WordPress.org

Make WordPress Core

Changeset 13253


Ignore:
Timestamp:
02/20/2010 01:51:32 PM (8 years ago)
Author:
nacin
Message:

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

Location:
trunk/wp-includes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/load.php

    r13222 r13253  
    382382function wp_not_installed() {
    383383    if ( is_multisite() ) {
    384         if ( !is_blog_installed() && !defined( 'WP_INSTALLING' ) )
     384        if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) )
    385385            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' ) ) {
    387387        if ( defined( 'WP_SITEURL' ) )
    388388            $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' ) )
    390390            $link = preg_replace( '|/wp-admin/?.*?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php';
    391391        else
    392392            $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' );
    396396        wp_redirect( $link );
    397397        die();
     
    560560 * Whether Multisite support is enabled
    561561 *
    562  * @since 3.0
     562 * @since 3.0.0
    563563 *
    564564 * @return bool True if multisite is enabled, false otherwise.
  • trunk/wp-includes/ms-load.php

    r13209 r13253  
    177177
    178178/**
    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.
    182182 *
    183183 * @todo Merge with is_blog_installed(), dead_db(), wp_not_installed(), etc.
     
    185185 * @since 3.0.0
    186186 */
    187 function is_installed() {
     187function ms_not_installed() {
    188188    global $wpdb, $domain, $path;
    189     $base = stripslashes( $base );
    190     if ( defined( 'WP_INSTALLING' ) )
    191         return;
    192189
    193190    $msg = '<h1>' . esc_html__( 'Fatal Error' ) . '</h1>';
  • trunk/wp-includes/ms-settings.php

    r13126 r13253  
    9595    }
    9696    if ( ! $current_blog || ! $current_site )
    97         is_installed();
     97        ms_not_installed();
    9898}
    9999
Note: See TracChangeset for help on using the changeset viewer.