WP Merge.

Delete feed code and sql


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@636 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 20 insertions, 2 deletions

diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index 92ac4cb..49fe06e 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -413,7 +413,7 @@ function edit_user($user_id = 0) {
 		$pass2 = $_POST['pass2'];
 
 	if (isset ($_POST['role']) && current_user_can('edit_users')) {
-		if ($user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap('edit_users'))
+		if($user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap('edit_users'))
 			$user->role = $_POST['role'];
 	}
 
@@ -712,7 +712,7 @@ function page_rows($parent = 0, $level = 0, $pages = 0, $hierarchy = true) {
     <th scope="row"><?php echo $post->ID; ?></th> 
     <td>
       <?php echo $pad; ?><?php the_title() ?>
-      <?php if ('private' == $post->post_status) _e(' - <strong>Private</strong>'); ?></td>
+      <?php if ('private' == $post->post_status) _e(' - <strong>Private</strong>'); ?>
     </td> 
     <td><?php the_author() ?></td>
     <td><?php echo mysql2date('Y-m-d g:i a', $post->post_modified); ?></td> 
@@ -1966,6 +1966,24 @@ function get_udims($width, $height) {
 		return array((int) ($width / $height * 96), 96);
 }
 
+function wp_reset_vars($vars) {
+	for ($i=0; $i<count($vars); $i += 1) {
+		$var = $vars[$i];
+		global $$var;
+
+		if (!isset($$var)) {
+			if (empty($_POST["$var"])) {
+				if (empty($_GET["$var"]))
+					$$var = '';
+				else
+					$$var = $_GET["$var"];
+			} else {
+				$$var = $_POST["$var"];
+			}
+		}
+	}
+}
+
 function autocomplete_css() {
 	?>
 <style type='text/css'>