<!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>[19110] trunk/wp-admin: Chain off of get_current_screen() instead of using global.</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/19110">19110</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-11-02 02:38:37 +0000 (Wed, 02 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Chain off of get_current_screen() instead of using global. see <a href="http://core.trac.wordpress.org/ticket/19020">#19020</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadminindexphp">trunk/wp-admin/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (19109 => 19110)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2011-11-02 02:36:18 UTC (rev 19109)
+++ trunk/wp-admin/edit-form-advanced.php 2011-11-02 02:38:37 UTC (rev 19110)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> if ( 'post' == $post_type ) {
</span><span class="cx"> $customize_display = '<p>' . __('The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop, and can minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.') . '</p>';
</span><span class="cx">
</span><del>- $current_screen->add_help_tab( array(
</del><ins>+ get_current_screen()->add_help_tab( array(
</ins><span class="cx"> 'id' => 'customize-display',
</span><span class="cx"> 'title' => __('Customizing This Display'),
</span><span class="cx"> 'content' => $customize_display,
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> $title_and_editor = '<p>' . __('<strong>Title</strong> - Enter a title for your post. After you enter a title, you&#8217;ll see the permalink below, which you can edit.') . '</p>';
</span><span class="cx"> $title_and_editor .= '<p>' . __('<strong>Post editor</strong> - Enter the text for your post. There are two modes of editing: Visual and HTML. Choose the mode by clicking on the appropriate tab. Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. The HTML mode allows you to enter raw HTML along with your post text. You can insert media files by clicking the icons above the post editor and following the directions. You can go the distraction-free writing screen, new in 3.2, via the Fullscreen icon in Visual mode (second to last in the top row) or the Fullscreen button in HTML mode (last in the row). Once there, you can make buttons visible by hovering over the top area. Exit Fullscreen back to the regular post editor.') . '</p>';
</span><span class="cx">
</span><del>- $current_screen->add_help_tab( array(
</del><ins>+ get_current_screen()->add_help_tab( array(
</ins><span class="cx"> 'id' => 'title-post-editor',
</span><span class="cx"> 'title' => __('Title and Post Editor'),
</span><span class="cx"> 'content' => $title_and_editor,
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> $publish_box .= '<p>' . __('<strong>Featured Image</strong> - This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the featured image as a post thumbnail on the home page, a custom header, etc.') . '</p>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $current_screen->add_help_tab( array(
</del><ins>+ get_current_screen()->add_help_tab( array(
</ins><span class="cx"> 'id' => 'publish-box',
</span><span class="cx"> 'title' => __('Publish Box'),
</span><span class="cx"> 'content' => $publish_box,
</span><span class="lines">@@ -197,13 +197,13 @@
</span><span class="cx"> $discussion_settings = '<p>' . __('<strong>Send Trackbacks</strong> - Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. Enter the URL(s) you want to send trackbacks. If you link to other WordPress sites they&#8217;ll be notified automatically using pingbacks, and this field is unnecessary.') . '</p>';
</span><span class="cx"> $discussion_settings .= '<p>' . __('<strong>Discussion</strong> - You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them.') . '</p>';
</span><span class="cx">
</span><del>- $current_screen->add_help_tab( array(
</del><ins>+ get_current_screen()->add_help_tab( array(
</ins><span class="cx"> 'id' => 'discussion-settings',
</span><span class="cx"> 'title' => __('Discussion Settings'),
</span><span class="cx"> 'content' => $discussion_settings,
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- $current_screen->add_help_sidebar(
</del><ins>+ get_current_screen()->add_help_sidebar(
</ins><span class="cx"> '<p>' . sprintf(__('You can also create posts with the <a href="%s">Press This bookmarklet</a>.'), 'options-writing.php') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Posts_Add_New_Screen" target="_blank">Documentation on Writing and Editing Posts</a>') . '</p>' .
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> $about_pages = '<p>' . __('Pages are similar to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the &#8220;Parent&#8221; of the other, creating a group of Pages.') . '</p>' .
</span><span class="cx"> '<p>' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the new in 3.2 distraction-free writing space, available in both the Visual and HTML modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box:') . '</p>';
</span><span class="cx">
</span><del>- $current_screen->add_help_tab( array(
</del><ins>+ get_current_screen()->add_help_tab( array(
</ins><span class="cx"> 'id' => 'about-pages',
</span><span class="cx"> 'title' => __('About Pages'),
</span><span class="cx"> 'content' => $about_pages,
</span><span class="lines">@@ -223,13 +223,13 @@
</span><span class="cx"> '<p>' . __('<strong>Template</strong> - Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.') . '</p>' .
</span><span class="cx"> '<p>' . __('<strong>Order</strong> - Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.') . '</p>';
</span><span class="cx">
</span><del>- $current_screen->add_help_tab( array(
</del><ins>+ get_current_screen()->add_help_tab( array(
</ins><span class="cx"> 'id' => 'page-attributes',
</span><span class="cx"> 'title' => __('Page Attributes'),
</span><span class="cx"> 'content' => $page_attributes,
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- $current_screen->add_help_sidebar(
</del><ins>+ get_current_screen()->add_help_sidebar(
</ins><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Pages_Add_New_Screen" target="_blank">Documentation on Adding New Pages</a>') . '</p>' .
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Pages_Screen#Editing_Individual_Pages" target="_blank">Documentation on Editing Pages</a>') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (19109 => 19110)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2011-11-02 02:36:18 UTC (rev 19109)
+++ trunk/wp-admin/index.php 2011-11-02 02:38:37 UTC (rev 19110)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> $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>';
</span><span class="cx"> $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>';
</span><span class="cx">
</span><del>-$current_screen->add_help_tab( array(
</del><ins>+get_current_screen()->add_help_tab( array(
</ins><span class="cx"> 'id' => 'help-navigation',
</span><span class="cx"> 'title' => __('Navigation'),
</span><span class="cx"> 'content' => $help_navigation,
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> $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>';
</span><span class="cx"> $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>';
</span><span class="cx">
</span><del>-$current_screen->add_help_tab( array(
</del><ins>+get_current_screen()->add_help_tab( array(
</ins><span class="cx"> 'id' => 'help-layout',
</span><span class="cx"> 'title' => __('Layout'),
</span><span class="cx"> 'content' => $help_layout,
</span><span class="lines">@@ -64,13 +64,13 @@
</span><span class="cx"> $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>';
</span><span class="cx"> $help_content .= '<p>' . __('<strong>Plugins</strong> - Features the most popular, newest, and recently updated plugins from the WordPress.org Plugin Directory.') . '</p>';
</span><span class="cx">
</span><del>-$current_screen->add_help_tab( array(
</del><ins>+get_current_screen()->add_help_tab( array(
</ins><span class="cx"> 'id' => 'help-content',
</span><span class="cx"> 'title' => __('Content'),
</span><span class="cx"> 'content' => $help_content,
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>-$current_screen->add_help_sidebar(
</del><ins>+get_current_screen()->add_help_sidebar(
</ins><span class="cx"> '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
</span><span class="cx"> '<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>' .
</span><span class="cx"> '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
</span></span></pre>
</div>
</div>
</body>
</html>