From d021cb8bc08b1c7dd8d9121e163e0dd332afa7a7 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sat, 10 Oct 2015 15:20:24 +0000
Subject: [PATCH] WP Screen: after [34991], avoid unnecessary nesting levels
 and remove unused global import.

See #33646.

Built from https://develop.svn.wordpress.org/trunk@35010


git-svn-id: http://core.svn.wordpress.org/trunk@34975 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-screen.php | 109 ++++++++++++++------------
 wp-includes/version.php               |   2 +-
 2 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/wp-admin/includes/class-wp-screen.php b/wp-admin/includes/class-wp-screen.php
index a01d94be3f..311bdd0b54 100644
--- a/wp-admin/includes/class-wp-screen.php
+++ b/wp-admin/includes/class-wp-screen.php
@@ -965,11 +965,8 @@ final class WP_Screen {
 	 * @param array $options {
 	 *     @type bool $wrap  Whether the screen-options-wrap div will be included. Defaults to true.
 	 * }
-	 * @global array $wp_meta_boxes
 	 */
 	public function render_screen_options( $options = array() ) {
-		global $wp_meta_boxes;
-
 		$options = wp_parse_args( $options, array(
 			'wrap' => true,
 		) );
@@ -1003,32 +1000,38 @@ final class WP_Screen {
 	 * Render the meta boxes preferences.
 	 *
 	 * @since 4.4.0
+	 *
+	 * @global array $wp_meta_boxes
 	 */
 	public function render_meta_boxes_preferences() {
 		global $wp_meta_boxes;
 
-		if ( isset( $wp_meta_boxes[ $this->id ] ) ) : ?>
-			<fieldset class="metabox-prefs">
-			<legend><?php _e( 'Boxes' ); ?></legend>
-			<?php
-				meta_box_prefs( $this );
+		if ( ! isset( $wp_meta_boxes[ $this->id ] ) ) {
+			return;
+		}
+		?>
+		<fieldset class="metabox-prefs">
+		<legend><?php _e( 'Boxes' ); ?></legend>
+		<?php
+			meta_box_prefs( $this );
 
-				if ( 'dashboard' === $this->id && has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) {
-					if ( isset( $_GET['welcome'] ) ) {
-						$welcome_checked = empty( $_GET['welcome'] ) ? 0 : 1;
-						update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked );
-					} else {
-						$welcome_checked = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
-						if ( 2 == $welcome_checked && wp_get_current_user()->user_email != get_option( 'admin_email' ) )
-							$welcome_checked = false;
+			if ( 'dashboard' === $this->id && has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) {
+				if ( isset( $_GET['welcome'] ) ) {
+					$welcome_checked = empty( $_GET['welcome'] ) ? 0 : 1;
+					update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked );
+				} else {
+					$welcome_checked = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
+					if ( 2 == $welcome_checked && wp_get_current_user()->user_email != get_option( 'admin_email' ) ) {
+						$welcome_checked = false;
 					}
-					echo '<label for="wp_welcome_panel-hide">';
-					echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
-					echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n";
 				}
-			?>
-			</fieldset>
-		<?php endif;
+				echo '<label for="wp_welcome_panel-hide">';
+				echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
+				echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n";
+			}
+		?>
+		</fieldset>
+		<?php
 	}
 
 	/**
@@ -1041,37 +1044,39 @@ final class WP_Screen {
 		$columns = get_column_headers( $this );
 		$hidden  = get_hidden_columns( $this );
 
-		if ( $columns ) {
-			$legend = ! empty( $columns['_title'] ) ? $columns['_title'] : __( 'Columns' );
-			?>
-			<fieldset class="metabox-prefs">
-			<legend><?php echo $legend; ?></legend>
-			<?php
-			$special = array( '_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname' );
-
-			foreach ( $columns as $column => $title ) {
-				// Can't hide these for they are special
-				if ( in_array( $column, $special ) ) {
-						continue;
-				}
-
-				if ( empty( $title ) ) {
-						continue;
-				}
-
-				if ( 'comments' == $column ) {
-						$title = __( 'Comments' );
-				}
-
-				$id = "$column-hide";
-				echo '<label>';
-				echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" value="' . $column . '"' . checked( ! in_array( $column, $hidden ), true, false ) . ' />';
-				echo "$title</label>\n";
-			}
-			?>
-			</fieldset>
-		<?php
+		if ( ! $columns ) {
+			return;
 		}
+
+		$legend = ! empty( $columns['_title'] ) ? $columns['_title'] : __( 'Columns' );
+		?>
+		<fieldset class="metabox-prefs">
+		<legend><?php echo $legend; ?></legend>
+		<?php
+		$special = array( '_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname' );
+
+		foreach ( $columns as $column => $title ) {
+			// Can't hide these for they are special
+			if ( in_array( $column, $special ) ) {
+				continue;
+			}
+
+			if ( empty( $title ) ) {
+				continue;
+			}
+
+			if ( 'comments' == $column ) {
+				$title = __( 'Comments' );
+			}
+
+			$id = "$column-hide";
+			echo '<label>';
+			echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" value="' . $column . '"' . checked( ! in_array( $column, $hidden ), true, false ) . ' />';
+			echo "$title</label>\n";
+		}
+		?>
+		</fieldset>
+		<?php
 	}
 
 	/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 39ead73caa..139a4206a9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35009';
+$wp_version = '4.4-alpha-35010';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.