<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12977] trunk: restore shell wp-content/blogs.php & add deprecated warnings
, props nacin, see #11742</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12977">12977</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-05 21:40:22 +0000 (Fri, 05 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>restore shell wp-content/blogs.php & add deprecated warnings, props nacin, see <a href="http://trac.wordpress.org/ticket/11742">#11742</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesmsfilesphp">trunk/wp-includes/ms-files.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpcontentblogsphp">trunk/wp-content/blogs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentblogsphp"></a>
<div class="addfile"><h4>Added: trunk/wp-content/blogs.php (0 => 12977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/blogs.php (rev 0)
+++ trunk/wp-content/blogs.php 2010-02-05 21:40:22 UTC (rev 12977)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<?php
+/**
+ * Deprecated. Update your .htaccess file to use wp-includes/ms-files.php instead.
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ */
+
+define( 'SHORTINIT', true );
+require_once( dirname( dirname( __FILE__) ) . '/wp-load.php' );
+/* l10n is not loaded on SHORTINIT */
+_deprecated_file( basename( __FILE__ ), '3.0', null, sprintf( 'Change your rewrite rules to use <code>%1$s</code> instead of <code>%2$s</code>.', 'wp-includes/ms-files.php', 'wp-content/blogs.php' ) );
+
+/** Load Multisite upload handler. */
+require_once( ABSPATH . WPINC . '/ms-files.php' );
+
+?>
</ins></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (12976 => 12977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-02-05 21:33:53 UTC (rev 12976)
+++ trunk/wp-includes/functions.php 2010-02-05 21:40:22 UTC (rev 12977)
</span><span class="lines">@@ -3071,24 +3071,26 @@
</span><span class="cx"> * @access private
</span><span class="cx"> *
</span><span class="cx"> * @uses do_action() Calls 'deprecated_file_included' and passes the file name, what to use instead,
</span><del>- * and the version in which the file was deprecated.
</del><ins>+ * the version in which the file was deprecated, and any message regarding the change.
</ins><span class="cx"> * @uses apply_filters() Calls 'deprecated_file_trigger_error' and expects boolean value of true to do
</span><span class="cx"> * trigger or false to not trigger error.
</span><span class="cx"> *
</span><span class="cx"> * @param string $file The file that was included
</span><span class="cx"> * @param string $version The version of WordPress that deprecated the file
</span><span class="cx"> * @param string $replacement Optional. The file that should have been included based on ABSPATH
</span><ins>+ * @param string $message Optional. A message regarding the change
</ins><span class="cx"> */
</span><del>-function _deprecated_file( $file, $version, $replacement = null ) {
</del><ins>+function _deprecated_file( $file, $version, $replacement = null, $message = '' ) {
</ins><span class="cx">
</span><del>- do_action( 'deprecated_file_included', $file, $replacement, $version );
</del><ins>+ do_action( 'deprecated_file_included', $file, $replacement, $version, $message );
</ins><span class="cx">
</span><span class="cx"> // Allow plugin to filter the output error trigger
</span><span class="cx"> if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
</span><ins>+ $message = empty( $message ) ? '' : ' ' . $message;
</ins><span class="cx"> if ( ! is_null( $replacement ) )
</span><del>- trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) );
</del><ins>+ trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
</ins><span class="cx"> else
</span><del>- trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) );
</del><ins>+ trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesmsfilesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-files.php (12976 => 12977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-files.php 2010-02-05 21:33:53 UTC (rev 12976)
+++ trunk/wp-includes/ms-files.php 2010-02-05 21:40:22 UTC (rev 12977)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * Load mulitsite uploaded media
</del><ins>+ * Multisite upload handler.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><span class="lines">@@ -8,8 +8,11 @@
</span><span class="cx"> * @subpackage Multisite
</span><span class="cx"> */
</span><span class="cx">
</span><del>-define( 'SHORTINIT', true );
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
</del><ins>+if ( ! defined( 'SHORTINIT' ) ) {
+ define( 'SHORTINIT', true );
+ require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+}
+
</ins><span class="cx"> ms_default_constants( 'ms-files' );
</span><span class="cx">
</span><span class="cx"> error_reporting(0);
</span></span></pre>
</div>
</div>
</body>
</html>