Changeset 12845

Timestamp:

01/26/2010 06:09:45 PM (16 years ago)

Author:

ryan

Message:

unset temp vars in menu.php so they don't pollute the global namespace.

File:

• trunk/wp-admin/menu.php (modified) (8 diffs)

trunk/wp-admin/menu.php

@@ -53 +53 @@
         $submenu['edit.php'][$i++] = array( esc_attr($tax->label), 'manage_categories', 'edit-tags.php?taxonomy=' . $tax->name );
     }
+    unset($tax);
 
 $menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top', 'menu-media', 'div' );
@@ -114 +115 @@
             $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
 }
-unset($menu_perms);
+unset($menu_perms, $update_plugins, $update_count);
 
 if ( current_user_can('edit_users') )
@@ -189 +190 @@
     $admin_page_hooks[$menu_page[2]] = $hook_name;
 }
+unset($menu_page);
 
 $_wp_submenu_nopriv = array();
@@ -201 +203 @@
             }
         }
+        unset($index, $data);
 
         if ( empty(${$sub_loop}[$parent]) )
             unset(${$sub_loop}[$parent]);
     }
-}
+    unset($sub, $parent);
+}
+unset($sub_loop);
 
 // Loop over the top-level menu.
@@ -227 +232 @@
             unset($submenu[$old_parent][$index]);
         }
-        unset($submenu[$old_parent]);
+        unset($submenu[$old_parent], $index);
 
         if ( isset($_wp_submenu_nopriv[$old_parent]) )
@@ -233 +238 @@
     }
 }
+unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
 
 do_action('admin_menu', '');
@@ -250 +256 @@
     }
 }
+unset($id, $data);
 
 // Remove any duplicated seperators
@@ -265 +272 @@
     }
 }
-
-unset($id);
+unset($id, $data);
 
 function add_cssclass($add, $class) {