Changeset 15175

Timestamp:

06/08/2010 03:34:42 PM (13 years ago)

Author:

ryan

Message:

Make set_current_screen() taxonomy aware. Use current_screen when setting up table headers for edit-tags.php. see #13783

Location:

trunk/wp-admin

Files:

• admin.php (modified) (1 diff)
• edit-tags.php (modified) (2 diffs)
• includes/template.php (modified) (4 diffs)

trunk/wp-admin/admin.php

@@ -82 +82 @@
 
 if ( isset($_GET['post_type']) )
-    $typenow = sanitize_user($_GET['post_type'], true);
+    $typenow = sanitize_key($_GET['post_type']);
 else
     $typenow = '';
+
+if ( isset($_GET['taxonomy']) )
+    $taxnow = sanitize_key($_GET['taxonomy']);
+else
+    $taxnow = '';
 
 require(ABSPATH . 'wp-admin/menu.php');

trunk/wp-admin/edit-tags.php

@@ -297 +297 @@
 
 <div class="clear"></div>
-<?php $table_type = ('category' == $taxonomy ? 'categories' : 'edit-tags'); ?>
 <table class="widefat tag fixed" cellspacing="0">
     <thead>
     <tr>
-<?php print_column_headers($table_type); ?>
+<?php print_column_headers($current_screen); ?>
     </tr>
     </thead>
@@ -307 +306 @@
     <tfoot>
     <tr>
-<?php print_column_headers($table_type, false); ?>
+<?php print_column_headers($current_screen, false); ?>
     </tr>
     </tfoot>

trunk/wp-admin/includes/template.php

@@ -397 +397 @@
  */
 function _tag_row( $tag, $level, $taxonomy = 'post_tag' ) {
-        global $post_type;
+        global $post_type, $current_screen;
         static $row_class = '';
         $row_class = ($row_class == '' ? ' class="alternate"' : '');
@@ -423 +423 @@
 
 
-        $columns = get_column_headers('edit-tags');
-        $hidden = get_hidden_columns('edit-tags');
+        $columns = get_column_headers($current_screen);
+        $hidden = get_hidden_columns($current_screen);
         $default_term = get_option('default_' . $taxonomy);
         foreach ( $columns as $column_name => $column_display_name ) {
@@ -3901 +3901 @@
  */
 function set_current_screen( $id =  '' ) {
-    global $current_screen, $hook_suffix, $typenow;
+    global $current_screen, $hook_suffix, $typenow, $taxnow;
 
     if ( empty($id) ) {
@@ -3933 +3933 @@
         $current_screen->id = $typenow;
         $current_screen->post_type = $typenow;
+    } elseif ( 'edit-tags' == $current_screen->id ) {
+        if ( empty($taxnow) )
+            $taxnow = 'post_tag';
+        $current_screen->id = 'edit-' . $taxnow;
+        $current_screen->taxonomy = $taxnow;
     }