Changeset 23658 for trunk/wp-admin/includes/screen.php

Timestamp:

03/09/2013 03:52:27 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Replace deprecated WP_Screen::is_network property with WP_Screen::in_admin( 'network' ). props bpetty. fixes #23215.

File:

• trunk/wp-admin/includes/screen.php (modified) (8 diffs)

trunk/wp-admin/includes/screen.php

@@ -320 +320 @@
     /**
      * 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.
      *
@@ -333 +333 @@
      * @var string
      * @access private
-     */
+     */
     private $_help_sidebar = '';
 
@@ -377 +377 @@
     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 = '' ) {
 
@@ -428 +428 @@
                 $maybe = substr( $id, 5 );
                 if ( taxonomy_exists( $maybe ) ) {
-                    $id = 'edit-tags';
+                    $id = 'edit-tags';
                     $taxonomy = $maybe;
                 } elseif ( post_type_exists( $maybe ) ) {
@@ -434 +434 @@
                     $post_type = $maybe;
                 }
-            }
+            }
 
             if ( ! $in_admin )
@@ -481 +481 @@
                     break;
             }
-        }
+        }
 
         switch ( $base ) {
@@ -514 +514 @@
             $id   .= '-user';
             $base .= '-user';
-        }
+        }
 
         if ( isset( self::$_registry[ $id ] ) ) {
@@ -536 +536 @@
 
         return $screen;
-    }
+    }
 
     /**