Changeset 26120 for trunk/src/wp-includes/ms-functions.php

Timestamp:

11/13/2013 03:22:48 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Use get_current_site() instead of the $current_site global when possible.

props jeremyfelt.
fixes #25158.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (9 diffs)

trunk/src/wp-includes/ms-functions.php

@@ -536 +536 @@
  * @return array Contains the new site data and error messages.
  */
-function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
-    global $wpdb, $domain, $current_site;
-
+function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
+    global $wpdb, $domain;
+
+    $current_site = get_current_site();
     $base = $current_site->path;
 
@@ -710 +711 @@
  */
 function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta = array() ) {
-    global $current_site;
-
     if ( !apply_filters('wpmu_signup_blog_notification', $domain, $path, $title, $user, $user_email, $key, $meta) )
         return false;
 
     // Send email with activation link.
-    if ( !is_subdomain_install() || $current_site->id != 1 )
+    if ( !is_subdomain_install() || get_current_site()->id != 1 )
         $activate_url = network_site_url("wp-activate.php?key=$key");
     else
@@ -1123 +1122 @@
  * @param string $blog_title The title of the new site.
  */
-function install_blog($blog_id, $blog_title = '') {
-    global $wpdb, $wp_roles, $current_site;
+function install_blog( $blog_id, $blog_title = '' ) {
+    global $wpdb, $wp_roles;
 
     // Cast for security
@@ -1152 +1151 @@
         update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
     else
-        update_option( 'upload_path', get_blog_option( $current_site->blog_id, 'upload_path' ) );
+        update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
 
     update_option( 'blogname', wp_unslash( $blog_title ) );
@@ -1206 +1205 @@
  */
 function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta = array() ) {
-    global $current_site;
+    $current_site = get_current_site();
 
     if ( !apply_filters('wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta) )
@@ -1270 +1269 @@
  */
 function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) {
-    global $current_site;
+    $current_site = get_current_site();
 
     if ( !apply_filters('wpmu_welcome_user_notification', $user_id, $password, $meta) )
@@ -1561 +1560 @@
  */
 function redirect_this_site( $deprecated = '' ) {
-    global $current_site;
-    return array( $current_site->domain );
+    return array( get_current_site()->domain );
 }
 
@@ -1690 +1688 @@
  */
 function add_new_user_to_blog( $user_id, $password, $meta ) {
-    global $current_site;
     if ( !empty( $meta[ 'add_to_blog' ] ) ) {
         $blog_id = $meta[ 'add_to_blog' ];
         $role = $meta[ 'new_role' ];
-        remove_user_from_blog($user_id, $current_site->blog_id); // remove user from main blog.
+        remove_user_from_blog($user_id, get_current_site()->blog_id); // remove user from main blog.
         add_user_to_blog( $blog_id, $user_id, $role );
         update_user_meta( $user_id, 'primary_blog', $blog_id );
@@ -1706 +1703 @@
  */
 function fix_phpmailer_messageid( $phpmailer ) {
-    global $current_site;
-    $phpmailer->Hostname = $current_site->domain;
+    $phpmailer->Hostname = get_current_site()->domain;
 }