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

git-svn-id: http://core.svn.wordpress.org/trunk@21484 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/general-template.php

@@ -491,18 +491,6 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
 	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);
-}
-
 /**
  * Display or retrieve page title for all areas of blog.
  *

wp-includes/load.php

@@ -653,6 +653,18 @@ function is_multisite() {
 	return false;
 }
 
+/**
+ * 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.
  *