<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13884] trunk: Use network_*_url().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13884">13884</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-03-29 21:45:31 +0000 (Mon, 29 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use network_*_url(). see <a href="http://trac.wordpress.org/ticket/12736">#12736</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpactivatephp">trunk/wp-activate.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpactivatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-activate.php (13883 => 13884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-activate.php 2010-03-29 20:35:06 UTC (rev 13883)
+++ trunk/wp-activate.php 2010-03-29 21:45:31 UTC (rev 13884)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> <?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>
</span><span class="cx">
</span><span class="cx"> <h2><?php _e('Activation Key Required') ?></h2>
</span><del>- <form name="activateform" id="activateform" method="post" action="<?php echo 'http://' . $current_site->domain . $current_site->path ?>wp-activate.php">
</del><ins>+ <form name="activateform" id="activateform" method="post" action="<?php echo network_site_url('wp-activate.php'); ?>">
</ins><span class="cx"> <p>
</span><span class="cx"> <label for="key"><?php _e('Activation Key:') ?></label>
</span><span class="cx"> <br /><input type="text" name="key" id="key" value="" size="50" />
</span><span class="lines">@@ -64,9 +64,9 @@
</span><span class="cx"> <h2><?php _e('Your account is now active!'); ?></h2>
</span><span class="cx"> <?php
</span><span class="cx"> if ( $signup->domain . $signup->path == '' ) {
</span><del>- printf(__('<p class="lead-in">Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of "%2$s". Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.</p>'), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
</del><ins>+ printf(__('<p class="lead-in">Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of "%2$s". Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.</p>'), network_site_url('wp-login.php', 'login'), $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword', 'login'));
</ins><span class="cx"> } else {
</span><del>- printf(__('<p class="lead-in">Your site at <a href="%1$s">%2$s</a> is active. You may now login to your site using your chosen username of "%3$s". Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.</p>'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
</del><ins>+ printf(__('<p class="lead-in">Your site at <a href="%1$s">%2$s</a> is active. You may now login to your site using your chosen username of "%3$s". Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.</p>'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword'));
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> ?>
</span><span class="lines">@@ -86,10 +86,10 @@
</span><span class="cx"> <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $password; ?></p>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php if ( $url != 'http://' . $current_site->domain . $current_site->path ) : ?>
</del><ins>+ <?php if ( $url != network_home_url('', 'http') ) : ?>
</ins><span class="cx"> <p class="view"><?php printf(__('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Login</a>'), $url, $url . 'wp-login.php' ); ?></p>
</span><span class="cx"> <?php else: ?>
</span><del>- <p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.' ), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', 'http://' . $current_site->domain . $current_site->path ); ?></p>
</del><ins>+ <p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url('wp-login.php', 'login'), network_home_url() ); ?></p>
</ins><span class="cx"> <?php endif;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (13883 => 13884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-03-29 20:35:06 UTC (rev 13883)
+++ trunk/wp-admin/includes/ms.php 2010-03-29 21:45:31 UTC (rev 13884)
</span><span class="lines">@@ -249,7 +249,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function update_option_new_admin_email($old_value, $value) {
</span><del>- global $current_site;
</del><span class="cx"> if ( $value == get_option( 'admin_email' ) || !is_email( $value ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -276,17 +275,17 @@
</span><span class="cx"> All at ###SITENAME###
</span><span class="cx"> ###SITEURL###"), $new_admin_email );
</span><span class="cx">
</span><del>- $content = str_replace('###ADMIN_URL###', esc_url(get_option( "siteurl" ).'/wp-admin/options.php?adminhash='.$hash), $content);
</del><ins>+ $content = str_replace('###ADMIN_URL###', esc_url(admin_url('options.php?adminhash='.$hash)), $content);
</ins><span class="cx"> $content = str_replace('###EMAIL###', $value, $content);
</span><span class="cx"> $content = str_replace('###SITENAME###', get_site_option( 'site_name' ), $content);
</span><del>- $content = str_replace('###SITEURL###', 'http://' . $current_site->domain . $current_site->path, $content);
</del><ins>+ $content = str_replace('###SITEURL###', network_home_url(), $content);
</ins><span class="cx">
</span><span class="cx"> wp_mail( $value, sprintf(__('[%s] New Admin Email Address'), get_option('blogname')), $content );
</span><span class="cx"> }
</span><span class="cx"> add_action('update_option_new_admin_email', 'update_option_new_admin_email', 10, 2);
</span><span class="cx">
</span><span class="cx"> function send_confirmation_on_profile_email() {
</span><del>- global $errors, $wpdb, $current_user, $current_site;
</del><ins>+ global $errors, $wpdb, $current_user;
</ins><span class="cx"> if ( ! is_object($errors) )
</span><span class="cx"> $errors = new WP_Error();
</span><span class="cx">
</span><span class="lines">@@ -327,10 +326,10 @@
</span><span class="cx"> All at ###SITENAME###
</span><span class="cx"> ###SITEURL###"), $new_user_email );
</span><span class="cx">
</span><del>- $content = str_replace('###ADMIN_URL###', esc_url(get_option( "siteurl" ).'/wp-admin/profile.php?newuseremail='.$hash), $content);
</del><ins>+ $content = str_replace('###ADMIN_URL###', esc_url(admin_url('profile.php?newuseremail='.$hash)), $content);
</ins><span class="cx"> $content = str_replace('###EMAIL###', $_POST[ 'email' ], $content);
</span><span class="cx"> $content = str_replace('###SITENAME###', get_site_option( 'site_name' ), $content);
</span><del>- $content = str_replace('###SITEURL###', 'http://' . $current_site->domain . $current_site->path, $content);
</del><ins>+ $content = str_replace('###SITEURL###', network_home_url(), $content);
</ins><span class="cx">
</span><span class="cx"> wp_mail( $_POST[ 'email' ], sprintf(__('[%s] New Email Address'), get_option('blogname')), $content );
</span><span class="cx"> $_POST[ 'email' ] = $current_user->user_email;
</span><span class="lines">@@ -534,7 +533,7 @@
</span><span class="cx"> add_filter( 'get_term', 'sync_category_tag_slugs', 10, 2 );
</span><span class="cx">
</span><span class="cx"> function redirect_user_to_blog() {
</span><del>- global $current_user, $current_site;
</del><ins>+ global $current_user;
</ins><span class="cx"> $c = 0;
</span><span class="cx"> if ( isset( $_GET[ 'c' ] ) )
</span><span class="cx"> $c = (int)$_GET[ 'c' ];
</span><span class="lines">@@ -547,8 +546,7 @@
</span><span class="cx"> $blog = get_active_blog_for_user( $current_user->ID );
</span><span class="cx"> $dashboard_blog = get_dashboard_blog();
</span><span class="cx"> if ( is_object( $blog ) ) {
</span><del>- $protocol = ( is_ssl() ? 'https://' : 'http://' );
- wp_redirect( $protocol . $blog->domain . $blog->path . 'wp-admin/?c=' . $c ); // redirect and count to 5, "just in case"
</del><ins>+ wp_redirect( get_admin_url($blog->blog_id, '?c=' . $c) ); // redirect and count to 5, "just in case"
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (13883 => 13884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-03-29 20:35:06 UTC (rev 13883)
+++ trunk/wp-admin/ms-options.php 2010-03-29 21:45:31 UTC (rev 13884)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> <th scope="row"><label for="admin_notice_feed"><?php _e('Admin Notice Feed') ?></label></th>
</span><span class="cx"> <td><input name="admin_notice_feed" class="large-text" type="text" id="admin_notice_feed" value="<?php echo esc_attr( get_site_option( 'admin_notice_feed' ) ) ?>" size="80" /><br />
</span><span class="cx"> <?php _e( 'Display the latest post from this RSS or Atom feed on all site dashboards. Leave blank to disable.' ); ?><br />
</span><del>- <?php if ( get_site_option( 'admin_notice_feed' ) != 'http://' . $current_site->domain . $current_site->path . 'feed/' )
- echo __( "A good one to use would be the feed from your main site: " ) . 'http://' . $current_site->domain . $current_site->path . 'feed/'; ?></td>
</del><ins>+ <?php if ( get_site_option( 'admin_notice_feed' ) != network_home_url('feed/', 'http') )
+ echo __( "A good one to use would be the feed from your main site: " ) . network_home_url('feed/'); ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx"> <h3><?php _e('Registration Settings'); ?></h3>
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (13883 => 13884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-03-29 20:35:06 UTC (rev 13883)
+++ trunk/wp-includes/link-template.php 2010-03-29 21:45:31 UTC (rev 13884)
</span><span class="lines">@@ -2037,6 +2037,10 @@
</span><span class="cx"> */
</span><span class="cx"> function network_site_url( $path = '', $scheme = null ) {
</span><span class="cx"> global $current_site;
</span><ins>+
+ if ( !is_multisite() )
+ return site_url($path, $scheme);
+
</ins><span class="cx"> $orig_scheme = $scheme;
</span><span class="cx"> if ( !in_array($scheme, array('http', 'https')) ) {
</span><span class="cx"> if ( ( 'login_post' == $scheme || 'rpc' == $scheme ) && ( force_ssl_login() || force_ssl_admin() ) )
</span><span class="lines">@@ -2075,6 +2079,10 @@
</span><span class="cx"> */
</span><span class="cx"> function network_home_url( $path = '', $scheme = null ) {
</span><span class="cx"> global $current_site;
</span><ins>+
+ if ( !is_multisite() )
+ return home_url($path, $scheme);
+
</ins><span class="cx"> $orig_scheme = $scheme;
</span><span class="cx">
</span><span class="cx"> if ( !in_array($scheme, array('http', 'https')) )
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (13883 => 13884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-03-29 20:35:06 UTC (rev 13883)
+++ trunk/wp-includes/ms-functions.php 2010-03-29 21:45:31 UTC (rev 13884)
</span><span class="lines">@@ -674,9 +674,9 @@
</span><span class="cx">
</span><span class="cx"> // Send email with activation link.
</span><span class="cx"> if ( !is_subdomain_install() || $current_site->id != 1 )
</span><del>- $activate_url = "http://" . $current_site->domain . $current_site->path . "wp-activate.php?key=$key";
</del><ins>+ $activate_url = network_site_url("wp-activate.php?key=$key");
</ins><span class="cx"> else
</span><del>- $activate_url = "http://{$domain}{$path}wp-activate.php?key=$key";
</del><ins>+ $activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
</ins><span class="cx">
</span><span class="cx"> $activate_url = esc_url($activate_url);
</span><span class="cx"> $admin_email = get_site_option( "admin_email" );
</span><span class="lines">@@ -841,7 +841,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
</span><del>- global $current_site;
</del><span class="cx"> if ( get_site_option( 'registrationnotification' ) != 'yes' )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -849,11 +848,11 @@
</span><span class="cx"> if ( is_email($email) == false )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $options_site_url = esc_url("http://{$current_site->domain}{$current_site->path}wp-admin/ms-options.php");
</del><ins>+ $options_site_url = esc_url(network_admin_url('ms-options.php'));
</ins><span class="cx">
</span><span class="cx"> switch_to_blog( $blog_id );
</span><span class="cx"> $blogname = get_option( 'blogname' );
</span><del>- $siteurl = get_option( 'siteurl' );
</del><ins>+ $siteurl = site_url();
</ins><span class="cx"> restore_current_blog();
</span><span class="cx">
</span><span class="cx"> $msg = sprintf( __( "New Blog: %1s
</span><span class="lines">@@ -868,8 +867,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function newuser_notify_siteadmin( $user_id ) {
</span><del>- global $current_site;
-
</del><span class="cx"> if ( get_site_option( 'registrationnotification' ) != 'yes' )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -880,7 +877,7 @@
</span><span class="cx">
</span><span class="cx"> $user = new WP_User($user_id);
</span><span class="cx">
</span><del>- $options_site_url = esc_url("http://{$current_site->domain}{$current_site->path}wp-admin/ms-options.php");
</del><ins>+ $options_site_url = esc_url(network_admin_url('ms-options.php'));
</ins><span class="cx"> $msg = sprintf(__("New User: %1s
</span><span class="cx"> Remote IP: %2s
</span><span class="cx">
</span><span class="lines">@@ -1278,7 +1275,7 @@
</span><span class="cx"> global $current_site;
</span><span class="cx"> if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = NOBLOGREDIRECT ) ) {
</span><span class="cx"> if ( $destination == '%siteurl%' )
</span><del>- $destination = $current_site->domain . $current_site->path;
</del><ins>+ $destination = network_home_url();
</ins><span class="cx"> wp_redirect( $destination );
</span><span class="cx"> exit();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (13883 => 13884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2010-03-29 20:35:06 UTC (rev 13883)
+++ trunk/wp-login.php 2010-03-29 21:45:31 UTC (rev 13884)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> <?php if ( !is_multisite() ) { ?>
</span><span class="cx"> <div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', 'http://wordpress.org/'); ?>" title="<?php echo apply_filters('login_headertitle', __('Powered by WordPress')); ?>"><?php bloginfo('name'); ?></a></h1>
</span><span class="cx"> <?php } else { ?>
</span><del>-<div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', 'http://' . $current_site->domain . $current_site->path ); ?>" title="<?php echo apply_filters('login_headertitle', $current_site->site_name ); ?>"><span class="hide"><?php bloginfo('name'); ?></span></a></h1>
</del><ins>+<div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', network_home_url() ); ?>" title="<?php echo apply_filters('login_headertitle', $current_site->site_name ); ?>"><span class="hide"><?php bloginfo('name'); ?></span></a></h1>
</ins><span class="cx"> <?php }
</span><span class="cx">
</span><span class="cx"> $message = apply_filters('login_message', $message);
</span><span class="lines">@@ -184,16 +184,10 @@
</span><span class="cx"> $wpdb->update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login));
</span><span class="cx"> }
</span><span class="cx"> $message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n";
</span><del>- if ( !is_multisite() )
- $message .= get_option('siteurl') . "\r\n\r\n";
- else
- $message .= 'http://' . trailingslashit( $current_site->domain . $current_site->path ) . "\r\n\r\n";
</del><ins>+ $message .= network_site_url() . "\r\n\r\n";
</ins><span class="cx"> $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
</span><span class="cx"> $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
</span><del>- if ( !is_multisite() )
- $message .= site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n";
- else
- $message .= 'http://' . trailingslashit( $current_site->domain . $current_site->path ) . "wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login) . "\r\n";
</del><ins>+ $message .= network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n";
</ins><span class="cx">
</span><span class="cx"> if ( is_multisite() )
</span><span class="cx"> $blogname = $GLOBALS['current_site']->site_name;
</span></span></pre>
</div>
</div>
</body>
</html>