WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename is_installed() to ms_not_installed(). See #12083 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13253 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-02-20 13:51:32 +00:00
parent 8ad91e8b54
commit 20f50e7f06
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/load.php
View File

@ -381,18 +381,18 @@ function wp_start_object_cache() {
*/ */
function wp_not_installed() { function wp_not_installed() {
if ( is_multisite() ) { if ( is_multisite() ) {
if ( !is_blog_installed() && !defined( 'WP_INSTALLING' ) ) if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) )
wp_die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) ); wp_die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) );
} elseif ( !is_blog_installed() && ( strpos( $_SERVER['PHP_SELF'], 'install.php' ) === false && !defined( 'WP_INSTALLING' ) ) ) { } elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) {
if ( defined( 'WP_SITEURL' ) ) if ( defined( 'WP_SITEURL' ) )
$link = WP_SITEURL . '/wp-admin/install.php'; $link = WP_SITEURL . '/wp-admin/install.php';
elseif ( strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) !== false ) elseif ( false !== strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) )
$link = preg_replace( '|/wp-admin/?.*?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php'; $link = preg_replace( '|/wp-admin/?.*?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php';
else else
$link = preg_replace( '|/[^/]+?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php'; $link = preg_replace( '|/[^/]+?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php';
require_once( ABSPATH . WPINC . '/kses.php' ); require( ABSPATH . WPINC . '/kses.php' );
require_once( ABSPATH . WPINC . '/pluggable.php' ); require( ABSPATH . WPINC . '/pluggable.php' );
require_once( ABSPATH . WPINC . '/formatting.php' ); require( ABSPATH . WPINC . '/formatting.php' );
wp_redirect( $link ); wp_redirect( $link );
die(); die();
} }
@ -559,7 +559,7 @@ function is_admin() {
/** /**
* Whether Multisite support is enabled * Whether Multisite support is enabled
* *
* @since 3.0 * @since 3.0.0
* *
* @return bool True if multisite is enabled, false otherwise. * @return bool True if multisite is enabled, false otherwise.
*/ */

9
wp-includes/ms-load.php
View File

@ -176,19 +176,16 @@ function wpmu_current_site() {
} }
/** /**
* Displays a failure message when blog does not exist. * Displays a failure message.
* *
* Checks for a missing $wpdb->site table as well. * Used when blog does not exist. Checks for a missing $wpdb->site table as well.
* *
* @todo Merge with is_blog_installed(), dead_db(), wp_not_installed(), etc. * @todo Merge with is_blog_installed(), dead_db(), wp_not_installed(), etc.
* @access private * @access private
* @since 3.0.0 * @since 3.0.0
*/ */
function is_installed() { function ms_not_installed() {
global $wpdb, $domain, $path; global $wpdb, $domain, $path;
$base = stripslashes( $base );
if ( defined( 'WP_INSTALLING' ) )
return;
$msg = '<h1>' . esc_html__( 'Fatal Error' ) . '</h1>'; $msg = '<h1>' . esc_html__( 'Fatal Error' ) . '</h1>';
$msg = '<p>' . __( 'If your blog does not display, please contact the owner of this site.' ) . '</p>'; $msg = '<p>' . __( 'If your blog does not display, please contact the owner of this site.' ) . '</p>';

2
wp-includes/ms-settings.php
View File

@ -94,7 +94,7 @@ if ( ! defined( 'WP_INSTALLING' ) ) {
$current_blog = get_blog_details( array('domain' => $current_site->domain, 'path' => $current_site->path), false ); $current_blog = get_blog_details( array('domain' => $current_site->domain, 'path' => $current_site->path), false );
} }
if ( ! $current_blog || ! $current_site ) if ( ! $current_blog || ! $current_site )
is_installed(); ms_not_installed();
} }
$blog_id = $current_blog->blog_id; $blog_id = $current_blog->blog_id;