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

Timestamp:

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

Author:

ryan

Message:

Use network_*_url(). see #12736

File:

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

trunk/wp-includes/ms-functions.php

@@ -675 +675 @@
     // Send email with activation link.
     if ( !is_subdomain_install() || $current_site->id != 1 )
-        $activate_url = "http://" . $current_site->domain . $current_site->path . "wp-activate.php?key=$key";
+        $activate_url = network_site_url("wp-activate.php?key=$key");
     else
-        $activate_url = "http://{$domain}{$path}wp-activate.php?key=$key";
+        $activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
 
     $activate_url = esc_url($activate_url);
@@ -842 +842 @@
 
 function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
-    global $current_site;
     if ( get_site_option( 'registrationnotification' ) != 'yes' )
         return false;
@@ -850 +849 @@
         return false;
 
-    $options_site_url = esc_url("http://{$current_site->domain}{$current_site->path}wp-admin/ms-options.php");
+    $options_site_url = esc_url(network_admin_url('ms-options.php'));
 
     switch_to_blog( $blog_id );
     $blogname = get_option( 'blogname' );
-    $siteurl = get_option( 'siteurl' );
+    $siteurl = site_url();
     restore_current_blog();
 
@@ -869 +868 @@
 
 function newuser_notify_siteadmin( $user_id ) {
-    global $current_site;
-
     if ( get_site_option( 'registrationnotification' ) != 'yes' )
         return false;
@@ -881 +878 @@
     $user = new WP_User($user_id);
 
-    $options_site_url = esc_url("http://{$current_site->domain}{$current_site->path}wp-admin/ms-options.php");
+    $options_site_url = esc_url(network_admin_url('ms-options.php'));
     $msg = sprintf(__("New User: %1s
 Remote IP: %2s
@@ -1279 +1276 @@
     if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = NOBLOGREDIRECT ) ) {
         if ( $destination == '%siteurl%' )
-            $destination = $current_site->domain . $current_site->path;
+            $destination = network_home_url();
         wp_redirect( $destination );
         exit();