Changeset 42343 for trunk/src/wp-admin/includes/screen.php

Timestamp:

11/30/2017 11:09:33 PM (8 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

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

trunk/src/wp-admin/includes/screen.php

@@ -18 +18 @@
  */
 function get_column_headers( $screen ) {
-    if ( is_string( $screen ) )
-        $screen = convert_to_screen( $screen );
+    if ( is_string( $screen ) ) {
+        $screen = convert_to_screen( $screen );
+    }
 
     static $column_headers = array();
@@ -99 +100 @@
     global $wp_meta_boxes;
 
-    if ( is_string( $screen ) )
-        $screen = convert_to_screen( $screen );
-
-    if ( empty($wp_meta_boxes[$screen->id]) )
+    if ( is_string( $screen ) ) {
+        $screen = convert_to_screen( $screen );
+    }
+
+    if ( empty( $wp_meta_boxes[ $screen->id ] ) ) {
         return;
-
-    $hidden = get_hidden_meta_boxes($screen);
+    }
+
+    $hidden = get_hidden_meta_boxes( $screen );
 
     foreach ( array_keys( $wp_meta_boxes[ $screen->id ] ) as $context ) {
@@ -113 +116 @@
             }
             foreach ( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] as $box ) {
-                if ( false == $box || ! $box['title'] )
+                if ( false == $box || ! $box['title'] ) {
                     continue;
+                }
                 // Submit box cannot be hidden
-                if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] )
+                if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] ) {
                     continue;
+                }
 
                 $widget_title = $box['title'];
@@ -145 +150 @@
  */
 function get_hidden_meta_boxes( $screen ) {
-    if ( is_string( $screen ) )
-        $screen = convert_to_screen( $screen );
+    if ( is_string( $screen ) ) {
+        $screen = convert_to_screen( $screen );
+    }
 
     $hidden = get_user_option( "metaboxhidden_{$screen->id}" );
@@ -156 +162 @@
         $hidden = array();
         if ( 'post' == $screen->base ) {
-            if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type )
-                $hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
-            else
+            if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type ) {
+                $hidden = array( 'slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv' );
+            } else {
                 $hidden = array( 'slugdiv' );
+            }
         }
 
@@ -197 +204 @@
     $current_screen = get_current_screen();
 
-    if ( ! $current_screen )
+    if ( ! $current_screen ) {
         return;
+    }
 
     $current_screen->add_option( $option, $args );
@@ -215 +223 @@
     global $current_screen;
 
-    if ( ! isset( $current_screen ) )
+    if ( ! isset( $current_screen ) ) {
         return null;
+    }
 
     return $current_screen;
@@ -227 +236 @@
  *
  * @param mixed $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen,
- *                         or an existing screen object.
+ *                         or an existing screen object.
  */
 function set_current_screen( $hook_name = '' ) {