Changeset 34896

Timestamp:

10/07/2015 03:01:27 AM (11 years ago)

Author:

boonebgorges

Message:

Move wp_installing() to load.php.

Various functions in load.php need to check whether WP is in installation mode.
Let's let them.

Props adamsilverstein.
See #31130.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (1 diff)
• load.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -1256 +1256 @@
          */
         echo apply_filters( 'robots_txt', $output, $public );
-}
-
-/**
- * Check or set whether WordPress is in "installation" mode.
- *
- * If the `WP_INSTALLING` constant is defined during the bootstrap, `wp_installing()` will default to `true`.
- *
- * @since 4.4.0
- *
- * @staticvar bool $installing
- *
- * @param bool $is_installing Optional. True to set WP into Installing mode, false to turn Installing mode off.
- *                            Omit this parameter if you only want to fetch the current status.
- * @return bool True if WP is installing, otherwise false. When a `$is_installing` is passed, the function will
- *              report whether WP was in installing mode prior to the change to `$is_installing`.
- */
-function wp_installing( $is_installing = null ) {
-        static $installing = null;
-
-        // Support for the `WP_INSTALLING` constant, defined before WP is loaded.
-        if ( is_null( $installing ) ) {
-                $installing = defined( 'WP_INSTALLING' ) && WP_INSTALLING;
-        }
-
-        if ( ! is_null( $is_installing ) ) {
-                $old_installing = $installing;
-                $installing = $is_installing;
-                return (bool) $old_installing;
-        }
-
-        return (bool) $installing;
 }
 

trunk/src/wp-includes/load.php

@@ -849 +849 @@
         $wp_locale = new WP_Locale();
 }
+
+/**
+ * Check or set whether WordPress is in "installation" mode.
+ *
+ * If the `WP_INSTALLING` constant is defined during the bootstrap, `wp_installing()` will default to `true`.
+ *
+ * @since 4.4.0
+ *
+ * @staticvar bool $installing
+ *
+ * @param bool $is_installing Optional. True to set WP into Installing mode, false to turn Installing mode off.
+ *                            Omit this parameter if you only want to fetch the current status.
+ * @return bool True if WP is installing, otherwise false. When a `$is_installing` is passed, the function will
+ *              report whether WP was in installing mode prior to the change to `$is_installing`.
+ */
+function wp_installing( $is_installing = null ) {
+        static $installing = null;
+
+        // Support for the `WP_INSTALLING` constant, defined before WP is loaded.
+        if ( is_null( $installing ) ) {
+                $installing = defined( 'WP_INSTALLING' ) && WP_INSTALLING;
+        }
+
+        if ( ! is_null( $is_installing ) ) {
+                $old_installing = $installing;
+                $installing = $is_installing;
+                return (bool) $old_installing;
+        }
+
+        return (bool) $installing;
+}