WordPress.org

Make WordPress Core

Changeset 16253


Ignore:
Timestamp:
11/09/10 03:28:09 (3 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/edit-tags.php

    r16222 r16253  
    99/** WordPress Administration Bootstrap */ 
    1010require_once('./admin.php'); 
     11$tax = get_taxonomy( $taxnow ); 
    1112if ( !current_user_can( $tax->cap->manage_terms ) ) 
    1213    wp_die( __( 'Cheatin’ uh?' ) ); 
  • trunk/wp-admin/menu.php

    r16251 r16253  
    138138    } 
    139139} 
    140 unset($ptype, $ptype_obj, $ptype_class, $ptype_for_id, $ptype_menu_position, $menu_icon, $i); 
     140unset($ptype, $ptype_obj, $ptype_class, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax); 
    141141 
    142142$menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' ); 
Note: See TracChangeset for help on using the changeset viewer.