From e0f37101f710bd2e4bf9846270744cdada30d075 Mon Sep 17 00:00:00 2001
From: Mark Jaquith <markjaquith@git.wordpress.org>
Date: Mon, 24 Jan 2011 04:16:55 +0000
Subject: [PATCH] Make sure we don't double-add -user or -network suffixes in
 convert_to_screen(). props SergeyBiryukov. fixes #16348

git-svn-id: https://develop.svn.wordpress.org/trunk@17356 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 02358361b3..d9790bef47 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1660,7 +1660,7 @@ function _post_states($post) {
  * @return object An object containing the safe screen name and id
  */
 function convert_to_screen( $screen ) {
-	$screen = str_replace( array('.php', '-new', '-add' ), '', $screen);
+	$screen = str_replace( array('.php', '-new', '-add', '-network', '-user' ), '', $screen);
 
 	if ( is_network_admin() )
 		$screen .= '-network';