Changeset 7756

Timestamp:

04/21/2008 04:46:15 PM (17 years ago)

Author:

ryan

Message:

Redirect back to original referer when deleting a comment from the edit comment page. fixes #6458 for 2.5

Location:

branches/2.5/wp-admin

Files:

• comment.php (modified) (1 diff)
• edit-form-comment.php (modified) (2 diffs)

branches/2.5/wp-admin/comment.php

@@ -142 +142 @@
         wp_delete_comment( $comment->comment_ID );
 
-    if ( '' != wp_get_referer() && false == $noredir )
+    if ( '' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php' ) )
         wp_redirect( wp_get_referer() );
+    else if ( '' != wp_get_original_referer() && false == $noredir )
+        wp_redirect( wp_get_original_referer() );
     else
         wp_redirect( get_option('siteurl') . '/wp-admin/edit-comments.php' );

branches/2.5/wp-admin/edit-form-comment.php

@@ -47 +47 @@
 <input type="submit" name="save" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" />
 <?php
-echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID", 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete comment') . "</a>";
+echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete comment') . "</a>";
 ?>
 </p>
@@ -96 +96 @@
 <input type="hidden" name="p" value="<?php echo $comment->comment_post_ID ?>" />
 <input name="referredby" type="hidden" id="referredby" value="<?php echo wp_get_referer(); ?>" />
+<?php wp_original_referer_field(true, 'previous'); ?>
 <input type="hidden" name="noredir" value="1" />
 </div>