Changeset 13884 for trunk/wp-admin/includes/ms.php

Timestamp:

03/29/2010 09:45:31 PM (15 years ago)

Author:

ryan

Message:

Use network_*_url(). see #12736

File:

• trunk/wp-admin/includes/ms.php (modified) (6 diffs)

trunk/wp-admin/includes/ms.php

@@ -250 +250 @@
 
 function update_option_new_admin_email($old_value, $value) {
-    global $current_site;
     if ( $value == get_option( 'admin_email' ) || !is_email( $value ) )
         return;
@@ -277 +276 @@
 ###SITEURL###"), $new_admin_email );
 
-    $content = str_replace('###ADMIN_URL###', esc_url(get_option( "siteurl" ).'/wp-admin/options.php?adminhash='.$hash), $content);
+    $content = str_replace('###ADMIN_URL###', esc_url(admin_url('options.php?adminhash='.$hash)), $content);
     $content = str_replace('###EMAIL###', $value, $content);
     $content = str_replace('###SITENAME###', get_site_option( 'site_name' ), $content);
-    $content = str_replace('###SITEURL###', 'http://' . $current_site->domain . $current_site->path, $content);
+    $content = str_replace('###SITEURL###', network_home_url(), $content);
 
     wp_mail( $value, sprintf(__('[%s] New Admin Email Address'), get_option('blogname')), $content );
@@ -287 +286 @@
 
 function send_confirmation_on_profile_email() {
-    global $errors, $wpdb, $current_user, $current_site;
+    global $errors, $wpdb, $current_user;
     if ( ! is_object($errors) )
         $errors = new WP_Error();
@@ -328 +327 @@
 ###SITEURL###"), $new_user_email );
 
-        $content = str_replace('###ADMIN_URL###', esc_url(get_option( "siteurl" ).'/wp-admin/profile.php?newuseremail='.$hash), $content);
+        $content = str_replace('###ADMIN_URL###', esc_url(admin_url('profile.php?newuseremail='.$hash)), $content);
         $content = str_replace('###EMAIL###', $_POST[ 'email' ], $content);
         $content = str_replace('###SITENAME###', get_site_option( 'site_name' ), $content);
-        $content = str_replace('###SITEURL###', 'http://' . $current_site->domain . $current_site->path, $content);
+        $content = str_replace('###SITEURL###', network_home_url(), $content);
 
         wp_mail( $_POST[ 'email' ], sprintf(__('[%s] New Email Address'), get_option('blogname')), $content );
@@ -535 +534 @@
 
 function redirect_user_to_blog() {
-    global $current_user, $current_site;
+    global $current_user;
     $c = 0;
     if ( isset( $_GET[ 'c' ] ) )
@@ -548 +547 @@
     $dashboard_blog = get_dashboard_blog();
     if ( is_object( $blog ) ) {
-        $protocol = ( is_ssl() ? 'https://' : 'http://' );
-        wp_redirect( $protocol . $blog->domain . $blog->path . 'wp-admin/?c=' . $c ); // redirect and count to 5, "just in case"
+        wp_redirect( get_admin_url($blog->blog_id, '?c=' . $c) ); // redirect and count to 5, "just in case"
         exit;
     }