<!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" />
<title>[18867] trunk/wp-admin: Use add_option() method, introduce add_option_context() method for adding specific text above the screen options, see #18690</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18867">18867</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-10-03 04:00:57 +0000 (Mon, 03 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use add_option() method, introduce add_option_context() method for adding specific text above the screen options, see <a href="http://core.trac.wordpress.org/ticket/18690">#18690</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</a></li>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.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="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
<li><a href="#trunkwpadminindexphp">trunk/wp-admin/index.php</a></li>
<li><a href="#trunkwpadminlinkmanagerphp">trunk/wp-admin/link-manager.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpadminnetworkindexphp">trunk/wp-admin/network/index.php</a></li>
<li><a href="#trunkwpadminnetworksitethemesphp">trunk/wp-admin/network/site-themes.php</a></li>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
<li><a href="#trunkwpadminnetworksitesphp">trunk/wp-admin/network/sites.php</a></li>
<li><a href="#trunkwpadminnetworkthemesphp">trunk/wp-admin/network/themes.php</a></li>
<li><a href="#trunkwpadminnetworkusersphp">trunk/wp-admin/network/users.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="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/css/wp-admin.dev.css 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -1506,15 +1506,13 @@
</span><span class="cx">
</span><span class="cx"> #screen-options-wrap h5,
</span><span class="cx"> #contextual-help-wrap h5 {
</span><del>- margin: 8px 0;
</del><ins>+ margin: 12px 0 2px;
</ins><span class="cx"> font-size: 13px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .metabox-prefs label {
</span><del>- display: inline-block;
</del><span class="cx"> padding-right: 15px;
</span><span class="cx"> white-space: nowrap;
</span><del>- line-height: 30px;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .metabox-prefs label input {
</span></span></pre></div>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/edit-comments.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -109,12 +109,9 @@
</span><span class="cx"> else
</span><span class="cx"> $title = __('Comments');
</span><span class="cx">
</span><del>-add_screen_option( 'per_page', array('label' => _x( 'Comments', 'comments per page (screen options)' )) );
</del><ins>+$current_screen->add_option( 'per_page', array('label' => _x( 'Comments', 'comments per page (screen options)' )) );
+$current_screen->add_option_context( '<p>test</p>' );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
-'<p>test</p>'
-);
-
</del><span class="cx"> add_contextual_help( $current_screen, '<p>' . __( 'You can manage comments made on your site similar to the way you manage Posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'A yellow row means the comment is waiting for you to moderate it.' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'In the Author column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/edit-form-advanced.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx">
</span><span class="cx"> $current_screen->add_option('layout_columns', array('max' => 2, 'default' => 'auto') );
</span><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</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 (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-form.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/edit-link-form.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -37,9 +37,9 @@
</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><del>-add_screen_option('layout_columns', array('max' => 2, 'default' => 'auto') );
</del><ins>+$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 'auto') );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/edit-tags.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx"> $submenu_file = "edit-tags.php?taxonomy=$taxonomy";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-add_screen_option( 'per_page', array('label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page') );
</del><ins>+$current_screen->add_option( 'per_page', array('label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page') );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/edit.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -148,12 +148,9 @@
</span><span class="cx">
</span><span class="cx"> $title = $post_type_object->labels->name;
</span><span class="cx">
</span><del>-add_screen_option( 'per_page', array('label' => $title, 'default' => 20) );
</del><ins>+$current_screen->add_option( 'per_page', array('label' => $title, 'default' => 20) );
+$current_screen->add_option_context( '<p>test</p>' );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
-'<p>test</p>'
-);
-
</del><span class="cx"> if ( 'post' == $post_type ) {
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/includes/screen.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> * @param string|object $screen The screen you want the headers for
</span><span class="cx"> * @return array Containing the headers in the format id => UI String
</span><span class="cx"> */
</span><del>-function get_column_headers( $screen ) {
</del><ins>+function get_column_headers( $screen ) { // TODO: fold into WP_Screen
</ins><span class="cx"> if ( is_string( $screen ) )
</span><span class="cx"> $screen = convert_to_screen( $screen );
</span><span class="cx">
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> * @param string|object $screen The screen you want the hidden columns for
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><del>-function get_hidden_columns( $screen ) {
</del><ins>+function get_hidden_columns( $screen ) { // TODO: fold into WP_Screen
</ins><span class="cx"> if ( is_string( $screen ) )
</span><span class="cx"> $screen = convert_to_screen( $screen );
</span><span class="cx">
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param unknown_type $screen
</span><span class="cx"> */
</span><del>-function meta_box_prefs($screen) {
</del><ins>+function meta_box_prefs($screen) { // TODO: fold into WP_Screen
</ins><span class="cx"> global $wp_meta_boxes;
</span><span class="cx">
</span><span class="cx"> if ( is_string($screen) )
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> * @param string|object $screen Screen identifier
</span><span class="cx"> * @return array Hidden Meta Boxes
</span><span class="cx"> */
</span><del>-function get_hidden_meta_boxes( $screen ) {
</del><ins>+function get_hidden_meta_boxes( $screen ) { // TODO: fold into WP_Screen
</ins><span class="cx"> if ( is_string( $screen ) )
</span><span class="cx"> $screen = convert_to_screen( $screen );
</span><span class="cx">
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> */
</span><del>-function favorite_actions( $screen = null ) {
</del><ins>+function favorite_actions( $screen = null ) { // TODO: deprecate and remove?
</ins><span class="cx"> $default_action = false;
</span><span class="cx">
</span><span class="cx"> if ( is_string($screen) )
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> * @param string $screen The name of the screen
</span><span class="cx"> * @return object An object containing the safe screen name and id
</span><span class="cx"> */
</span><del>-function convert_to_screen( $screen ) {
</del><ins>+function convert_to_screen( $screen ) { // TODO: fold into WP_Screen
</ins><span class="cx"> $screen = str_replace( array('.php', '-new', '-add', '-network', '-user' ), '', $screen);
</span><span class="cx">
</span><span class="cx"> if ( is_network_admin() )
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> elseif ( is_user_admin() )
</span><span class="cx"> $screen .= '-user';
</span><span class="cx">
</span><del>- $screen = (string) apply_filters( 'screen_meta_screen', $screen );
</del><ins>+ // why do we need this? $screen = (string) apply_filters( 'screen_meta_screen', $screen );
</ins><span class="cx"> $screen = (object) array('id' => $screen, 'base' => $screen);
</span><span class="cx"> return $screen;
</span><span class="cx"> }
</span><span class="lines">@@ -245,10 +245,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
</span><span class="cx"> * @param string $help The content of a 'Screen Info' help tab.
</span><del>- *
- * @todo: deprecate?
</del><span class="cx"> */
</span><del>-function add_contextual_help($screen, $help) {
</del><ins>+function add_contextual_help($screen, $help) { // TODO: deprecate
</ins><span class="cx"> global $_wp_contextual_help;
</span><span class="cx">
</span><span class="cx"> if ( is_string($screen) )
</span><span class="lines">@@ -269,7 +267,7 @@
</span><span class="cx"> * @param mixed $args Option dependent arguments
</span><span class="cx"> * @return void
</span><span class="cx"> */
</span><del>-function add_screen_option( $option, $args = array() ) {
</del><ins>+function add_screen_option( $option, $args = array() ) { // TODO: set deprecated
</ins><span class="cx"> $current_screen = get_current_screen();
</span><span class="cx">
</span><span class="cx"> if ( ! $current_screen )
</span><span class="lines">@@ -278,11 +276,11 @@
</span><span class="cx"> return $current_screen->add_option( $option, $args );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function screen_icon( $screen = '' ) {
</del><ins>+function screen_icon( $screen = '' ) { // TODO: fold into WP_Screen
</ins><span class="cx"> echo get_screen_icon( $screen );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function get_screen_icon( $screen = '' ) {
</del><ins>+function get_screen_icon( $screen = '' ) { // TODO: fold into WP_Screen
</ins><span class="cx"> global $current_screen, $typenow;
</span><span class="cx">
</span><span class="cx"> if ( empty($screen) )
</span><span class="lines">@@ -338,12 +336,15 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $id Screen id, optional.
</span><span class="cx"> */
</span><del>-function set_current_screen( $id = '' ) {
</del><ins>+function set_current_screen( $id = '' ) {
</ins><span class="cx"> global $current_screen;
</span><span class="cx">
</span><ins>+ if ( is_a( $current_screen, 'WP_Screen' ) )
+ return;
+
</ins><span class="cx"> $current_screen = new WP_Screen( $id );
</span><span class="cx">
</span><del>- $current_screen = apply_filters('current_screen', $current_screen);
</del><ins>+ // why do we need this? $current_screen = apply_filters('current_screen', $current_screen);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -464,17 +465,19 @@
</span><span class="cx"> * @var array
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><del>- private $_options = array();
</del><ins>+ private $_options = array(
+ '_context' => '',
+ '_screen_settings' => ''
+ );
</ins><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><del>- * Stores the result of the public show_screen_options function.
</del><ins>+ * Show screen options if any.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> * @var bool
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><del>- private $_show_screen_options;
</del><ins>+ private $_show_options = false;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Stores the 'screen_settings' section of screen options.
</span><span class="lines">@@ -483,7 +486,7 @@
</span><span class="cx"> * @var string
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><del>- private $_screen_settings;
</del><ins>+ private $_screen_settings = '';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Constructor
</span><span class="lines">@@ -500,15 +503,19 @@
</span><span class="cx"> if ( empty( $id ) ) {
</span><span class="cx"> $screen = $hook_suffix;
</span><span class="cx"> $screen = str_replace('.php', '', $screen);
</span><ins>+
</ins><span class="cx"> if ( preg_match('/-add|-new$/', $screen) )
</span><span class="cx"> $action = 'add';
</span><ins>+
</ins><span class="cx"> $screen = str_replace('-new', '', $screen);
</span><span class="cx"> $screen = str_replace('-add', '', $screen);
</span><span class="cx"> $this->id = $this->base = $screen;
</span><span class="cx"> } else {
</span><span class="cx"> $id = sanitize_key( $id );
</span><ins>+
</ins><span class="cx"> if ( false !== strpos($id, '-') ) {
</span><span class="cx"> list( $id, $typenow ) = explode('-', $id, 2);
</span><ins>+
</ins><span class="cx"> if ( taxonomy_exists( $typenow ) ) {
</span><span class="cx"> $id = 'edit-tags';
</span><span class="cx"> $taxnow = $typenow;
</span><span class="lines">@@ -523,22 +530,26 @@
</span><span class="cx"> // Map index to dashboard
</span><span class="cx"> if ( 'index' == $this->base )
</span><span class="cx"> $this->base = 'dashboard';
</span><ins>+
</ins><span class="cx"> if ( 'index' == $this->id )
</span><span class="cx"> $this->id = 'dashboard';
</span><span class="cx">
</span><span class="cx"> if ( 'edit' == $this->id ) {
</span><span class="cx"> if ( empty($typenow) )
</span><span class="cx"> $typenow = 'post';
</span><ins>+
</ins><span class="cx"> $this->id .= '-' . $typenow;
</span><span class="cx"> $this->post_type = $typenow;
</span><span class="cx"> } elseif ( 'post' == $this->id ) {
</span><span class="cx"> if ( empty($typenow) )
</span><span class="cx"> $typenow = 'post';
</span><ins>+
</ins><span class="cx"> $this->id = $typenow;
</span><span class="cx"> $this->post_type = $typenow;
</span><span class="cx"> } elseif ( 'edit-tags' == $this->id ) {
</span><span class="cx"> if ( empty($taxnow) )
</span><span class="cx"> $taxnow = 'post_tag';
</span><ins>+
</ins><span class="cx"> $this->id = 'edit-' . $taxnow;
</span><span class="cx"> $this->taxonomy = $taxnow;
</span><span class="cx"> }
</span><span class="lines">@@ -571,27 +582,44 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Adds an option for the screen.
</span><del>- * Call this in template files after admin.php is loaded and before admin-header.php is loaded to add screen options.
</del><ins>+ * Use the 'add_screen_help_and_options' action to add screen options.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $option Option ID
</span><del>- * @param array $args Associative array of arguments particular to the given $option.
</del><ins>+ * @param mixed $args Associative array of arguments particular to the default $option or the HTML string to be printed in the Screen Options tab.
</ins><span class="cx"> */
</span><del>- public function add_option( $option, $args = array() ) {
- $this->_options[ $option ] = $args;
</del><ins>+ public function add_option( $option = false, $args ) {
+ if ( is_array($args) && !empty($option) )
+ $this->_options[ $option ] = $args;
+ elseif ( is_string($args) )
+ $this->_options['_screen_settings'] .= $args;
+
+ $this->_show_options = true;
</ins><span class="cx"> }
</span><ins>+
+ /**
+ * Adds option context.
+ * Use the 'add_screen_help_and_options' action to add it. Will not be shown if there aren't any screen options.
+ *
+ * @since 3.3.0
+ *
+ * @param string $text
+ */
+ public function add_option_context( $text ) {
+ $this->_options['_context'] .= $text;
+ }
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add a help tab to the contextual help for the screen.
</span><del>- * Call this in template files after admin.php is loaded and before admin-header.php is loaded to add contextual help tabs.
</del><ins>+ * Use the 'add_screen_help_and_options' action to add contextual help tabs.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> *
</span><span class="cx"> * @param array $args
</span><span class="cx"> * - string - title - Title for the tab.
</span><ins>+ * - string - id - Tab ID.
</ins><span class="cx"> * - string - section - Section title for the tab. Optional.
</span><del>- * - string - id - Tab ID. Optional.
</del><span class="cx"> * - string - content - Help tab content in plain text or HTML. Optional.
</span><span class="cx"> * - callback - callback - A callback to generate the tab content. Optional.
</span><span class="cx"> *
</span><span class="lines">@@ -599,34 +627,31 @@
</span><span class="cx"> public function add_help_tab( $args ) {
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'title' => false,
</span><ins>+ 'id' => false,
</ins><span class="cx"> 'section' => false,
</span><del>- 'id' => false,
</del><span class="cx"> 'content' => '',
</span><del>- 'callback' => false,
</del><ins>+ 'callback' => false
</ins><span class="cx"> );
</span><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx">
</span><del>- // Ensure we have a title.
- if ( ! $args['title'] )
</del><ins>+ // Ensure we have title and ID.
+ if ( ! $args['title'] || ! $args['id'] )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- // Create an id from the title if one is not provided.
- if ( ! $args['id'] )
- $args['id'] = sanitize_html_class( $args['title'] );
-
</del><span class="cx"> $this->_help_tabs[] = $args;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add a sidebar to the contextual help for the screen.
</span><del>- * Call this in template files after admin.php is loaded and before admin-header.php is loaded to add a sidebar to the contextual help.
</del><ins>+ * Use the 'add_screen_help_and_options' action to add a sidebar to the contextual help.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $content Sidebar content in plain text or HTML.
</span><span class="cx"> */
</span><span class="cx"> public function add_help_sidebar( $content ) {
</span><del>- $this->_help_sidebar = $content;
</del><ins>+ if ( empty($this->_help_sidebar) ) // add only one
+ $this->_help_sidebar = $content;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -639,19 +664,23 @@
</span><span class="cx"> public function render_screen_meta() {
</span><span class="cx"> global $_wp_contextual_help;
</span><span class="cx">
</span><ins>+ do_action('add_screen_help_and_options');
+
</ins><span class="cx"> // Call old contextual_help_list filter.
</span><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 = apply_filters( 'contextual_help_list', $_wp_contextual_help, $this );
</del><ins>+ // why are we filtering a global? $_wp_contextual_help = apply_filters( 'contextual_help_list', $_wp_contextual_help, $this );
</ins><span class="cx">
</span><span class="cx"> if ( isset( $_wp_contextual_help[ $this->id ] ) ) {
</span><span class="cx"> // Call old contextual_help filter.
</span><ins>+ // why are we filtering the same global second time??
</ins><span class="cx"> $contextual_help = apply_filters( 'contextual_help', $_wp_contextual_help[ $this->id ], $this->id, $this );
</span><span class="cx">
</span><span class="cx"> $this->add_help_tab( array(
</span><del>- 'title' => __('Screen Info'),
- 'content' => $contextual_help,
</del><ins>+ 'title' => __('Screen Info'),
+ 'id' => 'screen-info',
+ 'content' => $_wp_contextual_help[ $this->id ]
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -661,33 +690,56 @@
</span><span class="cx"> <div id="contextual-help-wrap" class="hidden">
</span><span class="cx"> <div class="contextual-help-tabs">
</span><span class="cx"> <ul>
</span><del>- <?php foreach ( $this->_help_tabs as $i => $tab ):
- $link_id = "tab-link-{$tab['id']}";
- $panel_id = "tab-panel-{$tab['id']}";
- $classes = ( $i == 0 ) ? 'active' : '';
</del><ins>+ <?php
+
+ if ( $this->_show_options ) {
+ $class = true;
</ins><span class="cx"> ?>
</span><ins>+ <li id="tab-link-screen-options" class="active">
+ <a href="#tab-panel-screen-options">
+ <?php _e('Screen Options'); ?>
+ </a>
+ </li>
+ <?php
+ }
</ins><span class="cx">
</span><del>- <li id="<?php echo esc_attr( $link_id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
- <a href="<?php echo esc_url( "#$panel_id" ); ?>">
</del><ins>+ foreach ( $this->_help_tabs as $i => $tab ) {
+ $id = esc_attr($tab['id']);
+ $class = empty($class) && $i == 0 ? ' class="active"' : '';
+ ?>
+ <li id="<?php echo "tab-link-$id"; ?>"<?php echo $class; ?>>
+ <a href="<?php echo "#tab-panel-$id"; ?>">
</ins><span class="cx"> <?php echo esc_html( $tab['title'] ); ?>
</span><span class="cx"> </a>
</span><span class="cx"> </li>
</span><del>- <?php endforeach; ?>
</del><ins>+ <?php } ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </div>
</span><ins>+ <?php
</ins><span class="cx">
</span><del>- <div class="contextual-help-sidebar">
- <?php echo $this->_help_sidebar; ?>
- </div>
</del><ins>+ if ( $this->_help_sidebar )
+ echo '<div class="contextual-help-sidebar">' . $this->_help_sidebar . '</div>';
</ins><span class="cx">
</span><ins>+ ?>
</ins><span class="cx"> <div class="contextual-help-tabs-wrap">
</span><del>- <?php foreach ( $this->_help_tabs as $i => $tab ):
- $panel_id = "tab-panel-{$tab['id']}";
- $classes = ( $i == 0 ) ? 'active' : '';
- $classes .= ' help-tab-content';
</del><ins>+ <?php
+
+ if ( $this->_show_options ) {
+ $class2 = true;
+ echo '<div id="tab-panel-screen-options" class="help-tab-content active">';
+
+ if ( !empty($this->_options['_context']) )
+ echo $this->_options['_context'];
+
+ $this->render_screen_options();
+ echo '</div>';
+ }
+
+ foreach ( $this->_help_tabs as $i => $tab ) {
+ $class2 = empty($class2) && $i == 0 ? ' active' : '';
</ins><span class="cx"> ?>
</span><span class="cx">
</span><del>- <div id="<?php echo esc_attr( $panel_id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
</del><ins>+ <div id="<?php echo esc_attr( "tab-panel-{$tab['id']}" ); ?>" class="help-tab-content<?php echo $class2; ?>">
</ins><span class="cx"> <?php
</span><span class="cx"> if ( $tab['section'] )
</span><span class="cx"> echo '<h3>' . esc_html( $tab['section'] ) . '</h3>';
</span><span class="lines">@@ -700,84 +752,59 @@
</span><span class="cx"> call_user_func( $tab['callback'], $this );
</span><span class="cx"> ?>
</span><span class="cx"> </div>
</span><del>- <?php endforeach; ?>
</del><ins>+ <?php } ?>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public function show_screen_options() { // not needed?
- global $wp_meta_boxes, $wp_list_table;
</del><ins>+ /**
+ * Render the screen options tab.
+ *
+ * @since 3.3.0
+ */
+ public function render_screen_options() {
</ins><span class="cx">
</span><del>- if ( is_bool( $this->_show_screen_options ) )
- return $this->_show_screen_options;
</del><ins>+ $screen_settings = $this->_options['_screen_settings'];
</ins><span class="cx">
</span><del>- $columns = get_column_headers( $this );
-
- $show_screen = false;
- if ( ! empty( $wp_meta_boxes[ $this->id ] ) || ! empty( $columns ) )
- $show_screen = true;
-
- // Check if there are per-page options.
- $show_screen = $show_screen || isset( $this->_options['per_page'] );
-
- $this->_screen_settings = apply_filters( 'screen_settings', '', $this );
-
</del><ins>+ // Default screen_settings for various screens.
+ // TODO: should probably be set on these screens, not here.
</ins><span class="cx"> switch ( $this->id ) {
</span><span class="cx"> case 'widgets':
</span><del>- $this->_screen_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";
- $show_screen = true;
</del><ins>+ $screen_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";
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! empty( $this->_screen_settings ) )
- $show_screen = true;
</del><ins>+ // TODO: deprecate
+ $screen_settings = apply_filters( 'screen_settings', $screen_settings, $this );
</ins><span class="cx">
</span><del>- if ( ! empty( $this->_options ) )
- $show_screen = true;
</del><ins>+ ?>
+ <form id="adv-settings" action="" method="post">
+ <?php
</ins><span class="cx">
</span><del>- $this->_show_screen_options = apply_filters( 'screen_options_show_screen', $show_screen, $this );
- return $this->_show_screen_options;
- }
</del><ins>+ $this->render_table_columns_prefs();
+ $this->render_metabox_prefs();
+ $this->render_screen_layout();
+ $this->render_per_page_options();
+ echo $screen_settings;
</ins><span class="cx">
</span><del>- public function add_screen_options($before = '') {
- $this->add_help_tab( array(
- 'title' => __('Screen Options'),
- 'id' => 'screen-options',
- 'callback' => array( $this, 'render_screen_options' ),
- 'content' => $before
- ));
</del><ins>+ wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?>
+ </form>
+ <?php
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Render the screen options tab.
</del><ins>+ * Render the option for hiding table columns on the page
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> */
</span><del>- public function render_screen_options() {
- global $wp_meta_boxes, $wp_list_table;
-
</del><ins>+ function render_table_columns_prefs() {
</ins><span class="cx"> $columns = get_column_headers( $this );
</span><del>- $hidden = get_hidden_columns( $this );
- $this->_screen_settings = apply_filters( 'screen_settings', '', $this );
</del><span class="cx">
</span><del>- switch ( $this->id ) {
- case 'widgets':
- $this->_screen_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";
- break;
- }
-
- ?>
- <form id="adv-settings" action="" method="post">
- <?php if ( isset( $wp_meta_boxes[ $this->id ] ) ) : ?>
- <h5><?php _ex('Show on screen', 'Metaboxes') ?></h5>
- <div class="metabox-prefs">
- <?php meta_box_prefs( $this ); ?>
- <br class="clear" />
- </div>
- <?php endif;
- if ( ! empty( $columns ) ) : ?>
</del><ins>+ if ( ! empty( $columns ) ) {
+ $hidden = get_hidden_columns( $this );
+ ?>
</ins><span class="cx"> <h5><?php echo ( isset( $columns['_title'] ) ? $columns['_title'] : _x('Show on screen', 'Columns') ) ?></h5>
</span><span class="cx"> <div class="metabox-prefs">
</span><span class="cx"> <?php
</span><span class="lines">@@ -792,6 +819,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'comments' == $column )
</span><span class="cx"> $title = __( 'Comments' );
</span><ins>+
</ins><span class="cx"> $id = "$column-hide";
</span><span class="cx"> echo '<label for="' . $id . '">';
</span><span class="cx"> echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( !in_array($column, $hidden), true, false ) . ' />';
</span><span class="lines">@@ -800,16 +828,26 @@
</span><span class="cx"> ?>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </div>
</span><del>- <?php endif;
</del><ins>+ <?php }
+ }
</ins><span class="cx">
</span><del>- $this->render_screen_layout();
- $this->render_per_page_options();
- echo $this->_screen_settings;
</del><ins>+ /**
+ * Render the option for hiding metaboxes on the page
+ *
+ * @since 3.3.0
+ */
+ function render_metabox_prefs() {
+ global $wp_meta_boxes;
</ins><span class="cx">
</span><del>- ?>
- <div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div>
- </form>
- <?php
</del><ins>+ if ( isset( $wp_meta_boxes[ $this->id ] ) ) {
+ ?>
+ <h5><?php _ex('Show on screen', 'Metaboxes') ?></h5>
+ <div class="metabox-prefs">
+ <?php meta_box_prefs( $this ); ?>
+ <br class="clear" />
+ </div>
+ <?php
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -821,10 +859,11 @@
</span><span class="cx"> global $screen_layout_columns;
</span><span class="cx">
</span><span class="cx"> // Back compat for plugins using the filter instead of add_screen_option()
</span><ins>+ // TODO: deprecate it
</ins><span class="cx"> $columns = apply_filters( 'screen_layout_columns', array(), $this->id, $this );
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) )
</span><del>- add_screen_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
</del><ins>+ $this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
</ins><span class="cx">
</span><span class="cx"> if ( ! isset( $this->_options['layout_columns'] ) ) {
</span><span class="cx"> $screen_layout_columns = 0;
</span><span class="lines">@@ -869,7 +908,7 @@
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> */
</span><span class="cx"> function render_per_page_options() {
</span><del>- if ( ! isset( $this->_options['per_page'] ) )
</del><ins>+ if ( empty( $this->_options['per_page'] ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $per_page_label = $this->_options['per_page']['label'];
</span><span class="lines">@@ -919,3 +958,4 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins></span></pre></div>
<a id="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/index.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -23,61 +23,65 @@
</span><span class="cx"> $parent_file = 'index.php';
</span><span class="cx">
</span><span class="cx"> if ( is_user_admin() )
</span><del>- add_screen_option('layout_columns', array('max' => 4, 'default' => 1) );
</del><ins>+ $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 1) );
</ins><span class="cx"> else
</span><del>- add_screen_option('layout_columns', array('max' => 4, 'default' => 'auto') );
</del><ins>+ $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 'auto') );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Help tabs
</span><span class="cx">
</span><del>-$help_overview = '<p>' . __('Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the top bar.') . '</p>';
</del><ins>+$help = '<p>' . __('Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the top bar.') . '</p>';
</ins><span class="cx">
</span><span class="cx"> $current_screen->add_help_tab( array(
</span><span class="cx"> 'title' => __('Overview'),
</span><del>- 'content' => $help_overview,
</del><ins>+ 'id' => 'overview',
+ 'content' => $help
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>-$help_navigation = '<p>' . __('The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.') . '</p>';
-$help_navigation .= '<p>' . __('Links in the &#8220;admin bar&#8221; at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.') . '</p>';
</del><ins>+$help = '<p>' . __('The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.') . '</p>
+<p>' . __('Links in the &#8220;admin bar&#8221; at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.') . '</p>';
</ins><span class="cx">
</span><span class="cx"> $current_screen->add_help_tab( array(
</span><span class="cx"> 'title' => __('Navigation'),
</span><del>- 'content' => $help_navigation,
</del><ins>+ 'id' => 'navigation',
+ 'content' => $help
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>-$help_layout = '<p>' . __('You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.') . '</p>';
-$help_layout .= '<p>' . __('<strong>Screen Options</strong> - Use the Screen Options tab to choose which Dashboard boxes to show, and how many columns to display.') . '</p>';
-$help_layout .= '<p>' . __('<strong>Drag and Drop</strong> - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.') . '</p>';
-$help_layout .= '<p>' . __('<strong>Box Controls</strong> - Click the title bar of the box to expand or collapse it. In addition, some box have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.') . '</p>';
</del><ins>+$help = '<p>' . __('You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.') . '</p>
+<p>' . __('<strong>Screen Options</strong> - Use the Screen Options tab to choose which Dashboard boxes to show, and how many columns to display.') . '</p>
+<p>' . __('<strong>Drag and Drop</strong> - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.') . '</p>
+<p>' . __('<strong>Box Controls</strong> - Click the title bar of the box to expand or collapse it. In addition, some box have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.') . '</p>';
</ins><span class="cx">
</span><span class="cx"> $current_screen->add_help_tab( array(
</span><span class="cx"> 'title' => __('Layout'),
</span><del>- 'content' => $help_layout,
</del><ins>+ 'id' => 'layout',
+ 'content' => $help
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>-$help_content = '<p>' . __('The boxes on your Dashboard screen are:') . '</p>';
-$help_content .= '<p>' . __('<strong>Right Now</strong> - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.') . '</p>';
-$help_content .= '<p>' . __('<strong>Recent Comments</strong> - Shows the most recent comments on your posts (configurable, up to 30) and allows you to moderate them.') . '</p>';
-$help_content .= '<p>' . __('<strong>Incoming Links</strong> - Shows links to your site found by Google Blog Search.') . '</p>';
-$help_content .= '<p>' . __('<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.') . '</p>';
-$help_content .= '<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>';
-$help_content .= '<p>' . __('<strong>WordPress Blog</strong> - Latest news from the official WordPress project.') . '</p>';
-$help_content .= '<p>' . __('<strong>Other WordPress News</strong> - Shows the <a href="http://planet.wordpress.org" target="_blank">WordPress Planet</a> feed. You can configure it to show a different feed of your choosing.') . '</p>';
-$help_content .= '<p>' . __('<strong>Plugins</strong> - Features the most popular, newest, and recently updated plugins from the WordPress.org Plugin Directory.') . '</p>';
</del><ins>+$help = '<p>' . __('The boxes on your Dashboard screen are:') . '</p>
+<p>' . __('<strong>Right Now</strong> - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.') . '</p>
+<p>' . __('<strong>Recent Comments</strong> - Shows the most recent comments on your posts (configurable, up to 30) and allows you to moderate them.') . '</p>
+<p>' . __('<strong>Incoming Links</strong> - Shows links to your site found by Google Blog Search.') . '</p>
+<p>' . __('<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.') . '</p>
+<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>
+<p>' . __('<strong>WordPress Blog</strong> - Latest news from the official WordPress project.') . '</p>
+<p>' . __('<strong>Other WordPress News</strong> - Shows the <a href="http://planet.wordpress.org" target="_blank">WordPress Planet</a> feed. You can configure it to show a different feed of your choosing.') . '</p>
+<p>' . __('<strong>Plugins</strong> - Features the most popular, newest, and recently updated plugins from the WordPress.org Plugin Directory.') . '</p>';
</ins><span class="cx">
</span><span class="cx"> $current_screen->add_help_tab( array(
</span><span class="cx"> 'title' => __('Content'),
</span><del>- 'content' => $help_content,
</del><ins>+ 'id' => 'content',
+ 'content' => $help
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>-$current_screen->add_help_sidebar(
- '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
- '<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>' .
- '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
-);
</del><ins>+$current_screen->add_help_sidebar('
+<p><strong>' . __( 'For more information:' ) . '</strong></p>
+<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>
+<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>
+');
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> include (ABSPATH . 'wp-admin/admin-header.php');
</span></span></pre></div>
<a id="trunkwpadminlinkmanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link-manager.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link-manager.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/link-manager.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> $title = __('Links');
</span><span class="cx"> $this_file = $parent_file = 'link-manager.php';
</span><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/nav-menus.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx"> if ( ! current_theme_supports( 'menus' ) && ! wp_get_nav_menus() )
</span><span class="cx"> $messages[] = '<div id="message" class="updated"><p>' . __('The current theme does not natively support menus, but you can use the &#8220;Custom Menu&#8221; widget to add any menus you create here to the theme&#8217;s sidebar.') . '</p></div>';
</span><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/index.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/index.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/network/index.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -38,9 +38,9 @@
</span><span class="cx"> wp_enqueue_script( 'plugin-install' );
</span><span class="cx"> add_thickbox();
</span><span class="cx">
</span><del>-add_screen_option('layout_columns', array('max' => 4, 'default' => 'auto') );
</del><ins>+$current_screen->add_option('layout_columns', array('max' => 4, 'default' => 'auto') );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworksitethemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-themes.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-themes.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/network/site-themes.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -122,9 +122,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> add_thickbox();
</span><del>-add_screen_option( 'per_page', array( 'label' => _x( 'Themes', 'themes per page (screen options)' ) ) );
</del><ins>+$current_screen->add_option( 'per_page', array( 'label' => _x( 'Themes', 'themes per page (screen options)' ) ) );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/network/site-users.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -153,9 +153,9 @@
</span><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-add_screen_option( 'per_page', array( 'label' => _x( 'Users', 'users per page (screen options)' ) ) );
</del><ins>+$current_screen->add_option( 'per_page', array( 'label' => _x( 'Users', 'users per page (screen options)' ) ) );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/network/sites.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -22,9 +22,9 @@
</span><span class="cx"> $title = __( 'Sites' );
</span><span class="cx"> $parent_file = 'sites.php';
</span><span class="cx">
</span><del>-add_screen_option( 'per_page', array('label' => _x( 'Sites', 'sites per page (screen options)' )) );
</del><ins>+$current_screen->add_option( 'per_page', array('label' => _x( 'Sites', 'sites per page (screen options)' )) );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/themes.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/themes.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/network/themes.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -173,9 +173,9 @@
</span><span class="cx">
</span><span class="cx"> add_thickbox();
</span><span class="cx">
</span><del>-add_screen_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );
</del><ins>+$current_screen->add_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/users.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/users.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/network/users.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -227,9 +227,9 @@
</span><span class="cx"> $title = __( 'Users' );
</span><span class="cx"> $parent_file = 'users.php';
</span><span class="cx">
</span><del>-add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
</del><ins>+$current_screen->add_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</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 (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-install.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/plugin-install.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -35,7 +35,7 @@
</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><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/plugins.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -316,9 +316,9 @@
</span><span class="cx"> wp_enqueue_script('plugin-install');
</span><span class="cx"> add_thickbox();
</span><span class="cx">
</span><del>-add_screen_option( 'per_page', array('label' => _x( 'Plugins', 'plugins per page (screen options)' )) );
</del><ins>+$current_screen->add_option( 'per_page', array('label' => _x( 'Plugins', 'plugins per page (screen options)' )) );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/upload.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -137,9 +137,9 @@
</span><span class="cx"> wp_enqueue_script( 'jquery-ui-draggable' );
</span><span class="cx"> wp_enqueue_script( 'media' );
</span><span class="cx">
</span><del>-add_screen_option( 'per_page', array('label' => _x( 'Media items', 'items per page (screen options)' )) );
</del><ins>+$current_screen->add_option( 'per_page', array('label' => _x( 'Media items', 'items per page (screen options)' )) );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/users.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -17,9 +17,9 @@
</span><span class="cx"> $title = __('Users');
</span><span class="cx"> $parent_file = 'users.php';
</span><span class="cx">
</span><del>-add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
</del><ins>+$current_screen->add_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
</ins><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (18866 => 18867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2011-10-02 18:19:49 UTC (rev 18866)
+++ trunk/wp-admin/widgets.php 2011-10-03 04:00:57 UTC (rev 18867)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> $title = __( 'Widgets' );
</span><span class="cx"> $parent_file = 'themes.php';
</span><span class="cx">
</span><del>-$current_screen->add_screen_options(
</del><ins>+$current_screen->add_option_context(
</ins><span class="cx"> '<p>test</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>