<!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>[13514] trunk: Remove wp-content/blogs.
 php and add deprecated warning for MU admins.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13514">13514</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-28 20:29:24 +0000 (Sun, 28 Feb 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove wp-content/blogs.php and add deprecated warning for MU admins. fixes <a href="http://trac.wordpress.org/ticket/11742">#11742</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpincludesmsfilesphp">trunk/wp-includes/ms-files.php</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpcontentblogsphp">trunk/wp-content/blogs.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (13513 => 13514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php        2010-02-28 20:02:14 UTC (rev 13513)
+++ trunk/wp-admin/includes/ms.php        2010-02-28 20:29:24 UTC (rev 13514)
</span><span class="lines">@@ -771,9 +771,8 @@
</span><span class="cx"> add_action( 'wpmu_upgrade_site', 'stripslashes_from_options' );
</span><span class="cx"> 
</span><span class="cx"> function show_post_thumbnail_warning() {
</span><del>-        if ( false == is_super_admin() ) {
</del><ins>+        if ( ! is_super_admin() )
</ins><span class="cx">                 return;
</span><del>-        }
</del><span class="cx">         $mu_media_buttons = get_site_option( 'mu_media_buttons', array() );
</span><span class="cx">         if ( empty($mu_media_buttons[ 'image' ]) &amp;&amp; current_theme_supports( 'post-thumbnails' ) ) {
</span><span class="cx">                 echo &quot;&lt;div id='update-nag'&gt;&quot; . sprintf( __( &quot;Warning! The current theme supports post thumbnails. You must enable image uploads on &lt;a href='%s'&gt;the options page&lt;/a&gt; for it to work.&quot; ), admin_url( 'ms-options.php' ) ) . &quot;&lt;/div&gt;&quot;;
</span><span class="lines">@@ -781,4 +780,13 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'show_post_thumbnail_warning' );
</span><span class="cx"> 
</span><ins>+function ms_deprecated_blogs_file() {
+        if ( ! is_super_admin() )
+                return;
+        if ( ! file_exists( WP_CONTENT_DIR . '/blogs.php' ) )
+                return;
+        echo '&lt;div id=&quot;update-nag&quot;&gt;' . sprintf( __( 'The &lt;code&gt;%1$s&lt;/code&gt; file is deprecated. Please remove it and update your server rewrite rules to use &lt;code&gt;%2$s&lt;/code&gt; instead.' ), 'wp-content/blogs.php', 'wp-includes/ms-files.php' ) . '&lt;/div&gt;';
+}
+add_action( 'admin_notices', 'ms_deprecated_blogs_file' );
+
</ins><span class="cx"> ?&gt;
</span></span></pre></div>
<a id="trunkwpcontentblogsphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-content/blogs.php (13513 => 13514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/blogs.php        2010-02-28 20:02:14 UTC (rev 13513)
+++ trunk/wp-content/blogs.php        2010-02-28 20:29:24 UTC (rev 13514)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-&lt;?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' );
-
-/** Load Multisite upload handler. */
-require_once( ABSPATH . WPINC . '/ms-files.php' );
-
-?&gt;
</del></span></pre></div>
<a id="trunkwpincludesmsfilesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-files.php (13513 => 13514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-files.php        2010-02-28 20:02:14 UTC (rev 13513)
+++ trunk/wp-includes/ms-files.php        2010-02-28 20:29:24 UTC (rev 13514)
</span><span class="lines">@@ -8,12 +8,10 @@
</span><span class="cx">  * @subpackage Multisite
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-if ( ! defined( 'SHORTINIT' ) ) {
-        define( 'SHORTINIT', true );
-        require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
-}
</del><ins>+define( 'SHORTINIT', true );
+require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
</ins><span class="cx"> 
</span><del>-ms_file_constants( );
</del><ins>+ms_file_constants();
</ins><span class="cx"> 
</span><span class="cx"> error_reporting( 0 );
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>