<!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>[16847] trunk: Always exit after wp_redirect.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16847">16847</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-09 18:02:54 +0000 (Thu, 09 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Always exit after wp_redirect. props filosofo, fixes <a href="http://trac.wordpress.org/ticket/15518">#15518</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminlinkmanagerphp">trunk/wp-admin/link-manager.php</a></li>
<li><a href="#trunkwpadminmediauploadphp">trunk/wp-admin/media-upload.php</a></li>
<li><a href="#trunkwpadminmoderationphp">trunk/wp-admin/moderation.php</a></li>
<li><a href="#trunkwpadminmsadminphp">trunk/wp-admin/ms-admin.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsthemesphp">trunk/wp-admin/ms-themes.php</a></li>
<li><a href="#trunkwpadminmsupgradenetworkphp">trunk/wp-admin/ms-upgrade-network.php</a></li>
<li><a href="#trunkwpadminmsusersphp">trunk/wp-admin/ms-users.php</a></li>
<li><a href="#trunkwpadminnetworkadminphp">trunk/wp-admin/network/admin.php</a></li>
<li><a href="#trunkwpadminnetworkeditphp">trunk/wp-admin/network/edit.php</a></li>
<li><a href="#trunkwpadminnetworksiteinfophp">trunk/wp-admin/network/site-info.php</a></li>
<li><a href="#trunkwpadminnetworksiteoptionsphp">trunk/wp-admin/network/site-options.php</a></li>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.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="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpadminuseradminphp">trunk/wp-admin/user/admin.php</a></li>
<li><a href="#trunkwpatomphp">trunk/wp-atom.php</a></li>
<li><a href="#trunkwpcommentspostphp">trunk/wp-comments-post.php</a></li>
<li><a href="#trunkwpcommentsrss2php">trunk/wp-commentsrss2.php</a></li>
<li><a href="#trunkwpfeedphp">trunk/wp-feed.php</a></li>
<li><a href="#trunkwppassphp">trunk/wp-pass.php</a></li>
<li><a href="#trunkwprdfphp">trunk/wp-rdf.php</a></li>
<li><a href="#trunkwpregisterphp">trunk/wp-register.php</a></li>
<li><a href="#trunkwprssphp">trunk/wp-rss.php</a></li>
<li><a href="#trunkwprss2php">trunk/wp-rss2.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 (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/admin.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -178,13 +178,17 @@
</span><span class="cx"> if ( ! current_user_can('import') )
</span><span class="cx"> wp_die(__('You are not allowed to import.'));
</span><span class="cx">
</span><del>- if ( validate_file($importer) )
</del><ins>+ if ( validate_file($importer) ) {
</ins><span class="cx"> wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
</span><ins>+ exit;
+ }
</ins><span class="cx">
</span><span class="cx"> // Allow plugins to define importers as well
</span><span class="cx"> if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) {
</span><del>- if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
</del><ins>+ if (! file_exists(ABSPATH . "wp-admin/import/$importer.php")) {
</ins><span class="cx"> wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
</span><ins>+ exit;
+ }
</ins><span class="cx"> include(ABSPATH . "wp-admin/import/$importer.php");
</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 (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/includes/ms.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -507,12 +507,10 @@
</span><span class="cx">
</span><span class="cx"> if ( is_object( $blog ) ) {
</span><span class="cx"> wp_redirect( get_admin_url( $blog->blog_id, '?c=' . $c ) ); // redirect and count to 5, "just in case"
</span><del>- exit;
</del><span class="cx"> } else {
</span><span class="cx"> wp_redirect( user_admin_url( '?c=' . $c ) ); // redirect and count to 5, "just in case"
</span><span class="cx"> }
</span><del>-
- wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
</del><ins>+ exit;
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'admin_page_access_denied', 'redirect_user_to_blog', 99 );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminlinkmanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link-manager.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link-manager.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/link-manager.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> wp_redirect( add_query_arg('deleted', count( $bulklinks ), admin_url( 'link-manager.php' ) ) );
</span><ins>+ exit;
</ins><span class="cx"> }
</span><span class="cx"> } elseif ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
</span><span class="cx"> wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), stripslashes( $_SERVER['REQUEST_URI'] ) ) );
</span></span></pre></div>
<a id="trunkwpadminmediauploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/media-upload.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/media-upload.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/media-upload.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> $location .= '?message=3';
</span><span class="cx">
</span><span class="cx"> wp_redirect( admin_url($location) );
</span><ins>+ exit;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $title = __('Upload New Media');
</span></span></pre></div>
<a id="trunkwpadminmoderationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/moderation.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/moderation.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/moderation.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -9,4 +9,5 @@
</span><span class="cx"> */
</span><span class="cx"> require_once('../wp-load.php');
</span><span class="cx"> wp_redirect( admin_url('edit-comments.php?comment_status=moderated') );
</span><ins>+exit;
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminmsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-admin.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-admin.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/ms-admin.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -9,4 +9,6 @@
</span><span class="cx">
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><del>-wp_redirect( network_admin_url() );
</del><span class="cx">\ No newline at end of file
</span><ins>+wp_redirect( network_admin_url() );
+exit;
+?>
</ins></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/ms-edit.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -9,4 +9,6 @@
</span><span class="cx">
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><del>-wp_redirect( network_admin_url() );
</del><span class="cx">\ No newline at end of file
</span><ins>+wp_redirect( network_admin_url() );
+exit;
+?>
</ins></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/ms-sites.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -9,4 +9,7 @@
</span><span class="cx">
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><del>-wp_redirect( network_admin_url('sites.php') );
</del><span class="cx">\ No newline at end of file
</span><ins>+wp_redirect( network_admin_url('sites.php') );
+exit;
+
+?>
</ins></span></pre></div>
<a id="trunkwpadminmsthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-themes.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-themes.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/ms-themes.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -9,4 +9,6 @@
</span><span class="cx">
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><del>-wp_redirect( network_admin_url('themes.php') );
</del><span class="cx">\ No newline at end of file
</span><ins>+wp_redirect( network_admin_url('themes.php') );
+exit;
+?>
</ins></span></pre></div>
<a id="trunkwpadminmsupgradenetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-upgrade-network.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-upgrade-network.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/ms-upgrade-network.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -9,4 +9,7 @@
</span><span class="cx">
</span><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><del>-wp_redirect( network_admin_url('upgrade.php') );
</del><span class="cx">\ No newline at end of file
</span><ins>+wp_redirect( network_admin_url('upgrade.php') );
+exit;
+
+?>
</ins></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/ms-users.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -9,4 +9,6 @@
</span><span class="cx">
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><del>-wp_redirect( network_admin_url('users.php') );
</del><span class="cx">\ No newline at end of file
</span><ins>+wp_redirect( network_admin_url('users.php') );
+exit;
+?>
</ins></span></pre></div>
<a id="trunkwpadminnetworkadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/admin.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/admin.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/network/admin.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -15,7 +15,8 @@
</span><span class="cx"> if ( ! is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx">
</span><del>-if ( ! is_main_site() )
</del><ins>+if ( ! is_main_site() ) {
</ins><span class="cx"> wp_redirect( network_admin_url() );
</span><del>-
</del><ins>+ exit;
+}
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminnetworkeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/edit.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/edit.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/network/edit.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -13,8 +13,10 @@
</span><span class="cx"> if ( ! is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx">
</span><del>-if ( empty( $_GET['action'] ) )
</del><ins>+if ( empty( $_GET['action'] ) ) {
</ins><span class="cx"> wp_redirect( admin_url( 'index.php' ) );
</span><ins>+ exit;
+}
</ins><span class="cx">
</span><span class="cx"> function confirm_delete_users( $users ) {
</span><span class="cx"> $current_user = wp_get_current_user();
</span></span></pre></div>
<a id="trunkwpadminnetworksiteinfophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-info.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-info.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/network/site-info.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx">
</span><span class="cx"> restore_current_blog();
</span><span class="cx"> wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-info.php') );
</span><ins>+ exit;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['update']) ) {
</span></span></pre></div>
<a id="trunkwpadminnetworksiteoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-options.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-options.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/network/site-options.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> do_action( 'wpmu_update_blog_options' );
</span><span class="cx"> restore_current_blog();
</span><span class="cx"> wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-options.php') );
</span><ins>+ exit;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['update']) ) {
</span><span class="lines">@@ -131,4 +132,4 @@
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><del>-require('../admin-footer.php');
</del><span class="cx">\ No newline at end of file
</span><ins>+require('../admin-footer.php');
</ins></span></pre></div>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/network/site-users.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -279,4 +279,4 @@
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><del>-require('../admin-footer.php');
</del><span class="cx">\ No newline at end of file
</span><ins>+require('../admin-footer.php');
</ins></span></pre></div>
<a id="trunkwpadminplugineditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-editor.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-editor.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/plugin-editor.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> update_option('recently_activated', array($file => time()) + (array)get_option('recently_activated'));
</span><span class="cx">
</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><del>- exit;
</del><span class="cx"> }
</span><span class="cx"> wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkwpadminpostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/post.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
</span><ins>+ exit;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset( $_POST['deletepost'] ) )
</span><span class="lines">@@ -265,7 +266,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- wp_redirect( admin_url('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="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/update-core.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -366,6 +366,7 @@
</span><span class="cx"> return;
</span><span class="cx"> dismiss_core_update( $update );
</span><span class="cx"> wp_redirect( wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core') );
</span><ins>+ exit;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function do_undismiss_core_update() {
</span><span class="lines">@@ -376,6 +377,7 @@
</span><span class="cx"> return;
</span><span class="cx"> undismiss_core_update( $version, $locale );
</span><span class="cx"> wp_redirect( wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core') );
</span><ins>+ exit;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function no_update_actions($actions) {
</span></span></pre></div>
<a id="trunkwpadminuseradminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user/admin.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user/admin.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-admin/user/admin.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -11,7 +11,8 @@
</span><span class="cx">
</span><span class="cx"> require_once( dirname(dirname(__FILE__)) . '/admin.php');
</span><span class="cx">
</span><del>-if ( ! is_main_site() )
</del><ins>+if ( ! is_main_site() ) {
</ins><span class="cx"> wp_redirect( user_admin_url() );
</span><del>-
</del><ins>+ exit;
+}
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpatomphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-atom.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-atom.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-atom.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -8,5 +8,5 @@
</span><span class="cx">
</span><span class="cx"> require( './wp-load.php' );
</span><span class="cx"> wp_redirect( get_bloginfo( 'atom_url' ), 301 );
</span><del>-
-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+exit;
+?>
</ins></span></pre></div>
<a id="trunkwpcommentspostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-comments-post.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-comments-post.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-comments-post.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -101,5 +101,5 @@
</span><span class="cx"> $location = apply_filters('comment_post_redirect', $location, $comment);
</span><span class="cx">
</span><span class="cx"> wp_redirect($location);
</span><del>-
</del><ins>+exit;
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpcommentsrss2php"></a>
<div class="modfile"><h4>Modified: trunk/wp-commentsrss2.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-commentsrss2.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-commentsrss2.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -8,5 +8,5 @@
</span><span class="cx">
</span><span class="cx"> require( './wp-load.php' );
</span><span class="cx"> wp_redirect( get_bloginfo( 'comments_rss2_url' ), 301 );
</span><del>-
-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+exit;
+?>
</ins></span></pre></div>
<a id="trunkwpfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-feed.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-feed.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-feed.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -8,5 +8,5 @@
</span><span class="cx">
</span><span class="cx"> require( './wp-load.php' );
</span><span class="cx"> wp_redirect( get_bloginfo( get_default_feed() . '_url' ), 301 );
</span><del>-
-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+exit;
+?>
</ins></span></pre></div>
<a id="trunkwppassphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-pass.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-pass.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-pass.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -16,4 +16,5 @@
</span><span class="cx"> setcookie('wp-postpass_' . COOKIEHASH, $_POST['post_password'], time() + 864000, COOKIEPATH);
</span><span class="cx">
</span><span class="cx"> wp_safe_redirect(wp_get_referer());
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+exit;
+?>
</ins></span></pre></div>
<a id="trunkwprdfphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-rdf.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-rdf.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-rdf.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -8,5 +8,5 @@
</span><span class="cx">
</span><span class="cx"> require( './wp-load.php' );
</span><span class="cx"> wp_redirect( get_bloginfo( 'rdf_url' ), 301 );
</span><del>-
-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+exit;
+?>
</ins></span></pre></div>
<a id="trunkwpregisterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-register.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-register.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-register.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -11,5 +11,5 @@
</span><span class="cx">
</span><span class="cx"> require('./wp-load.php');
</span><span class="cx"> wp_redirect( site_url('wp-login.php?action=register') );
</span><del>-
-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+exit;
+?>
</ins></span></pre></div>
<a id="trunkwprssphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-rss.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-rss.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-rss.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -8,5 +8,5 @@
</span><span class="cx">
</span><span class="cx"> require( './wp-load.php' );
</span><span class="cx"> wp_redirect( get_bloginfo( 'rss_url' ), 301 );
</span><del>-
-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+exit;
+?>
</ins></span></pre></div>
<a id="trunkwprss2php"></a>
<div class="modfile"><h4>Modified: trunk/wp-rss2.php (16846 => 16847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-rss2.php 2010-12-09 17:59:35 UTC (rev 16846)
+++ trunk/wp-rss2.php 2010-12-09 18:02:54 UTC (rev 16847)
</span><span class="lines">@@ -8,5 +8,5 @@
</span><span class="cx">
</span><span class="cx"> require( './wp-load.php' );
</span><span class="cx"> wp_redirect( get_bloginfo( 'rss2_url' ), 301 );
</span><del>-
-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+exit;
+?>
</ins></span></pre>
</div>
</div>
</body>
</html>