Remove messages from the requested URI so they don't follow us around while paging.

ryanboren · ryanboren · commit 11db3d97c2bd · 2008-02-26T20:35:40.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@7046 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-admin/categories.php b/wp-admin/categories.php
@@ -114,7 +114,8 @@
 
 <?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
@@ -41,9 +41,9 @@
 $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
@@ -105,7 +105,8 @@
 
 <?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
@@ -107,7 +107,7 @@
 <?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
@@ -71,6 +71,7 @@
 	$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
@@ -110,7 +110,7 @@
 <?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;
 ?>
 

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@`
`71`	`71`	`$deleted = (int) $_GET['deleted'];`
`72`	`72`	`printf(__ngettext('%s link deleted.', '%s links deleted', $deleted), $deleted);`
`73`	`73`	`echo '</p></div>';`
	`74`	`+ $_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);`
`74`	`75`	`}`
`75`	`76`	`?>`
`76`	`77`