Changeset 16253

Timestamp:

11/09/2010 03:28:09 AM (14 years ago)

Author:

nacin

Message:

Set $tax as the taxonomy object, and kill off our colliding global from menu construction. see #15326.

Location:

trunk/wp-admin

Files:

• edit-tags.php (modified) (1 diff)
• menu.php (modified) (1 diff)

trunk/wp-admin/edit-tags.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
+$tax = get_taxonomy( $taxnow );
 if ( !current_user_can( $tax->cap->manage_terms ) )
     wp_die( __( 'Cheatin’ uh?' ) );

trunk/wp-admin/menu.php

@@ -138 +138 @@
     }
 }
-unset($ptype, $ptype_obj, $ptype_class, $ptype_for_id, $ptype_menu_position, $menu_icon, $i);
+unset($ptype, $ptype_obj, $ptype_class, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax);
 
 $menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' );