From 14ecba530b75e728d6ef2ee3085de0fc650485f5 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 9 Aug 2012 13:17:14 +0000
Subject: [PATCH] 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 | 12 ------------
 wp-includes/load.php             | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index ed106ee837..2fa010b929 100644
--- a/wp-includes/general-template.php
+++ b/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.
  *
diff --git a/wp-includes/load.php b/wp-includes/load.php
index 1bb354ebd5..b835097ca4 100644
--- a/wp-includes/load.php
+++ b/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.
  *