<!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>[12312] trunk/wp-admin:
Fix multiple confirmation messages when restoring posts and pages from the trash
, props caesarsgrunt, see #4529</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12312">12312</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-12-01 23:28:20 +0000 (Tue, 01 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix multiple confirmation messages when restoring posts and pages from the trash, props caesarsgrunt, see <a href="http://trac.wordpress.org/ticket/4529">#4529</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminpagephp">trunk/wp-admin/page.php</a></li>
<li><a href="#trunkwpadminpostphp">trunk/wp-admin/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminpagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/page.php (12311 => 12312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/page.php 2009-12-01 22:05:03 UTC (rev 12311)
+++ trunk/wp-admin/page.php 2009-12-01 23:28:20 UTC (rev 12312)
</span><span class="lines">@@ -72,6 +72,12 @@
</span><span class="cx"> elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
</span><span class="cx"> $action = 'preview';
</span><span class="cx">
</span><ins>+$sendback = wp_get_referer();
+if ( strpos($sendback, 'page.php') !== false || strpos($sendback, 'page-new.php') !== false )
+ $sendback = admin_url('edit-pages.php');
+else
+ $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );
+
</ins><span class="cx"> switch($action) {
</span><span class="cx"> case 'post':
</span><span class="cx"> check_admin_referer('add-page');
</span><span class="lines">@@ -156,13 +162,7 @@
</span><span class="cx"> if ( !wp_trash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in moving to trash...') );
</span><span class="cx">
</span><del>- $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
- if ( strpos($sendback, 'page.php') !== false || strpos($sendback, 'page-new.php') !== false )
- $sendback = admin_url('edit-pages.php?trashed=1&ids='.$post_id);
- else
- $sendback = add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback );
-
- wp_redirect($sendback);
</del><ins>+ wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -178,13 +178,7 @@
</span><span class="cx"> if ( !wp_untrash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in restoring from trash...') );
</span><span class="cx">
</span><del>- $sendback = wp_get_referer();
- if ( strpos($sendback, 'page.php') !== false )
- $sendback = admin_url('edit-pages.php?untrashed=1');
- else
- $sendback = add_query_arg('untrashed', 1, $sendback);
-
- wp_redirect($sendback);
</del><ins>+ wp_redirect( add_query_arg('untrashed', 1, $sendback) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -205,13 +199,7 @@
</span><span class="cx"> wp_die( __('Error in deleting...') );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $sendback = wp_get_referer();
- if ( strpos($sendback, 'page.php') !== false )
- $sendback = admin_url('edit-pages.php?deleted=1');
- else
- $sendback = add_query_arg('deleted', 1, $sendback);
-
- wp_redirect($sendback);
</del><ins>+ wp_redirect( add_query_arg('deleted', 1, $sendback) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminpostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post.php (12311 => 12312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post.php 2009-12-01 22:05:03 UTC (rev 12311)
+++ trunk/wp-admin/post.php 2009-12-01 23:28:20 UTC (rev 12312)
</span><span class="lines">@@ -77,6 +77,12 @@
</span><span class="cx"> elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
</span><span class="cx"> $action = 'preview';
</span><span class="cx">
</span><ins>+$sendback = wp_get_referer();
+if ( strpos($sendback, 'post.php') !== false || strpos($sendback, 'post-new.php') !== false )
+ $sendback = admin_url('edit.php');
+else
+ $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );
+
</ins><span class="cx"> switch($action) {
</span><span class="cx"> case 'postajaxpost':
</span><span class="cx"> case 'post':
</span><span class="lines">@@ -196,13 +202,7 @@
</span><span class="cx"> if ( ! wp_trash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in moving to trash...') );
</span><span class="cx">
</span><del>- $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
- if ( strpos($sendback, 'post.php') !== false || strpos($sendback, 'post-new.php') !== false )
- $sendback = admin_url('edit.php?trashed=1&ids='.$post_id);
- else
- $sendback = add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback );
-
- wp_redirect($sendback);
</del><ins>+ wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -218,13 +218,7 @@
</span><span class="cx"> if ( ! wp_untrash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in restoring from trash...') );
</span><span class="cx">
</span><del>- $sendback = wp_get_referer();
- if ( strpos($sendback, 'post.php') !== false )
- $sendback = admin_url('edit.php?untrashed=1');
- else
- $sendback = add_query_arg('untrashed', 1, $sendback);
-
- wp_redirect($sendback);
</del><ins>+ wp_redirect( add_query_arg('untrashed', 1, $sendback) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -245,13 +239,7 @@
</span><span class="cx"> wp_die( __('Error in deleting...') );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $sendback = wp_get_referer();
- if ( strpos($sendback, 'post.php') !== false )
- $sendback = admin_url('edit.php?deleted=1');
- else
- $sendback = add_query_arg('deleted', 1, $sendback);
-
- wp_redirect($sendback);
</del><ins>+ wp_redirect( add_query_arg('deleted', 1, $sendback) );
</ins><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>