Changes from branches/3.0/wp-includes/load.php at r15967 to trunk/wp-includes/load.php at r17194

File:

• trunk/wp-includes/load.php (modified) (8 diffs)

trunk/wp-includes/load.php

@@ -257 +257 @@
 function wp_debug_mode() {
     if ( WP_DEBUG ) {
+        // E_DEPRECATED is a core PHP constant in PHP 5.3. Don't define this yourself.
+        // The two statements are equivalent, just one is for 5.3+ and for less than 5.3.
         if ( defined( 'E_DEPRECATED' ) )
             error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
@@ -309 +311 @@
 
 /**
+ * Load the correct database class file.
+ *
+ * This function is used to load the database class file either at runtime or by
+ * wp-admin/setup-config.php. We must globalize $wpdb to ensure that it is
+ * defined globally by the inline code in wp-db.php.
+ *
+ * @since 2.5.0
+ * @global $wpdb WordPress Database Object
+ */
+function require_wp_db() {
+    global $wpdb;
+
+    require_once( ABSPATH . WPINC . '/wp-db.php' );
+    if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
+        require_once( WP_CONTENT_DIR . '/db.php' );
+
+    if ( isset( $wpdb ) )
+        return;
+
+    $wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
+}
+
+/**
  * Sets the database table prefix and the format specifiers for database table columns.
  *
@@ -379 +404 @@
 
     if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-        wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts' ) );
+        wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts' ) );
         wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
     }
@@ -397 +422 @@
             wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
     } elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) {
-        if ( defined( 'WP_SITEURL' ) )
-            $link = WP_SITEURL . '/wp-admin/install.php';
-        elseif ( false !== strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) )
-            $link = preg_replace( '|/wp-admin/?.*?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php';
-        else
-            $link = preg_replace( '|/[^/]+?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php';
+
+        $link = wp_guess_url() . '/wp-admin/install.php';
+
         require( ABSPATH . WPINC . '/kses.php' );
         require( ABSPATH . WPINC . '/pluggable.php' );
@@ -453 +475 @@
     $active_plugins = (array) get_option( 'active_plugins', array() );
 
-    // Get active network plugins
-    if ( is_multisite() ) {
-        $active_sitewide_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-        if ( !empty($active_sitewide_plugins) ) {
-            $active_plugins = array_merge( $active_plugins, array_keys( $active_sitewide_plugins ) );
-            sort( $active_plugins );
-        }
-    }
-
     // Check for hacks file if the option is enabled
     if ( get_option( 'hack_file' ) && file_exists( ABSPATH . 'my-hacks.php' ) ) {
@@ -471 +484 @@
         return $plugins;
 
+    $network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
+
     foreach ( $active_plugins as $plugin ) {
         if ( ! validate_file( $plugin ) // $plugin must validate as file
             && '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
             && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
+            // not already included as a network plugin
+            && ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins ) )
             )
         $plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
@@ -554 +571 @@
 
 /**
- * Whether the current request is in WordPress admin Panel
+ * Whether the current request is for a network or blog admin page
  *
  * Does not inform on whether the user is an admin! Use capability checks to
@@ -570 +587 @@
 
 /**
+ * Whether the current request is for a blog admin screen /wp-admin/
+ *
+ * Does not inform on whether the user is a blog admin! Use capability checks to
+ * tell if the user should be accessing a section or not.
+ *
+ * @since 3.1.0
+ *
+ * @return bool True if inside WordPress network administration pages.
+ */
+function is_blog_admin() {
+    if ( defined( 'WP_BLOG_ADMIN' ) )
+        return WP_BLOG_ADMIN;
+    return false;
+}
+
+/**
+ * Whether the current request is for a network admin screen /wp-admin/network/
+ *
+ * Does not inform on whether the user is a network admin! Use capability checks to
+ * tell if the user should be accessing a section or not.
+ *
+ * @since 3.1.0
+ *
+ * @return bool True if inside WordPress network administration pages.
+ */
+function is_network_admin() {
+    if ( defined( 'WP_NETWORK_ADMIN' ) )
+        return WP_NETWORK_ADMIN;
+    return false;
+}
+
+/**
+ * Whether the current request is for a user admin screen /wp-admin/user/
+ *
+ * Does not inform on whether the user is an admin! Use capability checks to
+ * tell if the user should be accessing a section or not.
+ *
+ * @since 3.1.0
+ *
+ * @return bool True if inside WordPress user administration pages.
+ */
+function is_user_admin() {
+    if ( defined( 'WP_USER_ADMIN' ) )
+        return WP_USER_ADMIN;
+    return false;
+}
+
+/**
  * Whether Multisite support is enabled
  *