ntwb / wordpress

src/wp-includes/class-wp-customize-manager.php

Doc Comments +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
 	 *
 	 * @since 3.4.0
 	 *
-	 * @param mixed $ajax_message AJAX return
+	 * @param integer $ajax_message AJAX return
 	 * @param mixed $message UI message
 	 */
 	protected function wp_die( $ajax_message, $message = null ) {

Spacing +365 added lines, -365 removed lines

@@ -106,39 +106,39 @@ 
 	 * @since 3.4.0
 	 */
 	public function __construct() {
-		require_once( ABSPATH . WPINC . '/class-wp-customize-setting.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-panel.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-section.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-control.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-widgets.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-nav-menus.php' );
+		require_once(ABSPATH.WPINC.'/class-wp-customize-setting.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-panel.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-section.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-control.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-widgets.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-nav-menus.php');
 
-		$this->widgets = new WP_Customize_Widgets( $this );
-		$this->nav_menus = new WP_Customize_Nav_Menus( $this );
+		$this->widgets = new WP_Customize_Widgets($this);
+		$this->nav_menus = new WP_Customize_Nav_Menus($this);
 
-		add_filter( 'wp_die_handler', array( $this, 'wp_die_handler' ) );
+		add_filter('wp_die_handler', array($this, 'wp_die_handler'));
 
-		add_action( 'setup_theme', array( $this, 'setup_theme' ) );
-		add_action( 'wp_loaded',   array( $this, 'wp_loaded' ) );
+		add_action('setup_theme', array($this, 'setup_theme'));
+		add_action('wp_loaded', array($this, 'wp_loaded'));
 
 		// Run wp_redirect_status late to make sure we override the status last.
-		add_action( 'wp_redirect_status', array( $this, 'wp_redirect_status' ), 1000 );
+		add_action('wp_redirect_status', array($this, 'wp_redirect_status'), 1000);
 
 		// Do not spawn cron (especially the alternate cron) while running the Customizer.
-		remove_action( 'init', 'wp_cron' );
+		remove_action('init', 'wp_cron');
 
 		// Do not run update checks when rendering the controls.
-		remove_action( 'admin_init', '_maybe_update_core' );
-		remove_action( 'admin_init', '_maybe_update_plugins' );
-		remove_action( 'admin_init', '_maybe_update_themes' );
+		remove_action('admin_init', '_maybe_update_core');
+		remove_action('admin_init', '_maybe_update_plugins');
+		remove_action('admin_init', '_maybe_update_themes');
 
-		add_action( 'wp_ajax_customize_save',           array( $this, 'save' ) );
-		add_action( 'wp_ajax_customize_refresh_nonces', array( $this, 'refresh_nonces' ) );
+		add_action('wp_ajax_customize_save', array($this, 'save'));
+		add_action('wp_ajax_customize_refresh_nonces', array($this, 'refresh_nonces'));
 
-		add_action( 'customize_register',                 array( $this, 'register_controls' ) );
-		add_action( 'customize_register',                 array( $this, 'register_dynamic_settings' ), 11 ); // allow code to create settings first
-		add_action( 'customize_controls_init',            array( $this, 'prepare_controls' ) );
-		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_control_scripts' ) );
+		add_action('customize_register', array($this, 'register_controls'));
+		add_action('customize_register', array($this, 'register_dynamic_settings'), 11); // allow code to create settings first
+		add_action('customize_controls_init', array($this, 'prepare_controls'));
+		add_action('customize_controls_enqueue_scripts', array($this, 'enqueue_control_scripts'));
 	}
 
 	/**
@@ -151,20 +151,20 @@ 
 	 * @param string|null $action Whether the supplied AJAX action is being run.
 	 * @return bool True if it's an AJAX request, false otherwise.
 	 */
-	public function doing_ajax( $action = null ) {
-		$doing_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
-		if ( ! $doing_ajax ) {
+	public function doing_ajax($action = null) {
+		$doing_ajax = (defined('DOING_AJAX') && DOING_AJAX);
+		if ( ! $doing_ajax) {
 			return false;
 		}
 
-		if ( ! $action ) {
+		if ( ! $action) {
 			return true;
 		} else {
 			/*
 			 * Note: we can't just use doing_action( "wp_ajax_{$action}" ) because we need
 			 * to check before admin-ajax.php gets to that point.
 			 */
-			return isset( $_REQUEST['action'] ) && wp_unslash( $_REQUEST['action'] ) === $action;
+			return isset($_REQUEST['action']) && wp_unslash($_REQUEST['action']) === $action;
 		}
 	}
 
@@ -177,16 +177,16 @@ 
 	 * @param mixed $ajax_message AJAX return
 	 * @param mixed $message UI message
 	 */
-	protected function wp_die( $ajax_message, $message = null ) {
-		if ( $this->doing_ajax() || isset( $_POST['customized'] ) ) {
-			wp_die( $ajax_message );
+	protected function wp_die($ajax_message, $message = null) {
+		if ($this->doing_ajax() || isset($_POST['customized'])) {
+			wp_die($ajax_message);
 		}
 
-		if ( ! $message ) {
-			$message = __( 'Cheatin’ uh?' );
+		if ( ! $message) {
+			$message = __('Cheatin’ uh?');
 		}
 
-		wp_die( $message );
+		wp_die($message);
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 * @return string
 	 */
 	public function wp_die_handler() {
-		if ( $this->doing_ajax() || isset( $_POST['customized'] ) ) {
+		if ($this->doing_ajax() || isset($_POST['customized'])) {
 			return '_ajax_wp_die_handler';
 		}
 
@@ -214,40 +214,40 @@ 
 	public function setup_theme() {
 		send_origin_headers();
 
-		$doing_ajax_or_is_customized = ( $this->doing_ajax() || isset( $_POST['customized'] ) );
-		if ( is_admin() && ! $doing_ajax_or_is_customized ) {
+		$doing_ajax_or_is_customized = ($this->doing_ajax() || isset($_POST['customized']));
+		if (is_admin() && ! $doing_ajax_or_is_customized) {
 			auth_redirect();
-		} elseif ( $doing_ajax_or_is_customized && ! is_user_logged_in() ) {
-			$this->wp_die( 0 );
+		} elseif ($doing_ajax_or_is_customized && ! is_user_logged_in()) {
+			$this->wp_die(0);
 		}
 
-		show_admin_bar( false );
+		show_admin_bar(false);
 
-		if ( ! current_user_can( 'customize' ) ) {
+		if ( ! current_user_can('customize')) {
 			$this->wp_die( -1 );
 		}
 
 		$this->original_stylesheet = get_stylesheet();
 
-		$this->theme = wp_get_theme( isset( $_REQUEST['theme'] ) ? $_REQUEST['theme'] : null );
+		$this->theme = wp_get_theme(isset($_REQUEST['theme']) ? $_REQUEST['theme'] : null);
 
-		if ( $this->is_theme_active() ) {
+		if ($this->is_theme_active()) {
 			// Once the theme is loaded, we'll validate it.
-			add_action( 'after_setup_theme', array( $this, 'after_setup_theme' ) );
+			add_action('after_setup_theme', array($this, 'after_setup_theme'));
 		} else {
 			// If the requested theme is not the active theme and the user doesn't have the
 			// switch_themes cap, bail.
-			if ( ! current_user_can( 'switch_themes' ) ) {
+			if ( ! current_user_can('switch_themes')) {
 				$this->wp_die( -1 );
 			}
 
 			// If the theme has errors while loading, bail.
-			if ( $this->theme()->errors() ) {
+			if ($this->theme()->errors()) {
 				$this->wp_die( -1 );
 			}
 
 			// If the theme isn't allowed per multisite settings, bail.
-			if ( ! $this->theme()->is_allowed() ) {
+			if ( ! $this->theme()->is_allowed()) {
 				$this->wp_die( -1 );
 			}
 		}
@@ -261,9 +261,9 @@ 
 	 * @since 3.4.0
 	 */
 	public function after_setup_theme() {
-		$doing_ajax_or_is_customized = ( $this->doing_ajax() || isset( $_SERVER['customized'] ) );
-		if ( ! $doing_ajax_or_is_customized && ! validate_current_theme() ) {
-			wp_redirect( 'themes.php?broken=true' );
+		$doing_ajax_or_is_customized = ($this->doing_ajax() || isset($_SERVER['customized']));
+		if ( ! $doing_ajax_or_is_customized && ! validate_current_theme()) {
+			wp_redirect('themes.php?broken=true');
 			exit;
 		}
 	}
@@ -276,24 +276,24 @@ 
 	 */
 	public function start_previewing_theme() {
 		// Bail if we're already previewing.
-		if ( $this->is_preview() ) {
+		if ($this->is_preview()) {
 			return;
 		}
 
 		$this->previewing = true;
 
-		if ( ! $this->is_theme_active() ) {
-			add_filter( 'template', array( $this, 'get_template' ) );
-			add_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
-			add_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
+		if ( ! $this->is_theme_active()) {
+			add_filter('template', array($this, 'get_template'));
+			add_filter('stylesheet', array($this, 'get_stylesheet'));
+			add_filter('pre_option_current_theme', array($this, 'current_theme'));
 
 			// @link: https://core.trac.wordpress.org/ticket/20027
-			add_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
-			add_filter( 'pre_option_template', array( $this, 'get_template' ) );
+			add_filter('pre_option_stylesheet', array($this, 'get_stylesheet'));
+			add_filter('pre_option_template', array($this, 'get_template'));
 
 			// Handle custom theme roots.
-			add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
-			add_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
+			add_filter('pre_option_stylesheet_root', array($this, 'get_stylesheet_root'));
+			add_filter('pre_option_template_root', array($this, 'get_template_root'));
 		}
 
 		/**
@@ -303,7 +303,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'start_previewing_theme', $this );
+		do_action('start_previewing_theme', $this);
 	}
 
 	/**
@@ -314,24 +314,24 @@ 
 	 * @since 3.4.0
 	 */
 	public function stop_previewing_theme() {
-		if ( ! $this->is_preview() ) {
+		if ( ! $this->is_preview()) {
 			return;
 		}
 
 		$this->previewing = false;
 
-		if ( ! $this->is_theme_active() ) {
-			remove_filter( 'template', array( $this, 'get_template' ) );
-			remove_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
-			remove_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
+		if ( ! $this->is_theme_active()) {
+			remove_filter('template', array($this, 'get_template'));
+			remove_filter('stylesheet', array($this, 'get_stylesheet'));
+			remove_filter('pre_option_current_theme', array($this, 'current_theme'));
 
 			// @link: https://core.trac.wordpress.org/ticket/20027
-			remove_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
-			remove_filter( 'pre_option_template', array( $this, 'get_template' ) );
+			remove_filter('pre_option_stylesheet', array($this, 'get_stylesheet'));
+			remove_filter('pre_option_template', array($this, 'get_template'));
 
 			// Handle custom theme roots.
-			remove_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
-			remove_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
+			remove_filter('pre_option_stylesheet_root', array($this, 'get_stylesheet_root'));
+			remove_filter('pre_option_template_root', array($this, 'get_template_root'));
 		}
 
 		/**
@@ -341,7 +341,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'stop_previewing_theme', $this );
+		do_action('stop_previewing_theme', $this);
 	}
 
 	/**
@@ -352,7 +352,7 @@ 
 	 * @return WP_Theme
 	 */
 	public function theme() {
-		if ( ! $this->theme ) {
+		if ( ! $this->theme) {
 			$this->theme = wp_get_theme();
 		}
 		return $this->theme;
@@ -439,9 +439,9 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_register', $this );
+		do_action('customize_register', $this);
 
-		if ( $this->is_preview() && ! is_admin() )
+		if ($this->is_preview() && ! is_admin())
 			$this->customize_preview_init();
 	}
 
@@ -456,8 +456,8 @@ 
 	 * @param $status
 	 * @return int
 	 */
-	public function wp_redirect_status( $status ) {
-		if ( $this->is_preview() && ! is_admin() )
+	public function wp_redirect_status($status) {
+		if ($this->is_preview() && ! is_admin())
 			return 200;
 
 		return $status;
@@ -472,15 +472,15 @@ 
 	 * @return array
 	 */
 	public function unsanitized_post_values() {
-		if ( ! isset( $this->_post_values ) ) {
-			if ( isset( $_POST['customized'] ) ) {
-				$this->_post_values = json_decode( wp_unslash( $_POST['customized'] ), true );
+		if ( ! isset($this->_post_values)) {
+			if (isset($_POST['customized'])) {
+				$this->_post_values = json_decode(wp_unslash($_POST['customized']), true);
 			}
-			if ( empty( $this->_post_values ) ) { // if not isset or if JSON error
+			if (empty($this->_post_values)) { // if not isset or if JSON error
 				$this->_post_values = array();
 			}
 		}
-		if ( empty( $this->_post_values ) ) {
+		if (empty($this->_post_values)) {
 			return array();
 		} else {
 			return $this->_post_values;
@@ -497,10 +497,10 @@ 
 	 * @param mixed $default value returned $setting has no post value (added in 4.2.0).
 	 * @return string|mixed $post_value Sanitized value or the $default provided
 	 */
-	public function post_value( $setting, $default = null ) {
+	public function post_value($setting, $default = null) {
 		$post_values = $this->unsanitized_post_values();
-		if ( array_key_exists( $setting->id, $post_values ) ) {
-			return $setting->sanitize( $post_values[ $setting->id ] );
+		if (array_key_exists($setting->id, $post_values)) {
+			return $setting->sanitize($post_values[$setting->id]);
 		} else {
 			return $default;
 		}
@@ -515,9 +515,9 @@ 
 	 * @param string $setting_id ID for the WP_Customize_Setting instance.
 	 * @param mixed  $value      Post value.
 	 */
-	public function set_post_value( $setting_id, $value ) {
+	public function set_post_value($setting_id, $value) {
 		$this->unsanitized_post_values();
-		$this->_post_values[ $setting_id ] = $value;
+		$this->_post_values[$setting_id] = $value;
 	}
 
 	/**
@@ -526,20 +526,20 @@ 
 	 * @since 3.4.0
 	 */
 	public function customize_preview_init() {
-		$this->nonce_tick = check_ajax_referer( 'preview-customize_' . $this->get_stylesheet(), 'nonce' );
+		$this->nonce_tick = check_ajax_referer('preview-customize_'.$this->get_stylesheet(), 'nonce');
 
 		$this->prepare_controls();
 
-		wp_enqueue_script( 'customize-preview' );
-		add_action( 'wp', array( $this, 'customize_preview_override_404_status' ) );
-		add_action( 'wp_head', array( $this, 'customize_preview_base' ) );
-		add_action( 'wp_head', array( $this, 'customize_preview_html5' ) );
-		add_action( 'wp_head', array( $this, 'customize_preview_loading_style' ) );
-		add_action( 'wp_footer', array( $this, 'customize_preview_settings' ), 20 );
-		add_action( 'shutdown', array( $this, 'customize_preview_signature' ), 1000 );
-		add_filter( 'wp_die_handler', array( $this, 'remove_preview_signature' ) );
+		wp_enqueue_script('customize-preview');
+		add_action('wp', array($this, 'customize_preview_override_404_status'));
+		add_action('wp_head', array($this, 'customize_preview_base'));
+		add_action('wp_head', array($this, 'customize_preview_html5'));
+		add_action('wp_head', array($this, 'customize_preview_loading_style'));
+		add_action('wp_footer', array($this, 'customize_preview_settings'), 20);
+		add_action('shutdown', array($this, 'customize_preview_signature'), 1000);
+		add_filter('wp_die_handler', array($this, 'remove_preview_signature'));
 
-		foreach ( $this->settings as $setting ) {
+		foreach ($this->settings as $setting) {
 			$setting->preview();
 		}
 
@@ -551,7 +551,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_preview_init', $this );
+		do_action('customize_preview_init', $this);
 	}
 
 	/**
@@ -562,8 +562,8 @@ 
 	 * @access public
 	 */
 	public function customize_preview_override_404_status() {
-		if ( is_404() ) {
-			status_header( 200 );
+		if (is_404()) {
+			status_header(200);
 		}
 	}
 
@@ -573,7 +573,7 @@ 
 	 * @since 3.4.0
 	 */
 	public function customize_preview_base() {
-		?><base href="<?php echo home_url( '/' ); ?>" /><?php
+		?><base href="<?php echo home_url('/'); ?>" /><?php
 	}
 
 	/**
@@ -622,51 +622,51 @@ 
 	public function customize_preview_settings() {
 		$settings = array(
 			'values'  => array(),
-			'channel' => wp_unslash( $_POST['customize_messenger_channel'] ),
+			'channel' => wp_unslash($_POST['customize_messenger_channel']),
 			'activePanels' => array(),
 			'activeSections' => array(),
 			'activeControls' => array(),
 			'l10n' => array(
-				'loading'  => __( 'Loading ...' ),
+				'loading'  => __('Loading ...'),
 			),
 		);
 
-		if ( 2 == $this->nonce_tick ) {
+		if (2 == $this->nonce_tick) {
 			$settings['nonce'] = array(
-				'save' => wp_create_nonce( 'save-customize_' . $this->get_stylesheet() ),
-				'preview' => wp_create_nonce( 'preview-customize_' . $this->get_stylesheet() )
+				'save' => wp_create_nonce('save-customize_'.$this->get_stylesheet()),
+				'preview' => wp_create_nonce('preview-customize_'.$this->get_stylesheet())
 			);
 		}
 
-		foreach ( $this->settings as $id => $setting ) {
-			if ( $setting->check_capabilities() ) {
-				$settings['values'][ $id ] = $setting->js_value();
+		foreach ($this->settings as $id => $setting) {
+			if ($setting->check_capabilities()) {
+				$settings['values'][$id] = $setting->js_value();
 			}
 		}
-		foreach ( $this->panels as $panel_id => $panel ) {
-			if ( $panel->check_capabilities() ) {
-				$settings['activePanels'][ $panel_id ] = $panel->active();
-				foreach ( $panel->sections as $section_id => $section ) {
-					if ( $section->check_capabilities() ) {
-						$settings['activeSections'][ $section_id ] = $section->active();
+		foreach ($this->panels as $panel_id => $panel) {
+			if ($panel->check_capabilities()) {
+				$settings['activePanels'][$panel_id] = $panel->active();
+				foreach ($panel->sections as $section_id => $section) {
+					if ($section->check_capabilities()) {
+						$settings['activeSections'][$section_id] = $section->active();
 					}
 				}
 			}
 		}
-		foreach ( $this->sections as $id => $section ) {
-			if ( $section->check_capabilities() ) {
-				$settings['activeSections'][ $id ] = $section->active();
+		foreach ($this->sections as $id => $section) {
+			if ($section->check_capabilities()) {
+				$settings['activeSections'][$id] = $section->active();
 			}
 		}
-		foreach ( $this->controls as $id => $control ) {
-			if ( $control->check_capabilities() ) {
-				$settings['activeControls'][ $id ] = $control->active();
+		foreach ($this->controls as $id => $control) {
+			if ($control->check_capabilities()) {
+				$settings['activeControls'][$id] = $control->active();
 			}
 		}
 
 		?>
 		<script type="text/javascript">
-			var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+			var _wpCustomizeSettings = <?php echo wp_json_encode($settings); ?>;
 		</script>
 		<?php
 	}
@@ -687,8 +687,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function remove_preview_signature( $return = null ) {
-		remove_action( 'shutdown', array( $this, 'customize_preview_signature' ), 1000 );
+	public function remove_preview_signature($return = null) {
+		remove_action('shutdown', array($this, 'customize_preview_signature'), 1000);
 
 		return $return;
 	}
@@ -734,7 +734,7 @@ 
 	 * @return string Theme root.
 	 */
 	public function get_template_root() {
-		return get_raw_theme_root( $this->get_template(), true );
+		return get_raw_theme_root($this->get_template(), true);
 	}
 
 	/**
@@ -745,7 +745,7 @@ 
 	 * @return string Theme root.
 	 */
 	public function get_stylesheet_root() {
-		return get_raw_theme_root( $this->get_stylesheet(), true );
+		return get_raw_theme_root($this->get_stylesheet(), true);
 	}
 
 	/**
@@ -756,7 +756,7 @@ 
 	 * @param $current_theme {@internal Parameter is not used}
 	 * @return string Theme name.
 	 */
-	public function current_theme( $current_theme ) {
+	public function current_theme($current_theme) {
 		return $this->theme()->display('Name');
 	}
 
@@ -766,22 +766,22 @@ 
 	 * @since 3.4.0
 	 */
 	public function save() {
-		if ( ! $this->is_preview() ) {
-			wp_send_json_error( 'not_preview' );
+		if ( ! $this->is_preview()) {
+			wp_send_json_error('not_preview');
 		}
 
-		$action = 'save-customize_' . $this->get_stylesheet();
-		if ( ! check_ajax_referer( $action, 'nonce', false ) ) {
-			wp_send_json_error( 'invalid_nonce' );
+		$action = 'save-customize_'.$this->get_stylesheet();
+		if ( ! check_ajax_referer($action, 'nonce', false)) {
+			wp_send_json_error('invalid_nonce');
 		}
 
 		// Do we have to switch themes?
-		if ( ! $this->is_theme_active() ) {
+		if ( ! $this->is_theme_active()) {
 			// Temporarily stop previewing the theme to allow switch_themes()
 			// to operate properly.
 			$this->stop_previewing_theme();
-			switch_theme( $this->get_stylesheet() );
-			update_option( 'theme_switched_via_customizer', true );
+			switch_theme($this->get_stylesheet());
+			update_option('theme_switched_via_customizer', true);
 			$this->start_previewing_theme();
 		}
 
@@ -793,9 +793,9 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_save', $this );
+		do_action('customize_save', $this);
 
-		foreach ( $this->settings as $setting ) {
+		foreach ($this->settings as $setting) {
 			$setting->save();
 		}
 
@@ -806,7 +806,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_save_after', $this );
+		do_action('customize_save_after', $this);
 
 		/**
 		 * Filter response data for a successful customize_save AJAX request.
@@ -819,8 +819,8 @@ 
 		 *                                   event on `wp.customize`.
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		$response = apply_filters( 'customize_save_response', array(), $this );
-		wp_send_json_success( $response );
+		$response = apply_filters('customize_save_response', array(), $this);
+		wp_send_json_success($response);
 	}
 
 	/**
@@ -829,13 +829,13 @@ 
 	 * @since 4.2.0
 	 */
 	public function refresh_nonces() {
-		if ( ! $this->is_preview() ) {
-			wp_send_json_error( 'not_preview' );
+		if ( ! $this->is_preview()) {
+			wp_send_json_error('not_preview');
 		}
 
 		$nonces = array(
-			'save'    => wp_create_nonce( 'save-customize_' . $this->get_stylesheet() ),
-			'preview' => wp_create_nonce( 'preview-customize_' . $this->get_stylesheet() ),
+			'save'    => wp_create_nonce('save-customize_'.$this->get_stylesheet()),
+			'preview' => wp_create_nonce('preview-customize_'.$this->get_stylesheet()),
 		);
 
 		/**
@@ -847,8 +847,8 @@ 
 		 *                                     preview actions.
 		 * @param WP_Customize_Manager $this   WP_Customize_Manager instance.
 		 */
-		$nonces = apply_filters( 'customize_refresh_nonces', $nonces, $this );
-		wp_send_json_success( $nonces );
+		$nonces = apply_filters('customize_refresh_nonces', $nonces, $this);
+		wp_send_json_success($nonces);
 	}
 
 	/**
@@ -860,13 +860,13 @@ 
 	 * @param array $args                     Setting arguments; passed to WP_Customize_Setting
 	 *                                        constructor.
 	 */
-	public function add_setting( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Setting ) {
+	public function add_setting($id, $args = array()) {
+		if ($id instanceof WP_Customize_Setting) {
 			$setting = $id;
 		} else {
-			$setting = new WP_Customize_Setting( $this, $id, $args );
+			$setting = new WP_Customize_Setting($this, $id, $args);
 		}
-		$this->settings[ $setting->id ] = $setting;
+		$this->settings[$setting->id] = $setting;
 	}
 
 	/**
@@ -883,11 +883,11 @@ 
 	 * @param array $setting_ids The setting IDs to add.
 	 * @return WP_Customize_Setting The settings added.
 	 */
-	public function add_dynamic_settings( $setting_ids ) {
+	public function add_dynamic_settings($setting_ids) {
 		$new_settings = array();
-		foreach ( $setting_ids as $setting_id ) {
+		foreach ($setting_ids as $setting_id) {
 			// Skip settings already created
-			if ( $this->get_setting( $setting_id ) ) {
+			if ($this->get_setting($setting_id)) {
 				continue;
 			}
 
@@ -906,8 +906,8 @@ 
 			 * @param false|array $setting_args The arguments to the WP_Customize_Setting constructor.
 			 * @param string      $setting_id   ID for dynamic setting, usually coming from `$_POST['customized']`.
 			 */
-			$setting_args = apply_filters( 'customize_dynamic_setting_args', $setting_args, $setting_id );
-			if ( false === $setting_args ) {
+			$setting_args = apply_filters('customize_dynamic_setting_args', $setting_args, $setting_id);
+			if (false === $setting_args) {
 				continue;
 			}
 
@@ -920,11 +920,11 @@ 
 			 * @param string $setting_id    ID for dynamic setting, usually coming from `$_POST['customized']`.
 			 * @param array  $setting_args  WP_Customize_Setting or a subclass.
 			 */
-			$setting_class = apply_filters( 'customize_dynamic_setting_class', $setting_class, $setting_id, $setting_args );
+			$setting_class = apply_filters('customize_dynamic_setting_class', $setting_class, $setting_id, $setting_args);
 
-			$setting = new $setting_class( $this, $setting_id, $setting_args );
+			$setting = new $setting_class($this, $setting_id, $setting_args);
 
-			$this->add_setting( $setting );
+			$this->add_setting($setting);
 			$new_settings[] = $setting;
 		}
 		return $new_settings;
@@ -938,9 +938,9 @@ 
 	 * @param string $id Customize Setting ID.
 	 * @return WP_Customize_Setting|void The setting, if set.
 	 */
-	public function get_setting( $id ) {
-		if ( isset( $this->settings[ $id ] ) ) {
-			return $this->settings[ $id ];
+	public function get_setting($id) {
+		if (isset($this->settings[$id])) {
+			return $this->settings[$id];
 		}
 	}
 
@@ -951,8 +951,8 @@ 
 	 *
 	 * @param string $id Customize Setting ID.
 	 */
-	public function remove_setting( $id ) {
-		unset( $this->settings[ $id ] );
+	public function remove_setting($id) {
+		unset($this->settings[$id]);
 	}
 
 	/**
@@ -964,14 +964,14 @@ 
 	 * @param WP_Customize_Panel|string $id   Customize Panel object, or Panel ID.
 	 * @param array                     $args Optional. Panel arguments. Default empty array.
 	 */
-	public function add_panel( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Panel ) {
+	public function add_panel($id, $args = array()) {
+		if ($id instanceof WP_Customize_Panel) {
 			$panel = $id;
 		} else {
-			$panel = new WP_Customize_Panel( $this, $id, $args );
+			$panel = new WP_Customize_Panel($this, $id, $args);
 		}
 
-		$this->panels[ $panel->id ] = $panel;
+		$this->panels[$panel->id] = $panel;
 	}
 
 	/**
@@ -983,9 +983,9 @@ 
 	 * @param string $id Panel ID to get.
 	 * @return WP_Customize_Panel|void Requested panel instance, if set.
 	 */
-	public function get_panel( $id ) {
-		if ( isset( $this->panels[ $id ] ) ) {
-			return $this->panels[ $id ];
+	public function get_panel($id) {
+		if (isset($this->panels[$id])) {
+			return $this->panels[$id];
 		}
 	}
 
@@ -997,8 +997,8 @@ 
 	 *
 	 * @param string $id Panel ID to remove.
 	 */
-	public function remove_panel( $id ) {
-		unset( $this->panels[ $id ] );
+	public function remove_panel($id) {
+		unset($this->panels[$id]);
 	}
 
 	/**
@@ -1013,7 +1013,7 @@ 
 	 *
 	 * @param string $panel Name of a custom panel which is a subclass of WP_Customize_Panel.
 	 */
-	public function register_panel_type( $panel ) {
+	public function register_panel_type($panel) {
 		$this->registered_panel_types[] = $panel;
 	}
 
@@ -1024,8 +1024,8 @@ 
 	 * @access public
 	 */
 	public function render_panel_templates() {
-		foreach ( $this->registered_panel_types as $panel_type ) {
-			$panel = new $panel_type( $this, 'temp', array() );
+		foreach ($this->registered_panel_types as $panel_type) {
+			$panel = new $panel_type($this, 'temp', array());
 			$panel->print_template();
 		}
 	}
@@ -1038,13 +1038,13 @@ 
 	 * @param WP_Customize_Section|string $id   Customize Section object, or Section ID.
 	 * @param array                       $args Section arguments.
 	 */
-	public function add_section( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Section ) {
+	public function add_section($id, $args = array()) {
+		if ($id instanceof WP_Customize_Section) {
 			$section = $id;
 		} else {
-			$section = new WP_Customize_Section( $this, $id, $args );
+			$section = new WP_Customize_Section($this, $id, $args);
 		}
-		$this->sections[ $section->id ] = $section;
+		$this->sections[$section->id] = $section;
 	}
 
 	/**
@@ -1055,9 +1055,9 @@ 
 	 * @param string $id Section ID.
 	 * @return WP_Customize_Section|void The section, if set.
 	 */
-	public function get_section( $id ) {
-		if ( isset( $this->sections[ $id ] ) )
-			return $this->sections[ $id ];
+	public function get_section($id) {
+		if (isset($this->sections[$id]))
+			return $this->sections[$id];
 	}
 
 	/**
@@ -1067,8 +1067,8 @@ 
 	 *
 	 * @param string $id Section ID.
 	 */
-	public function remove_section( $id ) {
-		unset( $this->sections[ $id ] );
+	public function remove_section($id) {
+		unset($this->sections[$id]);
 	}
 
 	/**
@@ -1083,7 +1083,7 @@ 
 	 *
 	 * @param string $section Name of a custom section which is a subclass of WP_Customize_Section.
 	 */
-	public function register_section_type( $section ) {
+	public function register_section_type($section) {
 		$this->registered_section_types[] = $section;
 	}
 
@@ -1094,8 +1094,8 @@ 
 	 * @access public
 	 */
 	public function render_section_templates() {
-		foreach ( $this->registered_section_types as $section_type ) {
-			$section = new $section_type( $this, 'temp', array() );
+		foreach ($this->registered_section_types as $section_type) {
+			$section = new $section_type($this, 'temp', array());
 			$section->print_template();
 		}
 	}
@@ -1109,13 +1109,13 @@ 
 	 * @param array                       $args Control arguments; passed to WP_Customize_Control
 	 *                                          constructor.
 	 */
-	public function add_control( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Control ) {
+	public function add_control($id, $args = array()) {
+		if ($id instanceof WP_Customize_Control) {
 			$control = $id;
 		} else {
-			$control = new WP_Customize_Control( $this, $id, $args );
+			$control = new WP_Customize_Control($this, $id, $args);
 		}
-		$this->controls[ $control->id ] = $control;
+		$this->controls[$control->id] = $control;
 	}
 
 	/**
@@ -1126,9 +1126,9 @@ 
 	 * @param string $id ID of the control.
 	 * @return WP_Customize_Control|void The control object, if set.
 	 */
-	public function get_control( $id ) {
-		if ( isset( $this->controls[ $id ] ) )
-			return $this->controls[ $id ];
+	public function get_control($id) {
+		if (isset($this->controls[$id]))
+			return $this->controls[$id];
 	}
 
 	/**
@@ -1138,8 +1138,8 @@ 
 	 *
 	 * @param string $id ID of the control.
 	 */
-	public function remove_control( $id ) {
-		unset( $this->controls[ $id ] );
+	public function remove_control($id) {
+		unset($this->controls[$id]);
 	}
 
 	/**
@@ -1153,7 +1153,7 @@ 
 	 * @param string $control Name of a custom control which is a subclass of
 	 *                        {@see WP_Customize_Control}.
 	 */
-	public function register_control_type( $control ) {
+	public function register_control_type($control) {
 		$this->registered_control_types[] = $control;
 	}
 
@@ -1164,8 +1164,8 @@ 
 	 * @access public
 	 */
 	public function render_control_templates() {
-		foreach ( $this->registered_control_types as $control_type ) {
-			$control = new $control_type( $this, 'temp', array() );
+		foreach ($this->registered_control_types as $control_type) {
+			$control = new $control_type($this, 'temp', array());
 			$control->print_template();
 		}
 	}
@@ -1179,8 +1179,8 @@ 
 	 * @param WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control $b Object B.
 	 * @return int
 	 */
-	protected function _cmp_priority( $a, $b ) {
-		if ( $a->priority === $b->priority ) {
+	protected function _cmp_priority($a, $b) {
+		if ($a->priority === $b->priority) {
 			return $a->instance_number - $a->instance_number;
 		} else {
 			return $a->priority - $b->priority;
@@ -1199,58 +1199,58 @@ 
 	public function prepare_controls() {
 
 		$controls = array();
-		uasort( $this->controls, array( $this, '_cmp_priority' ) );
+		uasort($this->controls, array($this, '_cmp_priority'));
 
-		foreach ( $this->controls as $id => $control ) {
-			if ( ! isset( $this->sections[ $control->section ] ) || ! $control->check_capabilities() ) {
+		foreach ($this->controls as $id => $control) {
+			if ( ! isset($this->sections[$control->section]) || ! $control->check_capabilities()) {
 				continue;
 			}
 
-			$this->sections[ $control->section ]->controls[] = $control;
-			$controls[ $id ] = $control;
+			$this->sections[$control->section]->controls[] = $control;
+			$controls[$id] = $control;
 		}
 		$this->controls = $controls;
 
 		// Prepare sections.
-		uasort( $this->sections, array( $this, '_cmp_priority' ) );
+		uasort($this->sections, array($this, '_cmp_priority'));
 		$sections = array();
 
-		foreach ( $this->sections as $section ) {
-			if ( ! $section->check_capabilities() ) {
+		foreach ($this->sections as $section) {
+			if ( ! $section->check_capabilities()) {
 				continue;
 			}
 
-			usort( $section->controls, array( $this, '_cmp_priority' ) );
+			usort($section->controls, array($this, '_cmp_priority'));
 
-			if ( ! $section->panel ) {
+			if ( ! $section->panel) {
 				// Top-level section.
-				$sections[ $section->id ] = $section;
+				$sections[$section->id] = $section;
 			} else {
 				// This section belongs to a panel.
-				if ( isset( $this->panels [ $section->panel ] ) ) {
-					$this->panels[ $section->panel ]->sections[ $section->id ] = $section;
+				if (isset($this->panels [$section->panel])) {
+					$this->panels[$section->panel]->sections[$section->id] = $section;
 				}
 			}
 		}
 		$this->sections = $sections;
 
 		// Prepare panels.
-		uasort( $this->panels, array( $this, '_cmp_priority' ) );
+		uasort($this->panels, array($this, '_cmp_priority'));
 		$panels = array();
 
-		foreach ( $this->panels as $panel ) {
-			if ( ! $panel->check_capabilities() ) {
+		foreach ($this->panels as $panel) {
+			if ( ! $panel->check_capabilities()) {
 				continue;
 			}
 
-			uasort( $panel->sections, array( $this, '_cmp_priority' ) );
-			$panels[ $panel->id ] = $panel;
+			uasort($panel->sections, array($this, '_cmp_priority'));
+			$panels[$panel->id] = $panel;
 		}
 		$this->panels = $panels;
 
 		// Sort panels and top-level sections together.
-		$this->containers = array_merge( $this->panels, $this->sections );
-		uasort( $this->containers, array( $this, '_cmp_priority' ) );
+		$this->containers = array_merge($this->panels, $this->sections);
+		uasort($this->containers, array($this, '_cmp_priority'));
 	}
 
 	/**
@@ -1259,7 +1259,7 @@ 
 	 * @since 3.4.0
 	 */
 	public function enqueue_control_scripts() {
-		foreach ( $this->controls as $control ) {
+		foreach ($this->controls as $control) {
 			$control->enqueue();
 		}
 	}
@@ -1272,198 +1272,198 @@ 
 	public function register_controls() {
 
 		/* Panel, Section, and Control Types */
-		$this->register_panel_type( 'WP_Customize_Panel' );
-		$this->register_section_type( 'WP_Customize_Section' );
-		$this->register_section_type( 'WP_Customize_Sidebar_Section' );
-		$this->register_control_type( 'WP_Customize_Color_Control' );
-		$this->register_control_type( 'WP_Customize_Media_Control' );
-		$this->register_control_type( 'WP_Customize_Upload_Control' );
-		$this->register_control_type( 'WP_Customize_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Background_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Cropped_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Site_Icon_Control' );
-		$this->register_control_type( 'WP_Customize_Theme_Control' );
+		$this->register_panel_type('WP_Customize_Panel');
+		$this->register_section_type('WP_Customize_Section');
+		$this->register_section_type('WP_Customize_Sidebar_Section');
+		$this->register_control_type('WP_Customize_Color_Control');
+		$this->register_control_type('WP_Customize_Media_Control');
+		$this->register_control_type('WP_Customize_Upload_Control');
+		$this->register_control_type('WP_Customize_Image_Control');
+		$this->register_control_type('WP_Customize_Background_Image_Control');
+		$this->register_control_type('WP_Customize_Cropped_Image_Control');
+		$this->register_control_type('WP_Customize_Site_Icon_Control');
+		$this->register_control_type('WP_Customize_Theme_Control');
 
 		/* Themes */
 
-		$this->add_section( new WP_Customize_Themes_Section( $this, 'themes', array(
-			'title'      => $this->theme()->display( 'Name' ),
+		$this->add_section(new WP_Customize_Themes_Section($this, 'themes', array(
+			'title'      => $this->theme()->display('Name'),
 			'capability' => 'switch_themes',
 			'priority'   => 0,
-		) ) );
+		)));
 
 		// Themes Setting (unused - the theme is considerably more fundamental to the Customizer experience).
-		$this->add_setting( new WP_Customize_Filter_Setting( $this, 'active_theme', array(
+		$this->add_setting(new WP_Customize_Filter_Setting($this, 'active_theme', array(
 			'capability' => 'switch_themes',
-		) ) );
+		)));
 
-		require_once( ABSPATH . 'wp-admin/includes/theme.php' );
+		require_once(ABSPATH.'wp-admin/includes/theme.php');
 
 		// Theme Controls.
 
 		// Add a control for the active/original theme.
-		if ( ! $this->is_theme_active() ) {
-			$themes = wp_prepare_themes_for_js( array( wp_get_theme( $this->original_stylesheet ) ) );
-			$active_theme = current( $themes );
+		if ( ! $this->is_theme_active()) {
+			$themes = wp_prepare_themes_for_js(array(wp_get_theme($this->original_stylesheet)));
+			$active_theme = current($themes);
 			$active_theme['isActiveTheme'] = true;
-			$this->add_control( new WP_Customize_Theme_Control( $this, $active_theme['id'], array(
+			$this->add_control(new WP_Customize_Theme_Control($this, $active_theme['id'], array(
 				'theme'    => $active_theme,
 				'section'  => 'themes',
 				'settings' => 'active_theme',
-			) ) );
+			)));
 		}
 
 		$themes = wp_prepare_themes_for_js();
-		foreach ( $themes as $theme ) {
-			if ( $theme['active'] || $theme['id'] === $this->original_stylesheet ) {
+		foreach ($themes as $theme) {
+			if ($theme['active'] || $theme['id'] === $this->original_stylesheet) {
 				continue;
 			}
 
-			$theme_id = 'theme_' . $theme['id'];
+			$theme_id = 'theme_'.$theme['id'];
 			$theme['isActiveTheme'] = false;
-			$this->add_control( new WP_Customize_Theme_Control( $this, $theme_id, array(
+			$this->add_control(new WP_Customize_Theme_Control($this, $theme_id, array(
 				'theme'    => $theme,
 				'section'  => 'themes',
 				'settings' => 'active_theme',
-			) ) );
+			)));
 		}
 
 		/* Site Identity */
 
-		$this->add_section( 'title_tagline', array(
-			'title'    => __( 'Site Identity' ),
+		$this->add_section('title_tagline', array(
+			'title'    => __('Site Identity'),
 			'priority' => 20,
-		) );
+		));
 
-		$this->add_setting( 'blogname', array(
-			'default'    => get_option( 'blogname' ),
+		$this->add_setting('blogname', array(
+			'default'    => get_option('blogname'),
 			'type'       => 'option',
 			'capability' => 'manage_options',
-		) );
+		));
 
-		$this->add_control( 'blogname', array(
-			'label'      => __( 'Site Title' ),
+		$this->add_control('blogname', array(
+			'label'      => __('Site Title'),
 			'section'    => 'title_tagline',
-		) );
+		));
 
-		$this->add_setting( 'blogdescription', array(
-			'default'    => get_option( 'blogdescription' ),
+		$this->add_setting('blogdescription', array(
+			'default'    => get_option('blogdescription'),
 			'type'       => 'option',
 			'capability' => 'manage_options',
-		) );
+		));
 
-		$this->add_control( 'blogdescription', array(
-			'label'      => __( 'Tagline' ),
+		$this->add_control('blogdescription', array(
+			'label'      => __('Tagline'),
 			'section'    => 'title_tagline',
-		) );
+		));
 
-		$this->add_setting( 'site_icon', array(
+		$this->add_setting('site_icon', array(
 			'type'       => 'option',
 			'capability' => 'manage_options',
 			'transport'  => 'postMessage', // Previewed with JS in the Customizer controls window.
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Site_Icon_Control( $this, 'site_icon', array(
-			'label'       => __( 'Site Icon' ),
-			'description' => __( 'The Site Icon is used as a browser and app icon for your site. Icons must be square, and at least 512px wide and tall.' ),
+		$this->add_control(new WP_Customize_Site_Icon_Control($this, 'site_icon', array(
+			'label'       => __('Site Icon'),
+			'description' => __('The Site Icon is used as a browser and app icon for your site. Icons must be square, and at least 512px wide and tall.'),
 			'section'     => 'title_tagline',
 			'priority'    => 60,
 			'height'      => 512,
 			'width'       => 512,
-		) ) );
+		)));
 
 		/* Colors */
 
-		$this->add_section( 'colors', array(
-			'title'          => __( 'Colors' ),
+		$this->add_section('colors', array(
+			'title'          => __('Colors'),
 			'priority'       => 40,
-		) );
+		));
 
-		$this->add_setting( 'header_textcolor', array(
-			'theme_supports' => array( 'custom-header', 'header-text' ),
-			'default'        => get_theme_support( 'custom-header', 'default-text-color' ),
+		$this->add_setting('header_textcolor', array(
+			'theme_supports' => array('custom-header', 'header-text'),
+			'default'        => get_theme_support('custom-header', 'default-text-color'),
 
-			'sanitize_callback'    => array( $this, '_sanitize_header_textcolor' ),
+			'sanitize_callback'    => array($this, '_sanitize_header_textcolor'),
 			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
+		));
 
 		// Input type: checkbox
 		// With custom value
-		$this->add_control( 'display_header_text', array(
+		$this->add_control('display_header_text', array(
 			'settings' => 'header_textcolor',
-			'label'    => __( 'Display Header Text' ),
+			'label'    => __('Display Header Text'),
 			'section'  => 'title_tagline',
 			'type'     => 'checkbox',
 			'priority' => 40,
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Color_Control( $this, 'header_textcolor', array(
-			'label'   => __( 'Header Text Color' ),
+		$this->add_control(new WP_Customize_Color_Control($this, 'header_textcolor', array(
+			'label'   => __('Header Text Color'),
 			'section' => 'colors',
-		) ) );
+		)));
 
 		// Input type: Color
 		// With sanitize_callback
-		$this->add_setting( 'background_color', array(
-			'default'        => get_theme_support( 'custom-background', 'default-color' ),
+		$this->add_setting('background_color', array(
+			'default'        => get_theme_support('custom-background', 'default-color'),
 			'theme_supports' => 'custom-background',
 
 			'sanitize_callback'    => 'sanitize_hex_color_no_hash',
 			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Color_Control( $this, 'background_color', array(
-			'label'   => __( 'Background Color' ),
+		$this->add_control(new WP_Customize_Color_Control($this, 'background_color', array(
+			'label'   => __('Background Color'),
 			'section' => 'colors',
-		) ) );
+		)));
 
 
 		/* Custom Header */
 
-		$this->add_section( 'header_image', array(
-			'title'          => __( 'Header Image' ),
+		$this->add_section('header_image', array(
+			'title'          => __('Header Image'),
 			'theme_supports' => 'custom-header',
 			'priority'       => 60,
-		) );
+		));
 
-		$this->add_setting( new WP_Customize_Filter_Setting( $this, 'header_image', array(
-			'default'        => get_theme_support( 'custom-header', 'default-image' ),
+		$this->add_setting(new WP_Customize_Filter_Setting($this, 'header_image', array(
+			'default'        => get_theme_support('custom-header', 'default-image'),
 			'theme_supports' => 'custom-header',
-		) ) );
+		)));
 
-		$this->add_setting( new WP_Customize_Header_Image_Setting( $this, 'header_image_data', array(
+		$this->add_setting(new WP_Customize_Header_Image_Setting($this, 'header_image_data', array(
 			// 'default'        => get_theme_support( 'custom-header', 'default-image' ),
 			'theme_supports' => 'custom-header',
-		) ) );
+		)));
 
-		$this->add_control( new WP_Customize_Header_Image_Control( $this ) );
+		$this->add_control(new WP_Customize_Header_Image_Control($this));
 
 		/* Custom Background */
 
-		$this->add_section( 'background_image', array(
-			'title'          => __( 'Background Image' ),
+		$this->add_section('background_image', array(
+			'title'          => __('Background Image'),
 			'theme_supports' => 'custom-background',
 			'priority'       => 80,
-		) );
+		));
 
-		$this->add_setting( 'background_image', array(
-			'default'        => get_theme_support( 'custom-background', 'default-image' ),
+		$this->add_setting('background_image', array(
+			'default'        => get_theme_support('custom-background', 'default-image'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_setting( new WP_Customize_Background_Image_Setting( $this, 'background_image_thumb', array(
+		$this->add_setting(new WP_Customize_Background_Image_Setting($this, 'background_image_thumb', array(
 			'theme_supports' => 'custom-background',
-		) ) );
+		)));
 
-		$this->add_control( new WP_Customize_Background_Image_Control( $this ) );
+		$this->add_control(new WP_Customize_Background_Image_Control($this));
 
-		$this->add_setting( 'background_repeat', array(
-			'default'        => get_theme_support( 'custom-background', 'default-repeat' ),
+		$this->add_setting('background_repeat', array(
+			'default'        => get_theme_support('custom-background', 'default-repeat'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_repeat', array(
-			'label'      => __( 'Background Repeat' ),
+		$this->add_control('background_repeat', array(
+			'label'      => __('Background Repeat'),
 			'section'    => 'background_image',
 			'type'       => 'radio',
 			'choices'    => array(
@@ -1472,15 +1472,15 @@ 
 				'repeat-x'   => __('Tile Horizontally'),
 				'repeat-y'   => __('Tile Vertically'),
 			),
-		) );
+		));
 
-		$this->add_setting( 'background_position_x', array(
-			'default'        => get_theme_support( 'custom-background', 'default-position-x' ),
+		$this->add_setting('background_position_x', array(
+			'default'        => get_theme_support('custom-background', 'default-position-x'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_position_x', array(
-			'label'      => __( 'Background Position' ),
+		$this->add_control('background_position_x', array(
+			'label'      => __('Background Position'),
 			'section'    => 'background_image',
 			'type'       => 'radio',
 			'choices'    => array(
@@ -1488,28 +1488,28 @@ 
 				'center'     => __('Center'),
 				'right'      => __('Right'),
 			),
-		) );
+		));
 
-		$this->add_setting( 'background_attachment', array(
-			'default'        => get_theme_support( 'custom-background', 'default-attachment' ),
+		$this->add_setting('background_attachment', array(
+			'default'        => get_theme_support('custom-background', 'default-attachment'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_attachment', array(
-			'label'      => __( 'Background Attachment' ),
+		$this->add_control('background_attachment', array(
+			'label'      => __('Background Attachment'),
 			'section'    => 'background_image',
 			'type'       => 'radio',
 			'choices'    => array(
 				'scroll'     => __('Scroll'),
 				'fixed'      => __('Fixed'),
 			),
-		) );
+		));
 
 		// If the theme is using the default background callback, we can update
 		// the background CSS using postMessage.
-		if ( get_theme_support( 'custom-background', 'wp-head-callback' ) === '_custom_background_cb' ) {
-			foreach ( array( 'color', 'image', 'position_x', 'repeat', 'attachment' ) as $prop ) {
-				$this->get_setting( 'background_' . $prop )->transport = 'postMessage';
+		if (get_theme_support('custom-background', 'wp-head-callback') === '_custom_background_cb') {
+			foreach (array('color', 'image', 'position_x', 'repeat', 'attachment') as $prop) {
+				$this->get_setting('background_'.$prop)->transport = 'postMessage';
 			}
 		}
 
@@ -1517,54 +1517,54 @@ 
 		// #WP19627
 
 		// Replicate behavior from options-reading.php and hide front page options if there are no pages
-		if ( get_pages() ) {
-			$this->add_section( 'static_front_page', array(
-				'title'          => __( 'Static Front Page' ),
+		if (get_pages()) {
+			$this->add_section('static_front_page', array(
+				'title'          => __('Static Front Page'),
 			//	'theme_supports' => 'static-front-page',
 				'priority'       => 120,
-				'description'    => __( 'Your theme supports a static front page.' ),
-			) );
+				'description'    => __('Your theme supports a static front page.'),
+			));
 
-			$this->add_setting( 'show_on_front', array(
-				'default'        => get_option( 'show_on_front' ),
+			$this->add_setting('show_on_front', array(
+				'default'        => get_option('show_on_front'),
 				'capability'     => 'manage_options',
 				'type'           => 'option',
 			//	'theme_supports' => 'static-front-page',
-			) );
+			));
 
-			$this->add_control( 'show_on_front', array(
-				'label'   => __( 'Front page displays' ),
+			$this->add_control('show_on_front', array(
+				'label'   => __('Front page displays'),
 				'section' => 'static_front_page',
 				'type'    => 'radio',
 				'choices' => array(
-					'posts' => __( 'Your latest posts' ),
-					'page'  => __( 'A static page' ),
+					'posts' => __('Your latest posts'),
+					'page'  => __('A static page'),
 				),
-			) );
+			));
 
-			$this->add_setting( 'page_on_front', array(
+			$this->add_setting('page_on_front', array(
 				'type'       => 'option',
 				'capability' => 'manage_options',
 			//	'theme_supports' => 'static-front-page',
-			) );
+			));
 
-			$this->add_control( 'page_on_front', array(
-				'label'      => __( 'Front page' ),
+			$this->add_control('page_on_front', array(
+				'label'      => __('Front page'),
 				'section'    => 'static_front_page',
 				'type'       => 'dropdown-pages',
-			) );
+			));
 
-			$this->add_setting( 'page_for_posts', array(
+			$this->add_setting('page_for_posts', array(
 				'type'           => 'option',
 				'capability'     => 'manage_options',
 			//	'theme_supports' => 'static-front-page',
-			) );
+			));
 
-			$this->add_control( 'page_for_posts', array(
-				'label'      => __( 'Posts page' ),
+			$this->add_control('page_for_posts', array(
+				'label'      => __('Posts page'),
 				'section'    => 'static_front_page',
 				'type'       => 'dropdown-pages',
-			) );
+			));
 		}
 	}
 
@@ -1577,7 +1577,7 @@ 
 	 * @see add_dynamic_settings()
 	 */
 	public function register_dynamic_settings() {
-		$this->add_dynamic_settings( array_keys( $this->unsanitized_post_values() ) );
+		$this->add_dynamic_settings(array_keys($this->unsanitized_post_values()));
 	}
 
 	/**
@@ -1591,13 +1591,13 @@ 
 	 * @param string $color
 	 * @return mixed
 	 */
-	public function _sanitize_header_textcolor( $color ) {
-		if ( 'blank' === $color )
+	public function _sanitize_header_textcolor($color) {
+		if ('blank' === $color)
 			return 'blank';
 
-		$color = sanitize_hex_color_no_hash( $color );
-		if ( empty( $color ) )
-			$color = get_theme_support( 'custom-header', 'default-text-color' );
+		$color = sanitize_hex_color_no_hash($color);
+		if (empty($color))
+			$color = get_theme_support('custom-header', 'default-text-color');
 
 		return $color;
 	}
@@ -1614,12 +1614,12 @@ 
  * @param string $color
  * @return string|void
  */
-function sanitize_hex_color( $color ) {
-	if ( '' === $color )
+function sanitize_hex_color($color) {
+	if ('' === $color)
 		return '';
 
 	// 3 or 6 hex digits, or the empty string.
-	if ( preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color ) )
+	if (preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color))
 		return $color;
 }
 
@@ -1637,13 +1637,13 @@ 
  * @param string $color
  * @return string|null
  */
-function sanitize_hex_color_no_hash( $color ) {
-	$color = ltrim( $color, '#' );
+function sanitize_hex_color_no_hash($color) {
+	$color = ltrim($color, '#');
 
-	if ( '' === $color )
+	if ('' === $color)
 		return '';
 
-	return sanitize_hex_color( '#' . $color ) ? $color : null;
+	return sanitize_hex_color('#'.$color) ? $color : null;
 }
 
 /**
@@ -1657,9 +1657,9 @@ 
  * @param string $color
  * @return string
  */
-function maybe_hash_hex_color( $color ) {
-	if ( $unhashed = sanitize_hex_color_no_hash( $color ) )
-		return '#' . $unhashed;
+function maybe_hash_hex_color($color) {
+	if ($unhashed = sanitize_hex_color_no_hash($color))
+		return '#'.$unhashed;
 
 	return $color;
 }

Braces +31 added lines, -21 removed lines

@@ -441,8 +441,9 @@ 
 		 */
 		do_action( 'customize_register', $this );
 
-		if ( $this->is_preview() && ! is_admin() )
-			$this->customize_preview_init();
+		if ( $this->is_preview() && ! is_admin() ) {
+					$this->customize_preview_init();
+		}
 	}
 
 	/**
@@ -457,8 +458,9 @@ 
 	 * @return int
 	 */
 	public function wp_redirect_status( $status ) {
-		if ( $this->is_preview() && ! is_admin() )
-			return 200;
+		if ( $this->is_preview() && ! is_admin() ) {
+					return 200;
+		}
 
 		return $status;
 	}
@@ -1056,8 +1058,9 @@ 
 	 * @return WP_Customize_Section|void The section, if set.
 	 */
 	public function get_section( $id ) {
-		if ( isset( $this->sections[ $id ] ) )
-			return $this->sections[ $id ];
+		if ( isset( $this->sections[ $id ] ) ) {
+					return $this->sections[ $id ];
+		}
 	}
 
 	/**
@@ -1127,8 +1130,9 @@ 
 	 * @return WP_Customize_Control|void The control object, if set.
 	 */
 	public function get_control( $id ) {
-		if ( isset( $this->controls[ $id ] ) )
-			return $this->controls[ $id ];
+		if ( isset( $this->controls[ $id ] ) ) {
+					return $this->controls[ $id ];
+		}
 	}
 
 	/**
@@ -1592,12 +1596,14 @@ 
 	 * @return mixed
 	 */
 	public function _sanitize_header_textcolor( $color ) {
-		if ( 'blank' === $color )
-			return 'blank';
+		if ( 'blank' === $color ) {
+					return 'blank';
+		}
 
 		$color = sanitize_hex_color_no_hash( $color );
-		if ( empty( $color ) )
-			$color = get_theme_support( 'custom-header', 'default-text-color' );
+		if ( empty( $color ) ) {
+					$color = get_theme_support( 'custom-header', 'default-text-color' );
+		}
 
 		return $color;
 	}
@@ -1615,13 +1621,15 @@ 
  * @return string|void
  */
 function sanitize_hex_color( $color ) {
-	if ( '' === $color )
-		return '';
+	if ( '' === $color ) {
+			return '';
+	}
 
 	// 3 or 6 hex digits, or the empty string.
-	if ( preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color ) )
-		return $color;
-}
+	if ( preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color ) ) {
+			return $color;
+	}
+	}
 
 /**
  * Sanitizes a hex color without a hash. Use sanitize_hex_color() when possible.
@@ -1640,8 +1648,9 @@ 
 function sanitize_hex_color_no_hash( $color ) {
 	$color = ltrim( $color, '#' );
 
-	if ( '' === $color )
-		return '';
+	if ( '' === $color ) {
+			return '';
+	}
 
 	return sanitize_hex_color( '#' . $color ) ? $color : null;
 }
@@ -1658,8 +1667,9 @@ 
  * @return string
  */
 function maybe_hash_hex_color( $color ) {
-	if ( $unhashed = sanitize_hex_color_no_hash( $color ) )
-		return '#' . $unhashed;
+	if ( $unhashed = sanitize_hex_color_no_hash( $color ) ) {
+			return '#' . $unhashed;
+	}
 
 	return $color;
 }

src/wp-includes/class-wp-customize-nav-menus.php

Doc Comments +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 	 * @since 4.3.0
 	 * @access public
 	 *
-	 * @param object $manager An instance of the WP_Customize_Manager class.
+	 * @param WP_Customize_Manager $manager An instance of the WP_Customize_Manager class.
 	 */
 	public function __construct( $manager ) {
 		$this->previewed_menus = array();
@@ -876,7 +876,7 @@ 
 	 *
 	 * @param string $nav_menu_content The HTML content for the navigation menu.
 	 * @param object $args             An object containing wp_nav_menu() arguments.
-	 * @return null
+	 * @return string
 	 */
 	public function filter_wp_nav_menu( $nav_menu_content, $args ) {
 		if ( ! empty( $args->can_partial_refresh ) && ! empty( $args->instance_number ) ) {

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * WordPress Customize Nav Menus classes
- *
- * @package WordPress
- * @subpackage Customize
- * @since 4.3.0
- */
+	 * WordPress Customize Nav Menus classes
+	 *
+	 * @package WordPress
+	 * @subpackage Customize
+	 * @since 4.3.0
+	 */
 
 /**
  * Customize Nav Menus class.

Spacing +273 added lines, -273 removed lines

@@ -44,22 +44,22 @@ 
 	 *
 	 * @param object $manager An instance of the WP_Customize_Manager class.
 	 */
-	public function __construct( $manager ) {
+	public function __construct($manager) {
 		$this->previewed_menus = array();
 		$this->manager         = $manager;
 
-		add_action( 'wp_ajax_load-available-menu-items-customizer', array( $this, 'ajax_load_available_items' ) );
-		add_action( 'wp_ajax_search-available-menu-items-customizer', array( $this, 'ajax_search_available_items' ) );
-		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		add_action('wp_ajax_load-available-menu-items-customizer', array($this, 'ajax_load_available_items'));
+		add_action('wp_ajax_search-available-menu-items-customizer', array($this, 'ajax_search_available_items'));
+		add_action('customize_controls_enqueue_scripts', array($this, 'enqueue_scripts'));
 
 		// Needs to run after core Navigation section is set up.
-		add_action( 'customize_register', array( $this, 'customize_register' ), 11 );
+		add_action('customize_register', array($this, 'customize_register'), 11);
 
-		add_filter( 'customize_dynamic_setting_args', array( $this, 'filter_dynamic_setting_args' ), 10, 2 );
-		add_filter( 'customize_dynamic_setting_class', array( $this, 'filter_dynamic_setting_class' ), 10, 3 );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'print_templates' ) );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'available_items_template' ) );
-		add_action( 'customize_preview_init', array( $this, 'customize_preview_init' ) );
+		add_filter('customize_dynamic_setting_args', array($this, 'filter_dynamic_setting_args'), 10, 2);
+		add_filter('customize_dynamic_setting_class', array($this, 'filter_dynamic_setting_class'), 10, 3);
+		add_action('customize_controls_print_footer_scripts', array($this, 'print_templates'));
+		add_action('customize_controls_print_footer_scripts', array($this, 'available_items_template'));
+		add_action('customize_preview_init', array($this, 'customize_preview_init'));
 	}
 
 	/**
@@ -69,25 +69,25 @@ 
 	 * @access public
 	 */
 	public function ajax_load_available_items() {
-		check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
+		check_ajax_referer('customize-menus', 'customize-menus-nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_die( -1 );
 		}
 
-		if ( empty( $_POST['type'] ) || empty( $_POST['object'] ) ) {
-			wp_send_json_error( 'nav_menus_missing_type_or_object_parameter' );
+		if (empty($_POST['type']) || empty($_POST['object'])) {
+			wp_send_json_error('nav_menus_missing_type_or_object_parameter');
 		}
 
-		$type = sanitize_key( $_POST['type'] );
-		$object = sanitize_key( $_POST['object'] );
-		$page = empty( $_POST['page'] ) ? 0 : absint( $_POST['page'] );
-		$items = $this->load_available_items_query( $type, $object, $page );
+		$type = sanitize_key($_POST['type']);
+		$object = sanitize_key($_POST['object']);
+		$page = empty($_POST['page']) ? 0 : absint($_POST['page']);
+		$items = $this->load_available_items_query($type, $object, $page);
 
-		if ( is_wp_error( $items ) ) {
-			wp_send_json_error( $items->get_error_code() );
+		if (is_wp_error($items)) {
+			wp_send_json_error($items->get_error_code());
 		} else {
-			wp_send_json_success( array( 'items' => $items ) );
+			wp_send_json_success(array('items' => $items));
 		}
 	}
 
@@ -103,51 +103,51 @@ 
 	 * @param int    $page   Optional. The page number used to generate the query offset. Default is '0'.
 	 * @return WP_Error|array Returns either a WP_Error object or an array of menu items.
 	 */
-	public function load_available_items_query( $type = 'post_type', $object = 'page', $page = 0 ) {
+	public function load_available_items_query($type = 'post_type', $object = 'page', $page = 0) {
 		$items = array();
 
-		if ( 'post_type' === $type ) {
-			if ( ! get_post_type_object( $object ) ) {
-				return new WP_Error( 'nav_menus_invalid_post_type' );
+		if ('post_type' === $type) {
+			if ( ! get_post_type_object($object)) {
+				return new WP_Error('nav_menus_invalid_post_type');
 			}
 
-			if ( 0 === $page && 'page' === $object ) {
+			if (0 === $page && 'page' === $object) {
 				// Add "Home" link. Treat as a page, but switch to custom on add.
 				$items[] = array(
 					'id'         => 'home',
-					'title'      => _x( 'Home', 'nav menu home label' ),
+					'title'      => _x('Home', 'nav menu home label'),
 					'type'       => 'custom',
-					'type_label' => __( 'Custom Link' ),
+					'type_label' => __('Custom Link'),
 					'object'     => '',
 					'url'        => home_url(),
 				);
 			}
 
-			$posts = get_posts( array(
+			$posts = get_posts(array(
 				'numberposts' => 10,
 				'offset'      => 10 * $page,
 				'orderby'     => 'date',
 				'order'       => 'DESC',
 				'post_type'   => $object,
-			) );
-			foreach ( $posts as $post ) {
+			));
+			foreach ($posts as $post) {
 				$post_title = $post->post_title;
-				if ( '' === $post_title ) {
+				if ('' === $post_title) {
 					/* translators: %d: ID of a post */
-					$post_title = sprintf( __( '#%d (no title)' ), $post->ID );
+					$post_title = sprintf(__('#%d (no title)'), $post->ID);
 				}
 				$items[] = array(
 					'id'         => "post-{$post->ID}",
-					'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'title'      => html_entity_decode($post_title, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'post_type',
-					'type_label' => get_post_type_object( $post->post_type )->labels->singular_name,
+					'type_label' => get_post_type_object($post->post_type)->labels->singular_name,
 					'object'     => $post->post_type,
-					'object_id'  => intval( $post->ID ),
-					'url'        => get_permalink( intval( $post->ID ) ),
+					'object_id'  => intval($post->ID),
+					'url'        => get_permalink(intval($post->ID)),
 				);
 			}
-		} elseif ( 'taxonomy' === $type ) {
-			$terms = get_terms( $object, array(
+		} elseif ('taxonomy' === $type) {
+			$terms = get_terms($object, array(
 				'child_of'     => 0,
 				'exclude'      => '',
 				'hide_empty'   => false,
@@ -158,20 +158,20 @@ 
 				'order'        => 'DESC',
 				'orderby'      => 'count',
 				'pad_counts'   => false,
-			) );
-			if ( is_wp_error( $terms ) ) {
+			));
+			if (is_wp_error($terms)) {
 				return $terms;
 			}
 
-			foreach ( $terms as $term ) {
+			foreach ($terms as $term) {
 				$items[] = array(
 					'id'         => "term-{$term->term_id}",
-					'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'title'      => html_entity_decode($term->name, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'taxonomy',
-					'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
+					'type_label' => get_taxonomy($term->taxonomy)->labels->singular_name,
 					'object'     => $term->taxonomy,
-					'object_id'  => intval( $term->term_id ),
-					'url'        => get_term_link( intval( $term->term_id ), $term->taxonomy ),
+					'object_id'  => intval($term->term_id),
+					'url'        => get_term_link(intval($term->term_id), $term->taxonomy),
 				);
 			}
 		}
@@ -186,7 +186,7 @@ 
 		 * @param string $object The object name.
 		 * @param int    $page   The current page number.
 		 */
-		$items = apply_filters( 'customize_nav_menu_available_items', $items, $type, $object, $page );
+		$items = apply_filters('customize_nav_menu_available_items', $items, $type, $object, $page);
 
 		return $items;
 	}
@@ -198,28 +198,28 @@ 
 	 * @access public
 	 */
 	public function ajax_search_available_items() {
-		check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
+		check_ajax_referer('customize-menus', 'customize-menus-nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_die( -1 );
 		}
 
-		if ( empty( $_POST['search'] ) ) {
-			wp_send_json_error( 'nav_menus_missing_search_parameter' );
+		if (empty($_POST['search'])) {
+			wp_send_json_error('nav_menus_missing_search_parameter');
 		}
 
-		$p = isset( $_POST['page'] ) ? absint( $_POST['page'] ) : 0;
-		if ( $p < 1 ) {
+		$p = isset($_POST['page']) ? absint($_POST['page']) : 0;
+		if ($p < 1) {
 			$p = 1;
 		}
 
-		$s = sanitize_text_field( wp_unslash( $_POST['search'] ) );
-		$items = $this->search_available_items_query( array( 'pagenum' => $p, 's' => $s ) );
+		$s = sanitize_text_field(wp_unslash($_POST['search']));
+		$items = $this->search_available_items_query(array('pagenum' => $p, 's' => $s));
 
-		if ( empty( $items ) ) {
-			wp_send_json_error( array( 'message' => __( 'No results found.' ) ) );
+		if (empty($items)) {
+			wp_send_json_error(array('message' => __('No results found.')));
 		} else {
-			wp_send_json_success( array( 'items' => $items ) );
+			wp_send_json_success(array('items' => $items));
 		}
 	}
 
@@ -234,12 +234,12 @@ 
 	 * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
 	 * @return array Menu items.
 	 */
-	public function search_available_items_query( $args = array() ) {
+	public function search_available_items_query($args = array()) {
 		$items = array();
 
-		$post_type_objects = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
+		$post_type_objects = get_post_types(array('show_in_nav_menus' => true), 'objects');
 		$query = array(
-			'post_type'              => array_keys( $post_type_objects ),
+			'post_type'              => array_keys($post_type_objects),
 			'suppress_filters'       => true,
 			'update_post_term_cache' => false,
 			'update_post_meta_cache' => false,
@@ -247,55 +247,55 @@ 
 			'posts_per_page'         => 20,
 		);
 
-		$args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
-		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
+		$args['pagenum'] = isset($args['pagenum']) ? absint($args['pagenum']) : 1;
+		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ($args['pagenum'] - 1) : 0;
 
-		if ( isset( $args['s'] ) ) {
+		if (isset($args['s'])) {
 			$query['s'] = $args['s'];
 		}
 
 		// Query posts.
-		$get_posts = new WP_Query( $query );
+		$get_posts = new WP_Query($query);
 
 		// Check if any posts were found.
-		if ( $get_posts->post_count ) {
-			foreach ( $get_posts->posts as $post ) {
+		if ($get_posts->post_count) {
+			foreach ($get_posts->posts as $post) {
 				$post_title = $post->post_title;
-				if ( '' === $post_title ) {
+				if ('' === $post_title) {
 					/* translators: %d: ID of a post */
-					$post_title = sprintf( __( '#%d (no title)' ), $post->ID );
+					$post_title = sprintf(__('#%d (no title)'), $post->ID);
 				}
 				$items[] = array(
-					'id'         => 'post-' . $post->ID,
-					'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'id'         => 'post-'.$post->ID,
+					'title'      => html_entity_decode($post_title, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'post_type',
-					'type_label' => $post_type_objects[ $post->post_type ]->labels->singular_name,
+					'type_label' => $post_type_objects[$post->post_type]->labels->singular_name,
 					'object'     => $post->post_type,
-					'object_id'  => intval( $post->ID ),
-					'url'        => get_permalink( intval( $post->ID ) ),
+					'object_id'  => intval($post->ID),
+					'url'        => get_permalink(intval($post->ID)),
 				);
 			}
 		}
 
 		// Query taxonomy terms.
-		$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'names' );
-		$terms = get_terms( $taxonomies, array(
+		$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'names');
+		$terms = get_terms($taxonomies, array(
 			'name__like' => $args['s'],
 			'number'     => 20,
 			'offset'     => 20 * ($args['pagenum'] - 1),
-		) );
+		));
 
 		// Check if any taxonomies were found.
-		if ( ! empty( $terms ) ) {
-			foreach ( $terms as $term ) {
+		if ( ! empty($terms)) {
+			foreach ($terms as $term) {
 				$items[] = array(
-					'id'         => 'term-' . $term->term_id,
-					'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'id'         => 'term-'.$term->term_id,
+					'title'      => html_entity_decode($term->name, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'taxonomy',
-					'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
+					'type_label' => get_taxonomy($term->taxonomy)->labels->singular_name,
 					'object'     => $term->taxonomy,
-					'object_id'  => intval( $term->term_id ),
-					'url'        => get_term_link( intval( $term->term_id ), $term->taxonomy ),
+					'object_id'  => intval($term->term_id),
+					'url'        => get_term_link(intval($term->term_id), $term->taxonomy),
 				);
 			}
 		}
@@ -310,47 +310,47 @@ 
 	 * @access public
 	 */
 	public function enqueue_scripts() {
-		wp_enqueue_style( 'customize-nav-menus' );
-		wp_enqueue_script( 'customize-nav-menus' );
+		wp_enqueue_style('customize-nav-menus');
+		wp_enqueue_script('customize-nav-menus');
 
-		$temp_nav_menu_setting      = new WP_Customize_Nav_Menu_Setting( $this->manager, 'nav_menu[-1]' );
-		$temp_nav_menu_item_setting = new WP_Customize_Nav_Menu_Item_Setting( $this->manager, 'nav_menu_item[-1]' );
+		$temp_nav_menu_setting      = new WP_Customize_Nav_Menu_Setting($this->manager, 'nav_menu[-1]');
+		$temp_nav_menu_item_setting = new WP_Customize_Nav_Menu_Item_Setting($this->manager, 'nav_menu_item[-1]');
 
 		// Pass data to JS.
 		$settings = array(
-			'nonce'                => wp_create_nonce( 'customize-menus' ),
+			'nonce'                => wp_create_nonce('customize-menus'),
 			'allMenus'             => wp_get_nav_menus(),
 			'itemTypes'            => $this->available_item_types(),
 			'l10n'                 => array(
-				'untitled'          => _x( '(no label)', 'missing menu item navigation label' ),
-				'unnamed'           => _x( '(unnamed)', 'Missing menu name.' ),
-				'custom_label'      => __( 'Custom Link' ),
+				'untitled'          => _x('(no label)', 'missing menu item navigation label'),
+				'unnamed'           => _x('(unnamed)', 'Missing menu name.'),
+				'custom_label'      => __('Custom Link'),
 				/* translators: %s: Current menu location */
-				'menuLocation'      => __( '(Currently set to: %s)' ),
-				'menuNameLabel'     => __( 'Menu Name' ),
-				'itemAdded'         => __( 'Menu item added' ),
-				'itemDeleted'       => __( 'Menu item deleted' ),
-				'menuAdded'         => __( 'Menu created' ),
-				'menuDeleted'       => __( 'Menu deleted' ),
-				'movedUp'           => __( 'Menu item moved up' ),
-				'movedDown'         => __( 'Menu item moved down' ),
-				'movedLeft'         => __( 'Menu item moved out of submenu' ),
-				'movedRight'        => __( 'Menu item is now a sub-item' ),
+				'menuLocation'      => __('(Currently set to: %s)'),
+				'menuNameLabel'     => __('Menu Name'),
+				'itemAdded'         => __('Menu item added'),
+				'itemDeleted'       => __('Menu item deleted'),
+				'menuAdded'         => __('Menu created'),
+				'menuDeleted'       => __('Menu deleted'),
+				'movedUp'           => __('Menu item moved up'),
+				'movedDown'         => __('Menu item moved down'),
+				'movedLeft'         => __('Menu item moved out of submenu'),
+				'movedRight'        => __('Menu item is now a sub-item'),
 				/* translators: &#9656; is the unicode right-pointing triangle, and %s is the section title in the Customizer */
-				'customizingMenus'  => sprintf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'nav_menus' )->title ) ),
+				'customizingMenus'  => sprintf(__('Customizing &#9656; %s'), esc_html($this->manager->get_panel('nav_menus')->title)),
 				/* translators: %s: title of menu item which is invalid */
-				'invalidTitleTpl'   => __( '%s (Invalid)' ),
+				'invalidTitleTpl'   => __('%s (Invalid)'),
 				/* translators: %s: title of menu item in draft status */
-				'pendingTitleTpl'   => __( '%s (Pending)' ),
-				'taxonomyTermLabel' => __( 'Taxonomy' ),
-				'postTypeLabel'     => __( 'Post Type' ),
-				'itemsFound'        => __( 'Number of items found: %d' ),
-				'itemsFoundMore'    => __( 'Additional items found: %d' ),
-				'itemsLoadingMore'  => __( 'Loading more results... please wait.' ),
-				'reorderModeOn'     => __( 'Reorder mode enabled' ),
-				'reorderModeOff'    => __( 'Reorder mode closed' ),
-				'reorderLabelOn'    => esc_attr__( 'Reorder menu items' ),
-				'reorderLabelOff'   => esc_attr__( 'Close reorder mode' ),
+				'pendingTitleTpl'   => __('%s (Pending)'),
+				'taxonomyTermLabel' => __('Taxonomy'),
+				'postTypeLabel'     => __('Post Type'),
+				'itemsFound'        => __('Number of items found: %d'),
+				'itemsFoundMore'    => __('Additional items found: %d'),
+				'itemsLoadingMore'  => __('Loading more results... please wait.'),
+				'reorderModeOn'     => __('Reorder mode enabled'),
+				'reorderModeOff'    => __('Reorder mode closed'),
+				'reorderLabelOn'    => esc_attr__('Reorder menu items'),
+				'reorderLabelOff'   => esc_attr__('Close reorder mode'),
 			),
 			'menuItemTransport'    => 'postMessage',
 			'phpIntMax'            => PHP_INT_MAX,
@@ -360,29 +360,29 @@ 
 			),
 		);
 
-		$data = sprintf( 'var _wpCustomizeNavMenusSettings = %s;', wp_json_encode( $settings ) );
-		wp_scripts()->add_data( 'customize-nav-menus', 'data', $data );
+		$data = sprintf('var _wpCustomizeNavMenusSettings = %s;', wp_json_encode($settings));
+		wp_scripts()->add_data('customize-nav-menus', 'data', $data);
 
 		// This is copied from nav-menus.php, and it has an unfortunate object name of `menus`.
 		$nav_menus_l10n = array(
 			'oneThemeLocationNoMenus' => null,
-			'moveUp'       => __( 'Move up one' ),
-			'moveDown'     => __( 'Move down one' ),
-			'moveToTop'    => __( 'Move to the top' ),
+			'moveUp'       => __('Move up one'),
+			'moveDown'     => __('Move down one'),
+			'moveToTop'    => __('Move to the top'),
 			/* translators: %s: previous item name */
-			'moveUnder'    => __( 'Move under %s' ),
+			'moveUnder'    => __('Move under %s'),
 			/* translators: %s: previous item name */
-			'moveOutFrom'  => __( 'Move out from under %s' ),
+			'moveOutFrom'  => __('Move out from under %s'),
 			/* translators: %s: previous item name */
-			'under'        => __( 'Under %s' ),
+			'under'        => __('Under %s'),
 			/* translators: %s: previous item name */
-			'outFrom'      => __( 'Out from under %s' ),
+			'outFrom'      => __('Out from under %s'),
 			/* translators: 1: item name, 2: item position, 3: total number of items */
-			'menuFocus'    => __( '%1$s. Menu item %2$d of %3$d.' ),
+			'menuFocus'    => __('%1$s. Menu item %2$d of %3$d.'),
 			/* translators: 1: item name, 2: item position, 3: parent item name */
-			'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
+			'subMenuFocus' => __('%1$s. Sub item number %2$d under %3$s.'),
 		);
-		wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
+		wp_localize_script('nav-menu', 'menus', $nav_menus_l10n);
 	}
 
 	/**
@@ -399,12 +399,12 @@ 
 	 * @param string      $setting_id   ID for dynamic setting, usually coming from `$_POST['customized']`.
 	 * @return array|false
 	 */
-	public function filter_dynamic_setting_args( $setting_args, $setting_id ) {
-		if ( preg_match( WP_Customize_Nav_Menu_Setting::ID_PATTERN, $setting_id ) ) {
+	public function filter_dynamic_setting_args($setting_args, $setting_id) {
+		if (preg_match(WP_Customize_Nav_Menu_Setting::ID_PATTERN, $setting_id)) {
 			$setting_args = array(
 				'type' => WP_Customize_Nav_Menu_Setting::TYPE,
 			);
-		} elseif ( preg_match( WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id ) ) {
+		} elseif (preg_match(WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id)) {
 			$setting_args = array(
 				'type' => WP_Customize_Nav_Menu_Item_Setting::TYPE,
 			);
@@ -423,12 +423,12 @@ 
 	 * @param array  $setting_args  WP_Customize_Setting or a subclass.
 	 * @return string
 	 */
-	public function filter_dynamic_setting_class( $setting_class, $setting_id, $setting_args ) {
-		unset( $setting_id );
+	public function filter_dynamic_setting_class($setting_class, $setting_id, $setting_args) {
+		unset($setting_id);
 
-		if ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Setting::TYPE === $setting_args['type'] ) {
+		if ( ! empty($setting_args['type']) && WP_Customize_Nav_Menu_Setting::TYPE === $setting_args['type']) {
 			$setting_class = 'WP_Customize_Nav_Menu_Setting';
-		} elseif ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type'] ) {
+		} elseif ( ! empty($setting_args['type']) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type']) {
 			$setting_class = 'WP_Customize_Nav_Menu_Item_Setting';
 		}
 		return $setting_class;
@@ -443,141 +443,141 @@ 
 	public function customize_register() {
 
 		// Require JS-rendered control types.
-		$this->manager->register_panel_type( 'WP_Customize_Nav_Menus_Panel' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Name_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Auto_Add_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Item_Control' );
+		$this->manager->register_panel_type('WP_Customize_Nav_Menus_Panel');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Name_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Auto_Add_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Item_Control');
 
 		// Create a panel for Menus.
-		$description = '<p>' . __( 'This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links.' ) . '</p>';
-		if ( current_theme_supports( 'widgets' ) ) {
-			$description .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a &#8220;Custom Menu&#8221; widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
+		$description = '<p>'.__('This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links.').'</p>';
+		if (current_theme_supports('widgets')) {
+			$description .= '<p>'.sprintf(__('Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a &#8220;Custom Menu&#8221; widget.'), "javascript:wp.customize.panel( 'widgets' ).focus();").'</p>';
 		} else {
-			$description .= '<p>' . __( 'Menus can be displayed in locations defined by your theme.' ) . '</p>';
+			$description .= '<p>'.__('Menus can be displayed in locations defined by your theme.').'</p>';
 		}
-		$this->manager->add_panel( new WP_Customize_Nav_Menus_Panel( $this->manager, 'nav_menus', array(
-			'title'       => __( 'Menus' ),
+		$this->manager->add_panel(new WP_Customize_Nav_Menus_Panel($this->manager, 'nav_menus', array(
+			'title'       => __('Menus'),
 			'description' => $description,
 			'priority'    => 100,
 			// 'theme_supports' => 'menus|widgets', @todo allow multiple theme supports
-		) ) );
+		)));
 		$menus = wp_get_nav_menus();
 
 		// Menu loactions.
 		$locations     = get_registered_nav_menus();
-		$num_locations = count( array_keys( $locations ) );
-		$description   = '<p>' . sprintf( _n( 'Your theme contains %s menu location. Select which menu you would like to use.', 'Your theme contains %s menu locations. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) );
-		$description  .= '</p><p>' . __( 'You can also place menus in widget areas with the Custom Menu widget.' ) . '</p>';
+		$num_locations = count(array_keys($locations));
+		$description   = '<p>'.sprintf(_n('Your theme contains %s menu location. Select which menu you would like to use.', 'Your theme contains %s menu locations. Select which menu appears in each location.', $num_locations), number_format_i18n($num_locations));
+		$description  .= '</p><p>'.__('You can also place menus in widget areas with the Custom Menu widget.').'</p>';
 
-		$this->manager->add_section( 'menu_locations', array(
-			'title'       => __( 'Menu Locations' ),
+		$this->manager->add_section('menu_locations', array(
+			'title'       => __('Menu Locations'),
 			'panel'       => 'nav_menus',
 			'priority'    => 5,
 			'description' => $description,
-		) );
+		));
 
-		$choices = array( '0' => __( '&mdash; Select &mdash;' ) );
-		foreach ( $menus as $menu ) {
-			$choices[ $menu->term_id ] = wp_html_excerpt( $menu->name, 40, '&hellip;' );
+		$choices = array('0' => __('&mdash; Select &mdash;'));
+		foreach ($menus as $menu) {
+			$choices[$menu->term_id] = wp_html_excerpt($menu->name, 40, '&hellip;');
 		}
 
-		foreach ( $locations as $location => $description ) {
+		foreach ($locations as $location => $description) {
 			$setting_id = "nav_menu_locations[{$location}]";
 
-			$setting = $this->manager->get_setting( $setting_id );
-			if ( $setting ) {
+			$setting = $this->manager->get_setting($setting_id);
+			if ($setting) {
 				$setting->transport = 'postMessage';
-				remove_filter( "customize_sanitize_{$setting_id}", 'absint' );
-				add_filter( "customize_sanitize_{$setting_id}", array( $this, 'intval_base10' ) );
+				remove_filter("customize_sanitize_{$setting_id}", 'absint');
+				add_filter("customize_sanitize_{$setting_id}", array($this, 'intval_base10'));
 			} else {
-				$this->manager->add_setting( $setting_id, array(
-					'sanitize_callback' => array( $this, 'intval_base10' ),
+				$this->manager->add_setting($setting_id, array(
+					'sanitize_callback' => array($this, 'intval_base10'),
 					'theme_supports'    => 'menus',
 					'type'              => 'theme_mod',
 					'transport'         => 'postMessage',
 					'default'           => 0,
-				) );
+				));
 			}
 
-			$this->manager->add_control( new WP_Customize_Nav_Menu_Location_Control( $this->manager, $setting_id, array(
+			$this->manager->add_control(new WP_Customize_Nav_Menu_Location_Control($this->manager, $setting_id, array(
 				'label'       => $description,
 				'location_id' => $location,
 				'section'     => 'menu_locations',
 				'choices'     => $choices,
-			) ) );
+			)));
 		}
 
 		// Register each menu as a Customizer section, and add each menu item to each menu.
-		foreach ( $menus as $menu ) {
+		foreach ($menus as $menu) {
 			$menu_id = $menu->term_id;
 
 			// Create a section for each menu.
-			$section_id = 'nav_menu[' . $menu_id . ']';
-			$this->manager->add_section( new WP_Customize_Nav_Menu_Section( $this->manager, $section_id, array(
-				'title'     => html_entity_decode( $menu->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+			$section_id = 'nav_menu['.$menu_id.']';
+			$this->manager->add_section(new WP_Customize_Nav_Menu_Section($this->manager, $section_id, array(
+				'title'     => html_entity_decode($menu->name, ENT_QUOTES, get_bloginfo('charset')),
 				'priority'  => 10,
 				'panel'     => 'nav_menus',
-			) ) );
+			)));
 
-			$nav_menu_setting_id = 'nav_menu[' . $menu_id . ']';
-			$this->manager->add_setting( new WP_Customize_Nav_Menu_Setting( $this->manager, $nav_menu_setting_id ) );
+			$nav_menu_setting_id = 'nav_menu['.$menu_id.']';
+			$this->manager->add_setting(new WP_Customize_Nav_Menu_Setting($this->manager, $nav_menu_setting_id));
 
 			// Add the menu contents.
-			$menu_items = (array) wp_get_nav_menu_items( $menu_id );
+			$menu_items = (array) wp_get_nav_menu_items($menu_id);
 
-			foreach ( array_values( $menu_items ) as $i => $item ) {
+			foreach (array_values($menu_items) as $i => $item) {
 
 				// Create a setting for each menu item (which doesn't actually manage data, currently).
-				$menu_item_setting_id = 'nav_menu_item[' . $item->ID . ']';
+				$menu_item_setting_id = 'nav_menu_item['.$item->ID.']';
 
 				$value = (array) $item;
 				$value['nav_menu_term_id'] = $menu_id;
-				$this->manager->add_setting( new WP_Customize_Nav_Menu_Item_Setting( $this->manager, $menu_item_setting_id, array(
+				$this->manager->add_setting(new WP_Customize_Nav_Menu_Item_Setting($this->manager, $menu_item_setting_id, array(
 					'value' => $value,
-				) ) );
+				)));
 
 				// Create a control for each menu item.
-				$this->manager->add_control( new WP_Customize_Nav_Menu_Item_Control( $this->manager, $menu_item_setting_id, array(
+				$this->manager->add_control(new WP_Customize_Nav_Menu_Item_Control($this->manager, $menu_item_setting_id, array(
 					'label'    => $item->title,
 					'section'  => $section_id,
 					'priority' => 10 + $i,
-				) ) );
+				)));
 			}
 
 			// Note: other controls inside of this section get added dynamically in JS via the MenuSection.ready() function.
 		}
 
 		// Add the add-new-menu section and controls.
-		$this->manager->add_section( new WP_Customize_New_Menu_Section( $this->manager, 'add_menu', array(
-			'title'    => __( 'Add a Menu' ),
+		$this->manager->add_section(new WP_Customize_New_Menu_Section($this->manager, 'add_menu', array(
+			'title'    => __('Add a Menu'),
 			'panel'    => 'nav_menus',
 			'priority' => 999,
-		) ) );
+		)));
 
-		$this->manager->add_setting( 'new_menu_name', array(
+		$this->manager->add_setting('new_menu_name', array(
 			'type'      => 'new_menu',
 			'default'   => '',
 			'transport' => 'postMessage',
-		) );
+		));
 
-		$this->manager->add_control( 'new_menu_name', array(
+		$this->manager->add_control('new_menu_name', array(
 			'label'       => '',
 			'section'     => 'add_menu',
 			'type'        => 'text',
 			'input_attrs' => array(
 				'class'       => 'menu-name-field',
-				'placeholder' => __( 'New menu name' ),
+				'placeholder' => __('New menu name'),
 			),
-		) );
+		));
 
-		$this->manager->add_setting( 'create_new_menu', array(
+		$this->manager->add_setting('create_new_menu', array(
 			'type' => 'new_menu',
-		) );
+		));
 
-		$this->manager->add_control( new WP_Customize_New_Menu_Control( $this->manager, 'create_new_menu', array(
+		$this->manager->add_control(new WP_Customize_New_Menu_Control($this->manager, 'create_new_menu', array(
 			'section' => 'add_menu',
-		) ) );
+		)));
 	}
 
 	/**
@@ -592,8 +592,8 @@ 
 	 * @param mixed $value Number to convert.
 	 * @return int Integer.
 	 */
-	public function intval_base10( $value ) {
-		return intval( $value, 10 );
+	public function intval_base10($value) {
+		return intval($value, 10);
 	}
 
 	/**
@@ -607,9 +607,9 @@ 
 	public function available_item_types() {
 		$item_types = array();
 
-		$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
-		if ( $post_types ) {
-			foreach ( $post_types as $slug => $post_type ) {
+		$post_types = get_post_types(array('show_in_nav_menus' => true), 'objects');
+		if ($post_types) {
+			foreach ($post_types as $slug => $post_type) {
 				$item_types[] = array(
 					'title'  => $post_type->labels->singular_name,
 					'type'   => 'post_type',
@@ -618,10 +618,10 @@ 
 			}
 		}
 
-		$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'objects' );
-		if ( $taxonomies ) {
-			foreach ( $taxonomies as $slug => $taxonomy ) {
-				if ( 'post_format' === $taxonomy && ! current_theme_supports( 'post-formats' ) ) {
+		$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'objects');
+		if ($taxonomies) {
+			foreach ($taxonomies as $slug => $taxonomy) {
+				if ('post_format' === $taxonomy && ! current_theme_supports('post-formats')) {
 					continue;
 				}
 				$item_types[] = array(
@@ -639,7 +639,7 @@ 
 		 *
 		 * @param array $item_types Custom menu item types.
 		 */
-		$item_types = apply_filters( 'customize_nav_menu_available_item_types', $item_types );
+		$item_types = apply_filters('customize_nav_menu_available_item_types', $item_types);
 
 		return $item_types;
 	}
@@ -665,7 +665,7 @@ 
 						<button type="button" class="not-a-button item-add">
 							<span class="screen-reader-text"><?php
 								/* translators: 1: Title of a menu item, 2: Type of a menu item */
-								printf( __( 'Add to menu: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}' );
+								printf(__('Add to menu: %1$s (%2$s)'), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}');
 							?></span>
 						</button>
 					</div>
@@ -678,10 +678,10 @@ 
 				<?php
 				printf(
 					'<button type="button" class="menus-move-up">%1$s</button><button type="button" class="menus-move-down">%2$s</button><button type="button" class="menus-move-left">%3$s</button><button type="button" class="menus-move-right">%4$s</button>',
-					__( 'Move up' ),
-					__( 'Move down' ),
-					__( 'Move one level up' ),
-					__( 'Move one level down' )
+					__('Move up'),
+					__('Move down'),
+					__('Move one level up'),
+					__('Move one level down')
 				);
 				?>
 			</div>
@@ -700,33 +700,33 @@ 
 		<div id="available-menu-items" class="accordion-container">
 			<div class="customize-section-title">
 				<button type="button" class="customize-section-back" tabindex="-1">
-					<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+					<span class="screen-reader-text"><?php _e('Back'); ?></span>
 				</button>
 				<h3>
 					<span class="customize-action">
 						<?php
 							/* translators: &#9656; is the unicode right-pointing triangle, and %s is the section title in the Customizer */
-							printf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'nav_menus' )->title ) );
+							printf(__('Customizing &#9656; %s'), esc_html($this->manager->get_panel('nav_menus')->title));
 						?>
 					</span>
-					<?php _e( 'Add Menu Items' ); ?>
+					<?php _e('Add Menu Items'); ?>
 				</h3>
 			</div>
 			<div id="available-menu-items-search" class="accordion-section cannot-expand">
 				<div class="accordion-section-title">
-					<label class="screen-reader-text" for="menu-items-search"><?php _e( 'Search Menu Items' ); ?></label>
-					<input type="text" id="menu-items-search" placeholder="<?php esc_attr_e( 'Search menu items&hellip;' ) ?>" aria-describedby="menu-items-search-desc" />
-					<p class="screen-reader-text" id="menu-items-search-desc"><?php _e( 'The search results will be updated as you type.' ); ?></p>
+					<label class="screen-reader-text" for="menu-items-search"><?php _e('Search Menu Items'); ?></label>
+					<input type="text" id="menu-items-search" placeholder="<?php esc_attr_e('Search menu items&hellip;') ?>" aria-describedby="menu-items-search-desc" />
+					<p class="screen-reader-text" id="menu-items-search-desc"><?php _e('The search results will be updated as you type.'); ?></p>
 					<span class="spinner"></span>
-					<span class="clear-results"><span class="screen-reader-text"><?php _e( 'Clear Results' ); ?></span></span>
+					<span class="clear-results"><span class="screen-reader-text"><?php _e('Clear Results'); ?></span></span>
 				</div>
 				<ul class="accordion-section-content" data-type="search"></ul>
 			</div>
 			<div id="new-custom-menu-item" class="accordion-section">
 				<h4 class="accordion-section-title" role="presentation">
-					<?php _e( 'Custom Links' ); ?>
+					<?php _e('Custom Links'); ?>
 					<button type="button" class="not-a-button" aria-expanded="false">
-						<span class="screen-reader-text"><?php _e( 'Toggle section: Custom Links' ); ?></span>
+						<span class="screen-reader-text"><?php _e('Toggle section: Custom Links'); ?></span>
 						<span class="toggle-indicator" aria-hidden="true"></span>
 					</button>
 				</h4>
@@ -734,19 +734,19 @@ 
 					<input type="hidden" value="custom" id="custom-menu-item-type" name="menu-item[-1][menu-item-type]" />
 					<p id="menu-item-url-wrap">
 						<label class="howto" for="custom-menu-item-url">
-							<span><?php _e( 'URL' ); ?></span>
+							<span><?php _e('URL'); ?></span>
 							<input id="custom-menu-item-url" name="menu-item[-1][menu-item-url]" type="text" class="code menu-item-textbox" value="http://">
 						</label>
 					</p>
 					<p id="menu-item-name-wrap">
 						<label class="howto" for="custom-menu-item-name">
-							<span><?php _e( 'Link Text' ); ?></span>
+							<span><?php _e('Link Text'); ?></span>
 							<input id="custom-menu-item-name" name="menu-item[-1][menu-item-title]" type="text" class="regular-text menu-item-textbox">
 						</label>
 					</p>
 					<p class="button-controls">
 						<span class="add-to-menu">
-							<input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
+							<input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
 							<span class="spinner"></span>
 						</span>
 					</p>
@@ -754,22 +754,22 @@ 
 			</div>
 			<?php
 			// Containers for per-post-type item browsing; items added with JS.
-			foreach ( $this->available_item_types() as $available_item_type ) {
-				$id = sprintf( 'available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object'] );
+			foreach ($this->available_item_types() as $available_item_type) {
+				$id = sprintf('available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object']);
 				?>
-				<div id="<?php echo esc_attr( $id ); ?>" class="accordion-section">
+				<div id="<?php echo esc_attr($id); ?>" class="accordion-section">
 					<h4 class="accordion-section-title" role="presentation">
-						<?php echo esc_html( $available_item_type['title'] ); ?>
+						<?php echo esc_html($available_item_type['title']); ?>
 						<span class="spinner"></span>
-						<span class="no-items"><?php _e( 'No items' ); ?></span>
+						<span class="no-items"><?php _e('No items'); ?></span>
 						<button type="button" class="not-a-button" aria-expanded="false">
 							<span class="screen-reader-text"><?php
 							/* translators: %s: Title of a section with menu items */
-							printf( __( 'Toggle section: %s' ), esc_html( $available_item_type['title'] ) ); ?></span>
+							printf(__('Toggle section: %s'), esc_html($available_item_type['title'])); ?></span>
 							<span class="toggle-indicator" aria-hidden="true"></span>
 						</button>
 					</h4>
-					<ul class="accordion-section-content" data-type="<?php echo esc_attr( $available_item_type['type'] ); ?>" data-object="<?php echo esc_attr( $available_item_type['object'] ); ?>"></ul>
+					<ul class="accordion-section-content" data-type="<?php echo esc_attr($available_item_type['type']); ?>" data-object="<?php echo esc_attr($available_item_type['object']); ?>"></ul>
 				</div>
 				<?php
 			}
@@ -808,12 +808,12 @@ 
 	 * @access public
 	 */
 	public function customize_preview_init() {
-		add_action( 'template_redirect', array( $this, 'render_menu' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue_deps' ) );
+		add_action('template_redirect', array($this, 'render_menu'));
+		add_action('wp_enqueue_scripts', array($this, 'customize_preview_enqueue_deps'));
 
-		if ( ! isset( $_REQUEST[ self::RENDER_QUERY_VAR ] ) ) {
-			add_filter( 'wp_nav_menu_args', array( $this, 'filter_wp_nav_menu_args' ), 1000 );
-			add_filter( 'wp_nav_menu', array( $this, 'filter_wp_nav_menu' ), 10, 2 );
+		if ( ! isset($_REQUEST[self::RENDER_QUERY_VAR])) {
+			add_filter('wp_nav_menu_args', array($this, 'filter_wp_nav_menu_args'), 1000);
+			add_filter('wp_nav_menu', array($this, 'filter_wp_nav_menu'), 10, 2);
 		}
 	}
 
@@ -828,41 +828,41 @@ 
 	 * @param array $args An array containing wp_nav_menu() arguments.
 	 * @return array Arguments.
 	 */
-	public function filter_wp_nav_menu_args( $args ) {
+	public function filter_wp_nav_menu_args($args) {
 		$this->preview_nav_menu_instance_number += 1;
 		$args['instance_number'] = $this->preview_nav_menu_instance_number;
 
 		$can_partial_refresh = (
-			! empty( $args['echo'] )
+			! empty($args['echo'])
 			&&
-			( empty( $args['fallback_cb'] ) || is_string( $args['fallback_cb'] ) )
+			(empty($args['fallback_cb']) || is_string($args['fallback_cb']))
 			&&
-			( empty( $args['walker'] ) || is_string( $args['walker'] ) )
+			(empty($args['walker']) || is_string($args['walker']))
 			&&
 			(
-				! empty( $args['theme_location'] )
+				! empty($args['theme_location'])
 				||
-				( ! empty( $args['menu'] ) && ( is_numeric( $args['menu'] ) || is_object( $args['menu'] ) ) )
+				( ! empty($args['menu']) && (is_numeric($args['menu']) || is_object($args['menu'])))
 			)
 		);
 		$args['can_partial_refresh'] = $can_partial_refresh;
 
 		$hashed_args = $args;
 
-		if ( ! $can_partial_refresh ) {
+		if ( ! $can_partial_refresh) {
 			$hashed_args['fallback_cb'] = '';
 			$hashed_args['walker'] = '';
 		}
 
 		// Replace object menu arg with a term_id menu arg, as this exports better to JS and is easier to compare hashes.
-		if ( ! empty( $hashed_args['menu'] ) && is_object( $hashed_args['menu'] ) ) {
+		if ( ! empty($hashed_args['menu']) && is_object($hashed_args['menu'])) {
 			$hashed_args['menu'] = $hashed_args['menu']->term_id;
 		}
 
-		ksort( $hashed_args );
-		$hashed_args['args_hash'] = $this->hash_nav_menu_args( $hashed_args );
+		ksort($hashed_args);
+		$hashed_args['args_hash'] = $this->hash_nav_menu_args($hashed_args);
 
-		$this->preview_nav_menu_instance_args[ $this->preview_nav_menu_instance_number ] = $hashed_args;
+		$this->preview_nav_menu_instance_args[$this->preview_nav_menu_instance_number] = $hashed_args;
 		return $args;
 	}
 
@@ -878,11 +878,11 @@ 
 	 * @param object $args             An object containing wp_nav_menu() arguments.
 	 * @return null
 	 */
-	public function filter_wp_nav_menu( $nav_menu_content, $args ) {
-		if ( ! empty( $args->can_partial_refresh ) && ! empty( $args->instance_number ) ) {
+	public function filter_wp_nav_menu($nav_menu_content, $args) {
+		if ( ! empty($args->can_partial_refresh) && ! empty($args->instance_number)) {
 			$nav_menu_content = preg_replace(
 				'/(?<=class=")/',
-				sprintf( 'partial-refreshable-nav-menu partial-refreshable-nav-menu-%1$d ', $args->instance_number ),
+				sprintf('partial-refreshable-nav-menu partial-refreshable-nav-menu-%1$d ', $args->instance_number),
 				$nav_menu_content,
 				1 // Only update the class on the first element found, the menu container.
 			);
@@ -900,8 +900,8 @@ 
 	 * @param array $args The arguments to hash.
 	 * @return string
 	 */
-	public function hash_nav_menu_args( $args ) {
-		return wp_hash( wp_create_nonce( self::RENDER_AJAX_ACTION ) . serialize( $args ) );
+	public function hash_nav_menu_args($args) {
+		return wp_hash(wp_create_nonce(self::RENDER_AJAX_ACTION).serialize($args));
 	}
 
 	/**
@@ -911,10 +911,10 @@ 
 	 * @access public
 	 */
 	public function customize_preview_enqueue_deps() {
-		wp_enqueue_script( 'customize-preview-nav-menus' );
-		wp_enqueue_style( 'customize-preview' );
+		wp_enqueue_script('customize-preview-nav-menus');
+		wp_enqueue_style('customize-preview');
 
-		add_action( 'wp_print_footer_scripts', array( $this, 'export_preview_data' ) );
+		add_action('wp_print_footer_scripts', array($this, 'export_preview_data'));
 	}
 
 	/**
@@ -928,22 +928,22 @@ 
 		// Why not wp_localize_script? Because we're not localizing, and it forces values into strings.
 		$exports = array(
 			'renderQueryVar'        => self::RENDER_QUERY_VAR,
-			'renderNonceValue'      => wp_create_nonce( self::RENDER_AJAX_ACTION ),
+			'renderNonceValue'      => wp_create_nonce(self::RENDER_AJAX_ACTION),
 			'renderNoncePostKey'    => self::RENDER_NONCE_POST_KEY,
 			'requestUri'            => '/',
 			'theme'                 => array(
 				'stylesheet' => $this->manager->get_stylesheet(),
 				'active'     => $this->manager->is_theme_active(),
 			),
-			'previewCustomizeNonce' => wp_create_nonce( 'preview-customize_' . $this->manager->get_stylesheet() ),
+			'previewCustomizeNonce' => wp_create_nonce('preview-customize_'.$this->manager->get_stylesheet()),
 			'navMenuInstanceArgs'   => $this->preview_nav_menu_instance_args,
 		);
 
-		if ( ! empty( $_SERVER['REQUEST_URI'] ) ) {
-			$exports['requestUri'] = esc_url_raw( home_url( wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+		if ( ! empty($_SERVER['REQUEST_URI'])) {
+			$exports['requestUri'] = esc_url_raw(home_url(wp_unslash($_SERVER['REQUEST_URI'])));
 		}
 
-		printf( '<script>var _wpCustomizePreviewNavMenusExports = %s;</script>', wp_json_encode( $exports ) );
+		printf('<script>var _wpCustomizePreviewNavMenusExports = %s;</script>', wp_json_encode($exports));
 	}
 
 	/**
@@ -955,47 +955,47 @@ 
 	 * @see wp_nav_menu()
 	 */
 	public function render_menu() {
-		if ( empty( $_POST[ self::RENDER_QUERY_VAR ] ) ) {
+		if (empty($_POST[self::RENDER_QUERY_VAR])) {
 			return;
 		}
 
 		$this->manager->remove_preview_signature();
 
-		if ( empty( $_POST[ self::RENDER_NONCE_POST_KEY ] ) ) {
-			wp_send_json_error( 'missing_nonce_param' );
+		if (empty($_POST[self::RENDER_NONCE_POST_KEY])) {
+			wp_send_json_error('missing_nonce_param');
 		}
 
-		if ( ! is_customize_preview() ) {
-			wp_send_json_error( 'expected_customize_preview' );
+		if ( ! is_customize_preview()) {
+			wp_send_json_error('expected_customize_preview');
 		}
 
-		if ( ! check_ajax_referer( self::RENDER_AJAX_ACTION, self::RENDER_NONCE_POST_KEY, false ) ) {
-			wp_send_json_error( 'nonce_check_fail' );
+		if ( ! check_ajax_referer(self::RENDER_AJAX_ACTION, self::RENDER_NONCE_POST_KEY, false)) {
+			wp_send_json_error('nonce_check_fail');
 		}
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
-			wp_send_json_error( 'unauthorized' );
+		if ( ! current_user_can('edit_theme_options')) {
+			wp_send_json_error('unauthorized');
 		}
 
-		if ( ! isset( $_POST['wp_nav_menu_args'] ) ) {
-			wp_send_json_error( 'missing_param' );
+		if ( ! isset($_POST['wp_nav_menu_args'])) {
+			wp_send_json_error('missing_param');
 		}
 
-		if ( ! isset( $_POST['wp_nav_menu_args_hash'] ) ) {
-			wp_send_json_error( 'missing_param' );
+		if ( ! isset($_POST['wp_nav_menu_args_hash'])) {
+			wp_send_json_error('missing_param');
 		}
 
-		$wp_nav_menu_args = json_decode( wp_unslash( $_POST['wp_nav_menu_args'] ), true );
-		if ( ! is_array( $wp_nav_menu_args ) ) {
-			wp_send_json_error( 'wp_nav_menu_args_not_array' );
+		$wp_nav_menu_args = json_decode(wp_unslash($_POST['wp_nav_menu_args']), true);
+		if ( ! is_array($wp_nav_menu_args)) {
+			wp_send_json_error('wp_nav_menu_args_not_array');
 		}
 
-		$wp_nav_menu_args_hash = sanitize_text_field( wp_unslash( $_POST['wp_nav_menu_args_hash'] ) );
-		if ( ! hash_equals( $this->hash_nav_menu_args( $wp_nav_menu_args ), $wp_nav_menu_args_hash ) ) {
-			wp_send_json_error( 'wp_nav_menu_args_hash_mismatch' );
+		$wp_nav_menu_args_hash = sanitize_text_field(wp_unslash($_POST['wp_nav_menu_args_hash']));
+		if ( ! hash_equals($this->hash_nav_menu_args($wp_nav_menu_args), $wp_nav_menu_args_hash)) {
+			wp_send_json_error('wp_nav_menu_args_hash_mismatch');
 		}
 
 		$wp_nav_menu_args['echo'] = false;
-		wp_send_json_success( wp_nav_menu( $wp_nav_menu_args ) );
+		wp_send_json_success(wp_nav_menu($wp_nav_menu_args));
 	}
 }

src/wp-includes/class-wp-customize-section.php

Doc Comments +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
 	 * @since 4.1.0
 	 * @access public
 	 *
-	 * @return true Always true.
+	 * @return boolean Always true.
 	 */
 	public function active_callback() {
 		return true;

Indentation +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * WordPress Customize Section classes
- *
- * @package WordPress
- * @subpackage Customize
- * @since 3.4.0
- */
+	 * WordPress Customize Section classes
+	 *
+	 * @package WordPress
+	 * @subpackage Customize
+	 * @since 3.4.0
+	 */
 
 /**
  * Customize Section class.
@@ -324,7 +324,7 @@ 
 	 * @see WP_Customize_Manager::render_template()
 	 */
 	public function print_template() {
-        ?>
+		?>
 		<script type="text/html" id="tmpl-customize-section-<?php echo $this->type; ?>">
 			<?php $this->render_template(); ?>
 		</script>

Spacing +43 added lines, -43 removed lines

@@ -156,18 +156,18 @@ 
 	 * @param string               $id      An specific ID of the section.
 	 * @param array                $args    Section arguments.
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		$keys = array_keys( get_object_vars( $this ) );
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+	public function __construct($manager, $id, $args = array()) {
+		$keys = array_keys(get_object_vars($this));
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
 		$this->manager = $manager;
 		$this->id = $id;
-		if ( empty( $this->active_callback ) ) {
-			$this->active_callback = array( $this, 'active_callback' );
+		if (empty($this->active_callback)) {
+			$this->active_callback = array($this, 'active_callback');
 		}
 		self::$instance_count += 1;
 		$this->instance_number = self::$instance_count;
@@ -185,7 +185,7 @@ 
 	 */
 	final public function active() {
 		$section = $this;
-		$active = call_user_func( $this->active_callback, $this );
+		$active = call_user_func($this->active_callback, $this);
 
 		/**
 		 * Filter response of {@see WP_Customize_Section::active()}.
@@ -195,7 +195,7 @@ 
 		 * @param bool                 $active  Whether the Customizer section is active.
 		 * @param WP_Customize_Section $section {@see WP_Customize_Section} instance.
 		 */
-		$active = apply_filters( 'customize_section_active', $active, $section );
+		$active = apply_filters('customize_section_active', $active, $section);
 
 		return $active;
 	}
@@ -223,17 +223,17 @@ 
 	 * @return array The array to be exported to the client as JSON.
 	 */
 	public function json() {
-		$array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'panel', 'type' ) );
-		$array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$array = wp_array_slice_assoc((array) $this, array('id', 'description', 'priority', 'panel', 'type'));
+		$array['title'] = html_entity_decode($this->title, ENT_QUOTES, get_bloginfo('charset'));
 		$array['content'] = $this->get_content();
 		$array['active'] = $this->active();
 		$array['instanceNumber'] = $this->instance_number;
 
-		if ( $this->panel ) {
+		if ($this->panel) {
 			/* translators: ▸ is the unicode right-pointing triangle, and %s is the section title in the Customizer */
-			$array['customizeAction'] = sprintf( __( 'Customizing ▸ %s' ), esc_html( $this->manager->get_panel( $this->panel )->title ) );
+			$array['customizeAction'] = sprintf(__('Customizing ▸ %s'), esc_html($this->manager->get_panel($this->panel)->title));
 		} else {
-			$array['customizeAction'] = __( 'Customizing' );
+			$array['customizeAction'] = __('Customizing');
 		}
 
 		return $array;
@@ -248,11 +248,11 @@ 
 	 * @return bool False if theme doesn't support the section or user doesn't have the capability.
 	 */
 	final public function check_capabilities() {
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
+		if ($this->capability && ! call_user_func_array('current_user_can', (array) $this->capability)) {
 			return false;
 		}
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
+		if ($this->theme_supports && ! call_user_func_array('current_theme_supports', (array) $this->theme_supports)) {
 			return false;
 		}
 
@@ -269,7 +269,7 @@ 
 	final public function get_content() {
 		ob_start();
 		$this->maybe_render();
-		return trim( ob_get_clean() );
+		return trim(ob_get_clean());
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 	 * @since 3.4.0
 	 */
 	final public function maybe_render() {
-		if ( ! $this->check_capabilities() ) {
+		if ( ! $this->check_capabilities()) {
 			return;
 		}
 
@@ -289,7 +289,7 @@ 
 		 *
 		 * @param WP_Customize_Section $this WP_Customize_Section instance.
 		 */
-		do_action( 'customize_render_section', $this );
+		do_action('customize_render_section', $this);
 		/**
 		 * Fires before rendering a specific Customizer section.
 		 *
@@ -298,7 +298,7 @@ 
 		 *
 		 * @since 3.4.0
 		 */
-		do_action( "customize_render_section_{$this->id}" );
+		do_action("customize_render_section_{$this->id}");
 
 		$this->render();
 	}
@@ -347,13 +347,13 @@ 
 		<li id="accordion-section-{{ data.id }}" class="accordion-section control-section control-section-{{ data.type }}">
 			<h3 class="accordion-section-title" tabindex="0">
 				{{ data.title }}
-				<span class="screen-reader-text"><?php _e( 'Press return or enter to open' ); ?></span>
+				<span class="screen-reader-text"><?php _e('Press return or enter to open'); ?></span>
 			</h3>
 			<ul class="accordion-section-content">
 				<li class="customize-section-description-container">
 					<div class="customize-section-title">
 						<button class="customize-section-back" tabindex="-1">
-							<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+							<span class="screen-reader-text"><?php _e('Back'); ?></span>
 						</button>
 						<h3>
 							<span class="customize-action">
@@ -401,44 +401,44 @@ 
 	 * @access protected
 	 */
 	protected function render() {
-		$classes = 'accordion-section control-section control-section-' . $this->type;
+		$classes = 'accordion-section control-section control-section-'.$this->type;
 		?>
-		<li id="accordion-section-<?php echo esc_attr( $this->id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
+		<li id="accordion-section-<?php echo esc_attr($this->id); ?>" class="<?php echo esc_attr($classes); ?>">
 			<h3 class="accordion-section-title">
 				<?php
-				if ( $this->manager->is_theme_active() ) {
-					echo '<span class="customize-action">' . __( 'Active theme' ) . '</span> ' . $this->title;
+				if ($this->manager->is_theme_active()) {
+					echo '<span class="customize-action">'.__('Active theme').'</span> '.$this->title;
 				} else {
-					echo '<span class="customize-action">' . __( 'Previewing theme' ) . '</span> ' . $this->title;
+					echo '<span class="customize-action">'.__('Previewing theme').'</span> '.$this->title;
 				}
 				?>
 
-				<button type="button" class="button change-theme" tabindex="0"><?php _ex( 'Change', 'theme' ); ?></button>
+				<button type="button" class="button change-theme" tabindex="0"><?php _ex('Change', 'theme'); ?></button>
 			</h3>
 			<div class="customize-themes-panel control-panel-content themes-php">
 				<h3 class="accordion-section-title customize-section-title">
-					<span class="customize-action"><?php _e( 'Customizing' ); ?></span>
-					<?php _e( 'Themes' ); ?>
-					<span class="title-count theme-count"><?php echo count( $this->controls ) + 1 /* Active theme */; ?></span>
+					<span class="customize-action"><?php _e('Customizing'); ?></span>
+					<?php _e('Themes'); ?>
+					<span class="title-count theme-count"><?php echo count($this->controls) + 1 /* Active theme */; ?></span>
 				</h3>
 				<h3 class="accordion-section-title customize-section-title">
 					<?php
-					if ( $this->manager->is_theme_active() ) {
-						echo '<span class="customize-action">' . __( 'Active theme' ) . '</span> ' . $this->title;
+					if ($this->manager->is_theme_active()) {
+						echo '<span class="customize-action">'.__('Active theme').'</span> '.$this->title;
 					} else {
-						echo '<span class="customize-action">' . __( 'Previewing theme' ) . '</span> ' . $this->title;
+						echo '<span class="customize-action">'.__('Previewing theme').'</span> '.$this->title;
 					}
 					?>
-					<button type="button" class="button customize-theme"><?php _e( 'Customize' ); ?></button>
+					<button type="button" class="button customize-theme"><?php _e('Customize'); ?></button>
 				</h3>
 
-				<div class="theme-overlay" tabindex="0" role="dialog" aria-label="<?php esc_attr_e( 'Theme Details' ); ?>"></div>
+				<div class="theme-overlay" tabindex="0" role="dialog" aria-label="<?php esc_attr_e('Theme Details'); ?>"></div>
 
 				<div id="customize-container"></div>
-				<?php if ( count( $this->controls ) > 4 ) : ?>
+				<?php if (count($this->controls) > 4) : ?>
 					<p><label for="themes-filter">
-						<span class="screen-reader-text"><?php _e( 'Search installed themes...' ); ?></span>
-						<input type="text" id="themes-filter" placeholder="<?php esc_attr_e( 'Search installed themes...' ); ?>" />
+						<span class="screen-reader-text"><?php _e('Search installed themes...'); ?></span>
+						<input type="text" id="themes-filter" placeholder="<?php esc_attr_e('Search installed themes...'); ?>" />
 					</label></p>
 				<?php endif; ?>
 				<div class="theme-browser rendered">
@@ -499,7 +499,7 @@ 
 	 * @return bool Whether sidebar is rendered.
 	 */
 	public function active_callback() {
-		return $this->manager->widgets->is_sidebar_rendered( $this->sidebar_id );
+		return $this->manager->widgets->is_sidebar_rendered($this->sidebar_id);
 	}
 }
 
@@ -532,7 +532,7 @@ 
 	 */
 	public function json() {
 		$exported = parent::json();
-		$exported['menu_id'] = intval( preg_replace( '/^nav_menu\[(\d+)\]/', '$1', $this->id ) );
+		$exported['menu_id'] = intval(preg_replace('/^nav_menu\[(\d+)\]/', '$1', $this->id));
 
 		return $exported;
 	}
@@ -566,9 +566,9 @@ 
 	 */
 	protected function render() {
 		?>
-		<li id="accordion-section-<?php echo esc_attr( $this->id ); ?>" class="accordion-section-new-menu">
+		<li id="accordion-section-<?php echo esc_attr($this->id); ?>" class="accordion-section-new-menu">
 			<button type="button" class="button-secondary add-new-menu-item add-menu-toggle" aria-expanded="false">
-				<?php echo esc_html( $this->title ); ?>
+				<?php echo esc_html($this->title); ?>
 			</button>
 			<ul class="new-menu-section-content"></ul>
 		</li>

src/wp-includes/class-wp-customize-setting.php

Doc Comments +4 added lines, -4 removed lines

@@ -263,7 +263,7 @@ 
 	 *
 	 * @since 3.4.0
 	 *
-	 * @param mixed $default A default value which is used as a fallback. Default is null.
+	 * @param stdClass $default A default value which is used as a fallback. Default is null.
 	 * @return mixed The default value on failure, otherwise the sanitized value.
 	 */
 	final public function post_value( $default = null ) {
@@ -298,7 +298,7 @@ 
 	 * @since 3.4.0
 	 *
 	 * @param mixed $value The value to update.
-	 * @return mixed The result of saving the value.
+	 * @return null|boolean The result of saving the value.
 	 */
 	protected function update( $value ) {
 		switch( $this->type ) {
@@ -352,7 +352,7 @@ 
 	 * @since 3.4.0
 	 *
 	 * @param mixed $value The value to update.
-	 * @return bool The result of saving the value.
+	 * @return boolean|null The result of saving the value.
 	 */
 	protected function _update_option( $value ) {
 		// Handle non-array option.
@@ -534,7 +534,7 @@ 
 	 *
 	 * @param $root
 	 * @param $keys
-	 * @param mixed $default A default value which is used as a fallback. Default is null.
+	 * @param string $default A default value which is used as a fallback. Default is null.
 	 * @return mixed The requested value or the default value.
 	 */
 	final protected function multidimensional_get( $root, $keys, $default = null ) {

Spacing +343 added lines, -343 removed lines

@@ -88,30 +88,30 @@ 
 	 *                                      theme mod or option name.
 	 * @param array                $args    Setting arguments.
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		$keys = array_keys( get_object_vars( $this ) );
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) )
-				$this->$key = $args[ $key ];
+	public function __construct($manager, $id, $args = array()) {
+		$keys = array_keys(get_object_vars($this));
+		foreach ($keys as $key) {
+			if (isset($args[$key]))
+				$this->$key = $args[$key];
 		}
 
 		$this->manager = $manager;
 		$this->id = $id;
 
 		// Parse the ID for array keys.
-		$this->id_data[ 'keys' ] = preg_split( '/\[/', str_replace( ']', '', $this->id ) );
-		$this->id_data[ 'base' ] = array_shift( $this->id_data[ 'keys' ] );
+		$this->id_data['keys'] = preg_split('/\[/', str_replace(']', '', $this->id));
+		$this->id_data['base'] = array_shift($this->id_data['keys']);
 
 		// Rebuild the ID.
-		$this->id = $this->id_data[ 'base' ];
-		if ( ! empty( $this->id_data[ 'keys' ] ) )
-			$this->id .= '[' . implode( '][', $this->id_data[ 'keys' ] ) . ']';
+		$this->id = $this->id_data['base'];
+		if ( ! empty($this->id_data['keys']))
+			$this->id .= '['.implode('][', $this->id_data['keys']).']';
 
-		if ( $this->sanitize_callback )
-			add_filter( "customize_sanitize_{$this->id}", $this->sanitize_callback, 10, 2 );
+		if ($this->sanitize_callback)
+			add_filter("customize_sanitize_{$this->id}", $this->sanitize_callback, 10, 2);
 
-		if ( $this->sanitize_js_callback )
-			add_filter( "customize_sanitize_js_{$this->id}", $this->sanitize_js_callback, 10, 2 );
+		if ($this->sanitize_js_callback)
+			add_filter("customize_sanitize_js_{$this->id}", $this->sanitize_js_callback, 10, 2);
 	}
 
 	/**
@@ -132,10 +132,10 @@ 
 	 * @return bool If preview() has been called.
 	 */
 	public function is_current_blog_previewed() {
-		if ( ! isset( $this->_previewed_blog_id ) ) {
+		if ( ! isset($this->_previewed_blog_id)) {
 			return false;
 		}
-		return ( get_current_blog_id() === $this->_previewed_blog_id );
+		return (get_current_blog_id() === $this->_previewed_blog_id);
 	}
 
 	/**
@@ -153,23 +153,23 @@ 
 	 * @since 3.4.0
 	 */
 	public function preview() {
-		if ( ! isset( $this->_original_value ) ) {
+		if ( ! isset($this->_original_value)) {
 			$this->_original_value = $this->value();
 		}
-		if ( ! isset( $this->_previewed_blog_id ) ) {
+		if ( ! isset($this->_previewed_blog_id)) {
 			$this->_previewed_blog_id = get_current_blog_id();
 		}
 
-		switch( $this->type ) {
+		switch ($this->type) {
 			case 'theme_mod' :
-				add_filter( 'theme_mod_' . $this->id_data[ 'base' ], array( $this, '_preview_filter' ) );
+				add_filter('theme_mod_'.$this->id_data['base'], array($this, '_preview_filter'));
 				break;
 			case 'option' :
-				if ( empty( $this->id_data[ 'keys' ] ) )
-					add_filter( 'pre_option_' . $this->id_data[ 'base' ], array( $this, '_preview_filter' ) );
+				if (empty($this->id_data['keys']))
+					add_filter('pre_option_'.$this->id_data['base'], array($this, '_preview_filter'));
 				else {
-					add_filter( 'option_' . $this->id_data[ 'base' ], array( $this, '_preview_filter' ) );
-					add_filter( 'default_option_' . $this->id_data[ 'base' ], array( $this, '_preview_filter' ) );
+					add_filter('option_'.$this->id_data['base'], array($this, '_preview_filter'));
+					add_filter('default_option_'.$this->id_data['base'], array($this, '_preview_filter'));
 				}
 				break;
 			default :
@@ -184,7 +184,7 @@ 
 				 *
 				 * @param WP_Customize_Setting $this {@see WP_Customize_Setting} instance.
 				 */
-				do_action( "customize_preview_{$this->id}", $this );
+				do_action("customize_preview_{$this->id}", $this);
 
 				/**
 				 * Fires when the {@see WP_Customize_Setting::preview()} method is called for settings
@@ -196,7 +196,7 @@ 
 				 *
 				 * @param WP_Customize_Setting $this {@see WP_Customize_Setting} instance.
 				 */
-				do_action( "customize_preview_{$this->type}", $this );
+				do_action("customize_preview_{$this->type}", $this);
 		}
 	}
 
@@ -213,20 +213,20 @@ 
 	 * @param mixed $original Old value.
 	 * @return mixed New or old value.
 	 */
-	public function _preview_filter( $original ) {
-		if ( ! $this->is_current_blog_previewed() ) {
+	public function _preview_filter($original) {
+		if ( ! $this->is_current_blog_previewed()) {
 			return $original;
 		}
 
 		$undefined = new stdClass(); // symbol hack
-		$post_value = $this->post_value( $undefined );
-		if ( $undefined === $post_value ) {
+		$post_value = $this->post_value($undefined);
+		if ($undefined === $post_value) {
 			$value = $this->_original_value;
 		} else {
 			$value = $post_value;
 		}
 
-		return $this->multidimensional_replace( $original, $this->id_data['keys'], $value );
+		return $this->multidimensional_replace($original, $this->id_data['keys'], $value);
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 	final public function save() {
 		$value = $this->post_value();
 
-		if ( ! $this->check_capabilities() || ! isset( $value ) )
+		if ( ! $this->check_capabilities() || ! isset($value))
 			return false;
 
 		/**
@@ -253,9 +253,9 @@ 
 		 *
 		 * @param WP_Customize_Setting $this {@see WP_Customize_Setting} instance.
 		 */
-		do_action( 'customize_save_' . $this->id_data[ 'base' ], $this );
+		do_action('customize_save_'.$this->id_data['base'], $this);
 
-		$this->update( $value );
+		$this->update($value);
 	}
 
 	/**
@@ -266,8 +266,8 @@ 
 	 * @param mixed $default A default value which is used as a fallback. Default is null.
 	 * @return mixed The default value on failure, otherwise the sanitized value.
 	 */
-	final public function post_value( $default = null ) {
-		return $this->manager->post_value( $this, $default );
+	final public function post_value($default = null) {
+		return $this->manager->post_value($this, $default);
 	}
 
 	/**
@@ -278,8 +278,8 @@ 
 	 * @param string|array $value The value to sanitize.
 	 * @return string|array|null Null if an input isn't valid, otherwise the sanitized value.
 	 */
-	public function sanitize( $value ) {
-		$value = wp_unslash( $value );
+	public function sanitize($value) {
+		$value = wp_unslash($value);
 
 		/**
 		 * Filter a Customize setting value in un-slashed form.
@@ -289,7 +289,7 @@ 
 		 * @param mixed                $value Value of the setting.
 		 * @param WP_Customize_Setting $this  WP_Customize_Setting instance.
 		 */
-		return apply_filters( "customize_sanitize_{$this->id}", $value, $this );
+		return apply_filters("customize_sanitize_{$this->id}", $value, $this);
 	}
 
 	/**
@@ -300,13 +300,13 @@ 
 	 * @param mixed $value The value to update.
 	 * @return mixed The result of saving the value.
 	 */
-	protected function update( $value ) {
-		switch( $this->type ) {
+	protected function update($value) {
+		switch ($this->type) {
 			case 'theme_mod' :
-				return $this->_update_theme_mod( $value );
+				return $this->_update_theme_mod($value);
 
 			case 'option' :
-				return $this->_update_option( $value );
+				return $this->_update_option($value);
 
 			default :
 
@@ -321,7 +321,7 @@ 
 				 * @param mixed                $value Value of the setting.
 				 * @param WP_Customize_Setting $this  WP_Customize_Setting instance.
 				 */
-				return do_action( 'customize_update_' . $this->type, $value, $this );
+				return do_action('customize_update_'.$this->type, $value, $this);
 		}
 	}
 
@@ -332,17 +332,17 @@ 
 	 *
 	 * @param mixed $value The value to update.
 	 */
-	protected function _update_theme_mod( $value ) {
+	protected function _update_theme_mod($value) {
 		// Handle non-array theme mod.
-		if ( empty( $this->id_data[ 'keys' ] ) ) {
-			set_theme_mod( $this->id_data[ 'base' ], $value );
+		if (empty($this->id_data['keys'])) {
+			set_theme_mod($this->id_data['base'], $value);
 			return;
 		}
 		// Handle array-based theme mod.
-		$mods = get_theme_mod( $this->id_data[ 'base' ] );
-		$mods = $this->multidimensional_replace( $mods, $this->id_data[ 'keys' ], $value );
-		if ( isset( $mods ) ) {
-			set_theme_mod( $this->id_data[ 'base' ], $mods );
+		$mods = get_theme_mod($this->id_data['base']);
+		$mods = $this->multidimensional_replace($mods, $this->id_data['keys'], $value);
+		if (isset($mods)) {
+			set_theme_mod($this->id_data['base'], $mods);
 		}
 	}
 
@@ -354,16 +354,16 @@ 
 	 * @param mixed $value The value to update.
 	 * @return bool The result of saving the value.
 	 */
-	protected function _update_option( $value ) {
+	protected function _update_option($value) {
 		// Handle non-array option.
-		if ( empty( $this->id_data[ 'keys' ] ) )
-			return update_option( $this->id_data[ 'base' ], $value );
+		if (empty($this->id_data['keys']))
+			return update_option($this->id_data['base'], $value);
 
 		// Handle array-based options.
-		$options = get_option( $this->id_data[ 'base' ] );
-		$options = $this->multidimensional_replace( $options, $this->id_data[ 'keys' ], $value );
-		if ( isset( $options ) )
-			return update_option( $this->id_data[ 'base' ], $options );
+		$options = get_option($this->id_data['base']);
+		$options = $this->multidimensional_replace($options, $this->id_data['keys'], $value);
+		if (isset($options))
+			return update_option($this->id_data['base'], $options);
 	}
 
 	/**
@@ -375,7 +375,7 @@ 
 	 */
 	public function value() {
 		// Get the callback that corresponds to the setting type.
-		switch( $this->type ) {
+		switch ($this->type) {
 			case 'theme_mod' :
 				$function = 'get_theme_mod';
 				break;
@@ -397,16 +397,16 @@ 
 				 *
 				 * @param mixed $default The setting default value. Default empty.
 				 */
-				return apply_filters( 'customize_value_' . $this->id_data[ 'base' ], $this->default );
+				return apply_filters('customize_value_'.$this->id_data['base'], $this->default);
 		}
 
 		// Handle non-array value
-		if ( empty( $this->id_data[ 'keys' ] ) )
-			return $function( $this->id_data[ 'base' ], $this->default );
+		if (empty($this->id_data['keys']))
+			return $function($this->id_data['base'], $this->default);
 
 		// Handle array-based value
-		$values = $function( $this->id_data[ 'base' ] );
-		return $this->multidimensional_get( $values, $this->id_data[ 'keys' ], $this->default );
+		$values = $function($this->id_data['base']);
+		return $this->multidimensional_get($values, $this->id_data['keys'], $this->default);
 	}
 
 	/**
@@ -428,10 +428,10 @@ 
 		 * @param mixed                $value The setting value.
 		 * @param WP_Customize_Setting $this  {@see WP_Customize_Setting} instance.
 		 */
-		$value = apply_filters( "customize_sanitize_js_{$this->id}", $this->value(), $this );
+		$value = apply_filters("customize_sanitize_js_{$this->id}", $this->value(), $this);
 
-		if ( is_string( $value ) )
-			return html_entity_decode( $value, ENT_QUOTES, 'UTF-8');
+		if (is_string($value))
+			return html_entity_decode($value, ENT_QUOTES, 'UTF-8');
 
 		return $value;
 	}
@@ -444,10 +444,10 @@ 
 	 * @return bool False if theme doesn't support the setting or user can't change setting, otherwise true.
 	 */
 	final public function check_capabilities() {
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) )
+		if ($this->capability && ! call_user_func_array('current_user_can', (array) $this->capability))
 			return false;
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) )
+		if ($this->theme_supports && ! call_user_func_array('current_theme_supports', (array) $this->theme_supports))
 			return false;
 
 		return true;
@@ -463,37 +463,37 @@ 
 	 * @param bool $create Default is false.
 	 * @return array|void Keys are 'root', 'node', and 'key'.
 	 */
-	final protected function multidimensional( &$root, $keys, $create = false ) {
-		if ( $create && empty( $root ) )
+	final protected function multidimensional(&$root, $keys, $create = false) {
+		if ($create && empty($root))
 			$root = array();
 
-		if ( ! isset( $root ) || empty( $keys ) )
+		if ( ! isset($root) || empty($keys))
 			return;
 
-		$last = array_pop( $keys );
+		$last = array_pop($keys);
 		$node = &$root;
 
-		foreach ( $keys as $key ) {
-			if ( $create && ! isset( $node[ $key ] ) )
-				$node[ $key ] = array();
+		foreach ($keys as $key) {
+			if ($create && ! isset($node[$key]))
+				$node[$key] = array();
 
-			if ( ! is_array( $node ) || ! isset( $node[ $key ] ) )
+			if ( ! is_array($node) || ! isset($node[$key]))
 				return;
 
-			$node = &$node[ $key ];
+			$node = &$node[$key];
 		}
 
-		if ( $create ) {
-			if ( ! is_array( $node ) ) {
+		if ($create) {
+			if ( ! is_array($node)) {
 				// account for an array overriding a string or object value
 				$node = array();
 			}
-			if ( ! isset( $node[ $last ] ) ) {
-				$node[ $last ] = array();
+			if ( ! isset($node[$last])) {
+				$node[$last] = array();
 			}
 		}
 
-		if ( ! isset( $node[ $last ] ) )
+		if ( ! isset($node[$last]))
 			return;
 
 		return array(
@@ -513,16 +513,16 @@ 
 	 * @param mixed $value The value to update.
 	 * @return
 	 */
-	final protected function multidimensional_replace( $root, $keys, $value ) {
-		if ( ! isset( $value ) )
+	final protected function multidimensional_replace($root, $keys, $value) {
+		if ( ! isset($value))
 			return $root;
-		elseif ( empty( $keys ) ) // If there are no keys, we're replacing the root.
+		elseif (empty($keys)) // If there are no keys, we're replacing the root.
 			return $value;
 
-		$result = $this->multidimensional( $root, $keys, true );
+		$result = $this->multidimensional($root, $keys, true);
 
-		if ( isset( $result ) )
-			$result['node'][ $result['key'] ] = $value;
+		if (isset($result))
+			$result['node'][$result['key']] = $value;
 
 		return $root;
 	}
@@ -537,12 +537,12 @@ 
 	 * @param mixed $default A default value which is used as a fallback. Default is null.
 	 * @return mixed The requested value or the default value.
 	 */
-	final protected function multidimensional_get( $root, $keys, $default = null ) {
-		if ( empty( $keys ) ) // If there are no keys, test the root.
-			return isset( $root ) ? $root : $default;
+	final protected function multidimensional_get($root, $keys, $default = null) {
+		if (empty($keys)) // If there are no keys, test the root.
+			return isset($root) ? $root : $default;
 
-		$result = $this->multidimensional( $root, $keys );
-		return isset( $result ) ? $result['node'][ $result['key'] ] : $default;
+		$result = $this->multidimensional($root, $keys);
+		return isset($result) ? $result['node'][$result['key']] : $default;
 	}
 
 	/**
@@ -554,9 +554,9 @@ 
 	 * @param $keys
 	 * @return bool True if value is set, false if not.
 	 */
-	final protected function multidimensional_isset( $root, $keys ) {
-		$result = $this->multidimensional_get( $root, $keys );
-		return isset( $result );
+	final protected function multidimensional_isset($root, $keys) {
+		$result = $this->multidimensional_get($root, $keys);
+		return isset($result);
 	}
 }
 
@@ -574,7 +574,7 @@ 
 	/**
 	 * @since 3.4.0
 	 */
-	public function update( $value ) {}
+	public function update($value) {}
 }
 
 /**
@@ -596,18 +596,18 @@ 
 	 *
 	 * @param $value
 	 */
-	public function update( $value ) {
+	public function update($value) {
 		global $custom_image_header;
 
 		// If the value doesn't exist (removed or random),
 		// use the header_image value.
-		if ( ! $value )
+		if ( ! $value)
 			$value = $this->manager->get_setting('header_image')->post_value();
 
-		if ( is_array( $value ) && isset( $value['choice'] ) )
-			$custom_image_header->set_header_image( $value['choice'] );
+		if (is_array($value) && isset($value['choice']))
+			$custom_image_header->set_header_image($value['choice']);
 		else
-			$custom_image_header->set_header_image( $value );
+			$custom_image_header->set_header_image($value);
 	}
 }
 
@@ -626,8 +626,8 @@ 
 	 *
 	 * @param $value
 	 */
-	public function update( $value ) {
-		remove_theme_mod( 'background_image_thumb' );
+	public function update($value) {
+		remove_theme_mod('background_image_thumb');
 	}
 }
 
@@ -803,25 +803,25 @@ 
 	 *
 	 * @throws Exception If $id is not valid for this setting type.
 	 */
-	public function __construct( WP_Customize_Manager $manager, $id, array $args = array() ) {
-		if ( empty( $manager->nav_menus ) ) {
-			throw new Exception( 'Expected WP_Customize_Manager::$nav_menus to be set.' );
+	public function __construct(WP_Customize_Manager $manager, $id, array $args = array()) {
+		if (empty($manager->nav_menus)) {
+			throw new Exception('Expected WP_Customize_Manager::$nav_menus to be set.');
 		}
 
-		if ( ! preg_match( self::ID_PATTERN, $id, $matches ) ) {
-			throw new Exception( "Illegal widget setting ID: $id" );
+		if ( ! preg_match(self::ID_PATTERN, $id, $matches)) {
+			throw new Exception("Illegal widget setting ID: $id");
 		}
 
-		$this->post_id = intval( $matches['id'] );
-		add_action( 'wp_update_nav_menu_item', array( $this, 'flush_cached_value' ), 10, 2 );
+		$this->post_id = intval($matches['id']);
+		add_action('wp_update_nav_menu_item', array($this, 'flush_cached_value'), 10, 2);
 
-		parent::__construct( $manager, $id, $args );
+		parent::__construct($manager, $id, $args);
 
 		// Ensure that an initially-supplied value is valid.
-		if ( isset( $this->value ) ) {
+		if (isset($this->value)) {
 			$this->populate_value();
-			foreach ( array_diff( array_keys( $this->default ), array_keys( $this->value ) ) as $missing ) {
-				throw new Exception( "Supplied nav_menu_item value missing property: $missing" );
+			foreach (array_diff(array_keys($this->default), array_keys($this->value)) as $missing) {
+				throw new Exception("Supplied nav_menu_item value missing property: $missing");
 			}
 		}
 
@@ -836,9 +836,9 @@ 
 	 * @param int $menu_id       The term ID for the menu.
 	 * @param int $menu_item_id  The post ID for the menu item.
 	 */
-	public function flush_cached_value( $menu_id, $menu_item_id ) {
-		unset( $menu_id );
-		if ( $menu_item_id === $this->post_id ) {
+	public function flush_cached_value($menu_id, $menu_item_id) {
+		unset($menu_id);
+		if ($menu_item_id === $this->post_id) {
 			$this->value = null;
 		}
 	}
@@ -854,29 +854,29 @@ 
 	 * @return array|false Instance data array, or false if the item is marked for deletion.
 	 */
 	public function value() {
-		if ( $this->is_previewed && $this->_previewed_blog_id === get_current_blog_id() ) {
+		if ($this->is_previewed && $this->_previewed_blog_id === get_current_blog_id()) {
 			$undefined  = new stdClass(); // Symbol.
-			$post_value = $this->post_value( $undefined );
+			$post_value = $this->post_value($undefined);
 
-			if ( $undefined === $post_value ) {
+			if ($undefined === $post_value) {
 				$value = $this->_original_value;
 			} else {
 				$value = $post_value;
 			}
-		} else if ( isset( $this->value ) ) {
+		} else if (isset($this->value)) {
 			$value = $this->value;
 		} else {
 			$value = false;
 
 			// Note that a ID of less than one indicates a nav_menu not yet inserted.
-			if ( $this->post_id > 0 ) {
-				$post = get_post( $this->post_id );
-				if ( $post && self::POST_TYPE === $post->post_type ) {
-					$value = (array) wp_setup_nav_menu_item( $post );
+			if ($this->post_id > 0) {
+				$post = get_post($this->post_id);
+				if ($post && self::POST_TYPE === $post->post_type) {
+					$value = (array) wp_setup_nav_menu_item($post);
 				}
 			}
 
-			if ( ! is_array( $value ) ) {
+			if ( ! is_array($value)) {
 				$value = $this->default;
 			}
 
@@ -900,46 +900,46 @@ 
 	 * @see WP_Customize_Nav_Menu_Item_Setting::value()
 	 */
 	protected function populate_value() {
-		if ( ! is_array( $this->value ) ) {
+		if ( ! is_array($this->value)) {
 			return;
 		}
 
-		if ( isset( $this->value['menu_order'] ) ) {
+		if (isset($this->value['menu_order'])) {
 			$this->value['position'] = $this->value['menu_order'];
-			unset( $this->value['menu_order'] );
+			unset($this->value['menu_order']);
 		}
-		if ( isset( $this->value['post_status'] ) ) {
+		if (isset($this->value['post_status'])) {
 			$this->value['status'] = $this->value['post_status'];
-			unset( $this->value['post_status'] );
+			unset($this->value['post_status']);
 		}
 
-		if ( ! isset( $this->value['original_title'] ) ) {
+		if ( ! isset($this->value['original_title'])) {
 			$original_title = '';
-			if ( 'post_type' === $this->value['type'] ) {
-				$original_title = get_the_title( $this->value['object_id'] );
-			} elseif ( 'taxonomy' === $this->value['type'] ) {
-				$original_title = get_term_field( 'name', $this->value['object_id'], $this->value['object'], 'raw' );
-				if ( is_wp_error( $original_title ) ) {
+			if ('post_type' === $this->value['type']) {
+				$original_title = get_the_title($this->value['object_id']);
+			} elseif ('taxonomy' === $this->value['type']) {
+				$original_title = get_term_field('name', $this->value['object_id'], $this->value['object'], 'raw');
+				if (is_wp_error($original_title)) {
 					$original_title = '';
 				}
 			}
-			$this->value['original_title'] = html_entity_decode( $original_title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+			$this->value['original_title'] = html_entity_decode($original_title, ENT_QUOTES, get_bloginfo('charset'));
 		}
 
-		if ( ! isset( $this->value['nav_menu_term_id'] ) && $this->post_id > 0 ) {
-			$menus = wp_get_post_terms( $this->post_id, WP_Customize_Nav_Menu_Setting::TAXONOMY, array(
+		if ( ! isset($this->value['nav_menu_term_id']) && $this->post_id > 0) {
+			$menus = wp_get_post_terms($this->post_id, WP_Customize_Nav_Menu_Setting::TAXONOMY, array(
 				'fields' => 'ids',
-			) );
-			if ( ! empty( $menus ) ) {
-				$this->value['nav_menu_term_id'] = array_shift( $menus );
+			));
+			if ( ! empty($menus)) {
+				$this->value['nav_menu_term_id'] = array_shift($menus);
 			} else {
 				$this->value['nav_menu_term_id'] = 0;
 			}
 		}
 
-		foreach ( array( 'object_id', 'menu_item_parent', 'nav_menu_term_id' ) as $key ) {
-			if ( ! is_int( $this->value[ $key ] ) ) {
-				$this->value[ $key ] = intval( $this->value[ $key ] );
+		foreach (array('object_id', 'menu_item_parent', 'nav_menu_term_id') as $key) {
+			if ( ! is_int($this->value[$key])) {
+				$this->value[$key] = intval($this->value[$key]);
 			}
 		}
 
@@ -969,8 +969,8 @@ 
 			'post_type',
 			'to_ping',
 		);
-		foreach ( $irrelevant_properties as $property ) {
-			unset( $this->value[ $property ] );
+		foreach ($irrelevant_properties as $property) {
+			unset($this->value[$property]);
 		}
 	}
 
@@ -983,7 +983,7 @@ 
 	 * @see WP_Customize_Manager::post_value()
 	 */
 	public function preview() {
-		if ( $this->is_previewed ) {
+		if ($this->is_previewed) {
 			return;
 		}
 
@@ -992,11 +992,11 @@ 
 		$this->original_nav_menu_term_id = $this->_original_value['nav_menu_term_id'];
 		$this->_previewed_blog_id        = get_current_blog_id();
 
-		add_filter( 'wp_get_nav_menu_items', array( $this, 'filter_wp_get_nav_menu_items' ), 10, 3 );
+		add_filter('wp_get_nav_menu_items', array($this, 'filter_wp_get_nav_menu_items'), 10, 3);
 
-		$sort_callback = array( __CLASS__, 'sort_wp_get_nav_menu_items' );
-		if ( ! has_filter( 'wp_get_nav_menu_items', $sort_callback ) ) {
-			add_filter( 'wp_get_nav_menu_items', array( __CLASS__, 'sort_wp_get_nav_menu_items' ), 1000, 3 );
+		$sort_callback = array(__CLASS__, 'sort_wp_get_nav_menu_items');
+		if ( ! has_filter('wp_get_nav_menu_items', $sort_callback)) {
+			add_filter('wp_get_nav_menu_items', array(__CLASS__, 'sort_wp_get_nav_menu_items'), 1000, 3);
 		}
 
 		// @todo Add get_post_metadata filters for plugins to add their data.
@@ -1015,17 +1015,17 @@ 
 	 * @param array  $args  An array of arguments used to retrieve menu item objects.
 	 * @return array Array of menu items,
 	 */
-	public function filter_wp_get_nav_menu_items( $items, $menu, $args ) {
+	public function filter_wp_get_nav_menu_items($items, $menu, $args) {
 		$this_item = $this->value();
 		$current_nav_menu_term_id = $this_item['nav_menu_term_id'];
-		unset( $this_item['nav_menu_term_id'] );
+		unset($this_item['nav_menu_term_id']);
 
 		$should_filter = (
 			$menu->term_id === $this->original_nav_menu_term_id
 			||
 			$menu->term_id === $current_nav_menu_term_id
 		);
-		if ( ! $should_filter ) {
+		if ( ! $should_filter) {
 			return $items;
 		}
 
@@ -1039,10 +1039,10 @@ 
 				$current_nav_menu_term_id !== $this->original_nav_menu_term_id
 			)
 		);
-		if ( $should_remove ) {
+		if ($should_remove) {
 			$filtered_items = array();
-			foreach ( $items as $item ) {
-				if ( $item->db_id !== $this->post_id ) {
+			foreach ($items as $item) {
+				if ($item->db_id !== $this->post_id) {
 					$filtered_items[] = $item;
 				}
 			}
@@ -1051,14 +1051,14 @@ 
 
 		$mutated = false;
 		$should_update = (
-			is_array( $this_item )
+			is_array($this_item)
 			&&
 			$current_nav_menu_term_id === $menu->term_id
 		);
-		if ( $should_update ) {
-			foreach ( $items as $item ) {
-				if ( $item->db_id === $this->post_id ) {
-					foreach ( get_object_vars( $this->value_as_wp_post_nav_menu_item() ) as $key => $value ) {
+		if ($should_update) {
+			foreach ($items as $item) {
+				if ($item->db_id === $this->post_id) {
+					foreach (get_object_vars($this->value_as_wp_post_nav_menu_item()) as $key => $value) {
 						$item->$key = $value;
 					}
 					$mutated = true;
@@ -1066,7 +1066,7 @@ 
 			}
 
 			// Not found so we have to append it..
-			if ( ! $mutated ) {
+			if ( ! $mutated) {
 				$items[] = $this->value_as_wp_post_nav_menu_item();
 			}
 		}
@@ -1088,22 +1088,22 @@ 
 	 * @param array  $args  An array of arguments used to retrieve menu item objects.
 	 * @return array Array of menu items,
 	 */
-	public static function sort_wp_get_nav_menu_items( $items, $menu, $args ) {
+	public static function sort_wp_get_nav_menu_items($items, $menu, $args) {
 		// @todo We should probably re-apply some constraints imposed by $args.
-		unset( $args['include'] );
+		unset($args['include']);
 
 		// Remove invalid items only in frontend.
-		if ( ! is_admin() ) {
-			$items = array_filter( $items, '_is_valid_nav_menu_item' );
+		if ( ! is_admin()) {
+			$items = array_filter($items, '_is_valid_nav_menu_item');
 		}
 
-		if ( ARRAY_A === $args['output'] ) {
+		if (ARRAY_A === $args['output']) {
 			$GLOBALS['_menu_item_sort_prop'] = $args['output_key'];
-			usort( $items, '_sort_nav_menu_items' );
+			usort($items, '_sort_nav_menu_items');
 			$i = 1;
 
-			foreach ( $items as $k => $item ) {
-				$items[ $k ]->{$args['output_key']} = $i++;
+			foreach ($items as $k => $item) {
+				$items[$k]->{$args['output_key']} = $i++;
 			}
 		}
 
@@ -1120,44 +1120,44 @@ 
 	 */
 	public function value_as_wp_post_nav_menu_item() {
 		$item = (object) $this->value();
-		unset( $item->nav_menu_term_id );
+		unset($item->nav_menu_term_id);
 
 		$item->post_status = $item->status;
-		unset( $item->status );
+		unset($item->status);
 
 		$item->post_type = 'nav_menu_item';
 		$item->menu_order = $item->position;
-		unset( $item->position );
+		unset($item->position);
 
-		if ( $item->title ) {
+		if ($item->title) {
 			$item->post_title = $item->title;
 		}
 
 		$item->ID = $this->post_id;
 		$item->db_id = $this->post_id;
-		$post = new WP_Post( (object) $item );
+		$post = new WP_Post((object) $item);
 
-		if ( empty( $post->post_author ) ) {
+		if (empty($post->post_author)) {
 			$post->post_author = get_current_user_id();
 		}
 
-		if ( ! isset( $post->type_label ) ) {
-			if ( 'post_type' === $post->type ) {
-				$object = get_post_type_object( $post->object );
-				if ( $object ) {
+		if ( ! isset($post->type_label)) {
+			if ('post_type' === $post->type) {
+				$object = get_post_type_object($post->object);
+				if ($object) {
 					$post->type_label = $object->labels->singular_name;
 				} else {
 					$post->type_label = $post->object;
 				}
-			} elseif ( 'taxonomy' == $post->type ) {
-				$object = get_taxonomy( $post->object );
-				if ( $object ) {
+			} elseif ('taxonomy' == $post->type) {
+				$object = get_taxonomy($post->object);
+				if ($object) {
 					$post->type_label = $object->labels->singular_name;
 				} else {
 					$post->type_label = $post->object;
 				}
 			} else {
-				$post->type_label = __( 'Custom Link' );
+				$post->type_label = __('Custom Link');
 			}
 		}
 
@@ -1177,14 +1177,14 @@ 
 	 * @return array|false|null Null if an input isn't valid. False if it is marked for deletion.
 	 *                          Otherwise the sanitized value.
 	 */
-	public function sanitize( $menu_item_value ) {
+	public function sanitize($menu_item_value) {
 		// Menu is marked for deletion.
-		if ( false === $menu_item_value ) {
+		if (false === $menu_item_value) {
 			return $menu_item_value;
 		}
 
 		// Invalid.
-		if ( ! is_array( $menu_item_value ) ) {
+		if ( ! is_array($menu_item_value)) {
 			return null;
 		}
 
@@ -1205,39 +1205,39 @@ 
 			'original_title'   => '',
 			'nav_menu_term_id' => 0,
 		);
-		$menu_item_value = array_merge( $default, $menu_item_value );
-		$menu_item_value = wp_array_slice_assoc( $menu_item_value, array_keys( $default ) );
-		$menu_item_value['position'] = max( 0, intval( $menu_item_value['position'] ) );
+		$menu_item_value = array_merge($default, $menu_item_value);
+		$menu_item_value = wp_array_slice_assoc($menu_item_value, array_keys($default));
+		$menu_item_value['position'] = max(0, intval($menu_item_value['position']));
 
-		foreach ( array( 'object_id', 'menu_item_parent', 'nav_menu_term_id' ) as $key ) {
+		foreach (array('object_id', 'menu_item_parent', 'nav_menu_term_id') as $key) {
 			// Note we need to allow negative-integer IDs for previewed objects not inserted yet.
-			$menu_item_value[ $key ] = intval( $menu_item_value[ $key ] );
+			$menu_item_value[$key] = intval($menu_item_value[$key]);
 		}
 
-		foreach ( array( 'type', 'object', 'target' ) as $key ) {
-			$menu_item_value[ $key ] = sanitize_key( $menu_item_value[ $key ] );
+		foreach (array('type', 'object', 'target') as $key) {
+			$menu_item_value[$key] = sanitize_key($menu_item_value[$key]);
 		}
 
-		foreach ( array( 'xfn', 'classes' ) as $key ) {
-			$value = $menu_item_value[ $key ];
-			if ( ! is_array( $value ) ) {
-				$value = explode( ' ', $value );
+		foreach (array('xfn', 'classes') as $key) {
+			$value = $menu_item_value[$key];
+			if ( ! is_array($value)) {
+				$value = explode(' ', $value);
 			}
-			$menu_item_value[ $key ] = implode( ' ', array_map( 'sanitize_html_class', $value ) );
+			$menu_item_value[$key] = implode(' ', array_map('sanitize_html_class', $value));
 		}
 
-		foreach ( array( 'title', 'attr_title', 'description', 'original_title' ) as $key ) {
+		foreach (array('title', 'attr_title', 'description', 'original_title') as $key) {
 			// @todo Should esc_attr() the attr_title as well?
-			$menu_item_value[ $key ] = sanitize_text_field( $menu_item_value[ $key ] );
+			$menu_item_value[$key] = sanitize_text_field($menu_item_value[$key]);
 		}
 
-		$menu_item_value['url'] = esc_url_raw( $menu_item_value['url'] );
-		if ( ! get_post_status_object( $menu_item_value['status'] ) ) {
+		$menu_item_value['url'] = esc_url_raw($menu_item_value['url']);
+		if ( ! get_post_status_object($menu_item_value['status'])) {
 			$menu_item_value['status'] = 'publish';
 		}
 
 		/** This filter is documented in wp-includes/class-wp-customize-setting.php */
-		return apply_filters( "customize_sanitize_{$this->id}", $menu_item_value, $this );
+		return apply_filters("customize_sanitize_{$this->id}", $menu_item_value, $this);
 	}
 
 	/**
@@ -1259,29 +1259,29 @@ 
 	 *                           should consist of.
 	 * @return null|void
 	 */
-	protected function update( $value ) {
-		if ( $this->is_updated ) {
+	protected function update($value) {
+		if ($this->is_updated) {
 			return;
 		}
 
 		$this->is_updated = true;
-		$is_placeholder   = ( $this->post_id < 0 );
-		$is_delete        = ( false === $value );
+		$is_placeholder   = ($this->post_id < 0);
+		$is_delete        = (false === $value);
 
 		// Update the cached value.
 		$this->value = $value;
 
-		add_filter( 'customize_save_response', array( $this, 'amend_customize_save_response' ) );
+		add_filter('customize_save_response', array($this, 'amend_customize_save_response'));
 
-		if ( $is_delete ) {
+		if ($is_delete) {
 			// If the current setting post is a placeholder, a delete request is a no-op.
-			if ( $is_placeholder ) {
+			if ($is_placeholder) {
 				$this->update_status = 'deleted';
 			} else {
-				$r = wp_delete_post( $this->post_id, true );
+				$r = wp_delete_post($this->post_id, true);
 
-				if ( false === $r ) {
-					$this->update_error  = new WP_Error( 'delete_failure' );
+				if (false === $r) {
+					$this->update_error  = new WP_Error('delete_failure');
 					$this->update_status = 'error';
 				} else {
 					$this->update_status = 'deleted';
@@ -1291,25 +1291,25 @@ 
 		} else {
 
 			// Handle saving menu items for menus that are being newly-created.
-			if ( $value['nav_menu_term_id'] < 0 ) {
-				$nav_menu_setting_id = sprintf( 'nav_menu[%s]', $value['nav_menu_term_id'] );
-				$nav_menu_setting    = $this->manager->get_setting( $nav_menu_setting_id );
+			if ($value['nav_menu_term_id'] < 0) {
+				$nav_menu_setting_id = sprintf('nav_menu[%s]', $value['nav_menu_term_id']);
+				$nav_menu_setting    = $this->manager->get_setting($nav_menu_setting_id);
 
-				if ( ! $nav_menu_setting || ! ( $nav_menu_setting instanceof WP_Customize_Nav_Menu_Setting ) ) {
+				if ( ! $nav_menu_setting || ! ($nav_menu_setting instanceof WP_Customize_Nav_Menu_Setting)) {
 					$this->update_status = 'error';
-					$this->update_error  = new WP_Error( 'unexpected_nav_menu_setting' );
+					$this->update_error  = new WP_Error('unexpected_nav_menu_setting');
 					return;
 				}
 
-				if ( false === $nav_menu_setting->save() ) {
+				if (false === $nav_menu_setting->save()) {
 					$this->update_status = 'error';
-					$this->update_error  = new WP_Error( 'nav_menu_setting_failure' );
+					$this->update_error  = new WP_Error('nav_menu_setting_failure');
 					return;
 				}
 
-				if ( $nav_menu_setting->previous_term_id !== intval( $value['nav_menu_term_id'] ) ) {
+				if ($nav_menu_setting->previous_term_id !== intval($value['nav_menu_term_id'])) {
 					$this->update_status = 'error';
-					$this->update_error  = new WP_Error( 'unexpected_previous_term_id' );
+					$this->update_error  = new WP_Error('unexpected_previous_term_id');
 					return;
 				}
 
@@ -1317,25 +1317,25 @@ 
 			}
 
 			// Handle saving a nav menu item that is a child of a nav menu item being newly-created.
-			if ( $value['menu_item_parent'] < 0 ) {
-				$parent_nav_menu_item_setting_id = sprintf( 'nav_menu_item[%s]', $value['menu_item_parent'] );
-				$parent_nav_menu_item_setting    = $this->manager->get_setting( $parent_nav_menu_item_setting_id );
+			if ($value['menu_item_parent'] < 0) {
+				$parent_nav_menu_item_setting_id = sprintf('nav_menu_item[%s]', $value['menu_item_parent']);
+				$parent_nav_menu_item_setting    = $this->manager->get_setting($parent_nav_menu_item_setting_id);
 
-				if ( ! $parent_nav_menu_item_setting || ! ( $parent_nav_menu_item_setting instanceof WP_Customize_Nav_Menu_Item_Setting ) ) {
+				if ( ! $parent_nav_menu_item_setting || ! ($parent_nav_menu_item_setting instanceof WP_Customize_Nav_Menu_Item_Setting)) {
 					$this->update_status = 'error';
-					$this->update_error  = new WP_Error( 'unexpected_nav_menu_item_setting' );
+					$this->update_error  = new WP_Error('unexpected_nav_menu_item_setting');
 					return;
 				}
 
-				if ( false === $parent_nav_menu_item_setting->save() ) {
+				if (false === $parent_nav_menu_item_setting->save()) {
 					$this->update_status = 'error';
-					$this->update_error  = new WP_Error( 'nav_menu_item_setting_failure' );
+					$this->update_error  = new WP_Error('nav_menu_item_setting_failure');
 					return;
 				}
 
-				if ( $parent_nav_menu_item_setting->previous_post_id !== intval( $value['menu_item_parent'] ) ) {
+				if ($parent_nav_menu_item_setting->previous_post_id !== intval($value['menu_item_parent'])) {
 					$this->update_status = 'error';
-					$this->update_error  = new WP_Error( 'unexpected_previous_post_id' );
+					$this->update_error  = new WP_Error('unexpected_previous_post_id');
 					return;
 				}
 
@@ -1365,11 +1365,11 @@ 
 				$menu_item_data
 			);
 
-			if ( is_wp_error( $r ) ) {
+			if (is_wp_error($r)) {
 				$this->update_status = 'error';
 				$this->update_error = $r;
 			} else {
-				if ( $is_placeholder ) {
+				if ($is_placeholder) {
 					$this->previous_post_id = $this->post_id;
 					$this->post_id = $r;
 					$this->update_status = 'inserted';
@@ -1392,8 +1392,8 @@ 
 	 * @param array $data Additional information passed back to the 'saved' event on `wp.customize`.
 	 * @return array Save response data.
 	 */
-	public function amend_customize_save_response( $data ) {
-		if ( ! isset( $data['nav_menu_item_updates'] ) ) {
+	public function amend_customize_save_response($data) {
+		if ( ! isset($data['nav_menu_item_updates'])) {
 			$data['nav_menu_item_updates'] = array();
 		}
 
@@ -1548,18 +1548,18 @@ 
 	 *
 	 * @throws Exception If $id is not valid for this setting type.
 	 */
-	public function __construct( WP_Customize_Manager $manager, $id, array $args = array() ) {
-		if ( empty( $manager->nav_menus ) ) {
-			throw new Exception( 'Expected WP_Customize_Manager::$nav_menus to be set.' );
+	public function __construct(WP_Customize_Manager $manager, $id, array $args = array()) {
+		if (empty($manager->nav_menus)) {
+			throw new Exception('Expected WP_Customize_Manager::$nav_menus to be set.');
 		}
 
-		if ( ! preg_match( self::ID_PATTERN, $id, $matches ) ) {
-			throw new Exception( "Illegal widget setting ID: $id" );
+		if ( ! preg_match(self::ID_PATTERN, $id, $matches)) {
+			throw new Exception("Illegal widget setting ID: $id");
 		}
 
-		$this->term_id = intval( $matches['id'] );
+		$this->term_id = intval($matches['id']);
 
-		parent::__construct( $manager, $id, $args );
+		parent::__construct($manager, $id, $args);
 	}
 
 	/**
@@ -1573,11 +1573,11 @@ 
 	 * @return array Instance data.
 	 */
 	public function value() {
-		if ( $this->is_previewed && $this->_previewed_blog_id === get_current_blog_id() ) {
+		if ($this->is_previewed && $this->_previewed_blog_id === get_current_blog_id()) {
 			$undefined  = new stdClass(); // Symbol.
-			$post_value = $this->post_value( $undefined );
+			$post_value = $this->post_value($undefined);
 
-			if ( $undefined === $post_value ) {
+			if ($undefined === $post_value) {
 				$value = $this->_original_value;
 			} else {
 				$value = $post_value;
@@ -1586,22 +1586,22 @@ 
 			$value = false;
 
 			// Note that a term_id of less than one indicates a nav_menu not yet inserted.
-			if ( $this->term_id > 0 ) {
-				$term = wp_get_nav_menu_object( $this->term_id );
+			if ($this->term_id > 0) {
+				$term = wp_get_nav_menu_object($this->term_id);
 
-				if ( $term ) {
-					$value = wp_array_slice_assoc( (array) $term, array_keys( $this->default ) );
+				if ($term) {
+					$value = wp_array_slice_assoc((array) $term, array_keys($this->default));
 
-					$nav_menu_options  = (array) get_option( 'nav_menu_options', array() );
+					$nav_menu_options  = (array) get_option('nav_menu_options', array());
 					$value['auto_add'] = false;
 
-					if ( isset( $nav_menu_options['auto_add'] ) && is_array( $nav_menu_options['auto_add'] ) ) {
-						$value['auto_add'] = in_array( $term->term_id, $nav_menu_options['auto_add'] );
+					if (isset($nav_menu_options['auto_add']) && is_array($nav_menu_options['auto_add'])) {
+						$value['auto_add'] = in_array($term->term_id, $nav_menu_options['auto_add']);
 					}
 				}
 			}
 
-			if ( ! is_array( $value ) ) {
+			if ( ! is_array($value)) {
 				$value = $this->default;
 			}
 		}
@@ -1617,7 +1617,7 @@ 
 	 * @see WP_Customize_Manager::post_value()
 	 */
 	public function preview() {
-		if ( $this->is_previewed ) {
+		if ($this->is_previewed) {
 			return;
 		}
 
@@ -1625,10 +1625,10 @@ 
 		$this->_original_value    = $this->value();
 		$this->_previewed_blog_id = get_current_blog_id();
 
-		add_filter( 'wp_get_nav_menus', array( $this, 'filter_wp_get_nav_menus' ), 10, 2 );
-		add_filter( 'wp_get_nav_menu_object', array( $this, 'filter_wp_get_nav_menu_object' ), 10, 2 );
-		add_filter( 'default_option_nav_menu_options', array( $this, 'filter_nav_menu_options' ) );
-		add_filter( 'option_nav_menu_options', array( $this, 'filter_nav_menu_options' ) );
+		add_filter('wp_get_nav_menus', array($this, 'filter_wp_get_nav_menus'), 10, 2);
+		add_filter('wp_get_nav_menu_object', array($this, 'filter_wp_get_nav_menu_object'), 10, 2);
+		add_filter('default_option_nav_menu_options', array($this, 'filter_nav_menu_options'));
+		add_filter('option_nav_menu_options', array($this, 'filter_nav_menu_options'));
 	}
 
 	/**
@@ -1643,47 +1643,47 @@ 
 	 * @param array $args  An array of arguments used to retrieve menu objects.
 	 * @return array
 	 */
-	public function filter_wp_get_nav_menus( $menus, $args ) {
-		if ( get_current_blog_id() !== $this->_previewed_blog_id ) {
+	public function filter_wp_get_nav_menus($menus, $args) {
+		if (get_current_blog_id() !== $this->_previewed_blog_id) {
 			return $menus;
 		}
 
 		$setting_value = $this->value();
-		$is_delete = ( false === $setting_value );
+		$is_delete = (false === $setting_value);
 		$index = -1;
 
 		// Find the existing menu item's position in the list.
-		foreach ( $menus as $i => $menu ) {
-			if ( (int) $this->term_id === (int) $menu->term_id || (int) $this->previous_term_id === (int) $menu->term_id ) {
+		foreach ($menus as $i => $menu) {
+			if ((int) $this->term_id === (int) $menu->term_id || (int) $this->previous_term_id === (int) $menu->term_id) {
 				$index = $i;
 				break;
 			}
 		}
 
-		if ( $is_delete ) {
+		if ($is_delete) {
 			// Handle deleted menu by removing it from the list.
 			if ( -1 !== $index ) {
-				array_splice( $menus, $index, 1 );
+				array_splice($menus, $index, 1);
 			}
 		} else {
 			// Handle menus being updated or inserted.
-			$menu_obj = (object) array_merge( array(
+			$menu_obj = (object) array_merge(array(
 				'term_id'          => $this->term_id,
 				'term_taxonomy_id' => $this->term_id,
-				'slug'             => sanitize_title( $setting_value['name'] ),
+				'slug'             => sanitize_title($setting_value['name']),
 				'count'            => 0,
 				'term_group'       => 0,
 				'taxonomy'         => self::TAXONOMY,
 				'filter'           => 'raw',
-			), $setting_value );
+			), $setting_value);
 
-			array_splice( $menus, $index, ( -1 === $index ? 0 : 1 ), array( $menu_obj ) );
+			array_splice($menus, $index, ( -1 === $index ? 0 : 1 ), array($menu_obj));
 		}
 
 		// Make sure the menu objects get re-sorted after an update/insert.
-		if ( ! $is_delete && ! empty( $args['orderby'] ) ) {
+		if ( ! $is_delete && ! empty($args['orderby'])) {
 			$this->_current_menus_sort_orderby = $args['orderby'];
-			usort( $menus, array( $this, '_sort_menus_by_orderby' ) );
+			usort($menus, array($this, '_sort_menus_by_orderby'));
 		}
 		// @todo add support for $args['hide_empty'] === true
 
@@ -1715,9 +1715,9 @@ 
 	 *
 	 * @see WP_Customize_Nav_Menu_Setting::filter_wp_get_nav_menus()
 	 */
-	protected function _sort_menus_by_orderby( $menu1, $menu2 ) {
+	protected function _sort_menus_by_orderby($menu1, $menu2) {
 		$key = $this->_current_menus_sort_orderby;
-		return strcmp( $menu1->$key, $menu2->$key );
+		return strcmp($menu1->$key, $menu2->$key);
 	}
 
 	/**
@@ -1734,39 +1734,39 @@ 
 	 * @param string      $menu_id  ID of the nav_menu term. Requests by slug or name will be ignored.
 	 * @return object|null
 	 */
-	public function filter_wp_get_nav_menu_object( $menu_obj, $menu_id ) {
+	public function filter_wp_get_nav_menu_object($menu_obj, $menu_id) {
 		$ok = (
 			get_current_blog_id() === $this->_previewed_blog_id
 			&&
-			is_int( $menu_id )
+			is_int($menu_id)
 			&&
 			$menu_id === $this->term_id
 		);
-		if ( ! $ok ) {
+		if ( ! $ok) {
 			return $menu_obj;
 		}
 
 		$setting_value = $this->value();
 
 		// Handle deleted menus.
-		if ( false === $setting_value ) {
+		if (false === $setting_value) {
 			return false;
 		}
 
 		// Handle sanitization failure by preventing short-circuiting.
-		if ( null === $setting_value ) {
+		if (null === $setting_value) {
 			return $menu_obj;
 		}
 
-		$menu_obj = (object) array_merge( array(
+		$menu_obj = (object) array_merge(array(
 				'term_id'          => $this->term_id,
 				'term_taxonomy_id' => $this->term_id,
-				'slug'             => sanitize_title( $setting_value['name'] ),
+				'slug'             => sanitize_title($setting_value['name']),
 				'count'            => 0,
 				'term_group'       => 0,
 				'taxonomy'         => self::TAXONOMY,
 				'filter'           => 'raw',
-			), $setting_value );
+			), $setting_value);
 
 		return $menu_obj;
 	}
@@ -1780,8 +1780,8 @@ 
 	 * @param array $nav_menu_options Nav menu options including auto_add.
 	 * @return array (Kaybe) modified nav menu options.
 	 */
-	public function filter_nav_menu_options( $nav_menu_options ) {
-		if ( $this->_previewed_blog_id !== get_current_blog_id() ) {
+	public function filter_nav_menu_options($nav_menu_options) {
+		if ($this->_previewed_blog_id !== get_current_blog_id()) {
 			return $nav_menu_options;
 		}
 
@@ -1808,14 +1808,14 @@ 
 	 * @return array|false|null Null if an input isn't valid. False if it is marked for deletion.
 	 *                          Otherwise the sanitized value.
 	 */
-	public function sanitize( $value ) {
+	public function sanitize($value) {
 		// Menu is marked for deletion.
-		if ( false === $value ) {
+		if (false === $value) {
 			return $value;
 		}
 
 		// Invalid.
-		if ( ! is_array( $value ) ) {
+		if ( ! is_array($value)) {
 			return null;
 		}
 
@@ -1825,20 +1825,20 @@ 
 			'parent'      => 0,
 			'auto_add'    => false,
 		);
-		$value = array_merge( $default, $value );
-		$value = wp_array_slice_assoc( $value, array_keys( $default ) );
+		$value = array_merge($default, $value);
+		$value = wp_array_slice_assoc($value, array_keys($default));
 
-		$value['name']        = trim( esc_html( $value['name'] ) ); // This sanitization code is used in wp-admin/nav-menus.php.
-		$value['description'] = sanitize_text_field( $value['description'] );
-		$value['parent']      = max( 0, intval( $value['parent'] ) );
-		$value['auto_add']    = ! empty( $value['auto_add'] );
+		$value['name']        = trim(esc_html($value['name'])); // This sanitization code is used in wp-admin/nav-menus.php.
+		$value['description'] = sanitize_text_field($value['description']);
+		$value['parent']      = max(0, intval($value['parent']));
+		$value['auto_add']    = ! empty($value['auto_add']);
 
-		if ( '' === $value['name'] ) {
-			$value['name'] = _x( '(unnamed)', 'Missing menu name.' );
+		if ('' === $value['name']) {
+			$value['name'] = _x('(unnamed)', 'Missing menu name.');
 		}
 
 		/** This filter is documented in wp-includes/class-wp-customize-setting.php */
-		return apply_filters( "customize_sanitize_{$this->id}", $value, $this );
+		return apply_filters("customize_sanitize_{$this->id}", $value, $this);
 	}
 
 	/**
@@ -1877,26 +1877,26 @@ 
 	 * }
 	 * @return null|void
 	 */
-	protected function update( $value ) {
-		if ( $this->is_updated ) {
+	protected function update($value) {
+		if ($this->is_updated) {
 			return;
 		}
 
 		$this->is_updated = true;
-		$is_placeholder   = ( $this->term_id < 0 );
-		$is_delete        = ( false === $value );
+		$is_placeholder   = ($this->term_id < 0);
+		$is_delete        = (false === $value);
 
-		add_filter( 'customize_save_response', array( $this, 'amend_customize_save_response' ) );
+		add_filter('customize_save_response', array($this, 'amend_customize_save_response'));
 
 		$auto_add = null;
-		if ( $is_delete ) {
+		if ($is_delete) {
 			// If the current setting term is a placeholder, a delete request is a no-op.
-			if ( $is_placeholder ) {
+			if ($is_placeholder) {
 				$this->update_status = 'deleted';
 			} else {
-				$r = wp_delete_nav_menu( $this->term_id );
+				$r = wp_delete_nav_menu($this->term_id);
 
-				if ( is_wp_error( $r ) ) {
+				if (is_wp_error($r)) {
 					$this->update_status = 'error';
 					$this->update_error  = $r;
 				} else {
@@ -1906,25 +1906,25 @@ 
 			}
 		} else {
 			// Insert or update menu.
-			$menu_data = wp_array_slice_assoc( $value, array( 'description', 'parent' ) );
+			$menu_data = wp_array_slice_assoc($value, array('description', 'parent'));
 			$menu_data['menu-name'] = $value['name'];
 
 			$menu_id = $is_placeholder ? 0 : $this->term_id;
-			$r = wp_update_nav_menu_object( $menu_id, $menu_data );
+			$r = wp_update_nav_menu_object($menu_id, $menu_data);
 			$original_name = $menu_data['menu-name'];
 			$name_conflict_suffix = 1;
-			while ( is_wp_error( $r ) && 'menu_exists' === $r->get_error_code() ) {
+			while (is_wp_error($r) && 'menu_exists' === $r->get_error_code()) {
 				$name_conflict_suffix += 1;
 				/* translators: 1: original menu name, 2: duplicate count */
-				$menu_data['menu-name'] = sprintf( __( '%1$s (%2$d)' ), $original_name, $name_conflict_suffix );
-				$r = wp_update_nav_menu_object( $menu_id, $menu_data );
+				$menu_data['menu-name'] = sprintf(__('%1$s (%2$d)'), $original_name, $name_conflict_suffix);
+				$r = wp_update_nav_menu_object($menu_id, $menu_data);
 			}
 
-			if ( is_wp_error( $r ) ) {
+			if (is_wp_error($r)) {
 				$this->update_status = 'error';
 				$this->update_error  = $r;
 			} else {
-				if ( $is_placeholder ) {
+				if ($is_placeholder) {
 					$this->previous_term_id = $this->term_id;
 					$this->term_id          = $r;
 					$this->update_status    = 'inserted';
@@ -1936,47 +1936,47 @@ 
 			}
 		}
 
-		if ( null !== $auto_add ) {
+		if (null !== $auto_add) {
 			$nav_menu_options = $this->filter_nav_menu_options_value(
-				(array) get_option( 'nav_menu_options', array() ),
+				(array) get_option('nav_menu_options', array()),
 				$this->term_id,
 				$auto_add
 			);
-			update_option( 'nav_menu_options', $nav_menu_options );
+			update_option('nav_menu_options', $nav_menu_options);
 		}
 
-		if ( 'inserted' === $this->update_status ) {
+		if ('inserted' === $this->update_status) {
 			// Make sure that new menus assigned to nav menu locations use their new IDs.
-			foreach ( $this->manager->settings() as $setting ) {
-				if ( ! preg_match( '/^nav_menu_locations\[/', $setting->id ) ) {
+			foreach ($this->manager->settings() as $setting) {
+				if ( ! preg_match('/^nav_menu_locations\[/', $setting->id)) {
 					continue;
 				}
 
-				$post_value = $setting->post_value( null );
-				if ( ! is_null( $post_value ) && $this->previous_term_id === intval( $post_value ) ) {
-					$this->manager->set_post_value( $setting->id, $this->term_id );
+				$post_value = $setting->post_value(null);
+				if ( ! is_null($post_value) && $this->previous_term_id === intval($post_value)) {
+					$this->manager->set_post_value($setting->id, $this->term_id);
 					$setting->save();
 				}
 			}
 
 			// Make sure that any nav_menu widgets referencing the placeholder nav menu get updated and sent back to client.
-			foreach ( array_keys( $this->manager->unsanitized_post_values() ) as $setting_id ) {
-				$nav_menu_widget_setting = $this->manager->get_setting( $setting_id );
-				if ( ! $nav_menu_widget_setting || ! preg_match( '/^widget_nav_menu\[/', $nav_menu_widget_setting->id ) ) {
+			foreach (array_keys($this->manager->unsanitized_post_values()) as $setting_id) {
+				$nav_menu_widget_setting = $this->manager->get_setting($setting_id);
+				if ( ! $nav_menu_widget_setting || ! preg_match('/^widget_nav_menu\[/', $nav_menu_widget_setting->id)) {
 					continue;
 				}
 
 				$widget_instance = $nav_menu_widget_setting->post_value(); // Note that this calls WP_Customize_Widgets::sanitize_widget_instance().
-				if ( empty( $widget_instance['nav_menu'] ) || intval( $widget_instance['nav_menu'] ) !== $this->previous_term_id ) {
+				if (empty($widget_instance['nav_menu']) || intval($widget_instance['nav_menu']) !== $this->previous_term_id) {
 					continue;
 				}
 
 				$widget_instance['nav_menu'] = $this->term_id;
-				$updated_widget_instance = $this->manager->widgets->sanitize_widget_js_instance( $widget_instance );
-				$this->manager->set_post_value( $nav_menu_widget_setting->id, $updated_widget_instance );
+				$updated_widget_instance = $this->manager->widgets->sanitize_widget_js_instance($widget_instance);
+				$this->manager->set_post_value($nav_menu_widget_setting->id, $updated_widget_instance);
 				$nav_menu_widget_setting->save();
 
-				$this->_widget_nav_menu_updates[ $nav_menu_widget_setting->id ] = $updated_widget_instance;
+				$this->_widget_nav_menu_updates[$nav_menu_widget_setting->id] = $updated_widget_instance;
 			}
 		}
 	}
@@ -1995,17 +1995,17 @@ 
 	 * @param bool  $auto_add         Whether to auto-add or not.
 	 * @return array (Maybe) modified nav_menu_otions array.
 	 */
-	protected function filter_nav_menu_options_value( $nav_menu_options, $menu_id, $auto_add ) {
+	protected function filter_nav_menu_options_value($nav_menu_options, $menu_id, $auto_add) {
 		$nav_menu_options = (array) $nav_menu_options;
-		if ( ! isset( $nav_menu_options['auto_add'] ) ) {
+		if ( ! isset($nav_menu_options['auto_add'])) {
 			$nav_menu_options['auto_add'] = array();
 		}
 
-		$i = array_search( $menu_id, $nav_menu_options['auto_add'] );
-		if ( $auto_add && false === $i ) {
-			array_push( $nav_menu_options['auto_add'], $this->term_id );
-		} elseif ( ! $auto_add && false !== $i ) {
-			array_splice( $nav_menu_options['auto_add'], $i, 1 );
+		$i = array_search($menu_id, $nav_menu_options['auto_add']);
+		if ($auto_add && false === $i) {
+			array_push($nav_menu_options['auto_add'], $this->term_id);
+		} elseif ( ! $auto_add && false !== $i) {
+			array_splice($nav_menu_options['auto_add'], $i, 1);
 		}
 
 		return $nav_menu_options;
@@ -2022,11 +2022,11 @@ 
 	 * @param array $data Additional information passed back to the 'saved' event on `wp.customize`.
 	 * @return array Export data.
 	 */
-	public function amend_customize_save_response( $data ) {
-		if ( ! isset( $data['nav_menu_updates'] ) ) {
+	public function amend_customize_save_response($data) {
+		if ( ! isset($data['nav_menu_updates'])) {
 			$data['nav_menu_updates'] = array();
 		}
-		if ( ! isset( $data['widget_nav_menu_updates'] ) ) {
+		if ( ! isset($data['widget_nav_menu_updates'])) {
 			$data['widget_nav_menu_updates'] = array();
 		}
 

Braces +70 added lines, -47 removed lines

@@ -91,8 +91,9 @@ 
 	public function __construct( $manager, $id, $args = array() ) {
 		$keys = array_keys( get_object_vars( $this ) );
 		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) )
-				$this->$key = $args[ $key ];
+			if ( isset( $args[ $key ] ) ) {
+							$this->$key = $args[ $key ];
+			}
 		}
 
 		$this->manager = $manager;
@@ -104,14 +105,17 @@ 
 
 		// Rebuild the ID.
 		$this->id = $this->id_data[ 'base' ];
-		if ( ! empty( $this->id_data[ 'keys' ] ) )
-			$this->id .= '[' . implode( '][', $this->id_data[ 'keys' ] ) . ']';
+		if ( ! empty( $this->id_data[ 'keys' ] ) ) {
+					$this->id .= '[' . implode( '][', $this->id_data[ 'keys' ] ) . ']';
+		}
 
-		if ( $this->sanitize_callback )
-			add_filter( "customize_sanitize_{$this->id}", $this->sanitize_callback, 10, 2 );
+		if ( $this->sanitize_callback ) {
+					add_filter( "customize_sanitize_{$this->id}", $this->sanitize_callback, 10, 2 );
+		}
 
-		if ( $this->sanitize_js_callback )
-			add_filter( "customize_sanitize_js_{$this->id}", $this->sanitize_js_callback, 10, 2 );
+		if ( $this->sanitize_js_callback ) {
+					add_filter( "customize_sanitize_js_{$this->id}", $this->sanitize_js_callback, 10, 2 );
+		}
 	}
 
 	/**
@@ -165,9 +169,9 @@ 
 				add_filter( 'theme_mod_' . $this->id_data[ 'base' ], array( $this, '_preview_filter' ) );
 				break;
 			case 'option' :
-				if ( empty( $this->id_data[ 'keys' ] ) )
-					add_filter( 'pre_option_' . $this->id_data[ 'base' ], array( $this, '_preview_filter' ) );
-				else {
+				if ( empty( $this->id_data[ 'keys' ] ) ) {
+									add_filter( 'pre_option_' . $this->id_data[ 'base' ], array( $this, '_preview_filter' ) );
+				} else {
 					add_filter( 'option_' . $this->id_data[ 'base' ], array( $this, '_preview_filter' ) );
 					add_filter( 'default_option_' . $this->id_data[ 'base' ], array( $this, '_preview_filter' ) );
 				}
@@ -240,8 +244,9 @@ 
 	final public function save() {
 		$value = $this->post_value();
 
-		if ( ! $this->check_capabilities() || ! isset( $value ) )
-			return false;
+		if ( ! $this->check_capabilities() || ! isset( $value ) ) {
+					return false;
+		}
 
 		/**
 		 * Fires when the WP_Customize_Setting::save() method is called.
@@ -356,14 +361,16 @@ 
 	 */
 	protected function _update_option( $value ) {
 		// Handle non-array option.
-		if ( empty( $this->id_data[ 'keys' ] ) )
-			return update_option( $this->id_data[ 'base' ], $value );
+		if ( empty( $this->id_data[ 'keys' ] ) ) {
+					return update_option( $this->id_data[ 'base' ], $value );
+		}
 
 		// Handle array-based options.
 		$options = get_option( $this->id_data[ 'base' ] );
 		$options = $this->multidimensional_replace( $options, $this->id_data[ 'keys' ], $value );
-		if ( isset( $options ) )
-			return update_option( $this->id_data[ 'base' ], $options );
+		if ( isset( $options ) ) {
+					return update_option( $this->id_data[ 'base' ], $options );
+		}
 	}
 
 	/**
@@ -401,8 +408,9 @@ 
 		}
 
 		// Handle non-array value
-		if ( empty( $this->id_data[ 'keys' ] ) )
-			return $function( $this->id_data[ 'base' ], $this->default );
+		if ( empty( $this->id_data[ 'keys' ] ) ) {
+					return $function( $this->id_data[ 'base' ], $this->default );
+		}
 
 		// Handle array-based value
 		$values = $function( $this->id_data[ 'base' ] );
@@ -430,8 +438,9 @@ 
 		 */
 		$value = apply_filters( "customize_sanitize_js_{$this->id}", $this->value(), $this );
 
-		if ( is_string( $value ) )
-			return html_entity_decode( $value, ENT_QUOTES, 'UTF-8');
+		if ( is_string( $value ) ) {
+					return html_entity_decode( $value, ENT_QUOTES, 'UTF-8');
+		}
 
 		return $value;
 	}
@@ -444,11 +453,13 @@ 
 	 * @return bool False if theme doesn't support the setting or user can't change setting, otherwise true.
 	 */
 	final public function check_capabilities() {
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) )
-			return false;
+		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
+					return false;
+		}
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) )
-			return false;
+		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
+					return false;
+		}
 
 		return true;
 	}
@@ -464,21 +475,25 @@ 
 	 * @return array|void Keys are 'root', 'node', and 'key'.
 	 */
 	final protected function multidimensional( &$root, $keys, $create = false ) {
-		if ( $create && empty( $root ) )
-			$root = array();
+		if ( $create && empty( $root ) ) {
+					$root = array();
+		}
 
-		if ( ! isset( $root ) || empty( $keys ) )
-			return;
+		if ( ! isset( $root ) || empty( $keys ) ) {
+					return;
+		}
 
 		$last = array_pop( $keys );
 		$node = &$root;
 
 		foreach ( $keys as $key ) {
-			if ( $create && ! isset( $node[ $key ] ) )
-				$node[ $key ] = array();
+			if ( $create && ! isset( $node[ $key ] ) ) {
+							$node[ $key ] = array();
+			}
 
-			if ( ! is_array( $node ) || ! isset( $node[ $key ] ) )
-				return;
+			if ( ! is_array( $node ) || ! isset( $node[ $key ] ) ) {
+							return;
+			}
 
 			$node = &$node[ $key ];
 		}
@@ -493,8 +508,9 @@ 
 			}
 		}
 
-		if ( ! isset( $node[ $last ] ) )
-			return;
+		if ( ! isset( $node[ $last ] ) ) {
+					return;
+		}
 
 		return array(
 			'root' => &$root,
@@ -514,15 +530,18 @@ 
 	 * @return
 	 */
 	final protected function multidimensional_replace( $root, $keys, $value ) {
-		if ( ! isset( $value ) )
-			return $root;
-		elseif ( empty( $keys ) ) // If there are no keys, we're replacing the root.
+		if ( ! isset( $value ) ) {
+					return $root;
+		} elseif ( empty( $keys ) ) {
+			// If there are no keys, we're replacing the root.
 			return $value;
+		}
 
 		$result = $this->multidimensional( $root, $keys, true );
 
-		if ( isset( $result ) )
-			$result['node'][ $result['key'] ] = $value;
+		if ( isset( $result ) ) {
+					$result['node'][ $result['key'] ] = $value;
+		}
 
 		return $root;
 	}
@@ -538,8 +557,10 @@ 
 	 * @return mixed The requested value or the default value.
 	 */
 	final protected function multidimensional_get( $root, $keys, $default = null ) {
-		if ( empty( $keys ) ) // If there are no keys, test the root.
+		if ( empty( $keys ) ) {
+			// If there are no keys, test the root.
 			return isset( $root ) ? $root : $default;
+		}
 
 		$result = $this->multidimensional( $root, $keys );
 		return isset( $result ) ? $result['node'][ $result['key'] ] : $default;
@@ -601,13 +622,15 @@ 
 
 		// If the value doesn't exist (removed or random),
 		// use the header_image value.
-		if ( ! $value )
-			$value = $this->manager->get_setting('header_image')->post_value();
+		if ( ! $value ) {
+					$value = $this->manager->get_setting('header_image')->post_value();
+		}
 
-		if ( is_array( $value ) && isset( $value['choice'] ) )
-			$custom_image_header->set_header_image( $value['choice'] );
-		else
-			$custom_image_header->set_header_image( $value );
+		if ( is_array( $value ) && isset( $value['choice'] ) ) {
+					$custom_image_header->set_header_image( $value['choice'] );
+		} else {
+					$custom_image_header->set_header_image( $value );
+		}
 	}
 }
 

src/wp-includes/class-wp-customize-widgets.php

Doc Comments +1 added lines, -2 removed lines

@@ -164,7 +164,6 @@ 
 	 * @since 4.2.0
 	 * @access public
 	 *
-	 * @param false|array $setting_args The arguments to the WP_Customize_Setting constructor.
 	 * @param string      $setting_id   ID for dynamic setting, usually coming from `$_POST['customized']`.
 	 * @return false|array Setting arguments, false otherwise.
 	 */
@@ -184,7 +183,7 @@ 
 	 *
 	 * @param string $name    Post value.
 	 * @param mixed  $default Default post value.
-	 * @return mixed Unslashed post value or default value.
+	 * @return string Unslashed post value or default value.
 	 */
 	protected function get_post_value( $name, $default = null ) {
 		if ( ! isset( $_POST[ $name ] ) ) {

Indentation +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * WordPress Customize Widgets classes
- *
- * @package WordPress
- * @subpackage Customize
- * @since 3.9.0
- */
+	 * WordPress Customize Widgets classes
+	 *
+	 * @package WordPress
+	 * @subpackage Customize
+	 * @since 3.9.0
+	 */
 
 /**
  * Customize Widgets class.
@@ -1000,7 +1000,7 @@ 
 	 *
 	 * @since 3.9.0
 	 * @access public
-     *
+	 *
 	 * @global array $wp_registered_sidebars
 	 * @global array $wp_registered_widgets
 	 */

Spacing +321 added lines, -321 removed lines

@@ -81,25 +81,25 @@ 
 	 *
 	 * @param WP_Customize_Manager $manager Customize manager bootstrap instance.
 	 */
-	public function __construct( $manager ) {
+	public function __construct($manager) {
 		$this->manager = $manager;
 
-		add_filter( 'customize_dynamic_setting_args',          array( $this, 'filter_customize_dynamic_setting_args' ), 10, 2 );
-		add_action( 'after_setup_theme',                       array( $this, 'register_settings' ) );
-		add_action( 'wp_loaded',                               array( $this, 'override_sidebars_widgets_for_theme_switch' ) );
-		add_action( 'customize_controls_init',                 array( $this, 'customize_controls_init' ) );
-		add_action( 'customize_register',                      array( $this, 'schedule_customize_register' ), 1 );
-		add_action( 'customize_controls_enqueue_scripts',      array( $this, 'enqueue_scripts' ) );
-		add_action( 'customize_controls_print_styles',         array( $this, 'print_styles' ) );
-		add_action( 'customize_controls_print_scripts',        array( $this, 'print_scripts' ) );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'print_footer_scripts' ) );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'output_widget_control_templates' ) );
-		add_action( 'customize_preview_init',                  array( $this, 'customize_preview_init' ) );
-		add_filter( 'customize_refresh_nonces',                array( $this, 'refresh_nonces' ) );
-
-		add_action( 'dynamic_sidebar',                         array( $this, 'tally_rendered_widgets' ) );
-		add_filter( 'is_active_sidebar',                       array( $this, 'tally_sidebars_via_is_active_sidebar_calls' ), 10, 2 );
-		add_filter( 'dynamic_sidebar_has_widgets',             array( $this, 'tally_sidebars_via_dynamic_sidebar_calls' ), 10, 2 );
+		add_filter('customize_dynamic_setting_args', array($this, 'filter_customize_dynamic_setting_args'), 10, 2);
+		add_action('after_setup_theme', array($this, 'register_settings'));
+		add_action('wp_loaded', array($this, 'override_sidebars_widgets_for_theme_switch'));
+		add_action('customize_controls_init', array($this, 'customize_controls_init'));
+		add_action('customize_register', array($this, 'schedule_customize_register'), 1);
+		add_action('customize_controls_enqueue_scripts', array($this, 'enqueue_scripts'));
+		add_action('customize_controls_print_styles', array($this, 'print_styles'));
+		add_action('customize_controls_print_scripts', array($this, 'print_scripts'));
+		add_action('customize_controls_print_footer_scripts', array($this, 'print_footer_scripts'));
+		add_action('customize_controls_print_footer_scripts', array($this, 'output_widget_control_templates'));
+		add_action('customize_preview_init', array($this, 'customize_preview_init'));
+		add_filter('customize_refresh_nonces', array($this, 'refresh_nonces'));
+
+		add_action('dynamic_sidebar', array($this, 'tally_rendered_widgets'));
+		add_filter('is_active_sidebar', array($this, 'tally_sidebars_via_is_active_sidebar_calls'), 10, 2);
+		add_filter('dynamic_sidebar_has_widgets', array($this, 'tally_sidebars_via_dynamic_sidebar_calls'), 10, 2);
 	}
 
 	/**
@@ -113,14 +113,14 @@ 
 	 * @param $setting_id Setting ID.
 	 * @return string|void Setting type.
 	 */
-	protected function get_setting_type( $setting_id ) {
+	protected function get_setting_type($setting_id) {
 		static $cache = array();
-		if ( isset( $cache[ $setting_id ] ) ) {
-			return $cache[ $setting_id ];
+		if (isset($cache[$setting_id])) {
+			return $cache[$setting_id];
 		}
-		foreach ( $this->setting_id_patterns as $type => $pattern ) {
-			if ( preg_match( $pattern, $setting_id ) ) {
-				$cache[ $setting_id ] = $type;
+		foreach ($this->setting_id_patterns as $type => $pattern) {
+			if (preg_match($pattern, $setting_id)) {
+				$cache[$setting_id] = $type;
 				return $type;
 			}
 		}
@@ -134,25 +134,25 @@ 
 	 */
 	public function register_settings() {
 		$widget_setting_ids = array();
-		$incoming_setting_ids = array_keys( $this->manager->unsanitized_post_values() );
-		foreach ( $incoming_setting_ids as $setting_id ) {
-			if ( ! is_null( $this->get_setting_type( $setting_id ) ) ) {
+		$incoming_setting_ids = array_keys($this->manager->unsanitized_post_values());
+		foreach ($incoming_setting_ids as $setting_id) {
+			if ( ! is_null($this->get_setting_type($setting_id))) {
 				$widget_setting_ids[] = $setting_id;
 			}
 		}
-		if ( $this->manager->doing_ajax( 'update-widget' ) && isset( $_REQUEST['widget-id'] ) ) {
-			$widget_setting_ids[] = $this->get_setting_id( wp_unslash( $_REQUEST['widget-id'] ) );
+		if ($this->manager->doing_ajax('update-widget') && isset($_REQUEST['widget-id'])) {
+			$widget_setting_ids[] = $this->get_setting_id(wp_unslash($_REQUEST['widget-id']));
 		}
 
-		$settings = $this->manager->add_dynamic_settings( array_unique( $widget_setting_ids ) );
+		$settings = $this->manager->add_dynamic_settings(array_unique($widget_setting_ids));
 
 		/*
 		 * Preview settings right away so that widgets and sidebars will get registered properly.
 		 * But don't do this if a customize_save because this will cause WP to think there is nothing
 		 * changed that needs to be saved.
 		 */
-		if ( ! $this->manager->doing_ajax( 'customize_save' ) ) {
-			foreach ( $settings as $setting ) {
+		if ( ! $this->manager->doing_ajax('customize_save')) {
+			foreach ($settings as $setting) {
 				$setting->preview();
 			}
 		}
@@ -168,9 +168,9 @@ 
 	 * @param string      $setting_id   ID for dynamic setting, usually coming from `$_POST['customized']`.
 	 * @return false|array Setting arguments, false otherwise.
 	 */
-	public function filter_customize_dynamic_setting_args( $args, $setting_id ) {
-		if ( $this->get_setting_type( $setting_id ) ) {
-			$args = $this->get_setting_args( $setting_id );
+	public function filter_customize_dynamic_setting_args($args, $setting_id) {
+		if ($this->get_setting_type($setting_id)) {
+			$args = $this->get_setting_args($setting_id);
 		}
 		return $args;
 	}
@@ -186,12 +186,12 @@ 
 	 * @param mixed  $default Default post value.
 	 * @return mixed Unslashed post value or default value.
 	 */
-	protected function get_post_value( $name, $default = null ) {
-		if ( ! isset( $_POST[ $name ] ) ) {
+	protected function get_post_value($name, $default = null) {
+		if ( ! isset($_POST[$name])) {
 			return $default;
 		}
 
-		return wp_unslash( $_POST[ $name ] );
+		return wp_unslash($_POST[$name]);
 	}
 
 	/**
@@ -212,19 +212,19 @@ 
 	public function override_sidebars_widgets_for_theme_switch() {
 		global $sidebars_widgets;
 
-		if ( $this->manager->doing_ajax() || $this->manager->is_theme_active() ) {
+		if ($this->manager->doing_ajax() || $this->manager->is_theme_active()) {
 			return;
 		}
 
 		$this->old_sidebars_widgets = wp_get_sidebars_widgets();
-		add_filter( 'customize_value_old_sidebars_widgets_data', array( $this, 'filter_customize_value_old_sidebars_widgets_data' ) );
+		add_filter('customize_value_old_sidebars_widgets_data', array($this, 'filter_customize_value_old_sidebars_widgets_data'));
 
 		// retrieve_widgets() looks at the global $sidebars_widgets
 		$sidebars_widgets = $this->old_sidebars_widgets;
-		$sidebars_widgets = retrieve_widgets( 'customize' );
-		add_filter( 'option_sidebars_widgets', array( $this, 'filter_option_sidebars_widgets_for_theme_switch' ), 1 );
+		$sidebars_widgets = retrieve_widgets('customize');
+		add_filter('option_sidebars_widgets', array($this, 'filter_option_sidebars_widgets_for_theme_switch'), 1);
 		// reset global cache var used by wp_get_sidebars_widgets()
-		unset( $GLOBALS['_wp_sidebars_widgets'] );
+		unset($GLOBALS['_wp_sidebars_widgets']);
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 * @param array $old_sidebars_widgets
 	 * @return array
 	 */
-	public function filter_customize_value_old_sidebars_widgets_data( $old_sidebars_widgets ) {
+	public function filter_customize_value_old_sidebars_widgets_data($old_sidebars_widgets) {
 		return $this->old_sidebars_widgets;
 	}
 
@@ -263,7 +263,7 @@ 
 	 * @param array $sidebars_widgets
 	 * @return array
 	 */
-	public function filter_option_sidebars_widgets_for_theme_switch( $sidebars_widgets ) {
+	public function filter_option_sidebars_widgets_for_theme_switch($sidebars_widgets) {
 		$sidebars_widgets = $GLOBALS['sidebars_widgets'];
 		$sidebars_widgets['array_version'] = 3;
 		return $sidebars_widgets;
@@ -279,13 +279,13 @@ 
 	 */
 	public function customize_controls_init() {
 		/** This action is documented in wp-admin/includes/ajax-actions.php */
-		do_action( 'load-widgets.php' );
+		do_action('load-widgets.php');
 
 		/** This action is documented in wp-admin/includes/ajax-actions.php */
-		do_action( 'widgets.php' );
+		do_action('widgets.php');
 
 		/** This action is documented in wp-admin/widgets.php */
-		do_action( 'sidebar_admin_setup' );
+		do_action('sidebar_admin_setup');
 	}
 
 	/**
@@ -299,10 +299,10 @@ 
 	 * @access public
 	 */
 	public function schedule_customize_register() {
-		if ( is_admin() ) {
+		if (is_admin()) {
 			$this->customize_register();
 		} else {
-			add_action( 'wp', array( $this, 'customize_register' ) );
+			add_action('wp', array($this, 'customize_register'));
 		}
 	}
 
@@ -320,8 +320,8 @@ 
 		global $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_sidebars;
 
 		$sidebars_widgets = array_merge(
-			array( 'wp_inactive_widgets' => array() ),
-			array_fill_keys( array_keys( $wp_registered_sidebars ), array() ),
+			array('wp_inactive_widgets' => array()),
+			array_fill_keys(array_keys($wp_registered_sidebars), array()),
 			wp_get_sidebars_widgets()
 		);
 
@@ -332,11 +332,11 @@ 
 		 * inactive, and orphaned since a widget may get suppressed from a sidebar
 		 * via a plugin (like Widget Visibility).
 		 */
-		foreach ( array_keys( $wp_registered_widgets ) as $widget_id ) {
-			$setting_id   = $this->get_setting_id( $widget_id );
-			$setting_args = $this->get_setting_args( $setting_id );
-			if ( ! $this->manager->get_setting( $setting_id ) ) {
-				$this->manager->add_setting( $setting_id, $setting_args );
+		foreach (array_keys($wp_registered_widgets) as $widget_id) {
+			$setting_id   = $this->get_setting_id($widget_id);
+			$setting_args = $this->get_setting_args($setting_id);
+			if ( ! $this->manager->get_setting($setting_id)) {
+				$this->manager->add_setting($setting_id, $setting_args);
 			}
 			$new_setting_ids[] = $setting_id;
 		}
@@ -345,50 +345,50 @@ 
 		 * Add a setting which will be supplied for the theme's sidebars_widgets
 		 * theme_mod when the the theme is switched.
 		 */
-		if ( ! $this->manager->is_theme_active() ) {
+		if ( ! $this->manager->is_theme_active()) {
 			$setting_id = 'old_sidebars_widgets_data';
-			$setting_args = $this->get_setting_args( $setting_id, array(
+			$setting_args = $this->get_setting_args($setting_id, array(
 				'type' => 'global_variable',
 				'dirty' => true,
-			) );
-			$this->manager->add_setting( $setting_id, $setting_args );
+			));
+			$this->manager->add_setting($setting_id, $setting_args);
 		}
 
-		$this->manager->add_panel( 'widgets', array(
-			'title'       => __( 'Widgets' ),
-			'description' => __( 'Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars).' ),
+		$this->manager->add_panel('widgets', array(
+			'title'       => __('Widgets'),
+			'description' => __('Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars).'),
 			'priority'    => 110,
-		) );
+		));
 
-		foreach ( $sidebars_widgets as $sidebar_id => $sidebar_widget_ids ) {
-			if ( empty( $sidebar_widget_ids ) ) {
+		foreach ($sidebars_widgets as $sidebar_id => $sidebar_widget_ids) {
+			if (empty($sidebar_widget_ids)) {
 				$sidebar_widget_ids = array();
 			}
 
-			$is_registered_sidebar = isset( $wp_registered_sidebars[ $sidebar_id ] );
-			$is_inactive_widgets   = ( 'wp_inactive_widgets' === $sidebar_id );
-			$is_active_sidebar     = ( $is_registered_sidebar && ! $is_inactive_widgets );
+			$is_registered_sidebar = isset($wp_registered_sidebars[$sidebar_id]);
+			$is_inactive_widgets   = ('wp_inactive_widgets' === $sidebar_id);
+			$is_active_sidebar     = ($is_registered_sidebar && ! $is_inactive_widgets);
 
 			// Add setting for managing the sidebar's widgets.
-			if ( $is_registered_sidebar || $is_inactive_widgets ) {
-				$setting_id   = sprintf( 'sidebars_widgets[%s]', $sidebar_id );
-				$setting_args = $this->get_setting_args( $setting_id );
-				if ( ! $this->manager->get_setting( $setting_id ) ) {
-					if ( ! $this->manager->is_theme_active() ) {
+			if ($is_registered_sidebar || $is_inactive_widgets) {
+				$setting_id   = sprintf('sidebars_widgets[%s]', $sidebar_id);
+				$setting_args = $this->get_setting_args($setting_id);
+				if ( ! $this->manager->get_setting($setting_id)) {
+					if ( ! $this->manager->is_theme_active()) {
 						$setting_args['dirty'] = true;
 					}
-					$this->manager->add_setting( $setting_id, $setting_args );
+					$this->manager->add_setting($setting_id, $setting_args);
 				}
 				$new_setting_ids[] = $setting_id;
 
 				// Add section to contain controls.
-				$section_id = sprintf( 'sidebar-widgets-%s', $sidebar_id );
-				if ( $is_active_sidebar ) {
+				$section_id = sprintf('sidebar-widgets-%s', $sidebar_id);
+				if ($is_active_sidebar) {
 
 					$section_args = array(
-						'title' => $wp_registered_sidebars[ $sidebar_id ]['name'],
-						'description' => $wp_registered_sidebars[ $sidebar_id ]['description'],
-						'priority' => array_search( $sidebar_id, array_keys( $wp_registered_sidebars ) ),
+						'title' => $wp_registered_sidebars[$sidebar_id]['name'],
+						'description' => $wp_registered_sidebars[$sidebar_id]['description'],
+						'priority' => array_search($sidebar_id, array_keys($wp_registered_sidebars)),
 						'panel' => 'widgets',
 						'sidebar_id' => $sidebar_id,
 					);
@@ -402,35 +402,35 @@ 
 					 * @param string     $section_id   Customizer section ID.
 					 * @param int|string $sidebar_id   Sidebar ID.
 					 */
-					$section_args = apply_filters( 'customizer_widgets_section_args', $section_args, $section_id, $sidebar_id );
+					$section_args = apply_filters('customizer_widgets_section_args', $section_args, $section_id, $sidebar_id);
 
-					$section = new WP_Customize_Sidebar_Section( $this->manager, $section_id, $section_args );
-					$this->manager->add_section( $section );
+					$section = new WP_Customize_Sidebar_Section($this->manager, $section_id, $section_args);
+					$this->manager->add_section($section);
 
-					$control = new WP_Widget_Area_Customize_Control( $this->manager, $setting_id, array(
+					$control = new WP_Widget_Area_Customize_Control($this->manager, $setting_id, array(
 						'section'    => $section_id,
 						'sidebar_id' => $sidebar_id,
-						'priority'   => count( $sidebar_widget_ids ), // place 'Add Widget' and 'Reorder' buttons at end.
-					) );
+						'priority'   => count($sidebar_widget_ids), // place 'Add Widget' and 'Reorder' buttons at end.
+					));
 					$new_setting_ids[] = $setting_id;
 
-					$this->manager->add_control( $control );
+					$this->manager->add_control($control);
 				}
 			}
 
 			// Add a control for each active widget (located in a sidebar).
-			foreach ( $sidebar_widget_ids as $i => $widget_id ) {
+			foreach ($sidebar_widget_ids as $i => $widget_id) {
 
 				// Skip widgets that may have gone away due to a plugin being deactivated.
-				if ( ! $is_active_sidebar || ! isset( $wp_registered_widgets[$widget_id] ) ) {
+				if ( ! $is_active_sidebar || ! isset($wp_registered_widgets[$widget_id])) {
 					continue;
 				}
 
 				$registered_widget = $wp_registered_widgets[$widget_id];
-				$setting_id        = $this->get_setting_id( $widget_id );
+				$setting_id        = $this->get_setting_id($widget_id);
 				$id_base           = $wp_registered_widget_controls[$widget_id]['id_base'];
 
-				$control = new WP_Widget_Form_Customize_Control( $this->manager, $setting_id, array(
+				$control = new WP_Widget_Form_Customize_Control($this->manager, $setting_id, array(
 					'label'          => $registered_widget['name'],
 					'section'        => $section_id,
 					'sidebar_id'     => $sidebar_id,
@@ -439,19 +439,19 @@ 
 					'priority'       => $i,
 					'width'          => $wp_registered_widget_controls[$widget_id]['width'],
 					'height'         => $wp_registered_widget_controls[$widget_id]['height'],
-					'is_wide'        => $this->is_wide_widget( $widget_id ),
-				) );
-				$this->manager->add_control( $control );
+					'is_wide'        => $this->is_wide_widget($widget_id),
+				));
+				$this->manager->add_control($control);
 			}
 		}
 
-		if ( ! $this->manager->doing_ajax( 'customize_save' ) ) {
-			foreach ( $new_setting_ids as $new_setting_id ) {
-				$this->manager->get_setting( $new_setting_id )->preview();
+		if ( ! $this->manager->doing_ajax('customize_save')) {
+			foreach ($new_setting_ids as $new_setting_id) {
+				$this->manager->get_setting($new_setting_id)->preview();
 			}
 		}
 
-		add_filter( 'sidebars_widgets', array( $this, 'preview_sidebars_widgets' ), 1 );
+		add_filter('sidebars_widgets', array($this, 'preview_sidebars_widgets'), 1);
 	}
 
 	/**
@@ -463,12 +463,12 @@ 
 	 * @param string $widget_id Widget ID.
 	 * @return string Maybe-parsed widget ID.
 	 */
-	public function get_setting_id( $widget_id ) {
-		$parsed_widget_id = $this->parse_widget_id( $widget_id );
-		$setting_id       = sprintf( 'widget_%s', $parsed_widget_id['id_base'] );
+	public function get_setting_id($widget_id) {
+		$parsed_widget_id = $this->parse_widget_id($widget_id);
+		$setting_id       = sprintf('widget_%s', $parsed_widget_id['id_base']);
 
-		if ( ! is_null( $parsed_widget_id['number'] ) ) {
-			$setting_id .= sprintf( '[%d]', $parsed_widget_id['number'] );
+		if ( ! is_null($parsed_widget_id['number'])) {
+			$setting_id .= sprintf('[%d]', $parsed_widget_id['number']);
 		}
 		return $setting_id;
 	}
@@ -491,13 +491,13 @@ 
 	 * @param string $widget_id Widget ID.
 	 * @return bool Whether or not the widget is a "wide" widget.
 	 */
-	public function is_wide_widget( $widget_id ) {
+	public function is_wide_widget($widget_id) {
 		global $wp_registered_widget_controls;
 
-		$parsed_widget_id = $this->parse_widget_id( $widget_id );
+		$parsed_widget_id = $this->parse_widget_id($widget_id);
 		$width            = $wp_registered_widget_controls[$widget_id]['width'];
-		$is_core          = in_array( $parsed_widget_id['id_base'], $this->core_widget_id_bases );
-		$is_wide          = ( $width > 250 && ! $is_core );
+		$is_core          = in_array($parsed_widget_id['id_base'], $this->core_widget_id_bases);
+		$is_wide          = ($width > 250 && ! $is_core);
 
 		/**
 		 * Filter whether the given widget is considered "wide".
@@ -507,7 +507,7 @@ 
 		 * @param bool   $is_wide   Whether the widget is wide, Default false.
 		 * @param string $widget_id Widget ID.
 		 */
-		return apply_filters( 'is_wide_widget_in_customizer', $is_wide, $widget_id );
+		return apply_filters('is_wide_widget_in_customizer', $is_wide, $widget_id);
 	}
 
 	/**
@@ -519,15 +519,15 @@ 
 	 * @param string $widget_id Widget ID.
 	 * @return array Array containing a widget's id_base and number components.
 	 */
-	public function parse_widget_id( $widget_id ) {
+	public function parse_widget_id($widget_id) {
 		$parsed = array(
 			'number' => null,
 			'id_base' => null,
 		);
 
-		if ( preg_match( '/^(.+)-(\d+)$/', $widget_id, $matches ) ) {
+		if (preg_match('/^(.+)-(\d+)$/', $widget_id, $matches)) {
 			$parsed['id_base'] = $matches[1];
-			$parsed['number']  = intval( $matches[2] );
+			$parsed['number']  = intval($matches[2]);
 		} else {
 			// likely an old single widget
 			$parsed['id_base'] = $widget_id;
@@ -545,15 +545,15 @@ 
 	 * @return WP_Error|array Array containing a widget's id_base and number components,
 	 *                        or a WP_Error object.
 	 */
-	public function parse_widget_setting_id( $setting_id ) {
-		if ( ! preg_match( '/^(widget_(.+?))(?:\[(\d+)\])?$/', $setting_id, $matches ) ) {
-			return new WP_Error( 'widget_setting_invalid_id' );
+	public function parse_widget_setting_id($setting_id) {
+		if ( ! preg_match('/^(widget_(.+?))(?:\[(\d+)\])?$/', $setting_id, $matches)) {
+			return new WP_Error('widget_setting_invalid_id');
 		}
 
 		$id_base = $matches[2];
-		$number  = isset( $matches[3] ) ? intval( $matches[3] ) : null;
+		$number  = isset($matches[3]) ? intval($matches[3]) : null;
 
-		return compact( 'id_base', 'number' );
+		return compact('id_base', 'number');
 	}
 
 	/**
@@ -565,10 +565,10 @@ 
 	 */
 	public function print_styles() {
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_styles-widgets.php' );
+		do_action('admin_print_styles-widgets.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_styles' );
+		do_action('admin_print_styles');
 	}
 
 	/**
@@ -580,10 +580,10 @@ 
 	 */
 	public function print_scripts() {
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_scripts-widgets.php' );
+		do_action('admin_print_scripts-widgets.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_scripts' );
+		do_action('admin_print_scripts');
 	}
 
 	/**
@@ -599,11 +599,11 @@ 
 	public function enqueue_scripts() {
 		global $wp_scripts, $wp_registered_sidebars, $wp_registered_widgets;
 
-		wp_enqueue_style( 'customize-widgets' );
-		wp_enqueue_script( 'customize-widgets' );
+		wp_enqueue_style('customize-widgets');
+		wp_enqueue_script('customize-widgets');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_enqueue_scripts', 'widgets.php' );
+		do_action('admin_enqueue_scripts', 'widgets.php');
 
 		/*
 		 * Export available widgets with control_tpl removed from model
@@ -611,23 +611,23 @@ 
 		 */
 		$available_widgets = array();
 
-		foreach ( $this->get_available_widgets() as $available_widget ) {
-			unset( $available_widget['control_tpl'] );
+		foreach ($this->get_available_widgets() as $available_widget) {
+			unset($available_widget['control_tpl']);
 			$available_widgets[] = $available_widget;
 		}
 
 		$widget_reorder_nav_tpl = sprintf(
 			'<div class="widget-reorder-nav"><span class="move-widget" tabindex="0">%1$s</span><span class="move-widget-down" tabindex="0">%2$s</span><span class="move-widget-up" tabindex="0">%3$s</span></div>',
-			__( 'Move to another area&hellip;' ),
-			__( 'Move down' ),
-			__( 'Move up' )
+			__('Move to another area&hellip;'),
+			__('Move down'),
+			__('Move up')
 		);
 
 		$move_widget_area_tpl = str_replace(
-			array( '{description}', '{btn}' ),
+			array('{description}', '{btn}'),
 			array(
-				__( 'Select an area to move this widget into:' ),
-				_x( 'Move', 'Move widget' ),
+				__('Select an area to move this widget into:'),
+				_x('Move', 'Move widget'),
 			),
 			'<div class="move-widget-area">
 				<p class="description">{description}</p>
@@ -643,18 +643,18 @@ 
 		);
 
 		$settings = array(
-			'nonce'                => wp_create_nonce( 'update-widget' ),
-			'registeredSidebars'   => array_values( $wp_registered_sidebars ),
+			'nonce'                => wp_create_nonce('update-widget'),
+			'registeredSidebars'   => array_values($wp_registered_sidebars),
 			'registeredWidgets'    => $wp_registered_widgets,
 			'availableWidgets'     => $available_widgets, // @todo Merge this with registered_widgets
 			'l10n' => array(
-				'saveBtnLabel'     => __( 'Apply' ),
-				'saveBtnTooltip'   => __( 'Save and preview changes before publishing them.' ),
-				'removeBtnLabel'   => __( 'Remove' ),
-				'removeBtnTooltip' => __( 'Trash widget by moving it to the inactive widgets sidebar.' ),
-				'error'            => __( 'An error has occurred. Please reload the page and try again.' ),
-				'widgetMovedUp'    => __( 'Widget moved up' ),
-				'widgetMovedDown'  => __( 'Widget moved down' ),
+				'saveBtnLabel'     => __('Apply'),
+				'saveBtnTooltip'   => __('Save and preview changes before publishing them.'),
+				'removeBtnLabel'   => __('Remove'),
+				'removeBtnTooltip' => __('Trash widget by moving it to the inactive widgets sidebar.'),
+				'error'            => __('An error has occurred. Please reload the page and try again.'),
+				'widgetMovedUp'    => __('Widget moved up'),
+				'widgetMovedDown'  => __('Widget moved down'),
 			),
 			'tpl' => array(
 				'widgetReorderNav' => $widget_reorder_nav_tpl,
@@ -662,14 +662,14 @@ 
 			),
 		);
 
-		foreach ( $settings['registeredWidgets'] as &$registered_widget ) {
-			unset( $registered_widget['callback'] ); // may not be JSON-serializeable
+		foreach ($settings['registeredWidgets'] as &$registered_widget) {
+			unset($registered_widget['callback']); // may not be JSON-serializeable
 		}
 
 		$wp_scripts->add_data(
 			'customize-widgets',
 			'data',
-			sprintf( 'var _wpCustomizeWidgetsSettings = %s;', wp_json_encode( $settings ) )
+			sprintf('var _wpCustomizeWidgetsSettings = %s;', wp_json_encode($settings))
 		);
 	}
 
@@ -685,23 +685,23 @@ 
 		<div id="available-widgets">
 			<div class="customize-section-title">
 				<button class="customize-section-back" tabindex="-1">
-					<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+					<span class="screen-reader-text"><?php _e('Back'); ?></span>
 				</button>
 				<h3>
 					<span class="customize-action"><?php
 						/* translators: &#9656; is the unicode right-pointing triangle, and %s is the section title in the Customizer */
-						echo sprintf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'widgets' )->title ) );
+						echo sprintf(__('Customizing &#9656; %s'), esc_html($this->manager->get_panel('widgets')->title));
 					?></span>
-					<?php _e( 'Add a Widget' ); ?>
+					<?php _e('Add a Widget'); ?>
 				</h3>
 			</div>
 			<div id="available-widgets-filter">
-				<label class="screen-reader-text" for="widgets-search"><?php _e( 'Search Widgets' ); ?></label>
-				<input type="search" id="widgets-search" placeholder="<?php esc_attr_e( 'Search widgets&hellip;' ) ?>" />
+				<label class="screen-reader-text" for="widgets-search"><?php _e('Search Widgets'); ?></label>
+				<input type="search" id="widgets-search" placeholder="<?php esc_attr_e('Search widgets&hellip;') ?>" />
 			</div>
 			<div id="available-widgets-list">
-			<?php foreach ( $this->get_available_widgets() as $available_widget ): ?>
-				<div id="widget-tpl-<?php echo esc_attr( $available_widget['id'] ) ?>" data-widget-id="<?php echo esc_attr( $available_widget['id'] ) ?>" class="widget-tpl <?php echo esc_attr( $available_widget['id'] ) ?>" tabindex="0">
+			<?php foreach ($this->get_available_widgets() as $available_widget): ?>
+				<div id="widget-tpl-<?php echo esc_attr($available_widget['id']) ?>" data-widget-id="<?php echo esc_attr($available_widget['id']) ?>" class="widget-tpl <?php echo esc_attr($available_widget['id']) ?>" tabindex="0">
 					<?php echo $available_widget['control_tpl']; ?>
 				</div>
 			<?php endforeach; ?>
@@ -720,10 +720,10 @@ 
 	 */
 	public function print_footer_scripts() {
 		/** This action is documented in wp-admin/admin-footer.php */
-		do_action( 'admin_print_footer_scripts' );
+		do_action('admin_print_footer_scripts');
 
 		/** This action is documented in wp-admin/admin-footer.php */
-		do_action( 'admin_footer-widgets.php' );
+		do_action('admin_footer-widgets.php');
 	}
 
 	/**
@@ -736,7 +736,7 @@ 
 	 * @param array  $overrides Array of setting overrides.
 	 * @return array Possibly modified setting arguments.
 	 */
-	public function get_setting_args( $id, $overrides = array() ) {
+	public function get_setting_args($id, $overrides = array()) {
 		$args = array(
 			'type'       => 'option',
 			'capability' => 'edit_theme_options',
@@ -744,15 +744,15 @@ 
 			'default'    => array(),
 		);
 
-		if ( preg_match( $this->setting_id_patterns['sidebar_widgets'], $id, $matches ) ) {
-			$args['sanitize_callback'] = array( $this, 'sanitize_sidebar_widgets' );
-			$args['sanitize_js_callback'] = array( $this, 'sanitize_sidebar_widgets_js_instance' );
-		} elseif ( preg_match( $this->setting_id_patterns['widget_instance'], $id, $matches ) ) {
-			$args['sanitize_callback'] = array( $this, 'sanitize_widget_instance' );
-			$args['sanitize_js_callback'] = array( $this, 'sanitize_widget_js_instance' );
+		if (preg_match($this->setting_id_patterns['sidebar_widgets'], $id, $matches)) {
+			$args['sanitize_callback'] = array($this, 'sanitize_sidebar_widgets');
+			$args['sanitize_js_callback'] = array($this, 'sanitize_sidebar_widgets_js_instance');
+		} elseif (preg_match($this->setting_id_patterns['widget_instance'], $id, $matches)) {
+			$args['sanitize_callback'] = array($this, 'sanitize_widget_instance');
+			$args['sanitize_js_callback'] = array($this, 'sanitize_widget_js_instance');
 		}
 
-		$args = array_merge( $args, $overrides );
+		$args = array_merge($args, $overrides);
 
 		/**
 		 * Filter the common arguments supplied when constructing a Customizer setting.
@@ -764,7 +764,7 @@ 
 		 * @param array  $args Array of Customizer setting arguments.
 		 * @param string $id   Widget setting ID.
 		 */
-		return apply_filters( 'widget_customizer_setting_args', $args, $id );
+		return apply_filters('widget_customizer_setting_args', $args, $id);
 	}
 
 	/**
@@ -778,11 +778,11 @@ 
 	 * @param array $widget_ids Array of widget IDs.
 	 * @return array Array of sanitized widget IDs.
 	 */
-	public function sanitize_sidebar_widgets( $widget_ids ) {
-		$widget_ids = array_map( 'strval', (array) $widget_ids );
+	public function sanitize_sidebar_widgets($widget_ids) {
+		$widget_ids = array_map('strval', (array) $widget_ids);
 		$sanitized_widget_ids = array();
-		foreach ( $widget_ids as $widget_id ) {
-			$sanitized_widget_ids[] = preg_replace( '/[^a-z0-9_\-]/', '', $widget_id );
+		foreach ($widget_ids as $widget_id) {
+			$sanitized_widget_ids[] = preg_replace('/[^a-z0-9_\-]/', '', $widget_id);
 		}
 		return $sanitized_widget_ids;
 	}
@@ -803,31 +803,31 @@ 
 	 */
 	public function get_available_widgets() {
 		static $available_widgets = array();
-		if ( ! empty( $available_widgets ) ) {
+		if ( ! empty($available_widgets)) {
 			return $available_widgets;
 		}
 
 		global $wp_registered_widgets, $wp_registered_widget_controls;
-		require_once ABSPATH . '/wp-admin/includes/widgets.php'; // for next_widget_id_number()
+		require_once ABSPATH.'/wp-admin/includes/widgets.php'; // for next_widget_id_number()
 
 		$sort = $wp_registered_widgets;
-		usort( $sort, array( $this, '_sort_name_callback' ) );
+		usort($sort, array($this, '_sort_name_callback'));
 		$done = array();
 
-		foreach ( $sort as $widget ) {
-			if ( in_array( $widget['callback'], $done, true ) ) { // We already showed this multi-widget
+		foreach ($sort as $widget) {
+			if (in_array($widget['callback'], $done, true)) { // We already showed this multi-widget
 				continue;
 			}
 
-			$sidebar = is_active_widget( $widget['callback'], $widget['id'], false, false );
+			$sidebar = is_active_widget($widget['callback'], $widget['id'], false, false);
 			$done[]  = $widget['callback'];
 
-			if ( ! isset( $widget['params'][0] ) ) {
+			if ( ! isset($widget['params'][0])) {
 				$widget['params'][0] = array();
 			}
 
 			$available_widget = $widget;
-			unset( $available_widget['callback'] ); // not serializable to JSON
+			unset($available_widget['callback']); // not serializable to JSON
 
 			$args = array(
 				'widget_id'   => $widget['id'],
@@ -836,37 +836,37 @@ 
 			);
 
 			$is_disabled     = false;
-			$is_multi_widget = ( isset( $wp_registered_widget_controls[$widget['id']]['id_base'] ) && isset( $widget['params'][0]['number'] ) );
-			if ( $is_multi_widget ) {
+			$is_multi_widget = (isset($wp_registered_widget_controls[$widget['id']]['id_base']) && isset($widget['params'][0]['number']));
+			if ($is_multi_widget) {
 				$id_base            = $wp_registered_widget_controls[$widget['id']]['id_base'];
 				$args['_temp_id']   = "$id_base-__i__";
-				$args['_multi_num'] = next_widget_id_number( $id_base );
+				$args['_multi_num'] = next_widget_id_number($id_base);
 				$args['_add']       = 'multi';
 			} else {
 				$args['_add'] = 'single';
 
-				if ( $sidebar && 'wp_inactive_widgets' !== $sidebar ) {
+				if ($sidebar && 'wp_inactive_widgets' !== $sidebar) {
 					$is_disabled = true;
 				}
 				$id_base = $widget['id'];
 			}
 
-			$list_widget_controls_args = wp_list_widget_controls_dynamic_sidebar( array( 0 => $args, 1 => $widget['params'][0] ) );
-			$control_tpl = $this->get_widget_control( $list_widget_controls_args );
+			$list_widget_controls_args = wp_list_widget_controls_dynamic_sidebar(array(0 => $args, 1 => $widget['params'][0]));
+			$control_tpl = $this->get_widget_control($list_widget_controls_args);
 
 			// The properties here are mapped to the Backbone Widget model.
-			$available_widget = array_merge( $available_widget, array(
-				'temp_id'      => isset( $args['_temp_id'] ) ? $args['_temp_id'] : null,
+			$available_widget = array_merge($available_widget, array(
+				'temp_id'      => isset($args['_temp_id']) ? $args['_temp_id'] : null,
 				'is_multi'     => $is_multi_widget,
 				'control_tpl'  => $control_tpl,
-				'multi_number' => ( $args['_add'] === 'multi' ) ? $args['_multi_num'] : false,
+				'multi_number' => ($args['_add'] === 'multi') ? $args['_multi_num'] : false,
 				'is_disabled'  => $is_disabled,
 				'id_base'      => $id_base,
 				'transport'    => 'refresh',
 				'width'        => $wp_registered_widget_controls[$widget['id']]['width'],
 				'height'       => $wp_registered_widget_controls[$widget['id']]['height'],
-				'is_wide'      => $this->is_wide_widget( $widget['id'] ),
-			) );
+				'is_wide'      => $this->is_wide_widget($widget['id']),
+			));
 
 			$available_widgets[] = $available_widget;
 		}
@@ -884,8 +884,8 @@ 
 	 * @param array $widget_b The second widget to compare.
 	 * @return int Reorder position for the current widget comparison.
 	 */
-	protected function _sort_name_callback( $widget_a, $widget_b ) {
-		return strnatcasecmp( $widget_a['name'], $widget_b['name'] );
+	protected function _sort_name_callback($widget_a, $widget_b) {
+		return strnatcasecmp($widget_a['name'], $widget_b['name']);
 	}
 
 	/**
@@ -897,10 +897,10 @@ 
 	 * @param array $args Widget control arguments.
 	 * @return string Widget control form HTML markup.
 	 */
-	public function get_widget_control( $args ) {
+	public function get_widget_control($args) {
 		ob_start();
 
-		call_user_func_array( 'wp_widget_control', $args );
+		call_user_func_array('wp_widget_control', $args);
 		$replacements = array(
 			'<form method="post">' => '<div class="form">',
 			'</form>' => '</div><!-- .form -->',
@@ -908,7 +908,7 @@ 
 
 		$control_tpl = ob_get_clean();
 
-		$control_tpl = str_replace( array_keys( $replacements ), array_values( $replacements ), $control_tpl );
+		$control_tpl = str_replace(array_keys($replacements), array_values($replacements), $control_tpl);
 
 		return $control_tpl;
 	}
@@ -920,9 +920,9 @@ 
 	 * @access public
 	 */
 	public function customize_preview_init() {
-		add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue' ) );
-		add_action( 'wp_print_styles',    array( $this, 'print_preview_css' ), 1 );
-		add_action( 'wp_footer',          array( $this, 'export_preview_data' ), 20 );
+		add_action('wp_enqueue_scripts', array($this, 'customize_preview_enqueue'));
+		add_action('wp_print_styles', array($this, 'print_preview_css'), 1);
+		add_action('wp_footer', array($this, 'export_preview_data'), 20);
 	}
 
 	/**
@@ -934,8 +934,8 @@ 
 	 * @param  array $nonces Array of nonces.
 	 * @return array $nonces Array of nonces.
 	 */
-	public function refresh_nonces( $nonces ) {
-		$nonces['update-widget'] = wp_create_nonce( 'update-widget' );
+	public function refresh_nonces($nonces) {
+		$nonces['update-widget'] = wp_create_nonce('update-widget');
 		return $nonces;
 	}
 
@@ -954,10 +954,10 @@ 
 	 * @param array $sidebars_widgets List of widgets for the current sidebar.
 	 * @return array
 	 */
-	public function preview_sidebars_widgets( $sidebars_widgets ) {
-		$sidebars_widgets = get_option( 'sidebars_widgets' );
+	public function preview_sidebars_widgets($sidebars_widgets) {
+		$sidebars_widgets = get_option('sidebars_widgets');
 
-		unset( $sidebars_widgets['array_version'] );
+		unset($sidebars_widgets['array_version']);
 		return $sidebars_widgets;
 	}
 
@@ -968,7 +968,7 @@ 
 	 * @access public
 	 */
 	public function customize_preview_enqueue() {
-		wp_enqueue_script( 'customize-preview-widgets' );
+		wp_enqueue_script('customize-preview-widgets');
 	}
 
 	/**
@@ -1008,21 +1008,21 @@ 
 		global $wp_registered_sidebars, $wp_registered_widgets;
 		// Prepare Customizer settings to pass to JavaScript.
 		$settings = array(
-			'renderedSidebars'   => array_fill_keys( array_unique( $this->rendered_sidebars ), true ),
-			'renderedWidgets'    => array_fill_keys( array_keys( $this->rendered_widgets ), true ),
-			'registeredSidebars' => array_values( $wp_registered_sidebars ),
+			'renderedSidebars'   => array_fill_keys(array_unique($this->rendered_sidebars), true),
+			'renderedWidgets'    => array_fill_keys(array_keys($this->rendered_widgets), true),
+			'registeredSidebars' => array_values($wp_registered_sidebars),
 			'registeredWidgets'  => $wp_registered_widgets,
 			'l10n'               => array(
-				'widgetTooltip' => __( 'Shift-click to edit this widget.' ),
+				'widgetTooltip' => __('Shift-click to edit this widget.'),
 			),
 		);
-		foreach ( $settings['registeredWidgets'] as &$registered_widget ) {
-			unset( $registered_widget['callback'] ); // may not be JSON-serializeable
+		foreach ($settings['registeredWidgets'] as &$registered_widget) {
+			unset($registered_widget['callback']); // may not be JSON-serializeable
 		}
 
 		?>
 		<script type="text/javascript">
-			var _wpWidgetCustomizerPreviewSettings = <?php echo wp_json_encode( $settings ); ?>;
+			var _wpWidgetCustomizerPreviewSettings = <?php echo wp_json_encode($settings); ?>;
 		</script>
 		<?php
 	}
@@ -1035,8 +1035,8 @@ 
 	 *
 	 * @param array $widget Rendered widget to tally.
 	 */
-	public function tally_rendered_widgets( $widget ) {
-		$this->rendered_widgets[ $widget['id'] ] = true;
+	public function tally_rendered_widgets($widget) {
+		$this->rendered_widgets[$widget['id']] = true;
 	}
 
 	/**
@@ -1048,8 +1048,8 @@ 
 	 * @param string $widget_id Widget ID to check.
 	 * @return bool Whether the widget is rendered.
 	 */
-	public function is_widget_rendered( $widget_id ) {
-		return in_array( $widget_id, $this->rendered_widgets );
+	public function is_widget_rendered($widget_id) {
+		return in_array($widget_id, $this->rendered_widgets);
 	}
 
 	/**
@@ -1061,8 +1061,8 @@ 
 	 * @param string $sidebar_id Sidebar ID to check.
 	 * @return bool Whether the sidebar is rendered.
 	 */
-	public function is_sidebar_rendered( $sidebar_id ) {
-		return in_array( $sidebar_id, $this->rendered_sidebars );
+	public function is_sidebar_rendered($sidebar_id) {
+		return in_array($sidebar_id, $this->rendered_sidebars);
 	}
 
 	/**
@@ -1082,8 +1082,8 @@ 
 	 * @param string $sidebar_id Sidebar ID.
 	 * @return bool
 	 */
-	public function tally_sidebars_via_is_active_sidebar_calls( $is_active, $sidebar_id ) {
-		if ( isset( $GLOBALS['wp_registered_sidebars'][$sidebar_id] ) ) {
+	public function tally_sidebars_via_is_active_sidebar_calls($is_active, $sidebar_id) {
+		if (isset($GLOBALS['wp_registered_sidebars'][$sidebar_id])) {
 			$this->rendered_sidebars[] = $sidebar_id;
 		}
 		/*
@@ -1110,8 +1110,8 @@ 
 	 * @param string $sidebar_id  Sidebar ID.
 	 * @return bool
 	 */
-	public function tally_sidebars_via_dynamic_sidebar_calls( $has_widgets, $sidebar_id ) {
-		if ( isset( $GLOBALS['wp_registered_sidebars'][$sidebar_id] ) ) {
+	public function tally_sidebars_via_dynamic_sidebar_calls($has_widgets, $sidebar_id) {
+		if (isset($GLOBALS['wp_registered_sidebars'][$sidebar_id])) {
 			$this->rendered_sidebars[] = $sidebar_id;
 		}
 
@@ -1135,8 +1135,8 @@ 
 	 * @param string $serialized_instance Widget instance.
 	 * @return string MAC for serialized widget instance.
 	 */
-	protected function get_instance_hash_key( $serialized_instance ) {
-		return wp_hash( $serialized_instance );
+	protected function get_instance_hash_key($serialized_instance) {
+		return wp_hash($serialized_instance);
 	}
 
 	/**
@@ -1151,29 +1151,29 @@ 
 	 * @param array $value Widget instance to sanitize.
 	 * @return array|void Sanitized widget instance.
 	 */
-	public function sanitize_widget_instance( $value ) {
-		if ( $value === array() ) {
+	public function sanitize_widget_instance($value) {
+		if ($value === array()) {
 			return $value;
 		}
 
-		if ( empty( $value['is_widget_customizer_js_value'] )
-			|| empty( $value['instance_hash_key'] )
-			|| empty( $value['encoded_serialized_instance'] ) )
+		if (empty($value['is_widget_customizer_js_value'])
+			|| empty($value['instance_hash_key'])
+			|| empty($value['encoded_serialized_instance']))
 		{
 			return;
 		}
 
-		$decoded = base64_decode( $value['encoded_serialized_instance'], true );
-		if ( false === $decoded ) {
+		$decoded = base64_decode($value['encoded_serialized_instance'], true);
+		if (false === $decoded) {
 			return;
 		}
 
-		if ( ! hash_equals( $this->get_instance_hash_key( $decoded ), $value['instance_hash_key'] ) ) {
+		if ( ! hash_equals($this->get_instance_hash_key($decoded), $value['instance_hash_key'])) {
 			return;
 		}
 
-		$instance = unserialize( $decoded );
-		if ( false === $instance ) {
+		$instance = unserialize($decoded);
+		if (false === $instance) {
 			return;
 		}
 
@@ -1189,15 +1189,15 @@ 
 	 * @param array $value Widget instance to convert to JSON.
 	 * @return array JSON-converted widget instance.
 	 */
-	public function sanitize_widget_js_instance( $value ) {
-		if ( empty( $value['is_widget_customizer_js_value'] ) ) {
-			$serialized = serialize( $value );
+	public function sanitize_widget_js_instance($value) {
+		if (empty($value['is_widget_customizer_js_value'])) {
+			$serialized = serialize($value);
 
 			$value = array(
-				'encoded_serialized_instance'   => base64_encode( $serialized ),
-				'title'                         => empty( $value['title'] ) ? '' : $value['title'],
+				'encoded_serialized_instance'   => base64_encode($serialized),
+				'title'                         => empty($value['title']) ? '' : $value['title'],
 				'is_widget_customizer_js_value' => true,
-				'instance_hash_key'             => $this->get_instance_hash_key( $serialized ),
+				'instance_hash_key'             => $this->get_instance_hash_key($serialized),
 			);
 		}
 		return $value;
@@ -1217,9 +1217,9 @@ 
 	 * @param array $widget_ids List of widget IDs.
 	 * @return array Parsed list of widget IDs.
 	 */
-	public function sanitize_sidebar_widgets_js_instance( $widget_ids ) {
+	public function sanitize_sidebar_widgets_js_instance($widget_ids) {
 		global $wp_registered_widgets;
-		$widget_ids = array_values( array_intersect( $widget_ids, array_keys( $wp_registered_widgets ) ) );
+		$widget_ids = array_values(array_intersect($widget_ids, array_keys($wp_registered_widgets)));
 		return $widget_ids;
 	}
 
@@ -1238,93 +1238,93 @@ 
 	 * @return WP_Error|array Array containing the updated widget information.
 	 *                        A WP_Error object, otherwise.
 	 */
-	public function call_widget_update( $widget_id ) {
+	public function call_widget_update($widget_id) {
 		global $wp_registered_widget_updates, $wp_registered_widget_controls;
 
-		$setting_id = $this->get_setting_id( $widget_id );
+		$setting_id = $this->get_setting_id($widget_id);
 
 		/*
 		 * Make sure that other setting changes have previewed since this widget
 		 * may depend on them (e.g. Menus being present for Custom Menu widget).
 		 */
-		if ( ! did_action( 'customize_preview_init' ) ) {
-			foreach ( $this->manager->settings() as $setting ) {
-				if ( $setting->id !== $setting_id ) {
+		if ( ! did_action('customize_preview_init')) {
+			foreach ($this->manager->settings() as $setting) {
+				if ($setting->id !== $setting_id) {
 					$setting->preview();
 				}
 			}
 		}
 
 		$this->start_capturing_option_updates();
-		$parsed_id   = $this->parse_widget_id( $widget_id );
-		$option_name = 'widget_' . $parsed_id['id_base'];
+		$parsed_id   = $this->parse_widget_id($widget_id);
+		$option_name = 'widget_'.$parsed_id['id_base'];
 
 		/*
 		 * If a previously-sanitized instance is provided, populate the input vars
 		 * with its values so that the widget update callback will read this instance
 		 */
 		$added_input_vars = array();
-		if ( ! empty( $_POST['sanitized_widget_setting'] ) ) {
-			$sanitized_widget_setting = json_decode( $this->get_post_value( 'sanitized_widget_setting' ), true );
-			if ( false === $sanitized_widget_setting ) {
+		if ( ! empty($_POST['sanitized_widget_setting'])) {
+			$sanitized_widget_setting = json_decode($this->get_post_value('sanitized_widget_setting'), true);
+			if (false === $sanitized_widget_setting) {
 				$this->stop_capturing_option_updates();
-				return new WP_Error( 'widget_setting_malformed' );
+				return new WP_Error('widget_setting_malformed');
 			}
 
-			$instance = $this->sanitize_widget_instance( $sanitized_widget_setting );
-			if ( is_null( $instance ) ) {
+			$instance = $this->sanitize_widget_instance($sanitized_widget_setting);
+			if (is_null($instance)) {
 				$this->stop_capturing_option_updates();
-				return new WP_Error( 'widget_setting_unsanitized' );
+				return new WP_Error('widget_setting_unsanitized');
 			}
 
-			if ( ! is_null( $parsed_id['number'] ) ) {
+			if ( ! is_null($parsed_id['number'])) {
 				$value = array();
 				$value[$parsed_id['number']] = $instance;
-				$key = 'widget-' . $parsed_id['id_base'];
-				$_REQUEST[$key] = $_POST[$key] = wp_slash( $value );
+				$key = 'widget-'.$parsed_id['id_base'];
+				$_REQUEST[$key] = $_POST[$key] = wp_slash($value);
 				$added_input_vars[] = $key;
 			} else {
-				foreach ( $instance as $key => $value ) {
-					$_REQUEST[$key] = $_POST[$key] = wp_slash( $value );
+				foreach ($instance as $key => $value) {
+					$_REQUEST[$key] = $_POST[$key] = wp_slash($value);
 					$added_input_vars[] = $key;
 				}
 			}
 		}
 
 		// Invoke the widget update callback.
-		foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
-			if ( $name === $parsed_id['id_base'] && is_callable( $control['callback'] ) ) {
+		foreach ((array) $wp_registered_widget_updates as $name => $control) {
+			if ($name === $parsed_id['id_base'] && is_callable($control['callback'])) {
 				ob_start();
-				call_user_func_array( $control['callback'], $control['params'] );
+				call_user_func_array($control['callback'], $control['params']);
 				ob_end_clean();
 				break;
 			}
 		}
 
 		// Clean up any input vars that were manually added
-		foreach ( $added_input_vars as $key ) {
-			unset( $_POST[ $key ] );
-			unset( $_REQUEST[ $key ] );
+		foreach ($added_input_vars as $key) {
+			unset($_POST[$key]);
+			unset($_REQUEST[$key]);
 		}
 
 		// Make sure the expected option was updated.
-		if ( 0 !== $this->count_captured_options() ) {
-			if ( $this->count_captured_options() > 1 ) {
+		if (0 !== $this->count_captured_options()) {
+			if ($this->count_captured_options() > 1) {
 				$this->stop_capturing_option_updates();
-				return new WP_Error( 'widget_setting_too_many_options' );
+				return new WP_Error('widget_setting_too_many_options');
 			}
 
-			$updated_option_name = key( $this->get_captured_options() );
-			if ( $updated_option_name !== $option_name ) {
+			$updated_option_name = key($this->get_captured_options());
+			if ($updated_option_name !== $option_name) {
 				$this->stop_capturing_option_updates();
-				return new WP_Error( 'widget_setting_unexpected_option' );
+				return new WP_Error('widget_setting_unexpected_option');
 			}
 		}
 
 		// Obtain the widget instance.
-		$option = $this->get_captured_option( $option_name );
-		if ( null !== $parsed_id['number'] ) {
-			$instance = $option[ $parsed_id['number'] ];
+		$option = $this->get_captured_option($option_name);
+		if (null !== $parsed_id['number']) {
+			$instance = $option[$parsed_id['number']];
 		} else {
 			$instance = $option;
 		}
@@ -1335,19 +1335,19 @@ 
 		 * in place from WP_Customize_Setting::preview() will use this value
 		 * instead of the default widget instance value (an empty array).
 		 */
-		$this->manager->set_post_value( $setting_id, $instance );
+		$this->manager->set_post_value($setting_id, $instance);
 
 		// Obtain the widget control with the updated instance in place.
 		ob_start();
-		$form = $wp_registered_widget_controls[ $widget_id ];
-		if ( $form ) {
-			call_user_func_array( $form['callback'], $form['params'] );
+		$form = $wp_registered_widget_controls[$widget_id];
+		if ($form) {
+			call_user_func_array($form['callback'], $form['params']);
 		}
 		$form = ob_get_clean();
 
 		$this->stop_capturing_option_updates();
 
-		return compact( 'instance', 'form' );
+		return compact('instance', 'form');
 	}
 
 	/**
@@ -1366,53 +1366,53 @@ 
 	 */
 	public function wp_ajax_update_widget() {
 
-		if ( ! is_user_logged_in() ) {
-			wp_die( 0 );
+		if ( ! is_user_logged_in()) {
+			wp_die(0);
 		}
 
-		check_ajax_referer( 'update-widget', 'nonce' );
+		check_ajax_referer('update-widget', 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_die( -1 );
 		}
 
-		if ( empty( $_POST['widget-id'] ) ) {
-			wp_send_json_error( 'missing_widget-id' );
+		if (empty($_POST['widget-id'])) {
+			wp_send_json_error('missing_widget-id');
 		}
 
 		/** This action is documented in wp-admin/includes/ajax-actions.php */
-		do_action( 'load-widgets.php' );
+		do_action('load-widgets.php');
 
 		/** This action is documented in wp-admin/includes/ajax-actions.php */
-		do_action( 'widgets.php' );
+		do_action('widgets.php');
 
 		/** This action is documented in wp-admin/widgets.php */
-		do_action( 'sidebar_admin_setup' );
+		do_action('sidebar_admin_setup');
 
-		$widget_id = $this->get_post_value( 'widget-id' );
-		$parsed_id = $this->parse_widget_id( $widget_id );
+		$widget_id = $this->get_post_value('widget-id');
+		$parsed_id = $this->parse_widget_id($widget_id);
 		$id_base = $parsed_id['id_base'];
 
 		$is_updating_widget_template = (
-			isset( $_POST[ 'widget-' . $id_base ] )
+			isset($_POST['widget-'.$id_base])
 			&&
-			is_array( $_POST[ 'widget-' . $id_base ] )
+			is_array($_POST['widget-'.$id_base])
 			&&
-			preg_match( '/__i__|%i%/', key( $_POST[ 'widget-' . $id_base ] ) )
+			preg_match('/__i__|%i%/', key($_POST['widget-'.$id_base]))
 		);
-		if ( $is_updating_widget_template ) {
-			wp_send_json_error( 'template_widget_not_updatable' );
+		if ($is_updating_widget_template) {
+			wp_send_json_error('template_widget_not_updatable');
 		}
 
-		$updated_widget = $this->call_widget_update( $widget_id ); // => {instance,form}
-		if ( is_wp_error( $updated_widget ) ) {
-			wp_send_json_error( $updated_widget->get_error_code() );
+		$updated_widget = $this->call_widget_update($widget_id); // => {instance,form}
+		if (is_wp_error($updated_widget)) {
+			wp_send_json_error($updated_widget->get_error_code());
 		}
 
 		$form = $updated_widget['form'];
-		$instance = $this->sanitize_widget_js_instance( $updated_widget['instance'] );
+		$instance = $this->sanitize_widget_js_instance($updated_widget['instance']);
 
-		wp_send_json_success( compact( 'form', 'instance' ) );
+		wp_send_json_success(compact('form', 'instance'));
 	}
 
 	/***************************************************************************
@@ -1446,8 +1446,8 @@ 
 	 * @param string $option_name Option name.
 	 * @return bool Whether the option capture is ignored.
 	 */
-	protected function is_option_capture_ignored( $option_name ) {
-		return ( 0 === strpos( $option_name, '_transient_' ) );
+	protected function is_option_capture_ignored($option_name) {
+		return (0 === strpos($option_name, '_transient_'));
 	}
 
 	/**
@@ -1472,9 +1472,9 @@ 
 	 * @param mixed  $default     Optional. Default value to return if the option does not exist.
 	 * @return mixed Value set for the option.
 	 */
-	protected function get_captured_option( $option_name, $default = false ) {
-		if ( array_key_exists( $option_name, $this->_captured_options ) ) {
-			$value = $this->_captured_options[ $option_name ];
+	protected function get_captured_option($option_name, $default = false) {
+		if (array_key_exists($option_name, $this->_captured_options)) {
+			$value = $this->_captured_options[$option_name];
 		} else {
 			$value = $default;
 		}
@@ -1490,7 +1490,7 @@ 
 	 * @return int Number of updated options.
 	 */
 	protected function count_captured_options() {
-		return count( $this->_captured_options );
+		return count($this->_captured_options);
 	}
 
 	/**
@@ -1500,13 +1500,13 @@ 
 	 * @access protected
 	 */
 	protected function start_capturing_option_updates() {
-		if ( $this->_is_capturing_option_updates ) {
+		if ($this->_is_capturing_option_updates) {
 			return;
 		}
 
 		$this->_is_capturing_option_updates = true;
 
-		add_filter( 'pre_update_option', array( $this, 'capture_filter_pre_update_option' ), 10, 3 );
+		add_filter('pre_update_option', array($this, 'capture_filter_pre_update_option'), 10, 3);
 	}
 
 	/**
@@ -1520,16 +1520,16 @@ 
 	 * @param mixed  $old_value   The old option value.
 	 * @return mixed Filtered option value.
 	 */
-	public function capture_filter_pre_update_option( $new_value, $option_name, $old_value ) {
-		if ( $this->is_option_capture_ignored( $option_name ) ) {
+	public function capture_filter_pre_update_option($new_value, $option_name, $old_value) {
+		if ($this->is_option_capture_ignored($option_name)) {
 			return;
 		}
 
-		if ( ! isset( $this->_captured_options[ $option_name ] ) ) {
-			add_filter( "pre_option_{$option_name}", array( $this, 'capture_filter_pre_get_option' ) );
+		if ( ! isset($this->_captured_options[$option_name])) {
+			add_filter("pre_option_{$option_name}", array($this, 'capture_filter_pre_get_option'));
 		}
 
-		$this->_captured_options[ $option_name ] = $new_value;
+		$this->_captured_options[$option_name] = $new_value;
 
 		return $old_value;
 	}
@@ -1543,14 +1543,14 @@ 
 	 * @param mixed $value Value to return instead of the option value.
 	 * @return mixed Filtered option value.
 	 */
-	public function capture_filter_pre_get_option( $value ) {
-		$option_name = preg_replace( '/^pre_option_/', '', current_filter() );
+	public function capture_filter_pre_get_option($value) {
+		$option_name = preg_replace('/^pre_option_/', '', current_filter());
 
-		if ( isset( $this->_captured_options[ $option_name ] ) ) {
-			$value = $this->_captured_options[ $option_name ];
+		if (isset($this->_captured_options[$option_name])) {
+			$value = $this->_captured_options[$option_name];
 
 			/** This filter is documented in wp-includes/option.php */
-			$value = apply_filters( 'option_' . $option_name, $value );
+			$value = apply_filters('option_'.$option_name, $value);
 		}
 
 		return $value;
@@ -1563,14 +1563,14 @@ 
 	 * @access protected
 	 */
 	protected function stop_capturing_option_updates() {
-		if ( ! $this->_is_capturing_option_updates ) {
+		if ( ! $this->_is_capturing_option_updates) {
 			return;
 		}
 
-		remove_filter( 'pre_update_option', array( $this, 'capture_filter_pre_update_option' ), 10, 3 );
+		remove_filter('pre_update_option', array($this, 'capture_filter_pre_update_option'), 10, 3);
 
-		foreach ( array_keys( $this->_captured_options ) as $option_name ) {
-			remove_filter( "pre_option_{$option_name}", array( $this, 'capture_filter_pre_get_option' ) );
+		foreach (array_keys($this->_captured_options) as $option_name) {
+			remove_filter("pre_option_{$option_name}", array($this, 'capture_filter_pre_get_option'));
 		}
 
 		$this->_captured_options = array();
@@ -1582,7 +1582,7 @@ 
 	 * @deprecated 4.2.0 Deprecated in favor of customize_dynamic_setting_args filter.
 	 */
 	public function setup_widget_addition_previews() {
-		_deprecated_function( __METHOD__, '4.2.0' );
+		_deprecated_function(__METHOD__, '4.2.0');
 	}
 
 	/**
@@ -1590,7 +1590,7 @@ 
 	 * @deprecated 4.2.0 Deprecated in favor of customize_dynamic_setting_args filter.
 	 */
 	public function prepreview_added_sidebars_widgets() {
-		_deprecated_function( __METHOD__, '4.2.0' );
+		_deprecated_function(__METHOD__, '4.2.0');
 	}
 
 	/**
@@ -1598,7 +1598,7 @@ 
 	 * @deprecated 4.2.0 Deprecated in favor of customize_dynamic_setting_args filter.
 	 */
 	public function prepreview_added_widget_instance() {
-		_deprecated_function( __METHOD__, '4.2.0' );
+		_deprecated_function(__METHOD__, '4.2.0');
 	}
 
 	/**
@@ -1606,6 +1606,6 @@ 
 	 * @deprecated 4.2.0 Deprecated in favor of customize_dynamic_setting_args filter.
 	 */
 	public function remove_prepreview_filters() {
-		_deprecated_function( __METHOD__, '4.2.0' );
+		_deprecated_function(__METHOD__, '4.2.0');
 	}
 }

src/wp-includes/class-wp-image-editor-gd.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 	 *
 	 * @param int $width
 	 * @param int $height
-	 * @return true
+	 * @return boolean
 	 */
 	protected function update_size( $width = false, $height = false ) {
 		if ( ! $width )

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress GD Image Editor
- *
- * @package WordPress
- * @subpackage Image_Editor
- */
+	 * WordPress GD Image Editor
+	 *
+	 * @package WordPress
+	 * @subpackage Image_Editor
+	 */
 
 /**
  * WordPress Image Editor Class for Image Manipulation through GD

Spacing +120 added lines, -120 removed lines

@@ -24,9 +24,9 @@ 
 	protected $image;
 
 	public function __destruct() {
-		if ( $this->image ) {
+		if ($this->image) {
 			// we don't need the original in memory anymore
-			imagedestroy( $this->image );
+			imagedestroy($this->image);
 		}
 	}
 
@@ -41,14 +41,14 @@ 
 	 * @param array $args
 	 * @return bool
 	 */
-	public static function test( $args = array() ) {
-		if ( ! extension_loaded('gd') || ! function_exists('gd_info') )
+	public static function test($args = array()) {
+		if ( ! extension_loaded('gd') || ! function_exists('gd_info'))
 			return false;
 
 		// On some setups GD library does not provide imagerotate() - Ticket #11536
-		if ( isset( $args['methods'] ) &&
-			 in_array( 'rotate', $args['methods'] ) &&
-			 ! function_exists('imagerotate') ){
+		if (isset($args['methods']) &&
+			 in_array('rotate', $args['methods']) &&
+			 ! function_exists('imagerotate')) {
 
 				return false;
 		}
@@ -67,9 +67,9 @@ 
 	 * @param string $mime_type
 	 * @return bool
 	 */
-	public static function supports_mime_type( $mime_type ) {
+	public static function supports_mime_type($mime_type) {
 		$image_types = imagetypes();
-		switch( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				return ($image_types & IMG_JPG) != 0;
 			case 'image/png':
@@ -90,11 +90,11 @@ 
 	 * @return bool|WP_Error True if loaded successfully; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image )
+		if ($this->image)
 			return true;
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
+		if ( ! is_file($this->file) && ! preg_match('|^https?://|', $this->file))
+			return new WP_Error('error_loading_image', __('File doesn’t exist?'), $this->file);
 
 		/**
 		 * Filter the memory limit allocated for image manipulation.
@@ -105,23 +105,23 @@ 
 		 *                          Accepts an integer (bytes), or a shorthand string notation, such as '256M'.
 		 */
 		// Set artificially high because GD uses uncompressed images in memory
-		@ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+		@ini_set('memory_limit', apply_filters('image_memory_limit', WP_MAX_MEMORY_LIMIT));
 
-		$this->image = @imagecreatefromstring( file_get_contents( $this->file ) );
+		$this->image = @imagecreatefromstring(file_get_contents($this->file));
 
-		if ( ! is_resource( $this->image ) )
-			return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file );
+		if ( ! is_resource($this->image))
+			return new WP_Error('invalid_image', __('File is not an image.'), $this->file);
 
-		$size = @getimagesize( $this->file );
-		if ( ! $size )
-			return new WP_Error( 'invalid_image', __('Could not read image size.'), $this->file );
+		$size = @getimagesize($this->file);
+		if ( ! $size)
+			return new WP_Error('invalid_image', __('Could not read image size.'), $this->file);
 
-		if ( function_exists( 'imagealphablending' ) && function_exists( 'imagesavealpha' ) ) {
-			imagealphablending( $this->image, false );
-			imagesavealpha( $this->image, true );
+		if (function_exists('imagealphablending') && function_exists('imagesavealpha')) {
+			imagealphablending($this->image, false);
+			imagesavealpha($this->image, true);
 		}
 
-		$this->update_size( $size[0], $size[1] );
+		$this->update_size($size[0], $size[1]);
 		$this->mime_type = $size['mime'];
 
 		return $this->set_quality();
@@ -137,14 +137,14 @@ 
 	 * @param int $height
 	 * @return true
 	 */
-	protected function update_size( $width = false, $height = false ) {
-		if ( ! $width )
-			$width = imagesx( $this->image );
+	protected function update_size($width = false, $height = false) {
+		if ( ! $width)
+			$width = imagesx($this->image);
 
-		if ( ! $height )
-			$height = imagesy( $this->image );
+		if ( ! $height)
+			$height = imagesy($this->image);
 
-		return parent::update_size( $width, $height );
+		return parent::update_size($width, $height);
 	}
 
 	/**
@@ -163,21 +163,21 @@ 
 	 * @param  bool     $crop
 	 * @return true|WP_Error
 	 */
-	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
+	public function resize($max_w, $max_h, $crop = false) {
+		if (($this->size['width'] == $max_w) && ($this->size['height'] == $max_h))
 			return true;
 
-		$resized = $this->_resize( $max_w, $max_h, $crop );
+		$resized = $this->_resize($max_w, $max_h, $crop);
 
-		if ( is_resource( $resized ) ) {
-			imagedestroy( $this->image );
+		if (is_resource($resized)) {
+			imagedestroy($this->image);
 			$this->image = $resized;
 			return true;
 
-		} elseif ( is_wp_error( $resized ) )
+		} elseif (is_wp_error($resized))
 			return $resized;
 
-		return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
+		return new WP_Error('image_resize_error', __('Image resize failed.'), $this->file);
 	}
 
 	/**
@@ -187,22 +187,22 @@ 
 	 * @param bool|array $crop
 	 * @return resource|WP_Error
 	 */
-	protected function _resize( $max_w, $max_h, $crop = false ) {
-		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
-		if ( ! $dims ) {
-			return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions'), $this->file );
+	protected function _resize($max_w, $max_h, $crop = false) {
+		$dims = image_resize_dimensions($this->size['width'], $this->size['height'], $max_w, $max_h, $crop);
+		if ( ! $dims) {
+			return new WP_Error('error_getting_dimensions', __('Could not calculate resized image dimensions'), $this->file);
 		}
-		list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
+		list($dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h) = $dims;
 
-		$resized = wp_imagecreatetruecolor( $dst_w, $dst_h );
-		imagecopyresampled( $resized, $this->image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
+		$resized = wp_imagecreatetruecolor($dst_w, $dst_h);
+		imagecopyresampled($resized, $this->image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
 
-		if ( is_resource( $resized ) ) {
-			$this->update_size( $dst_w, $dst_h );
+		if (is_resource($resized)) {
+			$this->update_size($dst_w, $dst_h);
 			return $resized;
 		}
 
-		return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
+		return new WP_Error('image_resize_error', __('Image resize failed.'), $this->file);
 	}
 
 	/**
@@ -226,36 +226,36 @@ 
 	 * }
 	 * @return array An array of resized images' metadata by size.
 	 */
-	public function multi_resize( $sizes ) {
+	public function multi_resize($sizes) {
 		$metadata = array();
 		$orig_size = $this->size;
 
-		foreach ( $sizes as $size => $size_data ) {
-			if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
+		foreach ($sizes as $size => $size_data) {
+			if ( ! isset($size_data['width']) && ! isset($size_data['height'])) {
 				continue;
 			}
 
-			if ( ! isset( $size_data['width'] ) ) {
+			if ( ! isset($size_data['width'])) {
 				$size_data['width'] = null;
 			}
-			if ( ! isset( $size_data['height'] ) ) {
+			if ( ! isset($size_data['height'])) {
 				$size_data['height'] = null;
 			}
 
-			if ( ! isset( $size_data['crop'] ) ) {
+			if ( ! isset($size_data['crop'])) {
 				$size_data['crop'] = false;
 			}
 
-			$image = $this->_resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
-			$duplicate = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
+			$image = $this->_resize($size_data['width'], $size_data['height'], $size_data['crop']);
+			$duplicate = (($orig_size['width'] == $size_data['width']) && ($orig_size['height'] == $size_data['height']));
 
-			if ( ! is_wp_error( $image ) && ! $duplicate ) {
-				$resized = $this->_save( $image );
+			if ( ! is_wp_error($image) && ! $duplicate) {
+				$resized = $this->_save($image);
 
-				imagedestroy( $image );
+				imagedestroy($image);
 
-				if ( ! is_wp_error( $resized ) && $resized ) {
-					unset( $resized['path'] );
+				if ( ! is_wp_error($resized) && $resized) {
+					unset($resized['path']);
 					$metadata[$size] = $resized;
 				}
 			}
@@ -281,34 +281,34 @@ 
 	 * @param bool $src_abs Optional. If the source crop points are absolute.
 	 * @return bool|WP_Error
 	 */
-	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
+	public function crop($src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false) {
 		// If destination width/height isn't specified, use same as
 		// width/height from source.
-		if ( ! $dst_w )
+		if ( ! $dst_w)
 			$dst_w = $src_w;
-		if ( ! $dst_h )
+		if ( ! $dst_h)
 			$dst_h = $src_h;
 
-		$dst = wp_imagecreatetruecolor( $dst_w, $dst_h );
+		$dst = wp_imagecreatetruecolor($dst_w, $dst_h);
 
-		if ( $src_abs ) {
+		if ($src_abs) {
 			$src_w -= $src_x;
 			$src_h -= $src_y;
 		}
 
-		if ( function_exists( 'imageantialias' ) )
-			imageantialias( $dst, true );
+		if (function_exists('imageantialias'))
+			imageantialias($dst, true);
 
-		imagecopyresampled( $dst, $this->image, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
+		imagecopyresampled($dst, $this->image, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
 
-		if ( is_resource( $dst ) ) {
-			imagedestroy( $this->image );
+		if (is_resource($dst)) {
+			imagedestroy($this->image);
 			$this->image = $dst;
 			$this->update_size();
 			return true;
 		}
 
-		return new WP_Error( 'image_crop_error', __('Image crop failed.'), $this->file );
+		return new WP_Error('image_crop_error', __('Image crop failed.'), $this->file);
 	}
 
 	/**
@@ -321,21 +321,21 @@ 
 	 * @param float $angle
 	 * @return true|WP_Error
 	 */
-	public function rotate( $angle ) {
-		if ( function_exists('imagerotate') ) {
-			$transparency = imagecolorallocatealpha( $this->image, 255, 255, 255, 127 );
-			$rotated = imagerotate( $this->image, $angle, $transparency );
-
-			if ( is_resource( $rotated ) ) {
-				imagealphablending( $rotated, true );
-				imagesavealpha( $rotated, true );
-				imagedestroy( $this->image );
+	public function rotate($angle) {
+		if (function_exists('imagerotate')) {
+			$transparency = imagecolorallocatealpha($this->image, 255, 255, 255, 127);
+			$rotated = imagerotate($this->image, $angle, $transparency);
+
+			if (is_resource($rotated)) {
+				imagealphablending($rotated, true);
+				imagesavealpha($rotated, true);
+				imagedestroy($this->image);
 				$this->image = $rotated;
 				$this->update_size();
 				return true;
 			}
 		}
-		return new WP_Error( 'image_rotate_error', __('Image rotate failed.'), $this->file );
+		return new WP_Error('image_rotate_error', __('Image rotate failed.'), $this->file);
 	}
 
 	/**
@@ -348,24 +348,24 @@ 
 	 * @param bool $vert Flip along Vertical Axis
 	 * @return true|WP_Error
 	 */
-	public function flip( $horz, $vert ) {
+	public function flip($horz, $vert) {
 		$w = $this->size['width'];
 		$h = $this->size['height'];
-		$dst = wp_imagecreatetruecolor( $w, $h );
+		$dst = wp_imagecreatetruecolor($w, $h);
 
-		if ( is_resource( $dst ) ) {
+		if (is_resource($dst)) {
 			$sx = $vert ? ($w - 1) : 0;
 			$sy = $horz ? ($h - 1) : 0;
 			$sw = $vert ? -$w : $w;
 			$sh = $horz ? -$h : $h;
 
-			if ( imagecopyresampled( $dst, $this->image, 0, 0, $sx, $sy, $w, $h, $sw, $sh ) ) {
-				imagedestroy( $this->image );
+			if (imagecopyresampled($dst, $this->image, 0, 0, $sx, $sy, $w, $h, $sw, $sh)) {
+				imagedestroy($this->image);
 				$this->image = $dst;
 				return true;
 			}
 		}
-		return new WP_Error( 'image_flip_error', __('Image flip failed.'), $this->file );
+		return new WP_Error('image_flip_error', __('Image flip failed.'), $this->file);
 	}
 
 	/**
@@ -378,10 +378,10 @@ 
 	 * @param string|null $mime_type
 	 * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
 	 */
-	public function save( $filename = null, $mime_type = null ) {
-		$saved = $this->_save( $this->image, $filename, $mime_type );
+	public function save($filename = null, $mime_type = null) {
+		$saved = $this->_save($this->image, $filename, $mime_type);
 
-		if ( ! is_wp_error( $saved ) ) {
+		if ( ! is_wp_error($saved)) {
 			$this->file = $saved['path'];
 			$this->mime_type = $saved['mime-type'];
 		}
@@ -395,36 +395,36 @@ 
 	 * @param string|null $mime_type
 	 * @return WP_Error|array
 	 */
-	protected function _save( $image, $filename = null, $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
+	protected function _save($image, $filename = null, $mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format($filename, $mime_type);
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename)
+			$filename = $this->generate_filename(null, null, $extension);
 
-		if ( 'image/gif' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagegif', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+		if ('image/gif' == $mime_type) {
+			if ( ! $this->make_image($filename, 'imagegif', array($image, $filename)))
+				return new WP_Error('image_save_error', __('Image Editor Save Failed'));
 		}
-		elseif ( 'image/png' == $mime_type ) {
+		elseif ('image/png' == $mime_type) {
 			// convert from full colors to index colors, like original PNG.
-			if ( function_exists('imageistruecolor') && ! imageistruecolor( $image ) )
-				imagetruecolortopalette( $image, false, imagecolorstotal( $image ) );
+			if (function_exists('imageistruecolor') && ! imageistruecolor($image))
+				imagetruecolortopalette($image, false, imagecolorstotal($image));
 
-			if ( ! $this->make_image( $filename, 'imagepng', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			if ( ! $this->make_image($filename, 'imagepng', array($image, $filename)))
+				return new WP_Error('image_save_error', __('Image Editor Save Failed'));
 		}
-		elseif ( 'image/jpeg' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+		elseif ('image/jpeg' == $mime_type) {
+			if ( ! $this->make_image($filename, 'imagejpeg', array($image, $filename, $this->get_quality())))
+				return new WP_Error('image_save_error', __('Image Editor Save Failed'));
 		}
 		else {
-			return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			return new WP_Error('image_save_error', __('Image Editor Save Failed'));
 		}
 
 		// Set correct file permissions
-		$stat = stat( dirname( $filename ) );
+		$stat = stat(dirname($filename));
 		$perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
-		@ chmod( $filename, $perms );
+		@ chmod($filename, $perms);
 
 		/**
 		 * Filter the name of the saved image file.
@@ -435,7 +435,7 @@ 
 		 */
 		return array(
 			'path'      => $filename,
-			'file'      => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ),
+			'file'      => wp_basename(apply_filters('image_make_intermediate_size', $filename)),
 			'width'     => $this->size['width'],
 			'height'    => $this->size['height'],
 			'mime-type' => $mime_type,
@@ -451,19 +451,19 @@ 
 	 * @param string $mime_type
 	 * @return bool
 	 */
-	public function stream( $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( null, $mime_type );
+	public function stream($mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format(null, $mime_type);
 
-		switch ( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/png':
-				header( 'Content-Type: image/png' );
-				return imagepng( $this->image );
+				header('Content-Type: image/png');
+				return imagepng($this->image);
 			case 'image/gif':
-				header( 'Content-Type: image/gif' );
-				return imagegif( $this->image );
+				header('Content-Type: image/gif');
+				return imagegif($this->image);
 			default:
-				header( 'Content-Type: image/jpeg' );
-				return imagejpeg( $this->image, null, $this->get_quality() );
+				header('Content-Type: image/jpeg');
+				return imagejpeg($this->image, null, $this->get_quality());
 		}
 	}
 
@@ -478,10 +478,10 @@ 
 	 * @param array $arguments
 	 * @return bool
 	 */
-	protected function make_image( $filename, $function, $arguments ) {
-		if ( wp_is_stream( $filename ) )
+	protected function make_image($filename, $function, $arguments) {
+		if (wp_is_stream($filename))
 			$arguments[1] = null;
 
-		return parent::make_image( $filename, $function, $arguments );
+		return parent::make_image($filename, $function, $arguments);
 	}
 }

Braces +57 added lines, -42 removed lines

@@ -42,8 +42,9 @@ 
 	 * @return bool
 	 */
 	public static function test( $args = array() ) {
-		if ( ! extension_loaded('gd') || ! function_exists('gd_info') )
-			return false;
+		if ( ! extension_loaded('gd') || ! function_exists('gd_info') ) {
+					return false;
+		}
 
 		// On some setups GD library does not provide imagerotate() - Ticket #11536
 		if ( isset( $args['methods'] ) &&
@@ -90,11 +91,13 @@ 
 	 * @return bool|WP_Error True if loaded successfully; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image )
-			return true;
+		if ( $this->image ) {
+					return true;
+		}
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
+		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) ) {
+					return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
+		}
 
 		/**
 		 * Filter the memory limit allocated for image manipulation.
@@ -109,12 +112,14 @@ 
 
 		$this->image = @imagecreatefromstring( file_get_contents( $this->file ) );
 
-		if ( ! is_resource( $this->image ) )
-			return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file );
+		if ( ! is_resource( $this->image ) ) {
+					return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file );
+		}
 
 		$size = @getimagesize( $this->file );
-		if ( ! $size )
-			return new WP_Error( 'invalid_image', __('Could not read image size.'), $this->file );
+		if ( ! $size ) {
+					return new WP_Error( 'invalid_image', __('Could not read image size.'), $this->file );
+		}
 
 		if ( function_exists( 'imagealphablending' ) && function_exists( 'imagesavealpha' ) ) {
 			imagealphablending( $this->image, false );
@@ -138,11 +143,13 @@ 
 	 * @return true
 	 */
 	protected function update_size( $width = false, $height = false ) {
-		if ( ! $width )
-			$width = imagesx( $this->image );
+		if ( ! $width ) {
+					$width = imagesx( $this->image );
+		}
 
-		if ( ! $height )
-			$height = imagesy( $this->image );
+		if ( ! $height ) {
+					$height = imagesy( $this->image );
+		}
 
 		return parent::update_size( $width, $height );
 	}
@@ -164,8 +171,9 @@ 
 	 * @return true|WP_Error
 	 */
 	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
-			return true;
+		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) ) {
+					return true;
+		}
 
 		$resized = $this->_resize( $max_w, $max_h, $crop );
 
@@ -174,8 +182,9 @@ 
 			$this->image = $resized;
 			return true;
 
-		} elseif ( is_wp_error( $resized ) )
-			return $resized;
+		} elseif ( is_wp_error( $resized ) ) {
+					return $resized;
+		}
 
 		return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
 	}
@@ -284,10 +293,12 @@ 
 	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
 		// If destination width/height isn't specified, use same as
 		// width/height from source.
-		if ( ! $dst_w )
-			$dst_w = $src_w;
-		if ( ! $dst_h )
-			$dst_h = $src_h;
+		if ( ! $dst_w ) {
+					$dst_w = $src_w;
+		}
+		if ( ! $dst_h ) {
+					$dst_h = $src_h;
+		}
 
 		$dst = wp_imagecreatetruecolor( $dst_w, $dst_h );
 
@@ -296,8 +307,9 @@ 
 			$src_h -= $src_y;
 		}
 
-		if ( function_exists( 'imageantialias' ) )
-			imageantialias( $dst, true );
+		if ( function_exists( 'imageantialias' ) ) {
+					imageantialias( $dst, true );
+		}
 
 		imagecopyresampled( $dst, $this->image, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
 
@@ -398,26 +410,28 @@ 
 	protected function _save( $image, $filename = null, $mime_type = null ) {
 		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename ) {
+					$filename = $this->generate_filename( null, null, $extension );
+		}
 
 		if ( 'image/gif' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagegif', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
-		}
-		elseif ( 'image/png' == $mime_type ) {
+			if ( ! $this->make_image( $filename, 'imagegif', array( $image, $filename ) ) ) {
+							return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			}
+		} elseif ( 'image/png' == $mime_type ) {
 			// convert from full colors to index colors, like original PNG.
-			if ( function_exists('imageistruecolor') && ! imageistruecolor( $image ) )
-				imagetruecolortopalette( $image, false, imagecolorstotal( $image ) );
+			if ( function_exists('imageistruecolor') && ! imageistruecolor( $image ) ) {
+							imagetruecolortopalette( $image, false, imagecolorstotal( $image ) );
+			}
 
-			if ( ! $this->make_image( $filename, 'imagepng', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
-		}
-		elseif ( 'image/jpeg' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
-		}
-		else {
+			if ( ! $this->make_image( $filename, 'imagepng', array( $image, $filename ) ) ) {
+							return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			}
+		} elseif ( 'image/jpeg' == $mime_type ) {
+			if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) ) {
+							return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			}
+		} else {
 			return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
 		}
 
@@ -479,8 +493,9 @@ 
 	 * @return bool
 	 */
 	protected function make_image( $filename, $function, $arguments ) {
-		if ( wp_is_stream( $filename ) )
-			$arguments[1] = null;
+		if ( wp_is_stream( $filename ) ) {
+					$arguments[1] = null;
+		}
 
 		return parent::make_image( $filename, $function, $arguments );
 	}

src/wp-includes/class-wp-image-editor.php

Doc Comments +2 added lines, -2 removed lines

@@ -197,7 +197,7 @@ 
 	 *
 	 * @param int $width
 	 * @param int $height
-	 * @return true
+	 * @return boolean
 	 */
 	protected function update_size( $width = null, $height = null ) {
 		$this->size = array(
@@ -213,7 +213,7 @@ 
 	 * @since 4.0.0
 	 * @access public
 	 *
-	 * @return int $quality Compression Quality. Range: [1,100]
+	 * @return boolean $quality Compression Quality. Range: [1,100]
 	 */
 	public function get_quality() {
 		if ( ! $this->quality ) {

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Base WordPress Image Editor
- *
- * @package WordPress
- * @subpackage Image_Editor
- */
+	 * Base WordPress Image Editor
+	 *
+	 * @package WordPress
+	 * @subpackage Image_Editor
+	 */
 
 /**
  * Base image editor class from which implementations extend

Spacing +63 added lines, -63 removed lines

@@ -22,7 +22,7 @@ 
 	/**
 	 * Each instance handles a single file.
 	 */
-	public function __construct( $file ) {
+	public function __construct($file) {
 		$this->file = $file;
 	}
 
@@ -39,7 +39,7 @@ 
 	 * @param array $args
 	 * @return bool
 	 */
-	public static function test( $args = array() ) {
+	public static function test($args = array()) {
 		return false;
 	}
 
@@ -56,7 +56,7 @@ 
 	 * @param string $mime_type
 	 * @return bool
 	 */
-	public static function supports_mime_type( $mime_type ) {
+	public static function supports_mime_type($mime_type) {
 		return false;
 	}
 
@@ -82,7 +82,7 @@ 
 	 * @param string $mime_type
 	 * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
 	 */
-	abstract public function save( $destfilename = null, $mime_type = null );
+	abstract public function save($destfilename = null, $mime_type = null);
 
 	/**
 	 * Resizes current image.
@@ -100,7 +100,7 @@ 
 	 * @param  bool     $crop
 	 * @return bool|WP_Error
 	 */
-	abstract public function resize( $max_w, $max_h, $crop = false );
+	abstract public function resize($max_w, $max_h, $crop = false);
 
 	/**
 	 * Resize multiple images from a single source.
@@ -120,7 +120,7 @@ 
 	 * }
 	 * @return array An array of resized images metadata by size.
 	 */
-	abstract public function multi_resize( $sizes );
+	abstract public function multi_resize($sizes);
 
 	/**
 	 * Crops Image.
@@ -138,7 +138,7 @@ 
 	 * @param bool $src_abs Optional. If the source crop points are absolute.
 	 * @return bool|WP_Error
 	 */
-	abstract public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false );
+	abstract public function crop($src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false);
 
 	/**
 	 * Rotates current image counter-clockwise by $angle.
@@ -150,7 +150,7 @@ 
 	 * @param float $angle
 	 * @return bool|WP_Error
 	 */
-	abstract public function rotate( $angle );
+	abstract public function rotate($angle);
 
 	/**
 	 * Flips current image.
@@ -163,7 +163,7 @@ 
 	 * @param bool $vert Flip along Vertical Axis
 	 * @return bool|WP_Error
 	 */
-	abstract public function flip( $horz, $vert );
+	abstract public function flip($horz, $vert);
 
 	/**
 	 * Streams current image to browser.
@@ -175,7 +175,7 @@ 
 	 * @param string $mime_type
 	 * @return bool|WP_Error
 	 */
-	abstract public function stream( $mime_type = null );
+	abstract public function stream($mime_type = null);
 
 	/**
 	 * Gets dimensions of image.
@@ -199,7 +199,7 @@ 
 	 * @param int $height
 	 * @return true
 	 */
-	protected function update_size( $width = null, $height = null ) {
+	protected function update_size($width = null, $height = null) {
 		$this->size = array(
 			'width' => (int) $width,
 			'height' => (int) $height
@@ -216,7 +216,7 @@ 
 	 * @return int $quality Compression Quality. Range: [1,100]
 	 */
 	public function get_quality() {
-		if ( ! $this->quality ) {
+		if ( ! $this->quality) {
 			$this->set_quality();
 		}
 
@@ -232,8 +232,8 @@ 
 	 * @param int $quality Compression Quality. Range: [1,100]
 	 * @return true|WP_Error True if set successfully; WP_Error on failure.
 	 */
-	public function set_quality( $quality = null ) {
-		if ( null === $quality ) {
+	public function set_quality($quality = null) {
+		if (null === $quality) {
 			/**
 			 * Filter the default image compression quality setting.
 			 *
@@ -247,9 +247,9 @@ 
 			 * @param int    $quality   Quality level between 1 (low) and 100 (high).
 			 * @param string $mime_type Image mime type.
 			 */
-			$quality = apply_filters( 'wp_editor_set_quality', $this->default_quality, $this->mime_type );
+			$quality = apply_filters('wp_editor_set_quality', $this->default_quality, $this->mime_type);
 
-			if ( 'image/jpeg' == $this->mime_type ) {
+			if ('image/jpeg' == $this->mime_type) {
 				/**
 				 * Filter the JPEG compression quality for backward-compatibility.
 				 *
@@ -266,24 +266,24 @@ 
 				 * @param int    $quality Quality level between 0 (low) and 100 (high) of the JPEG.
 				 * @param string $context Context of the filter.
 				 */
-				$quality = apply_filters( 'jpeg_quality', $quality, 'image_resize' );
+				$quality = apply_filters('jpeg_quality', $quality, 'image_resize');
 			}
 
-			if ( $quality < 0 || $quality > 100 ) {
+			if ($quality < 0 || $quality > 100) {
 				$quality = $this->default_quality;
 			}
 		}
 
 		// Allow 0, but squash to 1 due to identical images in GD, and for backwards compatibility.
-		if ( 0 === $quality ) {
+		if (0 === $quality) {
 			$quality = 1;
 		}
 
-		if ( ( $quality >= 1 ) && ( $quality <= 100 ) ) {
+		if (($quality >= 1) && ($quality <= 100)) {
 			$this->quality = $quality;
 			return true;
 		} else {
-			return new WP_Error( 'invalid_image_quality', __('Attempted to set image quality outside of the range [1,100].') );
+			return new WP_Error('invalid_image_quality', __('Attempted to set image quality outside of the range [1,100].'));
 		}
 	}
 
@@ -302,34 +302,34 @@ 
 	 * @param string $mime_type
 	 * @return array { filename|null, extension, mime-type }
 	 */
-	protected function get_output_format( $filename = null, $mime_type = null ) {
+	protected function get_output_format($filename = null, $mime_type = null) {
 		$new_ext = null;
 
 		// By default, assume specified type takes priority
-		if ( $mime_type ) {
-			$new_ext = $this->get_extension( $mime_type );
+		if ($mime_type) {
+			$new_ext = $this->get_extension($mime_type);
 		}
 
-		if ( $filename ) {
-			$file_ext = strtolower( pathinfo( $filename, PATHINFO_EXTENSION ) );
-			$file_mime = $this->get_mime_type( $file_ext );
+		if ($filename) {
+			$file_ext = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
+			$file_mime = $this->get_mime_type($file_ext);
 		}
 		else {
 			// If no file specified, grab editor's current extension and mime-type.
-			$file_ext = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
+			$file_ext = strtolower(pathinfo($this->file, PATHINFO_EXTENSION));
 			$file_mime = $this->mime_type;
 		}
 
 		// Check to see if specified mime-type is the same as type implied by
 		// file extension.  If so, prefer extension from file.
-		if ( ! $mime_type || ( $file_mime == $mime_type ) ) {
+		if ( ! $mime_type || ($file_mime == $mime_type)) {
 			$mime_type = $file_mime;
 			$new_ext = $file_ext;
 		}
 
 		// Double-check that the mime-type selected is supported by the editor.
 		// If not, choose a default instead.
-		if ( ! $this->supports_mime_type( $mime_type ) ) {
+		if ( ! $this->supports_mime_type($mime_type)) {
 			/**
 			 * Filter default mime type prior to getting the file extension.
 			 *
@@ -339,22 +339,22 @@ 
 			 *
 			 * @param string $mime_type Mime type string.
 			 */
-			$mime_type = apply_filters( 'image_editor_default_mime_type', $this->default_mime_type );
-			$new_ext = $this->get_extension( $mime_type );
+			$mime_type = apply_filters('image_editor_default_mime_type', $this->default_mime_type);
+			$new_ext = $this->get_extension($mime_type);
 		}
 
-		if ( $filename ) {
+		if ($filename) {
 			$ext = '';
-			$info = pathinfo( $filename );
+			$info = pathinfo($filename);
 			$dir  = $info['dirname'];
 
-			if ( isset( $info['extension'] ) )
+			if (isset($info['extension']))
 				$ext = $info['extension'];
 
-			$filename = trailingslashit( $dir ) . wp_basename( $filename, ".$ext" ) . ".{$new_ext}";
+			$filename = trailingslashit($dir).wp_basename($filename, ".$ext").".{$new_ext}";
 		}
 
-		return array( $filename, $new_ext, $mime_type );
+		return array($filename, $new_ext, $mime_type);
 	}
 
 	/**
@@ -368,22 +368,22 @@ 
 	 * @param string $extension
 	 * @return string filename
 	 */
-	public function generate_filename( $suffix = null, $dest_path = null, $extension = null ) {
+	public function generate_filename($suffix = null, $dest_path = null, $extension = null) {
 		// $suffix will be appended to the destination filename, just before the extension
-		if ( ! $suffix )
+		if ( ! $suffix)
 			$suffix = $this->get_suffix();
 
-		$info = pathinfo( $this->file );
+		$info = pathinfo($this->file);
 		$dir  = $info['dirname'];
 		$ext  = $info['extension'];
 
-		$name = wp_basename( $this->file, ".$ext" );
-		$new_ext = strtolower( $extension ? $extension : $ext );
+		$name = wp_basename($this->file, ".$ext");
+		$new_ext = strtolower($extension ? $extension : $ext);
 
-		if ( ! is_null( $dest_path ) && $_dest_path = realpath( $dest_path ) )
+		if ( ! is_null($dest_path) && $_dest_path = realpath($dest_path))
 			$dir = $_dest_path;
 
-		return trailingslashit( $dir ) . "{$name}-{$suffix}.{$new_ext}";
+		return trailingslashit($dir)."{$name}-{$suffix}.{$new_ext}";
 	}
 
 	/**
@@ -395,7 +395,7 @@ 
 	 * @return false|string suffix
 	 */
 	public function get_suffix() {
-		if ( ! $this->get_size() )
+		if ( ! $this->get_size())
 			return false;
 
 		return "{$this->size['width']}x{$this->size['height']}";
@@ -412,29 +412,29 @@ 
 	 * @param array $arguments
 	 * @return bool
 	 */
-	protected function make_image( $filename, $function, $arguments ) {
-		if ( $stream = wp_is_stream( $filename ) ) {
+	protected function make_image($filename, $function, $arguments) {
+		if ($stream = wp_is_stream($filename)) {
 			ob_start();
 		} else {
 			// The directory containing the original file may no longer exist when using a replication plugin.
-			wp_mkdir_p( dirname( $filename ) );
+			wp_mkdir_p(dirname($filename));
 		}
 
-		$result = call_user_func_array( $function, $arguments );
+		$result = call_user_func_array($function, $arguments);
 
-		if ( $result && $stream ) {
+		if ($result && $stream) {
 			$contents = ob_get_contents();
 
-			$fp = fopen( $filename, 'w' );
+			$fp = fopen($filename, 'w');
 
-			if ( ! $fp )
+			if ( ! $fp)
 				return false;
 
-			fwrite( $fp, $contents );
-			fclose( $fp );
+			fwrite($fp, $contents);
+			fclose($fp);
 		}
 
-		if ( $stream ) {
+		if ($stream) {
 			ob_end_clean();
 		}
 
@@ -453,15 +453,15 @@ 
 	 * @param string $extension
 	 * @return string|false
 	 */
-	protected static function get_mime_type( $extension = null ) {
-		if ( ! $extension )
+	protected static function get_mime_type($extension = null) {
+		if ( ! $extension)
 			return false;
 
 		$mime_types = wp_get_mime_types();
-		$extensions = array_keys( $mime_types );
+		$extensions = array_keys($mime_types);
 
-		foreach( $extensions as $_extension ) {
-			if ( preg_match( "/{$extension}/i", $_extension ) ) {
+		foreach ($extensions as $_extension) {
+			if (preg_match("/{$extension}/i", $_extension)) {
 				return $mime_types[$_extension];
 			}
 		}
@@ -481,10 +481,10 @@ 
 	 * @param string $mime_type
 	 * @return string|false
 	 */
-	protected static function get_extension( $mime_type = null ) {
-		$extensions = explode( '|', array_search( $mime_type, wp_get_mime_types() ) );
+	protected static function get_extension($mime_type = null) {
+		$extensions = explode('|', array_search($mime_type, wp_get_mime_types()));
 
-		if ( empty( $extensions[0] ) )
+		if (empty($extensions[0]))
 			return false;
 
 		return $extensions[0];

Braces +22 added lines, -16 removed lines

@@ -313,8 +313,7 @@ 
 		if ( $filename ) {
 			$file_ext = strtolower( pathinfo( $filename, PATHINFO_EXTENSION ) );
 			$file_mime = $this->get_mime_type( $file_ext );
-		}
-		else {
+		} else {
 			// If no file specified, grab editor's current extension and mime-type.
 			$file_ext = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
 			$file_mime = $this->mime_type;
@@ -348,8 +347,9 @@ 
 			$info = pathinfo( $filename );
 			$dir  = $info['dirname'];
 
-			if ( isset( $info['extension'] ) )
-				$ext = $info['extension'];
+			if ( isset( $info['extension'] ) ) {
+							$ext = $info['extension'];
+			}
 
 			$filename = trailingslashit( $dir ) . wp_basename( $filename, ".$ext" ) . ".{$new_ext}";
 		}
@@ -370,8 +370,9 @@ 
 	 */
 	public function generate_filename( $suffix = null, $dest_path = null, $extension = null ) {
 		// $suffix will be appended to the destination filename, just before the extension
-		if ( ! $suffix )
-			$suffix = $this->get_suffix();
+		if ( ! $suffix ) {
+					$suffix = $this->get_suffix();
+		}
 
 		$info = pathinfo( $this->file );
 		$dir  = $info['dirname'];
@@ -380,8 +381,9 @@ 
 		$name = wp_basename( $this->file, ".$ext" );
 		$new_ext = strtolower( $extension ? $extension : $ext );
 
-		if ( ! is_null( $dest_path ) && $_dest_path = realpath( $dest_path ) )
-			$dir = $_dest_path;
+		if ( ! is_null( $dest_path ) && $_dest_path = realpath( $dest_path ) ) {
+					$dir = $_dest_path;
+		}
 
 		return trailingslashit( $dir ) . "{$name}-{$suffix}.{$new_ext}";
 	}
@@ -395,8 +397,9 @@ 
 	 * @return false|string suffix
 	 */
 	public function get_suffix() {
-		if ( ! $this->get_size() )
-			return false;
+		if ( ! $this->get_size() ) {
+					return false;
+		}
 
 		return "{$this->size['width']}x{$this->size['height']}";
 	}
@@ -427,8 +430,9 @@ 
 
 			$fp = fopen( $filename, 'w' );
 
-			if ( ! $fp )
-				return false;
+			if ( ! $fp ) {
+							return false;
+			}
 
 			fwrite( $fp, $contents );
 			fclose( $fp );
@@ -454,8 +458,9 @@ 
 	 * @return string|false
 	 */
 	protected static function get_mime_type( $extension = null ) {
-		if ( ! $extension )
-			return false;
+		if ( ! $extension ) {
+					return false;
+		}
 
 		$mime_types = wp_get_mime_types();
 		$extensions = array_keys( $mime_types );
@@ -484,8 +489,9 @@ 
 	protected static function get_extension( $mime_type = null ) {
 		$extensions = explode( '|', array_search( $mime_type, wp_get_mime_types() ) );
 
-		if ( empty( $extensions[0] ) )
-			return false;
+		if ( empty( $extensions[0] ) ) {
+					return false;
+		}
 
 		return $extensions[0];
 	}

src/wp-includes/class-wp-theme.php

Doc Comments +1 added lines, -1 removed lines

@@ -953,7 +953,7 @@
 	 * @since 3.4.0
 	 * @access public
 	 *
-	 * @param mixed $type Optional. Array of extensions to return. Defaults to all files (null).
+	 * @param string $type Optional. Array of extensions to return. Defaults to all files (null).
 	 * @param int $depth Optional. How deep to search for files. Defaults to a flat scan (0 depth). -1 depth is infinite.
 	 * @param bool $search_parent Optional. Whether to return parent files. Defaults to false.
 	 * @return array Array of files, keyed by the path to the file relative to the theme's directory, with the values

Indentation +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * WP_Theme Class
- *
- * @package WordPress
- * @subpackage Theme
- */
+	 * WP_Theme Class
+	 *
+	 * @package WordPress
+	 * @subpackage Theme
+	 */
 
 final class WP_Theme implements ArrayAccess {
 
@@ -684,7 +684,7 @@ 
 	/**
 	 * Mark up a theme header.
 	 *
-     * @since 3.4.0
+	 * @since 3.4.0
 	 * @access private
 	 *
 	 * @staticvar string $comma

Spacing +257 added lines, -257 removed lines

@@ -186,19 +186,19 @@ 
 	 * @param string $theme_root Theme root.
 	 * @param WP_Error|void $_child If this theme is a parent theme, the child may be passed for validation purposes.
 	 */
-	public function __construct( $theme_dir, $theme_root, $_child = null ) {
+	public function __construct($theme_dir, $theme_root, $_child = null) {
 		global $wp_theme_directories;
 
 		// Initialize caching on first run.
-		if ( ! isset( self::$persistently_cache ) ) {
+		if ( ! isset(self::$persistently_cache)) {
 			/** This action is documented in wp-includes/theme.php */
-			self::$persistently_cache = apply_filters( 'wp_cache_themes_persistently', false, 'WP_Theme' );
-			if ( self::$persistently_cache ) {
-				wp_cache_add_global_groups( 'themes' );
-				if ( is_int( self::$persistently_cache ) )
+			self::$persistently_cache = apply_filters('wp_cache_themes_persistently', false, 'WP_Theme');
+			if (self::$persistently_cache) {
+				wp_cache_add_global_groups('themes');
+				if (is_int(self::$persistently_cache))
 					self::$cache_expiration = self::$persistently_cache;
 			} else {
-				wp_cache_add_non_persistent_groups( 'themes' );
+				wp_cache_add_non_persistent_groups('themes');
 			}
 		}
 
@@ -206,107 +206,107 @@ 
 		$this->stylesheet = $theme_dir;
 
 		// Correct a situation where the theme is 'some-directory/some-theme' but 'some-directory' was passed in as part of the theme root instead.
-		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) && in_array( dirname( $theme_root ), (array) $wp_theme_directories ) ) {
-			$this->stylesheet = basename( $this->theme_root ) . '/' . $this->stylesheet;
-			$this->theme_root = dirname( $theme_root );
+		if ( ! in_array($theme_root, (array) $wp_theme_directories) && in_array(dirname($theme_root), (array) $wp_theme_directories)) {
+			$this->stylesheet = basename($this->theme_root).'/'.$this->stylesheet;
+			$this->theme_root = dirname($theme_root);
 		}
 
-		$this->cache_hash = md5( $this->theme_root . '/' . $this->stylesheet );
-		$theme_file = $this->stylesheet . '/style.css';
+		$this->cache_hash = md5($this->theme_root.'/'.$this->stylesheet);
+		$theme_file = $this->stylesheet.'/style.css';
 
-		$cache = $this->cache_get( 'theme' );
+		$cache = $this->cache_get('theme');
 
-		if ( is_array( $cache ) ) {
-			foreach ( array( 'errors', 'headers', 'template' ) as $key ) {
-				if ( isset( $cache[ $key ] ) )
-					$this->$key = $cache[ $key ];
+		if (is_array($cache)) {
+			foreach (array('errors', 'headers', 'template') as $key) {
+				if (isset($cache[$key]))
+					$this->$key = $cache[$key];
 			}
-			if ( $this->errors )
+			if ($this->errors)
 				return;
-			if ( isset( $cache['theme_root_template'] ) )
+			if (isset($cache['theme_root_template']))
 				$theme_root_template = $cache['theme_root_template'];
-		} elseif ( ! file_exists( $this->theme_root . '/' . $theme_file ) ) {
+		} elseif ( ! file_exists($this->theme_root.'/'.$theme_file)) {
 			$this->headers['Name'] = $this->stylesheet;
-			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) )
-				$this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), $this->stylesheet ) );
+			if ( ! file_exists($this->theme_root.'/'.$this->stylesheet))
+				$this->errors = new WP_Error('theme_not_found', sprintf(__('The theme directory "%s" does not exist.'), $this->stylesheet));
 			else
-				$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
+				$this->errors = new WP_Error('theme_no_stylesheet', __('Stylesheet is missing.'));
 			$this->template = $this->stylesheet;
-			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
-			if ( ! file_exists( $this->theme_root ) ) // Don't cache this one.
-				$this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.' ) );
+			$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
+			if ( ! file_exists($this->theme_root)) // Don't cache this one.
+				$this->errors->add('theme_root_missing', __('ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.'));
 			return;
-		} elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) {
+		} elseif ( ! is_readable($this->theme_root.'/'.$theme_file)) {
 			$this->headers['Name'] = $this->stylesheet;
-			$this->errors = new WP_Error( 'theme_stylesheet_not_readable', __( 'Stylesheet is not readable.' ) );
+			$this->errors = new WP_Error('theme_stylesheet_not_readable', __('Stylesheet is not readable.'));
 			$this->template = $this->stylesheet;
-			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+			$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
 			return;
 		} else {
-			$this->headers = get_file_data( $this->theme_root . '/' . $theme_file, self::$file_headers, 'theme' );
+			$this->headers = get_file_data($this->theme_root.'/'.$theme_file, self::$file_headers, 'theme');
 			// Default themes always trump their pretenders.
 			// Properly identify default themes that are inside a directory within wp-content/themes.
-			if ( $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes ) ) {
-				if ( basename( $this->stylesheet ) != $default_theme_slug )
-					$this->headers['Name'] .= '/' . $this->stylesheet;
+			if ($default_theme_slug = array_search($this->headers['Name'], self::$default_themes)) {
+				if (basename($this->stylesheet) != $default_theme_slug)
+					$this->headers['Name'] .= '/'.$this->stylesheet;
 			}
 		}
 
 		// (If template is set from cache [and there are no errors], we know it's good.)
-		if ( ! $this->template && ! ( $this->template = $this->headers['Template'] ) ) {
+		if ( ! $this->template && ! ($this->template = $this->headers['Template'])) {
 			$this->template = $this->stylesheet;
-			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet . '/index.php' ) ) {
-				$this->errors = new WP_Error( 'theme_no_index', __( 'Template is missing.' ) );
-				$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+			if ( ! file_exists($this->theme_root.'/'.$this->stylesheet.'/index.php')) {
+				$this->errors = new WP_Error('theme_no_index', __('Template is missing.'));
+				$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
 				return;
 			}
 		}
 
 		// If we got our data from cache, we can assume that 'template' is pointing to the right place.
-		if ( ! is_array( $cache ) && $this->template != $this->stylesheet && ! file_exists( $this->theme_root . '/' . $this->template . '/index.php' ) ) {
+		if ( ! is_array($cache) && $this->template != $this->stylesheet && ! file_exists($this->theme_root.'/'.$this->template.'/index.php')) {
 			// If we're in a directory of themes inside /themes, look for the parent nearby.
 			// wp-content/themes/directory-of-themes/*
-			$parent_dir = dirname( $this->stylesheet );
-			if ( '.' != $parent_dir && file_exists( $this->theme_root . '/' . $parent_dir . '/' . $this->template . '/index.php' ) ) {
-				$this->template = $parent_dir . '/' . $this->template;
-			} elseif ( ( $directories = search_theme_directories() ) && isset( $directories[ $this->template ] ) ) {
+			$parent_dir = dirname($this->stylesheet);
+			if ('.' != $parent_dir && file_exists($this->theme_root.'/'.$parent_dir.'/'.$this->template.'/index.php')) {
+				$this->template = $parent_dir.'/'.$this->template;
+			} elseif (($directories = search_theme_directories()) && isset($directories[$this->template])) {
 				// Look for the template in the search_theme_directories() results, in case it is in another theme root.
 				// We don't look into directories of themes, just the theme root.
-				$theme_root_template = $directories[ $this->template ]['theme_root'];
+				$theme_root_template = $directories[$this->template]['theme_root'];
 			} else {
 				// Parent theme is missing.
-				$this->errors = new WP_Error( 'theme_no_parent', sprintf( __( 'The parent theme is missing. Please install the "%s" parent theme.' ), $this->template ) );
-				$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
-				$this->parent = new WP_Theme( $this->template, $this->theme_root, $this );
+				$this->errors = new WP_Error('theme_no_parent', sprintf(__('The parent theme is missing. Please install the "%s" parent theme.'), $this->template));
+				$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
+				$this->parent = new WP_Theme($this->template, $this->theme_root, $this);
 				return;
 			}
 		}
 
 		// Set the parent, if we're a child theme.
-		if ( $this->template != $this->stylesheet ) {
+		if ($this->template != $this->stylesheet) {
 			// If we are a parent, then there is a problem. Only two generations allowed! Cancel things out.
-			if ( $_child instanceof WP_Theme && $_child->template == $this->stylesheet ) {
+			if ($_child instanceof WP_Theme && $_child->template == $this->stylesheet) {
 				$_child->parent = null;
-				$_child->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), $_child->template ) );
-				$_child->cache_add( 'theme', array( 'headers' => $_child->headers, 'errors' => $_child->errors, 'stylesheet' => $_child->stylesheet, 'template' => $_child->template ) );
+				$_child->errors = new WP_Error('theme_parent_invalid', sprintf(__('The "%s" theme is not a valid parent theme.'), $_child->template));
+				$_child->cache_add('theme', array('headers' => $_child->headers, 'errors' => $_child->errors, 'stylesheet' => $_child->stylesheet, 'template' => $_child->template));
 				// The two themes actually reference each other with the Template header.
-				if ( $_child->stylesheet == $this->template ) {
-					$this->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), $this->template ) );
-					$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+				if ($_child->stylesheet == $this->template) {
+					$this->errors = new WP_Error('theme_parent_invalid', sprintf(__('The "%s" theme is not a valid parent theme.'), $this->template));
+					$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
 				}
 				return;
 			}
 			// Set the parent. Pass the current instance so we can do the crazy checks above and assess errors.
-			$this->parent = new WP_Theme( $this->template, isset( $theme_root_template ) ? $theme_root_template : $this->theme_root, $this );
+			$this->parent = new WP_Theme($this->template, isset($theme_root_template) ? $theme_root_template : $this->theme_root, $this);
 		}
 
 		// We're good. If we didn't retrieve from cache, set it.
-		if ( ! is_array( $cache ) ) {
-			$cache = array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template );
+		if ( ! is_array($cache)) {
+			$cache = array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template);
 			// If the parent theme is in another root, we'll want to cache this. Avoids an entire branch of filesystem calls above.
-			if ( isset( $theme_root_template ) )
+			if (isset($theme_root_template))
 				$cache['theme_root_template'] = $theme_root_template;
-			$this->cache_add( 'theme', $cache );
+			$this->cache_add('theme', $cache);
 		}
 	}
 
@@ -326,13 +326,13 @@ 
 	 *
 	 * @return bool
 	 */
-	public function __isset( $offset ) {
+	public function __isset($offset) {
 		static $properties = array(
 			'name', 'title', 'version', 'parent_theme', 'template_dir', 'stylesheet_dir', 'template', 'stylesheet',
 			'screenshot', 'description', 'author', 'tags', 'theme_root', 'theme_root_uri',
 		);
 
-		return in_array( $offset, $properties );
+		return in_array($offset, $properties);
 	}
 
 	/**
@@ -340,8 +340,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get( $offset ) {
-		switch ( $offset ) {
+	public function __get($offset) {
+		switch ($offset) {
 			case 'name' :
 			case 'title' :
 				return $this->get('Name');
@@ -358,21 +358,21 @@ 
 			case 'stylesheet' :
 				return $this->get_stylesheet();
 			case 'screenshot' :
-				return $this->get_screenshot( 'relative' );
+				return $this->get_screenshot('relative');
 			// 'author' and 'description' did not previously return translated data.
 			case 'description' :
 				return $this->display('Description');
 			case 'author' :
 				return $this->display('Author');
 			case 'tags' :
-				return $this->get( 'Tags' );
+				return $this->get('Tags');
 			case 'theme_root' :
 				return $this->get_theme_root();
 			case 'theme_root_uri' :
 				return $this->get_theme_root_uri();
 			// For cases where the array was converted to an object.
 			default :
-				return $this->offsetGet( $offset );
+				return $this->offsetGet($offset);
 		}
 	}
 
@@ -382,14 +382,14 @@ 
 	 * @param mixed $offset
 	 * @param mixed $value
 	 */
-	public function offsetSet( $offset, $value ) {}
+	public function offsetSet($offset, $value) {}
 
 	/**
 	 * Method to implement ArrayAccess for keys formerly returned by get_themes()
 	 *
 	 * @param mixed $offset
 	 */
-	public function offsetUnset( $offset ) {}
+	public function offsetUnset($offset) {}
 
 	/**
 	 * Method to implement ArrayAccess for keys formerly returned by get_themes()
@@ -399,14 +399,14 @@ 
 	 * @param mixed $offset
 	 * @return bool
 	 */
-	public function offsetExists( $offset ) {
+	public function offsetExists($offset) {
 		static $keys = array(
 			'Name', 'Version', 'Status', 'Title', 'Author', 'Author Name', 'Author URI', 'Description',
 			'Template', 'Stylesheet', 'Template Files', 'Stylesheet Files', 'Template Dir', 'Stylesheet Dir',
 			'Screenshot', 'Tags', 'Theme Root', 'Theme Root URI', 'Parent Theme',
 		);
 
-		return in_array( $offset, $keys );
+		return in_array($offset, $keys);
 	}
 
 	/**
@@ -422,38 +422,38 @@ 
 	 * @param mixed $offset
 	 * @return mixed
 	 */
-	public function offsetGet( $offset ) {
-		switch ( $offset ) {
+	public function offsetGet($offset) {
+		switch ($offset) {
 			case 'Name' :
 			case 'Title' :
 				// See note above about using translated data. get() is not ideal.
 				// It is only for backwards compatibility. Use display().
 				return $this->get('Name');
 			case 'Author' :
-				return $this->display( 'Author');
+				return $this->display('Author');
 			case 'Author Name' :
-				return $this->display( 'Author', false);
+				return $this->display('Author', false);
 			case 'Author URI' :
 				return $this->display('AuthorURI');
 			case 'Description' :
-				return $this->display( 'Description');
+				return $this->display('Description');
 			case 'Version' :
 			case 'Status' :
-				return $this->get( $offset );
+				return $this->get($offset);
 			case 'Template' :
 				return $this->get_template();
 			case 'Stylesheet' :
 				return $this->get_stylesheet();
 			case 'Template Files' :
-				return $this->get_files( 'php', 1, true );
+				return $this->get_files('php', 1, true);
 			case 'Stylesheet Files' :
-				return $this->get_files( 'css', 0, false );
+				return $this->get_files('css', 0, false);
 			case 'Template Dir' :
 				return $this->get_template_directory();
 			case 'Stylesheet Dir' :
 				return $this->get_stylesheet_directory();
 			case 'Screenshot' :
-				return $this->get_screenshot( 'relative' );
+				return $this->get_screenshot('relative');
 			case 'Tags' :
 				return $this->get('Tags');
 			case 'Theme Root' :
@@ -476,7 +476,7 @@ 
 	 * @return WP_Error|false WP_Error if there are errors, or false.
 	 */
 	public function errors() {
-		return is_wp_error( $this->errors ) ? $this->errors : false;
+		return is_wp_error($this->errors) ? $this->errors : false;
 	}
 
 	/**
@@ -491,7 +491,7 @@ 
 	 * @return bool Whether the theme exists.
 	 */
 	public function exists() {
-		return ! ( $this->errors() && in_array( 'theme_not_found', $this->errors()->get_error_codes() ) );
+		return ! ($this->errors() && in_array('theme_not_found', $this->errors()->get_error_codes()));
 	}
 
 	/**
@@ -503,7 +503,7 @@ 
 	 * @return WP_Theme|false Parent theme, or false if the current theme is not a child theme.
 	 */
 	public function parent() {
-		return isset( $this->parent ) ? $this->parent : false;
+		return isset($this->parent) ? $this->parent : false;
 	}
 
 	/**
@@ -518,8 +518,8 @@ 
 	 * @param string $data Data to store
 	 * @return bool Return value from wp_cache_add()
 	 */
-	private function cache_add( $key, $data ) {
-		return wp_cache_add( $key . '-' . $this->cache_hash, $data, 'themes', self::$cache_expiration );
+	private function cache_add($key, $data) {
+		return wp_cache_add($key.'-'.$this->cache_hash, $data, 'themes', self::$cache_expiration);
 	}
 
 	/**
@@ -533,8 +533,8 @@ 
 	 * @param string $key Type of data to retrieve (theme, screenshot, headers, page_templates)
 	 * @return mixed Retrieved data
 	 */
-	private function cache_get( $key ) {
-		return wp_cache_get( $key . '-' . $this->cache_hash, 'themes' );
+	private function cache_get($key) {
+		return wp_cache_get($key.'-'.$this->cache_hash, 'themes');
 	}
 
 	/**
@@ -544,11 +544,11 @@ 
 	 * @access public
 	 */
 	public function cache_delete() {
-		foreach ( array( 'theme', 'screenshot', 'headers', 'page_templates' ) as $key )
-			wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
+		foreach (array('theme', 'screenshot', 'headers', 'page_templates') as $key)
+			wp_cache_delete($key.'-'.$this->cache_hash, 'themes');
 		$this->template = $this->textdomain_loaded = $this->theme_root_uri = $this->parent = $this->errors = $this->headers_sanitized = $this->name_translated = null;
 		$this->headers = array();
-		$this->__construct( $this->stylesheet, $this->theme_root );
+		$this->__construct($this->stylesheet, $this->theme_root);
 	}
 
 	/**
@@ -568,29 +568,29 @@ 
 	 * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
 	 * @return string|false String on success, false on failure.
 	 */
-	public function get( $header ) {
-		if ( ! isset( $this->headers[ $header ] ) )
+	public function get($header) {
+		if ( ! isset($this->headers[$header]))
 			return false;
 
-		if ( ! isset( $this->headers_sanitized ) ) {
-			$this->headers_sanitized = $this->cache_get( 'headers' );
-			if ( ! is_array( $this->headers_sanitized ) )
+		if ( ! isset($this->headers_sanitized)) {
+			$this->headers_sanitized = $this->cache_get('headers');
+			if ( ! is_array($this->headers_sanitized))
 				$this->headers_sanitized = array();
 		}
 
-		if ( isset( $this->headers_sanitized[ $header ] ) )
-			return $this->headers_sanitized[ $header ];
+		if (isset($this->headers_sanitized[$header]))
+			return $this->headers_sanitized[$header];
 
 		// If themes are a persistent group, sanitize everything and cache it. One cache add is better than many cache sets.
-		if ( self::$persistently_cache ) {
-			foreach ( array_keys( $this->headers ) as $_header )
-				$this->headers_sanitized[ $_header ] = $this->sanitize_header( $_header, $this->headers[ $_header ] );
-			$this->cache_add( 'headers', $this->headers_sanitized );
+		if (self::$persistently_cache) {
+			foreach (array_keys($this->headers) as $_header)
+				$this->headers_sanitized[$_header] = $this->sanitize_header($_header, $this->headers[$_header]);
+			$this->cache_add('headers', $this->headers_sanitized);
 		} else {
-			$this->headers_sanitized[ $header ] = $this->sanitize_header( $header, $this->headers[ $header ] );
+			$this->headers_sanitized[$header] = $this->sanitize_header($header, $this->headers[$header]);
 		}
 
-		return $this->headers_sanitized[ $header ];
+		return $this->headers_sanitized[$header];
 	}
 
 	/**
@@ -604,20 +604,20 @@ 
 	 * @param bool $translate Optional. Whether to translate the header. Defaults to true.
 	 * @return string|false Processed header, false on failure.
 	 */
-	public function display( $header, $markup = true, $translate = true ) {
-		$value = $this->get( $header );
-		if ( false === $value ) {
+	public function display($header, $markup = true, $translate = true) {
+		$value = $this->get($header);
+		if (false === $value) {
 			return false;
 		}
 
-		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) )
+		if ($translate && (empty($value) || ! $this->load_textdomain()))
 			$translate = false;
 
-		if ( $translate )
-			$value = $this->translate_header( $header, $value );
+		if ($translate)
+			$value = $this->translate_header($header, $value);
 
-		if ( $markup )
-			$value = $this->markup_header( $header, $value, $translate );
+		if ($markup)
+			$value = $this->markup_header($header, $value, $translate);
 
 		return $value;
 	}
@@ -635,46 +635,46 @@ 
 	 * @param string $value Value to sanitize.
 	 * @return mixed
 	 */
-	private function sanitize_header( $header, $value ) {
-		switch ( $header ) {
+	private function sanitize_header($header, $value) {
+		switch ($header) {
 			case 'Status' :
-				if ( ! $value ) {
+				if ( ! $value) {
 					$value = 'publish';
 					break;
 				}
 				// Fall through otherwise.
 			case 'Name' :
 				static $header_tags = array(
-					'abbr'    => array( 'title' => true ),
-					'acronym' => array( 'title' => true ),
+					'abbr'    => array('title' => true),
+					'acronym' => array('title' => true),
 					'code'    => true,
 					'em'      => true,
 					'strong'  => true,
 				);
-				$value = wp_kses( $value, $header_tags );
+				$value = wp_kses($value, $header_tags);
 				break;
 			case 'Author' :
 				// There shouldn't be anchor tags in Author, but some themes like to be challenging.
 			case 'Description' :
 				static $header_tags_with_a = array(
-					'a'       => array( 'href' => true, 'title' => true ),
-					'abbr'    => array( 'title' => true ),
-					'acronym' => array( 'title' => true ),
+					'a'       => array('href' => true, 'title' => true),
+					'abbr'    => array('title' => true),
+					'acronym' => array('title' => true),
 					'code'    => true,
 					'em'      => true,
 					'strong'  => true,
 				);
-				$value = wp_kses( $value, $header_tags_with_a );
+				$value = wp_kses($value, $header_tags_with_a);
 				break;
 			case 'ThemeURI' :
 			case 'AuthorURI' :
-				$value = esc_url_raw( $value );
+				$value = esc_url_raw($value);
 				break;
 			case 'Tags' :
-				$value = array_filter( array_map( 'trim', explode( ',', strip_tags( $value ) ) ) );
+				$value = array_filter(array_map('trim', explode(',', strip_tags($value))));
 				break;
 			case 'Version' :
-				$value = strip_tags( $value );
+				$value = strip_tags($value);
 				break;
 		}
 
@@ -694,33 +694,33 @@ 
 	 * @param string $translate Whether the header has been translated.
 	 * @return string Value, marked up.
 	 */
-	private function markup_header( $header, $value, $translate ) {
-		switch ( $header ) {
+	private function markup_header($header, $value, $translate) {
+		switch ($header) {
 			case 'Name' :
-				if ( empty( $value ) )
+				if (empty($value))
 					$value = $this->get_stylesheet();
 				break;
 			case 'Description' :
-				$value = wptexturize( $value );
+				$value = wptexturize($value);
 				break;
 			case 'Author' :
-				if ( $this->get('AuthorURI') ) {
-					$value = sprintf( '<a href="%1$s">%2$s</a>', $this->display( 'AuthorURI', true, $translate ), $value );
-				} elseif ( ! $value ) {
-					$value = __( 'Anonymous' );
+				if ($this->get('AuthorURI')) {
+					$value = sprintf('<a href="%1$s">%2$s</a>', $this->display('AuthorURI', true, $translate), $value);
+				} elseif ( ! $value) {
+					$value = __('Anonymous');
 				}
 				break;
 			case 'Tags' :
 				static $comma = null;
-				if ( ! isset( $comma ) ) {
+				if ( ! isset($comma)) {
 					/* translators: used between list items, there is a space after the comma */
-					$comma = __( ', ' );
+					$comma = __(', ');
 				}
-				$value = implode( $comma, $value );
+				$value = implode($comma, $value);
 				break;
 			case 'ThemeURI' :
 			case 'AuthorURI' :
-				$value = esc_url( $value );
+				$value = esc_url($value);
 				break;
 		}
 
@@ -739,38 +739,38 @@ 
 	 * @param string $value Value to translate.
 	 * @return string Translated value.
 	 */
-	private function translate_header( $header, $value ) {
-		switch ( $header ) {
+	private function translate_header($header, $value) {
+		switch ($header) {
 			case 'Name' :
 				// Cached for sorting reasons.
-				if ( isset( $this->name_translated ) )
+				if (isset($this->name_translated))
 					return $this->name_translated;
-				$this->name_translated = translate( $value, $this->get('TextDomain' ) );
+				$this->name_translated = translate($value, $this->get('TextDomain'));
 				return $this->name_translated;
 			case 'Tags' :
-				if ( empty( $value ) || ! function_exists( 'get_theme_feature_list' ) )
+				if (empty($value) || ! function_exists('get_theme_feature_list'))
 					return $value;
 
 				static $tags_list;
-				if ( ! isset( $tags_list ) ) {
+				if ( ! isset($tags_list)) {
 					$tags_list = array();
-					$feature_list = get_theme_feature_list( false ); // No API
-					foreach ( $feature_list as $tags )
+					$feature_list = get_theme_feature_list(false); // No API
+					foreach ($feature_list as $tags)
 						$tags_list += $tags;
 				}
 
-				foreach ( $value as &$tag ) {
-					if ( isset( $tags_list[ $tag ] ) ) {
-						$tag = $tags_list[ $tag ];
-					} elseif ( isset( self::$tag_map[ $tag ] ) ) {
-						$tag = $tags_list[ self::$tag_map[ $tag ] ];
+				foreach ($value as &$tag) {
+					if (isset($tags_list[$tag])) {
+						$tag = $tags_list[$tag];
+					} elseif (isset(self::$tag_map[$tag])) {
+						$tag = $tags_list[self::$tag_map[$tag]];
 					}
 				}
 
 				return $value;
 
 			default :
-				$value = translate( $value, $this->get('TextDomain') );
+				$value = translate($value, $this->get('TextDomain'));
 		}
 		return $value;
 	}
@@ -817,10 +817,10 @@ 
 	 * @return string Absolute path of the stylesheet directory.
 	 */
 	public function get_stylesheet_directory() {
-		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) )
+		if ($this->errors() && in_array('theme_root_missing', $this->errors()->get_error_codes()))
 			return '';
 
-		return $this->theme_root . '/' . $this->stylesheet;
+		return $this->theme_root.'/'.$this->stylesheet;
 	}
 
 	/**
@@ -835,12 +835,12 @@ 
 	 * @return string Absolute path of the template directory.
 	 */
 	public function get_template_directory() {
-		if ( $this->parent() )
+		if ($this->parent())
 			$theme_root = $this->parent()->theme_root;
 		else
 			$theme_root = $this->theme_root;
 
-		return $theme_root . '/' . $this->template;
+		return $theme_root.'/'.$this->template;
 	}
 
 	/**
@@ -855,7 +855,7 @@ 
 	 * @return string URL to the stylesheet directory.
 	 */
 	public function get_stylesheet_directory_uri() {
-		return $this->get_theme_root_uri() . '/' . str_replace( '%2F', '/', rawurlencode( $this->stylesheet ) );
+		return $this->get_theme_root_uri().'/'.str_replace('%2F', '/', rawurlencode($this->stylesheet));
 	}
 
 	/**
@@ -870,12 +870,12 @@ 
 	 * @return string URL to the template directory.
 	 */
 	public function get_template_directory_uri() {
-		if ( $this->parent() )
+		if ($this->parent())
 			$theme_root_uri = $this->parent()->get_theme_root_uri();
 		else
 			$theme_root_uri = $this->get_theme_root_uri();
 
-		return $theme_root_uri . '/' . str_replace( '%2F', '/', rawurlencode( $this->template ) );
+		return $theme_root_uri.'/'.str_replace('%2F', '/', rawurlencode($this->template));
 	}
 
 	/**
@@ -905,8 +905,8 @@ 
 	 * @return string Theme root URI.
 	 */
 	public function get_theme_root_uri() {
-		if ( ! isset( $this->theme_root_uri ) )
-			$this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+		if ( ! isset($this->theme_root_uri))
+			$this->theme_root_uri = get_theme_root_uri($this->stylesheet, $this->theme_root);
 		return $this->theme_root_uri;
 	}
 
@@ -924,26 +924,26 @@ 
 	 * @param string $uri Type of URL to return, either 'relative' or an absolute URI. Defaults to absolute URI.
 	 * @return string|false Screenshot file. False if the theme does not have a screenshot.
 	 */
-	public function get_screenshot( $uri = 'uri' ) {
-		$screenshot = $this->cache_get( 'screenshot' );
-		if ( $screenshot ) {
-			if ( 'relative' == $uri )
+	public function get_screenshot($uri = 'uri') {
+		$screenshot = $this->cache_get('screenshot');
+		if ($screenshot) {
+			if ('relative' == $uri)
 				return $screenshot;
-			return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
-		} elseif ( 0 === $screenshot ) {
+			return $this->get_stylesheet_directory_uri().'/'.$screenshot;
+		} elseif (0 === $screenshot) {
 			return false;
 		}
 
-		foreach ( array( 'png', 'gif', 'jpg', 'jpeg' ) as $ext ) {
-			if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) {
-				$this->cache_add( 'screenshot', 'screenshot.' . $ext );
-				if ( 'relative' == $uri )
-					return 'screenshot.' . $ext;
-				return $this->get_stylesheet_directory_uri() . '/' . 'screenshot.' . $ext;
+		foreach (array('png', 'gif', 'jpg', 'jpeg') as $ext) {
+			if (file_exists($this->get_stylesheet_directory()."/screenshot.$ext")) {
+				$this->cache_add('screenshot', 'screenshot.'.$ext);
+				if ('relative' == $uri)
+					return 'screenshot.'.$ext;
+				return $this->get_stylesheet_directory_uri().'/'.'screenshot.'.$ext;
 			}
 		}
 
-		$this->cache_add( 'screenshot', 0 );
+		$this->cache_add('screenshot', 0);
 		return false;
 	}
 
@@ -959,11 +959,11 @@ 
 	 * @return array Array of files, keyed by the path to the file relative to the theme's directory, with the values
 	 * 	             being absolute paths.
 	 */
-	public function get_files( $type = null, $depth = 0, $search_parent = false ) {
-		$files = (array) self::scandir( $this->get_stylesheet_directory(), $type, $depth );
+	public function get_files($type = null, $depth = 0, $search_parent = false) {
+		$files = (array) self::scandir($this->get_stylesheet_directory(), $type, $depth);
 
-		if ( $search_parent && $this->parent() )
-			$files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
+		if ($search_parent && $this->parent())
+			$files += (array) self::scandir($this->get_template_directory(), $type, $depth);
 
 		return $files;
 	}
@@ -977,35 +977,35 @@ 
 	 * @param WP_Post|null $post Optional. The post being edited, provided for context.
 	 * @return array Array of page templates, keyed by filename, with the value of the translated header name.
 	 */
-	public function get_page_templates( $post = null ) {
+	public function get_page_templates($post = null) {
 		// If you screw up your current theme and we invalidate your parent, most things still work. Let it slide.
-		if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) )
+		if ($this->errors() && $this->errors()->get_error_codes() !== array('theme_parent_invalid'))
 			return array();
 
-		$page_templates = $this->cache_get( 'page_templates' );
+		$page_templates = $this->cache_get('page_templates');
 
-		if ( ! is_array( $page_templates ) ) {
+		if ( ! is_array($page_templates)) {
 			$page_templates = array();
 
-			$files = (array) $this->get_files( 'php', 1 );
+			$files = (array) $this->get_files('php', 1);
 
-			foreach ( $files as $file => $full_path ) {
-				if ( ! preg_match( '|Template Name:(.*)$|mi', file_get_contents( $full_path ), $header ) )
+			foreach ($files as $file => $full_path) {
+				if ( ! preg_match('|Template Name:(.*)$|mi', file_get_contents($full_path), $header))
 					continue;
-				$page_templates[ $file ] = _cleanup_header_comment( $header[1] );
+				$page_templates[$file] = _cleanup_header_comment($header[1]);
 			}
 
-			$this->cache_add( 'page_templates', $page_templates );
+			$this->cache_add('page_templates', $page_templates);
 		}
 
-		if ( $this->load_textdomain() ) {
-			foreach ( $page_templates as &$page_template ) {
-				$page_template = $this->translate_header( 'Template Name', $page_template );
+		if ($this->load_textdomain()) {
+			foreach ($page_templates as &$page_template) {
+				$page_template = $this->translate_header('Template Name', $page_template);
 			}
 		}
 
-		if ( $this->parent() )
-			$page_templates += $this->parent()->get_page_templates( $post );
+		if ($this->parent())
+			$page_templates += $this->parent()->get_page_templates($post);
 
 		/**
 		 * Filter list of page templates for a theme.
@@ -1019,9 +1019,9 @@ 
 		 * @param WP_Theme     $this           The theme object.
 		 * @param WP_Post|null $post           The post being edited, provided for context, or null.
 		 */
-		$return = apply_filters( 'theme_page_templates', $page_templates, $this, $post );
+		$return = apply_filters('theme_page_templates', $page_templates, $this, $post);
 
-		return array_intersect_assoc( $return, $page_templates );
+		return array_intersect_assoc($return, $page_templates);
 	}
 
 	/**
@@ -1043,32 +1043,32 @@ 
 	 * @return array|false Array of files, keyed by the path to the file relative to the `$path` directory prepended
 	 *                     with `$relative_path`, with the values being absolute paths. False otherwise.
 	 */
-	private static function scandir( $path, $extensions = null, $depth = 0, $relative_path = '' ) {
-		if ( ! is_dir( $path ) )
+	private static function scandir($path, $extensions = null, $depth = 0, $relative_path = '') {
+		if ( ! is_dir($path))
 			return false;
 
-		if ( $extensions ) {
+		if ($extensions) {
 			$extensions = (array) $extensions;
-			$_extensions = implode( '|', $extensions );
+			$_extensions = implode('|', $extensions);
 		}
 
-		$relative_path = trailingslashit( $relative_path );
-		if ( '/' == $relative_path )
+		$relative_path = trailingslashit($relative_path);
+		if ('/' == $relative_path)
 			$relative_path = '';
 
-		$results = scandir( $path );
+		$results = scandir($path);
 		$files = array();
 
-		foreach ( $results as $result ) {
-			if ( '.' == $result[0] )
+		foreach ($results as $result) {
+			if ('.' == $result[0])
 				continue;
-			if ( is_dir( $path . '/' . $result ) ) {
-				if ( ! $depth || 'CVS' == $result )
+			if (is_dir($path.'/'.$result)) {
+				if ( ! $depth || 'CVS' == $result)
 					continue;
-				$found = self::scandir( $path . '/' . $result, $extensions, $depth - 1 , $relative_path . $result );
-				$files = array_merge_recursive( $files, $found );
-			} elseif ( ! $extensions || preg_match( '~\.(' . $_extensions . ')$~', $result ) ) {
-				$files[ $relative_path . $result ] = $path . '/' . $result;
+				$found = self::scandir($path.'/'.$result, $extensions, $depth - 1, $relative_path.$result);
+				$files = array_merge_recursive($files, $found);
+			} elseif ( ! $extensions || preg_match('~\.('.$_extensions.')$~', $result)) {
+				$files[$relative_path.$result] = $path.'/'.$result;
 			}
 		}
 
@@ -1088,27 +1088,27 @@ 
 	 * 	False if no textdomain was specified in the file headers, or if the domain could not be loaded.
 	 */
 	public function load_textdomain() {
-		if ( isset( $this->textdomain_loaded ) )
+		if (isset($this->textdomain_loaded))
 			return $this->textdomain_loaded;
 
 		$textdomain = $this->get('TextDomain');
-		if ( ! $textdomain ) {
+		if ( ! $textdomain) {
 			$this->textdomain_loaded = false;
 			return false;
 		}
 
-		if ( is_textdomain_loaded( $textdomain ) ) {
+		if (is_textdomain_loaded($textdomain)) {
 			$this->textdomain_loaded = true;
 			return true;
 		}
 
 		$path = $this->get_stylesheet_directory();
-		if ( $domainpath = $this->get('DomainPath') )
+		if ($domainpath = $this->get('DomainPath'))
 			$path .= $domainpath;
 		else
 			$path .= '/languages';
 
-		$this->textdomain_loaded = load_theme_textdomain( $textdomain, $path );
+		$this->textdomain_loaded = load_theme_textdomain($textdomain, $path);
 		return $this->textdomain_loaded;
 	}
 
@@ -1123,19 +1123,19 @@ 
 	 * @param int $blog_id Optional. Ignored if only network-wide settings are checked. Defaults to current blog.
 	 * @return bool Whether the theme is allowed for the network. Returns true in single-site.
 	 */
-	public function is_allowed( $check = 'both', $blog_id = null ) {
-		if ( ! is_multisite() )
+	public function is_allowed($check = 'both', $blog_id = null) {
+		if ( ! is_multisite())
 			return true;
 
-		if ( 'both' == $check || 'network' == $check ) {
+		if ('both' == $check || 'network' == $check) {
 			$allowed = self::get_allowed_on_network();
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
+			if ( ! empty($allowed[$this->get_stylesheet()]))
 				return true;
 		}
 
-		if ( 'both' == $check || 'site' == $check ) {
-			$allowed = self::get_allowed_on_site( $blog_id );
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
+		if ('both' == $check || 'site' == $check) {
+			$allowed = self::get_allowed_on_site($blog_id);
+			if ( ! empty($allowed[$this->get_stylesheet()]))
 				return true;
 		}
 
@@ -1153,7 +1153,7 @@ 
 	 * @param int $blog_id Optional. Defaults to current blog.
 	 * @return array Array of stylesheet names.
 	 */
-	public static function get_allowed( $blog_id = null ) {
+	public static function get_allowed($blog_id = null) {
 		/**
 		 * Filter the array of themes allowed on the site or network.
 		 *
@@ -1161,8 +1161,8 @@ 
 		 *
 		 * @param array $allowed_themes An array of theme stylesheet names.
 		 */
-		$network = (array) apply_filters( 'allowed_themes', self::get_allowed_on_network() );
-		return $network + self::get_allowed_on_site( $blog_id );
+		$network = (array) apply_filters('allowed_themes', self::get_allowed_on_network());
+		return $network + self::get_allowed_on_site($blog_id);
 	}
 
 	/**
@@ -1179,8 +1179,8 @@ 
 	 */
 	public static function get_allowed_on_network() {
 		static $allowed_themes;
-		if ( ! isset( $allowed_themes ) )
-			$allowed_themes = (array) get_site_option( 'allowedthemes' );
+		if ( ! isset($allowed_themes))
+			$allowed_themes = (array) get_site_option('allowedthemes');
 		return $allowed_themes;
 	}
 
@@ -1197,62 +1197,62 @@ 
 	 * @param int $blog_id Optional. Defaults to current blog.
 	 * @return array Array of stylesheet names.
 	 */
-	public static function get_allowed_on_site( $blog_id = null ) {
+	public static function get_allowed_on_site($blog_id = null) {
 		static $allowed_themes = array();
 
-		if ( ! $blog_id || ! is_multisite() )
+		if ( ! $blog_id || ! is_multisite())
 			$blog_id = get_current_blog_id();
 
-		if ( isset( $allowed_themes[ $blog_id ] ) )
-			return $allowed_themes[ $blog_id ];
+		if (isset($allowed_themes[$blog_id]))
+			return $allowed_themes[$blog_id];
 
 		$current = $blog_id == get_current_blog_id();
 
-		if ( $current ) {
-			$allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
+		if ($current) {
+			$allowed_themes[$blog_id] = get_option('allowedthemes');
 		} else {
-			switch_to_blog( $blog_id );
-			$allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
+			switch_to_blog($blog_id);
+			$allowed_themes[$blog_id] = get_option('allowedthemes');
 			restore_current_blog();
 		}
 
 		// This is all super old MU back compat joy.
 		// 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
-		if ( false === $allowed_themes[ $blog_id ] ) {
-			if ( $current ) {
-				$allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
+		if (false === $allowed_themes[$blog_id]) {
+			if ($current) {
+				$allowed_themes[$blog_id] = get_option('allowed_themes');
 			} else {
-				switch_to_blog( $blog_id );
-				$allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
+				switch_to_blog($blog_id);
+				$allowed_themes[$blog_id] = get_option('allowed_themes');
 				restore_current_blog();
 			}
 
-			if ( ! is_array( $allowed_themes[ $blog_id ] ) || empty( $allowed_themes[ $blog_id ] ) ) {
-				$allowed_themes[ $blog_id ] = array();
+			if ( ! is_array($allowed_themes[$blog_id]) || empty($allowed_themes[$blog_id])) {
+				$allowed_themes[$blog_id] = array();
 			} else {
 				$converted = array();
 				$themes = wp_get_themes();
-				foreach ( $themes as $stylesheet => $theme_data ) {
-					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get('Name') ] ) )
-						$converted[ $stylesheet ] = true;
+				foreach ($themes as $stylesheet => $theme_data) {
+					if (isset($allowed_themes[$blog_id][$theme_data->get('Name')]))
+						$converted[$stylesheet] = true;
 				}
-				$allowed_themes[ $blog_id ] = $converted;
+				$allowed_themes[$blog_id] = $converted;
 			}
 			// Set the option so we never have to go through this pain again.
-			if ( is_admin() && $allowed_themes[ $blog_id ] ) {
-				if ( $current ) {
-					update_option( 'allowedthemes', $allowed_themes[ $blog_id ] );
-					delete_option( 'allowed_themes' );
+			if (is_admin() && $allowed_themes[$blog_id]) {
+				if ($current) {
+					update_option('allowedthemes', $allowed_themes[$blog_id]);
+					delete_option('allowed_themes');
 				} else {
-					switch_to_blog( $blog_id );
-					update_option( 'allowedthemes', $allowed_themes[ $blog_id ] );
-					delete_option( 'allowed_themes' );
+					switch_to_blog($blog_id);
+					update_option('allowedthemes', $allowed_themes[$blog_id]);
+					delete_option('allowed_themes');
 					restore_current_blog();
 				}
 			}
 		}
 
-		return (array) $allowed_themes[ $blog_id ];
+		return (array) $allowed_themes[$blog_id];
 	}
 
 	/**
@@ -1263,11 +1263,11 @@ 
 	 * @static
 	 * @access public
 	 */
-	public static function sort_by_name( &$themes ) {
-		if ( 0 === strpos( get_locale(), 'en_' ) ) {
-			uasort( $themes, array( 'WP_Theme', '_name_sort' ) );
+	public static function sort_by_name(&$themes) {
+		if (0 === strpos(get_locale(), 'en_')) {
+			uasort($themes, array('WP_Theme', '_name_sort'));
 		} else {
-			uasort( $themes, array( 'WP_Theme', '_name_sort_i18n' ) );
+			uasort($themes, array('WP_Theme', '_name_sort_i18n'));
 		}
 	}
 
@@ -1284,8 +1284,8 @@ 
 	 *
 	 * @return int
 	 */
-	private static function _name_sort( $a, $b ) {
-		return strnatcasecmp( $a->headers['Name'], $b->headers['Name'] );
+	private static function _name_sort($a, $b) {
+		return strnatcasecmp($a->headers['Name'], $b->headers['Name']);
 	}
 
 	/**
@@ -1298,8 +1298,8 @@ 
 	 *
 	 * @return int
 	 */
-	private static function _name_sort_i18n( $a, $b ) {
+	private static function _name_sort_i18n($a, $b) {
 		// Don't mark up; Do translate.
-		return strnatcasecmp( $a->display( 'Name', false, true ), $b->display( 'Name', false, true ) );
+		return strnatcasecmp($a->display('Name', false, true), $b->display('Name', false, true));
 	}
 }

Braces +137 added lines, -93 removed lines

@@ -195,8 +195,9 @@ 
 			self::$persistently_cache = apply_filters( 'wp_cache_themes_persistently', false, 'WP_Theme' );
 			if ( self::$persistently_cache ) {
 				wp_cache_add_global_groups( 'themes' );
-				if ( is_int( self::$persistently_cache ) )
-					self::$cache_expiration = self::$persistently_cache;
+				if ( is_int( self::$persistently_cache ) ) {
+									self::$cache_expiration = self::$persistently_cache;
+				}
 			} else {
 				wp_cache_add_non_persistent_groups( 'themes' );
 			}
@@ -218,23 +219,29 @@ 
 
 		if ( is_array( $cache ) ) {
 			foreach ( array( 'errors', 'headers', 'template' ) as $key ) {
-				if ( isset( $cache[ $key ] ) )
-					$this->$key = $cache[ $key ];
+				if ( isset( $cache[ $key ] ) ) {
+									$this->$key = $cache[ $key ];
+				}
+			}
+			if ( $this->errors ) {
+							return;
+			}
+			if ( isset( $cache['theme_root_template'] ) ) {
+							$theme_root_template = $cache['theme_root_template'];
 			}
-			if ( $this->errors )
-				return;
-			if ( isset( $cache['theme_root_template'] ) )
-				$theme_root_template = $cache['theme_root_template'];
 		} elseif ( ! file_exists( $this->theme_root . '/' . $theme_file ) ) {
 			$this->headers['Name'] = $this->stylesheet;
-			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) )
-				$this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), $this->stylesheet ) );
-			else
-				$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
+			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) ) {
+							$this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), $this->stylesheet ) );
+			} else {
+							$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
+			}
 			$this->template = $this->stylesheet;
 			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
-			if ( ! file_exists( $this->theme_root ) ) // Don't cache this one.
+			if ( ! file_exists( $this->theme_root ) ) {
+				// Don't cache this one.
 				$this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.' ) );
+			}
 			return;
 		} elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) {
 			$this->headers['Name'] = $this->stylesheet;
@@ -247,8 +254,9 @@ 
 			// Default themes always trump their pretenders.
 			// Properly identify default themes that are inside a directory within wp-content/themes.
 			if ( $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes ) ) {
-				if ( basename( $this->stylesheet ) != $default_theme_slug )
-					$this->headers['Name'] .= '/' . $this->stylesheet;
+				if ( basename( $this->stylesheet ) != $default_theme_slug ) {
+									$this->headers['Name'] .= '/' . $this->stylesheet;
+				}
 			}
 		}
 
@@ -304,8 +312,9 @@ 
 		if ( ! is_array( $cache ) ) {
 			$cache = array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template );
 			// If the parent theme is in another root, we'll want to cache this. Avoids an entire branch of filesystem calls above.
-			if ( isset( $theme_root_template ) )
-				$cache['theme_root_template'] = $theme_root_template;
+			if ( isset( $theme_root_template ) ) {
+							$cache['theme_root_template'] = $theme_root_template;
+			}
 			$this->cache_add( 'theme', $cache );
 		}
 	}
@@ -544,8 +553,9 @@ 
 	 * @access public
 	 */
 	public function cache_delete() {
-		foreach ( array( 'theme', 'screenshot', 'headers', 'page_templates' ) as $key )
-			wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
+		foreach ( array( 'theme', 'screenshot', 'headers', 'page_templates' ) as $key ) {
+					wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
+		}
 		$this->template = $this->textdomain_loaded = $this->theme_root_uri = $this->parent = $this->errors = $this->headers_sanitized = $this->name_translated = null;
 		$this->headers = array();
 		$this->__construct( $this->stylesheet, $this->theme_root );
@@ -569,22 +579,26 @@ 
 	 * @return string|false String on success, false on failure.
 	 */
 	public function get( $header ) {
-		if ( ! isset( $this->headers[ $header ] ) )
-			return false;
+		if ( ! isset( $this->headers[ $header ] ) ) {
+					return false;
+		}
 
 		if ( ! isset( $this->headers_sanitized ) ) {
 			$this->headers_sanitized = $this->cache_get( 'headers' );
-			if ( ! is_array( $this->headers_sanitized ) )
-				$this->headers_sanitized = array();
+			if ( ! is_array( $this->headers_sanitized ) ) {
+							$this->headers_sanitized = array();
+			}
 		}
 
-		if ( isset( $this->headers_sanitized[ $header ] ) )
-			return $this->headers_sanitized[ $header ];
+		if ( isset( $this->headers_sanitized[ $header ] ) ) {
+					return $this->headers_sanitized[ $header ];
+		}
 
 		// If themes are a persistent group, sanitize everything and cache it. One cache add is better than many cache sets.
 		if ( self::$persistently_cache ) {
-			foreach ( array_keys( $this->headers ) as $_header )
-				$this->headers_sanitized[ $_header ] = $this->sanitize_header( $_header, $this->headers[ $_header ] );
+			foreach ( array_keys( $this->headers ) as $_header ) {
+							$this->headers_sanitized[ $_header ] = $this->sanitize_header( $_header, $this->headers[ $_header ] );
+			}
 			$this->cache_add( 'headers', $this->headers_sanitized );
 		} else {
 			$this->headers_sanitized[ $header ] = $this->sanitize_header( $header, $this->headers[ $header ] );
@@ -610,14 +624,17 @@ 
 			return false;
 		}
 
-		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) )
-			$translate = false;
+		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) ) {
+					$translate = false;
+		}
 
-		if ( $translate )
-			$value = $this->translate_header( $header, $value );
+		if ( $translate ) {
+					$value = $this->translate_header( $header, $value );
+		}
 
-		if ( $markup )
-			$value = $this->markup_header( $header, $value, $translate );
+		if ( $markup ) {
+					$value = $this->markup_header( $header, $value, $translate );
+		}
 
 		return $value;
 	}
@@ -697,8 +714,9 @@ 
 	private function markup_header( $header, $value, $translate ) {
 		switch ( $header ) {
 			case 'Name' :
-				if ( empty( $value ) )
-					$value = $this->get_stylesheet();
+				if ( empty( $value ) ) {
+									$value = $this->get_stylesheet();
+				}
 				break;
 			case 'Description' :
 				$value = wptexturize( $value );
@@ -743,20 +761,23 @@ 
 		switch ( $header ) {
 			case 'Name' :
 				// Cached for sorting reasons.
-				if ( isset( $this->name_translated ) )
-					return $this->name_translated;
+				if ( isset( $this->name_translated ) ) {
+									return $this->name_translated;
+				}
 				$this->name_translated = translate( $value, $this->get('TextDomain' ) );
 				return $this->name_translated;
 			case 'Tags' :
-				if ( empty( $value ) || ! function_exists( 'get_theme_feature_list' ) )
-					return $value;
+				if ( empty( $value ) || ! function_exists( 'get_theme_feature_list' ) ) {
+									return $value;
+				}
 
 				static $tags_list;
 				if ( ! isset( $tags_list ) ) {
 					$tags_list = array();
 					$feature_list = get_theme_feature_list( false ); // No API
-					foreach ( $feature_list as $tags )
-						$tags_list += $tags;
+					foreach ( $feature_list as $tags ) {
+											$tags_list += $tags;
+					}
 				}
 
 				foreach ( $value as &$tag ) {
@@ -817,8 +838,9 @@ 
 	 * @return string Absolute path of the stylesheet directory.
 	 */
 	public function get_stylesheet_directory() {
-		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) )
-			return '';
+		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) ) {
+					return '';
+		}
 
 		return $this->theme_root . '/' . $this->stylesheet;
 	}
@@ -835,10 +857,11 @@ 
 	 * @return string Absolute path of the template directory.
 	 */
 	public function get_template_directory() {
-		if ( $this->parent() )
-			$theme_root = $this->parent()->theme_root;
-		else
-			$theme_root = $this->theme_root;
+		if ( $this->parent() ) {
+					$theme_root = $this->parent()->theme_root;
+		} else {
+					$theme_root = $this->theme_root;
+		}
 
 		return $theme_root . '/' . $this->template;
 	}
@@ -870,10 +893,11 @@ 
 	 * @return string URL to the template directory.
 	 */
 	public function get_template_directory_uri() {
-		if ( $this->parent() )
-			$theme_root_uri = $this->parent()->get_theme_root_uri();
-		else
-			$theme_root_uri = $this->get_theme_root_uri();
+		if ( $this->parent() ) {
+					$theme_root_uri = $this->parent()->get_theme_root_uri();
+		} else {
+					$theme_root_uri = $this->get_theme_root_uri();
+		}
 
 		return $theme_root_uri . '/' . str_replace( '%2F', '/', rawurlencode( $this->template ) );
 	}
@@ -905,8 +929,9 @@ 
 	 * @return string Theme root URI.
 	 */
 	public function get_theme_root_uri() {
-		if ( ! isset( $this->theme_root_uri ) )
-			$this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+		if ( ! isset( $this->theme_root_uri ) ) {
+					$this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+		}
 		return $this->theme_root_uri;
 	}
 
@@ -927,8 +952,9 @@ 
 	public function get_screenshot( $uri = 'uri' ) {
 		$screenshot = $this->cache_get( 'screenshot' );
 		if ( $screenshot ) {
-			if ( 'relative' == $uri )
-				return $screenshot;
+			if ( 'relative' == $uri ) {
+							return $screenshot;
+			}
 			return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
 		} elseif ( 0 === $screenshot ) {
 			return false;
@@ -937,8 +963,9 @@ 
 		foreach ( array( 'png', 'gif', 'jpg', 'jpeg' ) as $ext ) {
 			if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) {
 				$this->cache_add( 'screenshot', 'screenshot.' . $ext );
-				if ( 'relative' == $uri )
-					return 'screenshot.' . $ext;
+				if ( 'relative' == $uri ) {
+									return 'screenshot.' . $ext;
+				}
 				return $this->get_stylesheet_directory_uri() . '/' . 'screenshot.' . $ext;
 			}
 		}
@@ -962,8 +989,9 @@ 
 	public function get_files( $type = null, $depth = 0, $search_parent = false ) {
 		$files = (array) self::scandir( $this->get_stylesheet_directory(), $type, $depth );
 
-		if ( $search_parent && $this->parent() )
-			$files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
+		if ( $search_parent && $this->parent() ) {
+					$files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
+		}
 
 		return $files;
 	}
@@ -979,8 +1007,9 @@ 
 	 */
 	public function get_page_templates( $post = null ) {
 		// If you screw up your current theme and we invalidate your parent, most things still work. Let it slide.
-		if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) )
-			return array();
+		if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) ) {
+					return array();
+		}
 
 		$page_templates = $this->cache_get( 'page_templates' );
 
@@ -990,8 +1019,9 @@ 
 			$files = (array) $this->get_files( 'php', 1 );
 
 			foreach ( $files as $file => $full_path ) {
-				if ( ! preg_match( '|Template Name:(.*)$|mi', file_get_contents( $full_path ), $header ) )
-					continue;
+				if ( ! preg_match( '|Template Name:(.*)$|mi', file_get_contents( $full_path ), $header ) ) {
+									continue;
+				}
 				$page_templates[ $file ] = _cleanup_header_comment( $header[1] );
 			}
 
@@ -1004,8 +1034,9 @@ 
 			}
 		}
 
-		if ( $this->parent() )
-			$page_templates += $this->parent()->get_page_templates( $post );
+		if ( $this->parent() ) {
+					$page_templates += $this->parent()->get_page_templates( $post );
+		}
 
 		/**
 		 * Filter list of page templates for a theme.
@@ -1044,8 +1075,9 @@ 
 	 *                     with `$relative_path`, with the values being absolute paths. False otherwise.
 	 */
 	private static function scandir( $path, $extensions = null, $depth = 0, $relative_path = '' ) {
-		if ( ! is_dir( $path ) )
-			return false;
+		if ( ! is_dir( $path ) ) {
+					return false;
+		}
 
 		if ( $extensions ) {
 			$extensions = (array) $extensions;
@@ -1053,18 +1085,21 @@ 
 		}
 
 		$relative_path = trailingslashit( $relative_path );
-		if ( '/' == $relative_path )
-			$relative_path = '';
+		if ( '/' == $relative_path ) {
+					$relative_path = '';
+		}
 
 		$results = scandir( $path );
 		$files = array();
 
 		foreach ( $results as $result ) {
-			if ( '.' == $result[0] )
-				continue;
+			if ( '.' == $result[0] ) {
+							continue;
+			}
 			if ( is_dir( $path . '/' . $result ) ) {
-				if ( ! $depth || 'CVS' == $result )
-					continue;
+				if ( ! $depth || 'CVS' == $result ) {
+									continue;
+				}
 				$found = self::scandir( $path . '/' . $result, $extensions, $depth - 1 , $relative_path . $result );
 				$files = array_merge_recursive( $files, $found );
 			} elseif ( ! $extensions || preg_match( '~\.(' . $_extensions . ')$~', $result ) ) {
@@ -1088,8 +1123,9 @@ 
 	 * 	False if no textdomain was specified in the file headers, or if the domain could not be loaded.
 	 */
 	public function load_textdomain() {
-		if ( isset( $this->textdomain_loaded ) )
-			return $this->textdomain_loaded;
+		if ( isset( $this->textdomain_loaded ) ) {
+					return $this->textdomain_loaded;
+		}
 
 		$textdomain = $this->get('TextDomain');
 		if ( ! $textdomain ) {
@@ -1103,10 +1139,11 @@ 
 		}
 
 		$path = $this->get_stylesheet_directory();
-		if ( $domainpath = $this->get('DomainPath') )
-			$path .= $domainpath;
-		else
-			$path .= '/languages';
+		if ( $domainpath = $this->get('DomainPath') ) {
+					$path .= $domainpath;
+		} else {
+					$path .= '/languages';
+		}
 
 		$this->textdomain_loaded = load_theme_textdomain( $textdomain, $path );
 		return $this->textdomain_loaded;
@@ -1124,19 +1161,22 @@ 
 	 * @return bool Whether the theme is allowed for the network. Returns true in single-site.
 	 */
 	public function is_allowed( $check = 'both', $blog_id = null ) {
-		if ( ! is_multisite() )
-			return true;
+		if ( ! is_multisite() ) {
+					return true;
+		}
 
 		if ( 'both' == $check || 'network' == $check ) {
 			$allowed = self::get_allowed_on_network();
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
-				return true;
+			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) ) {
+							return true;
+			}
 		}
 
 		if ( 'both' == $check || 'site' == $check ) {
 			$allowed = self::get_allowed_on_site( $blog_id );
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
-				return true;
+			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) ) {
+							return true;
+			}
 		}
 
 		return false;
@@ -1179,8 +1219,9 @@ 
 	 */
 	public static function get_allowed_on_network() {
 		static $allowed_themes;
-		if ( ! isset( $allowed_themes ) )
-			$allowed_themes = (array) get_site_option( 'allowedthemes' );
+		if ( ! isset( $allowed_themes ) ) {
+					$allowed_themes = (array) get_site_option( 'allowedthemes' );
+		}
 		return $allowed_themes;
 	}
 
@@ -1200,11 +1241,13 @@ 
 	public static function get_allowed_on_site( $blog_id = null ) {
 		static $allowed_themes = array();
 
-		if ( ! $blog_id || ! is_multisite() )
-			$blog_id = get_current_blog_id();
+		if ( ! $blog_id || ! is_multisite() ) {
+					$blog_id = get_current_blog_id();
+		}
 
-		if ( isset( $allowed_themes[ $blog_id ] ) )
-			return $allowed_themes[ $blog_id ];
+		if ( isset( $allowed_themes[ $blog_id ] ) ) {
+					return $allowed_themes[ $blog_id ];
+		}
 
 		$current = $blog_id == get_current_blog_id();
 
@@ -1233,8 +1276,9 @@ 
 				$converted = array();
 				$themes = wp_get_themes();
 				foreach ( $themes as $stylesheet => $theme_data ) {
-					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get('Name') ] ) )
-						$converted[ $stylesheet ] = true;
+					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get('Name') ] ) ) {
+											$converted[ $stylesheet ] = true;
+					}
 				}
 				$allowed_themes[ $blog_id ] = $converted;
 			}

src/wp-includes/class-wp.php

Doc Comments +1 added lines, -1 removed lines

@@ -699,7 +699,7 @@
 	 * @access public
 	 *
 	 * @param string $subject subject
-	 * @param array  $matches data used for substitution
+	 * @param string[]  $matches data used for substitution
 	 * @return string
 	 */
 	public static function apply($subject, $matches) {

Indentation +16 added lines, -16 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * WordPress environment setup class.
- *
- * @package WordPress
- * @since 2.0.0
- */
+	 * WordPress environment setup class.
+	 *
+	 * @package WordPress
+	 * @since 2.0.0
+	 */
 class WP {
 	/**
 	 * Public query variables.
@@ -557,17 +557,17 @@ 
  	}
 
  	/**
-	 * Set the Headers for 404, if nothing is found for requested URL.
-	 *
-	 * Issue a 404 if a request doesn't match any posts and doesn't match
-	 * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already
-	 * issued, and if the request was not a search or the homepage.
-	 *
-	 * Otherwise, issue a 200.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @global WP_Query $wp_query
+ 	 * Set the Headers for 404, if nothing is found for requested URL.
+ 	 *
+ 	 * Issue a 404 if a request doesn't match any posts and doesn't match
+ 	 * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already
+ 	 * issued, and if the request was not a search or the homepage.
+ 	 *
+ 	 * Otherwise, issue a 200.
+ 	 *
+ 	 * @since 2.0.0
+ 	 *
+ 	 * @global WP_Query $wp_query
  	 */
 	public function handle_404() {
 		global $wp_query;

Spacing +123 added lines, -124 removed lines

@@ -25,7 +25,7 @@ 
 	 * @since 2.0.0
 	 * @var array
 	 */
-	public $private_query_vars = array( 'offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in' );
+	public $private_query_vars = array('offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in');
 
 	/**
 	 * Extra query variables set by the user.
@@ -91,7 +91,7 @@ 
 	 * @param string $qv Query variable name.
 	 */
 	public function add_query_var($qv) {
-		if ( !in_array($qv, $this->public_query_vars) )
+		if ( ! in_array($qv, $this->public_query_vars))
 			$this->public_query_vars[] = $qv;
 	}
 
@@ -131,35 +131,35 @@ 
 		 * @param WP           $this             Current WordPress environment instance.
 		 * @param array|string $extra_query_vars Extra passed query variables.
 		 */
-		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) )
+		if ( ! apply_filters('do_parse_request', true, $this, $extra_query_vars))
 			return;
 
 		$this->query_vars = array();
 		$post_type_query_vars = array();
 
-		if ( is_array( $extra_query_vars ) ) {
+		if (is_array($extra_query_vars)) {
 			$this->extra_query_vars = & $extra_query_vars;
-		} elseif ( ! empty( $extra_query_vars ) ) {
-			parse_str( $extra_query_vars, $this->extra_query_vars );
+		} elseif ( ! empty($extra_query_vars)) {
+			parse_str($extra_query_vars, $this->extra_query_vars);
 		}
 		// Process PATH_INFO, REQUEST_URI, and 404 for permalinks.
 
 		// Fetch the rewrite rules.
 		$rewrite = $wp_rewrite->wp_rewrite_rules();
 
-		if ( ! empty($rewrite) ) {
+		if ( ! empty($rewrite)) {
 			// If we match a rewrite rule, this will be cleared.
 			$error = '404';
 			$this->did_permalink = true;
 
-			$pathinfo = isset( $_SERVER['PATH_INFO'] ) ? $_SERVER['PATH_INFO'] : '';
-			list( $pathinfo ) = explode( '?', $pathinfo );
-			$pathinfo = str_replace( "%", "%25", $pathinfo );
+			$pathinfo = isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '';
+			list($pathinfo) = explode('?', $pathinfo);
+			$pathinfo = str_replace("%", "%25", $pathinfo);
 
-			list( $req_uri ) = explode( '?', $_SERVER['REQUEST_URI'] );
+			list($req_uri) = explode('?', $_SERVER['REQUEST_URI']);
 			$self = $_SERVER['PHP_SELF'];
-			$home_path = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );
-			$home_path_regex = sprintf( '|^%s|i', preg_quote( $home_path, '|' ) );
+			$home_path = trim(parse_url(home_url(), PHP_URL_PATH), '/');
+			$home_path_regex = sprintf('|^%s|i', preg_quote($home_path, '|'));
 
 			// Trim path info from the end and the leading home path from the
 			// front. For path info requests, this leaves us with the requesting
@@ -167,22 +167,22 @@ 
 			// requested permalink.
 			$req_uri = str_replace($pathinfo, '', $req_uri);
 			$req_uri = trim($req_uri, '/');
-			$req_uri = preg_replace( $home_path_regex, '', $req_uri );
+			$req_uri = preg_replace($home_path_regex, '', $req_uri);
 			$req_uri = trim($req_uri, '/');
 			$pathinfo = trim($pathinfo, '/');
-			$pathinfo = preg_replace( $home_path_regex, '', $pathinfo );
+			$pathinfo = preg_replace($home_path_regex, '', $pathinfo);
 			$pathinfo = trim($pathinfo, '/');
 			$self = trim($self, '/');
-			$self = preg_replace( $home_path_regex, '', $self );
+			$self = preg_replace($home_path_regex, '', $self);
 			$self = trim($self, '/');
 
 			// The requested permalink is in $pathinfo for path info requests and
 			//  $req_uri for other requests.
-			if ( ! empty($pathinfo) && !preg_match('|^.*' . $wp_rewrite->index . '$|', $pathinfo) ) {
+			if ( ! empty($pathinfo) && ! preg_match('|^.*'.$wp_rewrite->index.'$|', $pathinfo)) {
 				$request = $pathinfo;
 			} else {
 				// If the request uri is the index, blank it out so that we don't try to match it against a rule.
-				if ( $req_uri == $wp_rewrite->index )
+				if ($req_uri == $wp_rewrite->index)
 					$req_uri = '';
 				$request = $req_uri;
 			}
@@ -191,25 +191,25 @@ 
 
 			// Look for matches.
 			$request_match = $request;
-			if ( empty( $request_match ) ) {
+			if (empty($request_match)) {
 				// An empty request could only match against ^$ regex
-				if ( isset( $rewrite['$'] ) ) {
+				if (isset($rewrite['$'])) {
 					$this->matched_rule = '$';
 					$query = $rewrite['$'];
 					$matches = array('');
 				}
 			} else {
-				foreach ( (array) $rewrite as $match => $query ) {
+				foreach ((array) $rewrite as $match => $query) {
 					// If the requesting file is the anchor of the match, prepend it to the path info.
-					if ( ! empty($req_uri) && strpos($match, $req_uri) === 0 && $req_uri != $request )
-						$request_match = $req_uri . '/' . $request;
+					if ( ! empty($req_uri) && strpos($match, $req_uri) === 0 && $req_uri != $request)
+						$request_match = $req_uri.'/'.$request;
 
-					if ( preg_match("#^$match#", $request_match, $matches) ||
-						preg_match("#^$match#", urldecode($request_match), $matches) ) {
+					if (preg_match("#^$match#", $request_match, $matches) ||
+						preg_match("#^$match#", urldecode($request_match), $matches)) {
 
-						if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
+						if ($wp_rewrite->use_verbose_page_rules && preg_match('/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch)) {
 							// This is a verbose page match, let's check to be sure about it.
-							if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
+							if ( ! get_page_by_path($matches[$varmatch[1]]))
 						 		continue;
 						}
 
@@ -220,7 +220,7 @@ 
 				}
 			}
 
-			if ( isset( $this->matched_rule ) ) {
+			if (isset($this->matched_rule)) {
 				// Trim the query of everything up to the '?'.
 				$query = preg_replace("!^.+\?!", '', $query);
 
@@ -233,16 +233,16 @@ 
 				parse_str($query, $perma_query_vars);
 
 				// If we're processing a 404 request, clear the error var since we found something.
-				if ( '404' == $error )
-					unset( $error, $_GET['error'] );
+				if ('404' == $error)
+					unset($error, $_GET['error']);
 			}
 
 			// If req_uri is empty or if it is a request for ourself, unset error.
-			if ( empty($request) || $req_uri == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
-				unset( $error, $_GET['error'] );
+			if (empty($request) || $req_uri == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false) {
+				unset($error, $_GET['error']);
 
-				if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false )
-					unset( $perma_query_vars );
+				if (isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false)
+					unset($perma_query_vars);
 
 				$this->did_permalink = false;
 			}
@@ -259,34 +259,34 @@ 
 		 *
 		 * @param array $public_query_vars The array of whitelisted query variables.
 		 */
-		$this->public_query_vars = apply_filters( 'query_vars', $this->public_query_vars );
+		$this->public_query_vars = apply_filters('query_vars', $this->public_query_vars);
 
-		foreach ( get_post_types( array(), 'objects' ) as $post_type => $t )
-			if ( $t->query_var )
+		foreach (get_post_types(array(), 'objects') as $post_type => $t)
+			if ($t->query_var)
 				$post_type_query_vars[$t->query_var] = $post_type;
 
-		foreach ( $this->public_query_vars as $wpvar ) {
-			if ( isset( $this->extra_query_vars[$wpvar] ) )
+		foreach ($this->public_query_vars as $wpvar) {
+			if (isset($this->extra_query_vars[$wpvar]))
 				$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
-			elseif ( isset( $_POST[$wpvar] ) )
+			elseif (isset($_POST[$wpvar]))
 				$this->query_vars[$wpvar] = $_POST[$wpvar];
-			elseif ( isset( $_GET[$wpvar] ) )
+			elseif (isset($_GET[$wpvar]))
 				$this->query_vars[$wpvar] = $_GET[$wpvar];
-			elseif ( isset( $perma_query_vars[$wpvar] ) )
+			elseif (isset($perma_query_vars[$wpvar]))
 				$this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
 
-			if ( !empty( $this->query_vars[$wpvar] ) ) {
-				if ( ! is_array( $this->query_vars[$wpvar] ) ) {
+			if ( ! empty($this->query_vars[$wpvar])) {
+				if ( ! is_array($this->query_vars[$wpvar])) {
 					$this->query_vars[$wpvar] = (string) $this->query_vars[$wpvar];
 				} else {
-					foreach ( $this->query_vars[$wpvar] as $vkey => $v ) {
-						if ( !is_object( $v ) ) {
+					foreach ($this->query_vars[$wpvar] as $vkey => $v) {
+						if ( ! is_object($v)) {
 							$this->query_vars[$wpvar][$vkey] = (string) $v;
 						}
 					}
 				}
 
-				if ( isset($post_type_query_vars[$wpvar] ) ) {
+				if (isset($post_type_query_vars[$wpvar])) {
 					$this->query_vars['post_type'] = $post_type_query_vars[$wpvar];
 					$this->query_vars['name'] = $this->query_vars[$wpvar];
 				}
@@ -294,30 +294,30 @@ 
 		}
 
 		// Convert urldecoded spaces back into +
-		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t )
-			if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
-				$this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
+		foreach (get_taxonomies(array(), 'objects') as $taxonomy => $t)
+			if ($t->query_var && isset($this->query_vars[$t->query_var]))
+				$this->query_vars[$t->query_var] = str_replace(' ', '+', $this->query_vars[$t->query_var]);
 
 		// Limit publicly queried post_types to those that are publicly_queryable
-		if ( isset( $this->query_vars['post_type']) ) {
-			$queryable_post_types = get_post_types( array('publicly_queryable' => true) );
-			if ( ! is_array( $this->query_vars['post_type'] ) ) {
-				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) )
-					unset( $this->query_vars['post_type'] );
+		if (isset($this->query_vars['post_type'])) {
+			$queryable_post_types = get_post_types(array('publicly_queryable' => true));
+			if ( ! is_array($this->query_vars['post_type'])) {
+				if ( ! in_array($this->query_vars['post_type'], $queryable_post_types))
+					unset($this->query_vars['post_type']);
 			} else {
-				$this->query_vars['post_type'] = array_intersect( $this->query_vars['post_type'], $queryable_post_types );
+				$this->query_vars['post_type'] = array_intersect($this->query_vars['post_type'], $queryable_post_types);
 			}
 		}
 
 		// Resolve conflicts between posts with numeric slugs and date archive queries.
-		$this->query_vars = wp_resolve_numeric_slug_conflicts( $this->query_vars );
+		$this->query_vars = wp_resolve_numeric_slug_conflicts($this->query_vars);
 
-		foreach ( (array) $this->private_query_vars as $var) {
-			if ( isset($this->extra_query_vars[$var]) )
+		foreach ((array) $this->private_query_vars as $var) {
+			if (isset($this->extra_query_vars[$var]))
 				$this->query_vars[$var] = $this->extra_query_vars[$var];
 		}
 
-		if ( isset($error) )
+		if (isset($error))
 			$this->query_vars['error'] = $error;
 
 		/**
@@ -327,7 +327,7 @@ 
 		 *
 		 * @param array $query_vars The array of requested query variables.
 		 */
-		$this->query_vars = apply_filters( 'request', $this->query_vars );
+		$this->query_vars = apply_filters('request', $this->query_vars);
 
 		/**
 		 * Fires once all query variables for the current request have been parsed.
@@ -336,7 +336,7 @@ 
 		 *
 		 * @param WP &$this Current WordPress environment instance (passed by reference).
 		 */
-		do_action_ref_array( 'parse_request', array( &$this ) );
+		do_action_ref_array('parse_request', array(&$this));
 	}
 
 	/**
@@ -352,50 +352,50 @@ 
 		$status = null;
 		$exit_required = false;
 
-		if ( is_user_logged_in() )
+		if (is_user_logged_in())
 			$headers = array_merge($headers, wp_get_nocache_headers());
-		if ( ! empty( $this->query_vars['error'] ) ) {
+		if ( ! empty($this->query_vars['error'])) {
 			$status = (int) $this->query_vars['error'];
-			if ( 404 === $status ) {
-				if ( ! is_user_logged_in() )
+			if (404 === $status) {
+				if ( ! is_user_logged_in())
 					$headers = array_merge($headers, wp_get_nocache_headers());
-				$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
-			} elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
+				$headers['Content-Type'] = get_option('html_type').'; charset='.get_option('blog_charset');
+			} elseif (in_array($status, array(403, 500, 502, 503))) {
 				$exit_required = true;
 			}
-		} elseif ( empty( $this->query_vars['feed'] ) ) {
-			$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
+		} elseif (empty($this->query_vars['feed'])) {
+			$headers['Content-Type'] = get_option('html_type').'; charset='.get_option('blog_charset');
 		} else {
 			// Set the correct content type for feeds
 			$type = $this->query_vars['feed'];
-			if ( 'feed' == $this->query_vars['feed'] ) {
+			if ('feed' == $this->query_vars['feed']) {
 				$type = get_default_feed();
 			}
-			$headers['Content-Type'] = feed_content_type( $type ) . '; charset=' . get_option( 'blog_charset' );
+			$headers['Content-Type'] = feed_content_type($type).'; charset='.get_option('blog_charset');
 
 			// We're showing a feed, so WP is indeed the only thing that last changed
-			if ( !empty($this->query_vars['withcomments'])
-				|| false !== strpos( $this->query_vars['feed'], 'comments-' )
-				|| ( empty($this->query_vars['withoutcomments'])
-					&& ( !empty($this->query_vars['p'])
-						|| !empty($this->query_vars['name'])
-						|| !empty($this->query_vars['page_id'])
-						|| !empty($this->query_vars['pagename'])
-						|| !empty($this->query_vars['attachment'])
-						|| !empty($this->query_vars['attachment_id'])
+			if ( ! empty($this->query_vars['withcomments'])
+				|| false !== strpos($this->query_vars['feed'], 'comments-')
+				|| (empty($this->query_vars['withoutcomments'])
+					&& ( ! empty($this->query_vars['p'])
+						|| ! empty($this->query_vars['name'])
+						|| ! empty($this->query_vars['page_id'])
+						|| ! empty($this->query_vars['pagename'])
+						|| ! empty($this->query_vars['attachment'])
+						|| ! empty($this->query_vars['attachment_id'])
 					)
 				)
 			)
 				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
 			else
 				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
-			$wp_etag = '"' . md5($wp_last_modified) . '"';
+			$wp_etag = '"'.md5($wp_last_modified).'"';
 			$headers['Last-Modified'] = $wp_last_modified;
 			$headers['ETag'] = $wp_etag;
 
 			// Support for Conditional GET
 			if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
-				$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
+				$client_etag = wp_unslash($_SERVER['HTTP_IF_NONE_MATCH']);
 			else $client_etag = false;
 
 			$client_last_modified = empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? '' : trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
@@ -405,9 +405,8 @@ 
 			// Make a timestamp for our most recent modification...
 			$wp_modified_timestamp = strtotime($wp_last_modified);
 
-			if ( ($client_last_modified && $client_etag) ?
-					 (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) :
-					 (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
+			if (($client_last_modified && $client_etag) ?
+					 (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) : (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag))) {
 				$status = 304;
 				$exit_required = true;
 			}
@@ -421,23 +420,23 @@ 
 		 * @param array $headers The list of headers to be sent.
 		 * @param WP    $this    Current WordPress environment instance.
 		 */
-		$headers = apply_filters( 'wp_headers', $headers, $this );
+		$headers = apply_filters('wp_headers', $headers, $this);
 
-		if ( ! empty( $status ) )
-			status_header( $status );
+		if ( ! empty($status))
+			status_header($status);
 
 		// If Last-Modified is set to false, it should not be sent (no-cache situation).
-		if ( isset( $headers['Last-Modified'] ) && false === $headers['Last-Modified'] ) {
-			unset( $headers['Last-Modified'] );
+		if (isset($headers['Last-Modified']) && false === $headers['Last-Modified']) {
+			unset($headers['Last-Modified']);
 
 			// In PHP 5.3+, make sure we are not sending a Last-Modified header.
-			if ( function_exists( 'header_remove' ) ) {
-				@header_remove( 'Last-Modified' );
+			if (function_exists('header_remove')) {
+				@header_remove('Last-Modified');
 			} else {
 				// In PHP 5.2, send an empty Last-Modified header, but only as a
 				// last resort to override a header already sent. #WP23021
-				foreach ( headers_list() as $header ) {
-					if ( 0 === stripos( $header, 'Last-Modified' ) ) {
+				foreach (headers_list() as $header) {
+					if (0 === stripos($header, 'Last-Modified')) {
 						$headers['Last-Modified'] = '';
 						break;
 					}
@@ -445,10 +444,10 @@ 
 			}
 		}
 
-		foreach( (array) $headers as $name => $field_value )
+		foreach ((array) $headers as $name => $field_value)
 			@header("{$name}: {$field_value}");
 
-		if ( $exit_required )
+		if ($exit_required)
 			exit();
 
 		/**
@@ -458,7 +457,7 @@ 
 		 *
 		 * @param WP &$this Current WordPress environment instance (passed by reference).
 		 */
-		do_action_ref_array( 'send_headers', array( &$this ) );
+		do_action_ref_array('send_headers', array(&$this));
 	}
 
 	/**
@@ -471,16 +470,16 @@ 
 	 */
 	public function build_query_string() {
 		$this->query_string = '';
-		foreach ( (array) array_keys($this->query_vars) as $wpvar) {
-			if ( '' != $this->query_vars[$wpvar] ) {
+		foreach ((array) array_keys($this->query_vars) as $wpvar) {
+			if ('' != $this->query_vars[$wpvar]) {
 				$this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
-				if ( !is_scalar($this->query_vars[$wpvar]) ) // Discard non-scalars.
+				if ( ! is_scalar($this->query_vars[$wpvar])) // Discard non-scalars.
 					continue;
-				$this->query_string .= $wpvar . '=' . rawurlencode($this->query_vars[$wpvar]);
+				$this->query_string .= $wpvar.'='.rawurlencode($this->query_vars[$wpvar]);
 			}
 		}
 
-		if ( has_filter( 'query_string' ) ) {  // Don't bother filtering and parsing if no plugins are hooked in.
+		if (has_filter('query_string')) {  // Don't bother filtering and parsing if no plugins are hooked in.
 			/**
 			 * Filter the query string before parsing.
 			 *
@@ -489,7 +488,7 @@ 
 			 *
 			 * @param string $query_string The query string to modify.
 			 */
-			$this->query_string = apply_filters( 'query_string', $this->query_string );
+			$this->query_string = apply_filters('query_string', $this->query_string);
 			parse_str($this->query_string, $this->query_vars);
 		}
 	}
@@ -516,22 +515,22 @@ 
 		global $wp_query;
 
 		// Extract updated query vars back into global namespace.
-		foreach ( (array) $wp_query->query_vars as $key => $value ) {
-			$GLOBALS[ $key ] = $value;
+		foreach ((array) $wp_query->query_vars as $key => $value) {
+			$GLOBALS[$key] = $value;
 		}
 
 		$GLOBALS['query_string'] = $this->query_string;
 		$GLOBALS['posts'] = & $wp_query->posts;
-		$GLOBALS['post'] = isset( $wp_query->post ) ? $wp_query->post : null;
+		$GLOBALS['post'] = isset($wp_query->post) ? $wp_query->post : null;
 		$GLOBALS['request'] = $wp_query->request;
 
-		if ( $wp_query->is_single() || $wp_query->is_page() ) {
+		if ($wp_query->is_single() || $wp_query->is_page()) {
 			$GLOBALS['more']   = 1;
 			$GLOBALS['single'] = 1;
 		}
 
-		if ( $wp_query->is_author() && isset( $wp_query->post ) )
-			$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		if ($wp_query->is_author() && isset($wp_query->post))
+			$GLOBALS['authordata'] = get_userdata($wp_query->post->post_author);
 	}
 
 	/**
@@ -573,41 +572,41 @@ 
 		global $wp_query;
 
 		// If we've already issued a 404, bail.
-		if ( is_404() )
+		if (is_404())
 			return;
 
 		// Never 404 for the admin, robots, or if we found posts.
-		if ( is_admin() || is_robots() || $wp_query->posts ) {
-			status_header( 200 );
+		if (is_admin() || is_robots() || $wp_query->posts) {
+			status_header(200);
 			return;
 		}
 
 		// We will 404 for paged queries, as no posts were found.
-		if ( ! is_paged() ) {
+		if ( ! is_paged()) {
 
 			// Don't 404 for authors without posts as long as they matched an author on this site.
-			$author = get_query_var( 'author' );
-			if ( is_author() && is_numeric( $author ) && $author > 0 && is_user_member_of_blog( $author ) ) {
-				status_header( 200 );
+			$author = get_query_var('author');
+			if (is_author() && is_numeric($author) && $author > 0 && is_user_member_of_blog($author)) {
+				status_header(200);
 				return;
 			}
 
 			// Don't 404 for these queries if they matched an object.
-			if ( ( is_tag() || is_category() || is_tax() || is_post_type_archive() ) && get_queried_object() ) {
-				status_header( 200 );
+			if ((is_tag() || is_category() || is_tax() || is_post_type_archive()) && get_queried_object()) {
+				status_header(200);
 				return;
 			}
 
 			// Don't 404 for these queries either.
-			if ( is_home() || is_search() || is_feed() ) {
-				status_header( 200 );
+			if (is_home() || is_search() || is_feed()) {
+				status_header(200);
 				return;
 			}
 		}
 
 		// Guess it's time to 404.
 		$wp_query->set_404();
-		status_header( 404 );
+		status_header(404);
 		nocache_headers();
 	}
 
@@ -637,7 +636,7 @@ 
 		 *
 		 * @param WP &$this Current WordPress environment instance (passed by reference).
 		 */
-		do_action_ref_array( 'wp', array( &$this ) );
+		do_action_ref_array('wp', array(&$this));
 	}
 }
 
@@ -727,6 +726,6 @@ 
 	 */
 	public function callback($matches) {
 		$index = intval(substr($matches[0], 9, -1));
-		return ( isset( $this->_matches[$index] ) ? urlencode($this->_matches[$index]) : '' );
+		return (isset($this->_matches[$index]) ? urlencode($this->_matches[$index]) : '');
 	}
 }

Braces +79 added lines, -54 removed lines

@@ -91,8 +91,9 @@ 
 	 * @param string $qv Query variable name.
 	 */
 	public function add_query_var($qv) {
-		if ( !in_array($qv, $this->public_query_vars) )
-			$this->public_query_vars[] = $qv;
+		if ( !in_array($qv, $this->public_query_vars) ) {
+					$this->public_query_vars[] = $qv;
+		}
 	}
 
 	/**
@@ -131,8 +132,9 @@ 
 		 * @param WP           $this             Current WordPress environment instance.
 		 * @param array|string $extra_query_vars Extra passed query variables.
 		 */
-		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) )
-			return;
+		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) ) {
+					return;
+		}
 
 		$this->query_vars = array();
 		$post_type_query_vars = array();
@@ -182,8 +184,9 @@ 
 				$request = $pathinfo;
 			} else {
 				// If the request uri is the index, blank it out so that we don't try to match it against a rule.
-				if ( $req_uri == $wp_rewrite->index )
-					$req_uri = '';
+				if ( $req_uri == $wp_rewrite->index ) {
+									$req_uri = '';
+				}
 				$request = $req_uri;
 			}
 
@@ -201,16 +204,18 @@ 
 			} else {
 				foreach ( (array) $rewrite as $match => $query ) {
 					// If the requesting file is the anchor of the match, prepend it to the path info.
-					if ( ! empty($req_uri) && strpos($match, $req_uri) === 0 && $req_uri != $request )
-						$request_match = $req_uri . '/' . $request;
+					if ( ! empty($req_uri) && strpos($match, $req_uri) === 0 && $req_uri != $request ) {
+											$request_match = $req_uri . '/' . $request;
+					}
 
 					if ( preg_match("#^$match#", $request_match, $matches) ||
 						preg_match("#^$match#", urldecode($request_match), $matches) ) {
 
 						if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
 							// This is a verbose page match, let's check to be sure about it.
-							if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
-						 		continue;
+							if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) ) {
+													 		continue;
+							}
 						}
 
 						// Got a match.
@@ -233,16 +238,18 @@ 
 				parse_str($query, $perma_query_vars);
 
 				// If we're processing a 404 request, clear the error var since we found something.
-				if ( '404' == $error )
-					unset( $error, $_GET['error'] );
+				if ( '404' == $error ) {
+									unset( $error, $_GET['error'] );
+				}
 			}
 
 			// If req_uri is empty or if it is a request for ourself, unset error.
 			if ( empty($request) || $req_uri == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
 				unset( $error, $_GET['error'] );
 
-				if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false )
-					unset( $perma_query_vars );
+				if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
+									unset( $perma_query_vars );
+				}
 
 				$this->did_permalink = false;
 			}
@@ -261,19 +268,21 @@ 
 		 */
 		$this->public_query_vars = apply_filters( 'query_vars', $this->public_query_vars );
 
-		foreach ( get_post_types( array(), 'objects' ) as $post_type => $t )
-			if ( $t->query_var )
+		foreach ( get_post_types( array(), 'objects' ) as $post_type => $t ) {
+					if ( $t->query_var )
 				$post_type_query_vars[$t->query_var] = $post_type;
+		}
 
 		foreach ( $this->public_query_vars as $wpvar ) {
-			if ( isset( $this->extra_query_vars[$wpvar] ) )
-				$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
-			elseif ( isset( $_POST[$wpvar] ) )
-				$this->query_vars[$wpvar] = $_POST[$wpvar];
-			elseif ( isset( $_GET[$wpvar] ) )
-				$this->query_vars[$wpvar] = $_GET[$wpvar];
-			elseif ( isset( $perma_query_vars[$wpvar] ) )
-				$this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
+			if ( isset( $this->extra_query_vars[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
+			} elseif ( isset( $_POST[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $_POST[$wpvar];
+			} elseif ( isset( $_GET[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $_GET[$wpvar];
+			} elseif ( isset( $perma_query_vars[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
+			}
 
 			if ( !empty( $this->query_vars[$wpvar] ) ) {
 				if ( ! is_array( $this->query_vars[$wpvar] ) ) {
@@ -294,16 +303,18 @@ 
 		}
 
 		// Convert urldecoded spaces back into +
-		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t )
-			if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
+		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t ) {
+					if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
 				$this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
+		}
 
 		// Limit publicly queried post_types to those that are publicly_queryable
 		if ( isset( $this->query_vars['post_type']) ) {
 			$queryable_post_types = get_post_types( array('publicly_queryable' => true) );
 			if ( ! is_array( $this->query_vars['post_type'] ) ) {
-				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) )
-					unset( $this->query_vars['post_type'] );
+				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) ) {
+									unset( $this->query_vars['post_type'] );
+				}
 			} else {
 				$this->query_vars['post_type'] = array_intersect( $this->query_vars['post_type'], $queryable_post_types );
 			}
@@ -313,12 +324,14 @@ 
 		$this->query_vars = wp_resolve_numeric_slug_conflicts( $this->query_vars );
 
 		foreach ( (array) $this->private_query_vars as $var) {
-			if ( isset($this->extra_query_vars[$var]) )
-				$this->query_vars[$var] = $this->extra_query_vars[$var];
+			if ( isset($this->extra_query_vars[$var]) ) {
+							$this->query_vars[$var] = $this->extra_query_vars[$var];
+			}
 		}
 
-		if ( isset($error) )
-			$this->query_vars['error'] = $error;
+		if ( isset($error) ) {
+					$this->query_vars['error'] = $error;
+		}
 
 		/**
 		 * Filter the array of parsed query variables.
@@ -352,13 +365,15 @@ 
 		$status = null;
 		$exit_required = false;
 
-		if ( is_user_logged_in() )
-			$headers = array_merge($headers, wp_get_nocache_headers());
+		if ( is_user_logged_in() ) {
+					$headers = array_merge($headers, wp_get_nocache_headers());
+		}
 		if ( ! empty( $this->query_vars['error'] ) ) {
 			$status = (int) $this->query_vars['error'];
 			if ( 404 === $status ) {
-				if ( ! is_user_logged_in() )
-					$headers = array_merge($headers, wp_get_nocache_headers());
+				if ( ! is_user_logged_in() ) {
+									$headers = array_merge($headers, wp_get_nocache_headers());
+				}
 				$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
 			} elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
 				$exit_required = true;
@@ -385,18 +400,21 @@ 
 						|| !empty($this->query_vars['attachment_id'])
 					)
 				)
-			)
-				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
-			else
-				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
+			) {
+							$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
+			} else {
+							$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
+			}
 			$wp_etag = '"' . md5($wp_last_modified) . '"';
 			$headers['Last-Modified'] = $wp_last_modified;
 			$headers['ETag'] = $wp_etag;
 
 			// Support for Conditional GET
-			if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
-				$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
-			else $client_etag = false;
+			if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+							$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
+			} else {
+				$client_etag = false;
+			}
 
 			$client_last_modified = empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? '' : trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
 			// If string is empty, return 0. If not, attempt to parse into a timestamp
@@ -423,8 +441,9 @@ 
 		 */
 		$headers = apply_filters( 'wp_headers', $headers, $this );
 
-		if ( ! empty( $status ) )
-			status_header( $status );
+		if ( ! empty( $status ) ) {
+					status_header( $status );
+		}
 
 		// If Last-Modified is set to false, it should not be sent (no-cache situation).
 		if ( isset( $headers['Last-Modified'] ) && false === $headers['Last-Modified'] ) {
@@ -445,11 +464,13 @@ 
 			}
 		}
 
-		foreach( (array) $headers as $name => $field_value )
-			@header("{$name}: {$field_value}");
+		foreach( (array) $headers as $name => $field_value ) {
+					@header("{$name}: {$field_value}");
+		}
 
-		if ( $exit_required )
-			exit();
+		if ( $exit_required ) {
+					exit();
+		}
 
 		/**
 		 * Fires once the requested HTTP headers for caching, content type, etc. have been sent.
@@ -474,8 +495,10 @@ 
 		foreach ( (array) array_keys($this->query_vars) as $wpvar) {
 			if ( '' != $this->query_vars[$wpvar] ) {
 				$this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
-				if ( !is_scalar($this->query_vars[$wpvar]) ) // Discard non-scalars.
+				if ( !is_scalar($this->query_vars[$wpvar]) ) {
+					// Discard non-scalars.
 					continue;
+				}
 				$this->query_string .= $wpvar . '=' . rawurlencode($this->query_vars[$wpvar]);
 			}
 		}
@@ -530,8 +553,9 @@ 
 			$GLOBALS['single'] = 1;
 		}
 
-		if ( $wp_query->is_author() && isset( $wp_query->post ) )
-			$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		if ( $wp_query->is_author() && isset( $wp_query->post ) ) {
+					$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		}
 	}
 
 	/**
@@ -573,8 +597,9 @@ 
 		global $wp_query;
 
 		// If we've already issued a 404, bail.
-		if ( is_404() )
-			return;
+		if ( is_404() ) {
+					return;
+		}
 
 		// Never 404 for the admin, robots, or if we found posts.
 		if ( is_admin() || is_robots() || $wp_query->posts ) {