From 3b82fdffc79dc0391920b1da461af7ca688e4bbf Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 26 Feb 2008 20:35:40 +0000
Subject: [PATCH] Remove messages from the requested URI so they don't follow
 us around while paging.

git-svn-id: http://svn.automattic.com/wordpress/trunk@7046 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/categories.php           | 3 ++-
 wp-admin/edit-link-categories.php | 4 ++--
 wp-admin/edit-tags.php            | 3 ++-
 wp-admin/edit.php                 | 2 +-
 wp-admin/link-manager.php         | 1 +
 wp-admin/upload.php               | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 4c4addba71..2763eca177 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -114,7 +114,8 @@ $messages[5] = __('Category not updated.');
 
 <?php if (isset($_GET['message'])) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
-<?php endif; ?>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+endif; ?>
 
 <div class="wrap">
 <form id="posts-filter" action="" method="get">
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index 5736874553..58c080c3c3 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -41,9 +41,9 @@ $messages[5] = __('Category not updated.');
 $messages[6] = __('Categories deleted.');
 
 if (isset($_GET['message'])) : ?>
-
 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
-<?php endif; ?>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+endif; ?>
 
 <div class="wrap">
 
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 0275f2b1ff..17e74a6bbd 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -105,7 +105,8 @@ $messages[6] = __('Tags deleted.');
 
 <?php if (isset($_GET['message'])) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
-<?php endif; ?>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+endif; ?>
 
 <div class="wrap">
 
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 04b3d11ff6..0dc3bfca1c 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -107,7 +107,7 @@ unset($status_links);
 <?php
 if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
 <div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="post.php?action=edit&amp;post=<?php echo $_GET['posted']; ?>"><?php _e('Edit post'); ?></a></p></div>
-<?php
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
 endif;
 ?>
 
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index dfeec242a2..88c543b56e 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -71,6 +71,7 @@ if ( isset($_GET['deleted']) ) {
 	$deleted = (int) $_GET['deleted'];
 	printf(__ngettext('%s link deleted.', '%s links deleted', $deleted), $deleted);
 	echo '</p></div>';
+	$_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);
 }
 ?>
 
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 0a0ab063ea..c7ae921b0e 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -110,7 +110,7 @@ unset($status_links);
 <?php
 if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
 <div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="post.php?action=edit&amp;post=<?php echo $_GET['posted']; ?>"><?php _e('Edit post'); ?></a></p></div>
-<?php
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
 endif;
 ?>