Changeset 19110

Timestamp:

11/02/2011 02:38:37 AM (14 years ago)

Author:

ryan

Message:

Chain off of get_current_screen() instead of using global. see #19020

Location:

trunk/wp-admin

Files:

• edit-form-advanced.php (modified) (8 diffs)
• index.php (modified) (4 diffs)

trunk/wp-admin/edit-form-advanced.php

@@ -164 +164 @@
     $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>';
 
-    $current_screen->add_help_tab( array(
+    get_current_screen()->add_help_tab( array(
         'id'      => 'customize-display',
         'title'   => __('Customizing This Display'),
@@ -173 +173 @@
     $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>';
 
-    $current_screen->add_help_tab( array(
+    get_current_screen()->add_help_tab( array(
         'id'      => 'title-post-editor',
         'title'   => __('Title and Post Editor'),
@@ -189 +189 @@
     }
 
-    $current_screen->add_help_tab( array(
+    get_current_screen()->add_help_tab( array(
         'id'      => 'publish-box',
         'title'   => __('Publish Box'),
@@ -198 +198 @@
     $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>';
 
-    $current_screen->add_help_tab( array(
+    get_current_screen()->add_help_tab( array(
         'id'      => 'discussion-settings',
         'title'   => __('Discussion Settings'),
@@ -204 +204 @@
     ) );
 
-    $current_screen->add_help_sidebar(
+    get_current_screen()->add_help_sidebar(
             '<p>' . sprintf(__('You can also create posts with the <a href="%s">Press This bookmarklet</a>.'), 'options-writing.php') . '</p>' .
             '<p><strong>' . __('For more information:') . '</strong></p>' .
@@ -214 +214 @@
         '<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>';
 
-    $current_screen->add_help_tab( array(
+    get_current_screen()->add_help_tab( array(
         'id'      => 'about-pages',
         'title'   => __('About Pages'),
@@ -224 +224 @@
         '<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>';
 
-    $current_screen->add_help_tab( array(
+    get_current_screen()->add_help_tab( array(
         'id' => 'page-attributes',
         'title' => __('Page Attributes'),
@@ -230 +230 @@
     ) );
 
-    $current_screen->add_help_sidebar(
+    get_current_screen()->add_help_sidebar(
             '<p><strong>' . __('For more information:') . '</strong></p>' .
             '<p>' . __('<a href="http://codex.wordpress.org/Pages_Add_New_Screen" target="_blank">Documentation on Adding New Pages</a>') . '</p>' .

trunk/wp-admin/index.php

@@ -38 +38 @@
 $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>';
 
-$current_screen->add_help_tab( array(
+get_current_screen()->add_help_tab( array(
         'id'      => 'help-navigation',
     'title'   => __('Navigation'),
@@ -49 +49 @@
 $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>';
 
-$current_screen->add_help_tab( array(
+get_current_screen()->add_help_tab( array(
         'id'      => 'help-layout',
     'title'   => __('Layout'),
@@ -65 +65 @@
 $help_content .= '<p>' . __('<strong>Plugins</strong> - Features the most popular, newest, and recently updated plugins from the WordPress.org Plugin Directory.') . '</p>';
 
-$current_screen->add_help_tab( array(
+get_current_screen()->add_help_tab( array(
         'id'      => 'help-content',
     'title'   => __('Content'),
@@ -71 +71 @@
 ) );
 
-$current_screen->add_help_sidebar(
+get_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>' .