<!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>[13253] trunk/wp-includes: Rename is_installed() to ms_not_installed().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13253">13253</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-20 13:51:32 +0000 (Sat, 20 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename is_installed() to ms_not_installed(). See <a href="http://trac.wordpress.org/ticket/12083">#12083</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.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="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (13252 => 13253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2010-02-20 12:58:25 UTC (rev 13252)
+++ trunk/wp-includes/load.php 2010-02-20 13:51:32 UTC (rev 13253)
</span><span class="lines">@@ -381,18 +381,18 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_not_installed() {
</span><span class="cx"> if ( is_multisite() ) {
</span><del>- if ( !is_blog_installed() && !defined( 'WP_INSTALLING' ) )
</del><ins>+ if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) )
</ins><span class="cx"> wp_die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) );
</span><del>- } elseif ( !is_blog_installed() && ( strpos( $_SERVER['PHP_SELF'], 'install.php' ) === false && !defined( 'WP_INSTALLING' ) ) ) {
</del><ins>+ } elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) {
</ins><span class="cx"> if ( defined( 'WP_SITEURL' ) )
</span><span class="cx"> $link = WP_SITEURL . '/wp-admin/install.php';
</span><del>- elseif ( strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) !== false )
</del><ins>+ elseif ( false !== strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) )
</ins><span class="cx"> $link = preg_replace( '|/wp-admin/?.*?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php';
</span><span class="cx"> else
</span><span class="cx"> $link = preg_replace( '|/[^/]+?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php';
</span><del>- require_once( ABSPATH . WPINC . '/kses.php' );
- require_once( ABSPATH . WPINC . '/pluggable.php' );
- require_once( ABSPATH . WPINC . '/formatting.php' );
</del><ins>+ require( ABSPATH . WPINC . '/kses.php' );
+ require( ABSPATH . WPINC . '/pluggable.php' );
+ require( ABSPATH . WPINC . '/formatting.php' );
</ins><span class="cx"> wp_redirect( $link );
</span><span class="cx"> die();
</span><span class="cx"> }
</span><span class="lines">@@ -559,7 +559,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Whether Multisite support is enabled
</span><span class="cx"> *
</span><del>- * @since 3.0
</del><ins>+ * @since 3.0.0
</ins><span class="cx"> *
</span><span class="cx"> * @return bool True if multisite is enabled, false otherwise.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (13252 => 13253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-02-20 12:58:25 UTC (rev 13252)
+++ trunk/wp-includes/ms-load.php 2010-02-20 13:51:32 UTC (rev 13253)
</span><span class="lines">@@ -176,19 +176,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Displays a failure message when blog does not exist.
</del><ins>+ * Displays a failure message.
</ins><span class="cx"> *
</span><del>- * Checks for a missing $wpdb->site table as well.
</del><ins>+ * Used when blog does not exist. Checks for a missing $wpdb->site table as well.
</ins><span class="cx"> *
</span><span class="cx"> * @todo Merge with is_blog_installed(), dead_db(), wp_not_installed(), etc.
</span><span class="cx"> * @access private
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><del>-function is_installed() {
</del><ins>+function ms_not_installed() {
</ins><span class="cx"> global $wpdb, $domain, $path;
</span><del>- $base = stripslashes( $base );
- if ( defined( 'WP_INSTALLING' ) )
- return;
</del><span class="cx">
</span><span class="cx"> $msg = '<h1>' . esc_html__( 'Fatal Error' ) . '</h1>';
</span><span class="cx"> $msg = '<p>' . __( 'If your blog does not display, please contact the owner of this site.' ) . '</p>';
</span></span></pre></div>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (13252 => 13253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-02-20 12:58:25 UTC (rev 13252)
+++ trunk/wp-includes/ms-settings.php 2010-02-20 13:51:32 UTC (rev 13253)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> $current_blog = get_blog_details( array('domain' => $current_site->domain, 'path' => $current_site->path), false );
</span><span class="cx"> }
</span><span class="cx"> if ( ! $current_blog || ! $current_site )
</span><del>- is_installed();
</del><ins>+ ms_not_installed();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $blog_id = $current_blog->blog_id;
</span></span></pre>
</div>
</div>
</body>
</html>