Make sure we don't double-add -user or -network suffixes in convert_to_screen(). props SergeyBiryukov. fixes #16348

git-svn-id: http://svn.automattic.com/wordpress/trunk@17356 1a063a9b-81f0-0310-95a4-ce76da25c4cd

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';