<!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>[16008] trunk: Use Absolute URL's & API'
s in header redirects in more locations.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16008">16008</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-10-27 10:43:43 +0000 (Wed, 27 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use Absolute URL's & API's in header redirects in more locations. See <a href="http://trac.wordpress.org/ticket/14062">#14062</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
<li><a href="#trunkwpadminimportphp">trunk/wp-admin/import.php</a></li>
<li><a href="#trunkwpadminlinkphp">trunk/wp-admin/link.php</a></li>
<li><a href="#trunkwpadminmediaphp">trunk/wp-admin/media.php</a></li>
<li><a href="#trunkwpadminmoderationphp">trunk/wp-admin/moderation.php</a></li>
<li><a href="#trunkwpadminplugineditorphp">trunk/wp-admin/plugin-editor.php</a></li>
<li><a href="#trunkwpadminpostphp">trunk/wp-admin/post.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpadminupdatephp">trunk/wp-admin/update.php</a></li>
<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
<li><a href="#trunkwpregisterphp">trunk/wp-register.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-admin/admin.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> $query_string = $_SERVER[ 'QUERY_STRING' ];
</span><span class="cx"> else
</span><span class="cx"> $query_string = 'page=' . $plugin_page;
</span><del>- wp_redirect( 'tools.php?' . $query_string );
</del><ins>+ wp_redirect( admin_url('tools.php?' . $query_string) );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminimportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-admin/import.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $_GET['invalid'] ) && !empty($popular_importers[$_GET['invalid']][3]) ) {
</span><del>- wp_redirect("import.php?import=" . $popular_importers[$_GET['invalid']][3]);
</del><ins>+ wp_redirect( admin_url('import.php?import=' . $popular_importers[$_GET['invalid']][3]) );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminlinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-admin/link.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> if ( !empty($_POST['linkcheck']) )
</span><span class="cx"> $linkcheck = $_POST['linkcheck'];
</span><span class="cx">
</span><del>-$this_file = 'link-manager.php';
</del><ins>+$this_file = admin_url('link-manager.php');
</ins><span class="cx">
</span><span class="cx"> switch ($action) {
</span><span class="cx"> case 'deletebookmarks' :
</span></span></pre></div>
<a id="trunkwpadminmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/media.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/media.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-admin/media.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> $errors = null;
</span><span class="cx">
</span><span class="cx"> if ( empty( $_GET['attachment_id'] ) ) {
</span><del>- wp_redirect('upload.php');
</del><ins>+ wp_redirect( admin_url('upload.php') );
</ins><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx"> $att_id = (int) $_GET['attachment_id'];
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> exit;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- wp_redirect( 'upload.php' );
</del><ins>+ wp_redirect( admin_url('upload.php') );
</ins><span class="cx"> exit;
</span><span class="cx">
</span><span class="cx"> endswitch;
</span></span></pre></div>
<a id="trunkwpadminmoderationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/moderation.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/moderation.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-admin/moderation.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -8,5 +8,5 @@
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><span class="cx"> require_once('../wp-load.php');
</span><del>-wp_redirect('edit-comments.php?comment_status=moderated');
</del><ins>+wp_redirect( admin_url('edit-comments.php?comment_status=moderated') );
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminplugineditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-editor.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-editor.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-admin/plugin-editor.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -67,9 +67,9 @@
</span><span class="cx"> wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide));
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><del>- wp_redirect("plugin-editor.php?file=$file&a=te&scrollto=$scrollto");
</del><ins>+ wp_redirect( adin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
</ins><span class="cx"> } else {
</span><del>- wp_redirect("plugin-editor.php?file=$file&scrollto=$scrollto");
</del><ins>+ wp_redirect( admin_url("plugin-editor.php?file=$file&scrollto=$scrollto") );
</ins><span class="cx"> }
</span><span class="cx"> exit;
</span><span class="cx">
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> if ( ! is_plugin_active($file) )
</span><span class="cx"> activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error
</span><span class="cx">
</span><del>- wp_redirect("plugin-editor.php?file=$file&a=te&scrollto=$scrollto");
</del><ins>+ wp_redirect( admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminpostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-admin/post.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> $editing = true;
</span><span class="cx">
</span><span class="cx"> if ( empty( $post_id ) ) {
</span><del>- wp_redirect("post.php");
</del><ins>+ wp_redirect( admin_url('post.php') );
</ins><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- wp_redirect('edit.php');
</del><ins>+ wp_redirect( admin_url('edit.php') );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx"> } // end switch
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-admin/themes.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -16,14 +16,14 @@
</span><span class="cx"> if ( 'activate' == $_GET['action'] ) {
</span><span class="cx"> check_admin_referer('switch-theme_' . $_GET['template']);
</span><span class="cx"> switch_theme($_GET['template'], $_GET['stylesheet']);
</span><del>- wp_redirect('themes.php?activated=true');
</del><ins>+ wp_redirect( admin_url('themes.php?activated=true') );
</ins><span class="cx"> exit;
</span><span class="cx"> } else if ( 'delete' == $_GET['action'] ) {
</span><span class="cx"> check_admin_referer('delete-theme_' . $_GET['template']);
</span><span class="cx"> if ( !current_user_can('delete_themes') )
</span><span class="cx"> wp_die( __( 'Cheatin&#8217; uh?' ) );
</span><span class="cx"> delete_theme($_GET['template']);
</span><del>- wp_redirect('themes.php?deleted=true');
</del><ins>+ wp_redirect( admin_url('themes.php?deleted=true') );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-admin/update-core.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx"> } elseif ( isset( $_POST['checked'] ) ) {
</span><span class="cx"> $plugins = (array) $_POST['checked'];
</span><span class="cx"> } else {
</span><del>- wp_redirect('update-core.php');
</del><ins>+ wp_redirect( admin_url('update-core.php') );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> } elseif ( isset( $_POST['checked'] ) ) {
</span><span class="cx"> $themes = (array) $_POST['checked'];
</span><span class="cx"> } else {
</span><del>- wp_redirect('update-core.php');
</del><ins>+ wp_redirect( admin_url('update-core.php') );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-admin/update.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -70,9 +70,9 @@
</span><span class="cx">
</span><span class="cx"> check_admin_referer('activate-plugin_' . $plugin);
</span><span class="cx"> if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
</span><del>- wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
</del><ins>+ wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
</ins><span class="cx"> activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ) );
</span><del>- wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
</del><ins>+ wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
</ins><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx"> iframe_header( __('Plugin Reactivation'), true );
</span></span></pre></div>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-admin/widgets.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> if ( isset($_POST['removewidget']) && $_POST['removewidget'] ) {
</span><span class="cx">
</span><span class="cx"> if ( !in_array($widget_id, $sidebar, true) ) {
</span><del>- wp_redirect('widgets.php?error=0');
</del><ins>+ wp_redirect( admin_url('widgets.php?error=0') );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> wp_set_sidebars_widgets($sidebars_widgets);
</span><del>- wp_redirect('widgets.php?message=0');
</del><ins>+ wp_redirect( admin_url('widgets.php?message=0') );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-login.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> $user = check_password_reset_key($_GET['key'], $_GET['login']);
</span><span class="cx">
</span><span class="cx"> if ( is_wp_error($user) ) {
</span><del>- wp_redirect('wp-login.php?action=lostpassword&error=invalidkey');
</del><ins>+ wp_redirect( site_url('wp-login.php?action=lostpassword&error=invalidkey') );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -484,12 +484,12 @@
</span><span class="cx"> case 'register' :
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> // Multisite uses wp-signup.php
</span><del>- wp_redirect( apply_filters( 'wp_signup_location', get_bloginfo('wpurl') . '/wp-signup.php' ) );
</del><ins>+ wp_redirect( apply_filters( 'wp_signup_location', site_url('wp-signup.php') ) );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !get_option('users_can_register') ) {
</span><del>- wp_redirect('wp-login.php?registration=disabled');
</del><ins>+ wp_redirect( site_url('wp-login.php?registration=disabled') );
</ins><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpregisterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-register.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-register.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-register.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -10,6 +10,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> require('./wp-load.php');
</span><del>-wp_redirect('wp-login.php?action=register');
</del><ins>+wp_redirect( site_url('wp-login.php?action=register') );
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (16007 => 16008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-10-27 10:29:27 UTC (rev 16007)
+++ trunk/wp-signup.php 2010-10-27 10:43:43 UTC (rev 16008)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !is_multisite() ) {
</span><del>- wp_redirect( get_option( 'siteurl' ) . "/wp-login.php?action=register" );
</del><ins>+ wp_redirect( site_url('wp-login.php?action=register') );
</ins><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>