WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@12845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-01-26 18:09:45 +00:00
parent 943f69cb1f
commit 055f3db3a3
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/menu.php
View File

@ -52,6 +52,7 @@ $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu
$submenu['edit.php'][$i++] = array( esc_attr($tax->label), 'manage_categories', 'edit-tags.php?taxonomy=' . $tax->name ); $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' ); $menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top', 'menu-media', 'div' );
$submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php'); $submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php');
@ -113,7 +114,7 @@ if ( is_super_admin() || ( is_multisite() && isset($menu_perms['plugins']) && $m
if ( !is_multisite() ) if ( !is_multisite() )
$submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' ); $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') ) if ( current_user_can('edit_users') )
$menu[70] = array( __('Users'), 'edit_users', 'users.php', '', 'menu-top', 'menu-users', 'div' ); $menu[70] = array( __('Users'), 'edit_users', 'users.php', '', 'menu-top', 'menu-users', 'div' );
@ -188,6 +189,7 @@ foreach ($menu as $menu_page) {
$admin_page_hooks[$menu_page[2]] = $hook_name; $admin_page_hooks[$menu_page[2]] = $hook_name;
} }
unset($menu_page);
$_wp_submenu_nopriv = array(); $_wp_submenu_nopriv = array();
$_wp_menu_nopriv = array(); $_wp_menu_nopriv = array();
@ -200,11 +202,14 @@ foreach ( array( 'submenu' ) as $sub_loop ) {
$_wp_submenu_nopriv[$parent][$data[2]] = true; $_wp_submenu_nopriv[$parent][$data[2]] = true;
} }
} }
unset($index, $data);
if ( empty(${$sub_loop}[$parent]) ) if ( empty(${$sub_loop}[$parent]) )
unset(${$sub_loop}[$parent]); unset(${$sub_loop}[$parent]);
} }
unset($sub, $parent);
} }
unset($sub_loop);
// Loop over the top-level menu. // Loop over the top-level menu.
// Menus for which the original parent is not acessible due to lack of privs will have the next // Menus for which the original parent is not acessible due to lack of privs will have the next
@ -226,12 +231,13 @@ foreach ( $menu as $id => $data ) {
$submenu[$new_parent][$index] = $submenu[$old_parent][$index]; $submenu[$new_parent][$index] = $submenu[$old_parent][$index];
unset($submenu[$old_parent][$index]); unset($submenu[$old_parent][$index]);
} }
unset($submenu[$old_parent]); unset($submenu[$old_parent], $index);
if ( isset($_wp_submenu_nopriv[$old_parent]) ) if ( isset($_wp_submenu_nopriv[$old_parent]) )
$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent]; $_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
} }
} }
unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
do_action('admin_menu', ''); do_action('admin_menu', '');
@ -249,6 +255,7 @@ foreach ( $menu as $id => $data ) {
} }
} }
} }
unset($id, $data);
// Remove any duplicated seperators // Remove any duplicated seperators
$seperator_found = false; $seperator_found = false;
@ -264,8 +271,7 @@ foreach ( $menu as $id => $data ) {
$seperator_found = false; $seperator_found = false;
} }
} }
unset($id, $data);
unset($id);
function add_cssclass($add, $class) { function add_cssclass($add, $class) {
$class = empty($class) ? $add : $class .= ' ' . $add; $class = empty($class) ? $add : $class .= ' ' . $add;