Changeset 13253
- Timestamp:
- 02/20/2010 01:51:32 PM (15 years ago)
- Location:
- trunk/wp-includes
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/load.php
r13222 r13253 382 382 function wp_not_installed() { 383 383 if ( is_multisite() ) { 384 if ( ! is_blog_installed() && !defined( 'WP_INSTALLING' ) )384 if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) 385 385 wp_die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) ); 386 } elseif ( ! is_blog_installed() && ( strpos( $_SERVER['PHP_SELF'], 'install.php' ) === false && !defined( 'WP_INSTALLING' )) ) {386 } elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) { 387 387 if ( defined( 'WP_SITEURL' ) ) 388 388 $link = WP_SITEURL . '/wp-admin/install.php'; 389 elseif ( strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) !== false)389 elseif ( false !== strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) ) 390 390 $link = preg_replace( '|/wp-admin/?.*?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php'; 391 391 else 392 392 $link = preg_replace( '|/[^/]+?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php'; 393 require _once( ABSPATH . WPINC . '/kses.php' );394 require _once( ABSPATH . WPINC . '/pluggable.php' );395 require _once( ABSPATH . WPINC . '/formatting.php' );393 require( ABSPATH . WPINC . '/kses.php' ); 394 require( ABSPATH . WPINC . '/pluggable.php' ); 395 require( ABSPATH . WPINC . '/formatting.php' ); 396 396 wp_redirect( $link ); 397 397 die(); … … 560 560 * Whether Multisite support is enabled 561 561 * 562 * @since 3.0 562 * @since 3.0.0 563 563 * 564 564 * @return bool True if multisite is enabled, false otherwise. -
trunk/wp-includes/ms-load.php
r13209 r13253 177 177 178 178 /** 179 * Displays a failure message when blog does not exist.180 * 181 * Checks for a missing $wpdb->site table as well.179 * Displays a failure message. 180 * 181 * Used when blog does not exist. Checks for a missing $wpdb->site table as well. 182 182 * 183 183 * @todo Merge with is_blog_installed(), dead_db(), wp_not_installed(), etc. … … 185 185 * @since 3.0.0 186 186 */ 187 function is_installed() {187 function ms_not_installed() { 188 188 global $wpdb, $domain, $path; 189 $base = stripslashes( $base );190 if ( defined( 'WP_INSTALLING' ) )191 return;192 189 193 190 $msg = '<h1>' . esc_html__( 'Fatal Error' ) . '</h1>'; -
trunk/wp-includes/ms-settings.php
r13126 r13253 95 95 } 96 96 if ( ! $current_blog || ! $current_site ) 97 is_installed();97 ms_not_installed(); 98 98 } 99 99
Note: See TracChangeset
for help on using the changeset viewer.