<!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>[12858] trunk: Deprecate is_main_blog() for is_main_site().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12858">12858</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-26 22:46:09 +0000 (Tue, 26 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecate is_main_blog() for is_main_site(). see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpincludesmsdeprecatedphp">trunk/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludesmssettingsphp">trunk/wp-includes/ms-settings.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 (12857 => 12858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-01-26 21:39:06 UTC (rev 12857)
+++ trunk/wp-admin/includes/ms.php 2010-01-26 22:46:09 UTC (rev 12858)
</span><span class="lines">@@ -725,7 +725,7 @@
</span><span class="cx"> return $data;
</span><span class="cx"> if ( !isset( $data[ 'post_name' ] ) || $data[ 'post_name' ] == '' )
</span><span class="cx"> return $data;
</span><del>- if ( !is_main_blog() )
</del><ins>+ if ( !is_main_site() )
</ins><span class="cx"> return $data;
</span><span class="cx">
</span><span class="cx"> $post_name = $data[ 'post_name' ];
</span></span></pre></div>
<a id="trunkwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-deprecated.php (12857 => 12858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-deprecated.php 2010-01-26 21:39:06 UTC (rev 12857)
+++ trunk/wp-includes/ms-deprecated.php 2010-01-26 22:46:09 UTC (rev 12858)
</span><span class="lines">@@ -117,4 +117,12 @@
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.0', 'clean_post_cache' );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * @deprecated 3.0
+ */
+function is_main_blog() {
+ _deprecated_function( __FUNCTION__, '3.0', 'is_main_site' );
+ return is_main_site();
+}
+
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12857 => 12858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-01-26 21:39:06 UTC (rev 12857)
+++ trunk/wp-includes/ms-functions.php 2010-01-26 22:46:09 UTC (rev 12858)
</span><span class="lines">@@ -81,13 +81,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function is_main_blog() {
- global $current_blog, $current_site;
- if ( $current_blog->domain == $current_site->domain && $current_blog->path == $current_site->path )
- return true;
- return false;
-}
-
</del><span class="cx"> function get_id_from_blogname( $name ) {
</span><span class="cx"> global $wpdb, $current_site;
</span><span class="cx"> $blog_id = wp_cache_get( "get_id_from_blogname_" . $name, 'blog-details' );
</span><span class="lines">@@ -1819,7 +1812,7 @@
</span><span class="cx">
</span><span class="cx"> function maybe_redirect_404() {
</span><span class="cx"> global $current_site;
</span><del>- if ( is_main_blog() && is_404() && defined( 'NOBLOGREDIRECT' ) && constant( 'NOBLOGREDIRECT' ) != '' ) {
</del><ins>+ if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && constant( 'NOBLOGREDIRECT' ) != '' ) {
</ins><span class="cx"> $destination = constant( 'NOBLOGREDIRECT' );
</span><span class="cx"> if ( $destination == '%siteurl%' )
</span><span class="cx"> $destination = $current_site->domain . $current_site->path;
</span></span></pre></div>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (12857 => 12858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-01-26 21:39:06 UTC (rev 12857)
+++ trunk/wp-includes/ms-settings.php 2010-01-26 22:46:09 UTC (rev 12858)
</span><span class="lines">@@ -65,13 +65,13 @@
</span><span class="cx"> $current_site->path = $path = PATH_CURRENT_SITE;
</span><span class="cx"> if ( defined( 'BLOGID_CURRENT_SITE' ) )
</span><span class="cx"> $current_site->blog_id = BLOGID_CURRENT_SITE;
</span><del>- if ( DOMAIN_CURRENT_SITE == $domain )
</del><ins>+ if ( DOMAIN_CURRENT_SITE == $domain )
</ins><span class="cx"> $current_site->cookie_domain = $cookie_domain;
</span><span class="cx"> elseif ( substr( $current_site->domain, 0, 4 ) == 'www.' )
</span><span class="cx"> $current_site->cookie_domain = substr( $current_site->domain, 4 );
</span><span class="cx"> else
</span><span class="cx"> $current_site->cookie_domain = $current_site->domain;
</span><del>-
</del><ins>+
</ins><span class="cx"> return $current_site;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>