Wordpress 3.6

[autoinstalls/wordpress.git] / wp-admin / includes / screen.php

diff --git a/wp-admin/includes/screen.php b/wp-admin/includes/screen.php
index 4a409e8c68b4297b831469ccf2c43801708cd0a4..2ab5161bff08601df3e8d407ac79e9c827438374 100644 (file)
--- a/wp-admin/includes/screen.php
+++ b/wp-admin/includes/screen.php
@@ -142,6 +142,7 @@ function screen_icon( $screen = '' ) {
  *
  * @since 3.2.0
  *
+ * @global $post_ID
  * @param string|WP_Screen $screen Optional. Accepts a screen object (and defaults to the current screen object)
  *     which it uses to determine an icon HTML ID. Or, if a string is provided, it is used to form the icon HTML ID.
  * @return string HTML for the screen icon.
@@ -319,20 +320,20 @@ final class WP_Screen {
 
        /**
         * The help tab data associated with the screen, if any.
-        *
-        * @since 3.3.0
-        * @var array
-        * @access private
-        */
+        *
+        * @since 3.3.0
+        * @var array
+        * @access private
+        */
        private $_help_tabs = array();
 
-       /**
+       /**
         * The help sidebar data associated with screen, if any.
         *
         * @since 3.3.0
         * @var string
         * @access private
-        */
+        */
        private $_help_sidebar = '';
 
        /**
@@ -376,16 +377,16 @@ final class WP_Screen {
         */
        private $_screen_settings;
 
-       /**
+       /**
         * Fetches a screen object.
-        *
-        * @since 3.3.0
+        *
+        * @since 3.3.0
         * @access public
-        *
+        *
         * @param string $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen.
         *      Defaults to the current $hook_suffix global.
         * @return WP_Screen Screen object.
-        */
+        */
        public static function get( $hook_name = '' ) {
 
                if ( is_a( $hook_name, 'WP_Screen' ) )
@@ -427,13 +428,13 @@ final class WP_Screen {
                        if ( 'edit-comments' != $id && 'edit-tags' != $id && 'edit-' == substr( $id, 0, 5 ) ) {
                                $maybe = substr( $id, 5 );
                                if ( taxonomy_exists( $maybe ) ) {
-                                       $id = 'edit-tags';
+                                       $id = 'edit-tags';
                                        $taxonomy = $maybe;
                                } elseif ( post_type_exists( $maybe ) ) {
                                        $id = 'edit';
                                        $post_type = $maybe;
                                }
-                       }
+                       }
 
                        if ( ! $in_admin )
                                $in_admin = 'site';
@@ -480,7 +481,7 @@ final class WP_Screen {
                                                $post_type = 'post';
                                        break;
                        }
-               }
+               }
 
                switch ( $base ) {
                        case 'post' :
@@ -513,7 +514,7 @@ final class WP_Screen {
                } elseif ( 'user' == $in_admin ) {
                        $id   .= '-user';
                        $base .= '-user';
-               }
+               }
 
                if ( isset( self::$_registry[ $id ] ) ) {
                        $screen = self::$_registry[ $id ];
@@ -535,7 +536,7 @@ final class WP_Screen {
                self::$_registry[ $id ] = $screen;
 
                return $screen;
-       }
+       }
 
        /**
         * Makes the screen object the current screen.
@@ -898,14 +899,17 @@ final class WP_Screen {
 
                $show_screen = ! empty( $wp_meta_boxes[ $this->id ] ) || $columns || $this->get_option( 'per_page' );
 
-               $this->_screen_settings = apply_filters( 'screen_settings', '', $this );
-
                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;
+                       default:
+                               $this->_screen_settings = '';
+                               break;
                }
 
+               $this->_screen_settings = apply_filters( 'screen_settings', $this->_screen_settings, $this );
+
                if ( $this->_screen_settings || $this->_options )
                        $show_screen = true;
 
@@ -923,6 +927,7 @@ final class WP_Screen {
 
                $columns = get_column_headers( $this );
                $hidden  = get_hidden_columns( $this );
+               $post    = get_post();
 
                ?>
                <div id="screen-options-wrap" class="hidden" tabindex="-1" aria-label="<?php esc_attr_e('Screen Options Tab'); ?>">