Fix trashing/untrashing comments when no JS, props caesarsgrunt, see #4529
git-svn-id: https://develop.svn.wordpress.org/trunk@12113 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
5e11e936ef
commit
69b036bf7f
|
@ -171,33 +171,36 @@ case 'untrashcomment' :
|
||||||
$comment_id = absint( $_REQUEST['c'] );
|
$comment_id = absint( $_REQUEST['c'] );
|
||||||
$noredir = isset($_REQUEST['noredir']);
|
$noredir = isset($_REQUEST['noredir']);
|
||||||
|
|
||||||
if (!$comment = get_comment($comment_id))
|
if ( !$comment = get_comment($comment_id) )
|
||||||
comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit-comments.php') );
|
comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit-comments.php') );
|
||||||
if (!current_user_can('edit_post', $comment->comment_post_ID ))
|
if ( !current_user_can('edit_post', $comment->comment_post_ID ) )
|
||||||
comment_footer_die( __('You are not allowed to edit comments on this post.') );
|
comment_footer_die( __('You are not allowed to edit comments on this post.') );
|
||||||
|
|
||||||
if ($action == 'trashcomment') {
|
check_admin_referer( 'delete-comment_' . $comment_id );
|
||||||
check_admin_referer( 'trash-comment_' . $comment_id );
|
|
||||||
|
if ( '' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php') )
|
||||||
|
$redir = wp_get_referer();
|
||||||
|
elseif ( '' != wp_get_original_referer() && false == $noredir )
|
||||||
|
$redir = wp_get_original_referer();
|
||||||
|
else
|
||||||
|
$redir = admin_url('edit-comments.php');
|
||||||
|
|
||||||
|
if ( $action == 'trashcomment' ) {
|
||||||
wp_trash_comment($comment_id);
|
wp_trash_comment($comment_id);
|
||||||
}
|
$redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
|
||||||
else {
|
} else {
|
||||||
check_admin_referer( 'untrash-comment_' . $comment_id );
|
|
||||||
wp_untrash_comment($comment_id);
|
wp_untrash_comment($comment_id);
|
||||||
|
$redir = add_query_arg( array('untrashed' => '1'), $redir );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ('' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php' ))
|
wp_redirect( $redir );
|
||||||
wp_redirect( wp_get_referer() );
|
|
||||||
else if ('' != wp_get_original_referer() && false == $noredir)
|
|
||||||
wp_redirect(wp_get_original_referer());
|
|
||||||
else
|
|
||||||
wp_redirect(admin_url('edit-comments.php'));
|
|
||||||
|
|
||||||
die;
|
die;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'unapprovecomment' :
|
case 'unapprovecomment' :
|
||||||
$comment_id = absint( $_GET['c'] );
|
$comment_id = absint( $_GET['c'] );
|
||||||
check_admin_referer( 'unapprove-comment_' . $comment_id );
|
check_admin_referer( 'approve-comment_' . $comment_id );
|
||||||
|
|
||||||
if ( isset( $_GET['noredir'] ) )
|
if ( isset( $_GET['noredir'] ) )
|
||||||
$noredir = true;
|
$noredir = true;
|
||||||
|
|
|
@ -68,7 +68,7 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
|
||||||
|
|
||||||
<div id="major-publishing-actions">
|
<div id="major-publishing-actions">
|
||||||
<div id="delete-action">
|
<div id="delete-action">
|
||||||
<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=trashcomment&c=$comment->comment_ID&_wp_original_http_referer=" . urlencode(wp_get_referer()), 'trash-comment_' . $comment->comment_ID) . "'>" . __('Move to Trash') . "</a>\n"; ?>
|
<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=trashcomment&c=$comment->comment_ID&_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "'>" . __('Move to Trash') . "</a>\n"; ?>
|
||||||
</div>
|
</div>
|
||||||
<div id="publishing-action">
|
<div id="publishing-action">
|
||||||
<input type="submit" name="save" value="<?php esc_attr_e('Update Comment'); ?>" tabindex="4" class="button-primary" />
|
<input type="submit" name="save" value="<?php esc_attr_e('Update Comment'); ?>" tabindex="4" class="button-primary" />
|
||||||
|
|
Loading…
Reference in New Issue