ntwb / wordpress

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

Doc Comments +1 added lines, -1 removed lines

@@ -193,7 +193,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 +1 added lines, -1 removed lines

@@ -1160,7 +1160,7 @@
 	 *
 	 * @since 3.9.0
 	 * @access public
-     *
+	 *
 	 * @global array $wp_registered_sidebars
 	 * @global array $wp_registered_widgets
 	 */

Spacing +427 added lines, -427 removed lines

@@ -90,36 +90,36 @@ 
 	 *
 	 * @param WP_Customize_Manager $manager Customize manager bootstrap instance.
 	 */
-	public function __construct( $manager ) {
+	public function __construct($manager) {
 		$this->manager = $manager;
 
 		// See https://github.com/xwp/wp-customize-snapshots/blob/962586659688a5b1fd9ae93618b7ce2d4e7a421c/php/class-customize-snapshot-manager.php#L420-L449
-		add_filter( 'customize_dynamic_setting_args',          array( $this, 'filter_customize_dynamic_setting_args' ), 10, 2 );
-		add_action( 'widgets_init',                            array( $this, 'register_settings' ), 95 );
-		add_action( 'customize_register',                      array( $this, 'schedule_customize_register' ), 1 );
+		add_filter('customize_dynamic_setting_args', array($this, 'filter_customize_dynamic_setting_args'), 10, 2);
+		add_action('widgets_init', array($this, 'register_settings'), 95);
+		add_action('customize_register', array($this, 'schedule_customize_register'), 1);
 
 		// Skip remaining hooks when the user can't manage widgets anyway.
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			return;
 		}
 
-		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_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('wp_loaded', array($this, 'override_sidebars_widgets_for_theme_switch'));
+		add_action('customize_controls_init', array($this, 'customize_controls_init'));
+		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_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);
 
 		// Selective Refresh.
-		add_filter( 'customize_dynamic_partial_args',          array( $this, 'customize_dynamic_partial_args' ), 10, 2 );
-		add_action( 'customize_preview_init',                  array( $this, 'selective_refresh_init' ) );
+		add_filter('customize_dynamic_partial_args', array($this, 'customize_dynamic_partial_args'), 10, 2);
+		add_action('customize_preview_init', array($this, 'selective_refresh_init'));
 	}
 
 	/**
@@ -136,13 +136,13 @@ 
 	 */
 	public function get_selective_refreshable_widgets() {
 		global $wp_widget_factory;
-		if ( ! current_theme_supports( 'customize-selective-refresh-widgets' ) ) {
+		if ( ! current_theme_supports('customize-selective-refresh-widgets')) {
 			return array();
 		}
-		if ( ! isset( $this->selective_refreshable_widgets ) ) {
+		if ( ! isset($this->selective_refreshable_widgets)) {
 			$this->selective_refreshable_widgets = array();
-			foreach ( $wp_widget_factory->widgets as $wp_widget ) {
-				$this->selective_refreshable_widgets[ $wp_widget->id_base ] = ! empty( $wp_widget->widget_options['customize_selective_refresh'] );
+			foreach ($wp_widget_factory->widgets as $wp_widget) {
+				$this->selective_refreshable_widgets[$wp_widget->id_base] = ! empty($wp_widget->widget_options['customize_selective_refresh']);
 			}
 		}
 		return $this->selective_refreshable_widgets;
@@ -157,9 +157,9 @@ 
 	 * @param string $id_base Widget ID Base.
 	 * @return bool Whether the widget can be selective refreshed.
 	 */
-	public function is_widget_selective_refreshable( $id_base ) {
+	public function is_widget_selective_refreshable($id_base) {
 		$selective_refreshable_widgets = $this->get_selective_refreshable_widgets();
-		return ! empty( $selective_refreshable_widgets[ $id_base ] );
+		return ! empty($selective_refreshable_widgets[$id_base]);
 	}
 
 	/**
@@ -173,14 +173,14 @@ 
 	 * @param string $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;
 			}
 		}
@@ -195,25 +195,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();
 			}
 		}
@@ -229,9 +229,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;
 	}
@@ -246,12 +246,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]);
 	}
 
 	/**
@@ -272,20 +272,20 @@ 
 	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' ) );
-		$this->manager->set_post_value( 'old_sidebars_widgets_data', $this->old_sidebars_widgets ); // Override any value cached in changeset.
+		add_filter('customize_value_old_sidebars_widgets_data', array($this, 'filter_customize_value_old_sidebars_widgets_data'));
+		$this->manager->set_post_value('old_sidebars_widgets_data', $this->old_sidebars_widgets); // Override any value cached in changeset.
 
 		// 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']);
 	}
 
 	/**
@@ -304,7 +304,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;
 	}
 
@@ -324,7 +324,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;
@@ -340,13 +340,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');
 	}
 
 	/**
@@ -359,10 +359,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'));
 		}
 	}
 
@@ -379,11 +379,11 @@ 
 	public function customize_register() {
 		global $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_sidebars;
 
-		add_filter( 'sidebars_widgets', array( $this, 'preview_sidebars_widgets' ), 1 );
+		add_filter('sidebars_widgets', array($this, 'preview_sidebars_widgets'), 1);
 
 		$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()
 		);
 
@@ -394,11 +394,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;
 		}
@@ -407,53 +407,53 @@ 
 		 * Add a setting which will be supplied for the theme's sidebars_widgets
 		 * theme_mod when 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(
+		$this->manager->add_panel('widgets', array(
 			'type'            => 'widgets',
-			'title'           => __( 'Widgets' ),
-			'description'     => __( 'Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars).' ),
+			'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,
-			'active_callback' => array( $this, 'is_panel_active' ),
+			'active_callback' => array($this, 'is_panel_active'),
 			'auto_expand_sole_section' => true,
-		) );
+		));
 
-		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 = is_registered_sidebar( $sidebar_id );
-			$is_inactive_widgets   = ( 'wp_inactive_widgets' === $sidebar_id );
-			$is_active_sidebar     = ( $is_registered_sidebar && ! $is_inactive_widgets );
+			$is_registered_sidebar = is_registered_sidebar($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,
 					);
@@ -467,35 +467,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,
@@ -504,15 +504,15 @@ 
 					'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();
 			}
 		}
 	}
@@ -530,7 +530,7 @@ 
 	 */
 	public function is_panel_active() {
 		global $wp_registered_sidebars;
-		return ! empty( $wp_registered_sidebars );
+		return ! empty($wp_registered_sidebars);
 	}
 
 	/**
@@ -542,12 +542,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;
 	}
@@ -570,13 +570,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);
 
 		/**
 		 * Filters whether the given widget is considered "wide".
@@ -586,7 +586,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);
 	}
 
 	/**
@@ -598,15 +598,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;
@@ -624,15 +624,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');
 	}
 
 	/**
@@ -644,10 +644,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');
 	}
 
 	/**
@@ -659,10 +659,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');
 	}
 
 	/**
@@ -678,11 +678,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
@@ -690,23 +690,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>
@@ -728,61 +728,61 @@ 
 		$some_non_rendered_areas_messages = array();
 		$some_non_rendered_areas_messages[1] = html_entity_decode(
 			/* translators: placeholder is the number of other widget areas registered but not rendered */
-			__( 'Your theme has 1 other widget area, but this particular page doesn&#8217;t display it.' ),
+			__('Your theme has 1 other widget area, but this particular page doesn&#8217;t display it.'),
 			ENT_QUOTES,
-			get_bloginfo( 'charset' )
+			get_bloginfo('charset')
 		);
-		$registered_sidebar_count = count( $wp_registered_sidebars );
-		for ( $non_rendered_count = 2; $non_rendered_count < $registered_sidebar_count; $non_rendered_count++ ) {
-			$some_non_rendered_areas_messages[ $non_rendered_count ] = html_entity_decode( sprintf(
+		$registered_sidebar_count = count($wp_registered_sidebars);
+		for ($non_rendered_count = 2; $non_rendered_count < $registered_sidebar_count; $non_rendered_count++) {
+			$some_non_rendered_areas_messages[$non_rendered_count] = html_entity_decode(sprintf(
 				/* translators: placeholder is the number of other widget areas registered but not rendered */
 				_n(
 					'Your theme has %s other widget area, but this particular page doesn&#8217;t display it.',
 					'Your theme has %s other widget areas, but this particular page doesn&#8217;t display them.',
 					$non_rendered_count
 				),
-				number_format_i18n( $non_rendered_count )
-			), ENT_QUOTES, get_bloginfo( 'charset' ) );
+				number_format_i18n($non_rendered_count)
+			), ENT_QUOTES, get_bloginfo('charset'));
 		}
 
-		if ( 1 === $registered_sidebar_count ) {
-			$no_areas_shown_message = html_entity_decode( sprintf(
+		if (1 === $registered_sidebar_count) {
+			$no_areas_shown_message = html_entity_decode(sprintf(
 				/* translators: placeholder is the total number of widget areas registered */
-				__( 'Your theme has 1 widget area, but this particular page doesn&#8217;t display it.' )
-			), ENT_QUOTES, get_bloginfo( 'charset' ) );
+				__('Your theme has 1 widget area, but this particular page doesn&#8217;t display it.')
+			), ENT_QUOTES, get_bloginfo('charset'));
 		} else {
-			$no_areas_shown_message = html_entity_decode( sprintf(
+			$no_areas_shown_message = html_entity_decode(sprintf(
 				/* translators: placeholder is the total number of widget areas registered */
 				_n(
 					'Your theme has %s widget area, but this particular page doesn&#8217;t display it.',
 					'Your theme has %s widget areas, but this particular page doesn&#8217;t display them.',
 					$registered_sidebar_count
 				),
-				number_format_i18n( $registered_sidebar_count )
-			), ENT_QUOTES, get_bloginfo( 'charset' ) );
+				number_format_i18n($registered_sidebar_count)
+			), ENT_QUOTES, get_bloginfo('charset'));
 		}
 
 		$settings = array(
-			'registeredSidebars'   => array_values( $wp_registered_sidebars ),
+			'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' ),
-				'navigatePreview'  => __( 'You can navigate to other pages on your site while using the Customizer to view and edit the widgets displayed on those pages.' ),
+				'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'),
+				'navigatePreview'  => __('You can navigate to other pages on your site while using the Customizer to view and edit the widgets displayed on those pages.'),
 				'someAreasShown'   => $some_non_rendered_areas_messages,
 				'noAreasShown'     => $no_areas_shown_message,
-				'reorderModeOn'    => __( 'Reorder mode enabled' ),
-				'reorderModeOff'   => __( 'Reorder mode closed' ),
-				'reorderLabelOn'   => esc_attr__( 'Reorder widgets' ),
+				'reorderModeOn'    => __('Reorder mode enabled'),
+				'reorderModeOff'   => __('Reorder mode closed'),
+				'reorderLabelOn'   => esc_attr__('Reorder widgets'),
 				/* translators: placeholder is the count for the number of widgets found */
-				'widgetsFound'     => __( 'Number of widgets found: %d' ),
-				'noWidgetsFound'   => __( 'No widgets found.' ),
+				'widgetsFound'     => __('Number of widgets found: %d'),
+				'noWidgetsFound'   => __('No widgets found.'),
 			),
 			'tpl' => array(
 				'widgetReorderNav' => $widget_reorder_nav_tpl,
@@ -791,14 +791,14 @@ 
 			'selectiveRefreshableWidgets' => $this->get_selective_refreshable_widgets(),
 		);
 
-		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))
 		);
 	}
 
@@ -814,30 +814,30 @@ 
 		<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="text" id="widgets-search" placeholder="<?php esc_attr_e( 'Search widgets&hellip;' ) ?>" aria-describedby="widgets-search-desc" />
+				<label class="screen-reader-text" for="widgets-search"><?php _e('Search Widgets'); ?></label>
+				<input type="text" id="widgets-search" placeholder="<?php esc_attr_e('Search widgets&hellip;') ?>" aria-describedby="widgets-search-desc" />
 				<div class="search-icon" aria-hidden="true"></div>
-				<button type="button" class="clear-results"><span class="screen-reader-text"><?php _e( 'Clear Results' ); ?></span></button>
-				<p class="screen-reader-text" id="widgets-search-desc"><?php _e( 'The search results will be updated as you type.' ); ?></p>
+				<button type="button" class="clear-results"><span class="screen-reader-text"><?php _e('Clear Results'); ?></span></button>
+				<p class="screen-reader-text" id="widgets-search-desc"><?php _e('The search results will be updated as you type.'); ?></p>
 			</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; ?>
-			<p class="no-widgets-found-message"><?php _e( 'No widgets found.' ); ?></p>
+			<p class="no-widgets-found-message"><?php _e('No widgets found.'); ?></p>
 			</div><!-- #available-widgets-list -->
 		</div><!-- #available-widgets -->
 		</div><!-- #widgets-left -->
