Changeset 21484

Timestamp:

08/09/2012 01:17:14 PM (12 years ago)

Author:

ryan

Message:

Move get_current_blog_id() to load.php so it is available during multisite bootstrap. fixes #21432

Location:

trunk/wp-includes

Files:

• general-template.php (modified) (1 diff)
• load.php (modified) (1 diff)

trunk/wp-includes/general-template.php

@@ -490 +490 @@
 
     return $output;
-}
-
-/**
- * Retrieve the current blog id
- *
- * @since 3.1.0
- *
- * @return int Blog id
- */
-function get_current_blog_id() {
-    global $blog_id;
-    return absint($blog_id);
 }
 

trunk/wp-includes/load.php

@@ -655 +655 @@
 
 /**
+ * Retrieve the current blog id
+ *
+ * @since 3.1.0
+ *
+ * @return int Blog id
+ */
+function get_current_blog_id() {
+    global $blog_id;
+    return absint($blog_id);
+}
+
+/**
  * Attempts an early load of translations.
  *