Changes in trunk/wp-admin/includes/template.php [14933:15201]

File:

• trunk/wp-admin/includes/template.php (modified) (13 diffs)

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 ) {
@@ -1433 +1433 @@
         case 'author':
         ?>
-        <td <?php echo $attributes ?>><a href="edit.php?author=<?php the_author_meta('ID'); ?>"><?php the_author() ?></a></td>
+        <td <?php echo $attributes ?>><a href="edit.php?post_type=<?php echo $post->post_type; ?>&amp;author=<?php the_author_meta('ID'); ?>"><?php the_author() ?></a></td>
         <?php
         break;
@@ -1530 +1530 @@
     case 'cb':
         ?>
-        <th scope="row" class="check-column"><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /></th>
+        <th scope="row" class="check-column"><?php if ( current_user_can( $post_type_object->cap->edit_post, $page->ID ) ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></th>
         <?php
         break;
@@ -1623 +1623 @@
     case 'author':
         ?>
-        <td <?php echo $attributes ?>><a href="edit-pages.php?author=<?php the_author_meta('ID'); ?>"><?php the_author() ?></a></td>
+        <td <?php echo $attributes ?>><a href="edit.php?post_type=<?php echo $post_type; ?>&amp;author=<?php the_author_meta('ID'); ?>"><?php the_author() ?></a></td>
         <?php
         break;
@@ -2402 +2402 @@
     $r .= "\n\t\t<div class='submit'><input name='deletemeta[{$entry['meta_id']}]' type='submit' ";
     $r .= "class='delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce deletemeta' tabindex='6' value='". esc_attr__( 'Delete' ) ."' />";
-    $r .= "\n\t\t<input name='updatemeta' type='submit' tabindex='6' value='". esc_attr__( 'Update' ) ."' class='add:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$update_nonce updatemeta' /></div>";
+    $r .= "\n\t\t<input name='updatemeta' type='submit' tabindex='6' value='". esc_attr__( 'Update' ) ."' class='add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce updatemeta' /></div>";
     $r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false );
     $r .= "</td>";
@@ -2966 +2966 @@
  * Add settings fields to your section with add_settings_field()
  *
- * The $callback argument should be the name of a function that echos out any
+ * The $callback argument should be the name of a function that echoes out any
  * content you want to show at the top of the settings section before the actual
  * fields. It can output nothing if you want.
@@ -2973 +2973 @@
  *
  * @global $wp_settings_sections Storage array of all settings sections added to admin pages
-
+ *
  * @param string $id Slug-name to identify the section. Used in the 'id' attribute of tags.
  * @param string $title Formatted title of the section. Shown as the heading for the section.
- * @param string $callback Function that echo's out content for the section heading.
- * @param string $page The slug-name of the settings page on which to show the section (general, reading, writing, ...).
+ * @param string $callback Function that echos out any content at the top of the section (between heading and fields).
+ * @param string $page The slug-name of the settings page on which to show the section. Built-in pages include 'general', 'reading', 'writing', 'discussion', 'media', etc. Create your own using add_options_page();
  */
 function add_settings_section($id, $title, $callback, $page) {
@@ -3749 +3749 @@
             break;
         case 'ms-sites':
-            $per_page_label = __('Sites');
+            $per_page_label = _x( 'Sites', 'sites per page (screen options)' );
             break;
         case 'ms-users':
-            $per_page_label = __('Users');
+            $per_page_label = _x( 'Users', 'users per page (screen options)' );
             break;
         case 'edit-comments':
-            $per_page_label = __('Comments');
+            $per_page_label = _x( 'Comments', 'comments per page (screen options)' );
             break;
         case 'upload':
-            $per_page_label = __('Media items');
+            $per_page_label = _x( 'Media items', 'items per page (screen options)' );
             break;
         case 'edit-tags':
@@ -3765 +3765 @@
             break;
         case 'plugins':
-            $per_page_label = __('Plugins');
+            $per_page_label = _x( 'Plugins', 'plugins per page (screen options)' );
             break;
         default:
@@ -3901 +3901 @@
  */
 function set_current_screen( $id =  '' ) {
-    global $current_screen, $hook_suffix, $typenow;
+    global $current_screen, $hook_suffix, $typenow, $taxnow;
 
     if ( empty($id) ) {
@@ -3910 +3910 @@
         $current_screen = array('id' => $current_screen, 'base' => $current_screen);
     } else {
-        if ( false !== strpos($id, '-') )
+        $id = sanitize_key($id);
+        if ( false !== strpos($id, '-') ) {
             list( $id, $typenow ) = explode('-', $id, 2);
+            if ( is_taxonomy($typenow) ) {
+                $id = 'edit-tags';
+                $taxnow = $typenow;
+                $typenow = '';
+            }
+        }
         $current_screen = array('id' => $id, 'base' => $id);
     }
@@ -3933 +3940 @@
         $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;
     }