summaryrefslogtreecommitdiffstats
path: root/wp-admin/comment.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-04-24 11:45:39 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-04-24 11:45:39 +0000
commitcf9f85dc8121a359d550ffa3b735fb48859eee88 (patch)
tree9f90be15fc46163f5656f019f2a2866414b7c9f2 /wp-admin/comment.php
parentf10f9f5b05e23ce4c07479b094bd3ff4bbfd86d0 (diff)
downloadwordpress-mu-cf9f85dc8121a359d550ffa3b735fb48859eee88.tar.gz
wordpress-mu-cf9f85dc8121a359d550ffa3b735fb48859eee88.tar.xz
wordpress-mu-cf9f85dc8121a359d550ffa3b735fb48859eee88.zip
Merged with WP 2.5, revision 7806
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1260 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/comment.php')
-rw-r--r--wp-admin/comment.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/wp-admin/comment.php b/wp-admin/comment.php
index 514be26..6691456 100644
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -141,8 +141,10 @@ case 'deletecomment' :
else
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' );