Changeset 16050

Timestamp:

10/28/2010 03:46:11 PM (16 years ago)

Author:

ryan

Message:

get_current_blog_id(). Props aaroncampbell. fixes #15233

Location:

trunk

Files:

• wp-app.php (modified) (2 diffs)
• wp-includes/admin-bar/admin-bar-class.php (modified) (3 diffs)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/post.php (modified) (4 diffs)
• wp-includes/user.php (modified) (4 diffs)

trunk/wp-app.php

@@ -388 +388 @@
          */
         function create_post() {
-                global $blog_id, $user_ID;
+                global $user_ID;
                 $this->get_accepted_content_type($this->atom_content_types);
 
@@ -420 +420 @@
                         $this->auth_required(__('Sorry, you do not have the right to edit/publish new posts.'));
 
-                $blog_ID = (int ) $blog_id;
+                $blog_ID = get_current_blog_id();
                 $post_status = ($publish) ? 'publish' : 'draft';
                 $post_author = (int) $user_ID;

trunk/wp-includes/admin-bar/admin-bar-class.php

@@ -8 +8 @@
 
         function initialize() {
-                global $blog_id;
-
                 /* Only load super admin menu code if the logged in user is a super admin */
                 if ( is_super_admin() ) {
@@ -29 +27 @@
                         $this->user->account_domain = $this->user->domain;
                 } else {
-                        $this->user->active_blog = $this->user->blogs[$blog_id];
+                        $this->user->active_blog = $this->user->blogs[get_current_blog_id()];
                         $this->user->domain = trailingslashit( home_url() );
                         $this->user->account_domain = $this->user->domain;
@@ -86 +84 @@
                 return $this->remove_node( $id, $this->menu );
         }
-        
+
         function render() {
                 ?>

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/post.php

@@ -1017 +1017 @@
  * - publish_posts - Controls publishing objects of this post type.
  * - read_private_posts - Controls whether private objects can be read.
- 
+
  * These four primitive capabilities are checked in core in various locations.
  * There are also seven other primitive capabilities which are not referenced
@@ -2266 +2266 @@
                 'suppress_filters' => true
         );
-        
+
         $r = wp_parse_args( $args, $defaults );
 
         $results = get_posts( $r );
-        
+
         // Backward compatibility. Prior to 3.1 expected posts to be returned in array
         if ( ARRAY_A == $output ){
@@ -4142 +4142 @@
  */
 function _get_last_post_time( $timezone, $field ) {
-        global $wpdb, $blog_id;
+        global $wpdb;
 
         if ( !in_array( $field, array( 'date', 'modified' ) ) )
@@ -4153 +4153 @@
         $post_types = apply_filters( "get_lastpost{$field}_post_types", (array) $post_types );
 
-        $key = "lastpost{$field}:$blog_id:$timezone:" . md5( serialize( $post_types ) );
+        $key = "lastpost{$field}:" . get_current_blog_id() . ":$timezone:" . md5( serialize( $post_types ) );
 
         $date = wp_cache_get( $key, 'timeinfo' );

trunk/wp-includes/user.php

@@ -377 +377 @@
                                 'blog_id' => $GLOBALS['blog_id'],
                                 'role' => '',
-                                'meta_key' => '', 
+                                'meta_key' => '',
                                 'meta_value' => '',
                                 'meta_compare' => '',
@@ -573 +573 @@
  */
 function get_users_of_blog( $id = '' ) {
-        global $blog_id;
-
         if ( empty( $id ) )
-                $id = (int) $blog_id;
+                $id = get_current_blog_id();
 
         return get_users( array( 'blog_id' => $id ) );
@@ -594 +592 @@
 
         if ( !is_multisite() ) {
-                global $blog_id;
+                $blog_id = get_current_blog_id();
                 $blogs = array();
                 $blogs[ $blog_id ]->userblog_id = $blog_id;
@@ -758 +756 @@
  */
 function count_users($strategy = 'time') {
-        global $wpdb, $blog_id, $wp_roles;
+        global $wpdb, $wp_roles;
 
         // Initialize
-        $id = (int) $blog_id;
+        $id = get_current_blog_id();
         $blog_prefix = $wpdb->get_blog_prefix($id);
         $result = array();