@@ -853,13 +853,13 @@ 
 	 */
 	public function print_footer_scripts() {
 		/** This action is documented in wp-admin/admin-footer.php */
-		do_action( 'admin_print_footer_scripts-widgets.php' );
+		do_action('admin_print_footer_scripts-widgets.php');
 
 		/** 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');
 	}
 
 	/**
@@ -872,24 +872,24 @@ 
 	 * @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',
 			'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' );
-			$args['transport'] = current_theme_supports( 'customize-selective-refresh-widgets' ) ? 'postMessage' : 'refresh';
-		} 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['transport'] = $this->is_widget_selective_refreshable( $matches['id_base'] ) ? 'postMessage' : 'refresh';
+		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');
+			$args['transport'] = current_theme_supports('customize-selective-refresh-widgets') ? 'postMessage' : 'refresh';
+		} 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['transport'] = $this->is_widget_selective_refreshable($matches['id_base']) ? 'postMessage' : 'refresh';
 		}
 
-		$args = array_merge( $args, $overrides );
+		$args = array_merge($args, $overrides);
 
 		/**
 		 * Filters the common arguments supplied when constructing a Customizer setting.
@@ -901,7 +901,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);
 	}
 
 	/**
@@ -915,11 +915,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;
 	}
@@ -940,31 +940,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'],
@@ -973,37 +973,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'    => $this->is_widget_selective_refreshable( $id_base ) ? 'postMessage' : 'refresh',
+				'transport'    => $this->is_widget_selective_refreshable($id_base) ? 'postMessage' : '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;
 		}
@@ -1021,8 +1021,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']);
 	}
 
 	/**
@@ -1034,13 +1034,13 @@ 
 	 * @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) {
 		$args[0]['before_form'] = '<div class="form">';
 		$args[0]['after_form'] = '</div><!-- .form -->';
 		$args[0]['before_widget_content'] = '<div class="widget-content">';
 		$args[0]['after_widget_content'] = '</div><!-- .widget-content -->';
 		ob_start();
-		call_user_func_array( 'wp_widget_control', $args );
+		call_user_func_array('wp_widget_control', $args);
 		$control_tpl = ob_get_clean();
 		return $control_tpl;
 	}
@@ -1057,23 +1057,23 @@ 
 	 *     @type string $content The contents of the widget form itself.
 	 * }
 	 */
-	public function get_widget_control_parts( $args ) {
+	public function get_widget_control_parts($args) {
 		$args[0]['before_widget_content'] = '<div class="widget-content">';
 		$args[0]['after_widget_content'] = '</div><!-- .widget-content -->';
-		$control_markup = $this->get_widget_control( $args );
+		$control_markup = $this->get_widget_control($args);
 
-		$content_start_pos = strpos( $control_markup, $args[0]['before_widget_content'] );
-		$content_end_pos = strrpos( $control_markup, $args[0]['after_widget_content'] );
+		$content_start_pos = strpos($control_markup, $args[0]['before_widget_content']);
+		$content_end_pos = strrpos($control_markup, $args[0]['after_widget_content']);
 
-		$control = substr( $control_markup, 0, $content_start_pos + strlen( $args[0]['before_widget_content'] ) );
-		$control .= substr( $control_markup, $content_end_pos );
-		$content = trim( substr(
+		$control = substr($control_markup, 0, $content_start_pos + strlen($args[0]['before_widget_content']));
+		$control .= substr($control_markup, $content_end_pos);
+		$content = trim(substr(
 			$control_markup,
-			$content_start_pos + strlen( $args[0]['before_widget_content'] ),
-			$content_end_pos - $content_start_pos - strlen( $args[0]['before_widget_content'] )
-		) );
+			$content_start_pos + strlen($args[0]['before_widget_content']),
+			$content_end_pos - $content_start_pos - strlen($args[0]['before_widget_content'])
+		));
 
-		return compact( 'control', 'content' );
+		return compact('control', 'content');
 	}
 
 	/**
@@ -1083,9 +1083,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);
 	}
 
 	/**
@@ -1097,8 +1097,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;
 	}
 
@@ -1116,10 +1116,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', array() );
+	public function preview_sidebars_widgets($sidebars_widgets) {
+		$sidebars_widgets = get_option('sidebars_widgets', array());
 
-		unset( $sidebars_widgets['array_version'] );
+		unset($sidebars_widgets['array_version']);
 		return $sidebars_widgets;
 	}
 
@@ -1130,7 +1130,7 @@ 
 	 * @access public
 	 */
 	public function customize_preview_enqueue() {
-		wp_enqueue_script( 'customize-preview-widgets' );
+		wp_enqueue_script('customize-preview-widgets');
 	}
 
 	/**
@@ -1167,30 +1167,30 @@ 
 	public function export_preview_data() {
 		global $wp_registered_sidebars, $wp_registered_widgets;
 
-		$switched_locale = switch_to_locale( get_user_locale() );
+		$switched_locale = switch_to_locale(get_user_locale());
 		$l10n = array(
-			'widgetTooltip'  => __( 'Shift-click to edit this widget.' ),
+			'widgetTooltip'  => __('Shift-click to edit this widget.'),
 		);
-		if ( $switched_locale ) {
+		if ($switched_locale) {
 			restore_previous_locale();
 		}
 
 		// 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'               => $l10n,
 			'selectiveRefreshableWidgets' => $this->get_selective_refreshable_widgets(),
 		);
-		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
 	}
@@ -1203,8 +1203,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;
 	}
 
 	/**
@@ -1216,8 +1216,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);
 	}
 
 	/**
@@ -1229,8 +1229,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);
 	}
 
 	/**
@@ -1247,8 +1247,8 @@ 
 	 * @param string $sidebar_id Sidebar ID.
 	 * @return bool Whether the sidebar is active.
 	 */
-	public function tally_sidebars_via_is_active_sidebar_calls( $is_active, $sidebar_id ) {
-		if ( is_registered_sidebar( $sidebar_id ) ) {
+	public function tally_sidebars_via_is_active_sidebar_calls($is_active, $sidebar_id) {
+		if (is_registered_sidebar($sidebar_id)) {
 			$this->rendered_sidebars[] = $sidebar_id;
 		}
 		/*
@@ -1273,8 +1273,8 @@ 
 	 * @param string $sidebar_id  Sidebar ID.
 	 * @return bool Whether the current sidebar has widgets.
 	 */
-	public function tally_sidebars_via_dynamic_sidebar_calls( $has_widgets, $sidebar_id ) {
-		if ( is_registered_sidebar( $sidebar_id ) ) {
+	public function tally_sidebars_via_dynamic_sidebar_calls($has_widgets, $sidebar_id) {
+		if (is_registered_sidebar($sidebar_id)) {
 			$this->rendered_sidebars[] = $sidebar_id;
 		}
 
@@ -1298,8 +1298,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);
 	}
 
 	/**
@@ -1314,29 +1314,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;
 		}
 
@@ -1352,15 +1352,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;
@@ -1380,9 +1380,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;
 	}
 
@@ -1401,93 +1401,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;
 		}
@@ -1498,19 +1498,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, $this->sanitize_widget_js_instance( $instance ) );
+		$this->manager->set_post_value($setting_id, $this->sanitize_widget_js_instance($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');
 	}
 
 	/**
@@ -1528,53 +1528,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'));
 	}
 
 	/*
@@ -1591,22 +1591,22 @@ 
 	 * @param string      $partial_id   Partial ID.
 	 * @return array (Maybe) modified partial arguments.
 	 */
-	public function customize_dynamic_partial_args( $partial_args, $partial_id ) {
-		if ( ! current_theme_supports( 'customize-selective-refresh-widgets' ) ) {
+	public function customize_dynamic_partial_args($partial_args, $partial_id) {
+		if ( ! current_theme_supports('customize-selective-refresh-widgets')) {
 			return $partial_args;
 		}
 
-		if ( preg_match( '/^widget\[(?P<widget_id>.+)\]$/', $partial_id, $matches ) ) {
-			if ( false === $partial_args ) {
+		if (preg_match('/^widget\[(?P<widget_id>.+)\]$/', $partial_id, $matches)) {
+			if (false === $partial_args) {
 				$partial_args = array();
 			}
 			$partial_args = array_merge(
 				$partial_args,
 				array(
 					'type'                => 'widget',
-					'render_callback'     => array( $this, 'render_widget_partial' ),
+					'render_callback'     => array($this, 'render_widget_partial'),
 					'container_inclusive' => true,
-					'settings'            => array( $this->get_setting_id( $matches['widget_id'] ) ),
+					'settings'            => array($this->get_setting_id($matches['widget_id'])),
 					'capability'          => 'edit_theme_options',
 				)
 			);
@@ -1622,13 +1622,13 @@ 
 	 * @access public
 	 */
 	public function selective_refresh_init() {
-		if ( ! current_theme_supports( 'customize-selective-refresh-widgets' ) ) {
+		if ( ! current_theme_supports('customize-selective-refresh-widgets')) {
 			return;
 		}
-		add_filter( 'dynamic_sidebar_params', array( $this, 'filter_dynamic_sidebar_params' ) );
-		add_filter( 'wp_kses_allowed_html', array( $this, 'filter_wp_kses_allowed_data_attributes' ) );
-		add_action( 'dynamic_sidebar_before', array( $this, 'start_dynamic_sidebar' ) );
-		add_action( 'dynamic_sidebar_after', array( $this, 'end_dynamic_sidebar' ) );
+		add_filter('dynamic_sidebar_params', array($this, 'filter_dynamic_sidebar_params'));
+		add_filter('wp_kses_allowed_html', array($this, 'filter_wp_kses_allowed_data_attributes'));
+		add_action('dynamic_sidebar_before', array($this, 'start_dynamic_sidebar'));
+		add_action('dynamic_sidebar_after', array($this, 'end_dynamic_sidebar'));
 	}
 
 	/**
@@ -1644,7 +1644,7 @@ 
 	 *
 	 * @return array Params.
 	 */
-	public function filter_dynamic_sidebar_params( $params ) {
+	public function filter_dynamic_sidebar_params($params) {
 		$sidebar_args = array_merge(
 			array(
 				'before_widget' => '',
@@ -1656,33 +1656,33 @@ 
 		// Skip widgets not in a registered sidebar or ones which lack a proper wrapper element to attach the data-* attributes to.
 		$matches = array();
 		$is_valid = (
-			isset( $sidebar_args['id'] )
+			isset($sidebar_args['id'])
 			&&
-			is_registered_sidebar( $sidebar_args['id'] )
+			is_registered_sidebar($sidebar_args['id'])
 			&&
-			( isset( $this->current_dynamic_sidebar_id_stack[0] ) && $this->current_dynamic_sidebar_id_stack[0] === $sidebar_args['id'] )
+			(isset($this->current_dynamic_sidebar_id_stack[0]) && $this->current_dynamic_sidebar_id_stack[0] === $sidebar_args['id'])
 			&&
-			preg_match( '#^<(?P<tag_name>\w+)#', $sidebar_args['before_widget'], $matches )
+			preg_match('#^<(?P<tag_name>\w+)#', $sidebar_args['before_widget'], $matches)
 		);
-		if ( ! $is_valid ) {
+		if ( ! $is_valid) {
 			return $params;
 		}
-		$this->before_widget_tags_seen[ $matches['tag_name'] ] = true;
+		$this->before_widget_tags_seen[$matches['tag_name']] = true;
 
 		$context = array(
 			'sidebar_id' => $sidebar_args['id'],
 		);
-		if ( isset( $this->context_sidebar_instance_number ) ) {
+		if (isset($this->context_sidebar_instance_number)) {
 			$context['sidebar_instance_number'] = $this->context_sidebar_instance_number;
-		} else if ( isset( $sidebar_args['id'] ) && isset( $this->sidebar_instance_count[ $sidebar_args['id'] ] ) ) {
-			$context['sidebar_instance_number'] = $this->sidebar_instance_count[ $sidebar_args['id'] ];
+		} else if (isset($sidebar_args['id']) && isset($this->sidebar_instance_count[$sidebar_args['id']])) {
+			$context['sidebar_instance_number'] = $this->sidebar_instance_count[$sidebar_args['id']];
 		}
 
-		$attributes = sprintf( ' data-customize-partial-id="%s"', esc_attr( 'widget[' . $sidebar_args['widget_id'] . ']' ) );
+		$attributes = sprintf(' data-customize-partial-id="%s"', esc_attr('widget['.$sidebar_args['widget_id'].']'));
 		$attributes .= ' data-customize-partial-type="widget"';
-		$attributes .= sprintf( ' data-customize-partial-placement-context="%s"', esc_attr( wp_json_encode( $context ) ) );
-		$attributes .= sprintf( ' data-customize-widget-id="%s"', esc_attr( $sidebar_args['widget_id'] ) );
-		$sidebar_args['before_widget'] = preg_replace( '#^(<\w+)#', '$1 ' . $attributes, $sidebar_args['before_widget'] );
+		$attributes .= sprintf(' data-customize-partial-placement-context="%s"', esc_attr(wp_json_encode($context)));
+		$attributes .= sprintf(' data-customize-widget-id="%s"', esc_attr($sidebar_args['widget_id']));
+		$sidebar_args['before_widget'] = preg_replace('#^(<\w+)#', '$1 '.$attributes, $sidebar_args['before_widget']);
 
 		$params[0] = $sidebar_args;
 		return $params;
@@ -1711,20 +1711,20 @@ 
 	 * @param array $allowed_html Allowed HTML.
 	 * @return array (Maybe) modified allowed HTML.
 	 */
-	public function filter_wp_kses_allowed_data_attributes( $allowed_html ) {
-		foreach ( array_keys( $this->before_widget_tags_seen ) as $tag_name ) {
-			if ( ! isset( $allowed_html[ $tag_name ] ) ) {
-				$allowed_html[ $tag_name ] = array();
+	public function filter_wp_kses_allowed_data_attributes($allowed_html) {
+		foreach (array_keys($this->before_widget_tags_seen) as $tag_name) {
+			if ( ! isset($allowed_html[$tag_name])) {
+				$allowed_html[$tag_name] = array();
 			}
-			$allowed_html[ $tag_name ] = array_merge(
-				$allowed_html[ $tag_name ],
-				array_fill_keys( array(
+			$allowed_html[$tag_name] = array_merge(
+				$allowed_html[$tag_name],
+				array_fill_keys(array(
 					'data-customize-partial-id',
 					'data-customize-partial-type',
 					'data-customize-partial-placement-context',
 					'data-customize-partial-widget-id',
 					'data-customize-partial-options',
-				), true )
+				), true)
 			);
 		}
 		return $allowed_html;
@@ -1769,14 +1769,14 @@ 
 	 *
 	 * @param int|string $index Index, name, or ID of the dynamic sidebar.
 	 */
-	public function start_dynamic_sidebar( $index ) {
-		array_unshift( $this->current_dynamic_sidebar_id_stack, $index );
-		if ( ! isset( $this->sidebar_instance_count[ $index ] ) ) {
-			$this->sidebar_instance_count[ $index ] = 0;
+	public function start_dynamic_sidebar($index) {
+		array_unshift($this->current_dynamic_sidebar_id_stack, $index);
+		if ( ! isset($this->sidebar_instance_count[$index])) {
+			$this->sidebar_instance_count[$index] = 0;
 		}
-		$this->sidebar_instance_count[ $index ] += 1;
-		if ( ! $this->manager->selective_refresh->is_render_partials_request() ) {
-			printf( "\n<!--dynamic_sidebar_before:%s:%d-->\n", esc_html( $index ), intval( $this->sidebar_instance_count[ $index ] ) );
+		$this->sidebar_instance_count[$index] += 1;
+		if ( ! $this->manager->selective_refresh->is_render_partials_request()) {
+			printf("\n<!--dynamic_sidebar_before:%s:%d-->\n", esc_html($index), intval($this->sidebar_instance_count[$index]));
 		}
 	}
 
@@ -1790,10 +1790,10 @@ 
 	 *
 	 * @param int|string $index Index, name, or ID of the dynamic sidebar.
 	 */
-	public function end_dynamic_sidebar( $index ) {
-		array_shift( $this->current_dynamic_sidebar_id_stack );
-		if ( ! $this->manager->selective_refresh->is_render_partials_request() ) {
-			printf( "\n<!--dynamic_sidebar_after:%s:%d-->\n", esc_html( $index ), intval( $this->sidebar_instance_count[ $index ] ) );
+	public function end_dynamic_sidebar($index) {
+		array_shift($this->current_dynamic_sidebar_id_stack);
+		if ( ! $this->manager->selective_refresh->is_render_partials_request()) {
+			printf("\n<!--dynamic_sidebar_after:%s:%d-->\n", esc_html($index), intval($this->sidebar_instance_count[$index]));
 		}
 	}
 
@@ -1824,8 +1824,8 @@ 
 	 * @param array $sidebars_widgets Sidebars widgets.
 	 * @return array Filtered sidebars widgets.
 	 */
-	public function filter_sidebars_widgets_for_rendering_widget( $sidebars_widgets ) {
-		$sidebars_widgets[ $this->rendering_sidebar_id ] = array( $this->rendering_widget_id );
+	public function filter_sidebars_widgets_for_rendering_widget($sidebars_widgets) {
+		$sidebars_widgets[$this->rendering_sidebar_id] = array($this->rendering_widget_id);
 		return $sidebars_widgets;
 	}
 
@@ -1846,36 +1846,36 @@ 
 	 * }
 	 * @return string|false
 	 */
-	public function render_widget_partial( $partial, $context ) {
+	public function render_widget_partial($partial, $context) {
 		$id_data   = $partial->id_data();
-		$widget_id = array_shift( $id_data['keys'] );
+		$widget_id = array_shift($id_data['keys']);
 
-		if ( ! is_array( $context )
-			|| empty( $context['sidebar_id'] )
-			|| ! is_registered_sidebar( $context['sidebar_id'] )
+		if ( ! is_array($context)
+			|| empty($context['sidebar_id'])
+			|| ! is_registered_sidebar($context['sidebar_id'])
 		) {
 			return false;
 		}
 
 		$this->rendering_sidebar_id = $context['sidebar_id'];
 
-		if ( isset( $context['sidebar_instance_number'] ) ) {
-			$this->context_sidebar_instance_number = intval( $context['sidebar_instance_number'] );
+		if (isset($context['sidebar_instance_number'])) {
+			$this->context_sidebar_instance_number = intval($context['sidebar_instance_number']);
 		}
 
 		// Filter sidebars_widgets so that only the queried widget is in the sidebar.
 		$this->rendering_widget_id = $widget_id;
 
-		$filter_callback = array( $this, 'filter_sidebars_widgets_for_rendering_widget' );
-		add_filter( 'sidebars_widgets', $filter_callback, 1000 );
+		$filter_callback = array($this, 'filter_sidebars_widgets_for_rendering_widget');
+		add_filter('sidebars_widgets', $filter_callback, 1000);
 
 		// Render the widget.
 		ob_start();
-		dynamic_sidebar( $this->rendering_sidebar_id = $context['sidebar_id'] );
+		dynamic_sidebar($this->rendering_sidebar_id = $context['sidebar_id']);
 		$container = ob_get_clean();
 
 		// Reset variables for next partial render.
-		remove_filter( 'sidebars_widgets', $filter_callback, 1000 );
+		remove_filter('sidebars_widgets', $filter_callback, 1000);
 
 		$this->context_sidebar_instance_number = null;
 		$this->rendering_sidebar_id = null;
@@ -1915,8 +1915,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_'));
 	}
 
 	/**
@@ -1941,9 +1941,9 @@ 
 	 * @param mixed  $default     Optional. Default value to return if the option does not exist. Default false.
 	 * @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;
 		}
@@ -1959,7 +1959,7 @@ 
 	 * @return int Number of updated options.
 	 */
 	protected function count_captured_options() {
-		return count( $this->_captured_options );
+		return count($this->_captured_options);
 	}
 
 	/**
@@ -1969,13 +1969,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);
 	}
 
 	/**
@@ -1989,16 +1989,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;
 	}
@@ -2012,14 +2012,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;
@@ -2032,14 +2032,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 );
+		remove_filter('pre_update_option', array($this, 'capture_filter_pre_update_option'), 10);
 
-		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();
@@ -2055,7 +2055,7 @@ 
 	 * @deprecated 4.2.0 Deprecated in favor of the {@see 'customize_dynamic_setting_args'} filter.
 	 */
 	public function setup_widget_addition_previews() {
-		_deprecated_function( __METHOD__, '4.2.0' );
+		_deprecated_function(__METHOD__, '4.2.0');
 	}
 
 	/**
@@ -2067,7 +2067,7 @@ 
 	 * @deprecated 4.2.0 Deprecated in favor of the {@see 'customize_dynamic_setting_args'} filter.
 	 */
 	public function prepreview_added_sidebars_widgets() {
-		_deprecated_function( __METHOD__, '4.2.0' );
+		_deprecated_function(__METHOD__, '4.2.0');
 	}
 
 	/**
@@ -2079,7 +2079,7 @@ 
 	 * @deprecated 4.2.0 Deprecated in favor of the {@see 'customize_dynamic_setting_args'} filter.
 	 */
 	public function prepreview_added_widget_instance() {
-		_deprecated_function( __METHOD__, '4.2.0' );
+		_deprecated_function(__METHOD__, '4.2.0');
 	}
 
 	/**
@@ -2091,6 +2091,6 @@ 
 	 * @deprecated 4.2.0 Deprecated in favor of the {@see '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-post.php

Doc Comments +1 added lines, -1 removed lines

@@ -205,7 +205,7 @@
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
 	 * @param int $post_id Post ID.
-	 * @return WP_Post|false Post object, false otherwise.
+	 * @return string Post object, false otherwise.
 	 */
 	public static function get_instance( $post_id ) {
 		global $wpdb;

Braces +47 added lines, -32 removed lines

@@ -221,8 +221,9 @@ 
 		if ( ! $_post ) {
 			$_post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id ) );
 
-			if ( ! $_post )
-				return false;
+			if ( ! $_post ) {
+							return false;
+			}
 
 			$_post = sanitize_post( $_post, 'raw' );
 			wp_cache_add( $_post->ID, $_post, 'posts' );
@@ -239,8 +240,9 @@ 
 	 * @param WP_Post|object $post Post object.
 	 */
 	public function __construct( $post ) {
-		foreach ( get_object_vars( $post ) as $key => $value )
-			$this->$key = $value;
+		foreach ( get_object_vars( $post ) as $key => $value ) {
+					$this->$key = $value;
+		}
 	}
 
 	/**
@@ -250,17 +252,21 @@ 
 	 * @return bool
 	 */
 	public function __isset( $key ) {
-		if ( 'ancestors' == $key )
-			return true;
+		if ( 'ancestors' == $key ) {
+					return true;
+		}
 
-		if ( 'page_template' == $key )
-			return true;
+		if ( 'page_template' == $key ) {
+					return true;
+		}
 
-		if ( 'post_category' == $key )
-		   return true;
+		if ( 'post_category' == $key ) {
+				   return true;
+		}
 
-		if ( 'tags_input' == $key )
-		   return true;
+		if ( 'tags_input' == $key ) {
+				   return true;
+		}
 
 		return metadata_exists( 'post', $this->ID, $key );
 	}
@@ -277,33 +283,39 @@ 
 		}
 
 		if ( 'post_category' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'category' ) )
-				$terms = get_the_terms( $this, 'category' );
+			if ( is_object_in_taxonomy( $this->post_type, 'category' ) ) {
+							$terms = get_the_terms( $this, 'category' );
+			}
 
-			if ( empty( $terms ) )
-				return array();
+			if ( empty( $terms ) ) {
+							return array();
+			}
 
 			return wp_list_pluck( $terms, 'term_id' );
 		}
 
 		if ( 'tags_input' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) )
-				$terms = get_the_terms( $this, 'post_tag' );
+			if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) ) {
+							$terms = get_the_terms( $this, 'post_tag' );
+			}
 
-			if ( empty( $terms ) )
-				return array();
+			if ( empty( $terms ) ) {
+							return array();
+			}
 
 			return wp_list_pluck( $terms, 'name' );
 		}
 
 		// Rest of the values need filtering.
-		if ( 'ancestors' == $key )
-			$value = get_post_ancestors( $this );
-		else
-			$value = get_post_meta( $this->ID, $key, true );
+		if ( 'ancestors' == $key ) {
+					$value = get_post_ancestors( $this );
+		} else {
+					$value = get_post_meta( $this->ID, $key, true );
+		}
 
-		if ( $this->filter )
-			$value = sanitize_post_field( $key, $value, $this->ID, $this->filter );
+		if ( $this->filter ) {
+					$value = sanitize_post_field( $key, $value, $this->ID, $this->filter );
+		}
 
 		return $value;
 	}
@@ -315,11 +327,13 @@ 
 	 * @return self|array|bool|object|WP_Post
 	 */
 	public function filter( $filter ) {
-		if ( $this->filter == $filter )
-			return $this;
+		if ( $this->filter == $filter ) {
+					return $this;
+		}
 
-		if ( $filter == 'raw' )
-			return self::get_instance( $this->ID );
+		if ( $filter == 'raw' ) {
+					return self::get_instance( $this->ID );
+		}
 
 		return sanitize_post( $this, $filter );
 	}
@@ -333,8 +347,9 @@ 
 		$post = get_object_vars( $this );
 
 		foreach ( array( 'ancestors', 'page_template', 'post_category', 'tags_input' ) as $key ) {
-			if ( $this->__isset( $key ) )
-				$post[ $key ] = $this->__get( $key );
+			if ( $this->__isset( $key ) ) {
+							$post[ $key ] = $this->__get( $key );
+			}
 		}
 
 		return $post;

Spacing +46 added lines, -46 removed lines

@@ -207,29 +207,29 @@ 
 	 * @param int $post_id Post ID.
 	 * @return WP_Post|false Post object, false otherwise.
 	 */
-	public static function get_instance( $post_id ) {
+	public static function get_instance($post_id) {
 		global $wpdb;
 
 		$post_id = (int) $post_id;
-		if ( ! $post_id ) {
+		if ( ! $post_id) {
 			return false;
 		}
 
-		$_post = wp_cache_get( $post_id, 'posts' );
+		$_post = wp_cache_get($post_id, 'posts');
 
-		if ( ! $_post ) {
-			$_post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id ) );
+		if ( ! $_post) {
+			$_post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id));
 
-			if ( ! $_post )
+			if ( ! $_post)
 				return false;
 
-			$_post = sanitize_post( $_post, 'raw' );
-			wp_cache_add( $_post->ID, $_post, 'posts' );
-		} elseif ( empty( $_post->filter ) ) {
-			$_post = sanitize_post( $_post, 'raw' );
+			$_post = sanitize_post($_post, 'raw');
+			wp_cache_add($_post->ID, $_post, 'posts');
+		} elseif (empty($_post->filter)) {
+			$_post = sanitize_post($_post, 'raw');
 		}
 
-		return new WP_Post( $_post );
+		return new WP_Post($_post);
 	}
 
 	/**
@@ -237,8 +237,8 @@ 
 	 *
 	 * @param WP_Post|object $post Post object.
 	 */
-	public function __construct( $post ) {
-		foreach ( get_object_vars( $post ) as $key => $value )
+	public function __construct($post) {
+		foreach (get_object_vars($post) as $key => $value)
 			$this->$key = $value;
 	}
 
@@ -248,20 +248,20 @@ 
 	 * @param string $key Property to check if set.
 	 * @return bool
 	 */
-	public function __isset( $key ) {
-		if ( 'ancestors' == $key )
+	public function __isset($key) {
+		if ('ancestors' == $key)
 			return true;
 
-		if ( 'page_template' == $key )
+		if ('page_template' == $key)
 			return true;
 
-		if ( 'post_category' == $key )
+		if ('post_category' == $key)
 		   return true;
 
-		if ( 'tags_input' == $key )
+		if ('tags_input' == $key)
 		   return true;
 
-		return metadata_exists( 'post', $this->ID, $key );
+		return metadata_exists('post', $this->ID, $key);
 	}
 
 	/**
@@ -270,39 +270,39 @@ 
 	 * @param string $key Key to get.
 	 * @return mixed
 	 */
-	public function __get( $key ) {
-		if ( 'page_template' == $key && $this->__isset( $key ) ) {
-			return get_post_meta( $this->ID, '_wp_page_template', true );
+	public function __get($key) {
+		if ('page_template' == $key && $this->__isset($key)) {
+			return get_post_meta($this->ID, '_wp_page_template', true);
 		}
 
-		if ( 'post_category' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'category' ) )
-				$terms = get_the_terms( $this, 'category' );
+		if ('post_category' == $key) {
+			if (is_object_in_taxonomy($this->post_type, 'category'))
+				$terms = get_the_terms($this, 'category');
 
-			if ( empty( $terms ) )
+			if (empty($terms))
 				return array();
 
-			return wp_list_pluck( $terms, 'term_id' );
+			return wp_list_pluck($terms, 'term_id');
 		}
 
-		if ( 'tags_input' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) )
-				$terms = get_the_terms( $this, 'post_tag' );
+		if ('tags_input' == $key) {
+			if (is_object_in_taxonomy($this->post_type, 'post_tag'))
+				$terms = get_the_terms($this, 'post_tag');
 
-			if ( empty( $terms ) )
+			if (empty($terms))
 				return array();
 
-			return wp_list_pluck( $terms, 'name' );
+			return wp_list_pluck($terms, 'name');
 		}
 
 		// Rest of the values need filtering.
-		if ( 'ancestors' == $key )
-			$value = get_post_ancestors( $this );
+		if ('ancestors' == $key)
+			$value = get_post_ancestors($this);
 		else
-			$value = get_post_meta( $this->ID, $key, true );
+			$value = get_post_meta($this->ID, $key, true);
 
-		if ( $this->filter )
-			$value = sanitize_post_field( $key, $value, $this->ID, $this->filter );
+		if ($this->filter)
+			$value = sanitize_post_field($key, $value, $this->ID, $this->filter);
 
 		return $value;
 	}
@@ -313,14 +313,14 @@ 
 	 * @param string $filter Filter.
 	 * @return self|array|bool|object|WP_Post
 	 */
-	public function filter( $filter ) {
-		if ( $this->filter == $filter )
+	public function filter($filter) {
+		if ($this->filter == $filter)
 			return $this;
 
-		if ( $filter == 'raw' )
-			return self::get_instance( $this->ID );
+		if ($filter == 'raw')
+			return self::get_instance($this->ID);
 
-		return sanitize_post( $this, $filter );
+		return sanitize_post($this, $filter);
 	}
 
 	/**
@@ -329,11 +329,11 @@ 
 	 * @return array Object as array.
 	 */
 	public function to_array() {
-		$post = get_object_vars( $this );
+		$post = get_object_vars($this);
 
-		foreach ( array( 'ancestors', 'page_template', 'post_category', 'tags_input' ) as $key ) {
-			if ( $this->__isset( $key ) )
-				$post[ $key ] = $this->__get( $key );
+		foreach (array('ancestors', 'page_template', 'post_category', 'tags_input') as $key) {
+			if ($this->__isset($key))
+				$post[$key] = $this->__get($key);
 		}
 
 		return $post;

src/wp-includes/class-wp-user-query.php

Doc Comments +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
 	 * @access public
 	 *
 	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
+	 * @return boolean|null Whether the property is set.
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields ) ) {

Spacing +191 added lines, -191 removed lines

@@ -61,7 +61,7 @@ 
 	 */
 	public $request;
 
-	private $compat_fields = array( 'results', 'total_users' );
+	private $compat_fields = array('results', 'total_users');
 
 	// SQL clauses
 	public $query_fields;
@@ -77,9 +77,9 @@ 
 	 *
 	 * @param null|string|array $query Optional. The query variables.
 	 */
-	public function __construct( $query = null ) {
-		if ( ! empty( $query ) ) {
-			$this->prepare_query( $query );
+	public function __construct($query = null) {
+		if ( ! empty($query)) {
+			$this->prepare_query($query);
 			$this->query();
 		}
 	}
@@ -93,7 +93,7 @@ 
 	 * @param array $args Query vars, as passed to `WP_User_Query`.
 	 * @return array Complete query variables with undefined ones filled in with defaults.
 	 */
-	public static function fill_query_vars( $args ) {
+	public static function fill_query_vars($args) {
 		$defaults = array(
 			'blog_id' => get_current_blog_id(),
 			'role' => '',
@@ -123,7 +123,7 @@ 
 			'login__not_in' => array()
 		);
 
-		return wp_parse_args( $args, $defaults );
+		return wp_parse_args($args, $defaults);
 	}
 
 	/**
@@ -215,12 +215,12 @@ 
 	 *                                             logins will not be included in results. Default empty array.
 	 * }
 	 */
-	public function prepare_query( $query = array() ) {
+	public function prepare_query($query = array()) {
 		global $wpdb;
 
-		if ( empty( $this->query_vars ) || ! empty( $query ) ) {
+		if (empty($this->query_vars) || ! empty($query)) {
 			$this->query_limit = null;
-			$this->query_vars = $this->fill_query_vars( $query );
+			$this->query_vars = $this->fill_query_vars($query);
 		}
 
 		/**
@@ -234,101 +234,101 @@ 
 		 * @param WP_User_Query $this The current WP_User_Query instance,
 		 *                            passed by reference.
 		 */
-		do_action( 'pre_get_users', $this );
+		do_action('pre_get_users', $this);
 
 		// Ensure that query vars are filled after 'pre_get_users'.
-		$qv =& $this->query_vars;
-		$qv =  $this->fill_query_vars( $qv );
+		$qv = & $this->query_vars;
+		$qv = $this->fill_query_vars($qv);
 
-		if ( is_array( $qv['fields'] ) ) {
-			$qv['fields'] = array_unique( $qv['fields'] );
+		if (is_array($qv['fields'])) {
+			$qv['fields'] = array_unique($qv['fields']);
 
 			$this->query_fields = array();
-			foreach ( $qv['fields'] as $field ) {
-				$field = 'ID' === $field ? 'ID' : sanitize_key( $field );
+			foreach ($qv['fields'] as $field) {
+				$field = 'ID' === $field ? 'ID' : sanitize_key($field);
 				$this->query_fields[] = "$wpdb->users.$field";
 			}
-			$this->query_fields = implode( ',', $this->query_fields );
-		} elseif ( 'all' == $qv['fields'] ) {
+			$this->query_fields = implode(',', $this->query_fields);
+		} elseif ('all' == $qv['fields']) {
 			$this->query_fields = "$wpdb->users.*";
 		} else {
 			$this->query_fields = "$wpdb->users.ID";
 		}
 
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+		if (isset($qv['count_total']) && $qv['count_total'])
+			$this->query_fields = 'SQL_CALC_FOUND_ROWS '.$this->query_fields;
 
 		$this->query_from = "FROM $wpdb->users";
 		$this->query_where = "WHERE 1=1";
 
 		// Parse and sanitize 'include', for use by 'orderby' as well as 'include' below.
-		if ( ! empty( $qv['include'] ) ) {
-			$include = wp_parse_id_list( $qv['include'] );
+		if ( ! empty($qv['include'])) {
+			$include = wp_parse_id_list($qv['include']);
 		} else {
 			$include = false;
 		}
 
 		$blog_id = 0;
-		if ( isset( $qv['blog_id'] ) ) {
-			$blog_id = absint( $qv['blog_id'] );
+		if (isset($qv['blog_id'])) {
+			$blog_id = absint($qv['blog_id']);
 		}
 
-		if ( $qv['has_published_posts'] && $blog_id ) {
-			if ( true === $qv['has_published_posts'] ) {
-				$post_types = get_post_types( array( 'public' => true ) );
+		if ($qv['has_published_posts'] && $blog_id) {
+			if (true === $qv['has_published_posts']) {
+				$post_types = get_post_types(array('public' => true));
 			} else {
 				$post_types = (array) $qv['has_published_posts'];
 			}
 
-			foreach ( $post_types as &$post_type ) {
-				$post_type = $wpdb->prepare( '%s', $post_type );
+			foreach ($post_types as &$post_type) {
+				$post_type = $wpdb->prepare('%s', $post_type);
 			}
 
-			$posts_table = $wpdb->get_blog_prefix( $blog_id ) . 'posts';
-			$this->query_where .= " AND $wpdb->users.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( " . join( ", ", $post_types ) . " ) )";
+			$posts_table = $wpdb->get_blog_prefix($blog_id).'posts';
+			$this->query_where .= " AND $wpdb->users.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( ".join(", ", $post_types)." ) )";
 		}
 
 		// nicename
-		if ( '' !== $qv['nicename']) {
-			$this->query_where .= $wpdb->prepare( ' AND user_nicename = %s', $qv['nicename'] );
+		if ('' !== $qv['nicename']) {
+			$this->query_where .= $wpdb->prepare(' AND user_nicename = %s', $qv['nicename']);
 		}
 
-		if ( ! empty( $qv['nicename__in'] ) ) {
-			$sanitized_nicename__in = array_map( 'esc_sql', $qv['nicename__in'] );
-			$nicename__in = implode( "','", $sanitized_nicename__in );
+		if ( ! empty($qv['nicename__in'])) {
+			$sanitized_nicename__in = array_map('esc_sql', $qv['nicename__in']);
+			$nicename__in = implode("','", $sanitized_nicename__in);
 			$this->query_where .= " AND user_nicename IN ( '$nicename__in' )";
 		}
 
-		if ( ! empty( $qv['nicename__not_in'] ) ) {
-			$sanitized_nicename__not_in = array_map( 'esc_sql', $qv['nicename__not_in'] );
-			$nicename__not_in = implode( "','", $sanitized_nicename__not_in );
+		if ( ! empty($qv['nicename__not_in'])) {
+			$sanitized_nicename__not_in = array_map('esc_sql', $qv['nicename__not_in']);
+			$nicename__not_in = implode("','", $sanitized_nicename__not_in);
 			$this->query_where .= " AND user_nicename NOT IN ( '$nicename__not_in' )";
 		}
 
 		// login
-		if ( '' !== $qv['login']) {
-			$this->query_where .= $wpdb->prepare( ' AND user_login = %s', $qv['login'] );
+		if ('' !== $qv['login']) {
+			$this->query_where .= $wpdb->prepare(' AND user_login = %s', $qv['login']);
 		}
 
-		if ( ! empty( $qv['login__in'] ) ) {
-			$sanitized_login__in = array_map( 'esc_sql', $qv['login__in'] );
-			$login__in = implode( "','", $sanitized_login__in );
+		if ( ! empty($qv['login__in'])) {
+			$sanitized_login__in = array_map('esc_sql', $qv['login__in']);
+			$login__in = implode("','", $sanitized_login__in);
 			$this->query_where .= " AND user_login IN ( '$login__in' )";
 		}
 
-		if ( ! empty( $qv['login__not_in'] ) ) {
-			$sanitized_login__not_in = array_map( 'esc_sql', $qv['login__not_in'] );
-			$login__not_in = implode( "','", $sanitized_login__not_in );
+		if ( ! empty($qv['login__not_in'])) {
+			$sanitized_login__not_in = array_map('esc_sql', $qv['login__not_in']);
+			$login__not_in = implode("','", $sanitized_login__not_in);
 			$this->query_where .= " AND user_login NOT IN ( '$login__not_in' )";
 		}
 
 		// Meta query.
 		$this->meta_query = new WP_Meta_Query();
-		$this->meta_query->parse_query_vars( $qv );
+		$this->meta_query->parse_query_vars($qv);
 
-		if ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
+		if (isset($qv['who']) && 'authors' == $qv['who'] && $blog_id) {
 			$who_query = array(
-				'key' => $wpdb->get_blog_prefix( $blog_id ) . 'user_level',
+				'key' => $wpdb->get_blog_prefix($blog_id).'user_level',
 				'value' => 0,
 				'compare' => '!=',
 			);
@@ -336,47 +336,47 @@ 
 			// Prevent extra meta query.
 			$qv['blog_id'] = $blog_id = 0;
 
-			if ( empty( $this->meta_query->queries ) ) {
-				$this->meta_query->queries = array( $who_query );
+			if (empty($this->meta_query->queries)) {
+				$this->meta_query->queries = array($who_query);
 			} else {
 				// Append the cap query to the original queries and reparse the query.
 				$this->meta_query->queries = array(
 					'relation' => 'AND',
-					array( $this->meta_query->queries, $who_query ),
+					array($this->meta_query->queries, $who_query),
 				);
 			}
 
-			$this->meta_query->parse_query_vars( $this->meta_query->queries );
+			$this->meta_query->parse_query_vars($this->meta_query->queries);
 		}
 
 		$roles = array();
-		if ( isset( $qv['role'] ) ) {
-			if ( is_array( $qv['role'] ) ) {
+		if (isset($qv['role'])) {
+			if (is_array($qv['role'])) {
 				$roles = $qv['role'];
-			} elseif ( is_string( $qv['role'] ) && ! empty( $qv['role'] ) ) {
-				$roles = array_map( 'trim', explode( ',', $qv['role'] ) );
+			} elseif (is_string($qv['role']) && ! empty($qv['role'])) {
+				$roles = array_map('trim', explode(',', $qv['role']));
 			}
 		}
 
 		$role__in = array();
-		if ( isset( $qv['role__in'] ) ) {
+		if (isset($qv['role__in'])) {
 			$role__in = (array) $qv['role__in'];
 		}
 
 		$role__not_in = array();
-		if ( isset( $qv['role__not_in'] ) ) {
+		if (isset($qv['role__not_in'])) {
 			$role__not_in = (array) $qv['role__not_in'];
 		}
 
-		if ( $blog_id && ( ! empty( $roles ) || ! empty( $role__in ) || ! empty( $role__not_in ) || is_multisite() ) ) {
+		if ($blog_id && ( ! empty($roles) || ! empty($role__in) || ! empty($role__not_in) || is_multisite())) {
 			$role_queries  = array();
 
-			$roles_clauses = array( 'relation' => 'AND' );
-			if ( ! empty( $roles ) ) {
-				foreach ( $roles as $role ) {
+			$roles_clauses = array('relation' => 'AND');
+			if ( ! empty($roles)) {
+				foreach ($roles as $role) {
 					$roles_clauses[] = array(
-						'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
-						'value'   => '"' . $role . '"',
+						'key'     => $wpdb->get_blog_prefix($blog_id).'capabilities',
+						'value'   => '"'.$role.'"',
 						'compare' => 'LIKE',
 					);
 				}
@@ -384,12 +384,12 @@ 
 				$role_queries[] = $roles_clauses;
 			}
 
-			$role__in_clauses = array( 'relation' => 'OR' );
-			if ( ! empty( $role__in ) ) {
-				foreach ( $role__in as $role ) {
+			$role__in_clauses = array('relation' => 'OR');
+			if ( ! empty($role__in)) {
+				foreach ($role__in as $role) {
 					$role__in_clauses[] = array(
-						'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
-						'value'   => '"' . $role . '"',
+						'key'     => $wpdb->get_blog_prefix($blog_id).'capabilities',
+						'value'   => '"'.$role.'"',
 						'compare' => 'LIKE',
 					);
 				}
@@ -397,12 +397,12 @@ 
 				$role_queries[] = $role__in_clauses;
 			}
 
-			$role__not_in_clauses = array( 'relation' => 'AND' );
-			if ( ! empty( $role__not_in ) ) {
-				foreach ( $role__not_in as $role ) {
+			$role__not_in_clauses = array('relation' => 'AND');
+			if ( ! empty($role__not_in)) {
+				foreach ($role__not_in as $role) {
 					$role__not_in_clauses[] = array(
-						'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
-						'value'   => '"' . $role . '"',
+						'key'     => $wpdb->get_blog_prefix($blog_id).'capabilities',
+						'value'   => '"'.$role.'"',
 						'compare' => 'NOT LIKE',
 					);
 				}
@@ -411,9 +411,9 @@ 
 			}
 
 			// If there are no specific roles named, make sure the user is a member of the site.
-			if ( empty( $role_queries ) ) {
+			if (empty($role_queries)) {
 				$role_queries[] = array(
-					'key' => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+					'key' => $wpdb->get_blog_prefix($blog_id).'capabilities',
 					'compare' => 'EXISTS',
 				);
 			}
@@ -421,50 +421,50 @@ 
 			// Specify that role queries should be joined with AND.
 			$role_queries['relation'] = 'AND';
 
-			if ( empty( $this->meta_query->queries ) ) {
+			if (empty($this->meta_query->queries)) {
 				$this->meta_query->queries = $role_queries;
 			} else {
 				// Append the cap query to the original queries and reparse the query.
 				$this->meta_query->queries = array(
 					'relation' => 'AND',
-					array( $this->meta_query->queries, $role_queries ),
+					array($this->meta_query->queries, $role_queries),
 				);
 			}
 
-			$this->meta_query->parse_query_vars( $this->meta_query->queries );
+			$this->meta_query->parse_query_vars($this->meta_query->queries);
 		}
 
-		if ( ! empty( $this->meta_query->queries ) ) {
-			$clauses = $this->meta_query->get_sql( 'user', $wpdb->users, 'ID', $this );
+		if ( ! empty($this->meta_query->queries)) {
+			$clauses = $this->meta_query->get_sql('user', $wpdb->users, 'ID', $this);
 			$this->query_from .= $clauses['join'];
 			$this->query_where .= $clauses['where'];
 
-			if ( $this->meta_query->has_or_relation() ) {
-				$this->query_fields = 'DISTINCT ' . $this->query_fields;
+			if ($this->meta_query->has_or_relation()) {
+				$this->query_fields = 'DISTINCT '.$this->query_fields;
 			}
 		}
 
 		// sorting
-		$qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
-		$order = $this->parse_order( $qv['order'] );
+		$qv['order'] = isset($qv['order']) ? strtoupper($qv['order']) : '';
+		$order = $this->parse_order($qv['order']);
 
-		if ( empty( $qv['orderby'] ) ) {
+		if (empty($qv['orderby'])) {
 			// Default order is by 'user_login'.
-			$ordersby = array( 'user_login' => $order );
-		} elseif ( is_array( $qv['orderby'] ) ) {
+			$ordersby = array('user_login' => $order);
+		} elseif (is_array($qv['orderby'])) {
 			$ordersby = $qv['orderby'];
 		} else {
 			// 'orderby' values may be a comma- or space-separated list.
-			$ordersby = preg_split( '/[,\s]+/', $qv['orderby'] );
+			$ordersby = preg_split('/[,\s]+/', $qv['orderby']);
 		}
 
 		$orderby_array = array();
-		foreach ( $ordersby as $_key => $_value ) {
-			if ( ! $_value ) {
+		foreach ($ordersby as $_key => $_value) {
+			if ( ! $_value) {
 				continue;
 			}
 
-			if ( is_int( $_key ) ) {
+			if (is_int($_key)) {
 				// Integer key means this is a flat array of 'orderby' fields.
 				$_orderby = $_value;
 				$_order = $order;
@@ -474,62 +474,62 @@ 
 				$_order = $_value;
 			}
 
-			$parsed = $this->parse_orderby( $_orderby );
+			$parsed = $this->parse_orderby($_orderby);
 
-			if ( ! $parsed ) {
+			if ( ! $parsed) {
 				continue;
 			}
 
-			if ( 'nicename__in' === $_orderby || 'login__in' === $_orderby ) {
+			if ('nicename__in' === $_orderby || 'login__in' === $_orderby) {
 				$orderby_array[] = $parsed;
 			} else {
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+				$orderby_array[] = $parsed.' '.$this->parse_order($_order);
 			}
 		}
 
 		// If no valid clauses were found, order by user_login.
-		if ( empty( $orderby_array ) ) {
+		if (empty($orderby_array)) {
 			$orderby_array[] = "user_login $order";
 		}
 
-		$this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
+		$this->query_orderby = 'ORDER BY '.implode(', ', $orderby_array);
 
 		// limit
-		if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
-			if ( $qv['offset'] ) {
+		if (isset($qv['number']) && $qv['number'] > 0) {
+			if ($qv['offset']) {
 				$this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
 			} else {
-				$this->query_limit = $wpdb->prepare( "LIMIT %d, %d", $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
+				$this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['number'] * ($qv['paged'] - 1), $qv['number']);
 			}
 		}
 
 		$search = '';
-		if ( isset( $qv['search'] ) )
-			$search = trim( $qv['search'] );
+		if (isset($qv['search']))
+			$search = trim($qv['search']);
 
-		if ( $search ) {
-			$leading_wild = ( ltrim($search, '*') != $search );
-			$trailing_wild = ( rtrim($search, '*') != $search );
-			if ( $leading_wild && $trailing_wild )
+		if ($search) {
+			$leading_wild = (ltrim($search, '*') != $search);
+			$trailing_wild = (rtrim($search, '*') != $search);
+			if ($leading_wild && $trailing_wild)
 				$wild = 'both';
-			elseif ( $leading_wild )
+			elseif ($leading_wild)
 				$wild = 'leading';
-			elseif ( $trailing_wild )
+			elseif ($trailing_wild)
 				$wild = 'trailing';
 			else
 				$wild = false;
-			if ( $wild )
+			if ($wild)
 				$search = trim($search, '*');
 
 			$search_columns = array();
-			if ( $qv['search_columns'] )
-				$search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename' ) );
-			if ( ! $search_columns ) {
-				if ( false !== strpos( $search, '@') )
+			if ($qv['search_columns'])
+				$search_columns = array_intersect($qv['search_columns'], array('ID', 'user_login', 'user_email', 'user_url', 'user_nicename'));
+			if ( ! $search_columns) {
+				if (false !== strpos($search, '@'))
 					$search_columns = array('user_email');
-				elseif ( is_numeric($search) )
+				elseif (is_numeric($search))
 					$search_columns = array('user_login', 'ID');
-				elseif ( preg_match('|^https?://|', $search) && ! ( is_multisite() && wp_is_large_network( 'users' ) ) )
+				elseif (preg_match('|^https?://|', $search) && ! (is_multisite() && wp_is_large_network('users')))
 					$search_columns = array('user_url');
 				else
 					$search_columns = array('user_login', 'user_url', 'user_email', 'user_nicename', 'display_name');
@@ -547,23 +547,23 @@ 
 			 * @param string        $search         Text being searched.
 			 * @param WP_User_Query $this           The current WP_User_Query instance.
 			 */
-			$search_columns = apply_filters( 'user_search_columns', $search_columns, $search, $this );
+			$search_columns = apply_filters('user_search_columns', $search_columns, $search, $this);
 
-			$this->query_where .= $this->get_search_sql( $search, $search_columns, $wild );
+			$this->query_where .= $this->get_search_sql($search, $search_columns, $wild);
 		}
 
-		if ( ! empty( $include ) ) {
+		if ( ! empty($include)) {
 			// Sanitized earlier.
-			$ids = implode( ',', $include );
+			$ids = implode(',', $include);
 			$this->query_where .= " AND $wpdb->users.ID IN ($ids)";
-		} elseif ( ! empty( $qv['exclude'] ) ) {
-			$ids = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
+		} elseif ( ! empty($qv['exclude'])) {
+			$ids = implode(',', wp_parse_id_list($qv['exclude']));
 			$this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)";
 		}
 
 		// Date queries are allowed for the user_registered field.
-		if ( ! empty( $qv['date_query'] ) && is_array( $qv['date_query'] ) ) {
-			$date_query = new WP_Date_Query( $qv['date_query'], 'user_registered' );
+		if ( ! empty($qv['date_query']) && is_array($qv['date_query'])) {
+			$date_query = new WP_Date_Query($qv['date_query'], 'user_registered');
 			$this->query_where .= $date_query->get_sql();
 		}
 
@@ -579,7 +579,7 @@ 
 		 * @param WP_User_Query $this The current WP_User_Query instance,
 		 *                            passed by reference.
 		 */
-		do_action_ref_array( 'pre_user_query', array( &$this ) );
+		do_action_ref_array('pre_user_query', array(&$this));
 	}
 
 	/**
@@ -592,14 +592,14 @@ 
 	public function query() {
 		global $wpdb;
 
-		$qv =& $this->query_vars;
+		$qv = & $this->query_vars;
 
 		$this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
 
-		if ( is_array( $qv['fields'] ) || 'all' == $qv['fields'] ) {
-			$this->results = $wpdb->get_results( $this->request );
+		if (is_array($qv['fields']) || 'all' == $qv['fields']) {
+			$this->results = $wpdb->get_results($this->request);
 		} else {
-			$this->results = $wpdb->get_col( $this->request );
+			$this->results = $wpdb->get_col($this->request);
 		}
 
 		/**
@@ -611,23 +611,23 @@ 
 		 *
 		 * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query.
 		 */
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-			$this->total_users = (int) $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+		if (isset($qv['count_total']) && $qv['count_total'])
+			$this->total_users = (int) $wpdb->get_var(apply_filters('found_users_query', 'SELECT FOUND_ROWS()'));
 
-		if ( !$this->results )
+		if ( ! $this->results)
 			return;
 
-		if ( 'all_with_meta' == $qv['fields'] ) {
-			cache_users( $this->results );
+		if ('all_with_meta' == $qv['fields']) {
+			cache_users($this->results);
 
 			$r = array();
-			foreach ( $this->results as $userid )
-				$r[ $userid ] = new WP_User( $userid, '', $qv['blog_id'] );
+			foreach ($this->results as $userid)
+				$r[$userid] = new WP_User($userid, '', $qv['blog_id']);
 
 			$this->results = $r;
-		} elseif ( 'all' == $qv['fields'] ) {
-			foreach ( $this->results as $key => $user ) {
-				$this->results[ $key ] = new WP_User( $user, '', $qv['blog_id'] );
+		} elseif ('all' == $qv['fields']) {
+			foreach ($this->results as $key => $user) {
+				$this->results[$key] = new WP_User($user, '', $qv['blog_id']);
 			}
 		}
 	}
@@ -641,8 +641,8 @@ 
 	 * @param string $query_var Query variable key.
 	 * @return mixed
 	 */
-	public function get( $query_var ) {
-		if ( isset( $this->query_vars[$query_var] ) )
+	public function get($query_var) {
+		if (isset($this->query_vars[$query_var]))
 			return $this->query_vars[$query_var];
 
 		return null;
@@ -657,7 +657,7 @@ 
 	 * @param string $query_var Query variable key.
 	 * @param mixed $value Query variable value.
 	 */
-	public function set( $query_var, $value ) {
+	public function set($query_var, $value) {
 		$this->query_vars[$query_var] = $value;
 	}
 
@@ -675,23 +675,23 @@ 
 	 *                       Single site allows leading and trailing wildcards, Network Admin only trailing.
 	 * @return string
 	 */
-	protected function get_search_sql( $string, $cols, $wild = false ) {
+	protected function get_search_sql($string, $cols, $wild = false) {
 		global $wpdb;
 
 		$searches = array();
-		$leading_wild = ( 'leading' == $wild || 'both' == $wild ) ? '%' : '';
-		$trailing_wild = ( 'trailing' == $wild || 'both' == $wild ) ? '%' : '';
-		$like = $leading_wild . $wpdb->esc_like( $string ) . $trailing_wild;
+		$leading_wild = ('leading' == $wild || 'both' == $wild) ? '%' : '';
+		$trailing_wild = ('trailing' == $wild || 'both' == $wild) ? '%' : '';
+		$like = $leading_wild.$wpdb->esc_like($string).$trailing_wild;
 
-		foreach ( $cols as $col ) {
-			if ( 'ID' == $col ) {
-				$searches[] = $wpdb->prepare( "$col = %s", $string );
+		foreach ($cols as $col) {
+			if ('ID' == $col) {
+				$searches[] = $wpdb->prepare("$col = %s", $string);
 			} else {
-				$searches[] = $wpdb->prepare( "$col LIKE %s", $like );
+				$searches[] = $wpdb->prepare("$col LIKE %s", $like);
 			}
 		}
 
-		return ' AND (' . implode(' OR ', $searches) . ')';
+		return ' AND ('.implode(' OR ', $searches).')';
 	}
 
 	/**
@@ -729,21 +729,21 @@ 
 	 * @param string $orderby Alias for the field to order by.
 	 * @return string Value to used in the ORDER clause, if `$orderby` is valid.
 	 */
-	protected function parse_orderby( $orderby ) {
+	protected function parse_orderby($orderby) {
 		global $wpdb;
 
 		$meta_query_clauses = $this->meta_query->get_clauses();
 
 		$_orderby = '';
-		if ( in_array( $orderby, array( 'login', 'nicename', 'email', 'url', 'registered' ) ) ) {
-			$_orderby = 'user_' . $orderby;
-		} elseif ( in_array( $orderby, array( 'user_login', 'user_nicename', 'user_email', 'user_url', 'user_registered' ) ) ) {
+		if (in_array($orderby, array('login', 'nicename', 'email', 'url', 'registered'))) {
+			$_orderby = 'user_'.$orderby;
+		} elseif (in_array($orderby, array('user_login', 'user_nicename', 'user_email', 'user_url', 'user_registered'))) {
 			$_orderby = $orderby;
-		} elseif ( 'name' == $orderby || 'display_name' == $orderby ) {
+		} elseif ('name' == $orderby || 'display_name' == $orderby) {
 			$_orderby = 'display_name';
-		} elseif ( 'post_count' == $orderby ) {
+		} elseif ('post_count' == $orderby) {
 			// todo: avoid the JOIN
-			$where = get_posts_by_author_sql( 'post' );
+			$where = get_posts_by_author_sql('post');
 			$this->query_from .= " LEFT OUTER JOIN (
 				SELECT post_author, COUNT(*) as post_count
 				FROM $wpdb->posts
@@ -752,27 +752,27 @@ 
 			) p ON ({$wpdb->users}.ID = p.post_author)
 			";
 			$_orderby = 'post_count';
-		} elseif ( 'ID' == $orderby || 'id' == $orderby ) {
+		} elseif ('ID' == $orderby || 'id' == $orderby) {
 			$_orderby = 'ID';
-		} elseif ( 'meta_value' == $orderby || $this->get( 'meta_key' ) == $orderby ) {
+		} elseif ('meta_value' == $orderby || $this->get('meta_key') == $orderby) {
 			$_orderby = "$wpdb->usermeta.meta_value";
-		} elseif ( 'meta_value_num' == $orderby ) {
+		} elseif ('meta_value_num' == $orderby) {
 			$_orderby = "$wpdb->usermeta.meta_value+0";
-		} elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
-			$include = wp_parse_id_list( $this->query_vars['include'] );
-			$include_sql = implode( ',', $include );
+		} elseif ('include' === $orderby && ! empty($this->query_vars['include'])) {
+			$include = wp_parse_id_list($this->query_vars['include']);
+			$include_sql = implode(',', $include);
 			$_orderby = "FIELD( $wpdb->users.ID, $include_sql )";
-		} elseif ( 'nicename__in' === $orderby ) {
-			$sanitized_nicename__in = array_map( 'esc_sql', $this->query_vars['nicename__in'] );
-			$nicename__in = implode( "','", $sanitized_nicename__in );
+		} elseif ('nicename__in' === $orderby) {
+			$sanitized_nicename__in = array_map('esc_sql', $this->query_vars['nicename__in']);
+			$nicename__in = implode("','", $sanitized_nicename__in);
 			$_orderby = "FIELD( user_nicename, '$nicename__in' )";
-		} elseif ( 'login__in' === $orderby ) {
-			$sanitized_login__in = array_map( 'esc_sql', $this->query_vars['login__in'] );
-			$login__in = implode( "','", $sanitized_login__in );
+		} elseif ('login__in' === $orderby) {
+			$sanitized_login__in = array_map('esc_sql', $this->query_vars['login__in']);
+			$login__in = implode("','", $sanitized_login__in);
 			$_orderby = "FIELD( user_login, '$login__in' )";
-		} elseif ( isset( $meta_query_clauses[ $orderby ] ) ) {
-			$meta_clause = $meta_query_clauses[ $orderby ];
-			$_orderby = sprintf( "CAST(%s.meta_value AS %s)", esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );
+		} elseif (isset($meta_query_clauses[$orderby])) {
+			$meta_clause = $meta_query_clauses[$orderby];
+			$_orderby = sprintf("CAST(%s.meta_value AS %s)", esc_sql($meta_clause['alias']), esc_sql($meta_clause['cast']));
 		}
 
 		return $_orderby;
@@ -787,12 +787,12 @@ 
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
 	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
+	protected function parse_order($order) {
+		if ( ! is_string($order) || empty($order)) {
 			return 'DESC';
 		}
 
-		if ( 'ASC' === strtoupper( $order ) ) {
+		if ('ASC' === strtoupper($order)) {
 			return 'ASC';
 		} else {
 			return 'DESC';
@@ -808,8 +808,8 @@ 
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 	 */
-	public function __get( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __get($name) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name;
 		}
 	}
@@ -824,8 +824,8 @@ 
 	 * @param mixed  $value Property value.
 	 * @return mixed Newly-set property.
 	 */
-	public function __set( $name, $value ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __set($name, $value) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name = $value;
 		}
 	}
@@ -839,9 +839,9 @@ 
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			return isset( $this->$name );
+	public function __isset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			return isset($this->$name);
 		}
 	}
 
@@ -853,9 +853,9 @@ 
 	 *
 	 * @param string $name Property to unset.
 	 */
-	public function __unset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			unset( $this->$name );
+	public function __unset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			unset($this->$name);
 		}
 	}
 
@@ -869,9 +869,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( 'get_search_sql' === $name ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if ('get_search_sql' === $name) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}

Braces +42 added lines, -32 removed lines

@@ -255,8 +255,9 @@ 
 			$this->query_fields = "$wpdb->users.ID";
 		}
 
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+					$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+		}
 
 		$this->query_from = "FROM $wpdb->users";
 		$this->query_where = "WHERE 1=1";
@@ -504,35 +505,40 @@ 
 		}
 
 		$search = '';
-		if ( isset( $qv['search'] ) )
-			$search = trim( $qv['search'] );
+		if ( isset( $qv['search'] ) ) {
+					$search = trim( $qv['search'] );
+		}
 
 		if ( $search ) {
 			$leading_wild = ( ltrim($search, '*') != $search );
 			$trailing_wild = ( rtrim($search, '*') != $search );
-			if ( $leading_wild && $trailing_wild )
-				$wild = 'both';
-			elseif ( $leading_wild )
-				$wild = 'leading';
-			elseif ( $trailing_wild )
-				$wild = 'trailing';
-			else
-				$wild = false;
-			if ( $wild )
-				$search = trim($search, '*');
+			if ( $leading_wild && $trailing_wild ) {
+							$wild = 'both';
+			} elseif ( $leading_wild ) {
+							$wild = 'leading';
+			} elseif ( $trailing_wild ) {
+							$wild = 'trailing';
+			} else {
+							$wild = false;
+			}
+			if ( $wild ) {
+							$search = trim($search, '*');
+			}
 
 			$search_columns = array();
-			if ( $qv['search_columns'] )
-				$search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename' ) );
+			if ( $qv['search_columns'] ) {
+							$search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename' ) );
+			}
 			if ( ! $search_columns ) {
-				if ( false !== strpos( $search, '@') )
-					$search_columns = array('user_email');
-				elseif ( is_numeric($search) )
-					$search_columns = array('user_login', 'ID');
-				elseif ( preg_match('|^https?://|', $search) && ! ( is_multisite() && wp_is_large_network( 'users' ) ) )
-					$search_columns = array('user_url');
-				else
-					$search_columns = array('user_login', 'user_url', 'user_email', 'user_nicename', 'display_name');
+				if ( false !== strpos( $search, '@') ) {
+									$search_columns = array('user_email');
+				} elseif ( is_numeric($search) ) {
+									$search_columns = array('user_login', 'ID');
+				} elseif ( preg_match('|^https?://|', $search) && ! ( is_multisite() && wp_is_large_network( 'users' ) ) ) {
+									$search_columns = array('user_url');
+				} else {
+									$search_columns = array('user_login', 'user_url', 'user_email', 'user_nicename', 'display_name');
+				}
 			}
 
 			/**
@@ -611,18 +617,21 @@ 
 		 *
 		 * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query.
 		 */
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-			$this->total_users = (int) $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+					$this->total_users = (int) $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+		}
 
-		if ( !$this->results )
-			return;
+		if ( !$this->results ) {
+					return;
+		}
 
 		if ( 'all_with_meta' == $qv['fields'] ) {
 			cache_users( $this->results );
 
 			$r = array();
-			foreach ( $this->results as $userid )
-				$r[ $userid ] = new WP_User( $userid, '', $qv['blog_id'] );
+			foreach ( $this->results as $userid ) {
+							$r[ $userid ] = new WP_User( $userid, '', $qv['blog_id'] );
+			}
 
 			$this->results = $r;
 		} elseif ( 'all' == $qv['fields'] ) {
@@ -642,8 +651,9 @@ 
 	 * @return mixed
 	 */
 	public function get( $query_var ) {
-		if ( isset( $this->query_vars[$query_var] ) )
-			return $this->query_vars[$query_var];
+		if ( isset( $this->query_vars[$query_var] ) ) {
+					return $this->query_vars[$query_var];
+		}
 
 		return null;
 	}

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

Doc Comments +1 added lines, -6 removed lines

@@ -111,7 +111,7 @@ 
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
-	 * @param int|string|stdClass|WP_User $id User's ID, a WP_User object, or a user object from the DB.
+	 * @param integer $id User's ID, a WP_User object, or a user object from the DB.
 	 * @param string $name Optional. User's username
 	 * @param int $blog_id Optional Site ID, defaults to current site.
 	 */
@@ -702,11 +702,6 @@ 
 	 * @see map_meta_cap()
 	 *
 	 * @param string $cap           Capability name.
-	 * @param int    $object_id,... Optional. ID of the specific object to check against if `$cap` is a "meta" cap.
-	 *                              "Meta" capabilities, e.g. 'edit_post', 'edit_user', etc., are capabilities used
-	 *                              by map_meta_cap() to map to other "primitive" capabilities, e.g. 'edit_posts',
-	 *                              'edit_others_posts', etc. The parameter is accessed via func_get_args() and passed
-	 *                              to map_meta_cap().
 	 * @return bool Whether the current user has the given capability. If `$cap` is a meta cap and `$object_id` is
 	 *              passed, whether the current user has the given meta capability for the given object.
 	 */

Braces +55 added lines, -38 removed lines

@@ -192,17 +192,20 @@ 
 		if ( 'id' == $field ) {
 			// Make sure the value is numeric to avoid casting objects, for example,
 			// to int 1.
-			if ( ! is_numeric( $value ) )
-				return false;
+			if ( ! is_numeric( $value ) ) {
+							return false;
+			}
 			$value = intval( $value );
-			if ( $value < 1 )
-				return false;
+			if ( $value < 1 ) {
+							return false;
+			}
 		} else {
 			$value = trim( $value );
 		}
 
-		if ( !$value )
-			return false;
+		if ( !$value ) {
+					return false;
+		}
 
 		switch ( $field ) {
 			case 'id':
@@ -227,14 +230,16 @@ 
 		}
 
 		if ( false !== $user_id ) {
-			if ( $user = wp_cache_get( $user_id, 'users' ) )
-				return $user;
+			if ( $user = wp_cache_get( $user_id, 'users' ) ) {
+							return $user;
+			}
 		}
 
 		if ( !$user = $wpdb->get_row( $wpdb->prepare(
 			"SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
-		) ) )
-			return false;
+		) ) ) {
+					return false;
+		}
 
 		update_user_caches( $user );
 
@@ -279,11 +284,13 @@ 
 			$key = 'ID';
 		}
 
-		if ( isset( $this->data->$key ) )
-			return true;
+		if ( isset( $this->data->$key ) ) {
+					return true;
+		}
 
-		if ( isset( self::$back_compat_keys[ $key ] ) )
-			$key = self::$back_compat_keys[ $key ];
+		if ( isset( self::$back_compat_keys[ $key ] ) ) {
+					$key = self::$back_compat_keys[ $key ];
+		}
 
 		return metadata_exists( 'user', $this->ID, $key );
 	}
@@ -312,8 +319,9 @@ 
 		if ( isset( $this->data->$key ) ) {
 			$value = $this->data->$key;
 		} else {
-			if ( isset( self::$back_compat_keys[ $key ] ) )
-				$key = self::$back_compat_keys[ $key ];
+			if ( isset( self::$back_compat_keys[ $key ] ) ) {
+							$key = self::$back_compat_keys[ $key ];
+			}
 			$value = get_user_meta( $this->ID, $key, true );
 		}
 
@@ -449,15 +457,17 @@ 
 	protected function _init_caps( $cap_key = '' ) {
 		global $wpdb;
 
-		if ( empty($cap_key) )
-			$this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
-		else
-			$this->cap_key = $cap_key;
+		if ( empty($cap_key) ) {
+					$this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
+		} else {
+					$this->cap_key = $cap_key;
+		}
 
 		$this->caps = get_user_meta( $this->ID, $this->cap_key, true );
 
-		if ( ! is_array( $this->caps ) )
-			$this->caps = array();
+		if ( ! is_array( $this->caps ) ) {
+					$this->caps = array();
+		}
 
 		$this->get_role_caps();
 	}
@@ -479,8 +489,9 @@ 
 		$wp_roles = wp_roles();
 
 		//Filter out caps that are not role names and assign to $this->roles
-		if ( is_array( $this->caps ) )
-			$this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
+		if ( is_array( $this->caps ) ) {
+					$this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
+		}
 
 		//Build $allcaps from role caps, overlay user's $caps
 		$this->allcaps = array();
@@ -533,8 +544,9 @@ 
 	 * @param string $role Role name.
 	 */
 	public function remove_role( $role ) {
-		if ( !in_array($role, $this->roles) )
-			return;
+		if ( !in_array($role, $this->roles) ) {
+					return;
+		}
 		unset( $this->caps[$role] );
 		update_user_meta( $this->ID, $this->cap_key, $this->caps );
 		$this->get_role_caps();
@@ -564,11 +576,13 @@ 
 	 * @param string $role Role name.
 	 */
 	public function set_role( $role ) {
-		if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
-			return;
+		if ( 1 == count( $this->roles ) && $role == current( $this->roles ) ) {
+					return;
+		}
 
-		foreach ( (array) $this->roles as $oldrole )
-			unset( $this->caps[$oldrole] );
+		foreach ( (array) $this->roles as $oldrole ) {
+					unset( $this->caps[$oldrole] );
+		}
 
 		$old_roles = $this->roles;
 		if ( !empty( $role ) ) {
@@ -722,8 +736,9 @@ 
 
 		// Multisite super admin has all caps by definition, Unless specifically denied.
 		if ( is_multisite() && is_super_admin( $this->ID ) ) {
-			if ( in_array('do_not_allow', $caps) )
-				return false;
+			if ( in_array('do_not_allow', $caps) ) {
+							return false;
+			}
 			return true;
 		}
 
@@ -745,8 +760,9 @@ 
 
 		// Must have ALL requested caps.
 		foreach ( (array) $caps as $cap ) {
-			if ( empty( $capabilities[ $cap ] ) )
-				return false;
+			if ( empty( $capabilities[ $cap ] ) ) {
+							return false;
+			}
 		}
 
 		return true;
@@ -778,10 +794,11 @@ 
 	 */
 	public function for_blog( $blog_id = '' ) {
 		global $wpdb;
-		if ( ! empty( $blog_id ) )
-			$cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
-		else
-			$cap_key = '';
+		if ( ! empty( $blog_id ) ) {
+					$cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
+		} else {
+					$cap_key = '';
+		}
 		$this->_init_caps( $cap_key );
 	}
 }

Spacing +131 added lines, -131 removed lines

@@ -115,40 +115,40 @@ 
 	 * @param string $name Optional. User's username
 	 * @param int $blog_id Optional Site ID, defaults to current site.
 	 */
-	public function __construct( $id = 0, $name = '', $blog_id = '' ) {
-		if ( ! isset( self::$back_compat_keys ) ) {
+	public function __construct($id = 0, $name = '', $blog_id = '') {
+		if ( ! isset(self::$back_compat_keys)) {
 			$prefix = $GLOBALS['wpdb']->prefix;
 			self::$back_compat_keys = array(
 				'user_firstname' => 'first_name',
 				'user_lastname' => 'last_name',
 				'user_description' => 'description',
-				'user_level' => $prefix . 'user_level',
-				$prefix . 'usersettings' => $prefix . 'user-settings',
-				$prefix . 'usersettingstime' => $prefix . 'user-settings-time',
+				'user_level' => $prefix.'user_level',
+				$prefix.'usersettings' => $prefix.'user-settings',
+				$prefix.'usersettingstime' => $prefix.'user-settings-time',
 			);
 		}
 
-		if ( $id instanceof WP_User ) {
-			$this->init( $id->data, $blog_id );
+		if ($id instanceof WP_User) {
+			$this->init($id->data, $blog_id);
 			return;
-		} elseif ( is_object( $id ) ) {
-			$this->init( $id, $blog_id );
+		} elseif (is_object($id)) {
+			$this->init($id, $blog_id);
 			return;
 		}
 
-		if ( ! empty( $id ) && ! is_numeric( $id ) ) {
+		if ( ! empty($id) && ! is_numeric($id)) {
 			$name = $id;
 			$id = 0;
 		}
 
-		if ( $id ) {
-			$data = self::get_data_by( 'id', $id );
+		if ($id) {
+			$data = self::get_data_by('id', $id);
 		} else {
-			$data = self::get_data_by( 'login', $name );
+			$data = self::get_data_by('login', $name);
 		}
 
-		if ( $data ) {
-			$this->init( $data, $blog_id );
+		if ($data) {
+			$this->init($data, $blog_id);
 		} else {
 			$this->data = new stdClass;
 		}
@@ -160,11 +160,11 @@ 
 	 * @param object $data    User DB row object.
 	 * @param int    $blog_id Optional. The site ID to initialize for.
 	 */
-	public function init( $data, $blog_id = '' ) {
+	public function init($data, $blog_id = '') {
 		$this->data = $data;
 		$this->ID = (int) $data->ID;
 
-		$this->for_blog( $blog_id );
+		$this->for_blog($blog_id);
 	}
 
 	/**
@@ -181,30 +181,30 @@ 
 	 * @param string|int $value The field value
 	 * @return object|false Raw user object
 	 */
-	public static function get_data_by( $field, $value ) {
+	public static function get_data_by($field, $value) {
 		global $wpdb;
 
 		// 'ID' is an alias of 'id'.
-		if ( 'ID' === $field ) {
+		if ('ID' === $field) {
 			$field = 'id';
 		}
 
-		if ( 'id' == $field ) {
+		if ('id' == $field) {
 			// Make sure the value is numeric to avoid casting objects, for example,
 			// to int 1.
-			if ( ! is_numeric( $value ) )
+			if ( ! is_numeric($value))
 				return false;
-			$value = intval( $value );
-			if ( $value < 1 )
+			$value = intval($value);
+			if ($value < 1)
 				return false;
 		} else {
-			$value = trim( $value );
+			$value = trim($value);
 		}
 
-		if ( !$value )
+		if ( ! $value)
 			return false;
 
-		switch ( $field ) {
+		switch ($field) {
 			case 'id':
 				$user_id = $value;
 				$db_field = 'ID';
@@ -218,7 +218,7 @@ 
 				$db_field = 'user_email';
 				break;
 			case 'login':
-				$value = sanitize_user( $value );
+				$value = sanitize_user($value);
 				$user_id = wp_cache_get($value, 'userlogins');
 				$db_field = 'user_login';
 				break;
@@ -226,17 +226,17 @@ 
 				return false;
 		}
 
-		if ( false !== $user_id ) {
-			if ( $user = wp_cache_get( $user_id, 'users' ) )
+		if (false !== $user_id) {
+			if ($user = wp_cache_get($user_id, 'users'))
 				return $user;
 		}
 
-		if ( !$user = $wpdb->get_row( $wpdb->prepare(
+		if ( ! $user = $wpdb->get_row($wpdb->prepare(
 			"SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
-		) ) )
+		)))
 			return false;
 
-		update_user_caches( $user );
+		update_user_caches($user);
 
 		return $user;
 	}
@@ -251,9 +251,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|false Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( '_init_caps' === $name ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if ('_init_caps' === $name) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -267,25 +267,25 @@ 
 	 * @param string $key User meta key to check if set.
 	 * @return bool Whether the given user meta key is set.
 	 */
-	public function __isset( $key ) {
-		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1.0',
+	public function __isset($key) {
+		if ('id' == $key) {
+			_deprecated_argument('WP_User->id', '2.1.0',
 				sprintf(
 					/* translators: %s: WP_User->ID */
-					__( 'Use %s instead.' ),
+					__('Use %s instead.'),
 					'<code>WP_User->ID</code>'
 				)
 			);
 			$key = 'ID';
 		}
 
-		if ( isset( $this->data->$key ) )
+		if (isset($this->data->$key))
 			return true;
 
-		if ( isset( self::$back_compat_keys[ $key ] ) )
-			$key = self::$back_compat_keys[ $key ];
+		if (isset(self::$back_compat_keys[$key]))
+			$key = self::$back_compat_keys[$key];
 
-		return metadata_exists( 'user', $this->ID, $key );
+		return metadata_exists('user', $this->ID, $key);
 	}
 
 	/**
@@ -297,28 +297,28 @@ 
 	 * @param string $key User meta key to retrieve.
 	 * @return mixed Value of the given user meta key (if set). If `$key` is 'id', the user ID.
 	 */
-	public function __get( $key ) {
-		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1.0',
+	public function __get($key) {
+		if ('id' == $key) {
+			_deprecated_argument('WP_User->id', '2.1.0',
 				sprintf(
 					/* translators: %s: WP_User->ID */
-					__( 'Use %s instead.' ),
+					__('Use %s instead.'),
 					'<code>WP_User->ID</code>'
 				)
 			);
 			return $this->ID;
 		}
 
-		if ( isset( $this->data->$key ) ) {
+		if (isset($this->data->$key)) {
 			$value = $this->data->$key;
 		} else {
-			if ( isset( self::$back_compat_keys[ $key ] ) )
-				$key = self::$back_compat_keys[ $key ];
-			$value = get_user_meta( $this->ID, $key, true );
+			if (isset(self::$back_compat_keys[$key]))
+				$key = self::$back_compat_keys[$key];
+			$value = get_user_meta($this->ID, $key, true);
 		}
 
-		if ( $this->filter ) {
-			$value = sanitize_user_field( $key, $value, $this->ID, $this->filter );
+		if ($this->filter) {
+			$value = sanitize_user_field($key, $value, $this->ID, $this->filter);
 		}
 
 		return $value;
@@ -336,12 +336,12 @@ 
 	 * @param string $key   User meta key.
 	 * @param mixed  $value User meta value.
 	 */
-	public function __set( $key, $value ) {
-		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1.0',
+	public function __set($key, $value) {
+		if ('id' == $key) {
+			_deprecated_argument('WP_User->id', '2.1.0',
 				sprintf(
 					/* translators: %s: WP_User->ID */
-					__( 'Use %s instead.' ),
+					__('Use %s instead.'),
 					'<code>WP_User->ID</code>'
 				)
 			);
@@ -360,23 +360,23 @@ 
 	 *
 	 * @param string $key User meta key to unset.
 	 */
-	public function __unset( $key ) {
-		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1.0',
+	public function __unset($key) {
+		if ('id' == $key) {
+			_deprecated_argument('WP_User->id', '2.1.0',
 				sprintf(
 					/* translators: %s: WP_User->ID */
-					__( 'Use %s instead.' ),
+					__('Use %s instead.'),
 					'<code>WP_User->ID</code>'
 				)
 			);
 		}
 
-		if ( isset( $this->data->$key ) ) {
-			unset( $this->data->$key );
+		if (isset($this->data->$key)) {
+			unset($this->data->$key);
 		}
 
-		if ( isset( self::$back_compat_keys[ $key ] ) ) {
-			unset( self::$back_compat_keys[ $key ] );
+		if (isset(self::$back_compat_keys[$key])) {
+			unset(self::$back_compat_keys[$key]);
 		}
 	}
 
@@ -389,7 +389,7 @@ 
 	 * @return bool True if user exists in the database, false if not.
 	 */
 	public function exists() {
-		return ! empty( $this->ID );
+		return ! empty($this->ID);
 	}
 
 	/**
@@ -402,8 +402,8 @@ 
 	 * @param string $key Property
 	 * @return mixed
 	 */
-	public function get( $key ) {
-		return $this->__get( $key );
+	public function get($key) {
+		return $this->__get($key);
 	}
 
 	/**
@@ -416,8 +416,8 @@ 
 	 * @param string $key Property
 	 * @return bool
 	 */
-	public function has_prop( $key ) {
-		return $this->__isset( $key );
+	public function has_prop($key) {
+		return $this->__isset($key);
 	}
 
 	/**
@@ -428,7 +428,7 @@ 
 	 * @return array Array representation.
 	 */
 	public function to_array() {
-		return get_object_vars( $this->data );
+		return get_object_vars($this->data);
 	}
 
 	/**
@@ -446,17 +446,17 @@ 
 	 *
 	 * @param string $cap_key Optional capability key
 	 */
-	protected function _init_caps( $cap_key = '' ) {
+	protected function _init_caps($cap_key = '') {
 		global $wpdb;
 
-		if ( empty($cap_key) )
-			$this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
+		if (empty($cap_key))
+			$this->cap_key = $wpdb->get_blog_prefix().'capabilities';
 		else
 			$this->cap_key = $cap_key;
 
-		$this->caps = get_user_meta( $this->ID, $this->cap_key, true );
+		$this->caps = get_user_meta($this->ID, $this->cap_key, true);
 
-		if ( ! is_array( $this->caps ) )
+		if ( ! is_array($this->caps))
 			$this->caps = array();
 
 		$this->get_role_caps();
@@ -479,16 +479,16 @@ 
 		$wp_roles = wp_roles();
 
 		//Filter out caps that are not role names and assign to $this->roles
-		if ( is_array( $this->caps ) )
-			$this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
+		if (is_array($this->caps))
+			$this->roles = array_filter(array_keys($this->caps), array($wp_roles, 'is_role'));
 
 		//Build $allcaps from role caps, overlay user's $caps
 		$this->allcaps = array();
-		foreach ( (array) $this->roles as $role ) {
-			$the_role = $wp_roles->get_role( $role );
-			$this->allcaps = array_merge( (array) $this->allcaps, (array) $the_role->capabilities );
+		foreach ((array) $this->roles as $role) {
+			$the_role = $wp_roles->get_role($role);
+			$this->allcaps = array_merge((array) $this->allcaps, (array) $the_role->capabilities);
 		}
-		$this->allcaps = array_merge( (array) $this->allcaps, (array) $this->caps );
+		$this->allcaps = array_merge((array) $this->allcaps, (array) $this->caps);
 
 		return $this->allcaps;
 	}
@@ -503,13 +503,13 @@ 
 	 *
 	 * @param string $role Role name.
 	 */
-	public function add_role( $role ) {
-		if ( empty( $role ) ) {
+	public function add_role($role) {
+		if (empty($role)) {
 			return;
 		}
 
 		$this->caps[$role] = true;
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 
@@ -521,7 +521,7 @@ 
 		 * @param int    $user_id The user ID.
 		 * @param string $role    The new role.
 		 */
-		do_action( 'add_user_role', $this->ID, $role );
+		do_action('add_user_role', $this->ID, $role);
 	}
 
 	/**
@@ -532,11 +532,11 @@ 
 	 *
 	 * @param string $role Role name.
 	 */
-	public function remove_role( $role ) {
-		if ( !in_array($role, $this->roles) )
+	public function remove_role($role) {
+		if ( ! in_array($role, $this->roles))
 			return;
-		unset( $this->caps[$role] );
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		unset($this->caps[$role]);
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 
@@ -548,7 +548,7 @@ 
 		 * @param int    $user_id The user ID.
 		 * @param string $role    The removed role.
 		 */
-		do_action( 'remove_user_role', $this->ID, $role );
+		do_action('remove_user_role', $this->ID, $role);
 	}
 
 	/**
@@ -563,21 +563,21 @@ 
 	 *
 	 * @param string $role Role name.
 	 */
-	public function set_role( $role ) {
-		if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
+	public function set_role($role) {
+		if (1 == count($this->roles) && $role == current($this->roles))
 			return;
 
-		foreach ( (array) $this->roles as $oldrole )
-			unset( $this->caps[$oldrole] );
+		foreach ((array) $this->roles as $oldrole)
+			unset($this->caps[$oldrole]);
 
 		$old_roles = $this->roles;
-		if ( !empty( $role ) ) {
+		if ( ! empty($role)) {
 			$this->caps[$role] = true;
-			$this->roles = array( $role => true );
+			$this->roles = array($role => true);
 		} else {
 			$this->roles = false;
 		}
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 
@@ -591,7 +591,7 @@ 
 		 * @param string $role      The new role.
 		 * @param array  $old_roles An array of the user's previous roles.
 		 */
-		do_action( 'set_user_role', $this->ID, $role, $old_roles );
+		do_action('set_user_role', $this->ID, $role, $old_roles);
 	}
 
 	/**
@@ -613,10 +613,10 @@ 
 	 * @param string $item Level capability name.
 	 * @return int Max Level.
 	 */
-	public function level_reduction( $max, $item ) {
-		if ( preg_match( '/^level_(10|[0-9])$/i', $item, $matches ) ) {
-			$level = intval( $matches[1] );
-			return max( $max, $level );
+	public function level_reduction($max, $item) {
+		if (preg_match('/^level_(10|[0-9])$/i', $item, $matches)) {
+			$level = intval($matches[1]);
+			return max($max, $level);
 		} else {
 			return $max;
 		}
@@ -636,8 +636,8 @@ 
 	 */
 	public function update_user_level_from_caps() {
 		global $wpdb;
-		$this->user_level = array_reduce( array_keys( $this->allcaps ), array( $this, 'level_reduction' ), 0 );
-		update_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level', $this->user_level );
+		$this->user_level = array_reduce(array_keys($this->allcaps), array($this, 'level_reduction'), 0);
+		update_user_meta($this->ID, $wpdb->get_blog_prefix().'user_level', $this->user_level);
 	}
 
 	/**
@@ -649,9 +649,9 @@ 
 	 * @param string $cap Capability name.
 	 * @param bool $grant Whether to grant capability to user.
 	 */
-	public function add_cap( $cap, $grant = true ) {
+	public function add_cap($cap, $grant = true) {
 		$this->caps[$cap] = $grant;
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 	}
@@ -664,12 +664,12 @@ 
 	 *
 	 * @param string $cap Capability name.
 	 */
-	public function remove_cap( $cap ) {
-		if ( ! isset( $this->caps[ $cap ] ) ) {
+	public function remove_cap($cap) {
+		if ( ! isset($this->caps[$cap])) {
 			return;
 		}
-		unset( $this->caps[ $cap ] );
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		unset($this->caps[$cap]);
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 	}
@@ -685,8 +685,8 @@ 
 	public function remove_all_caps() {
 		global $wpdb;
 		$this->caps = array();
-		delete_user_meta( $this->ID, $this->cap_key );
-		delete_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level' );
+		delete_user_meta($this->ID, $this->cap_key);
+		delete_user_meta($this->ID, $wpdb->get_blog_prefix().'user_level');
 		$this->get_role_caps();
 	}
 
@@ -710,19 +710,19 @@ 
 	 * @return bool Whether the current user has the given capability. If `$cap` is a meta cap and `$object_id` is
 	 *              passed, whether the current user has the given meta capability for the given object.
 	 */
-	public function has_cap( $cap ) {
-		if ( is_numeric( $cap ) ) {
-			_deprecated_argument( __FUNCTION__, '2.0.0', __('Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead.') );
-			$cap = $this->translate_level_to_cap( $cap );
+	public function has_cap($cap) {
+		if (is_numeric($cap)) {
+			_deprecated_argument(__FUNCTION__, '2.0.0', __('Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead.'));
+			$cap = $this->translate_level_to_cap($cap);
 		}
 
-		$args = array_slice( func_get_args(), 1 );
-		$args = array_merge( array( $cap, $this->ID ), $args );
-		$caps = call_user_func_array( 'map_meta_cap', $args );
+		$args = array_slice(func_get_args(), 1);
+		$args = array_merge(array($cap, $this->ID), $args);
+		$caps = call_user_func_array('map_meta_cap', $args);
 
 		// Multisite super admin has all caps by definition, Unless specifically denied.
-		if ( is_multisite() && is_super_admin( $this->ID ) ) {
-			if ( in_array('do_not_allow', $caps) )
+		if (is_multisite() && is_super_admin($this->ID)) {
+			if (in_array('do_not_allow', $caps))
 				return false;
 			return true;
 		}
@@ -738,14 +738,14 @@ 
 		 * @param array   $args    Optional parameters passed to has_cap(), typically object ID.
 		 * @param WP_User $user    The user object.
 		 */
-		$capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args, $this );
+		$capabilities = apply_filters('user_has_cap', $this->allcaps, $caps, $args, $this);
 
 		// Everyone is allowed to exist.
 		$capabilities['exist'] = true;
 
 		// Must have ALL requested caps.
-		foreach ( (array) $caps as $cap ) {
-			if ( empty( $capabilities[ $cap ] ) )
+		foreach ((array) $caps as $cap) {
+			if (empty($capabilities[$cap]))
 				return false;
 		}
 
@@ -763,8 +763,8 @@ 
 	 * @param int $level Level number, 1 to 10.
 	 * @return string
 	 */
-	public function translate_level_to_cap( $level ) {
-		return 'level_' . $level;
+	public function translate_level_to_cap($level) {
+		return 'level_'.$level;
 	}
 
 	/**
@@ -776,12 +776,12 @@ 
 	 *
 	 * @param int $blog_id Optional. Site ID, defaults to current site.
 	 */
-	public function for_blog( $blog_id = '' ) {
+	public function for_blog($blog_id = '') {
 		global $wpdb;
-		if ( ! empty( $blog_id ) )
-			$cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
+		if ( ! empty($blog_id))
+			$cap_key = $wpdb->get_blog_prefix($blog_id).'capabilities';
 		else
 			$cap_key = '';
-		$this->_init_caps( $cap_key );
+		$this->_init_caps($cap_key);
 	}
 }

src/wp-includes/customize/class-wp-customize-selective-refresh.php

Doc Comments +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 	 * @since 4.5.0
 	 * @access public
 	 *
-	 * @return array Partials.
+	 * @return WP_Customize_Partial[] Partials.
 	 */
 	public function partials() {
 		return $this->partials;
@@ -283,7 +283,7 @@ 
 	 * @param string $errstr  Error string.
 	 * @param string $errfile Error file.
 	 * @param string $errline Error line.
-	 * @return true Always true.
+	 * @return boolean Always true.
 	 */
 	public function handle_error( $errno, $errstr, $errfile = null, $errline = null ) {
 		$this->triggered_errors[] = array(

Spacing +70 added lines, -70 removed lines

@@ -65,11 +65,11 @@ 
 	 *
 	 * @param WP_Customize_Manager $manager Manager instance.
 	 */
-	public function __construct( WP_Customize_Manager $manager ) {
+	public function __construct(WP_Customize_Manager $manager) {
 		$this->manager = $manager;
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-partial.php' );
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-partial.php');
 
-		add_action( 'customize_preview_init', array( $this, 'init_preview' ) );
+		add_action('customize_preview_init', array($this, 'init_preview'));
 	}
 
 	/**
@@ -113,22 +113,22 @@ 
 	 * }
 	 * @return WP_Customize_Partial             The instance of the panel that was added.
 	 */
-	public function add_partial( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Partial ) {
+	public function add_partial($id, $args = array()) {
+		if ($id instanceof WP_Customize_Partial) {
 			$partial = $id;
 		} else {
 			$class = 'WP_Customize_Partial';
 
 			/** This filter is documented in wp-includes/customize/class-wp-customize-selective-refresh.php */
-			$args = apply_filters( 'customize_dynamic_partial_args', $args, $id );
+			$args = apply_filters('customize_dynamic_partial_args', $args, $id);
 
 			/** This filter is documented in wp-includes/customize/class-wp-customize-selective-refresh.php */
-			$class = apply_filters( 'customize_dynamic_partial_class', $class, $id, $args );
+			$class = apply_filters('customize_dynamic_partial_class', $class, $id, $args);
 
-			$partial = new $class( $this, $id, $args );
+			$partial = new $class($this, $id, $args);
 		}
 
-		$this->partials[ $partial->id ] = $partial;
+		$this->partials[$partial->id] = $partial;
 		return $partial;
 	}
 
@@ -141,9 +141,9 @@ 
 	 * @param string $id Customize Partial ID.
 	 * @return WP_Customize_Partial|null The partial, if set. Otherwise null.
 	 */
-	public function get_partial( $id ) {
-		if ( isset( $this->partials[ $id ] ) ) {
-			return $this->partials[ $id ];
+	public function get_partial($id) {
+		if (isset($this->partials[$id])) {
+			return $this->partials[$id];
 		} else {
 			return null;
 		}
@@ -157,8 +157,8 @@ 
 	 *
 	 * @param string $id Customize Partial ID.
 	 */
-	public function remove_partial( $id ) {
-		unset( $this->partials[ $id ] );
+	public function remove_partial($id) {
+		unset($this->partials[$id]);
 	}
 
 	/**
@@ -168,8 +168,8 @@ 
 	 * @access public
 	 */
 	public function init_preview() {
-		add_action( 'template_redirect', array( $this, 'handle_render_partials_request' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_preview_scripts' ) );
+		add_action('template_redirect', array($this, 'handle_render_partials_request'));
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_preview_scripts'));
 	}
 
 	/**
@@ -179,8 +179,8 @@ 
 	 * @access public
 	 */
 	public function enqueue_preview_scripts() {
-		wp_enqueue_script( 'customize-selective-refresh' );
-		add_action( 'wp_footer', array( $this, 'export_preview_data' ), 1000 );
+		wp_enqueue_script('customize-selective-refresh');
+		add_action('wp_footer', array($this, 'export_preview_data'), 1000);
 	}
 
 	/**
@@ -192,23 +192,23 @@ 
 	public function export_preview_data() {
 		$partials = array();
 
-		foreach ( $this->partials() as $partial ) {
-			if ( $partial->check_capabilities() ) {
-				$partials[ $partial->id ] = $partial->json();
+		foreach ($this->partials() as $partial) {
+			if ($partial->check_capabilities()) {
+				$partials[$partial->id] = $partial->json();
 			}
 		}
 
-		$switched_locale = switch_to_locale( get_user_locale() );
+		$switched_locale = switch_to_locale(get_user_locale());
 		$l10n = array(
-			'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
-			'clickEditMenu' => __( 'Click to edit this menu.' ),
-			'clickEditWidget' => __( 'Click to edit this widget.' ),
-			'clickEditTitle' => __( 'Click to edit the site title.' ),
-			'clickEditMisc' => __( 'Click to edit this element.' ),
+			'shiftClickToEdit' => __('Shift-click to edit this element.'),
+			'clickEditMenu' => __('Click to edit this menu.'),
+			'clickEditWidget' => __('Click to edit this widget.'),
+			'clickEditTitle' => __('Click to edit the site title.'),
+			'clickEditMisc' => __('Click to edit this element.'),
 			/* translators: %s: document.write() */
-			'badDocumentWrite' => sprintf( __( '%s is forbidden' ), 'document.write()' ),
+			'badDocumentWrite' => sprintf(__('%s is forbidden'), 'document.write()'),
 		);
-		if ( $switched_locale ) {
+		if ($switched_locale) {
 			restore_previous_locale();
 		}
 
@@ -219,7 +219,7 @@ 
 		);
 
 		// Export data to JS.
-		echo sprintf( '<script>var _customizePartialRefreshExports = %s;</script>', wp_json_encode( $exports ) );
+		echo sprintf('<script>var _customizePartialRefreshExports = %s;</script>', wp_json_encode($exports));
 	}
 
 	/**
@@ -233,14 +233,14 @@ 
 	 * @param array $partial_ids The partial ID to add.
 	 * @return array Added WP_Customize_Partial instances.
 	 */
-	public function add_dynamic_partials( $partial_ids ) {
+	public function add_dynamic_partials($partial_ids) {
 		$new_partials = array();
 
-		foreach ( $partial_ids as $partial_id ) {
+		foreach ($partial_ids as $partial_id) {
 
 			// Skip partials already created.
-			$partial = $this->get_partial( $partial_id );
-			if ( $partial ) {
+			$partial = $this->get_partial($partial_id);
+			if ($partial) {
 				continue;
 			}
 
@@ -259,8 +259,8 @@ 
 			 * @param false|array $partial_args The arguments to the WP_Customize_Partial constructor.
 			 * @param string      $partial_id   ID for dynamic partial.
 			 */
-			$partial_args = apply_filters( 'customize_dynamic_partial_args', $partial_args, $partial_id );
-			if ( false === $partial_args ) {
+			$partial_args = apply_filters('customize_dynamic_partial_args', $partial_args, $partial_id);
+			if (false === $partial_args) {
 				continue;
 			}
 
@@ -275,11 +275,11 @@ 
 			 * @param string $partial_id    ID for dynamic partial.
 			 * @param array  $partial_args  The arguments to the WP_Customize_Partial constructor.
 			 */
-			$partial_class = apply_filters( 'customize_dynamic_partial_class', $partial_class, $partial_id, $partial_args );
+			$partial_class = apply_filters('customize_dynamic_partial_class', $partial_class, $partial_id, $partial_args);
 
-			$partial = new $partial_class( $this, $partial_id, $partial_args );
+			$partial = new $partial_class($this, $partial_id, $partial_args);
 
-			$this->add_partial( $partial );
+			$this->add_partial($partial);
 			$new_partials[] = $partial;
 		}
 		return $new_partials;
@@ -297,7 +297,7 @@ 
 	 * @return bool Whether the request is for rendering partials.
 	 */
 	public function is_render_partials_request() {
-		return ! empty( $_POST[ self::RENDER_QUERY_VAR ] );
+		return ! empty($_POST[self::RENDER_QUERY_VAR]);
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	 * @param string $errline Error line.
 	 * @return true Always true.
 	 */
-	public function handle_error( $errno, $errstr, $errfile = null, $errline = null ) {
+	public function handle_error($errno, $errstr, $errfile = null, $errline = null) {
 		$this->triggered_errors[] = array(
 			'partial'      => $this->current_partial_id,
 			'error_number' => $errno,
@@ -332,7 +332,7 @@ 
 	 * @access public
 	 */
 	public function handle_render_partials_request() {
-		if ( ! $this->is_render_partials_request() ) {
+		if ( ! $this->is_render_partials_request()) {
 			return;
 		}
 
@@ -341,22 +341,22 @@ 
 		 * user passed the 'customize' capability check and the nonce check, since
 		 * WP_Customize_Manager::setup_theme() is where the previewing flag is set.
 		 */
-		if ( ! is_customize_preview() ) {
-			wp_send_json_error( 'expected_customize_preview', 403 );
-		} elseif ( ! isset( $_POST['partials'] ) ) {
-			wp_send_json_error( 'missing_partials', 400 );
+		if ( ! is_customize_preview()) {
+			wp_send_json_error('expected_customize_preview', 403);
+		} elseif ( ! isset($_POST['partials'])) {
+			wp_send_json_error('missing_partials', 400);
 		}
 
 		// Ensure that doing selective refresh on 404 template doesn't result in fallback rendering behavior (full refreshes).
-		status_header( 200 );
+		status_header(200);
 
-		$partials = json_decode( wp_unslash( $_POST['partials'] ), true );
+		$partials = json_decode(wp_unslash($_POST['partials']), true);
 
-		if ( ! is_array( $partials ) ) {
-			wp_send_json_error( 'malformed_partials' );
+		if ( ! is_array($partials)) {
+			wp_send_json_error('malformed_partials');
 		}
 
-		$this->add_dynamic_partials( array_keys( $partials ) );
+		$this->add_dynamic_partials(array_keys($partials));
 
 		/**
 		 * Fires immediately before partials are rendered.
@@ -371,35 +371,35 @@ 
 		 *                                                 The array is keyed by partial ID, with each item being an array of
 		 *                                                 the placements' context data.
 		 */
-		do_action( 'customize_render_partials_before', $this, $partials );
+		do_action('customize_render_partials_before', $this, $partials);
 
-		set_error_handler( array( $this, 'handle_error' ), error_reporting() );
+		set_error_handler(array($this, 'handle_error'), error_reporting());
 
 		$contents = array();
 
-		foreach ( $partials as $partial_id => $container_contexts ) {
+		foreach ($partials as $partial_id => $container_contexts) {
 			$this->current_partial_id = $partial_id;
 
-			if ( ! is_array( $container_contexts ) ) {
-				wp_send_json_error( 'malformed_container_contexts' );
+			if ( ! is_array($container_contexts)) {
+				wp_send_json_error('malformed_container_contexts');
 			}
 
-			$partial = $this->get_partial( $partial_id );
+			$partial = $this->get_partial($partial_id);
 
-			if ( ! $partial || ! $partial->check_capabilities() ) {
-				$contents[ $partial_id ] = null;
+			if ( ! $partial || ! $partial->check_capabilities()) {
+				$contents[$partial_id] = null;
 				continue;
 			}
 
-			$contents[ $partial_id ] = array();
+			$contents[$partial_id] = array();
 
 			// @todo The array should include not only the contents, but also whether the container is included?
-			if ( empty( $container_contexts ) ) {
+			if (empty($container_contexts)) {
 				// Since there are no container contexts, render just once.
-				$contents[ $partial_id ][] = $partial->render( null );
+				$contents[$partial_id][] = $partial->render(null);
 			} else {
-				foreach ( $container_contexts as $container_context ) {
-					$contents[ $partial_id ][] = $partial->render( $container_context );
+				foreach ($container_contexts as $container_context) {
+					$contents[$partial_id][] = $partial->render($container_context);
 				}
 			}
 		}
@@ -420,18 +420,18 @@ 
 		 *                                                 The array is keyed by partial ID, with each item being an array of
 		 *                                                 the placements' context data.
 		 */
-		do_action( 'customize_render_partials_after', $this, $partials );
+		do_action('customize_render_partials_after', $this, $partials);
 
 		$response = array(
 			'contents' => $contents,
 		);
 
-		if ( defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG_DISPLAY ) {
+		if (defined('WP_DEBUG_DISPLAY') && WP_DEBUG_DISPLAY) {
 			$response['errors'] = $this->triggered_errors;
 		}
 
-		$setting_validities = $this->manager->validate_setting_values( $this->manager->unsanitized_post_values() );
-		$exported_setting_validities = array_map( array( $this->manager, 'prepare_setting_validity_for_js' ), $setting_validities );
+		$setting_validities = $this->manager->validate_setting_values($this->manager->unsanitized_post_values());
+		$exported_setting_validities = array_map(array($this->manager, 'prepare_setting_validity_for_js'), $setting_validities);
 		$response['setting_validities'] = $exported_setting_validities;
 
 		/**
@@ -464,8 +464,8 @@ 
 		 *                                                 The array is keyed by partial ID, with each item being an array of
 		 *                                                 the placements' context data.
 		 */
-		$response = apply_filters( 'customize_render_partials_response', $response, $this, $partials );
+		$response = apply_filters('customize_render_partials_response', $response, $this, $partials);
 
-		wp_send_json_success( $response );
+		wp_send_json_success($response);
 	}
 }

src/wp-includes/pluggable.php

Doc Comments +7 added lines, -7 removed lines

@@ -742,7 +742,7 @@ 
  *
  * @param string $cookie
  * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in
- * @return array|false Authentication cookie components
+ * @return string Authentication cookie components
  */
 function wp_parse_auth_cookie($cookie = '', $scheme = '') {
 	if ( empty($cookie) ) {
@@ -1041,7 +1041,7 @@ 
  *
  * @since 1.2.0
  *
- * @param int|string $action    Action nonce.
+ * @param integer $action    Action nonce.
  * @param string     $query_arg Optional. Key to check for nonce in `$_REQUEST` (since 2.5).
  *                              Default '_wpnonce'.
  * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
@@ -1081,7 +1081,7 @@ 
  *
  * @since 2.0.3
  *
- * @param int|string   $action    Action nonce.
+ * @param integer   $action    Action nonce.
  * @param false|string $query_arg Optional. Key to check for the nonce in `$_REQUEST` (since 2.5). If false,
  *                                `$_REQUEST` values will be evaluated for '_ajax_nonce', and '_wpnonce'
  *                                (in that order). Default false.
@@ -1531,7 +1531,7 @@ 
  * should be notified, overriding the site setting.
  *
  * @param int $comment_id Comment ID.
- * @return true Always returns true.
+ * @return boolean Always returns true.
  */
 function wp_notify_moderator($comment_id) {
 	global $wpdb;
@@ -1782,8 +1782,8 @@ 
  * @since 2.0.3
  *
  * @param string     $nonce  Nonce that was used in the form to verify
- * @param string|int $action Should give context to what is taking place and be the same when nonce was created.
- * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
+ * @param integer $action Should give context to what is taking place and be the same when nonce was created.
+ * @return string False if the nonce is invalid, 1 if the nonce is valid and generated between
  *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
  */
 function wp_verify_nonce( $nonce, $action = -1 ) {
@@ -1846,7 +1846,7 @@ 
  * @since 2.0.3
  * @since 4.0.0 Session tokens were integrated with nonce creation
  *
- * @param string|int $action Scalar value to add context to the nonce.
+ * @param integer $action Scalar value to add context to the nonce.
  * @return string The token.
  */
 function wp_create_nonce($action = -1) {

Indentation +1 added lines, -1 removed lines

@@ -764,7 +764,7 @@
 					$cookie_name = AUTH_COOKIE;
 					$scheme = 'auth';
 				}
-	    }
+		}
 
 		if ( empty($_COOKIE[$cookie_name]) )
 			return false;

Spacing +535 added lines, -535 removed lines

@@ -6,7 +6,7 @@ 
  * @package WordPress
  */
 
-if ( !function_exists('wp_set_current_user') ) :
+if ( ! function_exists('wp_set_current_user')) :
 /**
  * Changes the current user by ID or name.
  *
@@ -27,30 +27,30 @@ 
 	global $current_user;
 
 	// If `$id` matches the user who's already current, there's nothing to do.
-	if ( isset( $current_user )
-		&& ( $current_user instanceof WP_User )
-		&& ( $id == $current_user->ID )
-		&& ( null !== $id )
+	if (isset($current_user)
+		&& ($current_user instanceof WP_User)
+		&& ($id == $current_user->ID)
+		&& (null !== $id)
 	) {
 		return $current_user;
 	}
 
-	$current_user = new WP_User( $id, $name );
+	$current_user = new WP_User($id, $name);
 
-	setup_userdata( $current_user->ID );
+	setup_userdata($current_user->ID);
 
 	/**
 	 * Fires after the current user is set.
 	 *
 	 * @since 2.0.1
 	 */
-	do_action( 'set_current_user' );
+	do_action('set_current_user');
 
 	return $current_user;
 }
 endif;
 
-if ( !function_exists('wp_get_current_user') ) :
+if ( ! function_exists('wp_get_current_user')) :
 /**
  * Retrieve the current user object.
  *
@@ -70,7 +70,7 @@ 
 }
 endif;
 
-if ( !function_exists('get_userdata') ) :
+if ( ! function_exists('get_userdata')) :
 /**
  * Retrieve user info by user ID.
  *
@@ -79,12 +79,12 @@ 
  * @param int $user_id User ID
  * @return WP_User|false WP_User object on success, false on failure.
  */
-function get_userdata( $user_id ) {
-	return get_user_by( 'id', $user_id );
+function get_userdata($user_id) {
+	return get_user_by('id', $user_id);
 }
 endif;
 
-if ( !function_exists('get_user_by') ) :
+if ( ! function_exists('get_user_by')) :
 /**
  * Retrieve user info by a given field
  *
@@ -95,20 +95,20 @@ 
  * @param int|string $value A value for $field. A user ID, slug, email address, or login name.
  * @return WP_User|false WP_User object on success, false on failure.
  */
-function get_user_by( $field, $value ) {
-	$userdata = WP_User::get_data_by( $field, $value );
+function get_user_by($field, $value) {
+	$userdata = WP_User::get_data_by($field, $value);
 
-	if ( !$userdata )
+	if ( ! $userdata)
 		return false;
 
 	$user = new WP_User;
-	$user->init( $userdata );
+	$user->init($userdata);
 
 	return $user;
 }
 endif;
 
-if ( !function_exists('cache_users') ) :
+if ( ! function_exists('cache_users')) :
 /**
  * Retrieve info for user lists to prevent multiple queries by get_userdata()
  *
@@ -118,28 +118,28 @@ 
  *
  * @param array $user_ids User ID numbers list
  */
-function cache_users( $user_ids ) {
+function cache_users($user_ids) {
 	global $wpdb;
 
-	$clean = _get_non_cached_ids( $user_ids, 'users' );
+	$clean = _get_non_cached_ids($user_ids, 'users');
 
-	if ( empty( $clean ) )
+	if (empty($clean))
 		return;
 
-	$list = implode( ',', $clean );
+	$list = implode(',', $clean);
 
-	$users = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($list)" );
+	$users = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE ID IN ($list)");
 
 	$ids = array();
-	foreach ( $users as $user ) {
-		update_user_caches( $user );
+	foreach ($users as $user) {
+		update_user_caches($user);
 		$ids[] = $user->ID;
 	}
-	update_meta_cache( 'user', $ids );
+	update_meta_cache('user', $ids);
 }
 endif;
 
-if ( !function_exists( 'wp_mail' ) ) :
+if ( ! function_exists('wp_mail')) :
 /**
  * Send mail, similar to PHP's mail
  *
@@ -170,7 +170,7 @@ 
  * @param string|array $attachments Optional. Files to attach.
  * @return bool Whether the email contents were sent successfully.
  */
-function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() ) {
+function wp_mail($to, $subject, $message, $headers = '', $attachments = array()) {
 	// Compact the input, apply the filters, and extract them back out
 
 	/**
@@ -181,126 +181,126 @@ 
 	 * @param array $args A compacted array of wp_mail() arguments, including the "to" email,
 	 *                    subject, message, headers, and attachments values.
 	 */
-	$atts = apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) );
+	$atts = apply_filters('wp_mail', compact('to', 'subject', 'message', 'headers', 'attachments'));
 
-	if ( isset( $atts['to'] ) ) {
+	if (isset($atts['to'])) {
 		$to = $atts['to'];
 	}
 
-	if ( !is_array( $to ) ) {
-		$to = explode( ',', $to );
+	if ( ! is_array($to)) {
+		$to = explode(',', $to);
 	}
 
-	if ( isset( $atts['subject'] ) ) {
+	if (isset($atts['subject'])) {
 		$subject = $atts['subject'];
 	}
 
-	if ( isset( $atts['message'] ) ) {
+	if (isset($atts['message'])) {
 		$message = $atts['message'];
 	}
 
-	if ( isset( $atts['headers'] ) ) {
+	if (isset($atts['headers'])) {
 		$headers = $atts['headers'];
 	}
 
-	if ( isset( $atts['attachments'] ) ) {
+	if (isset($atts['attachments'])) {
 		$attachments = $atts['attachments'];
 	}
 
-	if ( ! is_array( $attachments ) ) {
-		$attachments = explode( "\n", str_replace( "\r\n", "\n", $attachments ) );
+	if ( ! is_array($attachments)) {
+		$attachments = explode("\n", str_replace("\r\n", "\n", $attachments));
 	}
 	global $phpmailer;
 
 	// (Re)create it, if it's gone missing
-	if ( ! ( $phpmailer instanceof PHPMailer ) ) {
-		require_once ABSPATH . WPINC . '/class-phpmailer.php';
-		require_once ABSPATH . WPINC . '/class-smtp.php';
-		$phpmailer = new PHPMailer( true );
+	if ( ! ($phpmailer instanceof PHPMailer)) {
+		require_once ABSPATH.WPINC.'/class-phpmailer.php';
+		require_once ABSPATH.WPINC.'/class-smtp.php';
+		$phpmailer = new PHPMailer(true);
 	}
 
 	// Headers
 	$cc = $bcc = $reply_to = array();
 
-	if ( empty( $headers ) ) {
+	if (empty($headers)) {
 		$headers = array();
 	} else {
-		if ( !is_array( $headers ) ) {
+		if ( ! is_array($headers)) {
 			// Explode the headers out, so this function can take both
 			// string headers and an array of headers.
-			$tempheaders = explode( "\n", str_replace( "\r\n", "\n", $headers ) );
+			$tempheaders = explode("\n", str_replace("\r\n", "\n", $headers));
 		} else {
 			$tempheaders = $headers;
 		}
 		$headers = array();
 
 		// If it's actually got contents
-		if ( !empty( $tempheaders ) ) {
+		if ( ! empty($tempheaders)) {
 			// Iterate through the raw headers
-			foreach ( (array) $tempheaders as $header ) {
-				if ( strpos($header, ':') === false ) {
-					if ( false !== stripos( $header, 'boundary=' ) ) {
-						$parts = preg_split('/boundary=/i', trim( $header ) );
-						$boundary = trim( str_replace( array( "'", '"' ), '', $parts[1] ) );
+			foreach ((array) $tempheaders as $header) {
+				if (strpos($header, ':') === false) {
+					if (false !== stripos($header, 'boundary=')) {
+						$parts = preg_split('/boundary=/i', trim($header));
+						$boundary = trim(str_replace(array("'", '"'), '', $parts[1]));
 					}
 					continue;
 				}
 				// Explode them out
-				list( $name, $content ) = explode( ':', trim( $header ), 2 );
+				list($name, $content) = explode(':', trim($header), 2);
 
 				// Cleanup crew
-				$name    = trim( $name    );
-				$content = trim( $content );
+				$name    = trim($name);
+				$content = trim($content);
 
-				switch ( strtolower( $name ) ) {
+				switch (strtolower($name)) {
 					// Mainly for legacy -- process a From: header if it's there
 					case 'from':
-						$bracket_pos = strpos( $content, '<' );
-						if ( $bracket_pos !== false ) {
+						$bracket_pos = strpos($content, '<');
+						if ($bracket_pos !== false) {
 							// Text before the bracketed email is the "From" name.
-							if ( $bracket_pos > 0 ) {
-								$from_name = substr( $content, 0, $bracket_pos - 1 );
-								$from_name = str_replace( '"', '', $from_name );
-								$from_name = trim( $from_name );
+							if ($bracket_pos > 0) {
+								$from_name = substr($content, 0, $bracket_pos - 1);
+								$from_name = str_replace('"', '', $from_name);
+								$from_name = trim($from_name);
 							}
 
-							$from_email = substr( $content, $bracket_pos + 1 );
-							$from_email = str_replace( '>', '', $from_email );
-							$from_email = trim( $from_email );
+							$from_email = substr($content, $bracket_pos + 1);
+							$from_email = str_replace('>', '', $from_email);
+							$from_email = trim($from_email);
 
 						// Avoid setting an empty $from_email.
-						} elseif ( '' !== trim( $content ) ) {
-							$from_email = trim( $content );
+						} elseif ('' !== trim($content)) {
+							$from_email = trim($content);
 						}
 						break;
 					case 'content-type':
-						if ( strpos( $content, ';' ) !== false ) {
-							list( $type, $charset_content ) = explode( ';', $content );
-							$content_type = trim( $type );
-							if ( false !== stripos( $charset_content, 'charset=' ) ) {
-								$charset = trim( str_replace( array( 'charset=', '"' ), '', $charset_content ) );
-							} elseif ( false !== stripos( $charset_content, 'boundary=' ) ) {
-								$boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset_content ) );
+						if (strpos($content, ';') !== false) {
+							list($type, $charset_content) = explode(';', $content);
+							$content_type = trim($type);
+							if (false !== stripos($charset_content, 'charset=')) {
+								$charset = trim(str_replace(array('charset=', '"'), '', $charset_content));
+							} elseif (false !== stripos($charset_content, 'boundary=')) {
+								$boundary = trim(str_replace(array('BOUNDARY=', 'boundary=', '"'), '', $charset_content));
 								$charset = '';
 							}
 
 						// Avoid setting an empty $content_type.
-						} elseif ( '' !== trim( $content ) ) {
-							$content_type = trim( $content );
+						} elseif ('' !== trim($content)) {
+							$content_type = trim($content);
 						}
 						break;
 					case 'cc':
-						$cc = array_merge( (array) $cc, explode( ',', $content ) );
+						$cc = array_merge((array) $cc, explode(',', $content));
 						break;
 					case 'bcc':
-						$bcc = array_merge( (array) $bcc, explode( ',', $content ) );
+						$bcc = array_merge((array) $bcc, explode(',', $content));
 						break;
 					case 'reply-to':
-						$reply_to = array_merge( (array) $reply_to, explode( ',', $content ) );
+						$reply_to = array_merge((array) $reply_to, explode(',', $content));
 						break;
 					default:
 						// Add it to our grand headers array
-						$headers[trim( $name )] = trim( $content );
+						$headers[trim($name)] = trim($content);
 						break;
 				}
 			}
@@ -315,7 +315,7 @@ 
 
 	// From email and name
 	// If we don't have a name from the input headers
-	if ( !isset( $from_name ) )
+	if ( ! isset($from_name))
 		$from_name = 'WordPress';
 
 	/* If we don't have an email from the input headers default to wordpress@$sitename
@@ -325,14 +325,14 @@ 
 	 * https://core.trac.wordpress.org/ticket/5007.
 	 */
 
-	if ( !isset( $from_email ) ) {
+	if ( ! isset($from_email)) {
 		// Get the site domain and get rid of www.
-		$sitename = strtolower( $_SERVER['SERVER_NAME'] );
-		if ( substr( $sitename, 0, 4 ) == 'www.' ) {
-			$sitename = substr( $sitename, 4 );
+		$sitename = strtolower($_SERVER['SERVER_NAME']);
+		if (substr($sitename, 0, 4) == 'www.') {
+			$sitename = substr($sitename, 4);
 		}
 
-		$from_email = 'wordpress@' . $sitename;
+		$from_email = 'wordpress@'.$sitename;
 	}
 
 	/**
@@ -342,7 +342,7 @@ 
 	 *
 	 * @param string $from_email Email address to send from.
 	 */
-	$from_email = apply_filters( 'wp_mail_from', $from_email );
+	$from_email = apply_filters('wp_mail_from', $from_email);
 
 	/**
 	 * Filters the name to associate with the "from" email address.
@@ -351,16 +351,16 @@ 
 	 *
 	 * @param string $from_name Name associated with the "from" email address.
 	 */
-	$from_name = apply_filters( 'wp_mail_from_name', $from_name );
+	$from_name = apply_filters('wp_mail_from_name', $from_name);
 
 	try {
-		$phpmailer->setFrom( $from_email, $from_name, false );
-	} catch ( phpmailerException $e ) {
-		$mail_error_data = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
+		$phpmailer->setFrom($from_email, $from_name, false);
+	} catch (phpmailerException $e) {
+		$mail_error_data = compact('to', 'subject', 'message', 'headers', 'attachments');
 		$mail_error_data['phpmailer_exception_code'] = $e->getCode();
 
 		/** This filter is documented in wp-includes/pluggable.php */
-		do_action( 'wp_mail_failed', new WP_Error( 'wp_mail_failed', $e->getMessage(), $mail_error_data ) );
+		do_action('wp_mail_failed', new WP_Error('wp_mail_failed', $e->getMessage(), $mail_error_data));
 
 		return false;
 	}
@@ -370,40 +370,40 @@ 
 	$phpmailer->Body    = $message;
 
 	// Set destination addresses, using appropriate methods for handling addresses
-	$address_headers = compact( 'to', 'cc', 'bcc', 'reply_to' );
+	$address_headers = compact('to', 'cc', 'bcc', 'reply_to');
 
-	foreach ( $address_headers as $address_header => $addresses ) {
-		if ( empty( $addresses ) ) {
+	foreach ($address_headers as $address_header => $addresses) {
+		if (empty($addresses)) {
 			continue;
 		}
 
-		foreach ( (array) $addresses as $address ) {
+		foreach ((array) $addresses as $address) {
 			try {
 				// Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
 				$recipient_name = '';
 
-				if ( preg_match( '/(.*)<(.+)>/', $address, $matches ) ) {
-					if ( count( $matches ) == 3 ) {
+				if (preg_match('/(.*)<(.+)>/', $address, $matches)) {
+					if (count($matches) == 3) {
 						$recipient_name = $matches[1];
 						$address        = $matches[2];
 					}
 				}
 
-				switch ( $address_header ) {
+				switch ($address_header) {
 					case 'to':
-						$phpmailer->addAddress( $address, $recipient_name );
+						$phpmailer->addAddress($address, $recipient_name);
 						break;
 					case 'cc':
-						$phpmailer->addCc( $address, $recipient_name );
+						$phpmailer->addCc($address, $recipient_name);
 						break;
 					case 'bcc':
-						$phpmailer->addBcc( $address, $recipient_name );
+						$phpmailer->addBcc($address, $recipient_name);
 						break;
 					case 'reply_to':
-						$phpmailer->addReplyTo( $address, $recipient_name );
+						$phpmailer->addReplyTo($address, $recipient_name);
 						break;
 				}
-			} catch ( phpmailerException $e ) {
+			} catch (phpmailerException $e) {
 				continue;
 			}
 		}
@@ -414,7 +414,7 @@ 
 
 	// Set Content-Type and charset
 	// If we don't have a content-type from the input headers
-	if ( !isset( $content_type ) )
+	if ( ! isset($content_type))
 		$content_type = 'text/plain';
 
 	/**
@@ -424,17 +424,17 @@ 
 	 *
 	 * @param string $content_type Default wp_mail() content type.
 	 */
-	$content_type = apply_filters( 'wp_mail_content_type', $content_type );
+	$content_type = apply_filters('wp_mail_content_type', $content_type);
 
 	$phpmailer->ContentType = $content_type;
 
 	// Set whether it's plaintext, depending on $content_type
-	if ( 'text/html' == $content_type )
-		$phpmailer->isHTML( true );
+	if ('text/html' == $content_type)
+		$phpmailer->isHTML(true);
 
 	// If we don't have a charset from the input headers
-	if ( !isset( $charset ) )
-		$charset = get_bloginfo( 'charset' );
+	if ( ! isset($charset))
+		$charset = get_bloginfo('charset');
 
 	// Set the content-type and charset
 
@@ -445,23 +445,23 @@ 
 	 *
 	 * @param string $charset Default email charset.
 	 */
-	$phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset );
+	$phpmailer->CharSet = apply_filters('wp_mail_charset', $charset);
 
 	// Set custom headers
-	if ( !empty( $headers ) ) {
-		foreach ( (array) $headers as $name => $content ) {
-			$phpmailer->addCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
+	if ( ! empty($headers)) {
+		foreach ((array) $headers as $name => $content) {
+			$phpmailer->addCustomHeader(sprintf('%1$s: %2$s', $name, $content));
 		}
 
-		if ( false !== stripos( $content_type, 'multipart' ) && ! empty($boundary) )
-			$phpmailer->addCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
+		if (false !== stripos($content_type, 'multipart') && ! empty($boundary))
+			$phpmailer->addCustomHeader(sprintf("Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary));
 	}
 
-	if ( !empty( $attachments ) ) {
-		foreach ( $attachments as $attachment ) {
+	if ( ! empty($attachments)) {
+		foreach ($attachments as $attachment) {
 			try {
 				$phpmailer->addAttachment($attachment);
-			} catch ( phpmailerException $e ) {
+			} catch (phpmailerException $e) {
 				continue;
 			}
 		}
@@ -474,14 +474,14 @@ 
 	 *
 	 * @param PHPMailer &$phpmailer The PHPMailer instance, passed by reference.
 	 */
-	do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) );
+	do_action_ref_array('phpmailer_init', array(&$phpmailer));
 
 	// Send!
 	try {
 		return $phpmailer->send();
-	} catch ( phpmailerException $e ) {
+	} catch (phpmailerException $e) {
 
-		$mail_error_data = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
+		$mail_error_data = compact('to', 'subject', 'message', 'headers', 'attachments');
 		$mail_error_data['phpmailer_exception_code'] = $e->getCode();
 
 		/**
@@ -492,14 +492,14 @@ 
 		 * @param WP_Error $error A WP_Error object with the phpmailerException message, and an array
 		 *                        containing the mail recipient, subject, message, headers, and attachments.
 		 */
-		do_action( 'wp_mail_failed', new WP_Error( 'wp_mail_failed', $e->getMessage(), $mail_error_data ) );
+		do_action('wp_mail_failed', new WP_Error('wp_mail_failed', $e->getMessage(), $mail_error_data));
 
 		return false;
 	}
 }
 endif;
 
-if ( !function_exists('wp_authenticate') ) :
+if ( ! function_exists('wp_authenticate')) :
 /**
  * Authenticate a user, confirming the login credentials are valid.
  *
@@ -529,17 +529,17 @@ 
 	 * @param string                $username Username or email address.
 	 * @param string                $password User password
 	 */
-	$user = apply_filters( 'authenticate', null, $username, $password );
+	$user = apply_filters('authenticate', null, $username, $password);
 
-	if ( $user == null ) {
+	if ($user == null) {
 		// TODO what should the error message be? (Or would these even happen?)
 		// Only needed if all authentication handlers fail to return anything.
-		$user = new WP_Error( 'authentication_failed', __( '<strong>ERROR</strong>: Invalid username, email address or incorrect password.' ) );
+		$user = new WP_Error('authentication_failed', __('<strong>ERROR</strong>: Invalid username, email address or incorrect password.'));
 	}
 
 	$ignore_codes = array('empty_username', 'empty_password');
 
-	if (is_wp_error($user) && !in_array($user->get_error_code(), $ignore_codes) ) {
+	if (is_wp_error($user) && ! in_array($user->get_error_code(), $ignore_codes)) {
 		/**
 		 * Fires after a user login has failed.
 		 *
@@ -548,14 +548,14 @@ 
 		 *
 		 * @param string $username Username or email address.
 		 */
-		do_action( 'wp_login_failed', $username );
+		do_action('wp_login_failed', $username);
 	}
 
 	return $user;
 }
 endif;
 
-if ( !function_exists('wp_logout') ) :
+if ( ! function_exists('wp_logout')) :
 /**
  * Log the current user out.
  *
@@ -570,11 +570,11 @@ 
 	 *
 	 * @since 1.5.0
 	 */
-	do_action( 'wp_logout' );
+	do_action('wp_logout');
 }
 endif;
 
-if ( !function_exists('wp_validate_auth_cookie') ) :
+if ( ! function_exists('wp_validate_auth_cookie')) :
 /**
  * Validates authentication cookie.
  *
@@ -593,7 +593,7 @@ 
  * @return false|int False if invalid cookie, User ID if valid.
  */
 function wp_validate_auth_cookie($cookie = '', $scheme = '') {
-	if ( ! $cookie_elements = wp_parse_auth_cookie($cookie, $scheme) ) {
+	if ( ! $cookie_elements = wp_parse_auth_cookie($cookie, $scheme)) {
 		/**
 		 * Fires if an authentication cookie is malformed.
 		 *
@@ -603,7 +603,7 @@ 
 		 * @param string $scheme Authentication scheme. Values include 'auth', 'secure_auth',
 		 *                       or 'logged_in'.
 		 */
-		do_action( 'auth_cookie_malformed', $cookie, $scheme );
+		do_action('auth_cookie_malformed', $cookie, $scheme);
 		return false;
 	}
 
@@ -614,12 +614,12 @@ 
 	$expired = $expiration = $cookie_elements['expiration'];
 
 	// Allow a grace period for POST and Ajax requests
-	if ( wp_doing_ajax() || 'POST' == $_SERVER['REQUEST_METHOD'] ) {
+	if (wp_doing_ajax() || 'POST' == $_SERVER['REQUEST_METHOD']) {
 		$expired += HOUR_IN_SECONDS;
 	}
 
 	// Quick check to see if an honest cookie has expired
-	if ( $expired < time() ) {
+	if ($expired < time()) {
 		/**
 		 * Fires once an authentication cookie has expired.
 		 *
@@ -627,12 +627,12 @@ 
 		 *
 		 * @param array $cookie_elements An array of data for the authentication cookie.
 		 */
-		do_action( 'auth_cookie_expired', $cookie_elements );
+		do_action('auth_cookie_expired', $cookie_elements);
 		return false;
 	}
 
 	$user = get_user_by('login', $username);
-	if ( ! $user ) {
+	if ( ! $user) {
 		/**
 		 * Fires if a bad username is entered in the user authentication process.
 		 *
@@ -640,19 +640,19 @@ 
 		 *
 		 * @param array $cookie_elements An array of data for the authentication cookie.
 		 */
-		do_action( 'auth_cookie_bad_username', $cookie_elements );
+		do_action('auth_cookie_bad_username', $cookie_elements);
 		return false;
 	}
 
 	$pass_frag = substr($user->user_pass, 8, 4);
 
-	$key = wp_hash( $username . '|' . $pass_frag . '|' . $expiration . '|' . $token, $scheme );
+	$key = wp_hash($username.'|'.$pass_frag.'|'.$expiration.'|'.$token, $scheme);
 
 	// If ext/hash is not present, compat.php's hash_hmac() does not support sha256.
-	$algo = function_exists( 'hash' ) ? 'sha256' : 'sha1';
-	$hash = hash_hmac( $algo, $username . '|' . $expiration . '|' . $token, $key );
+	$algo = function_exists('hash') ? 'sha256' : 'sha1';
+	$hash = hash_hmac($algo, $username.'|'.$expiration.'|'.$token, $key);
 
-	if ( ! hash_equals( $hash, $hmac ) ) {
+	if ( ! hash_equals($hash, $hmac)) {
 		/**
 		 * Fires if a bad authentication cookie hash is encountered.
 		 *
@@ -660,18 +660,18 @@ 
 		 *
 		 * @param array $cookie_elements An array of data for the authentication cookie.
 		 */
-		do_action( 'auth_cookie_bad_hash', $cookie_elements );
+		do_action('auth_cookie_bad_hash', $cookie_elements);
 		return false;
 	}
 
-	$manager = WP_Session_Tokens::get_instance( $user->ID );
-	if ( ! $manager->verify( $token ) ) {
-		do_action( 'auth_cookie_bad_session_token', $cookie_elements );
+	$manager = WP_Session_Tokens::get_instance($user->ID);
+	if ( ! $manager->verify($token)) {
+		do_action('auth_cookie_bad_session_token', $cookie_elements);
 		return false;
 	}
 
 	// Ajax/POST grace period set above
-	if ( $expiration < time() ) {
+	if ($expiration < time()) {
 		$GLOBALS['login_grace_period'] = 1;
 	}
 
@@ -683,13 +683,13 @@ 
 	 * @param array   $cookie_elements An array of data for the authentication cookie.
 	 * @param WP_User $user            User object.
 	 */
-	do_action( 'auth_cookie_valid', $cookie_elements, $user );
+	do_action('auth_cookie_valid', $cookie_elements, $user);
 
 	return $user->ID;
 }
 endif;
 
-if ( !function_exists('wp_generate_auth_cookie') ) :
+if ( ! function_exists('wp_generate_auth_cookie')) :
 /**
  * Generate authentication cookie contents.
  *
@@ -701,26 +701,26 @@ 
  * @param string $token      User's session token to use for this cookie
  * @return string Authentication cookie contents. Empty string if user does not exist.
  */
-function wp_generate_auth_cookie( $user_id, $expiration, $scheme = 'auth', $token = '' ) {
+function wp_generate_auth_cookie($user_id, $expiration, $scheme = 'auth', $token = '') {
 	$user = get_userdata($user_id);
-	if ( ! $user ) {
+	if ( ! $user) {
 		return '';
 	}
 
-	if ( ! $token ) {
-		$manager = WP_Session_Tokens::get_instance( $user_id );
-		$token = $manager->create( $expiration );
+	if ( ! $token) {
+		$manager = WP_Session_Tokens::get_instance($user_id);
+		$token = $manager->create($expiration);
 	}
 
 	$pass_frag = substr($user->user_pass, 8, 4);
 
-	$key = wp_hash( $user->user_login . '|' . $pass_frag . '|' . $expiration . '|' . $token, $scheme );
+	$key = wp_hash($user->user_login.'|'.$pass_frag.'|'.$expiration.'|'.$token, $scheme);
 
 	// If ext/hash is not present, compat.php's hash_hmac() does not support sha256.
-	$algo = function_exists( 'hash' ) ? 'sha256' : 'sha1';
-	$hash = hash_hmac( $algo, $user->user_login . '|' . $expiration . '|' . $token, $key );
+	$algo = function_exists('hash') ? 'sha256' : 'sha1';
+	$hash = hash_hmac($algo, $user->user_login.'|'.$expiration.'|'.$token, $key);
 
-	$cookie = $user->user_login . '|' . $expiration . '|' . $token . '|' . $hash;
+	$cookie = $user->user_login.'|'.$expiration.'|'.$token.'|'.$hash;
 
 	/**
 	 * Filters the authentication cookie.
@@ -733,11 +733,11 @@ 
 	 * @param string $scheme     Cookie scheme used. Accepts 'auth', 'secure_auth', or 'logged_in'.
 	 * @param string $token      User's session token used.
 	 */
-	return apply_filters( 'auth_cookie', $cookie, $user_id, $expiration, $scheme, $token );
+	return apply_filters('auth_cookie', $cookie, $user_id, $expiration, $scheme, $token);
 }
 endif;
 
-if ( !function_exists('wp_parse_auth_cookie') ) :
+if ( ! function_exists('wp_parse_auth_cookie')) :
 /**
  * Parse a cookie into its components
  *
@@ -748,8 +748,8 @@ 
  * @return array|false Authentication cookie components
  */
 function wp_parse_auth_cookie($cookie = '', $scheme = '') {
-	if ( empty($cookie) ) {
-		switch ($scheme){
+	if (empty($cookie)) {
+		switch ($scheme) {
 			case 'auth':
 				$cookie_name = AUTH_COOKIE;
 				break;
@@ -760,7 +760,7 @@ 
 				$cookie_name = LOGGED_IN_COOKIE;
 				break;
 			default:
-				if ( is_ssl() ) {
+				if (is_ssl()) {
 					$cookie_name = SECURE_AUTH_COOKIE;
 					$scheme = 'secure_auth';
 				} else {
@@ -769,23 +769,23 @@ 
 				}
 	    }
 
-		if ( empty($_COOKIE[$cookie_name]) )
+		if (empty($_COOKIE[$cookie_name]))
 			return false;
 		$cookie = $_COOKIE[$cookie_name];
 	}
 
 	$cookie_elements = explode('|', $cookie);
-	if ( count( $cookie_elements ) !== 4 ) {
+	if (count($cookie_elements) !== 4) {
 		return false;
 	}
 
-	list( $username, $expiration, $token, $hmac ) = $cookie_elements;
+	list($username, $expiration, $token, $hmac) = $cookie_elements;
 
-	return compact( 'username', 'expiration', 'token', 'hmac', 'scheme' );
+	return compact('username', 'expiration', 'token', 'hmac', 'scheme');
 }
 endif;
 
-if ( !function_exists('wp_set_auth_cookie') ) :
+if ( ! function_exists('wp_set_auth_cookie')) :
 /**
  * Log in a user by setting authentication cookies.
  *
@@ -802,8 +802,8 @@ 
  *                         Default is_ssl().
  * @param string $token    Optional. User's session token to use for this cookie.
  */
-function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token = '' ) {
-	if ( $remember ) {
+function wp_set_auth_cookie($user_id, $remember = false, $secure = '', $token = '') {
+	if ($remember) {
 		/**
 		 * Filters the duration of the authentication cookie expiration period.
 		 *
@@ -813,25 +813,25 @@ 
 		 * @param int  $user_id  User ID.
 		 * @param bool $remember Whether to remember the user login. Default false.
 		 */
-		$expiration = time() + apply_filters( 'auth_cookie_expiration', 14 * DAY_IN_SECONDS, $user_id, $remember );
+		$expiration = time() + apply_filters('auth_cookie_expiration', 14 * DAY_IN_SECONDS, $user_id, $remember);
 
 		/*
 		 * Ensure the browser will continue to send the cookie after the expiration time is reached.
 		 * Needed for the login grace period in wp_validate_auth_cookie().
 		 */
-		$expire = $expiration + ( 12 * HOUR_IN_SECONDS );
+		$expire = $expiration + (12 * HOUR_IN_SECONDS);
 	} else {
 		/** This filter is documented in wp-includes/pluggable.php */
-		$expiration = time() + apply_filters( 'auth_cookie_expiration', 2 * DAY_IN_SECONDS, $user_id, $remember );
+		$expiration = time() + apply_filters('auth_cookie_expiration', 2 * DAY_IN_SECONDS, $user_id, $remember);
 		$expire = 0;
 	}
 
-	if ( '' === $secure ) {
+	if ('' === $secure) {
 		$secure = is_ssl();
 	}
 
 	// Front-end cookie is secure when the auth cookie is secure and the site's home URL is forced HTTPS.
-	$secure_logged_in_cookie = $secure && 'https' === parse_url( get_option( 'home' ), PHP_URL_SCHEME );
+	$secure_logged_in_cookie = $secure && 'https' === parse_url(get_option('home'), PHP_URL_SCHEME);
 
 	/**
 	 * Filters whether the connection is secure.
@@ -841,7 +841,7 @@ 
 	 * @param bool $secure  Whether the connection is secure.
 	 * @param int  $user_id User ID.
 	 */
-	$secure = apply_filters( 'secure_auth_cookie', $secure, $user_id );
+	$secure = apply_filters('secure_auth_cookie', $secure, $user_id);
 
 	/**
 	 * Filters whether to use a secure cookie when logged-in.
@@ -852,9 +852,9 @@ 
 	 * @param int  $user_id                 User ID.
 	 * @param bool $secure                  Whether the connection is secure.
 	 */
-	$secure_logged_in_cookie = apply_filters( 'secure_logged_in_cookie', $secure_logged_in_cookie, $user_id, $secure );
+	$secure_logged_in_cookie = apply_filters('secure_logged_in_cookie', $secure_logged_in_cookie, $user_id, $secure);
 
-	if ( $secure ) {
+	if ($secure) {
 		$auth_cookie_name = SECURE_AUTH_COOKIE;
 		$scheme = 'secure_auth';
 	} else {
@@ -862,13 +862,13 @@ 
 		$scheme = 'auth';
 	}
 
-	if ( '' === $token ) {
-		$manager = WP_Session_Tokens::get_instance( $user_id );
-		$token   = $manager->create( $expiration );
+	if ('' === $token) {
+		$manager = WP_Session_Tokens::get_instance($user_id);
+		$token   = $manager->create($expiration);
 	}
 
-	$auth_cookie = wp_generate_auth_cookie( $user_id, $expiration, $scheme, $token );
-	$logged_in_cookie = wp_generate_auth_cookie( $user_id, $expiration, 'logged_in', $token );
+	$auth_cookie = wp_generate_auth_cookie($user_id, $expiration, $scheme, $token);
+	$logged_in_cookie = wp_generate_auth_cookie($user_id, $expiration, 'logged_in', $token);
 
 	/**
 	 * Fires immediately before the authentication cookie is set.
@@ -883,7 +883,7 @@ 
 	 * @param int    $user_id     User ID.
 	 * @param string $scheme      Authentication scheme. Values include 'auth', 'secure_auth', or 'logged_in'.
 	 */
-	do_action( 'set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme );
+	do_action('set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme);
 
 	/**
 	 * Fires immediately before the logged-in authentication cookie is set.
@@ -898,7 +898,7 @@ 
 	 * @param int    $user_id          User ID.
 	 * @param string $scheme           Authentication scheme. Default 'logged_in'.
 	 */
-	do_action( 'set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in' );
+	do_action('set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in');
 
 	/**
 	 * Allows preventing auth cookies from actually being sent to the client.
@@ -907,19 +907,19 @@ 
 	 *
 	 * @param bool $send Whether to send auth cookies to the client.
 	 */
-	if ( ! apply_filters( 'send_auth_cookies', true ) ) {
+	if ( ! apply_filters('send_auth_cookies', true)) {
 		return;
 	}
 
 	setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
 	setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
 	setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-	if ( COOKIEPATH != SITECOOKIEPATH )
+	if (COOKIEPATH != SITECOOKIEPATH)
 		setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
 }
 endif;
 
-if ( !function_exists('wp_clear_auth_cookie') ) :
+if ( ! function_exists('wp_clear_auth_cookie')) :
 /**
  * Removes all of the cookies associated with authentication.
  *
@@ -931,40 +931,40 @@ 
 	 *
 	 * @since 2.7.0
 	 */
-	do_action( 'clear_auth_cookie' );
+	do_action('clear_auth_cookie');
 
 	/** This filter is documented in wp-includes/pluggable.php */
-	if ( ! apply_filters( 'send_auth_cookies', true ) ) {
+	if ( ! apply_filters('send_auth_cookies', true)) {
 		return;
 	}
 
 	// Auth cookies
-	setcookie( AUTH_COOKIE,        ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH,   COOKIE_DOMAIN );
-	setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH,   COOKIE_DOMAIN );
-	setcookie( AUTH_COOKIE,        ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN );
-	setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN );
-	setcookie( LOGGED_IN_COOKIE,   ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,          COOKIE_DOMAIN );
-	setcookie( LOGGED_IN_COOKIE,   ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH,      COOKIE_DOMAIN );
+	setcookie(AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN);
+	setcookie(SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN);
+	setcookie(AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN);
+	setcookie(SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN);
+	setcookie(LOGGED_IN_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN);
+	setcookie(LOGGED_IN_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN);
 
 	// Settings cookies
-	setcookie( 'wp-settings-' . get_current_user_id(),      ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH );
-	setcookie( 'wp-settings-time-' . get_current_user_id(), ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH );
+	setcookie('wp-settings-'.get_current_user_id(), ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH);
+	setcookie('wp-settings-time-'.get_current_user_id(), ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH);
 
 	// Old cookies
-	setcookie( AUTH_COOKIE,        ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,     COOKIE_DOMAIN );
-	setcookie( AUTH_COOKIE,        ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
-	setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,     COOKIE_DOMAIN );
-	setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
+	setcookie(AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN);
+	setcookie(AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN);
+	setcookie(SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN);
+	setcookie(SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN);
 
 	// Even older cookies
-	setcookie( USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,     COOKIE_DOMAIN );
-	setcookie( PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,     COOKIE_DOMAIN );
-	setcookie( USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
-	setcookie( PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
+	setcookie(USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN);
+	setcookie(PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN);
+	setcookie(USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN);
+	setcookie(PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN);
 }
 endif;
 
-if ( !function_exists('is_user_logged_in') ) :
+if ( ! function_exists('is_user_logged_in')) :
 /**
  * Checks if the current visitor is a logged in user.
  *
@@ -979,7 +979,7 @@ 
 }
 endif;
 
-if ( !function_exists('auth_redirect') ) :
+if ( ! function_exists('auth_redirect')) :
 /**
  * Checks if a user is logged in, if not it redirects them to the login page.
  *
@@ -988,7 +988,7 @@ 
 function auth_redirect() {
 	// Checks if a user is logged in, if not redirects them to the login page
 
-	$secure = ( is_ssl() || force_ssl_admin() );
+	$secure = (is_ssl() || force_ssl_admin());
 
 	/**
 	 * Filters whether to use a secure authentication redirect.
@@ -997,15 +997,15 @@ 
 	 *
 	 * @param bool $secure Whether to use a secure authentication redirect. Default false.
 	 */
-	$secure = apply_filters( 'secure_auth_redirect', $secure );
+	$secure = apply_filters('secure_auth_redirect', $secure);
 
 	// If https is required and request is http, redirect
-	if ( $secure && !is_ssl() && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) {
-		if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
-			wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
+	if ($secure && ! is_ssl() && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin')) {
+		if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {
+			wp_redirect(set_url_scheme($_SERVER['REQUEST_URI'], 'https'));
 			exit();
 		} else {
-			wp_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+			wp_redirect('https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 			exit();
 		}
 	}
@@ -1017,9 +1017,9 @@ 
 	 *
 	 * @param string $scheme Authentication redirect scheme. Default empty.
 	 */
-	$scheme = apply_filters( 'auth_redirect_scheme', '' );
+	$scheme = apply_filters('auth_redirect_scheme', '');
 
-	if ( $user_id = wp_validate_auth_cookie( '',  $scheme) ) {
+	if ($user_id = wp_validate_auth_cookie('', $scheme)) {
 		/**
 		 * Fires before the authentication redirect.
 		 *
@@ -1027,26 +1027,26 @@ 
 		 *
 		 * @param int $user_id User ID.
 		 */
-		do_action( 'auth_redirect', $user_id );
+		do_action('auth_redirect', $user_id);
 
 		// If the user wants ssl but the session is not ssl, redirect.
-		if ( !$secure && get_user_option('use_ssl', $user_id) && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) {
-			if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
-				wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
+		if ( ! $secure && get_user_option('use_ssl', $user_id) && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin')) {
+			if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {
+				wp_redirect(set_url_scheme($_SERVER['REQUEST_URI'], 'https'));
 				exit();
 			} else {
-				wp_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+				wp_redirect('https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 				exit();
 			}
 		}
 
-		return;  // The cookie is good so we're done
+		return; // The cookie is good so we're done
 	}
 
 	// The cookie is no good so force login
 	nocache_headers();
 
-	$redirect = ( strpos( $_SERVER['REQUEST_URI'], '/options.php' ) && wp_get_referer() ) ? wp_get_referer() : set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+	$redirect = (strpos($_SERVER['REQUEST_URI'], '/options.php') && wp_get_referer()) ? wp_get_referer() : set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 
 	$login_url = wp_login_url($redirect, true);
 
@@ -1055,7 +1055,7 @@ 
 }
 endif;
 
-if ( !function_exists('check_admin_referer') ) :
+if ( ! function_exists('check_admin_referer')) :
 /**
  * Makes sure that a user was referred from another admin page.
  *
@@ -1069,9 +1069,9 @@ 
  * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
  *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
  */
-function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
+function check_admin_referer($action = -1, $query_arg = '_wpnonce') {
 	if ( -1 == $action )
-		_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );
+		_doing_it_wrong(__FUNCTION__, __('You should specify a nonce action to be verified by using the first parameter.'), '3.2.0');
 
 	$adminurl = strtolower(admin_url());
 	$referer = strtolower(wp_get_referer());
@@ -1086,10 +1086,10 @@ 
 	 * @param false|int $result False if the nonce is invalid, 1 if the nonce is valid and generated between
 	 *                          0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
 	 */
-	do_action( 'check_admin_referer', $action, $result );
+	do_action('check_admin_referer', $action, $result);
 
-	if ( ! $result && ! ( -1 == $action && strpos( $referer, $adminurl ) === 0 ) ) {
-		wp_nonce_ays( $action );
+	if ( ! $result && ! ( -1 == $action && strpos($referer, $adminurl) === 0 )) {
+		wp_nonce_ays($action);
 		die();
 	}
 
@@ -1097,7 +1097,7 @@ 
 }
 endif;
 
-if ( !function_exists('check_ajax_referer') ) :
+if ( ! function_exists('check_ajax_referer')) :
 /**
  * Verifies the Ajax request to prevent processing requests external of the blog.
  *
@@ -1112,21 +1112,21 @@ 
  * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
  *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
  */
-function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
+function check_ajax_referer($action = -1, $query_arg = false, $die = true) {
 	if ( -1 == $action ) {
-		_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '4.7' );
+		_doing_it_wrong(__FUNCTION__, __('You should specify a nonce action to be verified by using the first parameter.'), '4.7');
 	}
 
 	$nonce = '';
 
-	if ( $query_arg && isset( $_REQUEST[ $query_arg ] ) )
-		$nonce = $_REQUEST[ $query_arg ];
-	elseif ( isset( $_REQUEST['_ajax_nonce'] ) )
+	if ($query_arg && isset($_REQUEST[$query_arg]))
+		$nonce = $_REQUEST[$query_arg];
+	elseif (isset($_REQUEST['_ajax_nonce']))
 		$nonce = $_REQUEST['_ajax_nonce'];
-	elseif ( isset( $_REQUEST['_wpnonce'] ) )
+	elseif (isset($_REQUEST['_wpnonce']))
 		$nonce = $_REQUEST['_wpnonce'];
 
-	$result = wp_verify_nonce( $nonce, $action );
+	$result = wp_verify_nonce($nonce, $action);
 
 	/**
 	 * Fires once the Ajax request has been validated or not.
@@ -1137,13 +1137,13 @@ 
 	 * @param false|int $result False if the nonce is invalid, 1 if the nonce is valid and generated between
 	 *                          0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
 	 */
-	do_action( 'check_ajax_referer', $action, $result );
+	do_action('check_ajax_referer', $action, $result);
 
-	if ( $die && false === $result ) {
-		if ( wp_doing_ajax() ) {
+	if ($die && false === $result) {
+		if (wp_doing_ajax()) {
 			wp_die( -1, 403 );
 		} else {
-			die( '-1' );
+			die('-1');
 		}
 	}
 
@@ -1151,7 +1151,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_redirect') ) :
+if ( ! function_exists('wp_redirect')) :
 /**
  * Redirects to another page.
  *
@@ -1187,7 +1187,7 @@ 
 	 * @param string $location The path to redirect to.
 	 * @param int    $status   Status code to use.
 	 */
-	$location = apply_filters( 'wp_redirect', $location, $status );
+	$location = apply_filters('wp_redirect', $location, $status);
 
 	/**
 	 * Filters the redirect status code.
@@ -1197,14 +1197,14 @@ 
 	 * @param int    $status   Status code to use.
 	 * @param string $location The path to redirect to.
 	 */
-	$status = apply_filters( 'wp_redirect_status', $status, $location );
+	$status = apply_filters('wp_redirect_status', $status, $location);
 
-	if ( ! $location )
+	if ( ! $location)
 		return false;
 
 	$location = wp_sanitize_redirect($location);
 
-	if ( !$is_IIS && PHP_SAPI != 'cgi-fcgi' )
+	if ( ! $is_IIS && PHP_SAPI != 'cgi-fcgi')
 		status_header($status); // This causes problems on IIS and some FastCGI setups
 
 	header("Location: $location", true, $status);
@@ -1213,7 +1213,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_sanitize_redirect') ) :
+if ( ! function_exists('wp_sanitize_redirect')) :
 /**
  * Sanitizes a URL for use in a redirect.
  *
@@ -1235,13 +1235,13 @@ 
 			|   \xF4[\x80-\x8F][\x80-\xBF]{2}
 		){1,40}                              # ...one or more times
 		)/x';
-	$location = preg_replace_callback( $regex, '_wp_sanitize_utf8_in_redirect', $location );
+	$location = preg_replace_callback($regex, '_wp_sanitize_utf8_in_redirect', $location);
 	$location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%!*\[\]()@]|i', '', $location);
 	$location = wp_kses_no_null($location);
 
 	// remove %0d and %0a from location
 	$strip = array('%0d', '%0a', '%0D', '%0A');
-	return _deep_replace( $strip, $location );
+	return _deep_replace($strip, $location);
 }
 
 /**
@@ -1256,12 +1256,12 @@ 
  * @param array $matches RegEx matches against the redirect location.
  * @return string URL-encoded version of the first RegEx match.
  */
-function _wp_sanitize_utf8_in_redirect( $matches ) {
-	return urlencode( $matches[0] );
+function _wp_sanitize_utf8_in_redirect($matches) {
+	return urlencode($matches[0]);
 }
 endif;
 
-if ( !function_exists('wp_safe_redirect') ) :
+if ( ! function_exists('wp_safe_redirect')) :
 /**
  * Performs a safe (local) redirect, using wp_redirect().
  *
@@ -1291,13 +1291,13 @@ 
 	 * @param string $fallback_url The fallback URL to use by default.
 	 * @param int    $status       The redirect status.
 	 */
-	$location = wp_validate_redirect( $location, apply_filters( 'wp_safe_redirect_fallback', admin_url(), $status ) );
+	$location = wp_validate_redirect($location, apply_filters('wp_safe_redirect_fallback', admin_url(), $status));
 
 	wp_redirect($location, $status);
 }
 endif;
 
-if ( !function_exists('wp_validate_redirect') ) :
+if ( ! function_exists('wp_validate_redirect')) :
 /**
  * Validates a URL for use in a redirect.
  *
@@ -1314,33 +1314,33 @@ 
  * @return string redirect-sanitized URL
  **/
 function wp_validate_redirect($location, $default = '') {
-	$location = trim( $location, " \t\n\r\0\x08\x0B" );
+	$location = trim($location, " \t\n\r\0\x08\x0B");
 	// browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'
-	if ( substr($location, 0, 2) == '//' )
-		$location = 'http:' . $location;
+	if (substr($location, 0, 2) == '//')
+		$location = 'http:'.$location;
 
 	// In php 5 parse_url may fail if the URL query part contains http://, bug #38143
-	$test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location;
+	$test = ($cut = strpos($location, '?')) ? substr($location, 0, $cut) : $location;
 
 	// @-operator is used to prevent possible warnings in PHP < 5.3.3.
 	$lp = @parse_url($test);
 
 	// Give up if malformed URL
-	if ( false === $lp )
+	if (false === $lp)
 		return $default;
 
 	// Allow only http and https schemes. No data:, etc.
-	if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) )
+	if (isset($lp['scheme']) && ! ('http' == $lp['scheme'] || 'https' == $lp['scheme']))
 		return $default;
 
 	// Reject if certain components are set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
-	if ( ! isset( $lp['host'] ) && ( isset( $lp['scheme'] ) || isset( $lp['user'] ) || isset( $lp['pass'] ) || isset( $lp['port'] ) ) ) {
+	if ( ! isset($lp['host']) && (isset($lp['scheme']) || isset($lp['user']) || isset($lp['pass']) || isset($lp['port']))) {
 		return $default;
 	}
 
 	// Reject malformed components parse_url() can return on odd inputs.
-	foreach ( array( 'user', 'pass', 'host' ) as $component ) {
-		if ( isset( $lp[ $component ] ) && strpbrk( $lp[ $component ], ':/?#@' ) ) {
+	foreach (array('user', 'pass', 'host') as $component) {
+		if (isset($lp[$component]) && strpbrk($lp[$component], ':/?#@')) {
 			return $default;
 		}
 	}
@@ -1355,16 +1355,16 @@ 
 	 * @param array       $hosts An array of allowed hosts.
 	 * @param bool|string $host  The parsed host; empty if not isset.
 	 */
-	$allowed_hosts = (array) apply_filters( 'allowed_redirect_hosts', array($wpp['host']), isset($lp['host']) ? $lp['host'] : '' );
+	$allowed_hosts = (array) apply_filters('allowed_redirect_hosts', array($wpp['host']), isset($lp['host']) ? $lp['host'] : '');
 
-	if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) )
+	if (isset($lp['host']) && ( ! in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])))
 		$location = $default;
 
 	return $location;
 }
 endif;
 
-if ( ! function_exists('wp_notify_postauthor') ) :
+if ( ! function_exists('wp_notify_postauthor')) :
 /**
  * Notify an author (and/or others) of a comment/trackback/pingback on a post.
  *
@@ -1374,21 +1374,21 @@ 
  * @param string          $deprecated Not used
  * @return bool True on completion. False if no email addresses were specified.
  */
-function wp_notify_postauthor( $comment_id, $deprecated = null ) {
-	if ( null !== $deprecated ) {
-		_deprecated_argument( __FUNCTION__, '3.8.0' );
+function wp_notify_postauthor($comment_id, $deprecated = null) {
+	if (null !== $deprecated) {
+		_deprecated_argument(__FUNCTION__, '3.8.0');
 	}
 
-	$comment = get_comment( $comment_id );
-	if ( empty( $comment ) || empty( $comment->comment_post_ID ) )
+	$comment = get_comment($comment_id);
+	if (empty($comment) || empty($comment->comment_post_ID))
 		return false;
 
-	$post    = get_post( $comment->comment_post_ID );
-	$author  = get_userdata( $post->post_author );
+	$post    = get_post($comment->comment_post_ID);
+	$author  = get_userdata($post->post_author);
 
 	// Who to notify? By default, just the post author, but others can be added.
 	$emails = array();
-	if ( $author ) {
+	if ($author) {
 		$emails[] = $author->user_email;
 	}
 
@@ -1403,16 +1403,16 @@ 
 	 * @param array $emails     An array of email addresses to receive a comment notification.
 	 * @param int   $comment_id The comment ID.
 	 */
-	$emails = apply_filters( 'comment_notification_recipients', $emails, $comment->comment_ID );
-	$emails = array_filter( $emails );
+	$emails = apply_filters('comment_notification_recipients', $emails, $comment->comment_ID);
+	$emails = array_filter($emails);
 
 	// If there are no addresses to send the comment to, bail.
-	if ( ! count( $emails ) ) {
+	if ( ! count($emails)) {
 		return false;
 	}
 
 	// Facilitate unsetting below without knowing the keys.
-	$emails = array_flip( $emails );
+	$emails = array_flip($emails);
 
 	/**
 	 * Filters whether to notify comment authors of their comments on their own posts.
@@ -1426,103 +1426,103 @@ 
 	 *                         Default false.
 	 * @param int  $comment_id The comment ID.
 	 */
-	$notify_author = apply_filters( 'comment_notification_notify_author', false, $comment->comment_ID );
+	$notify_author = apply_filters('comment_notification_notify_author', false, $comment->comment_ID);
 
 	// The comment was left by the author
-	if ( $author && ! $notify_author && $comment->user_id == $post->post_author ) {
-		unset( $emails[ $author->user_email ] );
+	if ($author && ! $notify_author && $comment->user_id == $post->post_author) {
+		unset($emails[$author->user_email]);
 	}
 
 	// The author moderated a comment on their own post
-	if ( $author && ! $notify_author && $post->post_author == get_current_user_id() ) {
-		unset( $emails[ $author->user_email ] );
+	if ($author && ! $notify_author && $post->post_author == get_current_user_id()) {
+		unset($emails[$author->user_email]);
 	}
 
 	// The post author is no longer a member of the blog
-	if ( $author && ! $notify_author && ! user_can( $post->post_author, 'read_post', $post->ID ) ) {
-		unset( $emails[ $author->user_email ] );
+	if ($author && ! $notify_author && ! user_can($post->post_author, 'read_post', $post->ID)) {
+		unset($emails[$author->user_email]);
 	}
 
 	// If there's no email to send the comment to, bail, otherwise flip array back around for use below
-	if ( ! count( $emails ) ) {
+	if ( ! count($emails)) {
 		return false;
 	} else {
-		$emails = array_flip( $emails );
+		$emails = array_flip($emails);
 	}
 
-	$switched_locale = switch_to_locale( get_locale() );
+	$switched_locale = switch_to_locale(get_locale());
 
 	$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
 
 	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
 	// we want to reverse this for the plain text arena of emails.
 	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-	$comment_content = wp_specialchars_decode( $comment->comment_content );
+	$comment_content = wp_specialchars_decode($comment->comment_content);
 
-	switch ( $comment->comment_type ) {
+	switch ($comment->comment_type) {
 		case 'trackback':
 			/* translators: 1: Post title */
-			$notify_message  = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
+			$notify_message  = sprintf(__('New trackback on your post "%s"'), $post->post_title)."\r\n";
 			/* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-			$notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
-			$notify_message .= __( 'You can see all trackbacks on this post here:' ) . "\r\n";
+			$notify_message .= sprintf(__('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain)."\r\n";
+			$notify_message .= sprintf(__('URL: %s'), $comment->comment_author_url)."\r\n";
+			$notify_message .= sprintf(__('Comment: %s'), "\r\n".$comment_content)."\r\n\r\n";
+			$notify_message .= __('You can see all trackbacks on this post here:')."\r\n";
 			/* translators: 1: blog name, 2: post title */
-			$subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
+			$subject = sprintf(__('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title);
 			break;
 		case 'pingback':
 			/* translators: 1: Post title */
-			$notify_message  = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
+			$notify_message  = sprintf(__('New pingback on your post "%s"'), $post->post_title)."\r\n";
 			/* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-			$notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
-			$notify_message .= __( 'You can see all pingbacks on this post here:' ) . "\r\n";
+			$notify_message .= sprintf(__('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain)."\r\n";
+			$notify_message .= sprintf(__('URL: %s'), $comment->comment_author_url)."\r\n";
+			$notify_message .= sprintf(__('Comment: %s'), "\r\n".$comment_content)."\r\n\r\n";
+			$notify_message .= __('You can see all pingbacks on this post here:')."\r\n";
 			/* translators: 1: blog name, 2: post title */
-			$subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title );
+			$subject = sprintf(__('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title);
 			break;
 		default: // Comments
-			$notify_message  = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
+			$notify_message  = sprintf(__('New comment on your post "%s"'), $post->post_title)."\r\n";
 			/* translators: 1: comment author, 2: author IP, 3: author domain */
-			$notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-			$notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
-			$notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
+			$notify_message .= sprintf(__('Author: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain)."\r\n";
+			$notify_message .= sprintf(__('Email: %s'), $comment->comment_author_email)."\r\n";
+			$notify_message .= sprintf(__('URL: %s'), $comment->comment_author_url)."\r\n";
+			$notify_message .= sprintf(__('Comment: %s'), "\r\n".$comment_content)."\r\n\r\n";
+			$notify_message .= __('You can see all comments on this post here:')."\r\n";
 			/* translators: 1: blog name, 2: post title */
-			$subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title );
+			$subject = sprintf(__('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title);
 			break;
 	}
-	$notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
-	$notify_message .= sprintf( __('Permalink: %s'), get_comment_link( $comment ) ) . "\r\n";
+	$notify_message .= get_permalink($comment->comment_post_ID)."#comments\r\n\r\n";
+	$notify_message .= sprintf(__('Permalink: %s'), get_comment_link($comment))."\r\n";
 
-	if ( user_can( $post->post_author, 'edit_comment', $comment->comment_ID ) ) {
-		if ( EMPTY_TRASH_DAYS ) {
-			$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
+	if (user_can($post->post_author, 'edit_comment', $comment->comment_ID)) {
+		if (EMPTY_TRASH_DAYS) {
+			$notify_message .= sprintf(__('Trash it: %s'), admin_url("comment.php?action=trash&c={$comment->comment_ID}#wpbody-content"))."\r\n";
 		} else {
-			$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
+			$notify_message .= sprintf(__('Delete it: %s'), admin_url("comment.php?action=delete&c={$comment->comment_ID}#wpbody-content"))."\r\n";
 		}
-		$notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
+		$notify_message .= sprintf(__('Spam it: %s'), admin_url("comment.php?action=spam&c={$comment->comment_ID}#wpbody-content"))."\r\n";
 	}
 
-	$wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
+	$wp_email = 'wordpress@'.preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
 
-	if ( '' == $comment->comment_author ) {
+	if ('' == $comment->comment_author) {
 		$from = "From: \"$blogname\" <$wp_email>";
-		if ( '' != $comment->comment_author_email )
+		if ('' != $comment->comment_author_email)
 			$reply_to = "Reply-To: $comment->comment_author_email";
 	} else {
 		$from = "From: \"$comment->comment_author\" <$wp_email>";
-		if ( '' != $comment->comment_author_email )
+		if ('' != $comment->comment_author_email)
 			$reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";
 	}
 
 	$message_headers = "$from\n"
-		. "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+		. "Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 
-	if ( isset($reply_to) )
-		$message_headers .= $reply_to . "\n";
+	if (isset($reply_to))
+		$message_headers .= $reply_to."\n";
 
 	/**
 	 * Filters the comment notification email text.
@@ -1532,7 +1532,7 @@ 
 	 * @param string $notify_message The comment notification email text.
 	 * @param int    $comment_id     Comment ID.
 	 */
-	$notify_message = apply_filters( 'comment_notification_text', $notify_message, $comment->comment_ID );
+	$notify_message = apply_filters('comment_notification_text', $notify_message, $comment->comment_ID);
 
 	/**
 	 * Filters the comment notification email subject.
@@ -1542,7 +1542,7 @@ 
 	 * @param string $subject    The comment notification email subject.
 	 * @param int    $comment_id Comment ID.
 	 */
-	$subject = apply_filters( 'comment_notification_subject', $subject, $comment->comment_ID );
+	$subject = apply_filters('comment_notification_subject', $subject, $comment->comment_ID);
 
 	/**
 	 * Filters the comment notification email headers.
@@ -1552,13 +1552,13 @@ 
 	 * @param string $message_headers Headers for the comment notification email.
 	 * @param int    $comment_id      Comment ID.
 	 */
-	$message_headers = apply_filters( 'comment_notification_headers', $message_headers, $comment->comment_ID );
+	$message_headers = apply_filters('comment_notification_headers', $message_headers, $comment->comment_ID);
 
-	foreach ( $emails as $email ) {
-		@wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
+	foreach ($emails as $email) {
+		@wp_mail($email, wp_specialchars_decode($subject), $notify_message, $message_headers);
 	}
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 
@@ -1566,7 +1566,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_notify_moderator') ) :
+if ( ! function_exists('wp_notify_moderator')) :
 /**
  * Notifies the moderator of the site about a new comment that is awaiting approval.
  *
@@ -1583,7 +1583,7 @@ 
 function wp_notify_moderator($comment_id) {
 	global $wpdb;
 
-	$maybe_notify = get_option( 'moderation_notify' );
+	$maybe_notify = get_option('moderation_notify');
 
 	/**
 	 * Filters whether to send the site moderator email notifications, overriding the site setting.
@@ -1593,23 +1593,23 @@ 
 	 * @param bool $maybe_notify Whether to notify blog moderator.
 	 * @param int  $comment_ID   The id of the comment for the notification.
 	 */
-	$maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_id );
+	$maybe_notify = apply_filters('notify_moderator', $maybe_notify, $comment_id);
 
-	if ( ! $maybe_notify ) {
+	if ( ! $maybe_notify) {
 		return true;
 	}
 
 	$comment = get_comment($comment_id);
 	$post = get_post($comment->comment_post_ID);
-	$user = get_userdata( $post->post_author );
+	$user = get_userdata($post->post_author);
 	// Send to the administration and to the post author if the author can modify the comment.
-	$emails = array( get_option( 'admin_email' ) );
-	if ( $user && user_can( $user->ID, 'edit_comment', $comment_id ) && ! empty( $user->user_email ) ) {
-		if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) )
+	$emails = array(get_option('admin_email'));
+	if ($user && user_can($user->ID, 'edit_comment', $comment_id) && ! empty($user->user_email)) {
+		if (0 !== strcasecmp($user->user_email, get_option('admin_email')))
 			$emails[] = $user->user_email;
 	}
 
-	$switched_locale = switch_to_locale( get_locale() );
+	$switched_locale = switch_to_locale(get_locale());
 
 	$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
 	$comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
@@ -1617,65 +1617,65 @@ 
 	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
 	// we want to reverse this for the plain text arena of emails.
 	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-	$comment_content = wp_specialchars_decode( $comment->comment_content );
+	$comment_content = wp_specialchars_decode($comment->comment_content);
 
-	switch ( $comment->comment_type ) {
+	switch ($comment->comment_type) {
 		case 'trackback':
 			/* translators: 1: Post title */
-			$notify_message  = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
-			$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
+			$notify_message  = sprintf(__('A new trackback on the post "%s" is waiting for your approval'), $post->post_title)."\r\n";
+			$notify_message .= get_permalink($comment->comment_post_ID)."\r\n\r\n";
 			/* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-			$notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+			$notify_message .= sprintf(__('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain)."\r\n";
 			/* translators: 1: Trackback/pingback/comment author URL */
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n";
+			$notify_message .= sprintf(__('URL: %s'), $comment->comment_author_url)."\r\n";
+			$notify_message .= __('Trackback excerpt: ')."\r\n".$comment_content."\r\n\r\n";
 			break;
 		case 'pingback':
 			/* translators: 1: Post title */
-			$notify_message  = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
-			$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
+			$notify_message  = sprintf(__('A new pingback on the post "%s" is waiting for your approval'), $post->post_title)."\r\n";
+			$notify_message .= get_permalink($comment->comment_post_ID)."\r\n\r\n";
 			/* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-			$notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+			$notify_message .= sprintf(__('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain)."\r\n";
 			/* translators: 1: Trackback/pingback/comment author URL */
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n";
+			$notify_message .= sprintf(__('URL: %s'), $comment->comment_author_url)."\r\n";
+			$notify_message .= __('Pingback excerpt: ')."\r\n".$comment_content."\r\n\r\n";
 			break;
 		default: // Comments
 			/* translators: 1: Post title */
-			$notify_message  = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
-			$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
+			$notify_message  = sprintf(__('A new comment on the post "%s" is waiting for your approval'), $post->post_title)."\r\n";
+			$notify_message .= get_permalink($comment->comment_post_ID)."\r\n\r\n";
 			/* translators: 1: Comment author name, 2: comment author's IP, 3: comment author IP's hostname */
-			$notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+			$notify_message .= sprintf(__('Author: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain)."\r\n";
 			/* translators: 1: Comment author URL */
-			$notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
+			$notify_message .= sprintf(__('Email: %s'), $comment->comment_author_email)."\r\n";
 			/* translators: 1: Trackback/pingback/comment author URL */
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
+			$notify_message .= sprintf(__('URL: %s'), $comment->comment_author_url)."\r\n";
 			/* translators: 1: Comment text */
-			$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
+			$notify_message .= sprintf(__('Comment: %s'), "\r\n".$comment_content)."\r\n\r\n";
 			break;
 	}
 
 	/* translators: Comment moderation. 1: Comment action URL */
-	$notify_message .= sprintf( __( 'Approve it: %s' ), admin_url( "comment.php?action=approve&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+	$notify_message .= sprintf(__('Approve it: %s'), admin_url("comment.php?action=approve&c={$comment_id}#wpbody-content"))."\r\n";
 
-	if ( EMPTY_TRASH_DAYS ) {
+	if (EMPTY_TRASH_DAYS) {
 		/* translators: Comment moderation. 1: Comment action URL */
-		$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+		$notify_message .= sprintf(__('Trash it: %s'), admin_url("comment.php?action=trash&c={$comment_id}#wpbody-content"))."\r\n";
 	} else {
 		/* translators: Comment moderation. 1: Comment action URL */
-		$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+		$notify_message .= sprintf(__('Delete it: %s'), admin_url("comment.php?action=delete&c={$comment_id}#wpbody-content"))."\r\n";
 	}
 
 	/* translators: Comment moderation. 1: Comment action URL */
-	$notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+	$notify_message .= sprintf(__('Spam it: %s'), admin_url("comment.php?action=spam&c={$comment_id}#wpbody-content"))."\r\n";
 
 	/* translators: Comment moderation. 1: Number of comments awaiting approval */
-	$notify_message .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:',
- 		'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n";
-	$notify_message .= admin_url( "edit-comments.php?comment_status=moderated#wpbody-content" ) . "\r\n";
+	$notify_message .= sprintf(_n('Currently %s comment is waiting for approval. Please visit the moderation panel:',
+ 		'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting))."\r\n";
+	$notify_message .= admin_url("edit-comments.php?comment_status=moderated#wpbody-content")."\r\n";
 
 	/* translators: Comment moderation notification email subject. 1: Site name, 2: Post title */
-	$subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title );
+	$subject = sprintf(__('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title);
 	$message_headers = '';
 
 	/**
@@ -1686,7 +1686,7 @@ 
 	 * @param array $emails     List of email addresses to notify for comment moderation.
 	 * @param int   $comment_id Comment ID.
 	 */
-	$emails = apply_filters( 'comment_moderation_recipients', $emails, $comment_id );
+	$emails = apply_filters('comment_moderation_recipients', $emails, $comment_id);
 
 	/**
 	 * Filters the comment moderation email text.
@@ -1696,7 +1696,7 @@ 
 	 * @param string $notify_message Text of the comment moderation email.
 	 * @param int    $comment_id     Comment ID.
 	 */
-	$notify_message = apply_filters( 'comment_moderation_text', $notify_message, $comment_id );
+	$notify_message = apply_filters('comment_moderation_text', $notify_message, $comment_id);
 
 	/**
 	 * Filters the comment moderation email subject.
@@ -1706,7 +1706,7 @@ 
 	 * @param string $subject    Subject of the comment moderation email.
 	 * @param int    $comment_id Comment ID.
 	 */
-	$subject = apply_filters( 'comment_moderation_subject', $subject, $comment_id );
+	$subject = apply_filters('comment_moderation_subject', $subject, $comment_id);
 
 	/**
 	 * Filters the comment moderation email headers.
@@ -1716,13 +1716,13 @@ 
 	 * @param string $message_headers Headers for the comment moderation email.
 	 * @param int    $comment_id      Comment ID.
 	 */
-	$message_headers = apply_filters( 'comment_moderation_headers', $message_headers, $comment_id );
+	$message_headers = apply_filters('comment_moderation_headers', $message_headers, $comment_id);
 
-	foreach ( $emails as $email ) {
-		@wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
+	foreach ($emails as $email) {
+		@wp_mail($email, wp_specialchars_decode($subject), $notify_message, $message_headers);
 	}
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 
@@ -1730,7 +1730,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_password_change_notification') ) :
+if ( ! function_exists('wp_password_change_notification')) :
 /**
  * Notify the blog admin of a user changing password, normally via email.
  *
@@ -1738,22 +1738,22 @@ 
  *
  * @param WP_User $user User object.
  */
-function wp_password_change_notification( $user ) {
+function wp_password_change_notification($user) {
 	// send a copy of password change notification to the admin
 	// but check to see if it's the admin whose password we're changing, and skip this
-	if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {
+	if (0 !== strcasecmp($user->user_email, get_option('admin_email'))) {
 		/* translators: %s: user name */
-		$message = sprintf( __( 'Password changed for user: %s' ), $user->user_login ) . "\r\n";
+		$message = sprintf(__('Password changed for user: %s'), $user->user_login)."\r\n";
 		// The blogname option is escaped with esc_html on the way into the database in sanitize_option
 		// we want to reverse this for the plain text arena of emails.
 		$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 		/* translators: %s: site title */
-		wp_mail( get_option( 'admin_email' ), sprintf( __( '[%s] Password Changed' ), $blogname ), $message );
+		wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Changed'), $blogname), $message);
 	}
 }
 endif;
 
-if ( !function_exists('wp_new_user_notification') ) :
+if ( ! function_exists('wp_new_user_notification')) :
 /**
  * Email login credentials to a newly-registered user.
  *
@@ -1772,67 +1772,67 @@ 
  * @param string $notify     Optional. Type of notification that should happen. Accepts 'admin' or an empty
  *                           string (admin only), 'user', or 'both' (admin and user). Default empty.
  */
-function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' ) {
-	if ( $deprecated !== null ) {
-		_deprecated_argument( __FUNCTION__, '4.3.1' );
+function wp_new_user_notification($user_id, $deprecated = null, $notify = '') {
+	if ($deprecated !== null) {
+		_deprecated_argument(__FUNCTION__, '4.3.1');
 	}
 
 	global $wpdb, $wp_hasher;
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
 	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
 	// we want to reverse this for the plain text arena of emails.
 	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
-	if ( 'user' !== $notify ) {
-		$switched_locale = switch_to_locale( get_locale() );
-		$message  = sprintf( __( 'New user registration on your site %s:' ), $blogname ) . "\r\n\r\n";
-		$message .= sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n\r\n";
-		$message .= sprintf( __( 'Email: %s' ), $user->user_email ) . "\r\n";
+	if ('user' !== $notify) {
+		$switched_locale = switch_to_locale(get_locale());
+		$message  = sprintf(__('New user registration on your site %s:'), $blogname)."\r\n\r\n";
+		$message .= sprintf(__('Username: %s'), $user->user_login)."\r\n\r\n";
+		$message .= sprintf(__('Email: %s'), $user->user_email)."\r\n";
 
-		@wp_mail( get_option( 'admin_email' ), sprintf( __( '[%s] New User Registration' ), $blogname ), $message );
+		@wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
 
-		if ( $switched_locale ) {
+		if ($switched_locale) {
 			restore_previous_locale();
 		}
 	}
 
 	// `$deprecated was pre-4.3 `$plaintext_pass`. An empty `$plaintext_pass` didn't sent a user notification.
-	if ( 'admin' === $notify || ( empty( $deprecated ) && empty( $notify ) ) ) {
+	if ('admin' === $notify || (empty($deprecated) && empty($notify))) {
 		return;
 	}
 
 	// Generate something random for a password reset key.
-	$key = wp_generate_password( 20, false );
+	$key = wp_generate_password(20, false);
 
 	/** This action is documented in wp-login.php */
-	do_action( 'retrieve_password_key', $user->user_login, $key );
+	do_action('retrieve_password_key', $user->user_login, $key);
 
 	// Now insert the key, hashed, into the DB.
-	if ( empty( $wp_hasher ) ) {
-		require_once ABSPATH . WPINC . '/class-phpass.php';
-		$wp_hasher = new PasswordHash( 8, true );
+	if (empty($wp_hasher)) {
+		require_once ABSPATH.WPINC.'/class-phpass.php';
+		$wp_hasher = new PasswordHash(8, true);
 	}
-	$hashed = time() . ':' . $wp_hasher->HashPassword( $key );
-	$wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
+	$hashed = time().':'.$wp_hasher->HashPassword($key);
+	$wpdb->update($wpdb->users, array('user_activation_key' => $hashed), array('user_login' => $user->user_login));
 
-	$switched_locale = switch_to_locale( get_user_locale( $user ) );
+	$switched_locale = switch_to_locale(get_user_locale($user));
 
-	$message = sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
-	$message .= __('To set your password, visit the following address:') . "\r\n\r\n";
-	$message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user->user_login), 'login') . ">\r\n\r\n";
+	$message = sprintf(__('Username: %s'), $user->user_login)."\r\n\r\n";
+	$message .= __('To set your password, visit the following address:')."\r\n\r\n";
+	$message .= '<'.network_site_url("wp-login.php?action=rp&key=$key&login=".rawurlencode($user->user_login), 'login').">\r\n\r\n";
 
-	$message .= wp_login_url() . "\r\n";
+	$message .= wp_login_url()."\r\n";
 
 	wp_mail($user->user_email, sprintf(__('[%s] Your username and password info'), $blogname), $message);
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 }
 endif;
 
-if ( !function_exists('wp_nonce_tick') ) :
+if ( ! function_exists('wp_nonce_tick')) :
 /**
  * Get the time-dependent variable for nonce creation.
  *
@@ -1851,13 +1851,13 @@ 
 	 *
 	 * @param int $lifespan Lifespan of nonces in seconds. Default 86,400 seconds, or one day.
 	 */
-	$nonce_life = apply_filters( 'nonce_life', DAY_IN_SECONDS );
+	$nonce_life = apply_filters('nonce_life', DAY_IN_SECONDS);
 
-	return ceil(time() / ( $nonce_life / 2 ));
+	return ceil(time() / ($nonce_life / 2));
 }
 endif;
 
-if ( !function_exists('wp_verify_nonce') ) :
+if ( ! function_exists('wp_verify_nonce')) :
 /**
  * Verify that correct nonce was used with time limit.
  *
@@ -1871,11 +1871,11 @@ 
  * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
  *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
  */
-function wp_verify_nonce( $nonce, $action = -1 ) {
+function wp_verify_nonce($nonce, $action = -1) {
 	$nonce = (string) $nonce;
 	$user = wp_get_current_user();
 	$uid = (int) $user->ID;
-	if ( ! $uid ) {
+	if ( ! $uid) {
 		/**
 		 * Filters whether the user who generated the nonce is logged out.
 		 *
@@ -1884,10 +1884,10 @@ 
 		 * @param int    $uid    ID of the nonce-owning user.
 		 * @param string $action The nonce action.
 		 */
-		$uid = apply_filters( 'nonce_user_logged_out', $uid, $action );
+		$uid = apply_filters('nonce_user_logged_out', $uid, $action);
 	}
 
-	if ( empty( $nonce ) ) {
+	if (empty($nonce)) {
 		return false;
 	}
 
@@ -1895,14 +1895,14 @@ 
 	$i = wp_nonce_tick();
 
 	// Nonce generated 0-12 hours ago
-	$expected = substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce'), -12, 10 );
-	if ( hash_equals( $expected, $nonce ) ) {
+	$expected = substr(wp_hash($i.'|'.$action.'|'.$uid.'|'.$token, 'nonce'), -12, 10);
+	if (hash_equals($expected, $nonce)) {
 		return 1;
 	}
 
 	// Nonce generated 12-24 hours ago
-	$expected = substr( wp_hash( ( $i - 1 ) . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
-	if ( hash_equals( $expected, $nonce ) ) {
+	$expected = substr(wp_hash(($i - 1).'|'.$action.'|'.$uid.'|'.$token, 'nonce'), -12, 10);
+	if (hash_equals($expected, $nonce)) {
 		return 2;
 	}
 
@@ -1916,14 +1916,14 @@ 
 	 * @param WP_User    $user   The current user object.
 	 * @param string     $token  The user's session token.
 	 */
-	do_action( 'wp_verify_nonce_failed', $nonce, $action, $user, $token );
+	do_action('wp_verify_nonce_failed', $nonce, $action, $user, $token);
 
 	// Invalid nonce
 	return false;
 }
 endif;
 
-if ( !function_exists('wp_create_nonce') ) :
+if ( ! function_exists('wp_create_nonce')) :
 /**
  * Creates a cryptographic token tied to a specific action, user, user session,
  * and window of time.
@@ -1937,19 +1937,19 @@ 
 function wp_create_nonce($action = -1) {
 	$user = wp_get_current_user();
 	$uid = (int) $user->ID;
-	if ( ! $uid ) {
+	if ( ! $uid) {
 		/** This filter is documented in wp-includes/pluggable.php */
-		$uid = apply_filters( 'nonce_user_logged_out', $uid, $action );
+		$uid = apply_filters('nonce_user_logged_out', $uid, $action);
 	}
 
 	$token = wp_get_session_token();
 	$i = wp_nonce_tick();
 
-	return substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
+	return substr(wp_hash($i.'|'.$action.'|'.$uid.'|'.$token, 'nonce'), -12, 10);
 }
 endif;
 
-if ( !function_exists('wp_salt') ) :
+if ( ! function_exists('wp_salt')) :
 /**
  * Get salt to add to hashes.
  *
@@ -1985,9 +1985,9 @@ 
  * @param string $scheme Authentication scheme (auth, secure_auth, logged_in, nonce)
  * @return string Salt value
  */
-function wp_salt( $scheme = 'auth' ) {
+function wp_salt($scheme = 'auth') {
 	static $cached_salts = array();
-	if ( isset( $cached_salts[ $scheme ] ) ) {
+	if (isset($cached_salts[$scheme])) {
 		/**
 		 * Filters the WordPress salt.
 		 *
@@ -1997,19 +1997,19 @@ 
 		 * @param string $scheme      Authentication scheme. Values include 'auth',
 		 *                            'secure_auth', 'logged_in', and 'nonce'.
 		 */
-		return apply_filters( 'salt', $cached_salts[ $scheme ], $scheme );
+		return apply_filters('salt', $cached_salts[$scheme], $scheme);
 	}
 
 	static $duplicated_keys;
-	if ( null === $duplicated_keys ) {
-		$duplicated_keys = array( 'put your unique phrase here' => true );
-		foreach ( array( 'AUTH', 'SECURE_AUTH', 'LOGGED_IN', 'NONCE', 'SECRET' ) as $first ) {
-			foreach ( array( 'KEY', 'SALT' ) as $second ) {
-				if ( ! defined( "{$first}_{$second}" ) ) {
+	if (null === $duplicated_keys) {
+		$duplicated_keys = array('put your unique phrase here' => true);
+		foreach (array('AUTH', 'SECURE_AUTH', 'LOGGED_IN', 'NONCE', 'SECRET') as $first) {
+			foreach (array('KEY', 'SALT') as $second) {
+				if ( ! defined("{$first}_{$second}")) {
 					continue;
 				}
-				$value = constant( "{$first}_{$second}" );
-				$duplicated_keys[ $value ] = isset( $duplicated_keys[ $value ] );
+				$value = constant("{$first}_{$second}");
+				$duplicated_keys[$value] = isset($duplicated_keys[$value]);
 			}
 		}
 	}
@@ -2018,45 +2018,45 @@ 
 		'key' => '',
 		'salt' => ''
 	);
-	if ( defined( 'SECRET_KEY' ) && SECRET_KEY && empty( $duplicated_keys[ SECRET_KEY ] ) ) {
+	if (defined('SECRET_KEY') && SECRET_KEY && empty($duplicated_keys[SECRET_KEY])) {
 		$values['key'] = SECRET_KEY;
 	}
-	if ( 'auth' == $scheme && defined( 'SECRET_SALT' ) && SECRET_SALT && empty( $duplicated_keys[ SECRET_SALT ] ) ) {
+	if ('auth' == $scheme && defined('SECRET_SALT') && SECRET_SALT && empty($duplicated_keys[SECRET_SALT])) {
 		$values['salt'] = SECRET_SALT;
 	}
 
-	if ( in_array( $scheme, array( 'auth', 'secure_auth', 'logged_in', 'nonce' ) ) ) {
-		foreach ( array( 'key', 'salt' ) as $type ) {
-			$const = strtoupper( "{$scheme}_{$type}" );
-			if ( defined( $const ) && constant( $const ) && empty( $duplicated_keys[ constant( $const ) ] ) ) {
-				$values[ $type ] = constant( $const );
-			} elseif ( ! $values[ $type ] ) {
-				$values[ $type ] = get_site_option( "{$scheme}_{$type}" );
-				if ( ! $values[ $type ] ) {
-					$values[ $type ] = wp_generate_password( 64, true, true );
-					update_site_option( "{$scheme}_{$type}", $values[ $type ] );
+	if (in_array($scheme, array('auth', 'secure_auth', 'logged_in', 'nonce'))) {
+		foreach (array('key', 'salt') as $type) {
+			$const = strtoupper("{$scheme}_{$type}");
+			if (defined($const) && constant($const) && empty($duplicated_keys[constant($const)])) {
+				$values[$type] = constant($const);
+			} elseif ( ! $values[$type]) {
+				$values[$type] = get_site_option("{$scheme}_{$type}");
+				if ( ! $values[$type]) {
+					$values[$type] = wp_generate_password(64, true, true);
+					update_site_option("{$scheme}_{$type}", $values[$type]);
 				}
 			}
 		}
 	} else {
-		if ( ! $values['key'] ) {
-			$values['key'] = get_site_option( 'secret_key' );
-			if ( ! $values['key'] ) {
-				$values['key'] = wp_generate_password( 64, true, true );
-				update_site_option( 'secret_key', $values['key'] );
+		if ( ! $values['key']) {
+			$values['key'] = get_site_option('secret_key');
+			if ( ! $values['key']) {
+				$values['key'] = wp_generate_password(64, true, true);
+				update_site_option('secret_key', $values['key']);
 			}
 		}
-		$values['salt'] = hash_hmac( 'md5', $scheme, $values['key'] );
+		$values['salt'] = hash_hmac('md5', $scheme, $values['key']);
 	}
 
-	$cached_salts[ $scheme ] = $values['key'] . $values['salt'];
+	$cached_salts[$scheme] = $values['key'].$values['salt'];
 
 	/** This filter is documented in wp-includes/pluggable.php */
-	return apply_filters( 'salt', $cached_salts[ $scheme ], $scheme );
+	return apply_filters('salt', $cached_salts[$scheme], $scheme);
 }
 endif;
 
-if ( !function_exists('wp_hash') ) :
+if ( ! function_exists('wp_hash')) :
 /**
  * Get hash of given string.
  *
@@ -2073,7 +2073,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_hash_password') ) :
+if ( ! function_exists('wp_hash_password')) :
 /**
  * Create a hash (encrypt) of a plain text password.
  *
@@ -2090,17 +2090,17 @@ 
 function wp_hash_password($password) {
 	global $wp_hasher;
 
-	if ( empty($wp_hasher) ) {
-		require_once( ABSPATH . WPINC . '/class-phpass.php');
+	if (empty($wp_hasher)) {
+		require_once(ABSPATH.WPINC.'/class-phpass.php');
 		// By default, use the portable hash from phpass
 		$wp_hasher = new PasswordHash(8, true);
 	}
 
-	return $wp_hasher->HashPassword( trim( $password ) );
+	return $wp_hasher->HashPassword(trim($password));
 }
 endif;
 
-if ( !function_exists('wp_check_password') ) :
+if ( ! function_exists('wp_check_password')) :
 /**
  * Checks the plaintext password against the encrypted Password.
  *
@@ -2127,9 +2127,9 @@ 
 	global $wp_hasher;
 
 	// If the hash is still md5...
-	if ( strlen($hash) <= 32 ) {
-		$check = hash_equals( $hash, md5( $password ) );
-		if ( $check && $user_id ) {
+	if (strlen($hash) <= 32) {
+		$check = hash_equals($hash, md5($password));
+		if ($check && $user_id) {
 			// Rehash using new hash.
 			wp_set_password($password, $user_id);
 			$hash = wp_hash_password($password);
@@ -2145,13 +2145,13 @@ 
 		 * @param string     $hash     The hashed password.
 		 * @param string|int $user_id  User ID. Can be empty.
 		 */
-		return apply_filters( 'check_password', $check, $password, $hash, $user_id );
+		return apply_filters('check_password', $check, $password, $hash, $user_id);
 	}
 
 	// If the stored hash is longer than an MD5, presume the
 	// new style phpass portable hash.
-	if ( empty($wp_hasher) ) {
-		require_once( ABSPATH . WPINC . '/class-phpass.php');
+	if (empty($wp_hasher)) {
+		require_once(ABSPATH.WPINC.'/class-phpass.php');
 		// By default, use the portable hash from phpass
 		$wp_hasher = new PasswordHash(8, true);
 	}
@@ -2159,11 +2159,11 @@ 
 	$check = $wp_hasher->CheckPassword($password, $hash);
 
 	/** This filter is documented in wp-includes/pluggable.php */
-	return apply_filters( 'check_password', $check, $password, $hash, $user_id );
+	return apply_filters('check_password', $check, $password, $hash, $user_id);
 }
 endif;
 
-if ( !function_exists('wp_generate_password') ) :
+if ( ! function_exists('wp_generate_password')) :
 /**
  * Generates a random password drawn from the defined set of characters.
  *
@@ -2176,15 +2176,15 @@ 
  *                                  Used when generating secret keys and salts. Default false.
  * @return string The random password.
  */
-function wp_generate_password( $length = 12, $special_chars = true, $extra_special_chars = false ) {
+function wp_generate_password($length = 12, $special_chars = true, $extra_special_chars = false) {
 	$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-	if ( $special_chars )
+	if ($special_chars)
 		$chars .= '!@#$%^&*()';
-	if ( $extra_special_chars )
+	if ($extra_special_chars)
 		$chars .= '-_ []{}<>~`+=,.;:/?|';
 
 	$password = '';
-	for ( $i = 0; $i < $length; $i++ ) {
+	for ($i = 0; $i < $length; $i++) {
 		$password .= substr($chars, wp_rand(0, strlen($chars) - 1), 1);
 	}
 
@@ -2195,11 +2195,11 @@ 
 	 *
 	 * @param string $password The generated password.
 	 */
-	return apply_filters( 'random_password', $password );
+	return apply_filters('random_password', $password);
 }
 endif;
 
-if ( !function_exists('wp_rand') ) :
+if ( ! function_exists('wp_rand')) :
 /**
  * Generates a random number
  *
@@ -2214,7 +2214,7 @@ 
  * @param int $max Upper limit for the generated number
  * @return int A random number between min and max
  */
-function wp_rand( $min = 0, $max = 0 ) {
+function wp_rand($min = 0, $max = 0) {
 	global $rnd_value;
 
 	// Some misconfigured 32bit environments (Entropy PHP, for example) truncate integers larger than PHP_INT_MAX to PHP_INT_MAX rather than overflowing them to floats.
@@ -2226,38 +2226,38 @@ 
 
 	// Use PHP's CSPRNG, or a compatible method
 	static $use_random_int_functionality = true;
-	if ( $use_random_int_functionality ) {
+	if ($use_random_int_functionality) {
 		try {
-			$_max = ( 0 != $max ) ? $max : $max_random_number;
+			$_max = (0 != $max) ? $max : $max_random_number;
 			// wp_rand() can accept arguments in either order, PHP cannot.
-			$_max = max( $min, $_max );
-			$_min = min( $min, $_max );
-			$val = random_int( $_min, $_max );
-			if ( false !== $val ) {
-				return absint( $val );
+			$_max = max($min, $_max);
+			$_min = min($min, $_max);
+			$val = random_int($_min, $_max);
+			if (false !== $val) {
+				return absint($val);
 			} else {
 				$use_random_int_functionality = false;
 			}
-		} catch ( Error $e ) {
+		} catch (Error $e) {
 			$use_random_int_functionality = false;
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$use_random_int_functionality = false;
 		}
 	}
 
 	// Reset $rnd_value after 14 uses
 	// 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value
-	if ( strlen($rnd_value) < 8 ) {
-		if ( defined( 'WP_SETUP_CONFIG' ) )
+	if (strlen($rnd_value) < 8) {
+		if (defined('WP_SETUP_CONFIG'))
 			static $seed = '';
 		else
 			$seed = get_transient('random_seed');
-		$rnd_value = md5( uniqid(microtime() . mt_rand(), true ) . $seed );
+		$rnd_value = md5(uniqid(microtime().mt_rand(), true).$seed);
 		$rnd_value .= sha1($rnd_value);
-		$rnd_value .= sha1($rnd_value . $seed);
-		$seed = md5($seed . $rnd_value);
-		if ( ! defined( 'WP_SETUP_CONFIG' ) && ! defined( 'WP_INSTALLING' ) ) {
-			set_transient( 'random_seed', $seed );
+		$rnd_value .= sha1($rnd_value.$seed);
+		$seed = md5($seed.$rnd_value);
+		if ( ! defined('WP_SETUP_CONFIG') && ! defined('WP_INSTALLING')) {
+			set_transient('random_seed', $seed);
 		}
 	}
 
@@ -2270,14 +2270,14 @@ 
 	$value = abs(hexdec($value));
 
 	// Reduce the value to be within the min - max range
-	if ( $max != 0 )
-		$value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 );
+	if ($max != 0)
+		$value = $min + ($max - $min + 1) * $value / ($max_random_number + 1);
 
 	return abs(intval($value));
 }
 endif;
 
-if ( !function_exists('wp_set_password') ) :
+if ( ! function_exists('wp_set_password')) :
 /**
  * Updates the user's password with a new encrypted one.
  *
@@ -2295,17 +2295,17 @@ 
  * @param string $password The plaintext new user password
  * @param int    $user_id  User ID
  */
-function wp_set_password( $password, $user_id ) {
+function wp_set_password($password, $user_id) {
 	global $wpdb;
 
-	$hash = wp_hash_password( $password );
-	$wpdb->update($wpdb->users, array('user_pass' => $hash, 'user_activation_key' => ''), array('ID' => $user_id) );
+	$hash = wp_hash_password($password);
+	$wpdb->update($wpdb->users, array('user_pass' => $hash, 'user_activation_key' => ''), array('ID' => $user_id));
 
 	wp_cache_delete($user_id, 'users');
 }
 endif;
 
-if ( !function_exists( 'get_avatar' ) ) :
+if ( ! function_exists('get_avatar')) :
 /**
  * Retrieve the avatar `<img>` tag for a user, email address, MD5 hash, comment, or post.
  *
@@ -2340,15 +2340,15 @@ 
  * }
  * @return false|string `<img>` tag for the user's avatar. False on failure.
  */
-function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args = null ) {
+function get_avatar($id_or_email, $size = 96, $default = '', $alt = '', $args = null) {
 	$defaults = array(
 		// get_avatar_data() args.
 		'size'          => 96,
 		'height'        => null,
 		'width'         => null,
-		'default'       => get_option( 'avatar_default', 'mystery' ),
+		'default'       => get_option('avatar_default', 'mystery'),
 		'force_default' => false,
-		'rating'        => get_option( 'avatar_rating' ),
+		'rating'        => get_option('avatar_rating'),
 		'scheme'        => null,
 		'alt'           => '',
 		'class'         => null,
@@ -2356,7 +2356,7 @@ 
 		'extra_attr'    => '',
 	);
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		$args = array();
 	}
 
@@ -2364,17 +2364,17 @@ 
 	$args['default'] = $default;
 	$args['alt']     = $alt;
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( empty( $args['height'] ) ) {
+	if (empty($args['height'])) {
 		$args['height'] = $args['size'];
 	}
-	if ( empty( $args['width'] ) ) {
+	if (empty($args['width'])) {
 		$args['width'] = $args['size'];
 	}
 
-	if ( is_object( $id_or_email ) && isset( $id_or_email->comment_ID ) ) {
-		$id_or_email = get_comment( $id_or_email );
+	if (is_object($id_or_email) && isset($id_or_email->comment_ID)) {
+		$id_or_email = get_comment($id_or_email);
 	}
 
 	/**
@@ -2390,36 +2390,36 @@ 
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 * @param array  $args        Arguments passed to get_avatar_url(), after processing.
 	 */
-	$avatar = apply_filters( 'pre_get_avatar', null, $id_or_email, $args );
+	$avatar = apply_filters('pre_get_avatar', null, $id_or_email, $args);
 
-	if ( ! is_null( $avatar ) ) {
+	if ( ! is_null($avatar)) {
 		/** This filter is documented in wp-includes/pluggable.php */
-		return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args );
+		return apply_filters('get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args);
 	}
 
-	if ( ! $args['force_display'] && ! get_option( 'show_avatars' ) ) {
+	if ( ! $args['force_display'] && ! get_option('show_avatars')) {
 		return false;
 	}
 
-	$url2x = get_avatar_url( $id_or_email, array_merge( $args, array( 'size' => $args['size'] * 2 ) ) );
+	$url2x = get_avatar_url($id_or_email, array_merge($args, array('size' => $args['size'] * 2)));
 
-	$args = get_avatar_data( $id_or_email, $args );
+	$args = get_avatar_data($id_or_email, $args);
 
 	$url = $args['url'];
 
-	if ( ! $url || is_wp_error( $url ) ) {
+	if ( ! $url || is_wp_error($url)) {
 		return false;
 	}
 
-	$class = array( 'avatar', 'avatar-' . (int) $args['size'], 'photo' );
+	$class = array('avatar', 'avatar-'.(int) $args['size'], 'photo');
 
-	if ( ! $args['found_avatar'] || $args['force_default'] ) {
+	if ( ! $args['found_avatar'] || $args['force_default']) {
 		$class[] = 'avatar-default';
 	}
 
-	if ( $args['class'] ) {
-		if ( is_array( $args['class'] ) ) {
-			$class = array_merge( $class, $args['class'] );
+	if ($args['class']) {
+		if (is_array($args['class'])) {
+			$class = array_merge($class, $args['class']);
 		} else {
 			$class[] = $args['class'];
 		}
@@ -2427,10 +2427,10 @@ 
 
 	$avatar = sprintf(
 		"<img alt='%s' src='%s' srcset='%s' class='%s' height='%d' width='%d' %s/>",
-		esc_attr( $args['alt'] ),
-		esc_url( $url ),
-		esc_attr( "$url2x 2x" ),
-		esc_attr( join( ' ', $class ) ),
+		esc_attr($args['alt']),
+		esc_url($url),
+		esc_attr("$url2x 2x"),
+		esc_attr(join(' ', $class)),
 		(int) $args['height'],
 		(int) $args['width'],
 		$args['extra_attr']
@@ -2452,11 +2452,11 @@ 
 	 * @param string $alt         Alternative text to use in the avatar image tag. Default empty.
 	 * @param array  $args        Arguments passed to get_avatar_data(), after processing.
 	 */
-	return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args );
+	return apply_filters('get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args);
 }
 endif;
 
-if ( !function_exists( 'wp_text_diff' ) ) :
+if ( ! function_exists('wp_text_diff')) :
 /**
  * Displays a human readable HTML representation of the difference between two strings.
  *
@@ -2484,12 +2484,12 @@ 
  * @param string|array $args         Optional. Change 'title', 'title_left', and 'title_right' defaults.
  * @return string Empty string if strings are equivalent or HTML with differences.
  */
-function wp_text_diff( $left_string, $right_string, $args = null ) {
-	$defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
-	$args = wp_parse_args( $args, $defaults );
+function wp_text_diff($left_string, $right_string, $args = null) {
+	$defaults = array('title' => '', 'title_left' => '', 'title_right' => '');
+	$args = wp_parse_args($args, $defaults);
 
-	if ( ! class_exists( 'WP_Text_Diff_Renderer_Table', false ) )
-		require( ABSPATH . WPINC . '/wp-diff.php' );
+	if ( ! class_exists('WP_Text_Diff_Renderer_Table', false))
+		require(ABSPATH.WPINC.'/wp-diff.php');
 
 	$left_string  = normalize_whitespace($left_string);
 	$right_string = normalize_whitespace($right_string);
@@ -2497,31 +2497,31 @@ 
 	$left_lines  = explode("\n", $left_string);
 	$right_lines = explode("\n", $right_string);
 	$text_diff = new Text_Diff($left_lines, $right_lines);
-	$renderer  = new WP_Text_Diff_Renderer_Table( $args );
+	$renderer  = new WP_Text_Diff_Renderer_Table($args);
 	$diff = $renderer->render($text_diff);
 
-	if ( !$diff )
+	if ( ! $diff)
 		return '';
 
-	$r  = "<table class='diff'>\n";
+	$r = "<table class='diff'>\n";
 
-	if ( ! empty( $args[ 'show_split_view' ] ) ) {
+	if ( ! empty($args['show_split_view'])) {
 		$r .= "<col class='content diffsplit left' /><col class='content diffsplit middle' /><col class='content diffsplit right' />";
 	} else {
 		$r .= "<col class='content' />";
 	}
 
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
+	if ($args['title'] || $args['title_left'] || $args['title_right'])
 		$r .= "<thead>";
-	if ( $args['title'] )
+	if ($args['title'])
 		$r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
-	if ( $args['title_left'] || $args['title_right'] ) {
+	if ($args['title_left'] || $args['title_right']) {
 		$r .= "<tr class='diff-sub-title'>\n";
 		$r .= "\t<td></td><th>$args[title_left]</th>\n";
 		$r .= "\t<td></td><th>$args[title_right]</th>\n";
 		$r .= "</tr>\n";
 	}
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
+	if ($args['title'] || $args['title_left'] || $args['title_right'])
 		$r .= "</thead>\n";
 
 	$r .= "<tbody>\n$diff\n</tbody>\n";

Braces +101 added lines, -69 removed lines

@@ -98,8 +98,9 @@ 
 function get_user_by( $field, $value ) {
 	$userdata = WP_User::get_data_by( $field, $value );
 
-	if ( !$userdata )
-		return false;
+	if ( !$userdata ) {
+			return false;
+	}
 
 	$user = new WP_User;
 	$user->init( $userdata );
@@ -123,8 +124,9 @@ 
 
 	$clean = _get_non_cached_ids( $user_ids, 'users' );
 
-	if ( empty( $clean ) )
-		return;
+	if ( empty( $clean ) ) {
+			return;
+	}
 
 	$list = implode( ',', $clean );
 
@@ -315,8 +317,9 @@ 
 
 	// From email and name
 	// If we don't have a name from the input headers
-	if ( !isset( $from_name ) )
-		$from_name = 'WordPress';
+	if ( !isset( $from_name ) ) {
+			$from_name = 'WordPress';
+	}
 
 	/* If we don't have an email from the input headers default to wordpress@$sitename
 	 * Some hosts will block outgoing mail from this address if it doesn't exist but
@@ -414,8 +417,9 @@ 
 
 	// Set Content-Type and charset
 	// If we don't have a content-type from the input headers
-	if ( !isset( $content_type ) )
-		$content_type = 'text/plain';
+	if ( !isset( $content_type ) ) {
+			$content_type = 'text/plain';
+	}
 
 	/**
 	 * Filters the wp_mail() content type.
@@ -429,12 +433,14 @@ 
 	$phpmailer->ContentType = $content_type;
 
 	// Set whether it's plaintext, depending on $content_type
-	if ( 'text/html' == $content_type )
-		$phpmailer->isHTML( true );
+	if ( 'text/html' == $content_type ) {
+			$phpmailer->isHTML( true );
+	}
 
 	// If we don't have a charset from the input headers
-	if ( !isset( $charset ) )
-		$charset = get_bloginfo( 'charset' );
+	if ( !isset( $charset ) ) {
+			$charset = get_bloginfo( 'charset' );
+	}
 
 	// Set the content-type and charset
 
@@ -453,8 +459,9 @@ 
 			$phpmailer->addCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
 		}
 
-		if ( false !== stripos( $content_type, 'multipart' ) && ! empty($boundary) )
-			$phpmailer->addCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
+		if ( false !== stripos( $content_type, 'multipart' ) && ! empty($boundary) ) {
+					$phpmailer->addCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
+		}
 	}
 
 	if ( !empty( $attachments ) ) {
@@ -769,8 +776,9 @@ 
 				}
 	    }
 
-		if ( empty($_COOKIE[$cookie_name]) )
-			return false;
+		if ( empty($_COOKIE[$cookie_name]) ) {
+					return false;
+		}
 		$cookie = $_COOKIE[$cookie_name];
 	}
 
@@ -914,9 +922,10 @@ 
 	setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
 	setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
 	setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-	if ( COOKIEPATH != SITECOOKIEPATH )
-		setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-}
+	if ( COOKIEPATH != SITECOOKIEPATH ) {
+			setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
+	}
+	}
 endif;
 
 if ( !function_exists('wp_clear_auth_cookie') ) :
@@ -1070,8 +1079,9 @@ 
  *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
  */
 function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
-	if ( -1 == $action )
-		_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );
+	if ( -1 == $action ) {
+			_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );
+	}
 
 	$adminurl = strtolower(admin_url());
 	$referer = strtolower(wp_get_referer());
@@ -1119,12 +1129,13 @@ 
 
 	$nonce = '';
 
-	if ( $query_arg && isset( $_REQUEST[ $query_arg ] ) )
-		$nonce = $_REQUEST[ $query_arg ];
-	elseif ( isset( $_REQUEST['_ajax_nonce'] ) )
-		$nonce = $_REQUEST['_ajax_nonce'];
-	elseif ( isset( $_REQUEST['_wpnonce'] ) )
-		$nonce = $_REQUEST['_wpnonce'];
+	if ( $query_arg && isset( $_REQUEST[ $query_arg ] ) ) {
+			$nonce = $_REQUEST[ $query_arg ];
+	} elseif ( isset( $_REQUEST['_ajax_nonce'] ) ) {
+			$nonce = $_REQUEST['_ajax_nonce'];
+	} elseif ( isset( $_REQUEST['_wpnonce'] ) ) {
+			$nonce = $_REQUEST['_wpnonce'];
+	}
 
 	$result = wp_verify_nonce( $nonce, $action );
 
@@ -1199,13 +1210,16 @@ 
 	 */
 	$status = apply_filters( 'wp_redirect_status', $status, $location );
 
-	if ( ! $location )
-		return false;
+	if ( ! $location ) {
+			return false;
+	}
 
 	$location = wp_sanitize_redirect($location);
 
-	if ( !$is_IIS && PHP_SAPI != 'cgi-fcgi' )
-		status_header($status); // This causes problems on IIS and some FastCGI setups
+	if ( !$is_IIS && PHP_SAPI != 'cgi-fcgi' ) {
+			status_header($status);
+	}
+	// This causes problems on IIS and some FastCGI setups
 
 	header("Location: $location", true, $status);
 
@@ -1316,8 +1330,9 @@ 
 function wp_validate_redirect($location, $default = '') {
 	$location = trim( $location, " \t\n\r\0\x08\x0B" );
 	// browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'
-	if ( substr($location, 0, 2) == '//' )
-		$location = 'http:' . $location;
+	if ( substr($location, 0, 2) == '//' ) {
+			$location = 'http:' . $location;
+	}
 
 	// In php 5 parse_url may fail if the URL query part contains http://, bug #38143
 	$test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location;
@@ -1326,12 +1341,14 @@ 
 	$lp = @parse_url($test);
 
 	// Give up if malformed URL
-	if ( false === $lp )
-		return $default;
+	if ( false === $lp ) {
+			return $default;
+	}
 
 	// Allow only http and https schemes. No data:, etc.
-	if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) )
-		return $default;
+	if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) ) {
+			return $default;
+	}
 
 	// Reject if certain components are set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
 	if ( ! isset( $lp['host'] ) && ( isset( $lp['scheme'] ) || isset( $lp['user'] ) || isset( $lp['pass'] ) || isset( $lp['port'] ) ) ) {
@@ -1357,8 +1374,9 @@ 
 	 */
 	$allowed_hosts = (array) apply_filters( 'allowed_redirect_hosts', array($wpp['host']), isset($lp['host']) ? $lp['host'] : '' );
 
-	if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) )
-		$location = $default;
+	if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) ) {
+			$location = $default;
+	}
 
 	return $location;
 }
@@ -1380,8 +1398,9 @@ 
 	}
 
 	$comment = get_comment( $comment_id );
-	if ( empty( $comment ) || empty( $comment->comment_post_ID ) )
-		return false;
+	if ( empty( $comment ) || empty( $comment->comment_post_ID ) ) {
+			return false;
+	}
 
 	$post    = get_post( $comment->comment_post_ID );
 	$author  = get_userdata( $post->post_author );
@@ -1510,19 +1529,22 @@ 
 
 	if ( '' == $comment->comment_author ) {
 		$from = "From: \"$blogname\" <$wp_email>";
-		if ( '' != $comment->comment_author_email )
-			$reply_to = "Reply-To: $comment->comment_author_email";
+		if ( '' != $comment->comment_author_email ) {
+					$reply_to = "Reply-To: $comment->comment_author_email";
+		}
 	} else {
 		$from = "From: \"$comment->comment_author\" <$wp_email>";
-		if ( '' != $comment->comment_author_email )
-			$reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";
+		if ( '' != $comment->comment_author_email ) {
+					$reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";
+		}
 	}
 
 	$message_headers = "$from\n"
 		. "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 
-	if ( isset($reply_to) )
-		$message_headers .= $reply_to . "\n";
+	if ( isset($reply_to) ) {
+			$message_headers .= $reply_to . "\n";
+	}
 
 	/**
 	 * Filters the comment notification email text.
@@ -1605,8 +1627,9 @@ 
 	// Send to the administration and to the post author if the author can modify the comment.
 	$emails = array( get_option( 'admin_email' ) );
 	if ( $user && user_can( $user->ID, 'edit_comment', $comment_id ) && ! empty( $user->user_email ) ) {
-		if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) )
-			$emails[] = $user->user_email;
+		if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {
+					$emails[] = $user->user_email;
+		}
 	}
 
 	$switched_locale = switch_to_locale( get_locale() );
@@ -2178,10 +2201,12 @@ 
  */
 function wp_generate_password( $length = 12, $special_chars = true, $extra_special_chars = false ) {
 	$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-	if ( $special_chars )
-		$chars .= '!@#$%^&*()';
-	if ( $extra_special_chars )
-		$chars .= '-_ []{}<>~`+=,.;:/?|';
+	if ( $special_chars ) {
+			$chars .= '!@#$%^&*()';
+	}
+	if ( $extra_special_chars ) {
+			$chars .= '-_ []{}<>~`+=,.;:/?|';
+	}
 
 	$password = '';
 	for ( $i = 0; $i < $length; $i++ ) {
@@ -2248,10 +2273,11 @@ 
 	// Reset $rnd_value after 14 uses
 	// 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value
 	if ( strlen($rnd_value) < 8 ) {
-		if ( defined( 'WP_SETUP_CONFIG' ) )
-			static $seed = '';
-		else
-			$seed = get_transient('random_seed');
+		if ( defined( 'WP_SETUP_CONFIG' ) ) {
+					static $seed = '';
+		} else {
+					$seed = get_transient('random_seed');
+		}
 		$rnd_value = md5( uniqid(microtime() . mt_rand(), true ) . $seed );
 		$rnd_value .= sha1($rnd_value);
 		$rnd_value .= sha1($rnd_value . $seed);
@@ -2270,8 +2296,9 @@ 
 	$value = abs(hexdec($value));
 
 	// Reduce the value to be within the min - max range
-	if ( $max != 0 )
-		$value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 );
+	if ( $max != 0 ) {
+			$value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 );
+	}
 
 	return abs(intval($value));
 }
@@ -2488,8 +2515,9 @@ 
 	$defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
 	$args = wp_parse_args( $args, $defaults );
 
-	if ( ! class_exists( 'WP_Text_Diff_Renderer_Table', false ) )
-		require( ABSPATH . WPINC . '/wp-diff.php' );
+	if ( ! class_exists( 'WP_Text_Diff_Renderer_Table', false ) ) {
+			require( ABSPATH . WPINC . '/wp-diff.php' );
+	}
 
 	$left_string  = normalize_whitespace($left_string);
 	$right_string = normalize_whitespace($right_string);
@@ -2500,8 +2528,9 @@ 
 	$renderer  = new WP_Text_Diff_Renderer_Table( $args );
 	$diff = $renderer->render($text_diff);
 
-	if ( !$diff )
-		return '';
+	if ( !$diff ) {
+			return '';
+	}
 
 	$r  = "<table class='diff'>\n";
 
@@ -2511,18 +2540,21 @@ 
 		$r .= "<col class='content' />";
 	}
 
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
-		$r .= "<thead>";
-	if ( $args['title'] )
-		$r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
+	if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+			$r .= "<thead>";
+	}
+	if ( $args['title'] ) {
+			$r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
+	}
 	if ( $args['title_left'] || $args['title_right'] ) {
 		$r .= "<tr class='diff-sub-title'>\n";
 		$r .= "\t<td></td><th>$args[title_left]</th>\n";
 		$r .= "\t<td></td><th>$args[title_right]</th>\n";
 		$r .= "</tr>\n";
 	}
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
-		$r .= "</thead>\n";
+	if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+			$r .= "</thead>\n";
+	}
 
 	$r .= "<tbody>\n$diff\n</tbody>\n";
 	$r .= "</table>";

src/wp-includes/pomo/po.php

Doc Comments +7 added lines, -2 removed lines

@@ -87,6 +87,7 @@ 
 	 * Text to include as a comment before the start of the PO contents
 	 *
 	 * Doesn't need to include # in the beginning of lines, these are added automatically
+	 * @param string $text
 	 */
 	function set_comment_before_headers( $text ) {
 		$this->comments_before_headers = $text;
@@ -196,6 +197,7 @@ 
 	 *
 	 * @static
 	 * @param Translation_Entry &$entry the entry to convert to po string
+	 * @param Translation_Entry $entry
 	 * @return false|string PO-style formatted string for the entry or
 	 * 	false if the entry is empty
 	 */
@@ -223,6 +225,9 @@ 
 		return implode("\n", $po);
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function match_begin_and_end_newlines( $translation, $original ) {
 		if ( '' === $translation ) {
 			return $translation;
@@ -395,7 +400,7 @@ 
 	 *
 	 * @param     resource $f
 	 * @param     string   $action
-	 * @return boolean
+	 * @return boolean|string
 	 */
 	function read_line($f, $action = 'read') {
 		static $last_line = '';
@@ -435,7 +440,7 @@ 
 
 	/**
 	 * @param string $s
-	 * @return sring
+	 * @return string
 	 */
 	public static function trim_quotes($s) {
 		if ( substr($s, 0, 1) == '"') $s = substr($s, 1);

Spacing +56 added lines, -56 removed lines

@@ -7,9 +7,9 @@ 
  * @subpackage po
  */
 
-require_once dirname(__FILE__) . '/translations.php';
+require_once dirname(__FILE__).'/translations.php';
 
-if ( ! defined( 'PO_MAX_LINE_LEN' ) ) {
+if ( ! defined('PO_MAX_LINE_LEN')) {
 	define('PO_MAX_LINE_LEN', 79);
 }
 
@@ -18,7 +18,7 @@ 
 /**
  * Routines for working with PO files
  */
-if ( ! class_exists( 'PO', false ) ):
+if ( ! class_exists('PO', false)):
 class PO extends Gettext_Translations {
 
 	var $comments_before_headers = '';
@@ -30,8 +30,8 @@ 
 	 */
 	function export_headers() {
 		$header_string = '';
-		foreach($this->headers as $header => $value) {
-			$header_string.= "$header: $value\n";
+		foreach ($this->headers as $header => $value) {
+			$header_string .= "$header: $value\n";
 		}
 		$poified = PO::poify($header_string);
 		if ($this->comments_before_headers)
@@ -88,7 +88,7 @@ 
 	 *
 	 * Doesn't need to include # in the beginning of lines, these are added automatically
 	 */
-	function set_comment_before_headers( $text ) {
+	function set_comment_before_headers($text) {
 		$this->comments_before_headers = $text;
 	}
 
@@ -115,7 +115,7 @@ 
 		$po = $quote.implode("${slash}n$quote$newline$quote", explode($newline, $string)).$quote;
 		// add empty string on first line for readbility
 		if (false !== strpos($string, $newline) &&
-				(substr_count($string, $newline) > 1 || !($newline === substr($string, -strlen($newline))))) {
+				(substr_count($string, $newline) > 1 || ! ($newline === substr($string, -strlen($newline))))) {
 			$po = "$quote$quote$newline$po";
 		}
 		// remove empty strings
@@ -136,24 +136,24 @@ 
 		$lines = array_map(array('PO', 'trim_quotes'), $lines);
 		$unpoified = '';
 		$previous_is_backslash = false;
-		foreach($lines as $line) {
+		foreach ($lines as $line) {
 			preg_match_all('/./u', $line, $chars);
 			$chars = $chars[0];
-			foreach($chars as $char) {
-				if (!$previous_is_backslash) {
+			foreach ($chars as $char) {
+				if ( ! $previous_is_backslash) {
 					if ('\\' == $char)
 						$previous_is_backslash = true;
 					else
 						$unpoified .= $char;
 				} else {
 					$previous_is_backslash = false;
-					$unpoified .= isset($escapes[$char])? $escapes[$char] : $char;
+					$unpoified .= isset($escapes[$char]) ? $escapes[$char] : $char;
 				}
 			}
 		}
 
 		// Standardise the line endings on imported content, technically PO files shouldn't contain \r
-		$unpoified = str_replace( array( "\r\n", "\r" ), "\n", $unpoified );
+		$unpoified = str_replace(array("\r\n", "\r"), "\n", $unpoified);
 
 		return $unpoified;
 	}
@@ -177,10 +177,10 @@ 
 			$append = "\n";
 		}
 		foreach ($lines as &$line) {
-			$line = $with . $line;
+			$line = $with.$line;
 		}
 		unset($line);
-		return implode("\n", $lines) . $append;
+		return implode("\n", $lines).$append;
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 * @param string $char character to denote a special PO comment,
 	 * 	like :, default is a space
 	 */
-	public static function comment_block($text, $char=' ') {
+	public static function comment_block($text, $char = ' ') {
 		$text = wordwrap($text, PO_MAX_LINE_LEN - 3);
 		return PO::prepend_each_line($text, "#$char ");
 	}
@@ -206,53 +206,53 @@ 
 	 * 	false if the entry is empty
 	 */
 	public static function export_entry(&$entry) {
-		if ( null === $entry->singular || '' === $entry->singular ) return false;
+		if (null === $entry->singular || '' === $entry->singular) return false;
 		$po = array();
-		if (!empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
-		if (!empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.');
-		if (!empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
-		if (!empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
+		if ( ! empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
+		if ( ! empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.');
+		if ( ! empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
+		if ( ! empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
 		if ($entry->context) $po[] = 'msgctxt '.PO::poify($entry->context);
 		$po[] = 'msgid '.PO::poify($entry->singular);
-		if (!$entry->is_plural) {
-			$translation = empty($entry->translations)? '' : $entry->translations[0];
-			$translation = PO::match_begin_and_end_newlines( $translation, $entry->singular );
+		if ( ! $entry->is_plural) {
+			$translation = empty($entry->translations) ? '' : $entry->translations[0];
+			$translation = PO::match_begin_and_end_newlines($translation, $entry->singular);
 			$po[] = 'msgstr '.PO::poify($translation);
 		} else {
 			$po[] = 'msgid_plural '.PO::poify($entry->plural);
-			$translations = empty($entry->translations)? array('', '') : $entry->translations;
-			foreach($translations as $i => $translation) {
-				$translation = PO::match_begin_and_end_newlines( $translation, $entry->plural );
+			$translations = empty($entry->translations) ? array('', '') : $entry->translations;
+			foreach ($translations as $i => $translation) {
+				$translation = PO::match_begin_and_end_newlines($translation, $entry->plural);
 				$po[] = "msgstr[$i] ".PO::poify($translation);
 			}
 		}
 		return implode("\n", $po);
 	}
 
-	public static function match_begin_and_end_newlines( $translation, $original ) {
-		if ( '' === $translation ) {
+	public static function match_begin_and_end_newlines($translation, $original) {
+		if ('' === $translation) {
 			return $translation;
 		}
 
-		$original_begin = "\n" === substr( $original, 0, 1 );
-		$original_end = "\n" === substr( $original, -1 );
-		$translation_begin = "\n" === substr( $translation, 0, 1 );
-		$translation_end = "\n" === substr( $translation, -1 );
+		$original_begin = "\n" === substr($original, 0, 1);
+		$original_end = "\n" === substr($original, -1);
+		$translation_begin = "\n" === substr($translation, 0, 1);
+		$translation_end = "\n" === substr($translation, -1);
 
-		if ( $original_begin ) {
-			if ( ! $translation_begin ) {
-				$translation = "\n" . $translation;
+		if ($original_begin) {
+			if ( ! $translation_begin) {
+				$translation = "\n".$translation;
 			}
-		} elseif ( $translation_begin ) {
-			$translation = ltrim( $translation, "\n" );
+		} elseif ($translation_begin) {
+			$translation = ltrim($translation, "\n");
 		}
 
-		if ( $original_end ) {
-			if ( ! $translation_end ) {
+		if ($original_end) {
+			if ( ! $translation_end) {
 				$translation .= "\n";
 			}
-		} elseif ( $translation_end ) {
-			$translation = rtrim( $translation, "\n" );
+		} elseif ($translation_end) {
+			$translation = rtrim($translation, "\n");
 		}
 
 		return $translation;
@@ -264,11 +264,11 @@ 
 	 */
 	function import_from_file($filename) {
 		$f = fopen($filename, 'r');
-		if (!$f) return false;
+		if ( ! $f) return false;
 		$lineno = 0;
 		while (true) {
 			$res = $this->read_entry($f, $lineno);
-			if (!$res) break;
+			if ( ! $res) break;
 			if ($res['entry']->singular == '') {
 				$this->set_headers($this->make_headers($res['entry']->translations[0]));
 			} else {
@@ -276,10 +276,10 @@ 
 			}
 		}
 		PO::read_line($f, 'clear');
-		if ( false === $res ) {
+		if (false === $res) {
 			return false;
 		}
-		if ( ! $this->headers && ! $this->entries ) {
+		if ( ! $this->headers && ! $this->entries) {
 			return false;
 		}
 		return true;
@@ -308,11 +308,11 @@ 
 		while (true) {
 			$lineno++;
 			$line = PO::read_line($f);
-			if (!$line)  {
+			if ( ! $line) {
 				if (feof($f)) {
 					if (self::is_final($context))
 						break;
-					elseif (!$context) // we haven't read a line and eof came
+					elseif ( ! $context) // we haven't read a line and eof came
 						return null;
 					else
 						return false;
@@ -399,13 +399,13 @@ 
 		}
 
 		$have_translations = false;
-		foreach ( $entry->translations as $t ) {
-			if ( $t || ('0' === $t) ) {
+		foreach ($entry->translations as $t) {
+			if ($t || ('0' === $t)) {
 				$have_translations = true;
 				break;
 			}
 		}
-		if ( false === $have_translations ) {
+		if (false === $have_translations) {
 			$entry->translations = array();
 		}
 
@@ -431,8 +431,8 @@ 
 			$use_last_line = true;
 			return true;
 		}
-		$line = $use_last_line? $last_line : fgets($f);
-		$line = ( "\r\n" == substr( $line, -2 ) ) ? rtrim( $line, "\r\n" ) . "\n" : $line;
+		$line = $use_last_line ? $last_line : fgets($f);
+		$line = ("\r\n" == substr($line, -2)) ? rtrim($line, "\r\n")."\n" : $line;
 		$last_line = $line;
 		$use_last_line = false;
 		return $line;
@@ -448,11 +448,11 @@ 
 		if ('#:' == $first_two) {
 			$entry->references = array_merge($entry->references, preg_split('/\s+/', $comment));
 		} elseif ('#.' == $first_two) {
-			$entry->extracted_comments = trim($entry->extracted_comments . "\n" . $comment);
+			$entry->extracted_comments = trim($entry->extracted_comments."\n".$comment);
 		} elseif ('#,' == $first_two) {
 			$entry->flags = array_merge($entry->flags, preg_split('/,\s*/', $comment));
 		} else {
-			$entry->translator_comments = trim($entry->translator_comments . "\n" . $comment);
+			$entry->translator_comments = trim($entry->translator_comments."\n".$comment);
 		}
 	}
 
@@ -461,8 +461,8 @@ 
 	 * @return sring
 	 */
 	public static function trim_quotes($s) {
-		if ( substr($s, 0, 1) == '"') $s = substr($s, 1);
-		if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
+		if (substr($s, 0, 1) == '"') $s = substr($s, 1);
+		if (substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
 		return $s;
 	}
 }

Braces +56 added lines, -26 removed lines

@@ -34,10 +34,11 @@ 
 			$header_string.= "$header: $value\n";
 		}
 		$poified = PO::poify($header_string);
-		if ($this->comments_before_headers)
-			$before_headers = $this->prepend_each_line(rtrim($this->comments_before_headers)."\n", '# ');
-		else
-			$before_headers = '';
+		if ($this->comments_before_headers) {
+					$before_headers = $this->prepend_each_line(rtrim($this->comments_before_headers)."\n", '# ');
+		} else {
+					$before_headers = '';
+		}
 		return rtrim("{$before_headers}msgid \"\"\nmsgstr $poified");
 	}
 
@@ -76,10 +77,14 @@ 
 	 */
 	function export_to_file($filename, $include_headers = true) {
 		$fh = fopen($filename, 'w');
-		if (false === $fh) return false;
+		if (false === $fh) {
+			return false;
+		}
 		$export = $this->export($include_headers);
 		$res = fwrite($fh, $export);
-		if (false === $res) return false;
+		if (false === $res) {
+			return false;
+		}
 		return fclose($fh);
 	}
 
@@ -141,10 +146,11 @@ 
 			$chars = $chars[0];
 			foreach($chars as $char) {
 				if (!$previous_is_backslash) {
-					if ('\\' == $char)
-						$previous_is_backslash = true;
-					else
-						$unpoified .= $char;
+					if ('\\' == $char) {
+											$previous_is_backslash = true;
+					} else {
+											$unpoified .= $char;
+					}
 				} else {
 					$previous_is_backslash = false;
 					$unpoified .= isset($escapes[$char])? $escapes[$char] : $char;
@@ -206,13 +212,25 @@ 
 	 * 	false if the entry is empty
 	 */
 	public static function export_entry(&$entry) {
-		if ( null === $entry->singular || '' === $entry->singular ) return false;
+		if ( null === $entry->singular || '' === $entry->singular ) {
+			return false;
+		}
 		$po = array();
-		if (!empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
-		if (!empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.');
-		if (!empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
-		if (!empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
-		if ($entry->context) $po[] = 'msgctxt '.PO::poify($entry->context);
+		if (!empty($entry->translator_comments)) {
+			$po[] = PO::comment_block($entry->translator_comments);
+		}
+		if (!empty($entry->extracted_comments)) {
+			$po[] = PO::comment_block($entry->extracted_comments, '.');
+		}
+		if (!empty($entry->references)) {
+			$po[] = PO::comment_block(implode(' ', $entry->references), ':');
+		}
+		if (!empty($entry->flags)) {
+			$po[] = PO::comment_block(implode(", ", $entry->flags), ',');
+		}
+		if ($entry->context) {
+			$po[] = 'msgctxt '.PO::poify($entry->context);
+		}
 		$po[] = 'msgid '.PO::poify($entry->singular);
 		if (!$entry->is_plural) {
 			$translation = empty($entry->translations)? '' : $entry->translations[0];
@@ -264,11 +282,15 @@ 
 	 */
 	function import_from_file($filename) {
 		$f = fopen($filename, 'r');
-		if (!$f) return false;
+		if (!$f) {
+			return false;
+		}
 		$lineno = 0;
 		while (true) {
 			$res = $this->read_entry($f, $lineno);
-			if (!$res) break;
+			if (!$res) {
+				break;
+			}
 			if ($res['entry']->singular == '') {
 				$this->set_headers($this->make_headers($res['entry']->translations[0]));
 			} else {
@@ -310,17 +332,21 @@ 
 			$line = PO::read_line($f);
 			if (!$line)  {
 				if (feof($f)) {
-					if (self::is_final($context))
-						break;
-					elseif (!$context) // we haven't read a line and eof came
+					if (self::is_final($context)) {
+											break;
+					} elseif (!$context) {
+						// we haven't read a line and eof came
 						return null;
-					else
-						return false;
+					} else {
+											return false;
+					}
 				} else {
 					return false;
 				}
 			}
-			if ($line == "\n") continue;
+			if ($line == "\n") {
+				continue;
+			}
 			$line = trim($line);
 			if (preg_match('/^#/', $line, $m)) {
 				// the comment is the start of a new entry
@@ -461,8 +487,12 @@ 
 	 * @return sring
 	 */
 	public static function trim_quotes($s) {
-		if ( substr($s, 0, 1) == '"') $s = substr($s, 1);
-		if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
+		if ( substr($s, 0, 1) == '"') {
+			$s = substr($s, 1);
+		}
+		if ( substr($s, -1, 1) == '"') {
+			$s = substr($s, 0, -1);
+		}
 		return $s;
 	}
 }

src/wp-includes/post-thumbnail-template.php

Doc Comments +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
  *
  * @see get_the_post_thumbnail()
  *
- * @param string|array $size Optional. Image size to use. Accepts any valid image size, or
+ * @param string $size Optional. Image size to use. Accepts any valid image size, or
  *                           an array of width and height values in pixels (in that order).
  *                           Default 'post-thumbnail'.
  * @param string|array $attr Optional. Query string or array of attributes. Default empty.

Spacing +41 added lines, -41 removed lines

@@ -18,8 +18,8 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return bool Whether the post has an image attached.
  */
-function has_post_thumbnail( $post = null ) {
-	return (bool) get_post_thumbnail_id( $post );
+function has_post_thumbnail($post = null) {
+	return (bool) get_post_thumbnail_id($post);
 }
 
 /**
@@ -31,12 +31,12 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return string|int Post thumbnail ID or empty string.
  */
-function get_post_thumbnail_id( $post = null ) {
-	$post = get_post( $post );
-	if ( ! $post ) {
+function get_post_thumbnail_id($post = null) {
+	$post = get_post($post);
+	if ( ! $post) {
 		return '';
 	}
-	return get_post_meta( $post->ID, '_thumbnail_id', true );
+	return get_post_meta($post->ID, '_thumbnail_id', true);
 }
 
 /**
@@ -58,8 +58,8 @@ 
  *                           Default 'post-thumbnail'.
  * @param string|array $attr Optional. Query string or array of attributes. Default empty.
  */
-function the_post_thumbnail( $size = 'post-thumbnail', $attr = '' ) {
-	echo get_the_post_thumbnail( null, $size, $attr );
+function the_post_thumbnail($size = 'post-thumbnail', $attr = '') {
+	echo get_the_post_thumbnail(null, $size, $attr);
 }
 
 /**
@@ -71,21 +71,21 @@ 
  *
  * @param WP_Query $wp_query Optional. A WP_Query instance. Defaults to the $wp_query global.
  */
-function update_post_thumbnail_cache( $wp_query = null ) {
-	if ( ! $wp_query )
+function update_post_thumbnail_cache($wp_query = null) {
+	if ( ! $wp_query)
 		$wp_query = $GLOBALS['wp_query'];
 
-	if ( $wp_query->thumbnails_cached )
+	if ($wp_query->thumbnails_cached)
 		return;
 
 	$thumb_ids = array();
-	foreach ( $wp_query->posts as $post ) {
-		if ( $id = get_post_thumbnail_id( $post->ID ) )
+	foreach ($wp_query->posts as $post) {
+		if ($id = get_post_thumbnail_id($post->ID))
 			$thumb_ids[] = $id;
 	}
 
-	if ( ! empty ( $thumb_ids ) ) {
-		_prime_post_caches( $thumb_ids, false, true );
+	if ( ! empty ($thumb_ids)) {
+		_prime_post_caches($thumb_ids, false, true);
 	}
 
 	$wp_query->thumbnails_cached = true;
@@ -111,12 +111,12 @@ 
  * @param string|array $attr Optional. Query string or array of attributes. Default empty.
  * @return string The post thumbnail image tag.
  */
-function get_the_post_thumbnail( $post = null, $size = 'post-thumbnail', $attr = '' ) {
-	$post = get_post( $post );
-	if ( ! $post ) {
+function get_the_post_thumbnail($post = null, $size = 'post-thumbnail', $attr = '') {
+	$post = get_post($post);
+	if ( ! $post) {
 		return '';
 	}
-	$post_thumbnail_id = get_post_thumbnail_id( $post );
+	$post_thumbnail_id = get_post_thumbnail_id($post);
 
 	/**
 	 * Filters the post thumbnail size.
@@ -126,9 +126,9 @@ 
 	 * @param string|array $size The post thumbnail size. Image size or array of width and height
 	 *                           values (in that order). Default 'post-thumbnail'.
 	 */
-	$size = apply_filters( 'post_thumbnail_size', $size );
+	$size = apply_filters('post_thumbnail_size', $size);
 
-	if ( $post_thumbnail_id ) {
+	if ($post_thumbnail_id) {
 
 		/**
 		 * Fires before fetching the post thumbnail HTML.
@@ -142,10 +142,10 @@ 
 		 * @param string|array $size              The post thumbnail size. Image size or array of width
 		 *                                        and height values (in that order). Default 'post-thumbnail'.
 		 */
-		do_action( 'begin_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size );
-		if ( in_the_loop() )
+		do_action('begin_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size);
+		if (in_the_loop())
 			update_post_thumbnail_cache();
-		$html = wp_get_attachment_image( $post_thumbnail_id, $size, false, $attr );
+		$html = wp_get_attachment_image($post_thumbnail_id, $size, false, $attr);
 
 		/**
 		 * Fires after fetching the post thumbnail HTML.
@@ -157,7 +157,7 @@ 
 		 * @param string|array $size              The post thumbnail size. Image size or array of width
 		 *                                        and height values (in that order). Default 'post-thumbnail'.
 		 */
-		do_action( 'end_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size );
+		do_action('end_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size);
 
 	} else {
 		$html = '';
@@ -174,7 +174,7 @@ 
 	 *                                        values (in that order). Default 'post-thumbnail'.
 	 * @param string       $attr              Query string of attributes.
 	 */
-	return apply_filters( 'post_thumbnail_html', $html, $post->ID, $post_thumbnail_id, $size, $attr );
+	return apply_filters('post_thumbnail_html', $html, $post->ID, $post_thumbnail_id, $size, $attr);
 }
 
 /**
@@ -187,12 +187,12 @@ 
  *                           array of height and width dimensions. Default 'post-thumbnail'.
  * @return string|false Post thumbnail URL or false if no URL is available.
  */
-function get_the_post_thumbnail_url( $post = null, $size = 'post-thumbnail' ) {
-	$post_thumbnail_id = get_post_thumbnail_id( $post );
-	if ( ! $post_thumbnail_id ) {
+function get_the_post_thumbnail_url($post = null, $size = 'post-thumbnail') {
+	$post_thumbnail_id = get_post_thumbnail_id($post);
+	if ( ! $post_thumbnail_id) {
 		return false;
 	}
-	return wp_get_attachment_image_url( $post_thumbnail_id, $size );
+	return wp_get_attachment_image_url($post_thumbnail_id, $size);
 }
 
 /**
@@ -204,10 +204,10 @@ 
  *                           or an array of width and height values in pixels (in that order).
  *                           Default 'post-thumbnail'.
  */
-function the_post_thumbnail_url( $size = 'post-thumbnail' ) {
-	$url = get_the_post_thumbnail_url( null, $size );
-	if ( $url ) {
-		echo esc_url( $url );
+function the_post_thumbnail_url($size = 'post-thumbnail') {
+	$url = get_the_post_thumbnail_url(null, $size);
+	if ($url) {
+		echo esc_url($url);
 	}
 }
 
@@ -219,15 +219,15 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return string Post thumbnail caption.
  */
-function get_the_post_thumbnail_caption( $post = null ) {
-	$post_thumbnail_id = get_post_thumbnail_id( $post );
-	if ( ! $post_thumbnail_id ) {
+function get_the_post_thumbnail_caption($post = null) {
+	$post_thumbnail_id = get_post_thumbnail_id($post);
+	if ( ! $post_thumbnail_id) {
 		return '';
 	}
 
-	$caption = wp_get_attachment_caption( $post_thumbnail_id );
+	$caption = wp_get_attachment_caption($post_thumbnail_id);
 
-	if ( ! $caption ) {
+	if ( ! $caption) {
 		$caption = '';
 	}
 
@@ -241,7 +241,7 @@ 
  *
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
  */
-function the_post_thumbnail_caption( $post = null ) {
+function the_post_thumbnail_caption($post = null) {
 	/**
 	 * Filters the displayed post thumbnail caption.
 	 *
@@ -249,5 +249,5 @@ 
 	 *
 	 * @param string $caption Caption for the given attachment.
 	 */
-	echo apply_filters( 'the_post_thumbnail_caption', get_the_post_thumbnail_caption( $post ) );
+	echo apply_filters('the_post_thumbnail_caption', get_the_post_thumbnail_caption($post));
 }

Braces +12 added lines, -8 removed lines

@@ -72,16 +72,19 @@ 
  * @param WP_Query $wp_query Optional. A WP_Query instance. Defaults to the $wp_query global.
  */
 function update_post_thumbnail_cache( $wp_query = null ) {
-	if ( ! $wp_query )
-		$wp_query = $GLOBALS['wp_query'];
+	if ( ! $wp_query ) {
+			$wp_query = $GLOBALS['wp_query'];
+	}
 
-	if ( $wp_query->thumbnails_cached )
-		return;
+	if ( $wp_query->thumbnails_cached ) {
+			return;
+	}
 
 	$thumb_ids = array();
 	foreach ( $wp_query->posts as $post ) {
-		if ( $id = get_post_thumbnail_id( $post->ID ) )
-			$thumb_ids[] = $id;
+		if ( $id = get_post_thumbnail_id( $post->ID ) ) {
+					$thumb_ids[] = $id;
+		}
 	}
 
 	if ( ! empty ( $thumb_ids ) ) {
@@ -143,8 +146,9 @@ 
 		 *                                        and height values (in that order). Default 'post-thumbnail'.
 		 */
 		do_action( 'begin_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size );
-		if ( in_the_loop() )
-			update_post_thumbnail_cache();
+		if ( in_the_loop() ) {
+					update_post_thumbnail_cache();
+		}
 		$html = wp_get_attachment_image( $post_thumbnail_id, $size, false, $attr );
 
 		/**

src/wp-includes/random_compat/random.php

Doc Comments +1 added lines

@@ -199,6 +199,7 @@
             /**
              * We don't have any more options, so let's throw an exception right now
              * and hope the developer won't let it fail silently.
+             * @param integer $length
              */
             function random_bytes($length)
             {

Spacing +11 added lines, -11 removed lines

@@ -29,7 +29,7 @@ 
  * SOFTWARE.
  */
 
-if (!defined('PHP_VERSION_ID')) {
+if ( ! defined('PHP_VERSION_ID')) {
     // This constant was introduced in PHP 5.2.7
     $RandomCompatversion = explode('.', PHP_VERSION);
     define(
@@ -43,7 +43,7 @@ 
 
 if (PHP_VERSION_ID < 70000) {
 
-    if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+    if ( ! defined('RANDOM_COMPAT_READ_BUFFER')) {
         define('RANDOM_COMPAT_READ_BUFFER', 8);
     }
 
@@ -53,7 +53,7 @@ 
     require_once $RandomCompatDIR.'/cast_to_int.php';
     require_once $RandomCompatDIR.'/error_polyfill.php';
 
-    if (!function_exists('random_bytes')) {
+    if ( ! function_exists('random_bytes')) {
         /**
          * PHP 5.2.0 - 5.6.x way to implement random_bytes()
          *
@@ -87,7 +87,7 @@ 
             $RandomCompatUrandom = true;
             $RandomCompat_basedir = ini_get('open_basedir');
 
-            if (!empty($RandomCompat_basedir)) {
+            if ( ! empty($RandomCompat_basedir)) {
                 $RandomCompat_open_basedir = explode(
                     PATH_SEPARATOR,
                     strtolower($RandomCompat_basedir)
@@ -100,7 +100,7 @@ 
             }
 
             if (
-                !function_exists('random_bytes')
+                ! function_exists('random_bytes')
                 &&
                 $RandomCompatUrandom
                 &&
@@ -124,7 +124,7 @@ 
          * mcrypt_create_iv()
          */
         if (
-            !function_exists('random_bytes')
+            ! function_exists('random_bytes')
             &&
             PHP_VERSION_ID >= 50307
             &&
@@ -142,7 +142,7 @@ 
         }
 
         if (
-            !function_exists('random_bytes')
+            ! function_exists('random_bytes')
             &&
             extension_loaded('com_dotnet')
             &&
@@ -153,7 +153,7 @@ 
                 strtolower(ini_get('disable_classes'))
             );
 
-            if (!in_array('com', $RandomCompat_disabled_classes)) {
+            if ( ! in_array('com', $RandomCompat_disabled_classes)) {
                 try {
                     $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
                     if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
@@ -184,7 +184,7 @@ 
                 PHP_VERSION_ID >= 50401
             )
             &&
-            !function_exists('random_bytes')
+            ! function_exists('random_bytes')
             &&
             extension_loaded('openssl')
         ) {
@@ -195,7 +195,7 @@ 
         /**
          * throw new Exception
          */
-        if (!function_exists('random_bytes')) {
+        if ( ! function_exists('random_bytes')) {
             /**
              * We don't have any more options, so let's throw an exception right now
              * and hope the developer won't let it fail silently.
@@ -209,7 +209,7 @@ 
         }
     }
 
-    if (!function_exists('random_int')) {
+    if ( ! function_exists('random_int')) {
         require_once $RandomCompatDIR.'/random_int.php';
     }
 

Indentation +180 added lines, -180 removed lines

@@ -30,188 +30,188 @@
  */
 
 if (!defined('PHP_VERSION_ID')) {
-    // This constant was introduced in PHP 5.2.7
-    $RandomCompatversion = explode('.', PHP_VERSION);
-    define(
-        'PHP_VERSION_ID',
-        $RandomCompatversion[0] * 10000
-        + $RandomCompatversion[1] * 100
-        + $RandomCompatversion[2]
-    );
-    $RandomCompatversion = null;
+	// This constant was introduced in PHP 5.2.7
+	$RandomCompatversion = explode('.', PHP_VERSION);
+	define(
+		'PHP_VERSION_ID',
+		$RandomCompatversion[0] * 10000
+		+ $RandomCompatversion[1] * 100
+		+ $RandomCompatversion[2]
+	);
+	$RandomCompatversion = null;
 }
 
 if (PHP_VERSION_ID < 70000) {
 
-    if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
-        define('RANDOM_COMPAT_READ_BUFFER', 8);
-    }
-
-    $RandomCompatDIR = dirname(__FILE__);
-
-    require_once $RandomCompatDIR.'/byte_safe_strings.php';
-    require_once $RandomCompatDIR.'/cast_to_int.php';
-    require_once $RandomCompatDIR.'/error_polyfill.php';
-
-    if (!function_exists('random_bytes')) {
-        /**
-         * PHP 5.2.0 - 5.6.x way to implement random_bytes()
-         *
-         * We use conditional statements here to define the function in accordance
-         * to the operating environment. It's a micro-optimization.
-         *
-         * In order of preference:
-         *   1. Use libsodium if available.
-         *   2. fread() /dev/urandom if available (never on Windows)
-         *   3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM)
-         *   4. COM('CAPICOM.Utilities.1')->GetRandom()
-         *   5. openssl_random_pseudo_bytes() (absolute last resort)
-         *
-         * See ERRATA.md for our reasoning behind this particular order
-         */
-        if (extension_loaded('libsodium')) {
-            // See random_bytes_libsodium.php
-            if (PHP_VERSION_ID >= 50300 && function_exists('\\Sodium\\randombytes_buf')) {
-                require_once $RandomCompatDIR.'/random_bytes_libsodium.php';
-            } elseif (method_exists('Sodium', 'randombytes_buf')) {
-                require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.php';
-            }
-        }
-
-        /**
-         * Reading directly from /dev/urandom:
-         */
-        if (DIRECTORY_SEPARATOR === '/') {
-            // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
-            // way to exclude Windows.
-            $RandomCompatUrandom = true;
-            $RandomCompat_basedir = ini_get('open_basedir');
-
-            if (!empty($RandomCompat_basedir)) {
-                $RandomCompat_open_basedir = explode(
-                    PATH_SEPARATOR,
-                    strtolower($RandomCompat_basedir)
-                );
-                $RandomCompatUrandom = in_array(
-                    '/dev',
-                    $RandomCompat_open_basedir
-                );
-                $RandomCompat_open_basedir = null;
-            }
-
-            if (
-                !function_exists('random_bytes')
-                &&
-                $RandomCompatUrandom
-                &&
-                @is_readable('/dev/urandom')
-            ) {
-                // Error suppression on is_readable() in case of an open_basedir
-                // or safe_mode failure. All we care about is whether or not we
-                // can read it at this point. If the PHP environment is going to
-                // panic over trying to see if the file can be read in the first
-                // place, that is not helpful to us here.
-
-                // See random_bytes_dev_urandom.php
-                require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php';
-            }
-            // Unset variables after use
-            $RandomCompat_basedir = null;
-            $RandomCompatUrandom = null;
-        }
-
-        /**
-         * mcrypt_create_iv()
-         */
-        if (
-            !function_exists('random_bytes')
-            &&
-            PHP_VERSION_ID >= 50307
-            &&
-            extension_loaded('mcrypt')
-        ) {
-            // Prevent this code from hanging indefinitely on non-Windows;
-            // see https://bugs.php.net/bug.php?id=69833
-            if (
-                DIRECTORY_SEPARATOR !== '/' ||
-                (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
-            ) {
-                // See random_bytes_mcrypt.php
-                require_once $RandomCompatDIR.'/random_bytes_mcrypt.php';
-            }
-        }
-
-        if (
-            !function_exists('random_bytes')
-            &&
-            extension_loaded('com_dotnet')
-            &&
-            class_exists('COM')
-        ) {
-            $RandomCompat_disabled_classes = preg_split(
-                '#\s*,\s*#',
-                strtolower(ini_get('disable_classes'))
-            );
-
-            if (!in_array('com', $RandomCompat_disabled_classes)) {
-                try {
-                    $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
-                    if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
-                        // See random_bytes_com_dotnet.php
-                        require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php';
-                    }
-                } catch (com_exception $e) {
-                    // Don't try to use it.
-                }
-            }
-            $RandomCompat_disabled_classes = null;
-            $RandomCompatCOMtest = null;
-        }
-
-        /**
-         * openssl_random_pseudo_bytes()
-         */
-        if (
-            (
-                // Unix-like with PHP >= 5.3.0 or
-                (
-                    DIRECTORY_SEPARATOR === '/'
-                    &&
-                    PHP_VERSION_ID >= 50300
-                )
-                ||
-                // Windows with PHP >= 5.4.1
-                PHP_VERSION_ID >= 50401
-            )
-            &&
-            !function_exists('random_bytes')
-            &&
-            extension_loaded('openssl')
-        ) {
-            // See random_bytes_openssl.php
-            require_once $RandomCompatDIR.'/random_bytes_openssl.php';
-        }
-
-        /**
-         * throw new Exception
-         */
-        if (!function_exists('random_bytes')) {
-            /**
-             * We don't have any more options, so let's throw an exception right now
-             * and hope the developer won't let it fail silently.
-             */
-            function random_bytes($length)
-            {
-                throw new Exception(
-                    'There is no suitable CSPRNG installed on your system'
-                );
-            }
-        }
-    }
-
-    if (!function_exists('random_int')) {
-        require_once $RandomCompatDIR.'/random_int.php';
-    }
-
-    $RandomCompatDIR = null;
+	if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+		define('RANDOM_COMPAT_READ_BUFFER', 8);
+	}
+
+	$RandomCompatDIR = dirname(__FILE__);
+
+	require_once $RandomCompatDIR.'/byte_safe_strings.php';
+	require_once $RandomCompatDIR.'/cast_to_int.php';
+	require_once $RandomCompatDIR.'/error_polyfill.php';
+
+	if (!function_exists('random_bytes')) {
+		/**
+		 * PHP 5.2.0 - 5.6.x way to implement random_bytes()
+		 *
+		 * We use conditional statements here to define the function in accordance
+		 * to the operating environment. It's a micro-optimization.
+		 *
+		 * In order of preference:
+		 *   1. Use libsodium if available.
+		 *   2. fread() /dev/urandom if available (never on Windows)
+		 *   3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM)
+		 *   4. COM('CAPICOM.Utilities.1')->GetRandom()
+		 *   5. openssl_random_pseudo_bytes() (absolute last resort)
+		 *
+		 * See ERRATA.md for our reasoning behind this particular order
+		 */
+		if (extension_loaded('libsodium')) {
+			// See random_bytes_libsodium.php
+			if (PHP_VERSION_ID >= 50300 && function_exists('\\Sodium\\randombytes_buf')) {
+				require_once $RandomCompatDIR.'/random_bytes_libsodium.php';
+			} elseif (method_exists('Sodium', 'randombytes_buf')) {
+				require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.php';
+			}
+		}
+
+		/**
+		 * Reading directly from /dev/urandom:
+		 */
+		if (DIRECTORY_SEPARATOR === '/') {
+			// DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
+			// way to exclude Windows.
+			$RandomCompatUrandom = true;
+			$RandomCompat_basedir = ini_get('open_basedir');
+
+			if (!empty($RandomCompat_basedir)) {
+				$RandomCompat_open_basedir = explode(
+					PATH_SEPARATOR,
+					strtolower($RandomCompat_basedir)
+				);
+				$RandomCompatUrandom = in_array(
+					'/dev',
+					$RandomCompat_open_basedir
+				);
+				$RandomCompat_open_basedir = null;
+			}
+
+			if (
+				!function_exists('random_bytes')
+				&&
+				$RandomCompatUrandom
+				&&
+				@is_readable('/dev/urandom')
+			) {
+				// Error suppression on is_readable() in case of an open_basedir
+				// or safe_mode failure. All we care about is whether or not we
+				// can read it at this point. If the PHP environment is going to
+				// panic over trying to see if the file can be read in the first
+				// place, that is not helpful to us here.
+
+				// See random_bytes_dev_urandom.php
+				require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php';
+			}
+			// Unset variables after use
+			$RandomCompat_basedir = null;
+			$RandomCompatUrandom = null;
+		}
+
+		/**
+		 * mcrypt_create_iv()
+		 */
+		if (
+			!function_exists('random_bytes')
+			&&
+			PHP_VERSION_ID >= 50307
+			&&
+			extension_loaded('mcrypt')
+		) {
+			// Prevent this code from hanging indefinitely on non-Windows;
+			// see https://bugs.php.net/bug.php?id=69833
+			if (
+				DIRECTORY_SEPARATOR !== '/' ||
+				(PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
+			) {
+				// See random_bytes_mcrypt.php
+				require_once $RandomCompatDIR.'/random_bytes_mcrypt.php';
+			}
+		}
+
+		if (
+			!function_exists('random_bytes')
+			&&
+			extension_loaded('com_dotnet')
+			&&
+			class_exists('COM')
+		) {
+			$RandomCompat_disabled_classes = preg_split(
+				'#\s*,\s*#',
+				strtolower(ini_get('disable_classes'))
+			);
+
+			if (!in_array('com', $RandomCompat_disabled_classes)) {
+				try {
+					$RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
+					if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
+						// See random_bytes_com_dotnet.php
+						require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php';
+					}
+				} catch (com_exception $e) {
+					// Don't try to use it.
+				}
+			}
+			$RandomCompat_disabled_classes = null;
+			$RandomCompatCOMtest = null;
+		}
+
+		/**
+		 * openssl_random_pseudo_bytes()
+		 */
+		if (
+			(
+				// Unix-like with PHP >= 5.3.0 or
+				(
+					DIRECTORY_SEPARATOR === '/'
+					&&
+					PHP_VERSION_ID >= 50300
+				)
+				||
+				// Windows with PHP >= 5.4.1
+				PHP_VERSION_ID >= 50401
+			)
+			&&
+			!function_exists('random_bytes')
+			&&
+			extension_loaded('openssl')
+		) {
+			// See random_bytes_openssl.php
+			require_once $RandomCompatDIR.'/random_bytes_openssl.php';
+		}
+
+		/**
+		 * throw new Exception
+		 */
+		if (!function_exists('random_bytes')) {
+			/**
+			 * We don't have any more options, so let's throw an exception right now
+			 * and hope the developer won't let it fail silently.
+			 */
+			function random_bytes($length)
+			{
+				throw new Exception(
+					'There is no suitable CSPRNG installed on your system'
+				);
+			}
+		}
+	}
+
+	if (!function_exists('random_int')) {
+		require_once $RandomCompatDIR.'/random_int.php';
+	}
+
+	$RandomCompatDIR = null;
 }