<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12728] trunk/wp-admin: Merge edit-pages.php into edit.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12728">12728</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-15 16:58:36 +0000 (Fri, 15 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge edit-pages.php into edit.php. see <a href="http://trac.wordpress.org/ticket/9674">#9674</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadmineditlinkformphp">trunk/wp-admin/edit-link-form.php</a></li>
<li><a href="#trunkwpadmineditpostrowsphp">trunk/wp-admin/edit-post-rows.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminindexphp">trunk/wp-admin/index.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminplugininstallphp">trunk/wp-admin/plugin-install.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminpostnewphp">trunk/wp-admin/post-new.php</a></li>
<li><a href="#trunkwpadminpostphp">trunk/wp-admin/post.php</a></li>
<li><a href="#trunkwpadminthemeinstallphp">trunk/wp-admin/theme-install.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpadmineditpagesphp">trunk/wp-admin/edit-pages.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/admin-ajax.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -1003,8 +1003,11 @@
</span><span class="cx"> case 'autosave-generate-nonces' :
</span><span class="cx"> check_ajax_referer( 'autosave', 'autosavenonce' );
</span><span class="cx"> $ID = (int) $_POST['post_ID'];
</span><del>- $post_type = ( 'page' == $_POST['post_type'] ) ? 'page' : 'post';
- if ( current_user_can( "edit_{$post_type}", $ID ) )
</del><ins>+ $post_type = $_POST['post_type'];
+ $post_type_object = get_post_type_object($post_type);
+ if ( !$post_type_object )
+ die('0');
+ if ( current_user_can( $post_type_object->edit_cap, $ID ) )
</ins><span class="cx"> die( json_encode( array( 'updateNonce' => wp_create_nonce( "update-{$post_type}_{$ID}" ), 'deleteURL' => str_replace( '&amp;', '&', wp_nonce_url( admin_url( $post_type . '.php?action=trash&post=' . $ID ), "trash-{$post_type}_{$ID}" ) ) ) ) );
</span><span class="cx"> do_action('autosave_generate_nonces');
</span><span class="cx"> die('0');
</span></span></pre></div>
<a id="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/admin-header.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -29,21 +29,6 @@
</span><span class="cx"> wp_admin_css( 'css/ms' );
</span><span class="cx"> wp_enqueue_script('utils');
</span><span class="cx">
</span><del>-$hook_suffix = '';
-if ( isset($page_hook) )
- $hook_suffix = $page_hook;
-else if ( isset($plugin_page) )
- $hook_suffix = $plugin_page;
-else if ( isset($pagenow) )
- $hook_suffix = $pagenow;
-
-if ( isset($submenu_file) && (false !== $pos = strpos($submenu_file, 'post_type=')) )
- $typenow = substr($submenu_file, $pos + 10);
-elseif ( isset($parent_file) && (false !== $pos = strpos($parent_file, 'post_type=')) )
- $typenow = substr($parent_file, $pos + 10);
-else
- $typenow = '';
-
</del><span class="cx"> $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
</span><span class="cx"> ?>
</span><span class="cx"> <script type="text/javascript">
</span><span class="lines">@@ -119,16 +104,22 @@
</span><span class="cx"> <a href="<?php echo wp_logout_url() ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<?php favorite_actions($hook_suffix); ?>
</del><ins>+<?php favorite_actions($current_screen); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="wpbody">
</span><del>-<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
</del><ins>+<?php
+require(ABSPATH . 'wp-admin/menu-header.php');
</ins><span class="cx">
</span><ins>+$current_screen->parent_file = $parent_file;
+$current_screen->parent_base = preg_replace('/\?.*$/', '', $parent_file);
+$current_screen->parent_base = str_replace('.php', '', $current_screen->parent_base);
+?>
+
</ins><span class="cx"> <div id="wpbody-content">
</span><span class="cx"> <?php
</span><del>-screen_meta($hook_suffix);
</del><ins>+screen_meta($current_screen);
</ins><span class="cx">
</span><span class="cx"> do_action('admin_notices');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/admin.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -177,4 +177,43 @@
</span><span class="cx"> if ( !empty($_REQUEST['action']) )
</span><span class="cx"> do_action('admin_action_' . $_REQUEST['action']);
</span><span class="cx">
</span><ins>+$hook_suffix = '';
+if ( isset($page_hook) )
+ $hook_suffix = $page_hook;
+else if ( isset($plugin_page) )
+ $hook_suffix = $plugin_page;
+else if ( isset($pagenow) )
+ $hook_suffix = $pagenow;
+
+if ( isset($_GET['post_type']) )
+ $typenow = $_GET['post_type'];
+else
+ $typenow = '';
+// @todo validate typenow against post types.
+
+/**
+ * Global object containing info about the current screen.
+ */
+$current_screen = $hook_suffix;
+$current_screen = str_replace('.php', '', $current_screen);
+$current_screen = str_replace('-new', '', $current_screen);
+$current_screen = str_replace('-add', '', $current_screen);
+$current_screen = array('id' => $current_screen, 'base' => $current_screen);
+$current_screen = (object) $current_screen;
+if ( 'edit' == $current_screen->id ) {
+ if ( empty($typenow) )
+ $typenow = 'post';
+ $current_screen->id .= '-' . $typenow;
+ $current_screen->post_type = $typenow;
+} elseif ( 'post' == $current_screen->id ) {
+ if ( empty($typenow) )
+ $typenow = 'post';
+ $current_screen->id = $typenow;
+ $current_screen->post_type = $typenow;
+} else {
+ $typenow = '';
+}
+
+$current_screen = apply_filters('current_screen', $current_screen);
+
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/edit-form-advanced.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -142,6 +142,8 @@
</span><span class="cx"> do_action('do_meta_boxes', $post_type, 'advanced', $post);
</span><span class="cx"> do_action('do_meta_boxes', $post_type, 'side', $post);
</span><span class="cx">
</span><ins>+add_contextual_help($current_screen, drag_drop_help());
+
</ins><span class="cx"> require_once('admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditlinkformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-link-form.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-form.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/edit-link-form.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> do_action('do_meta_boxes', 'link', 'advanced', $link);
</span><span class="cx"> do_action('do_meta_boxes', 'link', 'side', $link);
</span><span class="cx">
</span><ins>+add_contextual_help($current_screen, drag_drop_help());
+
</ins><span class="cx"> require_once ('admin-header.php');
</span><span class="cx">
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadmineditpagesphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/edit-pages.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-pages.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/edit-pages.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -1,384 +0,0 @@
</span><del>-<?php
-/**
- * Edit Pages Administration Panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** WordPress Administration Bootstrap */
-require_once('admin.php');
-
-if ( !current_user_can('edit_pages') )
- wp_die(__('Cheatin&#8217; uh?'));
-
-// Handle bulk actions
-if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) || isset($_GET['bulk_edit']) ) {
- check_admin_referer('bulk-pages');
- $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
-
- if ( strpos($sendback, 'page.php') !== false )
- $sendback = admin_url('post-new.php?post_type=page');
-
- if ( isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
- $post_status = preg_replace('/[^a-z0-9_-]+/i', '', $_GET['post_status']);
- $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = %s", $post_status ) );
- $doaction = 'delete';
- } elseif ( ( $_GET['action'] != -1 || $_GET['action2'] != -1 ) && ( isset($_GET['post']) || isset($_GET['ids']) ) ) {
- $post_ids = isset($_GET['post']) ? array_map( 'intval', (array) $_GET['post'] ) : explode(',', $_GET['ids']);
- $doaction = ($_GET['action'] != -1) ? $_GET['action'] : $_GET['action2'];
- } else {
- wp_redirect( admin_url('edit-pages.php') );
- }
-
- switch ( $doaction ) {
- case 'trash':
- $trashed = 0;
- foreach( (array) $post_ids as $post_id ) {
- if ( !current_user_can('delete_page', $post_id) )
- wp_die( __('You are not allowed to move this page to the trash.') );
-
- if ( !wp_trash_post($post_id) )
- wp_die( __('Error in moving to trash...') );
-
- $trashed++;
- }
- $sendback = add_query_arg( array('trashed' => $trashed, 'ids' => join(',', $post_ids)), $sendback );
- break;
- case 'untrash':
- $untrashed = 0;
- foreach( (array) $post_ids as $post_id ) {
- if ( !current_user_can('delete_page', $post_id) )
- wp_die( __('You are not allowed to restore this page from the trash.') );
-
- if ( !wp_untrash_post($post_id) )
- wp_die( __('Error in restoring from trash...') );
-
- $untrashed++;
- }
- $sendback = add_query_arg('untrashed', $untrashed, $sendback);
- break;
- case 'delete':
- $deleted = 0;
- foreach( (array) $post_ids as $post_id ) {
- $post_del = & get_post($post_id);
-
- if ( !current_user_can('delete_page', $post_id) )
- wp_die( __('You are not allowed to delete this page.') );
-
- if ( $post_del->post_type == 'attachment' ) {
- if ( ! wp_delete_attachment($post_id) )
- wp_die( __('Error in deleting...') );
- } else {
- if ( !wp_delete_post($post_id) )
- wp_die( __('Error in deleting...') );
- }
- $deleted++;
- }
- $sendback = add_query_arg('deleted', $deleted, $sendback);
- break;
- case 'edit':
- $_GET['post_type'] = 'page';
- $done = bulk_edit_posts($_GET);
-
- if ( is_array($done) ) {
- $done['updated'] = count( $done['updated'] );
- $done['skipped'] = count( $done['skipped'] );
- $done['locked'] = count( $done['locked'] );
- $sendback = add_query_arg( $done, $sendback );
- }
- break;
- }
-
- if ( isset($_GET['action']) )
- $sendback = remove_query_arg( array('action', 'action2', 'post_parent', 'page_template', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view', 'post_type'), $sendback );
-
- wp_redirect($sendback);
- exit();
-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
- wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
- exit;
-}
-
-if ( empty($title) )
- $title = __('Edit Pages');
-$parent_file = 'edit-pages.php';
-wp_enqueue_script('inline-edit-post');
-
-$post_stati = array( // array( adj, noun )
- 'publish' => array(_x('Published', 'page'), __('Published pages'), _nx_noop('Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>', 'page')),
- 'future' => array(_x('Scheduled', 'page'), __('Scheduled pages'), _nx_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>', 'page')),
- 'pending' => array(_x('Pending Review', 'page'), __('Pending pages'), _nx_noop('Pending Review <span class="count">(%s)</span>', 'Pending Review <span class="count">(%s)</span>', 'page')),
- 'draft' => array(_x('Draft', 'page'), _x('Drafts', 'manage posts header'), _nx_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>', 'page')),
- 'private' => array(_x('Private', 'page'), __('Private pages'), _nx_noop('Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>', 'page')),
- 'trash' => array(_x('Trash', 'page'), __('Trash pages'), _nx_noop('Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>', 'page'))
- );
-
-if ( !EMPTY_TRASH_DAYS )
- unset($post_stati['trash']);
-
-$post_stati = apply_filters('page_stati', $post_stati);
-
-$query = array('post_type' => 'page', 'orderby' => 'menu_order title',
- 'posts_per_page' => -1, 'posts_per_archive_page' => -1, 'order' => 'asc');
-
-$post_status_label = __('Pages');
-if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) {
- $post_status_label = $post_stati[$_GET['post_status']][1];
- $query['post_status'] = $_GET['post_status'];
- $query['perm'] = 'readable';
-}
-
-$query = apply_filters('manage_pages_query', $query);
-wp($query);
-
-if ( is_singular() ) {
- wp_enqueue_script( 'admin-comments' );
- enqueue_comment_hotkeys_js();
-}
-
-require_once('admin-header.php'); ?>
-
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?> <a href="post-new.php?post_type=page" class="button add-new-h2"><?php echo esc_html_x('Add New', 'page'); ?></a> <?php
-if ( isset($_GET['s']) && $_GET['s'] )
- printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( get_search_query() ) ); ?>
-</h2>
-
-<?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) || isset($_GET['trashed']) || isset($_GET['untrashed']) ) { ?>
-<div id="message" class="updated"><p>
-<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) {
- printf( _n( '%s page updated.', '%s pages updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) );
- unset($_GET['updated']);
-}
-if ( isset($_GET['skipped']) && (int) $_GET['skipped'] ) {
- printf( _n( '%s page not updated, invalid parent page specified.', '%s pages not updated, invalid parent page specified.', $_GET['skipped'] ), number_format_i18n( $_GET['skipped'] ) );
- unset($_GET['skipped']);
-}
-if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
- printf( _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['skipped'] ) );
- unset($_GET['locked']);
-}
-if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
- printf( _n( 'Page permanently deleted.', '%s pages permanently deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
- unset($_GET['deleted']);
-}
-if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) {
- printf( _n( 'Page moved to the trash.', '%s pages moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
- $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
- echo ' <a href="' . esc_url( wp_nonce_url( "edit-pages.php?doaction=undo&action=untrash&ids=$ids", "bulk-pages" ) ) . '">' . __('Undo') . '</a><br />';
- unset($_GET['trashed']);
-}
-if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
- printf( _n( 'Page restored from the trash.', '%s pages restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
- unset($_GET['untrashed']);
-}
-$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed'), $_SERVER['REQUEST_URI'] );
-?>
-</p></div>
-<?php } ?>
-
-<?php if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
-<div id="message" class="updated"><p><strong><?php _e('Your page has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View page'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit page'); ?></a></p></div>
-<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
-endif; ?>
-
-<form id="posts-filter" action="<?php echo admin_url('edit-pages.php'); ?>" method="get">
-<ul class="subsubsub">
-<?php
-
-$avail_post_stati = get_available_post_statuses('page');
-if ( empty($locked_post_status) ) :
-$status_links = array();
-$num_posts = wp_count_posts('page', 'readable');
-$total_posts = array_sum( (array) $num_posts ) - $num_posts->trash;
-$class = empty($_GET['post_status']) ? ' class="current"' : '';
-$status_links[] = "<li><a href='edit-pages.php'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'pages' ), number_format_i18n( $total_posts ) ) . '</a>';
-foreach ( $post_stati as $status => $label ) {
- $class = '';
-
- if ( !in_array($status, $avail_post_stati) || $num_posts->$status <= 0 )
- continue;
-
- if ( isset( $_GET['post_status'] ) && $status == $_GET['post_status'] )
- $class = ' class="current"';
-
- $status_links[] = "<li><a href='edit-pages.php?post_status=$status'$class>" . sprintf( _nx( $label[2][0], $label[2][1], $num_posts->$status, $label[2][2] ), number_format_i18n( $num_posts->$status ) ) . '</a>';
-}
-echo implode( " |</li>\n", $status_links ) . '</li>';
-unset($status_links);
-endif;
-?>
-</ul>
-
-<p class="search-box">
- <label class="screen-reader-text" for="page-search-input"><?php _e( 'Search Pages' ); ?>:</label>
- <input type="text" id="page-search-input" name="s" value="<?php _admin_search_query(); ?>" />
- <input type="submit" value="<?php esc_attr_e( 'Search Pages' ); ?>" class="button" />
-</p>
-
-<input type="hidden" name="post_status" class="post_status_page" value="<?php echo !empty($_GET['post_status']) ? esc_attr($_GET['post_status']) : 'all'; ?>" />
-
-<?php if ($posts) { ?>
-
-<div class="tablenav">
-
-<?php
-$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
-if ( empty($pagenum) )
- $pagenum = 1;
-$per_page = (int) get_user_option( 'edit_pages_per_page' );
-if ( empty( $per_page ) || $per_page < 1 )
- $per_page = 20;
-$per_page = apply_filters( 'edit_pages_per_page', $per_page );
-
-$num_pages = ceil($wp_query->post_count / $per_page);
-$page_links = paginate_links( array(
- 'base' => add_query_arg( 'pagenum', '%#%' ),
- 'format' => '',
- 'prev_text' => __('&laquo;'),
- 'next_text' => __('&raquo;'),
- 'total' => $num_pages,
- 'current' => $pagenum
-));
-
-$is_trash = isset($_GET['post_status']) && $_GET['post_status'] == 'trash';
-
-if ( $page_links ) : ?>
-<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
- number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
- number_format_i18n( min( $pagenum * $per_page, $wp_query->post_count ) ),
- number_format_i18n( $wp_query->post_count ),
- $page_links
-); echo $page_links_text; ?></div>
-<?php endif; ?>
-
-<div class="alignleft actions">
-<select name="action">
-<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<?php if ( $is_trash ) { ?>
-<option value="untrash"><?php _e('Restore'); ?></option>
-<?php } else { ?>
-<option value="edit"><?php _e('Edit'); ?></option>
-<?php } if ( $is_trash || !EMPTY_TRASH_DAYS ) { ?>
-<option value="delete"><?php _e('Delete Permanently'); ?></option>
-<?php } else { ?>
-<option value="trash"><?php _e('Move to Trash'); ?></option>
-<?php } ?>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
-<?php wp_nonce_field('bulk-pages'); ?>
-<?php if ( $is_trash ) { ?>
-<input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
-<?php } ?>
-</div>
-
-<br class="clear" />
-</div>
-
-<div class="clear"></div>
-
-<table class="widefat page fixed" cellspacing="0">
- <thead>
- <tr>
-<?php print_column_headers('edit-pages'); ?>
- </tr>
- </thead>
-
- <tfoot>
- <tr>
-<?php print_column_headers('edit-pages', false); ?>
- </tr>
- </tfoot>
-
- <tbody>
- <?php page_rows($posts, $pagenum, $per_page); ?>
- </tbody>
-</table>
-
-<div class="tablenav">
-<?php
-if ( $page_links )
- echo "<div class='tablenav-pages'>$page_links_text</div>";
-?>
-
-<div class="alignleft actions">
-<select name="action2">
-<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<?php if ( $is_trash ) { ?>
-<option value="untrash"><?php _e('Restore'); ?></option>
-<?php } else { ?>
-<option value="edit"><?php _e('Edit'); ?></option>
-<?php } if ( $is_trash || !EMPTY_TRASH_DAYS ) { ?>
-<option value="delete"><?php _e('Delete Permanently'); ?></option>
-<?php } else { ?>
-<option value="trash"><?php _e('Move to Trash'); ?></option>
-<?php } ?>
-</select>
-<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-<?php if ( $is_trash ) { ?>
-<input type="submit" name="delete_all2" id="delete_all2" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
-<?php } ?>
-</div>
-
-<br class="clear" />
-</div>
-
-<?php } else { ?>
-<div class="clear"></div>
-<p><?php _e('No pages found.') ?></p>
-<?php
-} // end if ($posts)
-?>
-
-</form>
-
-<?php inline_edit_row( 'page' ) ?>
-
-<div id="ajax-response"></div>
-
-
-<?php
-
-if ( 1 == count($posts) && is_singular() ) :
-
- $comments = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved != 'spam' ORDER BY comment_date", $id) );
- if ( $comments ) :
- // Make sure comments, post, and post_author are cached
- update_comment_cache($comments);
- $post = get_post($id);
- $authordata = get_userdata($post->post_author);
- ?>
-
-<br class="clear" />
-
-<table class="widefat" cellspacing="0">
-<thead>
- <tr>
- <th scope="col" class="column-comment">
- <?php /* translators: column name */ echo _x('Comment', 'column name') ?>
- </th>
- <th scope="col" class="column-author"><?php _e('Author') ?></th>
- <th scope="col" class="column-date"><?php _e('Submitted') ?></th>
- </tr>
-</thead>
-<tbody id="the-comment-list" class="list:comment">
-<?php
- foreach ($comments as $comment)
- _wp_comment_row( $comment->comment_ID, 'single', false, false );
-?>
-</tbody>
-</table>
-
-<?php
-wp_comment_reply();
-endif; // comments
-endif; // posts;
-
-?>
-
-</div>
-
-<?php
-include('admin-footer.php');
</del></span></pre></div>
<a id="trunkwpadmineditpostrowsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-post-rows.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-post-rows.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/edit-post-rows.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -13,17 +13,22 @@
</span><span class="cx"> <table class="widefat post fixed" cellspacing="0">
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><del>-<?php print_column_headers('edit'); ?>
</del><ins>+<?php print_column_headers( $current_screen ); ?>
</ins><span class="cx"> </tr>
</span><span class="cx"> </thead>
</span><span class="cx">
</span><span class="cx"> <tfoot>
</span><span class="cx"> <tr>
</span><del>-<?php print_column_headers('edit', false); ?>
</del><ins>+<?php print_column_headers($current_screen, false); ?>
</ins><span class="cx"> </tr>
</span><span class="cx"> </tfoot>
</span><span class="cx">
</span><span class="cx"> <tbody>
</span><del>-<?php post_rows(); ?>
</del><ins>+<?php
+if ( $post_type_object->hierarchical )
+ page_rows($posts, $pagenum, $per_page);
+else
+ post_rows();
+?>
</ins><span class="cx"> </tbody>
</span><span class="cx"> </table>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/edit.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -20,13 +20,14 @@
</span><span class="cx"> unset( $_redirect );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( isset($_GET['post_type']) && in_array( $_GET['post_type'], get_post_types( array('_show' => true) ) ) )
</del><ins>+if ( isset($_GET['post_type']) && ( in_array( $_GET['post_type'], get_post_types( array('_show' => true ) ) ) || in_array( $_GET['post_type'], get_post_types( array('_builtin' => true ) ) ) ) )
</ins><span class="cx"> $post_type = $_GET['post_type'];
</span><span class="cx"> else
</span><span class="cx"> $post_type = 'post';
</span><span class="cx"> $_GET['post_type'] = $post_type;
</span><span class="cx">
</span><span class="cx"> $post_type_object = get_post_type_object($post_type);
</span><ins>+$post_type_cap = $post_type_object->capability_type;
</ins><span class="cx">
</span><span class="cx"> if ( 'post' != $post_type ) {
</span><span class="cx"> $parent_file = "edit.php?post_type=$post_type";
</span><span class="lines">@@ -38,6 +39,16 @@
</span><span class="cx"> $post_new_file = 'post-new.php';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+$pagenum = isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 0;
+if ( empty($pagenum) )
+ $pagenum = 1;
+$per_page = 'edit_' . $post_type . '_per_page';
+$per_page = (int) get_user_option( $per_page );
+if ( empty( $per_page ) || $per_page < 1 )
+ $per_page = 15;
+// @todo filter based on type
+$per_page = apply_filters( 'edit_posts_per_page', $per_page );
+
</ins><span class="cx"> // Handle bulk actions
</span><span class="cx"> if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) || isset($_GET['bulk_edit']) ) {
</span><span class="cx"> check_admin_referer('bulk-posts');
</span><span class="lines">@@ -61,8 +72,8 @@
</span><span class="cx"> case 'trash':
</span><span class="cx"> $trashed = 0;
</span><span class="cx"> foreach( (array) $post_ids as $post_id ) {
</span><del>- if ( !current_user_can('delete_post', $post_id) )
- wp_die( __('You are not allowed to move this post to the trash.') );
</del><ins>+ if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
+ wp_die( __('You are not allowed to move this item to the trash.') );
</ins><span class="cx">
</span><span class="cx"> if ( !wp_trash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in moving to trash...') );
</span><span class="lines">@@ -74,8 +85,8 @@
</span><span class="cx"> case 'untrash':
</span><span class="cx"> $untrashed = 0;
</span><span class="cx"> foreach( (array) $post_ids as $post_id ) {
</span><del>- if ( !current_user_can('delete_post', $post_id) )
- wp_die( __('You are not allowed to restore this post from the trash.') );
</del><ins>+ if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
+ wp_die( __('You are not allowed to restore this item from the trash.') );
</ins><span class="cx">
</span><span class="cx"> if ( !wp_untrash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in restoring from trash...') );
</span><span class="lines">@@ -89,8 +100,8 @@
</span><span class="cx"> foreach( (array) $post_ids as $post_id ) {
</span><span class="cx"> $post_del = & get_post($post_id);
</span><span class="cx">
</span><del>- if ( !current_user_can('delete_post', $post_id) )
- wp_die( __('You are not allowed to delete this post.') );
</del><ins>+ if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
+ wp_die( __('You are not allowed to delete this item.') );
</ins><span class="cx">
</span><span class="cx"> if ( $post_del->post_type == 'attachment' ) {
</span><span class="cx"> if ( ! wp_delete_attachment($post_id) )
</span><span class="lines">@@ -130,7 +141,7 @@
</span><span class="cx"> wp_enqueue_script('inline-edit-post');
</span><span class="cx">
</span><span class="cx"> $user_posts = false;
</span><del>-if ( !current_user_can('edit_others_posts') ) {
</del><ins>+if ( !current_user_can('edit_others_' . $post_type_cap . 's') ) {
</ins><span class="cx"> $user_posts_count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(1) FROM $wpdb->posts WHERE post_type = '%s' AND post_status != 'trash' AND post_author = %d", $post_type, $current_user->ID) );
</span><span class="cx"> $user_posts = true;
</span><span class="cx"> if ( $user_posts_count && empty($_GET['post_status']) && empty($_GET['all_posts']) && empty($_GET['author']) )
</span><span class="lines">@@ -139,11 +150,13 @@
</span><span class="cx">
</span><span class="cx"> $avail_post_stati = wp_edit_posts_query();
</span><span class="cx">
</span><ins>+if ( $post_type_object->hierarchical )
+ $num_pages = ceil($wp_query->post_count / $per_page);
+else
+ $num_pages = $wp_query->max_num_pages;
+
</ins><span class="cx"> require_once('admin-header.php');
</span><span class="cx">
</span><del>-if ( !isset( $_GET['paged'] ) )
- $_GET['paged'] = 1;
-
</del><span class="cx"> if ( empty($_GET['mode']) )
</span><span class="cx"> $mode = 'list';
</span><span class="cx"> else
</span><span class="lines">@@ -158,7 +171,7 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
</span><del>-<div id="message" class="updated"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div>
</del><ins>+<div id="message" class="updated"><p><strong><?php _e('This has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div>
</ins><span class="cx"> <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
</span><span class="cx"> endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -173,24 +186,24 @@
</span><span class="cx"> unset($_GET['skipped']);
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
</span><del>- printf( _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) );
</del><ins>+ printf( _n( '%s item not updated, somebody is editing it.', '%s items not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) );
</ins><span class="cx"> unset($_GET['locked']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
</span><del>- printf( _n( 'Post permanently deleted.', '%s posts permanently deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
</del><ins>+ printf( _n( 'Item permanently deleted.', '%s items permanently deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
</ins><span class="cx"> unset($_GET['deleted']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) {
</span><del>- printf( _n( 'Post moved to the trash.', '%s posts moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
</del><ins>+ printf( _n( 'Item moved to the trash.', '%s items moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
</ins><span class="cx"> $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
</span><span class="cx"> echo ' <a href="' . esc_url( wp_nonce_url( "edit.php?doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) ) . '">' . __('Undo') . '</a><br />';
</span><span class="cx"> unset($_GET['trashed']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
</span><del>- printf( _n( 'Post restored from the trash.', '%s posts restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
</del><ins>+ printf( _n( 'Item restored from the trash.', '%s items restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
</ins><span class="cx"> unset($_GET['undeleted']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -212,7 +225,7 @@
</span><span class="cx"> if ( $user_posts ) {
</span><span class="cx"> if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user->ID ) )
</span><span class="cx"> $class = ' class="current"';
</span><del>- $status_links[] = "<li><a href='edit.php?author=$current_user->ID'$class>" . sprintf( _nx( 'My Posts <span class="count">(%s)</span>', 'My Posts <span class="count">(%s)</span>', $user_posts_count, 'posts' ), number_format_i18n( $user_posts_count ) ) . '</a>';
</del><ins>+ $status_links[] = "<li><a href='edit.php?author=$current_user->ID'$class>" . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $user_posts_count, 'posts' ), number_format_i18n( $user_posts_count ) ) . '</a>';
</ins><span class="cx"> $allposts = '?all_posts=1';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -261,8 +274,8 @@
</span><span class="cx"> 'format' => '',
</span><span class="cx"> 'prev_text' => __('&laquo;'),
</span><span class="cx"> 'next_text' => __('&raquo;'),
</span><del>- 'total' => $wp_query->max_num_pages,
- 'current' => $_GET['paged']
</del><ins>+ 'total' => $num_pages,
+ 'current' => $pagenum
</ins><span class="cx"> ));
</span><span class="cx">
</span><span class="cx"> $is_trash = isset($_GET['post_status']) && $_GET['post_status'] == 'trash';
</span><span class="lines">@@ -318,23 +331,25 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>-$dropdown_options = array('show_option_all' => __('View all categories'), 'hide_empty' => 0, 'hierarchical' => 1,
- 'show_count' => 0, 'orderby' => 'name', 'selected' => $cat);
-wp_dropdown_categories($dropdown_options);
-do_action('restrict_manage_posts');
</del><ins>+if ( is_object_in_taxonomy($post_type, 'category') ) {
+ $dropdown_options = array('show_option_all' => __('View all categories'), 'hide_empty' => 0, 'hierarchical' => 1,
+ 'show_count' => 0, 'orderby' => 'name', 'selected' => $cat);
+ wp_dropdown_categories($dropdown_options);
+ do_action('restrict_manage_posts');
+}
</ins><span class="cx"> ?>
</span><span class="cx"> <input type="submit" id="post-query-submit" value="<?php esc_attr_e('Filter'); ?>" class="button-secondary" />
</span><span class="cx"> <?php }
</span><span class="cx">
</span><del>-if ( $is_trash && current_user_can('edit_others_posts') ) { ?>
</del><ins>+if ( $is_trash && current_user_can('edit_others_' . $post_type_cap .'s') ) { ?>
</ins><span class="cx"> <input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php if ( $page_links ) { ?>
</span><span class="cx"> <div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
</span><del>- number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ),
- number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ),
</del><ins>+ number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
+ number_format_i18n( min( $pagenum * $per_page, $wp_query->found_posts ) ),
</ins><span class="cx"> number_format_i18n( $wp_query->found_posts ),
</span><span class="cx"> $page_links
</span><span class="cx"> ); echo $page_links_text; ?></div>
</span><span class="lines">@@ -373,7 +388,7 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </select>
</span><span class="cx"> <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
</span><del>-<?php if ( $is_trash && current_user_can('edit_others_posts') ) { ?>
</del><ins>+<?php if ( $is_trash && current_user_can('edit_others_' . $post_type_cap . 's') ) { ?>
</ins><span class="cx"> <input type="submit" name="delete_all2" id="delete_all2" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
</span><span class="cx"> <?php } ?>
</span><span class="cx"> <br class="clear" />
</span><span class="lines">@@ -393,7 +408,7 @@
</span><span class="cx">
</span><span class="cx"> </form>
</span><span class="cx">
</span><del>-<?php inline_edit_row( 'post' ); ?>
</del><ins>+<?php inline_edit_row( $current_screen ); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="ajax-response"></div>
</span><span class="cx"> <br class="clear" />
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/includes/misc.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -410,7 +410,6 @@
</span><span class="cx">
</span><span class="cx"> switch ( $map_option ) {
</span><span class="cx"> case 'edit_per_page':
</span><del>- case 'edit_pages_per_page':
</del><span class="cx"> case 'edit_comments_per_page':
</span><span class="cx"> case 'upload_per_page':
</span><span class="cx"> case 'categories_per_page':
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/includes/post.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -819,10 +819,11 @@
</span><span class="cx"> $q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
</span><span class="cx"> $post_stati = get_post_stati();
</span><span class="cx">
</span><del>- if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types( array('_show' => true) ) ) )
</del><ins>+ if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) )
</ins><span class="cx"> $post_type = $q['post_type'];
</span><span class="cx"> else
</span><span class="cx"> $post_type = 'post';
</span><ins>+ $post_type_object = get_post_type_object($post_type);
</ins><span class="cx">
</span><span class="cx"> $avail_post_stati = get_available_post_statuses($post_type);
</span><span class="cx">
</span><span class="lines">@@ -842,17 +843,25 @@
</span><span class="cx"> $orderby = 'date';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( 'post' != $post_type )
- $per_page = 'edit_' . $post_type . '_per_page';
- else
- $per_page = 'edit_per_page';
- $posts_per_page = (int) get_user_option( 'edit_per_page' );
</del><ins>+ $per_page = 'edit_' . $post_type . '_per_page';
+ $posts_per_page = (int) get_user_option( $per_page );
</ins><span class="cx"> if ( empty( $posts_per_page ) || $posts_per_page < 1 )
</span><span class="cx"> $posts_per_page = 15;
</span><del>- $posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page );
</del><ins>+ $posts_per_page = apply_filters( $per_page, $posts_per_page );
</ins><span class="cx">
</span><del>- wp( compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page') );
</del><span class="cx">
</span><ins>+ $query = compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page');
+
+ // Hierarchical types require special args.
+ if ( $post_type_object->hierarchical ) {
+ $query['orderby'] = 'menu_order title';
+ $query['order'] = 'asc';
+ $query['posts_per_page'] = -1;
+ $query['posts_per_archive_page'] = -1;
+ }
+
+ wp( $query );
+
</ins><span class="cx"> return $avail_post_stati;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/includes/template.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -748,22 +748,26 @@
</span><span class="cx"> *
</span><span class="cx"> * @return unknown
</span><span class="cx"> */
</span><del>-function wp_manage_posts_columns() {
- global $typenow;
</del><ins>+function wp_manage_posts_columns( $screen = '') {
+ if ( empty($screen) )
+ $post_type = 'post';
+ else
+ $post_type = $screen->post_type;
</ins><span class="cx">
</span><span class="cx"> $posts_columns = array();
</span><span class="cx"> $posts_columns['cb'] = '<input type="checkbox" />';
</span><span class="cx"> /* translators: manage posts column name */
</span><del>- $posts_columns['title'] = _x('Post', 'column name');
</del><ins>+ $posts_columns['title'] = _x('Title', 'column name');
</ins><span class="cx"> $posts_columns['author'] = __('Author');
</span><del>- if ( empty($typenow) || is_object_in_taxonomy($typenow, 'category') )
</del><ins>+ if ( empty($post_type) || is_object_in_taxonomy($post_type, 'category') )
</ins><span class="cx"> $posts_columns['categories'] = __('Categories');
</span><del>- if ( empty($typenow) || is_object_in_taxonomy($typenow, 'category') )
</del><ins>+ if ( empty($post_type) || is_object_in_taxonomy($post_type, 'category') )
</ins><span class="cx"> $posts_columns['tags'] = __('Tags');
</span><span class="cx"> $post_status = !empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
</span><del>- if ( !in_array( $post_status, array('pending', 'draft', 'future') ) && ( empty($typenow) || post_type_supports($typenow, 'comments') ) )
</del><ins>+ if ( !in_array( $post_status, array('pending', 'draft', 'future') ) && ( empty($post_type) || post_type_supports($post_type, 'comments') ) )
</ins><span class="cx"> $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="images/comment-grey-bubble.png" /></div>';
</span><span class="cx"> $posts_columns['date'] = __('Date');
</span><ins>+ // @todo filter per type
</ins><span class="cx"> $posts_columns = apply_filters('manage_posts_columns', $posts_columns);
</span><span class="cx">
</span><span class="cx"> return $posts_columns;
</span><span class="lines">@@ -804,17 +808,7 @@
</span><span class="cx"> * @return unknown
</span><span class="cx"> */
</span><span class="cx"> function wp_manage_pages_columns() {
</span><del>- $posts_columns = array();
- $posts_columns['cb'] = '<input type="checkbox" />';
- $posts_columns['title'] = __('Title');
- $posts_columns['author'] = __('Author');
- $post_status = !empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
- if ( !in_array( $post_status, array('pending', 'draft', 'future') ) )
- $posts_columns['comments'] = '<div class="vers"><img alt="" src="images/comment-grey-bubble.png" /></div>';
- $posts_columns['date'] = __('Date');
- $posts_columns = apply_filters('manage_pages_columns', $posts_columns);
-
- return $posts_columns;
</del><ins>+ return wp_manage_posts_columns();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -822,33 +816,28 @@
</span><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> *
</span><del>- * @param unknown_type $page
</del><ins>+ * @param unknown_type $screen
</ins><span class="cx"> * @return unknown
</span><span class="cx"> */
</span><del>-function get_column_headers($page) {
</del><ins>+function get_column_headers($screen) {
</ins><span class="cx"> global $_wp_column_headers;
</span><span class="cx">
</span><span class="cx"> if ( !isset($_wp_column_headers) )
</span><span class="cx"> $_wp_column_headers = array();
</span><span class="cx">
</span><del>- $map_screen = $page;
- $type = str_replace('edit-', '', $map_screen);
- if ( in_array($type, get_post_types()) )
- $map_screen = 'edit';
</del><ins>+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
</ins><span class="cx">
</span><span class="cx"> // Store in static to avoid running filters on each call
</span><del>- if ( isset($_wp_column_headers[$page]) )
- return $_wp_column_headers[$page];
</del><ins>+ if ( isset($_wp_column_headers[$screen->id]) )
+ return $_wp_column_headers[$screen->id];
</ins><span class="cx">
</span><del>- switch ($map_screen) {
</del><ins>+ switch ($screen->base) {
</ins><span class="cx"> case 'edit':
</span><del>- $_wp_column_headers[$page] = wp_manage_posts_columns();
</del><ins>+ $_wp_column_headers[$screen->id] = wp_manage_posts_columns( $screen );
</ins><span class="cx"> break;
</span><del>- case 'edit-pages':
- $_wp_column_headers[$page] = wp_manage_pages_columns();
- break;
</del><span class="cx"> case 'edit-comments':
</span><del>- $_wp_column_headers[$page] = array(
</del><ins>+ $_wp_column_headers[$screen->id] = array(
</ins><span class="cx"> 'cb' => '<input type="checkbox" />',
</span><span class="cx"> 'author' => __('Author'),
</span><span class="cx"> /* translators: column name */
</span><span class="lines">@@ -859,7 +848,7 @@
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> case 'link-manager':
</span><del>- $_wp_column_headers[$page] = array(
</del><ins>+ $_wp_column_headers[$screen->id] = array(
</ins><span class="cx"> 'cb' => '<input type="checkbox" />',
</span><span class="cx"> 'name' => __('Name'),
</span><span class="cx"> 'url' => __('URL'),
</span><span class="lines">@@ -871,10 +860,10 @@
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> case 'upload':
</span><del>- $_wp_column_headers[$page] = wp_manage_media_columns();
</del><ins>+ $_wp_column_headers[$screen->id] = wp_manage_media_columns();
</ins><span class="cx"> break;
</span><span class="cx"> case 'categories':
</span><del>- $_wp_column_headers[$page] = array(
</del><ins>+ $_wp_column_headers[$screen->id] = array(
</ins><span class="cx"> 'cb' => '<input type="checkbox" />',
</span><span class="cx"> 'name' => __('Name'),
</span><span class="cx"> 'description' => __('Description'),
</span><span class="lines">@@ -884,7 +873,7 @@
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> case 'edit-link-categories':
</span><del>- $_wp_column_headers[$page] = array(
</del><ins>+ $_wp_column_headers[$screen->id] = array(
</ins><span class="cx"> 'cb' => '<input type="checkbox" />',
</span><span class="cx"> 'name' => __('Name'),
</span><span class="cx"> 'description' => __('Description'),
</span><span class="lines">@@ -894,7 +883,7 @@
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> case 'edit-tags':
</span><del>- $_wp_column_headers[$page] = array(
</del><ins>+ $_wp_column_headers[$screen->id] = array(
</ins><span class="cx"> 'cb' => '<input type="checkbox" />',
</span><span class="cx"> 'name' => __('Name'),
</span><span class="cx"> 'description' => __('Description'),
</span><span class="lines">@@ -904,7 +893,7 @@
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> case 'users':
</span><del>- $_wp_column_headers[$page] = array(
</del><ins>+ $_wp_column_headers[$screen->id] = array(
</ins><span class="cx"> 'cb' => '<input type="checkbox" />',
</span><span class="cx"> 'username' => __('Username'),
</span><span class="cx"> 'name' => __('Name'),
</span><span class="lines">@@ -914,11 +903,11 @@
</span><span class="cx"> );
</span><span class="cx"> break;
</span><span class="cx"> default :
</span><del>- $_wp_column_headers[$page] = array();
</del><ins>+ $_wp_column_headers[$screen->id] = array();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $_wp_column_headers[$page] = apply_filters('manage_' . $page . '_columns', $_wp_column_headers[$page]);
- return $_wp_column_headers[$page];
</del><ins>+ $_wp_column_headers[$screen->id] = apply_filters('manage_' . $screen->id . '_columns', $_wp_column_headers[$screen->id]);
+ return $_wp_column_headers[$screen->id];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -926,13 +915,15 @@
</span><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> *
</span><del>- * @param unknown_type $type
</del><ins>+ * @param unknown_type $screen
</ins><span class="cx"> * @param unknown_type $id
</span><span class="cx"> */
</span><del>-function print_column_headers( $type, $id = true ) {
- $type = str_replace('.php', '', $type);
- $columns = get_column_headers( $type );
- $hidden = get_hidden_columns($type);
</del><ins>+function print_column_headers( $screen, $id = true ) {
+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
+
+ $columns = get_column_headers( $screen );
+ $hidden = get_hidden_columns($screen);
</ins><span class="cx"> $styles = array();
</span><span class="cx">
</span><span class="cx"> foreach ( $columns as $column_key => $column_display_name ) {
</span><span class="lines">@@ -951,8 +942,8 @@
</span><span class="cx"> if ( in_array($column_key, $hidden) )
</span><span class="cx"> $style = 'display:none;';
</span><span class="cx">
</span><del>- if ( isset($styles[$type]) && isset($styles[$type][$column_key]) )
- $style .= ' ' . $styles[$type][$column_key];
</del><ins>+ if ( isset($styles[$screen->id]) && isset($styles[$screen->id][$column_key]) )
+ $style .= ' ' . $styles[$screen>id][$column_key];
</ins><span class="cx"> $style = ' style="' . $style . '"';
</span><span class="cx"> ?>
</span><span class="cx"> <th scope="col" <?php echo $id ? "id=\"$column_key\"" : ""; echo $class; echo $style; ?>><?php echo $column_display_name; ?></th>
</span><span class="lines">@@ -971,10 +962,13 @@
</span><span class="cx"> function register_column_headers($screen, $columns) {
</span><span class="cx"> global $_wp_column_headers;
</span><span class="cx">
</span><ins>+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
+
</ins><span class="cx"> if ( !isset($_wp_column_headers) )
</span><span class="cx"> $_wp_column_headers = array();
</span><span class="cx">
</span><del>- $_wp_column_headers[$screen] = $columns;
</del><ins>+ $_wp_column_headers[$screen->id] = $columns;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -982,11 +976,13 @@
</span><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> *
</span><del>- * @param unknown_type $page
</del><ins>+ * @param unknown_type $screen
</ins><span class="cx"> */
</span><del>-function get_hidden_columns($page) {
- $page = str_replace('.php', '', $page);
- return (array) get_user_option( 'manage-' . $page . '-columns-hidden' );
</del><ins>+function get_hidden_columns($screen) {
+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
+
+ return (array) get_user_option( 'manage-' . $screen->id. '-columns-hidden' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -998,23 +994,23 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $type 'post' or 'page'
</span><span class="cx"> */
</span><del>-function inline_edit_row( $type ) {
</del><ins>+function inline_edit_row( $screen ) {
</ins><span class="cx"> global $current_user, $mode;
</span><span class="cx">
</span><del>- $is_page = 'page' == $type;
- if ( $is_page ) {
- $screen = 'edit-pages';
- $post = get_default_page_to_edit();
- } else {
- $screen = 'edit';
- $post = get_default_post_to_edit();
</del><ins>+ if ( is_string($screen) ) {
+ $screen = array('id' => 'edit-' . $screen, 'base' => 'edit', 'post_type' => $screen );
+ $screen = (object) $screen;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $columns = $is_page ? wp_manage_pages_columns() : wp_manage_posts_columns();
</del><ins>+ $post = get_default_post_to_edit( $screen->post_type );
+ $post_type_object = get_post_type_object( $screen->post_type );
+
+ $columns = wp_manage_posts_columns($screen);
</ins><span class="cx"> $hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($screen) ) );
</span><span class="cx"> $col_count = count($columns) - count($hidden);
</span><span class="cx"> $m = ( isset($mode) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
</span><del>- $can_publish = current_user_can("publish_{$type}s");
</del><ins>+ // @todo use capability_type
+ $can_publish = current_user_can("publish_{$screen->post_type}s");
</ins><span class="cx"> $core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="lines">@@ -1024,12 +1020,12 @@
</span><span class="cx"> $bulk = 0;
</span><span class="cx"> while ( $bulk < 2 ) { ?>
</span><span class="cx">
</span><del>- <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$type ";
- echo $bulk ? "bulk-edit-row bulk-edit-row-$type" : "quick-edit-row quick-edit-row-$type";
</del><ins>+ <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$screen->post_type ";
+ echo $bulk ? "bulk-edit-row bulk-edit-row-$screen->post_type" : "quick-edit-row quick-edit-row-$screen->post_type";
</ins><span class="cx"> ?>" style="display: none"><td colspan="<?php echo $col_count; ?>">
</span><span class="cx">
</span><span class="cx"> <fieldset class="inline-edit-col-left"><div class="inline-edit-col">
</span><del>- <h4><?php echo $bulk ? ( $is_page ? __( 'Bulk Edit Pages' ) : __( 'Bulk Edit Posts' ) ) : __( 'Quick Edit' ); ?></h4>
</del><ins>+ <h4><?php echo $bulk ? ( __( 'Bulk Edit' ) ) : __( 'Quick Edit' ); ?></h4>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> <?php if ( $bulk ) : ?>
</span><span class="lines">@@ -1062,7 +1058,7 @@
</span><span class="cx">
</span><span class="cx"> <?php endif; // $bulk
</span><span class="cx">
</span><del>- $authors = get_editable_user_ids( $current_user->id, true, $type ); // TODO: ROLE SYSTEM
</del><ins>+ $authors = get_editable_user_ids( $current_user->id, true, $screen->post_type ); // TODO: ROLE SYSTEM
</ins><span class="cx"> $authors_dropdown = '';
</span><span class="cx"> if ( $authors && count( $authors ) > 1 ) :
</span><span class="cx"> $users_opt = array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1, 'echo' => 0);
</span><span class="lines">@@ -1092,7 +1088,7 @@
</span><span class="cx"> </em>
</span><span class="cx"> <label class="alignleft inline-edit-private">
</span><span class="cx"> <input type="checkbox" name="keep_private" value="private" />
</span><del>- <span class="checkbox-title"><?php echo $is_page ? __('Private page') : __('Private post'); ?></span>
</del><ins>+ <span class="checkbox-title"><?php echo __('Private'); ?></span>
</ins><span class="cx"> </label>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -1100,7 +1096,7 @@
</span><span class="cx">
</span><span class="cx"> </div></fieldset>
</span><span class="cx">
</span><del>-<?php if ( !$is_page && !$bulk ) : ?>
</del><ins>+<?php if ( is_object_in_taxonomy($screen->post_type, 'categories') && !$bulk ) : ?>
</ins><span class="cx">
</span><span class="cx"> <fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
</span><span class="cx"> <span class="title inline-edit-categories-label"><?php _e( 'Categories' ); ?>
</span><span class="lines">@@ -1112,7 +1108,7 @@
</span><span class="cx"> </ul>
</span><span class="cx"> </div></fieldset>
</span><span class="cx">
</span><del>-<?php endif; // !$is_page && !$bulk ?>
</del><ins>+<?php endif; // !hierarchical && !$bulk ?>
</ins><span class="cx">
</span><span class="cx"> <fieldset class="inline-edit-col-right"><div class="inline-edit-col">
</span><span class="cx">
</span><span class="lines">@@ -1121,7 +1117,7 @@
</span><span class="cx"> echo $authors_dropdown;
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<?php if ( $is_page ) : ?>
</del><ins>+<?php if ( $post_type_object->hierarchical ) : ?>
</ins><span class="cx">
</span><span class="cx"> <label>
</span><span class="cx"> <span class="title"><?php _e( 'Parent' ); ?></span>
</span><span class="lines">@@ -1221,7 +1217,7 @@
</span><span class="cx"> </select>
</span><span class="cx"> </label>
</span><span class="cx">
</span><del>-<?php if ( !$is_page && $can_publish && current_user_can( 'edit_others_posts' ) ) : ?>
</del><ins>+<?php if ( 'post' == $screen->post_type && $can_publish && current_user_can( 'edit_others_posts' ) ) : ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( $bulk ) : ?>
</span><span class="cx">
</span><span class="lines">@@ -1260,12 +1256,12 @@
</span><span class="cx"> <a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="button-secondary cancel alignleft"><?php _e('Cancel'); ?></a>
</span><span class="cx"> <?php if ( ! $bulk ) {
</span><span class="cx"> wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
</span><del>- $update_text = ( $is_page ) ? __( 'Update Page' ) : __( 'Update Post' );
</del><ins>+ $update_text = __( 'Update' );
</ins><span class="cx"> ?>
</span><span class="cx"> <a accesskey="s" href="#inline-edit" title="<?php _e('Update'); ?>" class="button-primary save alignright"><?php echo esc_attr( $update_text ); ?></a>
</span><span class="cx"> <img class="waiting" style="display:none;" src="images/wpspin_light.gif" alt="" />
</span><span class="cx"> <?php } else {
</span><del>- $update_text = ( $is_page ) ? __( 'Update Pages' ) : __( 'Update Posts' );
</del><ins>+ $update_text = __( 'Update' );
</ins><span class="cx"> ?>
</span><span class="cx"> <input accesskey="s" class="button-primary alignright" type="submit" name="bulk_edit" value="<?php echo esc_attr( $update_text ); ?>" />
</span><span class="cx"> <?php } ?>
</span><span class="lines">@@ -1369,7 +1365,7 @@
</span><span class="cx"> * @param unknown_type $mode
</span><span class="cx"> */
</span><span class="cx"> function _post_row($a_post, $pending_comments, $mode) {
</span><del>- global $post, $current_user;
</del><ins>+ global $post, $current_user, $current_screen;
</ins><span class="cx"> static $rowclass;
</span><span class="cx">
</span><span class="cx"> $global_post = $post;
</span><span class="lines">@@ -1383,8 +1379,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> <tr id='post-<?php echo $post->ID; ?>' class='<?php echo trim( $rowclass . ' author-' . $post_owner . ' status-' . $post->post_status ); ?> iedit' valign="top">
</span><span class="cx"> <?php
</span><del>- $posts_columns = get_column_headers('edit');
- $hidden = get_hidden_columns('edit');
</del><ins>+ $posts_columns = get_column_headers( $current_screen );
+ $hidden = get_hidden_columns( $current_screen );
</ins><span class="cx"> foreach ( $posts_columns as $column_name=>$column_display_name ) {
</span><span class="cx"> $class = "class=\"$column_name column-$column_name\"";
</span><span class="cx">
</span><span class="lines">@@ -1579,7 +1575,7 @@
</span><span class="cx"> * @param unknown_type $level
</span><span class="cx"> */
</span><span class="cx"> function display_page_row( $page, $level = 0 ) {
</span><del>- global $post;
</del><ins>+ global $post, $current_screen;
</ins><span class="cx"> static $rowclass;
</span><span class="cx">
</span><span class="cx"> $post = $page;
</span><span class="lines">@@ -1606,8 +1602,8 @@
</span><span class="cx"> $pad = str_repeat( '&#8212; ', $level );
</span><span class="cx"> $id = (int) $page->ID;
</span><span class="cx"> $rowclass = 'alternate' == $rowclass ? '' : 'alternate';
</span><del>- $posts_columns = get_column_headers('edit-pages');
- $hidden = get_hidden_columns('edit-pages');
</del><ins>+ $posts_columns = get_column_headers( $current_screen );
+ $hidden = get_hidden_columns( $current_screen );
</ins><span class="cx"> $title = _draft_or_post_title();
</span><span class="cx"> ?>
</span><span class="cx"> <tr id="page-<?php echo $id; ?>" class="<?php echo $rowclass; ?> iedit">
</span><span class="lines">@@ -3056,19 +3052,22 @@
</span><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> *
</span><del>- * @param unknown_type $page
</del><ins>+ * @param unknown_type $screen
</ins><span class="cx"> */
</span><del>-function meta_box_prefs($page) {
</del><ins>+function meta_box_prefs($screen) {
</ins><span class="cx"> global $wp_meta_boxes;
</span><span class="cx">
</span><del>- if ( empty($wp_meta_boxes[$page]) )
</del><ins>+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
+
+ if ( empty($wp_meta_boxes[$screen->id]) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- $hidden = get_hidden_meta_boxes($page);
</del><ins>+ $hidden = get_hidden_meta_boxes($screen);
</ins><span class="cx">
</span><del>- foreach ( array_keys($wp_meta_boxes[$page]) as $context ) {
- foreach ( array_keys($wp_meta_boxes[$page][$context]) as $priority ) {
- foreach ( $wp_meta_boxes[$page][$context][$priority] as $box ) {
</del><ins>+ foreach ( array_keys($wp_meta_boxes[$screen->id]) as $context ) {
+ foreach ( array_keys($wp_meta_boxes[$screen->id][$context]) as $priority ) {
+ foreach ( $wp_meta_boxes[$screen->id][$context][$priority] as $box ) {
</ins><span class="cx"> if ( false == $box || ! $box['title'] )
</span><span class="cx"> continue;
</span><span class="cx"> // Submit box cannot be hidden
</span><span class="lines">@@ -3083,9 +3082,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function get_hidden_meta_boxes($page) {
- $hidden = (array) get_user_option( "meta-box-hidden_$page" );
</del><ins>+function get_hidden_meta_boxes($screen) {
+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
</ins><span class="cx">
</span><ins>+ $hidden = (array) get_user_option( "meta-box-hidden_$screen->id" );
+
</ins><span class="cx"> // Hide slug boxes by default
</span><span class="cx"> if ( empty($hidden[0]) ) {
</span><span class="cx"> $hidden = array('slugdiv');
</span><span class="lines">@@ -3279,44 +3281,47 @@
</span><span class="cx"> * @since unknown
</span><span class="cx"> */
</span><span class="cx"> function favorite_actions( $screen = null ) {
</span><del>- switch ( $screen ) {
- case 'post-new.php':
</del><ins>+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
+
+ switch ( $screen->id ) {
+ case 'post':
</ins><span class="cx"> $default_action = array('edit.php' => array(__('Edit Posts'), 'edit_posts'));
</span><span class="cx"> break;
</span><del>- case 'edit-pages.php':
- $default_action = array('page-new.php' => array(__('New Page'), 'edit_pages'));
</del><ins>+ case 'edit-page':
+ $default_action = array('post-new.php?post_type=page' => array(__('New Page'), 'edit_pages'));
</ins><span class="cx"> break;
</span><del>- case 'page-new.php':
- $default_action = array('edit-pages.php' => array(__('Edit Pages'), 'edit_pages'));
</del><ins>+ case 'page':
+ $default_action = array('edit.php?post_type=page' => array(__('Edit Pages'), 'edit_pages'));
</ins><span class="cx"> break;
</span><span class="cx"> case 'upload.php':
</span><span class="cx"> $default_action = array('media-new.php' => array(__('New Media'), 'upload_files'));
</span><span class="cx"> break;
</span><del>- case 'media-new.php':
</del><ins>+ case 'media':
</ins><span class="cx"> $default_action = array('upload.php' => array(__('Edit Media'), 'upload_files'));
</span><span class="cx"> break;
</span><del>- case 'link-manager.php':
</del><ins>+ case 'link-manager':
</ins><span class="cx"> $default_action = array('link-add.php' => array(__('New Link'), 'manage_links'));
</span><span class="cx"> break;
</span><del>- case 'link-add.php':
</del><ins>+ case 'link-add':
</ins><span class="cx"> $default_action = array('link-manager.php' => array(__('Edit Links'), 'manage_links'));
</span><span class="cx"> break;
</span><del>- case 'users.php':
</del><ins>+ case 'users':
</ins><span class="cx"> $default_action = array('user-new.php' => array(__('New User'), 'create_users'));
</span><span class="cx"> break;
</span><del>- case 'user-new.php':
</del><ins>+ case 'user':
</ins><span class="cx"> $default_action = array('users.php' => array(__('Edit Users'), 'edit_users'));
</span><span class="cx"> break;
</span><del>- case 'plugins.php':
</del><ins>+ case 'plugins':
</ins><span class="cx"> $default_action = array('plugin-install.php' => array(__('Install Plugins'), 'install_plugins'));
</span><span class="cx"> break;
</span><del>- case 'plugin-install.php':
</del><ins>+ case 'plugin-install':
</ins><span class="cx"> $default_action = array('plugins.php' => array(__('Manage Plugins'), 'activate_plugins'));
</span><span class="cx"> break;
</span><del>- case 'themes.php':
</del><ins>+ case 'themes':
</ins><span class="cx"> $default_action = array('theme-install.php' => array(__('Install Themes'), 'install_themes'));
</span><span class="cx"> break;
</span><del>- case 'theme-install.php':
</del><ins>+ case 'theme-install':
</ins><span class="cx"> $default_action = array('themes.php' => array(__('Manage Themes'), 'switch_themes'));
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -3484,32 +3489,34 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function screen_meta($screen) {
- global $wp_meta_boxes, $_wp_contextual_help, $typenow;
-
</del><ins>+// Convert a screen string to a screen object
+function convert_to_screen( $screen ) {
</ins><span class="cx"> $screen = str_replace('.php', '', $screen);
</span><span class="cx"> $screen = str_replace('-new', '', $screen);
</span><span class="cx"> $screen = str_replace('-add', '', $screen);
</span><span class="cx"> $screen = apply_filters('screen_meta_screen', $screen);
</span><span class="cx">
</span><ins>+ $screen = array('id' => $screen, 'base' => $screen);
+ return (object) $screen;
+}
+
+function screen_meta($screen) {
+ global $wp_meta_boxes, $_wp_contextual_help, $post_type;
+
+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
+
</ins><span class="cx"> $column_screens = get_column_headers($screen);
</span><span class="cx"> $meta_screens = array('index' => 'dashboard');
</span><span class="cx">
</span><del>- // Give post_type pages their own screen
- if ( 'post' == $screen ) {
- if ( !empty($typenow) )
- $screen = $typenow;
</del><ins>+ if ( isset($meta_screens[$screen->id]) ) {
+ $screen->id = $meta_screens[$screen->id];
+ $screen->base = $screen->id;
</ins><span class="cx"> }
</span><del>- if ( 'edit' == $screen ) {
- if ( !empty($typenow) )
- $screen = 'edit-' . $typenow;
- }
</del><span class="cx">
</span><del>- if ( isset($meta_screens[$screen]) )
- $screen = $meta_screens[$screen];
</del><span class="cx"> $show_screen = false;
</span><span class="cx"> $show_on_screen = false;
</span><del>- if ( !empty($wp_meta_boxes[$screen]) || !empty($column_screens) ) {
</del><ins>+ if ( !empty($wp_meta_boxes[$screen->id]) || !empty($column_screens) ) {
</ins><span class="cx"> $show_screen = true;
</span><span class="cx"> $show_on_screen = true;
</span><span class="cx"> }
</span><span class="lines">@@ -3523,49 +3530,8 @@
</span><span class="cx">
</span><span class="cx"> $settings = '';
</span><span class="cx">
</span><del>- switch ( $screen ) {
- case 'post':
- if ( !isset($_wp_contextual_help['post']) ) {
- $help = drag_drop_help();
- $help .= '<p>' . __('<a href="http://codex.wordpress.org/Writing_Posts" target="_blank">Writing Posts</a>') . '</p>';
- $_wp_contextual_help['post'] = $help;
- }
- break;
- case 'page':
- if ( !isset($_wp_contextual_help['page']) ) {
- $help = drag_drop_help();
- $_wp_contextual_help['page'] = $help;
- }
- break;
- case 'dashboard':
- if ( !isset($_wp_contextual_help['dashboard']) ) {
- $help = '<p>' . __('The modules on this screen can be arranged in several columns. You can select the number of columns from the Screen Options tab.') . "</p>\n";
- $help .= drag_drop_help();
- $_wp_contextual_help['dashboard'] = $help;
- }
- break;
- case 'link':
- if ( !isset($_wp_contextual_help['link']) ) {
- $help = drag_drop_help();
- $_wp_contextual_help['link'] = $help;
- }
- break;
- case 'options-general':
- if ( !isset($_wp_contextual_help['options-general']) )
- $_wp_contextual_help['options-general'] = __('<a href="http://codex.wordpress.org/Settings_General_SubPanel" target="_blank">General Settings</a>');
- break;
- case 'theme-install':
- case 'plugin-install':
- if ( ( !isset($_GET['tab']) || 'dashboard' == $_GET['tab'] ) && !isset($_wp_contextual_help[$screen]) ) {
- $help = plugins_search_help();
- $_wp_contextual_help[$screen] = $help;
- }
- break;
</del><ins>+ switch ( $screen->id ) {
</ins><span class="cx"> case 'widgets':
</span><del>- if ( !isset($_wp_contextual_help['widgets']) ) {
- $help = widgets_help();
- $_wp_contextual_help['widgets'] = $help;
- }
</del><span class="cx"> $settings = '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
</span><span class="cx"> $show_screen = true;
</span><span class="cx"> break;
</span><span class="lines">@@ -3605,12 +3571,12 @@
</span><span class="cx"> <div id="contextual-help-wrap" class="hidden">
</span><span class="cx"> <?php
</span><span class="cx"> $contextual_help = '';
</span><del>- if ( isset($_wp_contextual_help[$screen]) ) {
</del><ins>+ if ( isset($_wp_contextual_help[$screen->id]) ) {
</ins><span class="cx"> if ( !empty($title) )
</span><span class="cx"> $contextual_help .= '<h5>' . sprintf(__('Get help with &#8220;%s&#8221;'), $title) . '</h5>';
</span><span class="cx"> else
</span><span class="cx"> $contextual_help .= '<h5>' . __('Get help with this page') . '</h5>';
</span><del>- $contextual_help .= '<div class="metabox-prefs">' . $_wp_contextual_help[$screen] . "</div>\n";
</del><ins>+ $contextual_help .= '<div class="metabox-prefs">' . $_wp_contextual_help[$screen->id] . "</div>\n";
</ins><span class="cx">
</span><span class="cx"> $contextual_help .= '<h5>' . __('Other Help') . '</h5>';
</span><span class="cx"> } else {
</span><span class="lines">@@ -3652,10 +3618,13 @@
</span><span class="cx"> function add_contextual_help($screen, $help) {
</span><span class="cx"> global $_wp_contextual_help;
</span><span class="cx">
</span><ins>+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
+
</ins><span class="cx"> if ( !isset($_wp_contextual_help) )
</span><span class="cx"> $_wp_contextual_help = array();
</span><span class="cx">
</span><del>- $_wp_contextual_help[$screen] = $help;
</del><ins>+ $_wp_contextual_help[$screen->id] = $help;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function drag_drop_help() {
</span><span class="lines">@@ -3675,33 +3644,27 @@
</span><span class="cx"> ';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function widgets_help() {
- return '
- <p>' . __('Widgets are added and arranged by simple drag &#8217;n&#8217; drop. If you hover your mouse over the titlebar of a widget, you&#8217;ll see a 4-arrow cursor which indicates that the widget is movable. Click on the titlebar, hold down the mouse button and drag the widget to a sidebar. As you drag, you&#8217;ll see a dotted box that also moves. This box shows where the widget will go once you drop it.') . '</p>
- <p>' . __('To remove a widget from a sidebar, drag it back to Available Widgets or click on the arrow on its titlebar to reveal its settings, and then click Remove.') . '</p>
- <p>' . __('To remove a widget from a sidebar <em>and keep its configuration</em>, drag it to Inactive Widgets.') . '</p>
- <p>' . __('The Inactive Widgets area stores widgets that are configured but not curently used. If you change themes and the new theme has fewer sidebars than the old, all extra widgets will be stored to Inactive Widgets automatically.') . '</p>
-';
-}
-
</del><span class="cx"> function screen_layout($screen) {
</span><span class="cx"> global $screen_layout_columns;
</span><span class="cx">
</span><ins>+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
+
</ins><span class="cx"> $columns = array('dashboard' => 4, 'post' => 2, 'page' => 2, 'link' => 2);
</span><span class="cx">
</span><span class="cx"> // Add custom post types
</span><span class="cx"> foreach ( get_post_types( array('_show' => true) ) as $post_type )
</span><span class="cx"> $columns[$post_type] = 2;
</span><span class="cx">
</span><del>- $columns = apply_filters('screen_layout_columns', $columns, $screen);
</del><ins>+ $columns = apply_filters('screen_layout_columns', $columns, $screen->id, $screen);
</ins><span class="cx">
</span><del>- if ( !isset($columns[$screen]) ) {
</del><ins>+ if ( !isset($columns[$screen->id]) ) {
</ins><span class="cx"> $screen_layout_columns = 0;
</span><span class="cx"> return '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $screen_layout_columns = get_user_option("screen_layout_$screen");
- $num = $columns[$screen];
</del><ins>+ $screen_layout_columns = get_user_option("screen_layout_$screen->id");
+ $num = $columns[$screen->id];
</ins><span class="cx">
</span><span class="cx"> if ( ! $screen_layout_columns )
</span><span class="cx"> $screen_layout_columns = 2;
</span><span class="lines">@@ -3717,12 +3680,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function screen_options($screen) {
</span><del>- $map_screen = $screen;
- $type = str_replace('edit-', '', $map_screen);
- if ( in_array($type, get_post_types()) )
- $map_screen = 'edit';
</del><ins>+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
</ins><span class="cx">
</span><del>- switch ( $map_screen ) {
</del><ins>+ switch ( $screen->base ) {
</ins><span class="cx"> case 'edit':
</span><span class="cx"> $per_page_label = __('Posts per page:');
</span><span class="cx"> break;
</span><span class="lines">@@ -3748,10 +3709,10 @@
</span><span class="cx"> return '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $option = str_replace( '-', '_', "${screen}_per_page" );
</del><ins>+ $option = str_replace( '-', '_', "{$screen->id}_per_page" );
</ins><span class="cx"> $per_page = (int) get_user_option( $option );
</span><span class="cx"> if ( empty( $per_page ) || $per_page < 1 ) {
</span><del>- if ( 'plugins' == $screen )
</del><ins>+ if ( 'plugins' == $screen->id )
</ins><span class="cx"> $per_page = 999;
</span><span class="cx"> else
</span><span class="cx"> $per_page = 20;
</span><span class="lines">@@ -3773,18 +3734,19 @@
</span><span class="cx"> return $return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function screen_icon($name = '') {
- global $parent_file, $hook_suffix;
</del><ins>+function screen_icon($screen = '') {
+ global $current_screen;
</ins><span class="cx">
</span><ins>+ if ( empty($screen) )
+ $screen = $current_screen;
+ elseif ( is_string($screen) )
+ $name = $screen;
+
</ins><span class="cx"> if ( empty($name) ) {
</span><del>- if ( isset($parent_file) && !empty($parent_file) ) {
- $name = $parent_file;
- if ( false !== $pos = strpos($name, '?post_type=') )
- $name = substr($name, 0, $pos);
- $name = substr($name, 0, -4);
- }
</del><ins>+ if ( !empty($screen->parent_base) )
+ $name = $screen->parent_base;
</ins><span class="cx"> else
</span><del>- $name = str_replace(array('.php', '-new', '-add'), '', $hook_suffix);
</del><ins>+ $name = $screen->base;
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> <div id="icon-<?php echo $name; ?>" class="icon32"><br /></div>
</span></span></pre></div>
<a id="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/index.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -23,6 +23,9 @@
</span><span class="cx">
</span><span class="cx"> $title = __('Dashboard');
</span><span class="cx"> $parent_file = 'index.php';
</span><ins>+
+add_contextual_help($current_screen, '<p>' . __('The modules on this screen can be arranged in several columns. You can select the number of columns from the Screen Options tab.') . "</p>\n" . drag_drop_help() );
+
</ins><span class="cx"> require_once('admin-header.php');
</span><span class="cx">
</span><span class="cx"> $today = current_time('mysql', 1);
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/menu.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -68,10 +68,10 @@
</span><span class="cx"> $submenu['link-manager.php'][10] = array( _x('Add New', 'links'), 'manage_links', 'link-add.php' );
</span><span class="cx"> $submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
</span><span class="cx">
</span><del>-$menu[20] = array( __('Pages'), 'edit_pages', 'edit-pages.php', '', 'menu-top', 'menu-pages', 'div' );
- $submenu['edit-pages.php'][5] = array( __('Edit'), 'edit_pages', 'edit-pages.php' );
</del><ins>+$menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top', 'menu-pages', 'div' );
+ $submenu['edit.php?post_type=page'][5] = array( __('Edit'), 'edit_pages', 'edit.php?post_type=page' );
</ins><span class="cx"> /* translators: add new page */
</span><del>- $submenu['edit-pages.php'][10] = array( _x('Add New', 'page'), 'edit_pages', 'post-new.php?post_type=page' );
</del><ins>+ $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), 'edit_pages', 'post-new.php?post_type=page' );
</ins><span class="cx">
</span><span class="cx"> $menu[25] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top', 'menu-comments', 'div' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/options-general.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -50,6 +50,8 @@
</span><span class="cx"> }
</span><span class="cx"> add_filter('admin_head', 'add_js');
</span><span class="cx">
</span><ins>+add_contextual_help($current_screen, __('<a href="http://codex.wordpress.org/Settings_General_SubPanel" target="_blank">General Settings</a>'));
+
</ins><span class="cx"> include('./admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-install.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-install.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/plugin-install.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx">
</span><span class="cx"> do_action('install_plugins_pre_' . $tab); //Used to override the general interface, Eg, install or plugin information.
</span><span class="cx">
</span><ins>+add_contextual_help($current_screen, plugins_search_help());
+
</ins><span class="cx"> include('admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/plugins.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> $help .= '<p>' . sprintf(__('You can find additional plugins for your site by using the new <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> directly and installing manually. To <em>manually</em> install a plugin you generally just need to upload the plugin file into your <code>%2$s</code> directory. Once a plugin has been installed, you may activate it here.'), 'plugin-install.php', WP_PLUGIN_DIR) . '</p>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-add_contextual_help('plugins', $help);
</del><ins>+add_contextual_help($current_screen, $help);
</ins><span class="cx">
</span><span class="cx"> if ( is_multisite() && is_super_admin() ) {
</span><span class="cx"> $menu_perms = get_site_option('menu_items', array());
</span></span></pre></div>
<a id="trunkwpadminpostnewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post-new.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post-new.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/post-new.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -17,8 +17,6 @@
</span><span class="cx"> if ( 'post' != $post_type ) {
</span><span class="cx"> $parent_file = "edit.php?post_type=$post_type";
</span><span class="cx"> $submenu_file = "post-new.php?post_type=$post_type";
</span><del>- if ( 'page' == $post_type )
- $parent_file = 'edit-pages.php';
</del><span class="cx"> } else {
</span><span class="cx"> $parent_file = 'edit.php';
</span><span class="cx"> $submenu_file = 'post-new.php';
</span></span></pre></div>
<a id="trunkwpadminpostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/post.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -23,17 +23,29 @@
</span><span class="cx"> else
</span><span class="cx"> $post_id = 0;
</span><span class="cx"> $post_ID = $post_id;
</span><del>-
</del><span class="cx"> $post = null;
</span><span class="cx"> $post_type_object = null;
</span><span class="cx"> $post_type_cap = null;
</span><ins>+$post_type = null;
</ins><span class="cx"> if ( $post_id ) {
</span><span class="cx"> $post = get_post($post_id);
</span><span class="cx"> if ( $post ) {
</span><span class="cx"> $post_type_object = get_post_type_object($post->post_type);
</span><del>- if ( $post_type_object )
</del><ins>+ if ( $post_type_object ) {
+ $post_type = $post->post_type;
+ $current_screen->post_type = $post->post_type;
+ $current_screen->id = $current_screen->post_type;
</ins><span class="cx"> $post_type_cap = $post_type_object->capability_type;
</span><ins>+ }
</ins><span class="cx"> }
</span><ins>+} elseif ( isset($_POST['post_type']) ) {
+ $post_type_object = get_post_type_object($_POST['post_type']);
+ if ( $post_type_object ) {
+ $post_type = $post_type_object->name;
+ $current_screen->post_type = $post_type;
+ $current_screen->id = $current_screen->post_type;
+ $post_type_cap = $post_type_object->capability_type;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -108,7 +120,7 @@
</span><span class="cx"> case 'post':
</span><span class="cx"> case 'post-quickpress-publish':
</span><span class="cx"> case 'post-quickpress-save':
</span><del>- check_admin_referer('add-post');
</del><ins>+ check_admin_referer('add-' . $post_type);
</ins><span class="cx">
</span><span class="cx"> if ( 'post-quickpress-publish' == $action )
</span><span class="cx"> $_POST['publish'] = 'publish'; // tell write_post() to publish
</span><span class="lines">@@ -163,17 +175,9 @@
</span><span class="cx"> if ( 'post' == $post_type ) {
</span><span class="cx"> $parent_file = "edit.php";
</span><span class="cx"> $submenu_file = "edit.php";
</span><del>- } elseif ( 'page' == $post_type ) {
- $parent_file = "edit-pages.php";
- $submenu_file = "edit-pages.php";
</del><span class="cx"> } else {
</span><del>- if ( $post_type_object->hierarchical ) {
- $parent_file = "edit-pages.php?post_type=$post_type";
- $submenu_file = "edit-pages.php?post_type=$post_type";
- } else {
- $parent_file = "edit.php?post_type=$post_type";
- $submenu_file = "edit.php?post_type=$post_type";
- }
</del><ins>+ $parent_file = "edit.php?post_type=$post_type";
+ $submenu_file = "edit.php?post_type=$post_type";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> wp_enqueue_script('post');
</span><span class="lines">@@ -213,7 +217,7 @@
</span><span class="cx"> wp_update_attachment_metadata( $post_id, $newmeta );
</span><span class="cx">
</span><span class="cx"> case 'editpost':
</span><del>- check_admin_referer('update-' . $post->post_type . '_' . $post_id);
</del><ins>+ check_admin_referer('update-' . $post_type . '_' . $post_id);
</ins><span class="cx">
</span><span class="cx"> $post_id = edit_post();
</span><span class="cx">
</span><span class="lines">@@ -223,7 +227,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'trash':
</span><del>- check_admin_referer('trash-post_' . $post_id);
</del><ins>+ check_admin_referer('trash-' . $post_type . '_' . $post_id);
</ins><span class="cx">
</span><span class="cx"> $post = & get_post($post_id);
</span><span class="cx">
</span><span class="lines">@@ -238,7 +242,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'untrash':
</span><del>- check_admin_referer('untrash-post_' . $post_id);
</del><ins>+ check_admin_referer('untrash-' . $post_type . '_' . $post_id);
</ins><span class="cx">
</span><span class="cx"> if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
</span><span class="cx"> wp_die( __('You are not allowed to move this item out of the trash.') );
</span><span class="lines">@@ -251,7 +255,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'delete':
</span><del>- check_admin_referer('delete-post_' . $post_id);
</del><ins>+ check_admin_referer('delete-' . $post_type . '_' . $post_id);
</ins><span class="cx">
</span><span class="cx"> if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
</span><span class="cx"> wp_die( __('You are not allowed to delete this item.') );
</span><span class="lines">@@ -280,9 +284,6 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- if ( $post_type_object->hierarchical )
- wp_redirect('edit-pages.php');
- else
</del><span class="cx"> wp_redirect('edit.php');
</span><span class="cx"> exit();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-install.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-install.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/theme-install.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx">
</span><span class="cx"> do_action('install_themes_pre_' . $tab); //Used to override the general interface, Eg, install or theme information.
</span><span class="cx">
</span><ins>+add_contextual_help($current_screen, plugins_search_help());
+
</ins><span class="cx"> include('admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/themes.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> $help .= '<p>' . __('Once a theme is uploaded, you should see it on this page.') . '</p>' ;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-add_contextual_help('themes', $help);
</del><ins>+add_contextual_help($current_screen, $help);
</ins><span class="cx">
</span><span class="cx"> add_thickbox();
</span><span class="cx"> wp_enqueue_script( 'theme-preview' );
</span></span></pre></div>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (12727 => 12728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2010-01-15 16:39:11 UTC (rev 12727)
+++ trunk/wp-admin/widgets.php 2010-01-15 16:58:36 UTC (rev 12728)
</span><span class="lines">@@ -33,6 +33,14 @@
</span><span class="cx"> $title = __( 'Widgets' );
</span><span class="cx"> $parent_file = 'themes.php';
</span><span class="cx">
</span><ins>+$help = '
+ <p>' . __('Widgets are added and arranged by simple drag &#8217;n&#8217; drop. If you hover your mouse over the titlebar of a widget, you&#8217;ll see a 4-arrow cursor which indicates that the widget is movable. Click on the titlebar, hold down the mouse button and drag the widget to a sidebar. As you drag, you&#8217;ll see a dotted box that also moves. This box shows where the widget will go once you drop it.') . '</p>
+ <p>' . __('To remove a widget from a sidebar, drag it back to Available Widgets or click on the arrow on its titlebar to reveal its settings, and then click Remove.') . '</p>
+ <p>' . __('To remove a widget from a sidebar <em>and keep its configuration</em>, drag it to Inactive Widgets.') . '</p>
+ <p>' . __('The Inactive Widgets area stores widgets that are configured but not curently used. If you change themes and the new theme has fewer sidebars than the old, all extra widgets will be stored to Inactive Widgets automatically.') . '</p>
+';
+add_contextual_help($current_screen, $help);
+
</ins><span class="cx"> // register the inactive_widgets area as sidebar
</span><span class="cx"> register_sidebar(array(
</span><span class="cx"> 'name' => __('Inactive Widgets'),
</span></span></pre>
</div>
</div>
</body>
</html>