ntwb / wordpress

src/wp-includes/widgets/class-wp-widget-calendar.php

Spacing +12 added lines, -12 removed lines

@@ -35,10 +35,10 @@ 
 	public function __construct() {
 		$widget_ops = array(
 			'classname' => 'widget_calendar',
-			'description' => __( 'A calendar of your site’s Posts.' ),
+			'description' => __('A calendar of your site’s Posts.'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'calendar', __( 'Calendar' ), $widget_ops );
+		parent::__construct('calendar', __('Calendar'), $widget_ops);
 	}
 
 	/**
@@ -51,15 +51,15 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance The settings for the particular instance of the widget.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+		$title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
 
 		echo $args['before_widget'];
-		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			echo $args['before_title'].$title.$args['after_title'];
 		}
-		if ( 0 === self::$instance ) {
+		if (0 === self::$instance) {
 			echo '<div id="calendar_wrap" class="calendar_wrap">';
 		} else {
 			echo '<div class="calendar_wrap">';
@@ -82,9 +82,9 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
+		$instance['title'] = sanitize_text_field($new_instance['title']);
 
 		return $instance;
 	}
@@ -97,9 +97,9 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
-		$title = sanitize_text_field( $instance['title'] );
+	public function form($instance) {
+		$instance = wp_parse_args((array) $instance, array('title' => ''));
+		$title = sanitize_text_field($instance['title']);
 		?>
 		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label>
 		<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>

src/wp-includes/widgets/class-wp-widget-search.php

Spacing +11 added lines, -11 removed lines

@@ -25,10 +25,10 @@ 
 	public function __construct() {
 		$widget_ops = array(
 			'classname' => 'widget_search',
-			'description' => __( 'A search form for your site.' ),
+			'description' => __('A search form for your site.'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'search', _x( 'Search', 'Search widget' ), $widget_ops );
+		parent::__construct('search', _x('Search', 'Search widget'), $widget_ops);
 	}
 
 	/**
@@ -41,13 +41,13 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current Search widget instance.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+		$title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
 
 		echo $args['before_widget'];
-		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			echo $args['before_title'].$title.$args['after_title'];
 		}
 
 		// Use current theme search form if it exists
@@ -64,8 +64,8 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '') );
+	public function form($instance) {
+		$instance = wp_parse_args((array) $instance, array('title' => ''));
 		$title = $instance['title'];
 		?>
 		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></label></p>
@@ -83,10 +83,10 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$new_instance = wp_parse_args((array) $new_instance, array( 'title' => ''));
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
+		$new_instance = wp_parse_args((array) $new_instance, array('title' => ''));
+		$instance['title'] = sanitize_text_field($new_instance['title']);
 		return $instance;
 	}
 

src/wp-includes/widgets/class-wp-widget-categories.php

Spacing +35 added lines, -35 removed lines

@@ -25,10 +25,10 @@ 
 	public function __construct() {
 		$widget_ops = array(
 			'classname' => 'widget_categories',
-			'description' => __( 'A list or dropdown of categories.' ),
+			'description' => __('A list or dropdown of categories.'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'categories', __( 'Categories' ), $widget_ops );
+		parent::__construct('categories', __('Categories'), $widget_ops);
 	}
 
 	/**
@@ -41,19 +41,19 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current Categories widget instance.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		static $first_dropdown = true;
 
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title'], $instance, $this->id_base );
+		$title = apply_filters('widget_title', empty($instance['title']) ? __('Categories') : $instance['title'], $instance, $this->id_base);
 
-		$c = ! empty( $instance['count'] ) ? '1' : '0';
-		$h = ! empty( $instance['hierarchical'] ) ? '1' : '0';
-		$d = ! empty( $instance['dropdown'] ) ? '1' : '0';
+		$c = ! empty($instance['count']) ? '1' : '0';
+		$h = ! empty($instance['hierarchical']) ? '1' : '0';
+		$d = ! empty($instance['dropdown']) ? '1' : '0';
 
 		echo $args['before_widget'];
-		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			echo $args['before_title'].$title.$args['after_title'];
 		}
 
 		$cat_args = array(
@@ -62,13 +62,13 @@ 
 			'hierarchical' => $h
 		);
 
-		if ( $d ) {
-			$dropdown_id = ( $first_dropdown ) ? 'cat' : "{$this->id_base}-dropdown-{$this->number}";
+		if ($d) {
+			$dropdown_id = ($first_dropdown) ? 'cat' : "{$this->id_base}-dropdown-{$this->number}";
 			$first_dropdown = false;
 
-			echo '<label class="screen-reader-text" for="' . esc_attr( $dropdown_id ) . '">' . $title . '</label>';
+			echo '<label class="screen-reader-text" for="'.esc_attr($dropdown_id).'">'.$title.'</label>';
 
-			$cat_args['show_option_none'] = __( 'Select Category' );
+			$cat_args['show_option_none'] = __('Select Category');
 			$cat_args['id'] = $dropdown_id;
 
 			/**
@@ -80,13 +80,13 @@ 
 			 *
 			 * @param array $cat_args An array of Categories widget drop-down arguments.
 			 */
-			wp_dropdown_categories( apply_filters( 'widget_categories_dropdown_args', $cat_args ) );
+			wp_dropdown_categories(apply_filters('widget_categories_dropdown_args', $cat_args));
 			?>
 
 <script type='text/javascript'>
 /* <![CDATA[ */
 (function() {
-	var dropdown = document.getElementById( "<?php echo esc_js( $dropdown_id ); ?>" );
+	var dropdown = document.getElementById( "<?php echo esc_js($dropdown_id); ?>" );
 	function onCatChange() {
 		if ( dropdown.options[ dropdown.selectedIndex ].value > 0 ) {
 			location.href = "<?php echo home_url(); ?>/?cat=" + dropdown.options[ dropdown.selectedIndex ].value;
@@ -111,7 +111,7 @@ 
 		 *
 		 * @param array $cat_args An array of Categories widget options.
 		 */
-		wp_list_categories( apply_filters( 'widget_categories_args', $cat_args ) );
+		wp_list_categories(apply_filters('widget_categories_args', $cat_args));
 ?>
 		</ul>
 <?php
@@ -131,12 +131,12 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
-		$instance['count'] = !empty($new_instance['count']) ? 1 : 0;
-		$instance['hierarchical'] = !empty($new_instance['hierarchical']) ? 1 : 0;
-		$instance['dropdown'] = !empty($new_instance['dropdown']) ? 1 : 0;
+		$instance['title'] = sanitize_text_field($new_instance['title']);
+		$instance['count'] = ! empty($new_instance['count']) ? 1 : 0;
+		$instance['hierarchical'] = ! empty($new_instance['hierarchical']) ? 1 : 0;
+		$instance['dropdown'] = ! empty($new_instance['dropdown']) ? 1 : 0;
 
 		return $instance;
 	}
@@ -149,25 +149,25 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 		//Defaults
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '') );
-		$title = sanitize_text_field( $instance['title'] );
-		$count = isset($instance['count']) ? (bool) $instance['count'] :false;
-		$hierarchical = isset( $instance['hierarchical'] ) ? (bool) $instance['hierarchical'] : false;
-		$dropdown = isset( $instance['dropdown'] ) ? (bool) $instance['dropdown'] : false;
+		$instance = wp_parse_args((array) $instance, array('title' => ''));
+		$title = sanitize_text_field($instance['title']);
+		$count = isset($instance['count']) ? (bool) $instance['count'] : false;
+		$hierarchical = isset($instance['hierarchical']) ? (bool) $instance['hierarchical'] : false;
+		$dropdown = isset($instance['dropdown']) ? (bool) $instance['dropdown'] : false;
 		?>
-		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
-		<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
+		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label>
+		<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
 
-		<p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>"<?php checked( $dropdown ); ?> />
-		<label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e( 'Display as dropdown' ); ?></label><br />
+		<p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>"<?php checked($dropdown); ?> />
+		<label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e('Display as dropdown'); ?></label><br />
 
-		<input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count'); ?>"<?php checked( $count ); ?> />
-		<label for="<?php echo $this->get_field_id('count'); ?>"><?php _e( 'Show post counts' ); ?></label><br />
+		<input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count'); ?>"<?php checked($count); ?> />
+		<label for="<?php echo $this->get_field_id('count'); ?>"><?php _e('Show post counts'); ?></label><br />
 
-		<input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hierarchical'); ?>" name="<?php echo $this->get_field_name('hierarchical'); ?>"<?php checked( $hierarchical ); ?> />
-		<label for="<?php echo $this->get_field_id('hierarchical'); ?>"><?php _e( 'Show hierarchy' ); ?></label></p>
+		<input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hierarchical'); ?>" name="<?php echo $this->get_field_name('hierarchical'); ?>"<?php checked($hierarchical); ?> />
+		<label for="<?php echo $this->get_field_id('hierarchical'); ?>"><?php _e('Show hierarchy'); ?></label></p>
 		<?php
 	}
 

src/wp-admin/includes/class-automatic-upgrader-skin.php

Doc Comments +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	}
 
 	/**
-	 * @param string|array|WP_Error $data
+	 * @param string $data
 	 */
 	public function feedback( $data ) {
 		if ( is_wp_error( $data ) ) {

Braces +12 added lines, -8 removed lines

@@ -58,14 +58,16 @@ 
 		} else {
 			$string = $data;
 		}
-		if ( ! empty( $this->upgrader->strings[ $string ] ) )
-			$string = $this->upgrader->strings[ $string ];
+		if ( ! empty( $this->upgrader->strings[ $string ] ) ) {
+					$string = $this->upgrader->strings[ $string ];
+		}
 
 		if ( strpos( $string, '%' ) !== false ) {
 			$args = func_get_args();
 			$args = array_splice( $args, 1 );
-			if ( ! empty( $args ) )
-				$string = vsprintf( $string, $args );
+			if ( ! empty( $args ) ) {
+							$string = vsprintf( $string, $args );
+			}
 		}
 
 		$string = trim( $string );
@@ -80,8 +82,9 @@ 
 			'strong' => true,
 		) );
 
-		if ( empty( $string ) )
-			return;
+		if ( empty( $string ) ) {
+					return;
+		}
 
 		$this->messages[] = $string;
 	}
@@ -98,7 +101,8 @@ 
 	 */
 	public function footer() {
 		$output = ob_get_clean();
-		if ( ! empty( $output ) )
-			$this->feedback( $output );
+		if ( ! empty( $output ) ) {
+					$this->feedback( $output );
+		}
 	}
 }

Spacing +18 added lines, -18 removed lines

@@ -37,14 +37,14 @@ 
 	 * @param bool   $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function request_filesystem_credentials( $error = false, $context = '', $allow_relaxed_file_ownership = false ) {
-		if ( $context ) {
+	public function request_filesystem_credentials($error = false, $context = '', $allow_relaxed_file_ownership = false) {
+		if ($context) {
 			$this->options['context'] = $context;
 		}
 		// TODO: fix up request_filesystem_credentials(), or split it, to allow us to request a no-output version
 		// This will output a credentials form in event of failure, We don't want that, so just hide with a buffer
 		ob_start();
-		$result = parent::request_filesystem_credentials( $error, $context, $allow_relaxed_file_ownership );
+		$result = parent::request_filesystem_credentials($error, $context, $allow_relaxed_file_ownership);
 		ob_end_clean();
 		return $result;
 	}
@@ -61,37 +61,37 @@ 
 	/**
 	 * @param string|array|WP_Error $data
 	 */
-	public function feedback( $data ) {
-		if ( is_wp_error( $data ) ) {
+	public function feedback($data) {
+		if (is_wp_error($data)) {
 			$string = $data->get_error_message();
-		} elseif ( is_array( $data ) ) {
+		} elseif (is_array($data)) {
 			return;
 		} else {
 			$string = $data;
 		}
-		if ( ! empty( $this->upgrader->strings[ $string ] ) )
-			$string = $this->upgrader->strings[ $string ];
+		if ( ! empty($this->upgrader->strings[$string]))
+			$string = $this->upgrader->strings[$string];
 
-		if ( strpos( $string, '%' ) !== false ) {
+		if (strpos($string, '%') !== false) {
 			$args = func_get_args();
-			$args = array_splice( $args, 1 );
-			if ( ! empty( $args ) )
-				$string = vsprintf( $string, $args );
+			$args = array_splice($args, 1);
+			if ( ! empty($args))
+				$string = vsprintf($string, $args);
 		}
 
-		$string = trim( $string );
+		$string = trim($string);
 
 		// Only allow basic HTML in the messages, as it'll be used in emails/logs rather than direct browser output.
-		$string = wp_kses( $string, array(
+		$string = wp_kses($string, array(
 			'a' => array(
 				'href' => true
 			),
 			'br' => true,
 			'em' => true,
 			'strong' => true,
-		) );
+		));
 
-		if ( empty( $string ) )
+		if (empty($string))
 			return;
 
 		$this->messages[] = $string;
@@ -109,7 +109,7 @@ 
 	 */
 	public function footer() {
 		$output = ob_get_clean();
-		if ( ! empty( $output ) )
-			$this->feedback( $output );
+		if ( ! empty($output))
+			$this->feedback($output);
 	}
 }

src/wp-admin/includes/class-plugin-upgrader.php

Doc Comments +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
 	 * @since 3.7.0 The `$args` parameter was added, making clearing the plugin update cache optional.
 	 * @access public
 	 *
-	 * @param array $plugins Array of the basename paths of the plugins' main files.
+	 * @param string[] $plugins Array of the basename paths of the plugins' main files.
 	 * @param array $args {
 	 *     Optional. Other arguments for upgrading several plugins at once. Default empty array.
 	 *

Indentation +1 added lines, -1 removed lines

@@ -431,7 +431,7 @@
 	 * @access public
 	 *
 	 * @global WP_Filesystem_Base $wp_filesystem Subclass
-     *
+	 *
 	 * @param bool|WP_Error $removed
 	 * @param string        $local_destination
 	 * @param string        $remote_destination

Spacing +68 added lines, -68 removed lines

@@ -90,23 +90,23 @@ 
 	 * }
 	 * @return bool|WP_Error True if the install was successful, false or a WP_Error otherwise.
 	 */
-	public function install( $package, $args = array() ) {
+	public function install($package, $args = array()) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->install_strings();
 
-		add_filter('upgrader_source_selection', array($this, 'check_package') );
-		if ( $parsed_args['clear_update_cache'] ) {
+		add_filter('upgrader_source_selection', array($this, 'check_package'));
+		if ($parsed_args['clear_update_cache']) {
 			// Clear cache so wp_update_plugins() knows about the new plugin.
-			add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+			add_action('upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0);
 		}
 
-		$this->run( array(
+		$this->run(array(
 			'package' => $package,
 			'destination' => WP_PLUGIN_DIR,
 			'clear_destination' => false, // Do not overwrite files.
@@ -115,16 +115,16 @@ 
 				'type' => 'plugin',
 				'action' => 'install',
 			)
-		) );
+		));
 
-		remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
-		remove_filter('upgrader_source_selection', array($this, 'check_package') );
+		remove_action('upgrader_process_complete', 'wp_clean_plugins_cache', 9);
+		remove_filter('upgrader_source_selection', array($this, 'check_package'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
+		if ( ! $this->result || is_wp_error($this->result))
 			return $this->result;
 
 		// Force refresh of plugin update information
-		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_plugins_cache($parsed_args['clear_update_cache']);
 
 		return true;
 	}
@@ -145,18 +145,18 @@ 
 	 * }
 	 * @return bool|WP_Error True if the upgrade was successful, false or a WP_Error object otherwise.
 	 */
-	public function upgrade( $plugin, $args = array() ) {
+	public function upgrade($plugin, $args = array()) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->upgrade_strings();
 
-		$current = get_site_transient( 'update_plugins' );
-		if ( !isset( $current->response[ $plugin ] ) ) {
+		$current = get_site_transient('update_plugins');
+		if ( ! isset($current->response[$plugin])) {
 			$this->skin->before();
 			$this->skin->set_result(false);
 			$this->skin->error('up_to_date');
@@ -165,17 +165,17 @@ 
 		}
 
 		// Get the URL to the zip file
-		$r = $current->response[ $plugin ];
+		$r = $current->response[$plugin];
 
 		add_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'), 10, 2);
 		add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
 		//'source_selection' => array($this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
-		if ( $parsed_args['clear_update_cache'] ) {
+		if ($parsed_args['clear_update_cache']) {
 			// Clear cache so wp_update_plugins() knows about the new plugin.
-			add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+			add_action('upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0);
 		}
 
-		$this->run( array(
+		$this->run(array(
 			'package' => $r->package,
 			'destination' => WP_PLUGIN_DIR,
 			'clear_destination' => true,
@@ -185,18 +185,18 @@ 
 				'type' => 'plugin',
 				'action' => 'update',
 			),
-		) );
+		));
 
 		// Cleanup our hooks, in case something else does a upgrade on this connection.
-		remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
+		remove_action('upgrader_process_complete', 'wp_clean_plugins_cache', 9);
 		remove_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'));
 		remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
+		if ( ! $this->result || is_wp_error($this->result))
 			return $this->result;
 
 		// Force refresh of plugin update information
-		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_plugins_cache($parsed_args['clear_update_cache']);
 
 		return true;
 	}
@@ -217,26 +217,26 @@ 
 	 * }
 	 * @return array|false An array of results indexed by plugin file, or false if unable to connect to the filesystem.
 	 */
-	public function bulk_upgrade( $plugins, $args = array() ) {
+	public function bulk_upgrade($plugins, $args = array()) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->bulk = true;
 		$this->upgrade_strings();
 
-		$current = get_site_transient( 'update_plugins' );
+		$current = get_site_transient('update_plugins');
 
 		add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
 
 		$this->skin->header();
 
 		// Connect to the Filesystem first.
-		$res = $this->fs_connect( array(WP_CONTENT_DIR, WP_PLUGIN_DIR) );
-		if ( ! $res ) {
+		$res = $this->fs_connect(array(WP_CONTENT_DIR, WP_PLUGIN_DIR));
+		if ( ! $res) {
 			$this->skin->footer();
 			return false;
 		}
@@ -249,21 +249,21 @@ 
 		 * - a plugin with an update available is currently active.
 		 * @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
 		 */
-		$maintenance = ( is_multisite() && ! empty( $plugins ) );
-		foreach ( $plugins as $plugin )
-			$maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin] ) );
-		if ( $maintenance )
+		$maintenance = (is_multisite() && ! empty($plugins));
+		foreach ($plugins as $plugin)
+			$maintenance = $maintenance || (is_plugin_active($plugin) && isset($current->response[$plugin]));
+		if ($maintenance)
 			$this->maintenance_mode(true);
 
 		$results = array();
 
 		$this->update_count = count($plugins);
 		$this->update_current = 0;
-		foreach ( $plugins as $plugin ) {
+		foreach ($plugins as $plugin) {
 			$this->update_current++;
-			$this->skin->plugin_info = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin, false, true);
+			$this->skin->plugin_info = get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin, false, true);
 
-			if ( !isset( $current->response[ $plugin ] ) ) {
+			if ( ! isset($current->response[$plugin])) {
 				$this->skin->set_result('up_to_date');
 				$this->skin->before();
 				$this->skin->feedback('up_to_date');
@@ -273,11 +273,11 @@ 
 			}
 
 			// Get the URL to the zip file.
-			$r = $current->response[ $plugin ];
+			$r = $current->response[$plugin];
 
 			$this->skin->plugin_active = is_plugin_active($plugin);
 
-			$result = $this->run( array(
+			$result = $this->run(array(
 				'package' => $r->package,
 				'destination' => WP_PLUGIN_DIR,
 				'clear_destination' => true,
@@ -286,27 +286,27 @@ 
 				'hook_extra' => array(
 					'plugin' => $plugin
 				)
-			) );
+			));
 
 			$results[$plugin] = $this->result;
 
 			// Prevent credentials auth screen from displaying multiple times
-			if ( false === $result )
+			if (false === $result)
 				break;
 		} //end foreach $plugins
 
 		$this->maintenance_mode(false);
 
 		// Force refresh of plugin update information.
-		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_plugins_cache($parsed_args['clear_update_cache']);
 
 		/** This action is documented in wp-admin/includes/class-wp-upgrader.php */
-		do_action( 'upgrader_process_complete', $this, array(
+		do_action('upgrader_process_complete', $this, array(
 			'action' => 'update',
 			'type' => 'plugin',
 			'bulk' => true,
 			'plugins' => $plugins,
-		) );
+		));
 
 		$this->skin->bulk_footer();
 
@@ -336,28 +336,28 @@ 
 	public function check_package($source) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($source) )
+		if (is_wp_error($source))
 			return $source;
 
-		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
-		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
+		$working_directory = str_replace($wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
+		if ( ! is_dir($working_directory)) // Sanity check, if the above fails, let's not prevent installation.
 			return $source;
 
 		// Check the folder contains at least 1 valid plugin.
 		$plugins_found = false;
-		$files = glob( $working_directory . '*.php' );
-		if ( $files ) {
-			foreach ( $files as $file ) {
-				$info = get_plugin_data( $file, false, false );
-				if ( ! empty( $info['Name'] ) ) {
+		$files = glob($working_directory.'*.php');
+		if ($files) {
+			foreach ($files as $file) {
+				$info = get_plugin_data($file, false, false);
+				if ( ! empty($info['Name'])) {
 					$plugins_found = true;
 					break;
 				}
 			}
 		}
 
-		if ( ! $plugins_found )
-			return new WP_Error( 'incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __( 'No valid plugins were found.' ) );
+		if ( ! $plugins_found)
+			return new WP_Error('incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __('No valid plugins were found.'));
 
 		return $source;
 	}
@@ -373,18 +373,18 @@ 
 	 * @return string|false The full path to the main plugin file, or false.
 	 */
 	public function plugin_info() {
-		if ( ! is_array($this->result) )
+		if ( ! is_array($this->result))
 			return false;
-		if ( empty($this->result['destination_name']) )
+		if (empty($this->result['destination_name']))
 			return false;
 
-		$plugin = get_plugins('/' . $this->result['destination_name']); //Ensure to pass with leading slash
-		if ( empty($plugin) )
+		$plugin = get_plugins('/'.$this->result['destination_name']); //Ensure to pass with leading slash
+		if (empty($plugin))
 			return false;
 
 		$pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
 
-		return $this->result['destination_name'] . '/' . $pluginfiles[0];
+		return $this->result['destination_name'].'/'.$pluginfiles[0];
 	}
 
 	/**
@@ -402,18 +402,18 @@ 
 	 */
 	public function deactivate_plugin_before_upgrade($return, $plugin) {
 
-		if ( is_wp_error($return) ) //Bypass.
+		if (is_wp_error($return)) //Bypass.
 			return $return;
 
 		// When in cron (background updates) don't deactivate the plugin, as we require a browser to reactivate it
-		if ( wp_doing_cron() )
+		if (wp_doing_cron())
 			return $return;
 
 		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
-		if ( empty($plugin) )
+		if (empty($plugin))
 			return new WP_Error('bad_request', $this->strings['bad_request']);
 
-		if ( is_plugin_active($plugin) ) {
+		if (is_plugin_active($plugin)) {
 			//Deactivate the plugin silently, Prevent deactivation hooks from running.
 			deactivate_plugins($plugin, true);
 		}
@@ -441,26 +441,26 @@ 
 	public function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($removed) )
+		if (is_wp_error($removed))
 			return $removed; //Pass errors through.
 
 		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
-		if ( empty($plugin) )
+		if (empty($plugin))
 			return new WP_Error('bad_request', $this->strings['bad_request']);
 
 		$plugins_dir = $wp_filesystem->wp_plugins_dir();
-		$this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
+		$this_plugin_dir = trailingslashit(dirname($plugins_dir.$plugin));
 
-		if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If it's already vanished.
+		if ( ! $wp_filesystem->exists($this_plugin_dir)) //If it's already vanished.
 			return $removed;
 
 		// If plugin is in its own directory, recursively delete the directory.
-		if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that it's not the root plugin folder
+		if (strpos($plugin, '/') && $this_plugin_dir != $plugins_dir) //base check on if plugin includes directory separator AND that it's not the root plugin folder
 			$deleted = $wp_filesystem->delete($this_plugin_dir, true);
 		else
-			$deleted = $wp_filesystem->delete($plugins_dir . $plugin);
+			$deleted = $wp_filesystem->delete($plugins_dir.$plugin);
 
-		if ( ! $deleted )
+		if ( ! $deleted)
 			return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
 
 		return true;

Braces +60 added lines, -36 removed lines

@@ -120,8 +120,9 @@ 
 		remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
 		remove_filter('upgrader_source_selection', array($this, 'check_package') );
 
-		if ( ! $this->result || is_wp_error($this->result) )
-			return $this->result;
+		if ( ! $this->result || is_wp_error($this->result) ) {
+					return $this->result;
+		}
 
 		// Force refresh of plugin update information
 		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
@@ -192,8 +193,9 @@ 
 		remove_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'));
 		remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
-			return $this->result;
+		if ( ! $this->result || is_wp_error($this->result) ) {
+					return $this->result;
+		}
 
 		// Force refresh of plugin update information
 		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
@@ -250,10 +252,12 @@ 
 		 * @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
 		 */
 		$maintenance = ( is_multisite() && ! empty( $plugins ) );
-		foreach ( $plugins as $plugin )
-			$maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin] ) );
-		if ( $maintenance )
-			$this->maintenance_mode(true);
+		foreach ( $plugins as $plugin ) {
+					$maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin] ) );
+		}
+		if ( $maintenance ) {
+					$this->maintenance_mode(true);
+		}
 
 		$results = array();
 
@@ -291,8 +295,9 @@ 
 			$results[$plugin] = $this->result;
 
 			// Prevent credentials auth screen from displaying multiple times
-			if ( false === $result )
-				break;
+			if ( false === $result ) {
+							break;
+			}
 		} //end foreach $plugins
 
 		$this->maintenance_mode(false);
@@ -336,12 +341,15 @@ 
 	public function check_package($source) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($source) )
-			return $source;
+		if ( is_wp_error($source) ) {
+					return $source;
+		}
 
 		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
-		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
+		if ( ! is_dir($working_directory) ) {
+			// Sanity check, if the above fails, let's not prevent installation.
 			return $source;
+		}
 
 		// Check the folder contains at least 1 valid plugin.
 		$plugins_found = false;
@@ -356,8 +364,9 @@ 
 			}
 		}
 
-		if ( ! $plugins_found )
-			return new WP_Error( 'incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __( 'No valid plugins were found.' ) );
+		if ( ! $plugins_found ) {
+					return new WP_Error( 'incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __( 'No valid plugins were found.' ) );
+		}
 
 		return $source;
 	}
@@ -373,14 +382,17 @@ 
 	 * @return string|false The full path to the main plugin file, or false.
 	 */
 	public function plugin_info() {
-		if ( ! is_array($this->result) )
-			return false;
-		if ( empty($this->result['destination_name']) )
-			return false;
+		if ( ! is_array($this->result) ) {
+					return false;
+		}
+		if ( empty($this->result['destination_name']) ) {
+					return false;
+		}
 
 		$plugin = get_plugins('/' . $this->result['destination_name']); //Ensure to pass with leading slash
-		if ( empty($plugin) )
-			return false;
+		if ( empty($plugin) ) {
+					return false;
+		}
 
 		$pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
 
@@ -402,16 +414,20 @@ 
 	 */
 	public function deactivate_plugin_before_upgrade($return, $plugin) {
 
-		if ( is_wp_error($return) ) //Bypass.
+		if ( is_wp_error($return) ) {
+			//Bypass.
 			return $return;
+		}
 
 		// When in cron (background updates) don't deactivate the plugin, as we require a browser to reactivate it
-		if ( wp_doing_cron() )
-			return $return;
+		if ( wp_doing_cron() ) {
+					return $return;
+		}
 
 		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
-		if ( empty($plugin) )
-			return new WP_Error('bad_request', $this->strings['bad_request']);
+		if ( empty($plugin) ) {
+					return new WP_Error('bad_request', $this->strings['bad_request']);
+		}
 
 		if ( is_plugin_active($plugin) ) {
 			//Deactivate the plugin silently, Prevent deactivation hooks from running.
@@ -441,27 +457,35 @@ 
 	public function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($removed) )
-			return $removed; //Pass errors through.
+		if ( is_wp_error($removed) ) {
+					return $removed;
+		}
+		//Pass errors through.
 
 		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
-		if ( empty($plugin) )
-			return new WP_Error('bad_request', $this->strings['bad_request']);
+		if ( empty($plugin) ) {
+					return new WP_Error('bad_request', $this->strings['bad_request']);
+		}
 
 		$plugins_dir = $wp_filesystem->wp_plugins_dir();
 		$this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
 
-		if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If it's already vanished.
+		if ( ! $wp_filesystem->exists($this_plugin_dir) ) {
+			//If it's already vanished.
 			return $removed;
+		}
 
 		// If plugin is in its own directory, recursively delete the directory.
-		if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that it's not the root plugin folder
+		if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) {
+			//base check on if plugin includes directory separator AND that it's not the root plugin folder
 			$deleted = $wp_filesystem->delete($this_plugin_dir, true);
-		else
-			$deleted = $wp_filesystem->delete($plugins_dir . $plugin);
+		} else {
+					$deleted = $wp_filesystem->delete($plugins_dir . $plugin);
+		}
 
-		if ( ! $deleted )
-			return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
+		if ( ! $deleted ) {
+					return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
+		}
 
 		return true;
 	}

src/wp-admin/includes/list-table.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
  *
  * @param string $class The type of the list table, which is the class name.
  * @param array $args Optional. Arguments to pass to the class. Accepts 'screen'.
- * @return object|bool Object on success, false if the class does not exist.
+ * @return string Object on success, false if the class does not exist.
  */
 function _get_list_table( $class, $args = array() ) {
 	$core_classes = array(

Spacing +13 added lines, -13 removed lines

@@ -19,7 +19,7 @@ 
  * @param array $args Optional. Arguments to pass to the class. Accepts 'screen'.
  * @return object|bool Object on success, false if the class does not exist.
  */
-function _get_list_table( $class, $args = array() ) {
+function _get_list_table($class, $args = array()) {
 	$core_classes = array(
 		//Site Admin
 		'WP_Posts_List_Table' => 'posts',
@@ -27,11 +27,11 @@ 
 		'WP_Terms_List_Table' => 'terms',
 		'WP_Users_List_Table' => 'users',
 		'WP_Comments_List_Table' => 'comments',
-		'WP_Post_Comments_List_Table' => array( 'comments', 'post-comments' ),
+		'WP_Post_Comments_List_Table' => array('comments', 'post-comments'),
 		'WP_Links_List_Table' => 'links',
 		'WP_Plugin_Install_List_Table' => 'plugin-install',
 		'WP_Themes_List_Table' => 'themes',
-		'WP_Theme_Install_List_Table' => array( 'themes', 'theme-install' ),
+		'WP_Theme_Install_List_Table' => array('themes', 'theme-install'),
 		'WP_Plugins_List_Table' => 'plugins',
 		// Network Admin
 		'WP_MS_Sites_List_Table' => 'ms-sites',
@@ -39,18 +39,18 @@ 
 		'WP_MS_Themes_List_Table' => 'ms-themes',
 	);
 
-	if ( isset( $core_classes[ $class ] ) ) {
-		foreach ( (array) $core_classes[ $class ] as $required )
-			require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+	if (isset($core_classes[$class])) {
+		foreach ((array) $core_classes[$class] as $required)
+			require_once(ABSPATH.'wp-admin/includes/class-wp-'.$required.'-list-table.php');
 
-		if ( isset( $args['screen'] ) )
-			$args['screen'] = convert_to_screen( $args['screen'] );
-		elseif ( isset( $GLOBALS['hook_suffix'] ) )
+		if (isset($args['screen']))
+			$args['screen'] = convert_to_screen($args['screen']);
+		elseif (isset($GLOBALS['hook_suffix']))
 			$args['screen'] = get_current_screen();
 		else
 			$args['screen'] = null;
 
-		return new $class( $args );
+		return new $class($args);
 	}
 
 	return false;
@@ -66,7 +66,7 @@ 
  * @see get_column_headers(), print_column_headers(), get_hidden_columns()
  */
 function register_column_headers($screen, $columns) {
-	new _WP_List_Table_Compat( $screen, $columns );
+	new _WP_List_Table_Compat($screen, $columns);
 }
 
 /**
@@ -77,8 +77,8 @@ 
  * @param string|WP_Screen $screen  The screen hook name or screen object.
  * @param bool             $with_id Whether to set the id attribute or not.
  */
-function print_column_headers( $screen, $with_id = true ) {
+function print_column_headers($screen, $with_id = true) {
 	$wp_list_table = new _WP_List_Table_Compat($screen);
 
-	$wp_list_table->print_column_headers( $with_id );
+	$wp_list_table->print_column_headers($with_id);
 }

Braces +10 added lines, -8 removed lines

@@ -40,15 +40,17 @@
 	);
 
 	if ( isset( $core_classes[ $class ] ) ) {
-		foreach ( (array) $core_classes[ $class ] as $required )
-			require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+		foreach ( (array) $core_classes[ $class ] as $required ) {
+					require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+		}
 
-		if ( isset( $args['screen'] ) )
-			$args['screen'] = convert_to_screen( $args['screen'] );
-		elseif ( isset( $GLOBALS['hook_suffix'] ) )
-			$args['screen'] = get_current_screen();
-		else
-			$args['screen'] = null;
+		if ( isset( $args['screen'] ) ) {
+					$args['screen'] = convert_to_screen( $args['screen'] );
+		} elseif ( isset( $GLOBALS['hook_suffix'] ) ) {
+					$args['screen'] = get_current_screen();
+		} else {
+					$args['screen'] = null;
+		}
 
 		return new $class( $args );
 	}

src/wp-admin/includes/template.php

Doc Comments +5 added lines, -5 removed lines

@@ -675,10 +675,10 @@ 
  *
  * @global WP_Locale  $wp_locale
  *
- * @param int|bool $edit      Accepts 1|true for editing the date, 0|false for adding the date.
- * @param int|bool $for_post  Accepts 1|true for applying the date to a post, 0|false for a comment.
+ * @param integer $edit      Accepts 1|true for editing the date, 0|false for adding the date.
+ * @param integer $for_post  Accepts 1|true for applying the date to a post, 0|false for a comment.
  * @param int      $tab_index The tabindex attribute to add. Default 0.
- * @param int|bool $multi     Optional. Whether the additional fields and buttons should be added.
+ * @param integer $multi     Optional. Whether the additional fields and buttons should be added.
  *                            Default 0|false.
  */
 function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
@@ -984,7 +984,7 @@ 
  * @staticvar bool $already_sorted
  * @param string|WP_Screen $screen  Screen identifier
  * @param string           $context box context
- * @param mixed            $object  gets passed to the box callback function as first parameter
+ * @param string            $object  gets passed to the box callback function as first parameter
  * @return int number of meta_boxes
  */
 function do_meta_boxes( $screen, $context, $object ) {
@@ -1533,7 +1533,7 @@ 
  *
  * @since 2.7.0
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The post title if set.
  */
 function _draft_or_post_title( $post = 0 ) {

Spacing +470 added lines, -470 removed lines

@@ -9,10 +9,10 @@ 
  */
 
 /** Walker_Category_Checklist class */
-require_once( ABSPATH . 'wp-admin/includes/class-walker-category-checklist.php' );
+require_once(ABSPATH.'wp-admin/includes/class-walker-category-checklist.php');
 
 /** WP_Internal_Pointers class */
-require_once( ABSPATH . 'wp-admin/includes/class-wp-internal-pointers.php' );
+require_once(ABSPATH.'wp-admin/includes/class-wp-internal-pointers.php');
 
 //
 // Category Checklists
@@ -37,15 +37,15 @@ 
  * @param bool   $checked_ontop        Optional. Whether to move checked items out of the hierarchy and to
  *                                     the top of the list. Default true.
  */
-function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null, $checked_ontop = true ) {
-	wp_terms_checklist( $post_id, array(
+function wp_category_checklist($post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null, $checked_ontop = true) {
+	wp_terms_checklist($post_id, array(
 		'taxonomy' => 'category',
 		'descendants_and_self' => $descendants_and_self,
 		'selected_cats' => $selected_cats,
 		'popular_cats' => $popular_cats,
 		'walker' => $walker,
 		'checked_ontop' => $checked_ontop
-	) );
+	));
 }
 
 /**
@@ -74,7 +74,7 @@ 
  *                                        of echoing it. Default true.
  * }
  */
-function wp_terms_checklist( $post_id = 0, $args = array() ) {
+function wp_terms_checklist($post_id = 0, $args = array()) {
  	$defaults = array(
 		'descendants_and_self' => 0,
 		'selected_cats' => false,
@@ -95,11 +95,11 @@ 
 	 * @param array $args    An array of arguments.
 	 * @param int   $post_id The post ID.
 	 */
-	$params = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
+	$params = apply_filters('wp_terms_checklist_args', $args, $post_id);
 
-	$r = wp_parse_args( $params, $defaults );
+	$r = wp_parse_args($params, $defaults);
 
-	if ( empty( $r['walker'] ) || ! ( $r['walker'] instanceof Walker ) ) {
+	if (empty($r['walker']) || ! ($r['walker'] instanceof Walker)) {
 		$walker = new Walker_Category_Checklist;
 	} else {
 		$walker = $r['walker'];
@@ -108,64 +108,64 @@ 
 	$taxonomy = $r['taxonomy'];
 	$descendants_and_self = (int) $r['descendants_and_self'];
 
-	$args = array( 'taxonomy' => $taxonomy );
+	$args = array('taxonomy' => $taxonomy);
 
-	$tax = get_taxonomy( $taxonomy );
-	$args['disabled'] = ! current_user_can( $tax->cap->assign_terms );
+	$tax = get_taxonomy($taxonomy);
+	$args['disabled'] = ! current_user_can($tax->cap->assign_terms);
 
-	$args['list_only'] = ! empty( $r['list_only'] );
+	$args['list_only'] = ! empty($r['list_only']);
 
-	if ( is_array( $r['selected_cats'] ) ) {
+	if (is_array($r['selected_cats'])) {
 		$args['selected_cats'] = $r['selected_cats'];
-	} elseif ( $post_id ) {
-		$args['selected_cats'] = wp_get_object_terms( $post_id, $taxonomy, array_merge( $args, array( 'fields' => 'ids' ) ) );
+	} elseif ($post_id) {
+		$args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
 	} else {
 		$args['selected_cats'] = array();
 	}
-	if ( is_array( $r['popular_cats'] ) ) {
+	if (is_array($r['popular_cats'])) {
 		$args['popular_cats'] = $r['popular_cats'];
 	} else {
-		$args['popular_cats'] = get_terms( $taxonomy, array(
+		$args['popular_cats'] = get_terms($taxonomy, array(
 			'fields' => 'ids',
 			'orderby' => 'count',
 			'order' => 'DESC',
 			'number' => 10,
 			'hierarchical' => false
-		) );
+		));
 	}
-	if ( $descendants_and_self ) {
-		$categories = (array) get_terms( $taxonomy, array(
+	if ($descendants_and_self) {
+		$categories = (array) get_terms($taxonomy, array(
 			'child_of' => $descendants_and_self,
 			'hierarchical' => 0,
 			'hide_empty' => 0
-		) );
-		$self = get_term( $descendants_and_self, $taxonomy );
-		array_unshift( $categories, $self );
+		));
+		$self = get_term($descendants_and_self, $taxonomy);
+		array_unshift($categories, $self);
 	} else {
-		$categories = (array) get_terms( $taxonomy, array( 'get' => 'all' ) );
+		$categories = (array) get_terms($taxonomy, array('get' => 'all'));
 	}
 
 	$output = '';
 
-	if ( $r['checked_ontop'] ) {
+	if ($r['checked_ontop']) {
 		// Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
 		$checked_categories = array();
-		$keys = array_keys( $categories );
+		$keys = array_keys($categories);
 
-		foreach ( $keys as $k ) {
-			if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
+		foreach ($keys as $k) {
+			if (in_array($categories[$k]->term_id, $args['selected_cats'])) {
 				$checked_categories[] = $categories[$k];
-				unset( $categories[$k] );
+				unset($categories[$k]);
 			}
 		}
 
 		// Put checked cats on top
-		$output .= call_user_func_array( array( $walker, 'walk' ), array( $checked_categories, 0, $args ) );
+		$output .= call_user_func_array(array($walker, 'walk'), array($checked_categories, 0, $args));
 	}
 	// Then the rest of them
-	$output .= call_user_func_array( array( $walker, 'walk' ), array( $categories, 0, $args ) );
+	$output .= call_user_func_array(array($walker, 'walk'), array($categories, 0, $args));
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	}
 
@@ -188,33 +188,33 @@ 
  * @param bool $echo Optionally output the list as well. Defaults to true.
  * @return array List of popular term IDs.
  */
-function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $echo = true ) {
+function wp_popular_terms_checklist($taxonomy, $default = 0, $number = 10, $echo = true) {
 	$post = get_post();
 
-	if ( $post && $post->ID )
+	if ($post && $post->ID)
 		$checked_terms = wp_get_object_terms($post->ID, $taxonomy, array('fields'=>'ids'));
 	else
 		$checked_terms = array();
 
-	$terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
+	$terms = get_terms($taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false));
 
 	$tax = get_taxonomy($taxonomy);
 
 	$popular_ids = array();
-	foreach ( (array) $terms as $term ) {
+	foreach ((array) $terms as $term) {
 		$popular_ids[] = $term->term_id;
-		if ( !$echo ) // Hack for Ajax use.
+		if ( ! $echo) // Hack for Ajax use.
 			continue;
 		$id = "popular-$taxonomy-$term->term_id";
-		$checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : '';
+		$checked = in_array($term->term_id, $checked_terms) ? 'checked="checked"' : '';
 		?>
 
 		<li id="<?php echo $id; ?>" class="popular-category">
 			<label class="selectit">
-				<input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php disabled( ! current_user_can( $tax->cap->assign_terms ) ); ?> />
+				<input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php disabled( ! current_user_can($tax->cap->assign_terms)); ?> />
 				<?php
 				/** This filter is documented in wp-includes/category-template.php */
-				echo esc_html( apply_filters( 'the_category', $term->name ) );
+				echo esc_html(apply_filters('the_category', $term->name));
 				?>
 			</label>
 		</li>
@@ -231,32 +231,32 @@ 
  *
  * @param int $link_id
  */
-function wp_link_category_checklist( $link_id = 0 ) {
+function wp_link_category_checklist($link_id = 0) {
 	$default = 1;
 
 	$checked_categories = array();
 
-	if ( $link_id ) {
-		$checked_categories = wp_get_link_cats( $link_id );
+	if ($link_id) {
+		$checked_categories = wp_get_link_cats($link_id);
 		// No selected categories, strange
-		if ( ! count( $checked_categories ) ) {
+		if ( ! count($checked_categories)) {
 			$checked_categories[] = $default;
 		}
 	} else {
 		$checked_categories[] = $default;
 	}
 
-	$categories = get_terms( 'link_category', array( 'orderby' => 'name', 'hide_empty' => 0 ) );
+	$categories = get_terms('link_category', array('orderby' => 'name', 'hide_empty' => 0));
 
-	if ( empty( $categories ) )
+	if (empty($categories))
 		return;
 
-	foreach ( $categories as $category ) {
+	foreach ($categories as $category) {
 		$cat_id = $category->term_id;
 
 		/** This filter is documented in wp-includes/category-template.php */
-		$name = esc_html( apply_filters( 'the_category', $category->name ) );
-		$checked = in_array( $cat_id, $checked_categories ) ? ' checked="checked"' : '';
+		$name = esc_html(apply_filters('the_category', $category->name));
+		$checked = in_array($cat_id, $checked_categories) ? ' checked="checked"' : '';
 		echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, "</label></li>";
 	}
 }
@@ -270,72 +270,72 @@ 
  */
 function get_inline_data($post) {
 	$post_type_object = get_post_type_object($post->post_type);
-	if ( ! current_user_can( 'edit_post', $post->ID ) )
+	if ( ! current_user_can('edit_post', $post->ID))
 		return;
 
-	$title = esc_textarea( trim( $post->post_title ) );
+	$title = esc_textarea(trim($post->post_title));
 
 	/** This filter is documented in wp-admin/edit-tag-form.php */
 	echo '
-<div class="hidden" id="inline_' . $post->ID . '">
-	<div class="post_title">' . $title . '</div>' .
+<div class="hidden" id="inline_' . $post->ID.'">
+	<div class="post_title">' . $title.'</div>'.
 	/** This filter is documented in wp-admin/edit-tag-form.php */
-	'<div class="post_name">' . apply_filters( 'editable_slug', $post->post_name, $post ) . '</div>
-	<div class="post_author">' . $post->post_author . '</div>
-	<div class="comment_status">' . esc_html( $post->comment_status ) . '</div>
-	<div class="ping_status">' . esc_html( $post->ping_status ) . '</div>
-	<div class="_status">' . esc_html( $post->post_status ) . '</div>
-	<div class="jj">' . mysql2date( 'd', $post->post_date, false ) . '</div>
-	<div class="mm">' . mysql2date( 'm', $post->post_date, false ) . '</div>
-	<div class="aa">' . mysql2date( 'Y', $post->post_date, false ) . '</div>
-	<div class="hh">' . mysql2date( 'H', $post->post_date, false ) . '</div>
-	<div class="mn">' . mysql2date( 'i', $post->post_date, false ) . '</div>
-	<div class="ss">' . mysql2date( 's', $post->post_date, false ) . '</div>
-	<div class="post_password">' . esc_html( $post->post_password ) . '</div>';
-
-	if ( $post_type_object->hierarchical ) {
-		echo '<div class="post_parent">' . $post->post_parent . '</div>';
+	'<div class="post_name">'.apply_filters('editable_slug', $post->post_name, $post).'</div>
+	<div class="post_author">' . $post->post_author.'</div>
+	<div class="comment_status">' . esc_html($post->comment_status).'</div>
+	<div class="ping_status">' . esc_html($post->ping_status).'</div>
+	<div class="_status">' . esc_html($post->post_status).'</div>
+	<div class="jj">' . mysql2date('d', $post->post_date, false).'</div>
+	<div class="mm">' . mysql2date('m', $post->post_date, false).'</div>
+	<div class="aa">' . mysql2date('Y', $post->post_date, false).'</div>
+	<div class="hh">' . mysql2date('H', $post->post_date, false).'</div>
+	<div class="mn">' . mysql2date('i', $post->post_date, false).'</div>
+	<div class="ss">' . mysql2date('s', $post->post_date, false).'</div>
+	<div class="post_password">' . esc_html($post->post_password).'</div>';
+
+	if ($post_type_object->hierarchical) {
+		echo '<div class="post_parent">'.$post->post_parent.'</div>';
 	}
 
-	echo '<div class="page_template">' . ( $post->page_template ? esc_html( $post->page_template ) : 'default' ) . '</div>';
+	echo '<div class="page_template">'.($post->page_template ? esc_html($post->page_template) : 'default').'</div>';
 
-	if ( post_type_supports( $post->post_type, 'page-attributes' ) ) {
-		echo '<div class="menu_order">' . $post->menu_order . '</div>';
+	if (post_type_supports($post->post_type, 'page-attributes')) {
+		echo '<div class="menu_order">'.$post->menu_order.'</div>';
 	}
 
-	$taxonomy_names = get_object_taxonomies( $post->post_type );
-	foreach ( $taxonomy_names as $taxonomy_name) {
-		$taxonomy = get_taxonomy( $taxonomy_name );
+	$taxonomy_names = get_object_taxonomies($post->post_type);
+	foreach ($taxonomy_names as $taxonomy_name) {
+		$taxonomy = get_taxonomy($taxonomy_name);
 
-		if ( $taxonomy->hierarchical && $taxonomy->show_ui ) {
+		if ($taxonomy->hierarchical && $taxonomy->show_ui) {
 
-			$terms = get_object_term_cache( $post->ID, $taxonomy_name );
-			if ( false === $terms ) {
-				$terms = wp_get_object_terms( $post->ID, $taxonomy_name );
-				wp_cache_add( $post->ID, wp_list_pluck( $terms, 'term_id' ), $taxonomy_name . '_relationships' );
+			$terms = get_object_term_cache($post->ID, $taxonomy_name);
+			if (false === $terms) {
+				$terms = wp_get_object_terms($post->ID, $taxonomy_name);
+				wp_cache_add($post->ID, wp_list_pluck($terms, 'term_id'), $taxonomy_name.'_relationships');
 			}
-			$term_ids = empty( $terms ) ? array() : wp_list_pluck( $terms, 'term_id' );
+			$term_ids = empty($terms) ? array() : wp_list_pluck($terms, 'term_id');
 
-			echo '<div class="post_category" id="' . $taxonomy_name . '_' . $post->ID . '">' . implode( ',', $term_ids ) . '</div>';
+			echo '<div class="post_category" id="'.$taxonomy_name.'_'.$post->ID.'">'.implode(',', $term_ids).'</div>';
 
-		} elseif ( $taxonomy->show_ui ) {
+		} elseif ($taxonomy->show_ui) {
 
-			$terms_to_edit = get_terms_to_edit( $post->ID, $taxonomy_name );
-			if ( ! is_string( $terms_to_edit ) ) {
+			$terms_to_edit = get_terms_to_edit($post->ID, $taxonomy_name);
+			if ( ! is_string($terms_to_edit)) {
 				$terms_to_edit = '';
 			}
 
 			echo '<div class="tags_input" id="'.$taxonomy_name.'_'.$post->ID.'">'
-				. esc_html( str_replace( ',', ', ', $terms_to_edit ) ) . '</div>';
+				. esc_html(str_replace(',', ', ', $terms_to_edit)).'</div>';
 
 		}
 	}
 
-	if ( !$post_type_object->hierarchical )
-		echo '<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
+	if ( ! $post_type_object->hierarchical)
+		echo '<div class="sticky">'.(is_sticky($post->ID) ? 'sticky' : '').'</div>';
 
-	if ( post_type_supports( $post->post_type, 'post-formats' ) )
-		echo '<div class="post_format">' . esc_html( get_post_format( $post->ID ) ) . '</div>';
+	if (post_type_supports($post->post_type, 'post-formats'))
+		echo '<div class="post_format">'.esc_html(get_post_format($post->ID)).'</div>';
 
 	echo '</div>';
 }
@@ -352,7 +352,7 @@ 
  * @param string $mode
  * @param bool   $table_row
  */
-function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $table_row = true ) {
+function wp_comment_reply($position = 1, $checkbox = false, $mode = 'single', $table_row = true) {
 	global $wp_list_table;
 	/**
 	 * Filters the in-line comment reply-to form output in the Comments
@@ -369,15 +369,15 @@ 
 	 * @param string $content The reply-to form content.
 	 * @param array  $args    An array of default args.
 	 */
-	$content = apply_filters( 'wp_comment_reply', '', array( 'position' => $position, 'checkbox' => $checkbox, 'mode' => $mode ) );
+	$content = apply_filters('wp_comment_reply', '', array('position' => $position, 'checkbox' => $checkbox, 'mode' => $mode));
 
-	if ( ! empty($content) ) {
+	if ( ! empty($content)) {
 		echo $content;
 		return;
 	}
 
-	if ( ! $wp_list_table ) {
-		if ( $mode == 'single' ) {
+	if ( ! $wp_list_table) {
+		if ($mode == 'single') {
 			$wp_list_table = _get_list_table('WP_Post_Comments_List_Table');
 		} else {
 			$wp_list_table = _get_list_table('WP_Comments_List_Table');
@@ -386,29 +386,29 @@ 
 
 ?>
 <form method="get">
-<?php if ( $table_row ) : ?>
+<?php if ($table_row) : ?>
 <table style="display:none;"><tbody id="com-reply"><tr id="replyrow" class="inline-edit-row" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
 <?php else : ?>
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
 <?php endif; ?>
 	<fieldset class="comment-reply">
 	<legend>
-		<span class="hidden" id="editlegend"><?php _e( 'Edit Comment' ); ?></span>
-		<span class="hidden" id="replyhead"><?php _e( 'Reply to Comment' ); ?></span>
-		<span class="hidden" id="addhead"><?php _e( 'Add new Comment' ); ?></span>
+		<span class="hidden" id="editlegend"><?php _e('Edit Comment'); ?></span>
+		<span class="hidden" id="replyhead"><?php _e('Reply to Comment'); ?></span>
+		<span class="hidden" id="addhead"><?php _e('Add new Comment'); ?></span>
 	</legend>
 
 	<div id="replycontainer">
-	<label for="replycontent" class="screen-reader-text"><?php _e( 'Comment' ); ?></label>
+	<label for="replycontent" class="screen-reader-text"><?php _e('Comment'); ?></label>
 	<?php
-	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
-	wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
+	$quicktags_settings = array('buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close');
+	wp_editor('', 'replycontent', array('media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings));
 	?>
 	</div>
 
 	<div id="edithead" style="display:none;">
 		<div class="inside">
-		<label for="author-name"><?php _e( 'Name' ) ?></label>
+		<label for="author-name"><?php _e('Name') ?></label>
 		<input type="text" name="newcomment_author" size="50" value="" id="author-name" />
 		</div>
 
@@ -441,12 +441,12 @@ 
 	<input type="hidden" name="checkbox" id="checkbox" value="<?php echo $checkbox ? 1 : 0; ?>" />
 	<input type="hidden" name="mode" id="mode" value="<?php echo esc_attr($mode); ?>" />
 	<?php
-		wp_nonce_field( 'replyto-comment', '_ajax_nonce-replyto-comment', false );
-		if ( current_user_can( 'unfiltered_html' ) )
-			wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
+		wp_nonce_field('replyto-comment', '_ajax_nonce-replyto-comment', false);
+		if (current_user_can('unfiltered_html'))
+			wp_nonce_field('unfiltered-html-comment', '_wp_unfiltered_html_comment', false);
 	?>
 	</fieldset>
-<?php if ( $table_row ) : ?>
+<?php if ($table_row) : ?>
 </td></tr></tbody></table>
 <?php else : ?>
 </div></div>
@@ -478,15 +478,15 @@ 
  *
  * @param array $meta
  */
-function list_meta( $meta ) {
+function list_meta($meta) {
 	// Exit if no meta
-	if ( ! $meta ) {
+	if ( ! $meta) {
 		echo '
 <table id="list-table" style="display: none;">
 	<thead>
 	<tr>
-		<th class="left">' . _x( 'Name', 'meta name' ) . '</th>
-		<th>' . __( 'Value' ) . '</th>
+		<th class="left">' . _x('Name', 'meta name').'</th>
+		<th>' . __('Value').'</th>
 	</tr>
 	</thead>
 	<tbody id="the-list" data-wp-lists="list:meta">
@@ -500,14 +500,14 @@ 
 <table id="list-table">
 	<thead>
 	<tr>
-		<th class="left"><?php _ex( 'Name', 'meta name' ) ?></th>
-		<th><?php _e( 'Value' ) ?></th>
+		<th class="left"><?php _ex('Name', 'meta name') ?></th>
+		<th><?php _e('Value') ?></th>
 	</tr>
 	</thead>
 	<tbody id='the-list' data-wp-lists='list:meta'>
 <?php
-	foreach ( $meta as $entry )
-		echo _list_meta_row( $entry, $count );
+	foreach ($meta as $entry)
+		echo _list_meta_row($entry, $count);
 ?>
 	</tbody>
 </table>
@@ -525,22 +525,22 @@ 
  * @param int   $count
  * @return string
  */
-function _list_meta_row( $entry, &$count ) {
+function _list_meta_row($entry, &$count) {
 	static $update_nonce = '';
 
-	if ( is_protected_meta( $entry['meta_key'], 'post' ) )
+	if (is_protected_meta($entry['meta_key'], 'post'))
 		return '';
 
-	if ( ! $update_nonce )
-		$update_nonce = wp_create_nonce( 'add-meta' );
+	if ( ! $update_nonce)
+		$update_nonce = wp_create_nonce('add-meta');
 
 	$r = '';
-	++ $count;
+	++$count;
 
-	if ( is_serialized( $entry['meta_value'] ) ) {
-		if ( is_serialized_string( $entry['meta_value'] ) ) {
+	if (is_serialized($entry['meta_value'])) {
+		if (is_serialized_string($entry['meta_value'])) {
 			// This is a serialized string, so we should display it.
-			$entry['meta_value'] = maybe_unserialize( $entry['meta_value'] );
+			$entry['meta_value'] = maybe_unserialize($entry['meta_value']);
 		} else {
 			// This is a serialized array/object so we should NOT display it.
 			--$count;
@@ -549,23 +549,23 @@ 
 	}
 
 	$entry['meta_key'] = esc_attr($entry['meta_key']);
-	$entry['meta_value'] = esc_textarea( $entry['meta_value'] ); // using a <textarea />
+	$entry['meta_value'] = esc_textarea($entry['meta_value']); // using a <textarea />
 	$entry['meta_id'] = (int) $entry['meta_id'];
 
-	$delete_nonce = wp_create_nonce( 'delete-meta_' . $entry['meta_id'] );
+	$delete_nonce = wp_create_nonce('delete-meta_'.$entry['meta_id']);
 
 	$r .= "\n\t<tr id='meta-{$entry['meta_id']}'>";
-	$r .= "\n\t\t<td class='left'><label class='screen-reader-text' for='meta-{$entry['meta_id']}-key'>" . __( 'Key' ) . "</label><input name='meta[{$entry['meta_id']}][key]' id='meta-{$entry['meta_id']}-key' type='text' size='20' value='{$entry['meta_key']}' />";
+	$r .= "\n\t\t<td class='left'><label class='screen-reader-text' for='meta-{$entry['meta_id']}-key'>".__('Key')."</label><input name='meta[{$entry['meta_id']}][key]' id='meta-{$entry['meta_id']}-key' type='text' size='20' value='{$entry['meta_key']}' />";
 
 	$r .= "\n\t\t<div class='submit'>";
-	$r .= get_submit_button( __( 'Delete' ), 'deletemeta small', "deletemeta[{$entry['meta_id']}]", false, array( 'data-wp-lists' => "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce" ) );
+	$r .= get_submit_button(__('Delete'), 'deletemeta small', "deletemeta[{$entry['meta_id']}]", false, array('data-wp-lists' => "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce"));
 	$r .= "\n\t\t";
-	$r .= get_submit_button( __( 'Update' ), 'updatemeta small', "meta-{$entry['meta_id']}-submit", false, array( 'data-wp-lists' => "add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce" ) );
+	$r .= get_submit_button(__('Update'), 'updatemeta small', "meta-{$entry['meta_id']}-submit", false, array('data-wp-lists' => "add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce"));
 	$r .= "</div>";
-	$r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false );
+	$r .= wp_nonce_field('change-meta', '_ajax_nonce', false, false);
 	$r .= "</td>";
 
-	$r .= "\n\t\t<td><label class='screen-reader-text' for='meta-{$entry['meta_id']}-value'>" . __( 'Value' ) . "</label><textarea name='meta[{$entry['meta_id']}][value]' id='meta-{$entry['meta_id']}-value' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>\n\t</tr>";
+	$r .= "\n\t\t<td><label class='screen-reader-text' for='meta-{$entry['meta_id']}-value'>".__('Value')."</label><textarea name='meta[{$entry['meta_id']}][value]' id='meta-{$entry['meta_id']}-value' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>\n\t</tr>";
 	return $r;
 }
 
@@ -578,9 +578,9 @@ 
  *
  * @param WP_Post $post Optional. The post being edited.
  */
-function meta_form( $post = null ) {
+function meta_form($post = null) {
 	global $wpdb;
-	$post = get_post( $post );
+	$post = get_post($post);
 
 	/**
 	 * Filters values for the meta key dropdown in the Custom Fields meta box.
@@ -593,9 +593,9 @@ 
 	 * @param array|null $keys Pre-defined meta keys to be used in place of a postmeta query. Default null.
 	 * @param WP_Post    $post The current post object.
 	 */
-	$keys = apply_filters( 'postmeta_form_keys', null, $post );
+	$keys = apply_filters('postmeta_form_keys', null, $post);
 
-	if ( null === $keys ) {
+	if (null === $keys) {
 		/**
 		 * Filters the number of custom fields to retrieve for the drop-down
 		 * in the Custom Fields meta box.
@@ -604,44 +604,44 @@ 
 		 *
 		 * @param int $limit Number of custom fields to retrieve. Default 30.
 		 */
-		$limit = apply_filters( 'postmeta_form_limit', 30 );
+		$limit = apply_filters('postmeta_form_limit', 30);
 		$sql = "SELECT DISTINCT meta_key
 			FROM $wpdb->postmeta
 			WHERE meta_key NOT BETWEEN '_' AND '_z'
 			HAVING meta_key NOT LIKE %s
 			ORDER BY meta_key
 			LIMIT %d";
-		$keys = $wpdb->get_col( $wpdb->prepare( $sql, $wpdb->esc_like( '_' ) . '%', $limit ) );
+		$keys = $wpdb->get_col($wpdb->prepare($sql, $wpdb->esc_like('_').'%', $limit));
 	}
 
-	if ( $keys ) {
-		natcasesort( $keys );
+	if ($keys) {
+		natcasesort($keys);
 		$meta_key_input_id = 'metakeyselect';
 	} else {
 		$meta_key_input_id = 'metakeyinput';
 	}
 ?>
-<p><strong><?php _e( 'Add New Custom Field:' ) ?></strong></p>
+<p><strong><?php _e('Add New Custom Field:') ?></strong></p>
 <table id="newmeta">
 <thead>
 <tr>
-<th class="left"><label for="<?php echo $meta_key_input_id; ?>"><?php _ex( 'Name', 'meta name' ) ?></label></th>
-<th><label for="metavalue"><?php _e( 'Value' ) ?></label></th>
+<th class="left"><label for="<?php echo $meta_key_input_id; ?>"><?php _ex('Name', 'meta name') ?></label></th>
+<th><label for="metavalue"><?php _e('Value') ?></label></th>
 </tr>
 </thead>
 
 <tbody>
 <tr>
 <td id="newmetaleft" class="left">
-<?php if ( $keys ) { ?>
+<?php if ($keys) { ?>
 <select id="metakeyselect" name="metakeyselect">
-<option value="#NONE#"><?php _e( '&mdash; Select &mdash;' ); ?></option>
+<option value="#NONE#"><?php _e('&mdash; Select &mdash;'); ?></option>
 <?php
 
-	foreach ( $keys as $key ) {
-		if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) )
+	foreach ($keys as $key) {
+		if (is_protected_meta($key, 'post') || ! current_user_can('add_post_meta', $post->ID, $key))
 			continue;
-		echo "\n<option value='" . esc_attr($key) . "'>" . esc_html($key) . "</option>";
+		echo "\n<option value='".esc_attr($key)."'>".esc_html($key)."</option>";
 	}
 ?>
 </select>
@@ -658,9 +658,9 @@ 
 
 <tr><td colspan="2">
 <div class="submit">
-<?php submit_button( __( 'Add Custom Field' ), '', 'addmeta', false, array( 'id' => 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta' ) ); ?>
+<?php submit_button(__('Add Custom Field'), '', 'addmeta', false, array('id' => 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta')); ?>
 </div>
-<?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
+<?php wp_nonce_field('add-meta', '_ajax_nonce-add-meta', false); ?>
 </td></tr>
 </tbody>
 </table>
@@ -682,15 +682,15 @@ 
  * @param int|bool $multi     Optional. Whether the additional fields and buttons should be added.
  *                            Default 0|false.
  */
-function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
+function touch_time($edit = 1, $for_post = 1, $tab_index = 0, $multi = 0) {
 	global $wp_locale;
 	$post = get_post();
 
-	if ( $for_post )
-		$edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
+	if ($for_post)
+		$edit = ! (in_array($post->post_status, array('draft', 'pending')) && ( ! $post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt));
 
 	$tab_index_attribute = '';
-	if ( (int) $tab_index > 0 )
+	if ((int) $tab_index > 0)
 		$tab_index_attribute = " tabindex=\"$tab_index\"";
 
 	// todo: Remove this?
@@ -698,56 +698,56 @@ 
 
 	$time_adj = current_time('timestamp');
 	$post_date = ($for_post) ? $post->post_date : get_comment()->comment_date;
-	$jj = ($edit) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
-	$mm = ($edit) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );
-	$aa = ($edit) ? mysql2date( 'Y', $post_date, false ) : gmdate( 'Y', $time_adj );
-	$hh = ($edit) ? mysql2date( 'H', $post_date, false ) : gmdate( 'H', $time_adj );
-	$mn = ($edit) ? mysql2date( 'i', $post_date, false ) : gmdate( 'i', $time_adj );
-	$ss = ($edit) ? mysql2date( 's', $post_date, false ) : gmdate( 's', $time_adj );
-
-	$cur_jj = gmdate( 'd', $time_adj );
-	$cur_mm = gmdate( 'm', $time_adj );
-	$cur_aa = gmdate( 'Y', $time_adj );
-	$cur_hh = gmdate( 'H', $time_adj );
-	$cur_mn = gmdate( 'i', $time_adj );
-
-	$month = '<label><span class="screen-reader-text">' . __( 'Month' ) . '</span><select ' . ( $multi ? '' : 'id="mm" ' ) . 'name="mm"' . $tab_index_attribute . ">\n";
-	for ( $i = 1; $i < 13; $i = $i +1 ) {
+	$jj = ($edit) ? mysql2date('d', $post_date, false) : gmdate('d', $time_adj);
+	$mm = ($edit) ? mysql2date('m', $post_date, false) : gmdate('m', $time_adj);
+	$aa = ($edit) ? mysql2date('Y', $post_date, false) : gmdate('Y', $time_adj);
+	$hh = ($edit) ? mysql2date('H', $post_date, false) : gmdate('H', $time_adj);
+	$mn = ($edit) ? mysql2date('i', $post_date, false) : gmdate('i', $time_adj);
+	$ss = ($edit) ? mysql2date('s', $post_date, false) : gmdate('s', $time_adj);
+
+	$cur_jj = gmdate('d', $time_adj);
+	$cur_mm = gmdate('m', $time_adj);
+	$cur_aa = gmdate('Y', $time_adj);
+	$cur_hh = gmdate('H', $time_adj);
+	$cur_mn = gmdate('i', $time_adj);
+
+	$month = '<label><span class="screen-reader-text">'.__('Month').'</span><select '.($multi ? '' : 'id="mm" ').'name="mm"'.$tab_index_attribute.">\n";
+	for ($i = 1; $i < 13; $i = $i + 1) {
 		$monthnum = zeroise($i, 2);
-		$monthtext = $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) );
-		$month .= "\t\t\t" . '<option value="' . $monthnum . '" data-text="' . $monthtext . '" ' . selected( $monthnum, $mm, false ) . '>';
+		$monthtext = $wp_locale->get_month_abbrev($wp_locale->get_month($i));
+		$month .= "\t\t\t".'<option value="'.$monthnum.'" data-text="'.$monthtext.'" '.selected($monthnum, $mm, false).'>';
 		/* translators: 1: month number (01, 02, etc.), 2: month abbreviation */
-		$month .= sprintf( __( '%1$s-%2$s' ), $monthnum, $monthtext ) . "</option>\n";
+		$month .= sprintf(__('%1$s-%2$s'), $monthnum, $monthtext)."</option>\n";
 	}
 	$month .= '</select></label>';
 
-	$day = '<label><span class="screen-reader-text">' . __( 'Day' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="jj" ' ) . 'name="jj" value="' . $jj . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$year = '<label><span class="screen-reader-text">' . __( 'Year' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="aa" ' ) . 'name="aa" value="' . $aa . '" size="4" maxlength="4"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$hour = '<label><span class="screen-reader-text">' . __( 'Hour' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="hh" ' ) . 'name="hh" value="' . $hh . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$minute = '<label><span class="screen-reader-text">' . __( 'Minute' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="mn" ' ) . 'name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
+	$day = '<label><span class="screen-reader-text">'.__('Day').'</span><input type="text" '.($multi ? '' : 'id="jj" ').'name="jj" value="'.$jj.'" size="2" maxlength="2"'.$tab_index_attribute.' autocomplete="off" /></label>';
+	$year = '<label><span class="screen-reader-text">'.__('Year').'</span><input type="text" '.($multi ? '' : 'id="aa" ').'name="aa" value="'.$aa.'" size="4" maxlength="4"'.$tab_index_attribute.' autocomplete="off" /></label>';
+	$hour = '<label><span class="screen-reader-text">'.__('Hour').'</span><input type="text" '.($multi ? '' : 'id="hh" ').'name="hh" value="'.$hh.'" size="2" maxlength="2"'.$tab_index_attribute.' autocomplete="off" /></label>';
+	$minute = '<label><span class="screen-reader-text">'.__('Minute').'</span><input type="text" '.($multi ? '' : 'id="mn" ').'name="mn" value="'.$mn.'" size="2" maxlength="2"'.$tab_index_attribute.' autocomplete="off" /></label>';
 
 	echo '<div class="timestamp-wrap">';
 	/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
-	printf( __( '%1$s %2$s, %3$s @ %4$s:%5$s' ), $month, $day, $year, $hour, $minute );
+	printf(__('%1$s %2$s, %3$s @ %4$s:%5$s'), $month, $day, $year, $hour, $minute);
 
-	echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
+	echo '</div><input type="hidden" id="ss" name="ss" value="'.$ss.'" />';
 
-	if ( $multi ) return;
+	if ($multi) return;
 
 	echo "\n\n";
 	$map = array(
-		'mm' => array( $mm, $cur_mm ),
-		'jj' => array( $jj, $cur_jj ),
-		'aa' => array( $aa, $cur_aa ),
-		'hh' => array( $hh, $cur_hh ),
-		'mn' => array( $mn, $cur_mn ),
+		'mm' => array($mm, $cur_mm),
+		'jj' => array($jj, $cur_jj),
+		'aa' => array($aa, $cur_aa),
+		'hh' => array($hh, $cur_hh),
+		'mn' => array($mn, $cur_mn),
 	);
-	foreach ( $map as $timeunit => $value ) {
-		list( $unit, $curr ) = $value;
+	foreach ($map as $timeunit => $value) {
+		list($unit, $curr) = $value;
 
-		echo '<input type="hidden" id="hidden_' . $timeunit . '" name="hidden_' . $timeunit . '" value="' . $unit . '" />' . "\n";
-		$cur_timeunit = 'cur_' . $timeunit;
-		echo '<input type="hidden" id="' . $cur_timeunit . '" name="' . $cur_timeunit . '" value="' . $curr . '" />' . "\n";
+		echo '<input type="hidden" id="hidden_'.$timeunit.'" name="hidden_'.$timeunit.'" value="'.$unit.'" />'."\n";
+		$cur_timeunit = 'cur_'.$timeunit;
+		echo '<input type="hidden" id="'.$cur_timeunit.'" name="'.$cur_timeunit.'" value="'.$curr.'" />'."\n";
 	}
 ?>
 
@@ -767,12 +767,12 @@ 
  * @param string $default   Optional. The template file name. Default empty.
  * @param string $post_type Optional. Post type to get templates for. Default 'post'.
  */
-function page_template_dropdown( $default = '', $post_type = 'page' ) {
-	$templates = get_page_templates( null, $post_type );
-	ksort( $templates );
-	foreach ( array_keys( $templates ) as $template ) {
-		$selected = selected( $default, $templates[ $template ], false );
-		echo "\n\t<option value='" . $templates[ $template ] . "' $selected>$template</option>";
+function page_template_dropdown($default = '', $post_type = 'page') {
+	$templates = get_page_templates(null, $post_type);
+	ksort($templates);
+	foreach (array_keys($templates) as $template) {
+		$selected = selected($default, $templates[$template], false);
+		echo "\n\t<option value='".$templates[$template]."' $selected>$template</option>";
 	}
 }
 
@@ -791,22 +791,22 @@ 
  *
  * @return null|false Boolean False if page has no children, otherwise print out html elements
  */
-function parent_dropdown( $default = 0, $parent = 0, $level = 0, $post = null ) {
+function parent_dropdown($default = 0, $parent = 0, $level = 0, $post = null) {
 	global $wpdb;
-	$post = get_post( $post );
-	$items = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent) );
+	$post = get_post($post);
+	$items = $wpdb->get_results($wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent));
 
-	if ( $items ) {
-		foreach ( $items as $item ) {
+	if ($items) {
+		foreach ($items as $item) {
 			// A page cannot be its own parent.
-			if ( $post && $post->ID && $item->ID == $post->ID )
+			if ($post && $post->ID && $item->ID == $post->ID)
 				continue;
 
-			$pad = str_repeat( '&nbsp;', $level * 3 );
-			$selected = selected( $default, $item->ID, false );
+			$pad = str_repeat('&nbsp;', $level * 3);
+			$selected = selected($default, $item->ID, false);
 
-			echo "\n\t<option class='level-$level' value='$item->ID' $selected>$pad " . esc_html($item->post_title) . "</option>";
-			parent_dropdown( $default, $item->ID, $level +1 );
+			echo "\n\t<option class='level-$level' value='$item->ID' $selected>$pad ".esc_html($item->post_title)."</option>";
+			parent_dropdown($default, $item->ID, $level + 1);
 		}
 	} else {
 		return false;
@@ -820,18 +820,18 @@ 
  *
  * @param string $selected Slug for the role that should be already selected.
  */
-function wp_dropdown_roles( $selected = '' ) {
+function wp_dropdown_roles($selected = '') {
 	$r = '';
 
-	$editable_roles = array_reverse( get_editable_roles() );
+	$editable_roles = array_reverse(get_editable_roles());
 
-	foreach ( $editable_roles as $role => $details ) {
-		$name = translate_user_role($details['name'] );
+	foreach ($editable_roles as $role => $details) {
+		$name = translate_user_role($details['name']);
 		// preselect specified role
-		if ( $selected == $role ) {
-			$r .= "\n\t<option selected='selected' value='" . esc_attr( $role ) . "'>$name</option>";
+		if ($selected == $role) {
+			$r .= "\n\t<option selected='selected' value='".esc_attr($role)."'>$name</option>";
 		} else {
-			$r .= "\n\t<option value='" . esc_attr( $role ) . "'>$name</option>";
+			$r .= "\n\t<option value='".esc_attr($role)."'>$name</option>";
 		}
 	}
 
@@ -845,7 +845,7 @@ 
  *
  * @param string $action The action attribute for the form.
  */
-function wp_import_upload_form( $action ) {
+function wp_import_upload_form($action) {
 
 	/**
 	 * Filters the maximum allowed upload size for import files.
@@ -856,22 +856,22 @@ 
 	 *
 	 * @param int $max_upload_size Allowed upload size. Default 1 MB.
 	 */
-	$bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
-	$size = size_format( $bytes );
+	$bytes = apply_filters('import_upload_size_limit', wp_max_upload_size());
+	$size = size_format($bytes);
 	$upload_dir = wp_upload_dir();
-	if ( ! empty( $upload_dir['error'] ) ) :
+	if ( ! empty($upload_dir['error'])) :
 		?><div class="error"><p><?php _e('Before you can upload your import file, you will need to fix the following error:'); ?></p>
 		<p><strong><?php echo $upload_dir['error']; ?></strong></p></div><?php
 	else :
 ?>
-<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) ); ?>">
+<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url(wp_nonce_url($action, 'import-upload')); ?>">
 <p>
-<label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?>)
+<label for="upload"><?php _e('Choose a file from your computer:'); ?></label> (<?php printf(__('Maximum size: %s'), $size); ?>)
 <input type="file" id="upload" name="import" size="25" />
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
 </p>
-<?php submit_button( __('Upload file and import'), 'primary' ); ?>
+<?php submit_button(__('Upload file and import'), 'primary'); ?>
 </form>
 <?php
 	endif;
@@ -905,75 +905,75 @@ 
  *                                              of the box array (which is the second parameter passed
  *                                              to your callback). Default null.
  */
-function add_meta_box( $id, $title, $callback, $screen = null, $context = 'advanced', $priority = 'default', $callback_args = null ) {
+function add_meta_box($id, $title, $callback, $screen = null, $context = 'advanced', $priority = 'default', $callback_args = null) {
 	global $wp_meta_boxes;
 
-	if ( empty( $screen ) ) {
+	if (empty($screen)) {
 		$screen = get_current_screen();
-	} elseif ( is_string( $screen ) ) {
-		$screen = convert_to_screen( $screen );
-	} elseif ( is_array( $screen ) ) {
-		foreach ( $screen as $single_screen ) {
-			add_meta_box( $id, $title, $callback, $single_screen, $context, $priority, $callback_args );
+	} elseif (is_string($screen)) {
+		$screen = convert_to_screen($screen);
+	} elseif (is_array($screen)) {
+		foreach ($screen as $single_screen) {
+			add_meta_box($id, $title, $callback, $single_screen, $context, $priority, $callback_args);
 		}
 	}
 
-	if ( ! isset( $screen->id ) ) {
+	if ( ! isset($screen->id)) {
 		return;
 	}
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
+	if ( ! isset($wp_meta_boxes))
 		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
+	if ( ! isset($wp_meta_boxes[$page]))
 		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
+	if ( ! isset($wp_meta_boxes[$page][$context]))
 		$wp_meta_boxes[$page][$context] = array();
 
-	foreach ( array_keys($wp_meta_boxes[$page]) as $a_context ) {
-		foreach ( array('high', 'core', 'default', 'low') as $a_priority ) {
-			if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) )
+	foreach (array_keys($wp_meta_boxes[$page]) as $a_context) {
+		foreach (array('high', 'core', 'default', 'low') as $a_priority) {
+			if ( ! isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]))
 				continue;
 
 			// If a core box was previously added or removed by a plugin, don't add.
-			if ( 'core' == $priority ) {
+			if ('core' == $priority) {
 				// If core box previously deleted, don't add
-				if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] )
+				if (false === $wp_meta_boxes[$page][$a_context][$a_priority][$id])
 					return;
 
 				/*
 				 * If box was added with default priority, give it core priority to
 				 * maintain sort order.
 				 */
-				if ( 'default' == $a_priority ) {
+				if ('default' == $a_priority) {
 					$wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id];
 					unset($wp_meta_boxes[$page][$a_context]['default'][$id]);
 				}
 				return;
 			}
 			// If no priority given and id already present, use existing priority.
-			if ( empty($priority) ) {
+			if (empty($priority)) {
 				$priority = $a_priority;
 			/*
 			 * Else, if we're adding to the sorted priority, we don't know the title
 			 * or callback. Grab them from the previously added context/priority.
 			 */
-			} elseif ( 'sorted' == $priority ) {
+			} elseif ('sorted' == $priority) {
 				$title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title'];
 				$callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback'];
 				$callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
 			}
 			// An id can be in only one priority and one context.
-			if ( $priority != $a_priority || $context != $a_context )
+			if ($priority != $a_priority || $context != $a_context)
 				unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
 		}
 	}
 
-	if ( empty($priority) )
+	if (empty($priority))
 		$priority = 'low';
 
-	if ( !isset($wp_meta_boxes[$page][$context][$priority]) )
+	if ( ! isset($wp_meta_boxes[$page][$context][$priority]))
 		$wp_meta_boxes[$page][$context][$priority] = array();
 
 	$wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $callback_args);
@@ -992,27 +992,27 @@ 
  * @param mixed            $object  gets passed to the box callback function as first parameter
  * @return int number of meta_boxes
  */
-function do_meta_boxes( $screen, $context, $object ) {
+function do_meta_boxes($screen, $context, $object) {
 	global $wp_meta_boxes;
 	static $already_sorted = false;
 
-	if ( empty( $screen ) )
+	if (empty($screen))
 		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	elseif (is_string($screen))
+		$screen = convert_to_screen($screen);
 
 	$page = $screen->id;
 
-	$hidden = get_hidden_meta_boxes( $screen );
+	$hidden = get_hidden_meta_boxes($screen);
 
 	printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));
 
 	// Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
-	if ( ! $already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
-		foreach ( $sorted as $box_context => $ids ) {
-			foreach ( explode( ',', $ids ) as $id ) {
-				if ( $id && 'dashboard_browser_nag' !== $id ) {
-					add_meta_box( $id, null, null, $screen, $box_context, 'sorted' );
+	if ( ! $already_sorted && $sorted = get_user_option("meta-box-order_$page")) {
+		foreach ($sorted as $box_context => $ids) {
+			foreach (explode(',', $ids) as $id) {
+				if ($id && 'dashboard_browser_nag' !== $id) {
+					add_meta_box($id, null, null, $screen, $box_context, 'sorted');
 				}
 			}
 		}
@@ -1022,31 +1022,31 @@ 
 
 	$i = 0;
 
-	if ( isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
-		foreach ( array( 'high', 'sorted', 'core', 'default', 'low' ) as $priority ) {
-			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ]) ) {
-				foreach ( (array) $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
+	if (isset($wp_meta_boxes[$page][$context])) {
+		foreach (array('high', 'sorted', 'core', 'default', 'low') as $priority) {
+			if (isset($wp_meta_boxes[$page][$context][$priority])) {
+				foreach ((array) $wp_meta_boxes[$page][$context][$priority] as $box) {
+					if (false == $box || ! $box['title'])
 						continue;
 					$i++;
 					$hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : '';
-					echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . $hidden_class . '" ' . '>' . "\n";
-					if ( 'dashboard_browser_nag' != $box['id'] ) {
-						$widget_title = $box[ 'title' ];
+					echo '<div id="'.$box['id'].'" class="postbox '.postbox_classes($box['id'], $page).$hidden_class.'" '.'>'."\n";
+					if ('dashboard_browser_nag' != $box['id']) {
+						$widget_title = $box['title'];
 
-						if ( is_array( $box[ 'args' ] ) && isset( $box[ 'args' ][ '__widget_basename' ] ) ) {
-							$widget_title = $box[ 'args' ][ '__widget_basename' ];
+						if (is_array($box['args']) && isset($box['args']['__widget_basename'])) {
+							$widget_title = $box['args']['__widget_basename'];
 							// Do not pass this parameter to the user callback function.
-							unset( $box[ 'args' ][ '__widget_basename' ] );
+							unset($box['args']['__widget_basename']);
 						}
 
 						echo '<button type="button" class="handlediv" aria-expanded="true">';
-						echo '<span class="screen-reader-text">' . sprintf( __( 'Toggle panel: %s' ), $widget_title ) . '</span>';
+						echo '<span class="screen-reader-text">'.sprintf(__('Toggle panel: %s'), $widget_title).'</span>';
 						echo '<span class="toggle-indicator" aria-hidden="true"></span>';
 						echo '</button>';
 					}
 					echo "<h2 class='hndle'><span>{$box['title']}</span></h2>\n";
-					echo '<div class="inside">' . "\n";
+					echo '<div class="inside">'."\n";
 					call_user_func($box['callback'], $object, $box);
 					echo "</div>\n";
 					echo "</div>\n";
@@ -1079,33 +1079,33 @@ 
  *                                        include 'normal' and 'side'. Menus meta boxes (accordion sections)
  *                                        all use the 'side' context.
  */
-function remove_meta_box( $id, $screen, $context ) {
+function remove_meta_box($id, $screen, $context) {
 	global $wp_meta_boxes;
 
-	if ( empty( $screen ) ) {
+	if (empty($screen)) {
 		$screen = get_current_screen();
-	} elseif ( is_string( $screen ) ) {
-		$screen = convert_to_screen( $screen );
-	} elseif ( is_array( $screen ) ) {
-		foreach ( $screen as $single_screen ) {
-			remove_meta_box( $id, $single_screen, $context );
+	} elseif (is_string($screen)) {
+		$screen = convert_to_screen($screen);
+	} elseif (is_array($screen)) {
+		foreach ($screen as $single_screen) {
+			remove_meta_box($id, $single_screen, $context);
 		}
 	}
 
-	if ( ! isset( $screen->id ) ) {
+	if ( ! isset($screen->id)) {
 		return;
 	}
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
+	if ( ! isset($wp_meta_boxes))
 		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
+	if ( ! isset($wp_meta_boxes[$page]))
 		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
+	if ( ! isset($wp_meta_boxes[$page][$context]))
 		$wp_meta_boxes[$page][$context] = array();
 
-	foreach ( array('high', 'core', 'default', 'low') as $priority )
+	foreach (array('high', 'core', 'default', 'low') as $priority)
 		$wp_meta_boxes[$page][$context][$priority][$id] = false;
 }
 
@@ -1125,19 +1125,19 @@ 
  * @param mixed         $object  gets passed to the section callback function as first parameter.
  * @return int number of meta boxes as accordion sections.
  */
-function do_accordion_sections( $screen, $context, $object ) {
+function do_accordion_sections($screen, $context, $object) {
 	global $wp_meta_boxes;
 
-	wp_enqueue_script( 'accordion' );
+	wp_enqueue_script('accordion');
 
-	if ( empty( $screen ) )
+	if (empty($screen))
 		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	elseif (is_string($screen))
+		$screen = convert_to_screen($screen);
 
 	$page = $screen->id;
 
-	$hidden = get_hidden_meta_boxes( $screen );
+	$hidden = get_hidden_meta_boxes($screen);
 	?>
 	<div id="side-sortables" class="accordion-container">
 		<ul class="outer-border">
@@ -1145,29 +1145,29 @@ 
 	$i = 0;
 	$first_open = false;
 
-	if ( isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
-		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
-			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
-				foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
+	if (isset($wp_meta_boxes[$page][$context])) {
+		foreach (array('high', 'core', 'default', 'low') as $priority) {
+			if (isset($wp_meta_boxes[$page][$context][$priority])) {
+				foreach ($wp_meta_boxes[$page][$context][$priority] as $box) {
+					if (false == $box || ! $box['title'])
 						continue;
 					$i++;
-					$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
+					$hidden_class = in_array($box['id'], $hidden) ? 'hide-if-js' : '';
 
 					$open_class = '';
-					if ( ! $first_open && empty( $hidden_class ) ) {
+					if ( ! $first_open && empty($hidden_class)) {
 						$first_open = true;
 						$open_class = 'open';
 					}
 					?>
-					<li class="control-section accordion-section <?php echo $hidden_class; ?> <?php echo $open_class; ?> <?php echo esc_attr( $box['id'] ); ?>" id="<?php echo esc_attr( $box['id'] ); ?>">
+					<li class="control-section accordion-section <?php echo $hidden_class; ?> <?php echo $open_class; ?> <?php echo esc_attr($box['id']); ?>" id="<?php echo esc_attr($box['id']); ?>">
 						<h3 class="accordion-section-title hndle" tabindex="0">
-							<?php echo esc_html( $box['title'] ); ?>
-							<span class="screen-reader-text"><?php _e( 'Press return or enter to open this section' ); ?></span>
+							<?php echo esc_html($box['title']); ?>
+							<span class="screen-reader-text"><?php _e('Press return or enter to open this section'); ?></span>
 						</h3>
-						<div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>">
+						<div class="accordion-section-content <?php postbox_classes($box['id'], $page); ?>">
 							<div class="inside">
-								<?php call_user_func( $box['callback'], $object, $box ); ?>
+								<?php call_user_func($box['callback'], $object, $box); ?>
 							</div><!-- .inside -->
 						</div><!-- .accordion-section-content -->
 					</li><!-- .accordion-section -->
@@ -1208,20 +1208,20 @@ 
 function add_settings_section($id, $title, $callback, $page) {
 	global $wp_settings_sections;
 
-	if ( 'misc' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0',
+	if ('misc' == $page) {
+		_deprecated_argument(__FUNCTION__, '3.0.0',
 			/* translators: %s: misc */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(__('The "%s" options group has been removed. Use another settings group.'),
 				'misc'
 			)
 		);
 		$page = 'general';
 	}
 
-	if ( 'privacy' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.5.0',
+	if ('privacy' == $page) {
+		_deprecated_argument(__FUNCTION__, '3.5.0',
 			/* translators: %s: privacy */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(__('The "%s" options group has been removed. Use another settings group.'),
 				'privacy'
 			)
 		);
@@ -1269,20 +1269,20 @@ 
 function add_settings_field($id, $title, $callback, $page, $section = 'default', $args = array()) {
 	global $wp_settings_fields;
 
-	if ( 'misc' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0',
+	if ('misc' == $page) {
+		_deprecated_argument(__FUNCTION__, '3.0.0',
 			/* translators: %s: misc */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(__('The "%s" options group has been removed. Use another settings group.'),
 				'misc'
 			)
 		);
 		$page = 'general';
 	}
 
-	if ( 'privacy' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.5.0',
+	if ('privacy' == $page) {
+		_deprecated_argument(__FUNCTION__, '3.5.0',
 			/* translators: %s: privacy */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(__('The "%s" options group has been removed. Use another settings group.'),
 				'privacy'
 			)
 		);
@@ -1305,23 +1305,23 @@ 
  *
  * @param string $page The slug name of the page whose settings sections you want to output
  */
-function do_settings_sections( $page ) {
+function do_settings_sections($page) {
 	global $wp_settings_sections, $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_sections[$page] ) )
+	if ( ! isset($wp_settings_sections[$page]))
 		return;
 
-	foreach ( (array) $wp_settings_sections[$page] as $section ) {
-		if ( $section['title'] )
+	foreach ((array) $wp_settings_sections[$page] as $section) {
+		if ($section['title'])
 			echo "<h2>{$section['title']}</h2>\n";
 
-		if ( $section['callback'] )
-			call_user_func( $section['callback'], $section );
+		if ($section['callback'])
+			call_user_func($section['callback'], $section);
 
-		if ( ! isset( $wp_settings_fields ) || !isset( $wp_settings_fields[$page] ) || !isset( $wp_settings_fields[$page][$section['id']] ) )
+		if ( ! isset($wp_settings_fields) || ! isset($wp_settings_fields[$page]) || ! isset($wp_settings_fields[$page][$section['id']]))
 			continue;
 		echo '<table class="form-table">';
-		do_settings_fields( $page, $section['id'] );
+		do_settings_fields($page, $section['id']);
 		echo '</table>';
 	}
 }
@@ -1343,22 +1343,22 @@ 
 function do_settings_fields($page, $section) {
 	global $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_fields[$page][$section] ) )
+	if ( ! isset($wp_settings_fields[$page][$section]))
 		return;
 
-	foreach ( (array) $wp_settings_fields[$page][$section] as $field ) {
+	foreach ((array) $wp_settings_fields[$page][$section] as $field) {
 		$class = '';
 
-		if ( ! empty( $field['args']['class'] ) ) {
-			$class = ' class="' . esc_attr( $field['args']['class'] ) . '"';
+		if ( ! empty($field['args']['class'])) {
+			$class = ' class="'.esc_attr($field['args']['class']).'"';
 		}
 
 		echo "<tr{$class}>";
 
-		if ( ! empty( $field['args']['label_for'] ) ) {
-			echo '<th scope="row"><label for="' . esc_attr( $field['args']['label_for'] ) . '">' . $field['title'] . '</label></th>';
+		if ( ! empty($field['args']['label_for'])) {
+			echo '<th scope="row"><label for="'.esc_attr($field['args']['label_for']).'">'.$field['title'].'</label></th>';
 		} else {
-			echo '<th scope="row">' . $field['title'] . '</th>';
+			echo '<th scope="row">'.$field['title'].'</th>';
 		}
 
 		echo '<td>';
@@ -1392,7 +1392,7 @@ 
  * @param string $type    Optional. Message type, controls HTML class. Accepts 'error' or 'updated'.
  *                        Default 'error'.
  */
-function add_settings_error( $setting, $code, $message, $type = 'error' ) {
+function add_settings_error($setting, $code, $message, $type = 'error') {
 	global $wp_settings_errors;
 
 	$wp_settings_errors[] = array(
@@ -1426,7 +1426,7 @@ 
  * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
  * @return array Array of settings errors
  */
-function get_settings_errors( $setting = '', $sanitize = false ) {
+function get_settings_errors($setting = '', $sanitize = false) {
 	global $wp_settings_errors;
 
 	/*
@@ -1434,24 +1434,24 @@ 
 	 * This allows the $sanitize_callback from register_setting() to run, adding
 	 * any settings errors you want to show by default.
 	 */
-	if ( $sanitize )
-		sanitize_option( $setting, get_option( $setting ) );
+	if ($sanitize)
+		sanitize_option($setting, get_option($setting));
 
 	// If settings were passed back from options.php then use them.
-	if ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] && get_transient( 'settings_errors' ) ) {
-		$wp_settings_errors = array_merge( (array) $wp_settings_errors, get_transient( 'settings_errors' ) );
-		delete_transient( 'settings_errors' );
+	if (isset($_GET['settings-updated']) && $_GET['settings-updated'] && get_transient('settings_errors')) {
+		$wp_settings_errors = array_merge((array) $wp_settings_errors, get_transient('settings_errors'));
+		delete_transient('settings_errors');
 	}
 
 	// Check global in case errors have been added on this pageload.
-	if ( ! count( $wp_settings_errors ) )
+	if ( ! count($wp_settings_errors))
 		return array();
 
 	// Filter the results to those of a specific setting if one was set.
-	if ( $setting ) {
+	if ($setting) {
 		$setting_errors = array();
-		foreach ( (array) $wp_settings_errors as $key => $details ) {
-			if ( $setting == $details['setting'] )
+		foreach ((array) $wp_settings_errors as $key => $details) {
+			if ($setting == $details['setting'])
 				$setting_errors[] = $wp_settings_errors[$key];
 		}
 		return $setting_errors;
@@ -1487,20 +1487,20 @@ 
  * @param bool   $hide_on_update If set to true errors will not be shown if the settings page has
  *                               already been submitted.
  */
-function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) {
+function settings_errors($setting = '', $sanitize = false, $hide_on_update = false) {
 
-	if ( $hide_on_update && ! empty( $_GET['settings-updated'] ) )
+	if ($hide_on_update && ! empty($_GET['settings-updated']))
 		return;
 
-	$settings_errors = get_settings_errors( $setting, $sanitize );
+	$settings_errors = get_settings_errors($setting, $sanitize);
 
-	if ( empty( $settings_errors ) )
+	if (empty($settings_errors))
 		return;
 
 	$output = '';
-	foreach ( $settings_errors as $key => $details ) {
-		$css_id = 'setting-error-' . $details['code'];
-		$css_class = $details['type'] . ' settings-error notice is-dismissible';
+	foreach ($settings_errors as $key => $details) {
+		$css_id = 'setting-error-'.$details['code'];
+		$css_class = $details['type'].' settings-error notice is-dismissible';
 		$output .= "<div id='$css_id' class='$css_class'> \n";
 		$output .= "<p><strong>{$details['message']}</strong></p>";
 		$output .= "</div> \n";
@@ -1519,26 +1519,26 @@ 
 ?>
 	<div id="find-posts" class="find-box" style="display: none;">
 		<div id="find-posts-head" class="find-box-head">
-			<?php _e( 'Attach to existing content' ); ?>
-			<button type="button" id="find-posts-close"><span class="screen-reader-text"><?php _e( 'Close media attachment panel' ); ?></span></button>
+			<?php _e('Attach to existing content'); ?>
+			<button type="button" id="find-posts-close"><span class="screen-reader-text"><?php _e('Close media attachment panel'); ?></span></button>
 		</div>
 		<div class="find-box-inside">
 			<div class="find-box-search">
-				<?php if ( $found_action ) { ?>
+				<?php if ($found_action) { ?>
 					<input type="hidden" name="found_action" value="<?php echo esc_attr($found_action); ?>" />
 				<?php } ?>
 				<input type="hidden" name="affected" id="affected" value="" />
-				<?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?>
-				<label class="screen-reader-text" for="find-posts-input"><?php _e( 'Search' ); ?></label>
+				<?php wp_nonce_field('find-posts', '_ajax_nonce', false); ?>
+				<label class="screen-reader-text" for="find-posts-input"><?php _e('Search'); ?></label>
 				<input type="text" id="find-posts-input" name="ps" value="" />
 				<span class="spinner"></span>
-				<input type="button" id="find-posts-search" value="<?php esc_attr_e( 'Search' ); ?>" class="button" />
+				<input type="button" id="find-posts-search" value="<?php esc_attr_e('Search'); ?>" class="button" />
 				<div class="clear"></div>
 			</div>
 			<div id="find-posts-response"></div>
 		</div>
 		<div class="find-box-buttons">
-			<?php submit_button( __( 'Select' ), 'primary alignright', 'find-posts-submit', false ); ?>
+			<?php submit_button(__('Select'), 'primary alignright', 'find-posts-submit', false); ?>
 			<div class="clear"></div>
 		</div>
 	</div>
@@ -1554,8 +1554,8 @@ 
  */
 function the_post_password() {
 	$post = get_post();
-	if ( isset( $post->post_password ) )
-		echo esc_attr( $post->post_password );
+	if (isset($post->post_password))
+		echo esc_attr($post->post_password);
 }
 
 /**
@@ -1569,11 +1569,11 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The post title if set.
  */
-function _draft_or_post_title( $post = 0 ) {
-	$title = get_the_title( $post );
-	if ( empty( $title ) )
-		$title = __( '(no title)' );
-	return esc_html( $title );
+function _draft_or_post_title($post = 0) {
+	$title = get_the_title($post);
+	if (empty($title))
+		$title = __('(no title)');
+	return esc_html($title);
 }
 
 /**
@@ -1585,7 +1585,7 @@ 
  * @since 2.7.0
  */
 function _admin_search_query() {
-	echo isset($_REQUEST['s']) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : '';
+	echo isset($_REQUEST['s']) ? esc_attr(wp_unslash($_REQUEST['s'])) : '';
 }
 
 /**
@@ -1600,69 +1600,69 @@ 
  * @param string $title      Optional. Title of the Iframe page. Default empty.
  * @param bool   $deprecated Not used.
  */
-function iframe_header( $title = '', $deprecated = false ) {
-	show_admin_bar( false );
+function iframe_header($title = '', $deprecated = false) {
+	show_admin_bar(false);
 	global $hook_suffix, $admin_body_class, $wp_locale;
 	$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 
 	$current_screen = get_current_screen();
 
-	@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
+	@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
 	_wp_admin_html_begin();
 ?>
 <title><?php bloginfo('name') ?> &rsaquo; <?php echo $title ?> &#8212; <?php _e('WordPress'); ?></title>
 <?php
-wp_enqueue_style( 'colors' );
+wp_enqueue_style('colors');
 ?>
 <script type="text/javascript">
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();}
-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
+var ajaxurl = '<?php echo admin_url('admin-ajax.php', 'relative'); ?>',
 	pagenow = '<?php echo $current_screen->id; ?>',
 	typenow = '<?php echo $current_screen->post_type; ?>',
 	adminpage = '<?php echo $admin_body_class; ?>',
-	thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
-	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+	thousandsSeparator = '<?php echo addslashes($wp_locale->number_format['thousands_sep']); ?>',
+	decimalPoint = '<?php echo addslashes($wp_locale->number_format['decimal_point']); ?>',
 	isRtl = <?php echo (int) is_rtl(); ?>;
 </script>
 <?php
 /** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_enqueue_scripts', $hook_suffix );
+do_action('admin_enqueue_scripts', $hook_suffix);
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( "admin_print_styles-$hook_suffix" );
+do_action("admin_print_styles-$hook_suffix");
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_print_styles' );
+do_action('admin_print_styles');
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( "admin_print_scripts-$hook_suffix" );
+do_action("admin_print_scripts-$hook_suffix");
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_print_scripts' );
+do_action('admin_print_scripts');
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( "admin_head-$hook_suffix" );
+do_action("admin_head-$hook_suffix");
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_head' );
+do_action('admin_head');
 
-$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
+$admin_body_class .= ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_user_locale())));
 
-if ( is_rtl() )
+if (is_rtl())
 	$admin_body_class .= ' rtl';
 
 ?>
 </head>
 <?php
 /** This filter is documented in wp-admin/admin-header.php */
-$admin_body_classes = apply_filters( 'admin_body_class', '' );
+$admin_body_classes = apply_filters('admin_body_class', '');
 ?>
 <body<?php
 /**
  * @global string $body_id
  */
-if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+if (isset($GLOBALS['body_id'])) echo ' id="'.$GLOBALS['body_id'].'"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes.' '.$admin_body_class; ?>">
 <script type="text/javascript">
 (function(){
 var c = document.body.className;
@@ -1693,13 +1693,13 @@ 
 	<div class="hidden">
 <?php
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_footer', $hook_suffix );
+	do_action('admin_footer', $hook_suffix);
 
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( "admin_print_footer_scripts-$hook_suffix" );
+	do_action("admin_print_footer_scripts-$hook_suffix");
 
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_print_footer_scripts' );
+	do_action('admin_print_footer_scripts');
 ?>
 	</div>
 <script type="text/javascript">if(typeof wpOnload=="function")wpOnload();</script>
@@ -1714,33 +1714,33 @@ 
  */
 function _post_states($post) {
 	$post_states = array();
-	if ( isset( $_REQUEST['post_status'] ) )
+	if (isset($_REQUEST['post_status']))
 		$post_status = $_REQUEST['post_status'];
 	else
 		$post_status = '';
 
-	if ( !empty($post->post_password) )
+	if ( ! empty($post->post_password))
 		$post_states['protected'] = __('Password protected');
-	if ( 'private' == $post->post_status && 'private' != $post_status )
+	if ('private' == $post->post_status && 'private' != $post_status)
 		$post_states['private'] = __('Private');
-	if ( 'draft' == $post->post_status && 'draft' != $post_status )
+	if ('draft' == $post->post_status && 'draft' != $post_status)
 		$post_states['draft'] = __('Draft');
-	if ( 'pending' == $post->post_status && 'pending' != $post_status )
+	if ('pending' == $post->post_status && 'pending' != $post_status)
 		$post_states['pending'] = _x('Pending', 'post status');
-	if ( is_sticky($post->ID) )
+	if (is_sticky($post->ID))
 		$post_states['sticky'] = __('Sticky');
 
-	if ( 'future' === $post->post_status ) {
-		$post_states['scheduled'] = __( 'Scheduled' );
+	if ('future' === $post->post_status) {
+		$post_states['scheduled'] = __('Scheduled');
 	}
 
-	if ( 'page' === get_option( 'show_on_front' ) ) {
-		if ( intval( get_option( 'page_on_front' ) ) === $post->ID ) {
-			$post_states['page_on_front'] = __( 'Front Page' );
+	if ('page' === get_option('show_on_front')) {
+		if (intval(get_option('page_on_front')) === $post->ID) {
+			$post_states['page_on_front'] = __('Front Page');
 		}
 
-		if ( intval( get_option( 'page_for_posts' ) ) === $post->ID ) {
-			$post_states['page_for_posts'] = __( 'Posts Page' );
+		if (intval(get_option('page_for_posts')) === $post->ID) {
+			$post_states['page_for_posts'] = __('Posts Page');
 		}
 	}
 
@@ -1753,15 +1753,15 @@ 
 	 * @param array   $post_states An array of post display states.
 	 * @param WP_Post $post        The current post object.
 	 */
-	$post_states = apply_filters( 'display_post_states', $post_states, $post );
+	$post_states = apply_filters('display_post_states', $post_states, $post);
 
-	if ( ! empty($post_states) ) {
+	if ( ! empty($post_states)) {
 		$state_count = count($post_states);
 		$i = 0;
 		echo ' &mdash; ';
-		foreach ( $post_states as $state ) {
+		foreach ($post_states as $state) {
 			++$i;
-			( $i == $state_count ) ? $sep = '' : $sep = ', ';
+			($i == $state_count) ? $sep = '' : $sep = ', ';
 			echo "<span class='post-state'>$state$sep</span>";
 		}
 	}
@@ -1772,53 +1772,53 @@ 
  *
  * @param WP_Post $post
  */
-function _media_states( $post ) {
+function _media_states($post) {
 	$media_states = array();
 	$stylesheet = get_option('stylesheet');
 
-	if ( current_theme_supports( 'custom-header') ) {
-		$meta_header = get_post_meta($post->ID, '_wp_attachment_is_custom_header', true );
+	if (current_theme_supports('custom-header')) {
+		$meta_header = get_post_meta($post->ID, '_wp_attachment_is_custom_header', true);
 
-		if ( is_random_header_image() ) {
-			$header_images = wp_list_pluck( get_uploaded_header_images(), 'attachment_id' );
+		if (is_random_header_image()) {
+			$header_images = wp_list_pluck(get_uploaded_header_images(), 'attachment_id');
 
-			if ( $meta_header == $stylesheet && in_array( $post->ID, $header_images ) ) {
-				$media_states[] = __( 'Header Image' );
+			if ($meta_header == $stylesheet && in_array($post->ID, $header_images)) {
+				$media_states[] = __('Header Image');
 			}
 		} else {
 			$header_image = get_header_image();
 
 			// Display "Header Image" if the image was ever used as a header image
-			if ( ! empty( $meta_header ) && $meta_header == $stylesheet && $header_image !== wp_get_attachment_url( $post->ID ) ) {
-				$media_states[] = __( 'Header Image' );
+			if ( ! empty($meta_header) && $meta_header == $stylesheet && $header_image !== wp_get_attachment_url($post->ID)) {
+				$media_states[] = __('Header Image');
 			}
 
 			// Display "Current Header Image" if the image is currently the header image
-			if ( $header_image && $header_image == wp_get_attachment_url( $post->ID ) ) {
-				$media_states[] = __( 'Current Header Image' );
+			if ($header_image && $header_image == wp_get_attachment_url($post->ID)) {
+				$media_states[] = __('Current Header Image');
 			}
 		}
 	}
 
-	if ( current_theme_supports( 'custom-background') ) {
-		$meta_background = get_post_meta($post->ID, '_wp_attachment_is_custom_background', true );
+	if (current_theme_supports('custom-background')) {
+		$meta_background = get_post_meta($post->ID, '_wp_attachment_is_custom_background', true);
 
-		if ( ! empty( $meta_background ) && $meta_background == $stylesheet ) {
-			$media_states[] = __( 'Background Image' );
+		if ( ! empty($meta_background) && $meta_background == $stylesheet) {
+			$media_states[] = __('Background Image');
 
 			$background_image = get_background_image();
-			if ( $background_image && $background_image == wp_get_attachment_url( $post->ID ) ) {
-				$media_states[] = __( 'Current Background Image' );
+			if ($background_image && $background_image == wp_get_attachment_url($post->ID)) {
+				$media_states[] = __('Current Background Image');
 			}
 		}
 	}
 
-	if ( $post->ID == get_option( 'site_icon' ) ) {
-		$media_states[] = __( 'Site Icon' );
+	if ($post->ID == get_option('site_icon')) {
+		$media_states[] = __('Site Icon');
 	}
 
-	if ( $post->ID == get_theme_mod( 'custom_logo' ) ) {
-		$media_states[] = __( 'Logo' );
+	if ($post->ID == get_theme_mod('custom_logo')) {
+		$media_states[] = __('Logo');
 	}
 
 	/**
@@ -1831,15 +1831,15 @@ 
 	 *                              'Background Image', 'Site Icon', 'Logo'.
 	 * @param WP_Post $post         The current attachment object.
 	 */
-	$media_states = apply_filters( 'display_media_states', $media_states, $post );
+	$media_states = apply_filters('display_media_states', $media_states, $post);
 
-	if ( ! empty( $media_states ) ) {
-		$state_count = count( $media_states );
+	if ( ! empty($media_states)) {
+		$state_count = count($media_states);
 		$i = 0;
 		echo ' &mdash; ';
-		foreach ( $media_states as $state ) {
+		foreach ($media_states as $state) {
 			++$i;
-			( $i == $state_count ) ? $sep = '' : $sep = ', ';
+			($i == $state_count) ? $sep = '' : $sep = ', ';
 			echo "<span class='post-state'>$state$sep</span>";
 		}
 	}
@@ -1858,7 +1858,7 @@ 
 function compression_test() {
 ?>
 	<script type="text/javascript">
-	var compressionNonce = <?php echo wp_json_encode( wp_create_nonce( 'update_can_compress_scripts' ) ); ?>;
+	var compressionNonce = <?php echo wp_json_encode(wp_create_nonce('update_can_compress_scripts')); ?>;
 	var testCompression = {
 		get : function(test) {
 			var x;
@@ -1931,8 +1931,8 @@ 
  *                                       as a string such as 'tabindex="1"', though the array format is
  *                                       preferred. Default null.
  */
-function submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null ) {
-	echo get_submit_button( $text, $type, $name, $wrap, $other_attributes );
+function submit_button($text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null) {
+	echo get_submit_button($text, $type, $name, $wrap, $other_attributes);
 }
 
 /**
@@ -1956,47 +1956,47 @@ 
  *                                       Default empty.
  * @return string Submit button HTML.
  */
-function get_submit_button( $text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '' ) {
-	if ( ! is_array( $type ) )
-		$type = explode( ' ', $type );
-
-	$button_shorthand = array( 'primary', 'small', 'large' );
-	$classes = array( 'button' );
-	foreach ( $type as $t ) {
-		if ( 'secondary' === $t || 'button-secondary' === $t )
+function get_submit_button($text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '') {
+	if ( ! is_array($type))
+		$type = explode(' ', $type);
+
+	$button_shorthand = array('primary', 'small', 'large');
+	$classes = array('button');
+	foreach ($type as $t) {
+		if ('secondary' === $t || 'button-secondary' === $t)
 			continue;
-		$classes[] = in_array( $t, $button_shorthand ) ? 'button-' . $t : $t;
+		$classes[] = in_array($t, $button_shorthand) ? 'button-'.$t : $t;
 	}
 	// Remove empty items, remove duplicate items, and finally build a string.
-	$class = implode( ' ', array_unique( array_filter( $classes ) ) );
+	$class = implode(' ', array_unique(array_filter($classes)));
 
-	$text = $text ? $text : __( 'Save Changes' );
+	$text = $text ? $text : __('Save Changes');
 
 	// Default the id attribute to $name unless an id was specifically provided in $other_attributes
 	$id = $name;
-	if ( is_array( $other_attributes ) && isset( $other_attributes['id'] ) ) {
+	if (is_array($other_attributes) && isset($other_attributes['id'])) {
 		$id = $other_attributes['id'];
-		unset( $other_attributes['id'] );
+		unset($other_attributes['id']);
 	}
 
 	$attributes = '';
-	if ( is_array( $other_attributes ) ) {
-		foreach ( $other_attributes as $attribute => $value ) {
-			$attributes .= $attribute . '="' . esc_attr( $value ) . '" '; // Trailing space is important
+	if (is_array($other_attributes)) {
+		foreach ($other_attributes as $attribute => $value) {
+			$attributes .= $attribute.'="'.esc_attr($value).'" '; // Trailing space is important
 		}
-	} elseif ( ! empty( $other_attributes ) ) { // Attributes provided as a string
+	} elseif ( ! empty($other_attributes)) { // Attributes provided as a string
 		$attributes = $other_attributes;
 	}
 
 	// Don't output empty name and id attributes.
-	$name_attr = $name ? ' name="' . esc_attr( $name ) . '"' : '';
-	$id_attr = $id ? ' id="' . esc_attr( $id ) . '"' : '';
+	$name_attr = $name ? ' name="'.esc_attr($name).'"' : '';
+	$id_attr = $id ? ' id="'.esc_attr($id).'"' : '';
 
-	$button = '<input type="submit"' . $name_attr . $id_attr . ' class="' . esc_attr( $class );
-	$button	.= '" value="' . esc_attr( $text ) . '" ' . $attributes . ' />';
+	$button = '<input type="submit"'.$name_attr.$id_attr.' class="'.esc_attr($class);
+	$button	.= '" value="'.esc_attr($text).'" '.$attributes.' />';
 
-	if ( $wrap ) {
-		$button = '<p class="submit">' . $button . '</p>';
+	if ($wrap) {
+		$button = '<p class="submit">'.$button.'</p>';
 	}
 
 	return $button;
@@ -2009,9 +2009,9 @@ 
 function _wp_admin_html_begin() {
 	global $is_IE;
 
-	$admin_html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : '';
+	$admin_html_class = (is_admin_bar_showing()) ? 'wp-toolbar' : '';
 
-	if ( $is_IE )
+	if ($is_IE)
 		@header('X-UA-Compatible: IE=edge');
 
 ?>
@@ -2023,13 +2023,13 @@ 
 	 *
 	 * @since 2.2.0
 	 */
-	do_action( 'admin_xml_ns' );
+	do_action('admin_xml_ns');
 ?> <?php language_attributes(); ?>>
 <![endif]-->
 <!--[if !(IE 8) ]><!-->
 <html xmlns="http://www.w3.org/1999/xhtml" class="<?php echo $admin_html_class; ?>" <?php
 	/** This action is documented in wp-admin/includes/template.php */
-	do_action( 'admin_xml_ns' );
+	do_action('admin_xml_ns');
 ?> <?php language_attributes(); ?>>
 <!--<![endif]-->
 <head>
@@ -2045,13 +2045,13 @@ 
  * @param string $hook_name The hook name (also known as the hook suffix) used to determine the screen.
  * @return WP_Screen Screen object.
  */
-function convert_to_screen( $hook_name ) {
-	if ( ! class_exists( 'WP_Screen' ) ) {
-		_doing_it_wrong( 'convert_to_screen(), add_meta_box()', __( "Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead." ), '3.3.0' );
-		return (object) array( 'id' => '_invalid', 'base' => '_are_belong_to_us' );
+function convert_to_screen($hook_name) {
+	if ( ! class_exists('WP_Screen')) {
+		_doing_it_wrong('convert_to_screen(), add_meta_box()', __("Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead."), '3.3.0');
+		return (object) array('id' => '_invalid', 'base' => '_are_belong_to_us');
 	}
 
-	return WP_Screen::get( $hook_name );
+	return WP_Screen::get($hook_name);
 }
 
 /**
@@ -2064,11 +2064,11 @@ 
 	?>
 	<div id="local-storage-notice" class="hidden notice is-dismissible">
 	<p class="local-restore">
-		<?php _e( 'The backup of this post in your browser is different from the version below.' ); ?>
+		<?php _e('The backup of this post in your browser is different from the version below.'); ?>
 		<button type="button" class="button restore-backup"><?php _e('Restore the backup'); ?></button>
 	</p>
 	<p class="help">
-		<?php _e( 'This will replace the current editor content with the last backup version. You can use undo and redo in the editor to get the old content back or to return to the restored version.' ); ?>
+		<?php _e('This will replace the current editor content with the last backup version. You can use undo and redo in the editor to get the old content back or to return to the restored version.'); ?>
 	</p>
 	</div>
 	<?php
@@ -2096,45 +2096,45 @@ 
  *                          of echoing it. Default true.
  * }
  */
-function wp_star_rating( $args = array() ) {
+function wp_star_rating($args = array()) {
 	$defaults = array(
 		'rating' => 0,
 		'type'   => 'rating',
 		'number' => 0,
 		'echo'   => true,
 	);
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	// Non-english decimal places when the $rating is coming from a string
-	$rating = str_replace( ',', '.', $r['rating'] );
+	$rating = str_replace(',', '.', $r['rating']);
 
 	// Convert Percentage to star rating, 0..5 in .5 increments
-	if ( 'percent' == $r['type'] ) {
-		$rating = round( $rating / 10, 0 ) / 2;
+	if ('percent' == $r['type']) {
+		$rating = round($rating / 10, 0) / 2;
 	}
 
 	// Calculate the number of each type of star needed
-	$full_stars = floor( $rating );
-	$half_stars = ceil( $rating - $full_stars );
+	$full_stars = floor($rating);
+	$half_stars = ceil($rating - $full_stars);
 	$empty_stars = 5 - $full_stars - $half_stars;
 
-	if ( $r['number'] ) {
+	if ($r['number']) {
 		/* translators: 1: The rating, 2: The number of ratings */
-		$format = _n( '%1$s rating based on %2$s rating', '%1$s rating based on %2$s ratings', $r['number'] );
-		$title = sprintf( $format, number_format_i18n( $rating, 1 ), number_format_i18n( $r['number'] ) );
+		$format = _n('%1$s rating based on %2$s rating', '%1$s rating based on %2$s ratings', $r['number']);
+		$title = sprintf($format, number_format_i18n($rating, 1), number_format_i18n($r['number']));
 	} else {
 		/* translators: 1: The rating */
-		$title = sprintf( __( '%s rating' ), number_format_i18n( $rating, 1 ) );
+		$title = sprintf(__('%s rating'), number_format_i18n($rating, 1));
 	}
 
 	$output = '<div class="star-rating">';
-	$output .= '<span class="screen-reader-text">' . $title . '</span>';
-	$output .= str_repeat( '<div class="star star-full" aria-hidden="true"></div>', $full_stars );
-	$output .= str_repeat( '<div class="star star-half" aria-hidden="true"></div>', $half_stars );
-	$output .= str_repeat( '<div class="star star-empty" aria-hidden="true"></div>', $empty_stars );
+	$output .= '<span class="screen-reader-text">'.$title.'</span>';
+	$output .= str_repeat('<div class="star star-full" aria-hidden="true"></div>', $full_stars);
+	$output .= str_repeat('<div class="star star-half" aria-hidden="true"></div>', $half_stars);
+	$output .= str_repeat('<div class="star star-empty" aria-hidden="true"></div>', $empty_stars);
 	$output .= '</div>';
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	}
 
@@ -2148,5 +2148,5 @@ 
  * @since 4.2.0
  */
 function _wp_posts_page_notice() {
-	echo '<div class="notice notice-warning inline"><p>' . __( 'You are currently editing the page that shows your latest posts.' ) . '</p></div>';
+	echo '<div class="notice notice-warning inline"><p>'.__('You are currently editing the page that shows your latest posts.').'</p></div>';
 }

Braces +189 added lines, -122 removed lines

@@ -191,10 +191,11 @@ 
 function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $echo = true ) {
 	$post = get_post();
 
-	if ( $post && $post->ID )
-		$checked_terms = wp_get_object_terms($post->ID, $taxonomy, array('fields'=>'ids'));
-	else
-		$checked_terms = array();
+	if ( $post && $post->ID ) {
+			$checked_terms = wp_get_object_terms($post->ID, $taxonomy, array('fields'=>'ids'));
+	} else {
+			$checked_terms = array();
+	}
 
 	$terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
 
@@ -203,8 +204,10 @@ 
 	$popular_ids = array();
 	foreach ( (array) $terms as $term ) {
 		$popular_ids[] = $term->term_id;
-		if ( !$echo ) // Hack for Ajax use.
+		if ( !$echo ) {
+			// Hack for Ajax use.
 			continue;
+		}
 		$id = "popular-$taxonomy-$term->term_id";
 		$checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : '';
 		?>
@@ -248,8 +251,9 @@ 
 
 	$categories = get_terms( 'link_category', array( 'orderby' => 'name', 'hide_empty' => 0 ) );
 
-	if ( empty( $categories ) )
-		return;
+	if ( empty( $categories ) ) {
+			return;
+	}
 
 	foreach ( $categories as $category ) {
 		$cat_id = $category->term_id;
@@ -270,8 +274,9 @@ 
  */
 function get_inline_data($post) {
 	$post_type_object = get_post_type_object($post->post_type);
-	if ( ! current_user_can( 'edit_post', $post->ID ) )
-		return;
+	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
+			return;
+	}
 
 	$title = esc_textarea( trim( $post->post_title ) );
 
@@ -331,11 +336,13 @@ 
 		}
 	}
 
-	if ( !$post_type_object->hierarchical )
-		echo '<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
+	if ( !$post_type_object->hierarchical ) {
+			echo '<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
+	}
 
-	if ( post_type_supports( $post->post_type, 'post-formats' ) )
-		echo '<div class="post_format">' . esc_html( get_post_format( $post->ID ) ) . '</div>';
+	if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
+			echo '<div class="post_format">' . esc_html( get_post_format( $post->ID ) ) . '</div>';
+	}
 
 	echo '</div>';
 }
@@ -388,9 +395,12 @@ 
 <form method="get">
 <?php if ( $table_row ) : ?>
 <table style="display:none;"><tbody id="com-reply"><tr id="replyrow" class="inline-edit-row" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
-<?php else : ?>
+<?php else {
+	: ?>
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
-<?php endif; ?>
+<?php endif;
+}
+?>
 	<fieldset class="comment-reply">
 	<legend>
 		<span class="hidden" id="editlegend"><?php _e( 'Edit Comment' ); ?></span>
@@ -442,15 +452,19 @@ 
 	<input type="hidden" name="mode" id="mode" value="<?php echo esc_attr($mode); ?>" />
 	<?php
 		wp_nonce_field( 'replyto-comment', '_ajax_nonce-replyto-comment', false );
-		if ( current_user_can( 'unfiltered_html' ) )
-			wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
+		if ( current_user_can( 'unfiltered_html' ) ) {
+					wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
+		}
 	?>
 	</fieldset>
 <?php if ( $table_row ) : ?>
 </td></tr></tbody></table>
-<?php else : ?>
+<?php else {
+	: ?>
 </div></div>
-<?php endif; ?>
+<?php endif;
+}
+?>
 </form>
 <?php
 }
@@ -506,9 +520,10 @@ 
 	</thead>
 	<tbody id='the-list' data-wp-lists='list:meta'>
 <?php
-	foreach ( $meta as $entry )
-		echo _list_meta_row( $entry, $count );
-?>
+	foreach ( $meta as $entry ) {
+			echo _list_meta_row( $entry, $count );
+	}
+	?>
 	</tbody>
 </table>
 <?php
@@ -528,11 +543,13 @@ 
 function _list_meta_row( $entry, &$count ) {
 	static $update_nonce = '';
 
-	if ( is_protected_meta( $entry['meta_key'], 'post' ) )
-		return '';
+	if ( is_protected_meta( $entry['meta_key'], 'post' ) ) {
+			return '';
+	}
 
-	if ( ! $update_nonce )
-		$update_nonce = wp_create_nonce( 'add-meta' );
+	if ( ! $update_nonce ) {
+			$update_nonce = wp_create_nonce( 'add-meta' );
+	}
 
 	$r = '';
 	++ $count;
@@ -639,8 +656,9 @@ 
 <?php
 
 	foreach ( $keys as $key ) {
-		if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) )
-			continue;
+		if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) ) {
+					continue;
+		}
 		echo "\n<option value='" . esc_attr($key) . "'>" . esc_html($key) . "</option>";
 	}
 ?>
@@ -686,12 +704,14 @@ 
 	global $wp_locale;
 	$post = get_post();
 
-	if ( $for_post )
-		$edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
+	if ( $for_post ) {
+			$edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
+	}
 
 	$tab_index_attribute = '';
-	if ( (int) $tab_index > 0 )
-		$tab_index_attribute = " tabindex=\"$tab_index\"";
+	if ( (int) $tab_index > 0 ) {
+			$tab_index_attribute = " tabindex=\"$tab_index\"";
+	}
 
 	// todo: Remove this?
 	// echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';
@@ -732,7 +752,9 @@ 
 
 	echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
 
-	if ( $multi ) return;
+	if ( $multi ) {
+		return;
+	}
 
 	echo "\n\n";
 	$map = array(
@@ -799,8 +821,9 @@ 
 	if ( $items ) {
 		foreach ( $items as $item ) {
 			// A page cannot be its own parent.
-			if ( $post && $post->ID && $item->ID == $post->ID )
-				continue;
+			if ( $post && $post->ID && $item->ID == $post->ID ) {
+							continue;
+			}
 
 			$pad = str_repeat( '&nbsp;', $level * 3 );
 			$selected = selected( $default, $item->ID, false );
@@ -862,9 +885,12 @@ 
 	if ( ! empty( $upload_dir['error'] ) ) :
 		?><div class="error"><p><?php _e('Before you can upload your import file, you will need to fix the following error:'); ?></p>
 		<p><strong><?php echo $upload_dir['error']; ?></strong></p></div><?php
-	else :
+	else {
+		:
 ?>
-<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) ); ?>">
+<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) );
+	}
+	?>">
 <p>
 <label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?>)
 <input type="file" id="upload" name="import" size="25" />
@@ -924,23 +950,28 @@ 
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
-		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
-		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
-		$wp_meta_boxes[$page][$context] = array();
+	if ( !isset($wp_meta_boxes) ) {
+			$wp_meta_boxes = array();
+	}
+	if ( !isset($wp_meta_boxes[$page]) ) {
+			$wp_meta_boxes[$page] = array();
+	}
+	if ( !isset($wp_meta_boxes[$page][$context]) ) {
+			$wp_meta_boxes[$page][$context] = array();
+	}
 
 	foreach ( array_keys($wp_meta_boxes[$page]) as $a_context ) {
 		foreach ( array('high', 'core', 'default', 'low') as $a_priority ) {
-			if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) )
-				continue;
+			if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) ) {
+							continue;
+			}
 
 			// If a core box was previously added or removed by a plugin, don't add.
 			if ( 'core' == $priority ) {
 				// If core box previously deleted, don't add
-				if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] )
-					return;
+				if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] ) {
+									return;
+				}
 
 				/*
 				 * If box was added with default priority, give it core priority to
@@ -965,16 +996,19 @@ 
 				$callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
 			}
 			// An id can be in only one priority and one context.
-			if ( $priority != $a_priority || $context != $a_context )
-				unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
+			if ( $priority != $a_priority || $context != $a_context ) {
+							unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
+			}
 		}
 	}
 
-	if ( empty($priority) )
-		$priority = 'low';
+	if ( empty($priority) ) {
+			$priority = 'low';
+	}
 
-	if ( !isset($wp_meta_boxes[$page][$context][$priority]) )
-		$wp_meta_boxes[$page][$context][$priority] = array();
+	if ( !isset($wp_meta_boxes[$page][$context][$priority]) ) {
+			$wp_meta_boxes[$page][$context][$priority] = array();
+	}
 
 	$wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $callback_args);
 }
@@ -996,10 +1030,11 @@ 
 	global $wp_meta_boxes;
 	static $already_sorted = false;
 
-	if ( empty( $screen ) )
-		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( empty( $screen ) ) {
+			$screen = get_current_screen();
+	} elseif ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	$page = $screen->id;
 
@@ -1026,8 +1061,9 @@ 
 		foreach ( array( 'high', 'sorted', 'core', 'default', 'low' ) as $priority ) {
 			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ]) ) {
 				foreach ( (array) $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
-						continue;
+					if ( false == $box || ! $box['title'] ) {
+											continue;
+					}
 					$i++;
 					$hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : '';
 					echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . $hidden_class . '" ' . '>' . "\n";
@@ -1098,16 +1134,20 @@ 
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
-		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
-		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
-		$wp_meta_boxes[$page][$context] = array();
+	if ( !isset($wp_meta_boxes) ) {
+			$wp_meta_boxes = array();
+	}
+	if ( !isset($wp_meta_boxes[$page]) ) {
+			$wp_meta_boxes[$page] = array();
+	}
+	if ( !isset($wp_meta_boxes[$page][$context]) ) {
+			$wp_meta_boxes[$page][$context] = array();
+	}
 
-	foreach ( array('high', 'core', 'default', 'low') as $priority )
-		$wp_meta_boxes[$page][$context][$priority][$id] = false;
-}
+	foreach ( array('high', 'core', 'default', 'low') as $priority ) {
+			$wp_meta_boxes[$page][$context][$priority][$id] = false;
+	}
+	}
 
 /**
  * Meta Box Accordion Template Function
@@ -1130,10 +1170,11 @@ 
 
 	wp_enqueue_script( 'accordion' );
 
-	if ( empty( $screen ) )
-		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( empty( $screen ) ) {
+			$screen = get_current_screen();
+	} elseif ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	$page = $screen->id;
 
@@ -1149,8 +1190,9 @@ 
 		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
 			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
 				foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
-						continue;
+					if ( false == $box || ! $box['title'] ) {
+											continue;
+					}
 					$i++;
 					$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
 
@@ -1308,18 +1350,22 @@ 
 function do_settings_sections( $page ) {
 	global $wp_settings_sections, $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_sections[$page] ) )
-		return;
+	if ( ! isset( $wp_settings_sections[$page] ) ) {
+			return;
+	}
 
 	foreach ( (array) $wp_settings_sections[$page] as $section ) {
-		if ( $section['title'] )
-			echo "<h2>{$section['title']}</h2>\n";
+		if ( $section['title'] ) {
+					echo "<h2>{$section['title']}</h2>\n";
+		}
 
-		if ( $section['callback'] )
-			call_user_func( $section['callback'], $section );
+		if ( $section['callback'] ) {
+					call_user_func( $section['callback'], $section );
+		}
 
-		if ( ! isset( $wp_settings_fields ) || !isset( $wp_settings_fields[$page] ) || !isset( $wp_settings_fields[$page][$section['id']] ) )
-			continue;
+		if ( ! isset( $wp_settings_fields ) || !isset( $wp_settings_fields[$page] ) || !isset( $wp_settings_fields[$page][$section['id']] ) ) {
+					continue;
+		}
 		echo '<table class="form-table">';
 		do_settings_fields( $page, $section['id'] );
 		echo '</table>';
@@ -1343,8 +1389,9 @@ 
 function do_settings_fields($page, $section) {
 	global $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_fields[$page][$section] ) )
-		return;
+	if ( ! isset( $wp_settings_fields[$page][$section] ) ) {
+			return;
+	}
 
 	foreach ( (array) $wp_settings_fields[$page][$section] as $field ) {
 		$class = '';
@@ -1434,8 +1481,9 @@ 
 	 * This allows the $sanitize_callback from register_setting() to run, adding
 	 * any settings errors you want to show by default.
 	 */
-	if ( $sanitize )
-		sanitize_option( $setting, get_option( $setting ) );
+	if ( $sanitize ) {
+			sanitize_option( $setting, get_option( $setting ) );
+	}
 
 	// If settings were passed back from options.php then use them.
 	if ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] && get_transient( 'settings_errors' ) ) {
@@ -1444,15 +1492,17 @@ 
 	}
 
 	// Check global in case errors have been added on this pageload.
-	if ( ! count( $wp_settings_errors ) )
-		return array();
+	if ( ! count( $wp_settings_errors ) ) {
+			return array();
+	}
 
 	// Filter the results to those of a specific setting if one was set.
 	if ( $setting ) {
 		$setting_errors = array();
 		foreach ( (array) $wp_settings_errors as $key => $details ) {
-			if ( $setting == $details['setting'] )
-				$setting_errors[] = $wp_settings_errors[$key];
+			if ( $setting == $details['setting'] ) {
+							$setting_errors[] = $wp_settings_errors[$key];
+			}
 		}
 		return $setting_errors;
 	}
@@ -1489,13 +1539,15 @@ 
  */
 function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) {
 
-	if ( $hide_on_update && ! empty( $_GET['settings-updated'] ) )
-		return;
+	if ( $hide_on_update && ! empty( $_GET['settings-updated'] ) ) {
+			return;
+	}
 
 	$settings_errors = get_settings_errors( $setting, $sanitize );
 
-	if ( empty( $settings_errors ) )
-		return;
+	if ( empty( $settings_errors ) ) {
+			return;
+	}
 
 	$output = '';
 	foreach ( $settings_errors as $key => $details ) {
@@ -1554,9 +1606,10 @@ 
  */
 function the_post_password() {
 	$post = get_post();
-	if ( isset( $post->post_password ) )
-		echo esc_attr( $post->post_password );
-}
+	if ( isset( $post->post_password ) ) {
+			echo esc_attr( $post->post_password );
+	}
+	}
 
 /**
  * Get the post title.
@@ -1571,8 +1624,9 @@ 
  */
 function _draft_or_post_title( $post = 0 ) {
 	$title = get_the_title( $post );
-	if ( empty( $title ) )
-		$title = __( '(no title)' );
+	if ( empty( $title ) ) {
+			$title = __( '(no title)' );
+	}
 	return esc_html( $title );
 }
 
@@ -1649,8 +1703,9 @@ 
 
 $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
 
-if ( is_rtl() )
+if ( is_rtl() ) {
 	$admin_body_class .= ' rtl';
+}
 
 ?>
 </head>
@@ -1662,7 +1717,10 @@ 
 /**
  * @global string $body_id
  */
-if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+if ( isset($GLOBALS['body_id']) ) {
+	echo ' id="' . $GLOBALS['body_id'] . '"';
+}
+?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
 <script type="text/javascript">
 (function(){
 var c = document.body.className;
@@ -1714,21 +1772,27 @@ 
  */
 function _post_states($post) {
 	$post_states = array();
-	if ( isset( $_REQUEST['post_status'] ) )
-		$post_status = $_REQUEST['post_status'];
-	else
-		$post_status = '';
-
-	if ( !empty($post->post_password) )
-		$post_states['protected'] = __('Password protected');
-	if ( 'private' == $post->post_status && 'private' != $post_status )
-		$post_states['private'] = __('Private');
-	if ( 'draft' == $post->post_status && 'draft' != $post_status )
-		$post_states['draft'] = __('Draft');
-	if ( 'pending' == $post->post_status && 'pending' != $post_status )
-		$post_states['pending'] = _x('Pending', 'post status');
-	if ( is_sticky($post->ID) )
-		$post_states['sticky'] = __('Sticky');
+	if ( isset( $_REQUEST['post_status'] ) ) {
+			$post_status = $_REQUEST['post_status'];
+	} else {
+			$post_status = '';
+	}
+
+	if ( !empty($post->post_password) ) {
+			$post_states['protected'] = __('Password protected');
+	}
+	if ( 'private' == $post->post_status && 'private' != $post_status ) {
+			$post_states['private'] = __('Private');
+	}
+	if ( 'draft' == $post->post_status && 'draft' != $post_status ) {
+			$post_states['draft'] = __('Draft');
+	}
+	if ( 'pending' == $post->post_status && 'pending' != $post_status ) {
+			$post_states['pending'] = _x('Pending', 'post status');
+	}
+	if ( is_sticky($post->ID) ) {
+			$post_states['sticky'] = __('Sticky');
+	}
 
 	if ( 'future' === $post->post_status ) {
 		$post_states['scheduled'] = __( 'Scheduled' );
@@ -1957,14 +2021,16 @@ 
  * @return string Submit button HTML.
  */
 function get_submit_button( $text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '' ) {
-	if ( ! is_array( $type ) )
-		$type = explode( ' ', $type );
+	if ( ! is_array( $type ) ) {
+			$type = explode( ' ', $type );
+	}
 
 	$button_shorthand = array( 'primary', 'small', 'large' );
 	$classes = array( 'button' );
 	foreach ( $type as $t ) {
-		if ( 'secondary' === $t || 'button-secondary' === $t )
-			continue;
+		if ( 'secondary' === $t || 'button-secondary' === $t ) {
+					continue;
+		}
 		$classes[] = in_array( $t, $button_shorthand ) ? 'button-' . $t : $t;
 	}
 	// Remove empty items, remove duplicate items, and finally build a string.
@@ -2011,8 +2077,9 @@ 
 
 	$admin_html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : '';
 
-	if ( $is_IE )
-		@header('X-UA-Compatible: IE=edge');
+	if ( $is_IE ) {
+			@header('X-UA-Compatible: IE=edge');
+	}
 
 ?>
 <!DOCTYPE html>

src/wp-includes/comment-template.php

Doc Comments +21 added lines, -21 removed lines

@@ -17,7 +17,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to retrieve the author.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to retrieve the author.
  *									 Default current comment.
  * @return string The comment author
  */
@@ -52,7 +52,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author.
  *									 Default current comment.
  */
 function comment_author( $comment_ID = 0 ) {
@@ -77,7 +77,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's email.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's email.
  *									 Default current comment.
  * @return string The current comment author's email
  */
@@ -109,7 +109,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's email.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's email.
  *									 Default current comment.
  */
 function comment_author_email( $comment_ID = 0 ) {
@@ -209,7 +209,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's link.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's link.
  *									 Default current comment.
  * @return string The comment author name or HTML link for author's URL.
  */
@@ -243,7 +243,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's link.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's link.
  *									 Default current comment.
  */
 function comment_author_link( $comment_ID = 0 ) {
@@ -256,7 +256,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's IP address.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's IP address.
  *									 Default current comment.
  * @return string Comment author's IP address.
  */
@@ -282,7 +282,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's IP address.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's IP address.
  *									 Default current comment.
  */
 function comment_author_IP( $comment_ID = 0 ) {
@@ -295,7 +295,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's URL.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's URL.
  *									 Default current comment.
  * @return string Comment author URL.
  */
@@ -328,7 +328,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's URL.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's URL.
  *									 Default current comment.
  */
 function comment_author_url( $comment_ID = 0 ) {
@@ -366,7 +366,7 @@ 
  *                                 Default empty.
  * @param string         $after    Optional. The text or HTML to display after the email link.
  *                                 Default empty.
- * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object.
+ * @param integer $comment  Optional. Comment ID or WP_Comment object.
  *                                 Default is the current comment.
  * @return string The HTML link between the $before and $after parameters.
  */
@@ -404,7 +404,7 @@ 
  *                                 Default empty.
  * @param string         $after    Optional. Text or HTML to display after the email link.
  *                                 Default empty.
- * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object.
+ * @param integer $comment  Optional. Comment ID or WP_Comment object.
  *                                 Default is the current comment.
  */
 function comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
@@ -532,7 +532,7 @@ 
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param string          $d          Optional. The format of the date. Default user's setting.
- * @param int|WP_Comment  $comment_ID WP_Comment or ID of the comment for which to get the date.
+ * @param integer  $comment_ID WP_Comment or ID of the comment for which to get the date.
  *                                    Default current comment.
  * @return string The comment's date.
  */
@@ -561,7 +561,7 @@ 
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param string         $d          Optional. The format of the date. Default user's settings.
- * @param int|WP_Comment $comment_ID WP_Comment or ID of the comment for which to print the date.
+ * @param integer $comment_ID WP_Comment or ID of the comment for which to print the date.
  *                                   Default current comment.
  */
 function comment_date( $d = '', $comment_ID = 0 ) {
@@ -578,7 +578,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID  WP_Comment or ID of the comment for which to get the excerpt.
+ * @param integer $comment_ID  WP_Comment or ID of the comment for which to get the excerpt.
  *                                    Default current comment.
  * @return string The maybe truncated comment with 20 words or less.
  */
@@ -624,7 +624,7 @@ 
  * @since 1.2.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID  WP_Comment or ID of the comment for which to print the excerpt.
+ * @param integer $comment_ID  WP_Comment or ID of the comment for which to print the excerpt.
  *                                    Default current comment.
  */
 function comment_excerpt( $comment_ID = 0 ) {
@@ -795,7 +795,7 @@ 
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The link to the comments.
  */
 function get_comments_link( $post_id = 0 ) {
@@ -834,7 +834,7 @@ 
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return int The number of comments a post has.
  */
 function get_comments_number( $post_id = 0 ) {
@@ -922,7 +922,7 @@ 
  *
  * @see Walker_Comment::comment()
  *
- * @param int|WP_Comment  $comment_ID WP_Comment or ID of the comment for which to get the text.
+ * @param integer  $comment_ID WP_Comment or ID of the comment for which to get the text.
  *                                    Default current comment.
  * @param array           $args       Optional. An array of arguments. Default empty.
  * @return string The comment content.
@@ -952,7 +952,7 @@ 
  *
  * @see Walker_Comment::comment()
  *
- * @param int|WP_Comment  $comment_ID WP_Comment or ID of the comment for which to print the text.
+ * @param integer  $comment_ID WP_Comment or ID of the comment for which to print the text.
  *                                    Default current comment.
  * @param array           $args       Optional. An array of arguments. Default empty array. Default empty.
  */
@@ -1025,7 +1025,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or ID of the comment for which to get the type.
+ * @param integer $comment_ID Optional. WP_Comment or ID of the comment for which to get the type.
  *                                   Default current comment.
  * @return string The comment type.
  */

Braces +133 added lines, -88 removed lines

@@ -25,10 +25,11 @@ 
 	$comment = get_comment( $comment_ID );
 
 	if ( empty( $comment->comment_author ) ) {
-		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) )
-			$author = $user->display_name;
-		else
-			$author = __('Anonymous');
+		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) ) {
+					$author = $user->display_name;
+		} else {
+					$author = __('Anonymous');
+		}
 	} else {
 		$author = $comment->comment_author;
 	}
@@ -218,10 +219,11 @@ 
 	$url     = get_comment_author_url( $comment );
 	$author  = get_comment_author( $comment );
 
-	if ( empty( $url ) || 'http://' == $url )
-		$return = $author;
-	else
-		$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
+	if ( empty( $url ) || 'http://' == $url ) {
+			$return = $author;
+	} else {
+			$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
+	}
 
 	/**
 	 * Filters the comment author's link for display.
@@ -428,11 +430,12 @@ 
 function comment_class( $class = '', $comment = null, $post_id = null, $echo = true ) {
 	// Separates classes with a single space, collates classes for comment DIV
 	$class = 'class="' . join( ' ', get_comment_class( $class, $comment, $post_id ) ) . '"';
-	if ( $echo)
-		echo $class;
-	else
-		return $class;
-}
+	if ( $echo) {
+			echo $class;
+	} else {
+			return $class;
+	}
+	}
 
 /**
  * Returns the classes for the comment div as an array.
@@ -474,12 +477,15 @@ 
 		}
 	}
 
-	if ( empty($comment_alt) )
-		$comment_alt = 0;
-	if ( empty($comment_depth) )
-		$comment_depth = 1;
-	if ( empty($comment_thread_alt) )
-		$comment_thread_alt = 0;
+	if ( empty($comment_alt) ) {
+			$comment_alt = 0;
+	}
+	if ( empty($comment_depth) ) {
+			$comment_depth = 1;
+	}
+	if ( empty($comment_thread_alt) ) {
+			$comment_thread_alt = 0;
+	}
 
 	if ( $comment_alt % 2 ) {
 		$classes[] = 'odd';
@@ -504,8 +510,9 @@ 
 	$classes[] = "depth-$comment_depth";
 
 	if ( !empty($class) ) {
-		if ( !is_array( $class ) )
-			$class = preg_split('#\s+#', $class);
+		if ( !is_array( $class ) ) {
+					$class = preg_split('#\s+#', $class);
+		}
 		$classes = array_merge($classes, $class);
 	}
 
@@ -538,10 +545,11 @@ 
  */
 function get_comment_date( $d = '', $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	if ( '' == $d )
-		$date = mysql2date(get_option('date_format'), $comment->comment_date);
-	else
-		$date = mysql2date($d, $comment->comment_date);
+	if ( '' == $d ) {
+			$date = mysql2date(get_option('date_format'), $comment->comment_date);
+	} else {
+			$date = mysql2date($d, $comment->comment_date);
+	}
 	/**
 	 * Filters the returned comment date.
 	 *
@@ -822,10 +830,12 @@ 
  * @param string $deprecated_2 Not Used.
  */
 function comments_link( $deprecated = '', $deprecated_2 = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.72' );
-	if ( !empty( $deprecated_2 ) )
-		_deprecated_argument( __FUNCTION__, '1.3.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '0.72' );
+	}
+	if ( !empty( $deprecated_2 ) ) {
+			_deprecated_argument( __FUNCTION__, '1.3.0' );
+	}
 	echo esc_url( get_comments_link() );
 }
 
@@ -1010,10 +1020,11 @@ 
 	$comment = get_comment();
 
 	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
-	if ( '' == $d )
-		$date = mysql2date(get_option('time_format'), $comment_date, $translate);
-	else
-		$date = mysql2date($d, $comment_date, $translate);
+	if ( '' == $d ) {
+			$date = mysql2date(get_option('time_format'), $comment_date, $translate);
+	} else {
+			$date = mysql2date($d, $comment_date, $translate);
+	}
 
 	/**
 	 * Filters the returned comment time.
@@ -1052,8 +1063,9 @@ 
  */
 function get_comment_type( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	if ( '' == $comment->comment_type )
-		$comment->comment_type = 'comment';
+	if ( '' == $comment->comment_type ) {
+			$comment->comment_type = 'comment';
+	}
 
 	/**
 	 * Filters the returned comment type.
@@ -1078,9 +1090,15 @@ 
  * @param string $pingbacktxt  Optional. String to display for pingback type. Default false.
  */
 function comment_type( $commenttxt = false, $trackbacktxt = false, $pingbacktxt = false ) {
-	if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-	if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-	if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+	if ( false === $commenttxt ) {
+		$commenttxt = _x( 'Comment', 'noun' );
+	}
+	if ( false === $trackbacktxt ) {
+		$trackbacktxt = __( 'Trackback' );
+	}
+	if ( false === $pingbacktxt ) {
+		$pingbacktxt = __( 'Pingback' );
+	}
 	$type = get_comment_type();
 	switch( $type ) {
 		case 'trackback' :
@@ -1106,10 +1124,11 @@ 
  * @return string The trackback URL after being filtered.
  */
 function get_trackback_url() {
-	if ( '' != get_option('permalink_structure') )
-		$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
-	else
-		$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+	if ( '' != get_option('permalink_structure') ) {
+			$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
+	} else {
+			$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+	}
 
 	/**
 	 * Filters the returned trackback URL.
@@ -1291,11 +1310,13 @@ 
 function comments_template( $file = '/comments.php', $separate_comments = false ) {
 	global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
 
-	if ( !(is_single() || is_page() || $withcomments) || empty($post) )
-		return;
+	if ( !(is_single() || is_page() || $withcomments) || empty($post) ) {
+			return;
+	}
 
-	if ( empty($file) )
-		$file = '/comments.php';
+	if ( empty($file) ) {
+			$file = '/comments.php';
+	}
 
 	$req = get_option('require_name_email');
 
@@ -1453,8 +1474,9 @@ 
 		$overridden_cpage = true;
 	}
 
-	if ( !defined('COMMENTS_TEMPLATE') )
-		define('COMMENTS_TEMPLATE', true);
+	if ( !defined('COMMENTS_TEMPLATE') ) {
+			define('COMMENTS_TEMPLATE', true);
+	}
 
 	$theme_template = STYLESHEETPATH . $file;
 	/**
@@ -1465,13 +1487,15 @@ 
 	 * @param string $theme_template The path to the theme template file.
 	 */
 	$include = apply_filters( 'comments_template', $theme_template );
-	if ( file_exists( $include ) )
-		require( $include );
-	elseif ( file_exists( TEMPLATEPATH . $file ) )
-		require( TEMPLATEPATH . $file );
-	else // Backward compat code will be removed in a future release
+	if ( file_exists( $include ) ) {
+			require( $include );
+	} elseif ( file_exists( TEMPLATEPATH . $file ) ) {
+			require( TEMPLATEPATH . $file );
+	} else {
+		// Backward compat code will be removed in a future release
 		require( ABSPATH . WPINC . '/theme-compat/comments.php');
-}
+	}
+	}
 
 /**
  * Displays the link to the comments for the current post ID.
@@ -1774,8 +1798,9 @@ 
  * @return string
  */
 function get_cancel_comment_reply_link( $text = '' ) {
-	if ( empty($text) )
-		$text = __('Click here to cancel reply.');
+	if ( empty($text) ) {
+			$text = __('Click here to cancel reply.');
+	}
 
 	$style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
 	$link = esc_html( remove_query_arg('replytocom') ) . '#respond';
@@ -1814,8 +1839,9 @@ 
  * @return string Hidden input HTML for replying to comments
  */
 function get_comment_id_fields( $id = 0 ) {
-	if ( empty( $id ) )
-		$id = get_the_ID();
+	if ( empty( $id ) ) {
+			$id = get_the_ID();
+	}
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 	$result  = "<input type='hidden' name='comment_post_ID' value='$id' id='comment_post_ID' />\n";
@@ -1867,14 +1893,18 @@ 
 function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
 	global $comment;
 
-	if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
-	if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
+	if ( false === $noreplytext ) {
+		$noreplytext = __( 'Leave a Reply' );
+	}
+	if ( false === $replytext ) {
+		$replytext = __( 'Leave a Reply to %s' );
+	}
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 
-	if ( 0 == $replytoid )
-		echo $noreplytext;
-	else {
+	if ( 0 == $replytoid ) {
+			echo $noreplytext;
+	} else {
 		// Sets the global so that template tags can be used in the comment form.
 		$comment = get_comment($replytoid);
 		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $comment ) . '</a>' : get_comment_author( $comment );
@@ -1961,12 +1991,14 @@ 
 	// Figure out what comments we'll be looping through ($_comments)
 	if ( null !== $comments ) {
 		$comments = (array) $comments;
-		if ( empty($comments) )
-			return;
+		if ( empty($comments) ) {
+					return;
+		}
 		if ( 'all' != $r['type'] ) {
 			$comments_by_type = separate_comments($comments);
-			if ( empty($comments_by_type[$r['type']]) )
-				return;
+			if ( empty($comments_by_type[$r['type']]) ) {
+							return;
+			}
 			$_comments = $comments_by_type[$r['type']];
 		} else {
 			$_comments = $comments;
@@ -2016,13 +2048,16 @@ 
 
 		// Otherwise, fall back on the comments from `$wp_query->comments`.
 		} else {
-			if ( empty($wp_query->comments) )
-				return;
+			if ( empty($wp_query->comments) ) {
+							return;
+			}
 			if ( 'all' != $r['type'] ) {
-				if ( empty($wp_query->comments_by_type) )
-					$wp_query->comments_by_type = separate_comments($wp_query->comments);
-				if ( empty($wp_query->comments_by_type[$r['type']]) )
-					return;
+				if ( empty($wp_query->comments_by_type) ) {
+									$wp_query->comments_by_type = separate_comments($wp_query->comments);
+				}
+				if ( empty($wp_query->comments_by_type[$r['type']]) ) {
+									return;
+				}
 				$_comments = $wp_query->comments_by_type[$r['type']];
 			} else {
 				$_comments = $wp_query->comments;
@@ -2060,10 +2095,11 @@ 
 	}
 
 	if ( '' === $r['max_depth'] ) {
-		if ( get_option('thread_comments') )
-			$r['max_depth'] = get_option('thread_comments_depth');
-		else
-			$r['max_depth'] = -1;
+		if ( get_option('thread_comments') ) {
+					$r['max_depth'] = get_option('thread_comments_depth');
+		} else {
+					$r['max_depth'] = -1;
+		}
 	}
 
 	if ( '' === $r['page'] ) {
@@ -2077,11 +2113,13 @@ 
 	}
 	// Validation check
 	$r['page'] = intval($r['page']);
-	if ( 0 == $r['page'] && 0 != $r['per_page'] )
-		$r['page'] = 1;
+	if ( 0 == $r['page'] && 0 != $r['per_page'] ) {
+			$r['page'] = 1;
+	}
 
-	if ( null === $r['reverse_top_level'] )
-		$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+	if ( null === $r['reverse_top_level'] ) {
+			$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+	}
 
 	wp_queue_comments_for_comment_meta_lazyload( $_comments );
 
@@ -2165,8 +2203,9 @@ 
  * @param int|WP_Post $post_id Post ID or WP_Post object to generate the form for. Default current post.
  */
 function comment_form( $args = array(), $post_id = null ) {
-	if ( null === $post_id )
-		$post_id = get_the_ID();
+	if ( null === $post_id ) {
+			$post_id = get_the_ID();
+	}
 
 	// Exit the function when comments for the post are closed.
 	if ( ! comments_open( $post_id ) ) {
@@ -2185,8 +2224,9 @@ 
 	$user_identity = $user->exists() ? $user->display_name : '';
 
 	$args = wp_parse_args( $args );
-	if ( ! isset( $args['format'] ) )
-		$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+	if ( ! isset( $args['format'] ) ) {
+			$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+	}
 
 	$req      = get_option( 'require_name_email' );
 	$aria_req = ( $req ? " aria-required='true'" : '' );
@@ -2294,8 +2334,11 @@ 
 			 * @since 3.0.0
 			 */
 			do_action( 'comment_form_must_log_in_after' );
-		else : ?>
-			<form action="<?php echo esc_url( $args['action'] ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
+		else {
+			: ?>
+			<form action="<?php echo esc_url( $args['action'] );
+		}
+		?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
 				<?php
 				/**
 				 * Fires at the top of the comment form, inside the form tag.
@@ -2330,9 +2373,11 @@ 
 					 */
 					do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
 
-				else :
+				else {
+					:
 
 					echo $args['comment_notes_before'];
+				}
 
 				endif;
 

Indentation +15 added lines, -15 removed lines

@@ -2196,11 +2196,11 @@ 
 	$html5    = 'html5' === $args['format'];
 	$fields   =  array(
 		'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_req . $html_req . ' /></p>',
+					'<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_req . $html_req . ' /></p>',
 		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
+					'<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
 		'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
-		            '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
+					'<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
 	);
 
 	$required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
@@ -2218,20 +2218,20 @@ 
 		'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
 		/** This filter is documented in wp-includes/link-template.php */
 		'must_log_in'          => '<p class="must-log-in">' . sprintf(
-		                              /* translators: %s: login URL */
-		                              __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
-		                              wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
-		                          ) . '</p>',
+									  /* translators: %s: login URL */
+									  __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
+									  wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
+								  ) . '</p>',
 		/** This filter is documented in wp-includes/link-template.php */
 		'logged_in_as'         => '<p class="logged-in-as">' . sprintf(
-		                              /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
-		                              __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
-		                              get_edit_user_link(),
-		                              /* translators: %s: user name */
-		                              esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
-		                              $user_identity,
-		                              wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
-		                          ) . '</p>',
+									  /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
+									  __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
+									  get_edit_user_link(),
+									  /* translators: %s: user name */
+									  esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
+									  $user_identity,
+									  wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
+								  ) . '</p>',
 		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>'. ( $req ? $required_text : '' ) . '</p>',
 		'comment_notes_after'  => '',
 		'action'               => site_url( '/wp-comments-post.php' ),

Spacing +418 added lines, -418 removed lines

@@ -21,11 +21,11 @@ 
  *									 Default current comment.
  * @return string The comment author
  */
-function get_comment_author( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 
-	if ( empty( $comment->comment_author ) ) {
-		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) )
+	if (empty($comment->comment_author)) {
+		if ($comment->user_id && $user = get_userdata($comment->user_id))
 			$author = $user->display_name;
 		else
 			$author = __('Anonymous');
@@ -43,7 +43,7 @@ 
 	 * @param int        $comment_ID The comment ID.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_author', $author, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_author', $author, $comment->comment_ID, $comment);
 }
 
 /**
@@ -55,9 +55,9 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author.
  *									 Default current comment.
  */
-function comment_author( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	$author  = get_comment_author( $comment );
+function comment_author($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	$author  = get_comment_author($comment);
 
 	/**
 	 * Filters the comment author's name for display.
@@ -68,7 +68,7 @@ 
 	 * @param string $author     The comment author's username.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	echo apply_filters( 'comment_author', $author, $comment->comment_ID );
+	echo apply_filters('comment_author', $author, $comment->comment_ID);
 }
 
 /**
@@ -81,8 +81,8 @@ 
  *									 Default current comment.
  * @return string The current comment author's email
  */
-function get_comment_author_email( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author_email($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 
 	/**
 	 * Filters the comment author's returned email address.
@@ -94,7 +94,7 @@ 
 	 * @param int        $comment_ID           The comment ID.
 	 * @param WP_Comment $comment              The comment object.
 	 */
-	return apply_filters( 'get_comment_author_email', $comment->comment_author_email, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_author_email', $comment->comment_author_email, $comment->comment_ID, $comment);
 }
 
 /**
@@ -112,9 +112,9 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's email.
  *									 Default current comment.
  */
-function comment_author_email( $comment_ID = 0 ) {
-	$comment      = get_comment( $comment_ID );
-	$author_email = get_comment_author_email( $comment );
+function comment_author_email($comment_ID = 0) {
+	$comment      = get_comment($comment_ID);
+	$author_email = get_comment_author_email($comment);
 
 	/**
 	 * Filters the comment author's email for display.
@@ -125,7 +125,7 @@ 
 	 * @param string $author_email The comment author's email address.
 	 * @param int    $comment_ID   The comment ID.
 	 */
-	echo apply_filters( 'author_email', $author_email, $comment->comment_ID );
+	echo apply_filters('author_email', $author_email, $comment->comment_ID);
 }
 
 /**
@@ -146,8 +146,8 @@ 
  * @param string         $after    Optional. Text or HTML to display after the email link. Default empty.
  * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object. Default is the current comment.
  */
-function comment_author_email_link( $linktext = '', $before = '', $after = '', $comment = null ) {
-	if ( $link = get_comment_author_email_link( $linktext, $before, $after, $comment ) ) {
+function comment_author_email_link($linktext = '', $before = '', $after = '', $comment = null) {
+	if ($link = get_comment_author_email_link($linktext, $before, $after, $comment)) {
 		echo $link;
 	}
 }
@@ -172,8 +172,8 @@ 
  * @return string HTML markup for the comment author email link. By default, the email address is obfuscated
  *                via the {@see 'comment_email'} filter with antispambot().
  */
-function get_comment_author_email_link( $linktext = '', $before = '', $after = '', $comment = null ) {
-	$comment = get_comment( $comment );
+function get_comment_author_email_link($linktext = '', $before = '', $after = '', $comment = null) {
+	$comment = get_comment($comment);
 
 	/**
 	 * Filters the comment author's email for display.
@@ -187,12 +187,12 @@ 
 	 * @param string     $comment_author_email The comment author's email address.
 	 * @param WP_Comment $comment              The comment object.
 	 */
-	$email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
+	$email = apply_filters('comment_email', $comment->comment_author_email, $comment);
 
-	if ((!empty($email)) && ($email != '@')) {
+	if (( ! empty($email)) && ($email != '@')) {
 	$display = ($linktext != '') ? $linktext : $email;
 		$return  = $before;
-		$return .= sprintf( '<a href="%1$s">%2$s</a>', esc_url( 'mailto:' . $email ), esc_html( $display ) );
+		$return .= sprintf('<a href="%1$s">%2$s</a>', esc_url('mailto:'.$email), esc_html($display));
 	 	$return .= $after;
 		return $return;
 	} else {
@@ -213,12 +213,12 @@ 
  *									 Default current comment.
  * @return string The comment author name or HTML link for author's URL.
  */
-function get_comment_author_link( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	$url     = get_comment_author_url( $comment );
-	$author  = get_comment_author( $comment );
+function get_comment_author_link($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	$url     = get_comment_author_url($comment);
+	$author  = get_comment_author($comment);
 
-	if ( empty( $url ) || 'http://' == $url )
+	if (empty($url) || 'http://' == $url)
 		$return = $author;
 	else
 		$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
@@ -234,7 +234,7 @@ 
 	 * @param string $author     The comment author's username.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	return apply_filters( 'get_comment_author_link', $return, $author, $comment->comment_ID );
+	return apply_filters('get_comment_author_link', $return, $author, $comment->comment_ID);
 }
 
 /**
@@ -246,8 +246,8 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's link.
  *									 Default current comment.
  */
-function comment_author_link( $comment_ID = 0 ) {
-	echo get_comment_author_link( $comment_ID );
+function comment_author_link($comment_ID = 0) {
+	echo get_comment_author_link($comment_ID);
 }
 
 /**
@@ -260,8 +260,8 @@ 
  *									 Default current comment.
  * @return string Comment author's IP address.
  */
-function get_comment_author_IP( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author_IP($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 
 	/**
 	 * Filters the comment author's returned IP address.
@@ -273,7 +273,7 @@ 
 	 * @param int        $comment_ID        The comment ID.
 	 * @param WP_Comment $comment           The comment object.
 	 */
-	return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_author_IP', $comment->comment_author_IP, $comment->comment_ID, $comment);
 }
 
 /**
@@ -285,8 +285,8 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's IP address.
  *									 Default current comment.
  */
-function comment_author_IP( $comment_ID = 0 ) {
-	echo esc_html( get_comment_author_IP( $comment_ID ) );
+function comment_author_IP($comment_ID = 0) {
+	echo esc_html(get_comment_author_IP($comment_ID));
 }
 
 /**
@@ -299,13 +299,13 @@ 
  *									 Default current comment.
  * @return string Comment author URL.
  */
-function get_comment_author_url( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author_url($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 	$url = '';
 	$id = 0;
-	if ( ! empty( $comment ) ) {
-		$author_url = ( 'http://' == $comment->comment_author_url ) ? '' : $comment->comment_author_url;
-		$url = esc_url( $author_url, array( 'http', 'https' ) );
+	if ( ! empty($comment)) {
+		$author_url = ('http://' == $comment->comment_author_url) ? '' : $comment->comment_author_url;
+		$url = esc_url($author_url, array('http', 'https'));
 		$id = $comment->ID;
 	}
 
@@ -319,7 +319,7 @@ 
 	 * @param int        $comment_ID The comment ID.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_author_url', $url, $id, $comment );
+	return apply_filters('get_comment_author_url', $url, $id, $comment);
 }
 
 /**
@@ -331,9 +331,9 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's URL.
  *									 Default current comment.
  */
-function comment_author_url( $comment_ID = 0 ) {
-	$comment    = get_comment( $comment_ID );
-	$author_url = get_comment_author_url( $comment );
+function comment_author_url($comment_ID = 0) {
+	$comment    = get_comment($comment_ID);
+	$author_url = get_comment_author_url($comment);
 
 	/**
 	 * Filters the comment author's URL for display.
@@ -344,7 +344,7 @@ 
 	 * @param string $author_url The comment author's URL.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	echo apply_filters( 'comment_url', $author_url, $comment->comment_ID );
+	echo apply_filters('comment_url', $author_url, $comment->comment_ID);
 }
 
 /**
@@ -370,13 +370,13 @@ 
  *                                 Default is the current comment.
  * @return string The HTML link between the $before and $after parameters.
  */
-function get_comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
-	$url = get_comment_author_url( $comment );
+function get_comment_author_url_link($linktext = '', $before = '', $after = '', $comment = 0) {
+	$url = get_comment_author_url($comment);
 	$display = ($linktext != '') ? $linktext : $url;
-	$display = str_replace( 'http://www.', '', $display );
-	$display = str_replace( 'http://', '', $display );
+	$display = str_replace('http://www.', '', $display);
+	$display = str_replace('http://', '', $display);
 
-	if ( '/' == substr($display, -1) ) {
+	if ('/' == substr($display, -1)) {
 		$display = substr($display, 0, -1);
 	}
 
@@ -389,7 +389,7 @@ 
 	 *
 	 * @param string $return The HTML-formatted comment author URL link.
 	 */
-	return apply_filters( 'get_comment_author_url_link', $return );
+	return apply_filters('get_comment_author_url_link', $return);
 }
 
 /**
@@ -407,8 +407,8 @@ 
  * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object.
  *                                 Default is the current comment.
  */
-function comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
-	echo get_comment_author_url_link( $linktext, $before, $after, $comment );
+function comment_author_url_link($linktext = '', $before = '', $after = '', $comment = 0) {
+	echo get_comment_author_url_link($linktext, $before, $after, $comment);
 }
 
 /**
@@ -425,10 +425,10 @@ 
  *                                 Default true.
  * @return string If `$echo` is false, the class will be returned. Void otherwise.
  */
-function comment_class( $class = '', $comment = null, $post_id = null, $echo = true ) {
+function comment_class($class = '', $comment = null, $post_id = null, $echo = true) {
 	// Separates classes with a single space, collates classes for comment DIV
-	$class = 'class="' . join( ' ', get_comment_class( $class, $comment, $post_id ) ) . '"';
-	if ( $echo)
+	$class = 'class="'.join(' ', get_comment_class($class, $comment, $post_id)).'"';
+	if ($echo)
 		echo $class;
 	else
 		return $class;
@@ -449,39 +449,39 @@ 
  * @param int|WP_Post    $post_id    Post ID or WP_Post object. Default current post.
  * @return array An array of classes.
  */
-function get_comment_class( $class = '', $comment_id = null, $post_id = null ) {
+function get_comment_class($class = '', $comment_id = null, $post_id = null) {
 	global $comment_alt, $comment_depth, $comment_thread_alt;
 
 	$classes = array();
 
-	$comment = get_comment( $comment_id );
-	if ( ! $comment ) {
+	$comment = get_comment($comment_id);
+	if ( ! $comment) {
 		return $classes;
 	}
 
 	// Get the comment type (comment, trackback),
-	$classes[] = ( empty( $comment->comment_type ) ) ? 'comment' : $comment->comment_type;
+	$classes[] = (empty($comment->comment_type)) ? 'comment' : $comment->comment_type;
 
 	// Add classes for comment authors that are registered users.
-	if ( $comment->user_id > 0 && $user = get_userdata( $comment->user_id ) ) {
+	if ($comment->user_id > 0 && $user = get_userdata($comment->user_id)) {
 		$classes[] = 'byuser';
-		$classes[] = 'comment-author-' . sanitize_html_class( $user->user_nicename, $comment->user_id );
+		$classes[] = 'comment-author-'.sanitize_html_class($user->user_nicename, $comment->user_id);
 		// For comment authors who are the author of the post
-		if ( $post = get_post($post_id) ) {
-			if ( $comment->user_id === $post->post_author ) {
+		if ($post = get_post($post_id)) {
+			if ($comment->user_id === $post->post_author) {
 				$classes[] = 'bypostauthor';
 			}
 		}
 	}
 
-	if ( empty($comment_alt) )
+	if (empty($comment_alt))
 		$comment_alt = 0;
-	if ( empty($comment_depth) )
+	if (empty($comment_depth))
 		$comment_depth = 1;
-	if ( empty($comment_thread_alt) )
+	if (empty($comment_thread_alt))
 		$comment_thread_alt = 0;
 
-	if ( $comment_alt % 2 ) {
+	if ($comment_alt % 2) {
 		$classes[] = 'odd';
 		$classes[] = 'alt';
 	} else {
@@ -491,8 +491,8 @@ 
 	$comment_alt++;
 
 	// Alt for top-level comments
-	if ( 1 == $comment_depth ) {
-		if ( $comment_thread_alt % 2 ) {
+	if (1 == $comment_depth) {
+		if ($comment_thread_alt % 2) {
 			$classes[] = 'thread-odd';
 			$classes[] = 'thread-alt';
 		} else {
@@ -503,8 +503,8 @@ 
 
 	$classes[] = "depth-$comment_depth";
 
-	if ( !empty($class) ) {
-		if ( !is_array( $class ) )
+	if ( ! empty($class)) {
+		if ( ! is_array($class))
 			$class = preg_split('#\s+#', $class);
 		$classes = array_merge($classes, $class);
 	}
@@ -522,7 +522,7 @@ 
 	 * @param WP_Comment  $comment    The comment object.
 	 * @param int|WP_Post $post_id    The post ID or WP_Post object.
 	 */
-	return apply_filters( 'comment_class', $classes, $class, $comment->comment_ID, $comment, $post_id );
+	return apply_filters('comment_class', $classes, $class, $comment->comment_ID, $comment, $post_id);
 }
 
 /**
@@ -536,9 +536,9 @@ 
  *                                    Default current comment.
  * @return string The comment's date.
  */
-function get_comment_date( $d = '', $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	if ( '' == $d )
+function get_comment_date($d = '', $comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	if ('' == $d)
 		$date = mysql2date(get_option('date_format'), $comment->comment_date);
 	else
 		$date = mysql2date($d, $comment->comment_date);
@@ -551,7 +551,7 @@ 
 	 * @param string     $d       The format of the date.
 	 * @param WP_Comment $comment The comment object.
 	 */
-	return apply_filters( 'get_comment_date', $date, $d, $comment );
+	return apply_filters('get_comment_date', $date, $d, $comment);
 }
 
 /**
@@ -564,8 +564,8 @@ 
  * @param int|WP_Comment $comment_ID WP_Comment or ID of the comment for which to print the date.
  *                                   Default current comment.
  */
-function comment_date( $d = '', $comment_ID = 0 ) {
-	echo get_comment_date( $d, $comment_ID );
+function comment_date($d = '', $comment_ID = 0) {
+	echo get_comment_date($d, $comment_ID);
 }
 
 /**
@@ -582,10 +582,10 @@ 
  *                                    Default current comment.
  * @return string The maybe truncated comment with 20 words or less.
  */
-function get_comment_excerpt( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	$comment_text = strip_tags( str_replace( array( "\n", "\r" ), ' ', $comment->comment_content ) );
-	$words = explode( ' ', $comment_text );
+function get_comment_excerpt($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	$comment_text = strip_tags(str_replace(array("\n", "\r"), ' ', $comment->comment_content));
+	$words = explode(' ', $comment_text);
 
 	/**
 	 * Filters the amount of words used in the comment excerpt.
@@ -594,15 +594,15 @@ 
 	 *
 	 * @param int $comment_excerpt_length The amount of words you want to display in the comment excerpt.
 	 */
-	$comment_excerpt_length = apply_filters( 'comment_excerpt_length', 20 );
+	$comment_excerpt_length = apply_filters('comment_excerpt_length', 20);
 
-	$use_ellipsis = count( $words ) > $comment_excerpt_length;
-	if ( $use_ellipsis ) {
-		$words = array_slice( $words, 0, $comment_excerpt_length );
+	$use_ellipsis = count($words) > $comment_excerpt_length;
+	if ($use_ellipsis) {
+		$words = array_slice($words, 0, $comment_excerpt_length);
 	}
 
-	$excerpt = trim( join( ' ', $words ) );
-	if ( $use_ellipsis ) {
+	$excerpt = trim(join(' ', $words));
+	if ($use_ellipsis) {
 		$excerpt .= '&hellip;';
 	}
 	/**
@@ -615,7 +615,7 @@ 
 	 * @param int        $comment_ID The comment ID.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_excerpt', $excerpt, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_excerpt', $excerpt, $comment->comment_ID, $comment);
 }
 
 /**
@@ -627,9 +627,9 @@ 
  * @param int|WP_Comment $comment_ID  WP_Comment or ID of the comment for which to print the excerpt.
  *                                    Default current comment.
  */
-function comment_excerpt( $comment_ID = 0 ) {
-	$comment         = get_comment( $comment_ID );
-	$comment_excerpt = get_comment_excerpt( $comment );
+function comment_excerpt($comment_ID = 0) {
+	$comment         = get_comment($comment_ID);
+	$comment_excerpt = get_comment_excerpt($comment);
 
 	/**
 	 * Filters the comment excerpt for display.
@@ -640,7 +640,7 @@ 
 	 * @param string $comment_excerpt The comment excerpt text.
 	 * @param int    $comment_ID      The comment ID.
 	 */
-	echo apply_filters( 'comment_excerpt', $comment_excerpt, $comment->comment_ID );
+	echo apply_filters('comment_excerpt', $comment_excerpt, $comment->comment_ID);
 }
 
 /**
@@ -662,7 +662,7 @@ 
 	 * @param int        $comment_ID The current comment ID.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_ID', $comment->comment_ID, $comment );
+	return apply_filters('get_comment_ID', $comment->comment_ID, $comment);
 }
 
 /**
@@ -699,14 +699,14 @@ 
  * }
  * @return string The permalink to the given comment.
  */
-function get_comment_link( $comment = null, $args = array() ) {
+function get_comment_link($comment = null, $args = array()) {
 	global $wp_rewrite, $in_comment_loop;
 
 	$comment = get_comment($comment);
 
 	// Back-compat.
-	if ( ! is_array( $args ) ) {
-		$args = array( 'page' => $args );
+	if ( ! is_array($args)) {
+		$args = array('page' => $args);
 	}
 
 	$defaults = array(
@@ -716,33 +716,33 @@ 
 		'max_depth' => '',
 		'cpage'     => null,
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	$link = get_permalink( $comment->comment_post_ID );
+	$link = get_permalink($comment->comment_post_ID);
 
 	// The 'cpage' param takes precedence.
-	if ( ! is_null( $args['cpage'] ) ) {
+	if ( ! is_null($args['cpage'])) {
 		$cpage = $args['cpage'];
 
 	// No 'cpage' is provided, so we calculate one.
 	} else {
-		if ( '' === $args['per_page'] && get_option( 'page_comments' ) ) {
+		if ('' === $args['per_page'] && get_option('page_comments')) {
 			$args['per_page'] = get_option('comments_per_page');
 		}
 
-		if ( empty( $args['per_page'] ) ) {
+		if (empty($args['per_page'])) {
 			$args['per_page'] = 0;
 			$args['page'] = 0;
 		}
 
 		$cpage = $args['page'];
 
-		if ( '' == $cpage ) {
-			if ( ! empty( $in_comment_loop ) ) {
-				$cpage = get_query_var( 'cpage' );
+		if ('' == $cpage) {
+			if ( ! empty($in_comment_loop)) {
+				$cpage = get_query_var('cpage');
 			} else {
 				// Requires a database hit, so we only do it when we can't figure out from context.
-				$cpage = get_page_of_comment( $comment->comment_ID, $args );
+				$cpage = get_page_of_comment($comment->comment_ID, $args);
 			}
 		}
 
@@ -750,29 +750,29 @@ 
 		 * If the default page displays the oldest comments, the permalinks for comments on the default page
 		 * do not need a 'cpage' query var.
 		 */
-		if ( 'oldest' === get_option( 'default_comments_page' ) && 1 === $cpage ) {
+		if ('oldest' === get_option('default_comments_page') && 1 === $cpage) {
 			$cpage = '';
 		}
 	}
 
-	if ( $cpage && get_option( 'page_comments' ) ) {
-		if ( $wp_rewrite->using_permalinks() ) {
-			if ( $cpage ) {
-				$link = trailingslashit( $link ) . $wp_rewrite->comments_pagination_base . '-' . $cpage;
+	if ($cpage && get_option('page_comments')) {
+		if ($wp_rewrite->using_permalinks()) {
+			if ($cpage) {
+				$link = trailingslashit($link).$wp_rewrite->comments_pagination_base.'-'.$cpage;
 			}
 
-			$link = user_trailingslashit( $link, 'comment' );
-		} elseif ( $cpage ) {
-			$link = add_query_arg( 'cpage', $cpage, $link );
+			$link = user_trailingslashit($link, 'comment');
+		} elseif ($cpage) {
+			$link = add_query_arg('cpage', $cpage, $link);
 		}
 
 	}
 
-	if ( $wp_rewrite->using_permalinks() ) {
-		$link = user_trailingslashit( $link, 'comment' );
+	if ($wp_rewrite->using_permalinks()) {
+		$link = user_trailingslashit($link, 'comment');
 	}
 
-	$link = $link . '#comment-' . $comment->comment_ID;
+	$link = $link.'#comment-'.$comment->comment_ID;
 
 	/**
 	 * Filters the returned single comment permalink.
@@ -787,7 +787,7 @@ 
 	 * @param array      $args    An array of arguments to override the defaults.
 	 * @param int        $cpage   The calculated 'cpage' value.
 	 */
-	return apply_filters( 'get_comment_link', $link, $comment, $args, $cpage );
+	return apply_filters('get_comment_link', $link, $comment, $args, $cpage);
 }
 
 /**
@@ -798,9 +798,9 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The link to the comments.
  */
-function get_comments_link( $post_id = 0 ) {
-	$hash = get_comments_number( $post_id ) ? '#comments' : '#respond';
-	$comments_link = get_permalink( $post_id ) . $hash;
+function get_comments_link($post_id = 0) {
+	$hash = get_comments_number($post_id) ? '#comments' : '#respond';
+	$comments_link = get_permalink($post_id).$hash;
 
 	/**
 	 * Filters the returned post comments permalink.
@@ -810,7 +810,7 @@ 
 	 * @param string      $comments_link Post comments permalink with '#comments' appended.
 	 * @param int|WP_Post $post_id       Post ID or WP_Post object.
 	 */
-	return apply_filters( 'get_comments_link', $comments_link, $post_id );
+	return apply_filters('get_comments_link', $comments_link, $post_id);
 }
 
 /**
@@ -821,12 +821,12 @@ 
  * @param string $deprecated   Not Used.
  * @param string $deprecated_2 Not Used.
  */
-function comments_link( $deprecated = '', $deprecated_2 = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.72' );
-	if ( !empty( $deprecated_2 ) )
-		_deprecated_argument( __FUNCTION__, '1.3.0' );
-	echo esc_url( get_comments_link() );
+function comments_link($deprecated = '', $deprecated_2 = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '0.72');
+	if ( ! empty($deprecated_2))
+		_deprecated_argument(__FUNCTION__, '1.3.0');
+	echo esc_url(get_comments_link());
 }
 
 /**
@@ -837,10 +837,10 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return int The number of comments a post has.
  */
-function get_comments_number( $post_id = 0 ) {
-	$post = get_post( $post_id );
+function get_comments_number($post_id = 0) {
+	$post = get_post($post_id);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		$count = 0;
 	} else {
 		$count = $post->comment_count;
@@ -855,7 +855,7 @@ 
 	 * @param int $count   Number of comments a post has.
 	 * @param int $post_id Post ID.
 	 */
-	return apply_filters( 'get_comments_number', $count, $post_id );
+	return apply_filters('get_comments_number', $count, $post_id);
 }
 
 /**
@@ -868,11 +868,11 @@ 
  * @param string $more       Optional. Text for more than one comment. Default false.
  * @param string $deprecated Not used.
  */
-function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '1.3.0' );
+function comments_number($zero = false, $one = false, $more = false, $deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '1.3.0');
 	}
-	echo get_comments_number_text( $zero, $one, $more );
+	echo get_comments_number_text($zero, $one, $more);
 }
 
 /**
@@ -884,42 +884,42 @@ 
  * @param string $one  Optional. Text for one comment. Default false.
  * @param string $more Optional. Text for more than one comment. Default false.
  */
-function get_comments_number_text( $zero = false, $one = false, $more = false ) {
+function get_comments_number_text($zero = false, $one = false, $more = false) {
 	$number = get_comments_number();
 
-	if ( $number > 1 ) {
-		if ( false === $more ) {
+	if ($number > 1) {
+		if (false === $more) {
 			/* translators: %s: number of comments */
-			$output = sprintf( _n( '%s Comment', '%s Comments', $number ), number_format_i18n( $number ) );
+			$output = sprintf(_n('%s Comment', '%s Comments', $number), number_format_i18n($number));
 		} else {
 			// % Comments
 			/* translators: If comment number in your language requires declension,
 			 * translate this to 'on'. Do not translate into your own language.
 			 */
-			if ( 'on' === _x( 'off', 'Comment number declension: on or off' ) ) {
-				$text = preg_replace( '#<span class="screen-reader-text">.+?</span>#', '', $more );
-				$text = preg_replace( '/&.+?;/', '', $text ); // Kill entities
-				$text = trim( strip_tags( $text ), '% ' );
+			if ('on' === _x('off', 'Comment number declension: on or off')) {
+				$text = preg_replace('#<span class="screen-reader-text">.+?</span>#', '', $more);
+				$text = preg_replace('/&.+?;/', '', $text); // Kill entities
+				$text = trim(strip_tags($text), '% ');
 
 				// Replace '% Comments' with a proper plural form
-				if ( $text && ! preg_match( '/[0-9]+/', $text ) && false !== strpos( $more, '%' ) ) {
+				if ($text && ! preg_match('/[0-9]+/', $text) && false !== strpos($more, '%')) {
 					/* translators: %s: number of comments */
-					$new_text = _n( '%s Comment', '%s Comments', $number );
-					$new_text = trim( sprintf( $new_text, '' ) );
+					$new_text = _n('%s Comment', '%s Comments', $number);
+					$new_text = trim(sprintf($new_text, ''));
 
-					$more = str_replace( $text, $new_text, $more );
-					if ( false === strpos( $more, '%' ) ) {
-						$more = '% ' . $more;
+					$more = str_replace($text, $new_text, $more);
+					if (false === strpos($more, '%')) {
+						$more = '% '.$more;
 					}
 				}
 			}
 
-			$output = str_replace( '%', number_format_i18n( $number ), $more );
+			$output = str_replace('%', number_format_i18n($number), $more);
 		}
-	} elseif ( $number == 0 ) {
-		$output = ( false === $zero ) ? __( 'No Comments' ) : $zero;
+	} elseif ($number == 0) {
+		$output = (false === $zero) ? __('No Comments') : $zero;
 	} else { // must be one
-		$output = ( false === $one ) ? __( '1 Comment' ) : $one;
+		$output = (false === $one) ? __('1 Comment') : $one;
 	}
 	/**
 	 * Filters the comments count for display.
@@ -932,7 +932,7 @@ 
 	 *                       is equal to 0, 1, or 1+.
 	 * @param int    $number The number of post comments.
 	 */
-	return apply_filters( 'comments_number', $output, $number );
+	return apply_filters('comments_number', $output, $number);
 }
 
 /**
@@ -948,8 +948,8 @@ 
  * @param array           $args       Optional. An array of arguments. Default empty.
  * @return string The comment content.
  */
-function get_comment_text( $comment_ID = 0, $args = array() ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_text($comment_ID = 0, $args = array()) {
+	$comment = get_comment($comment_ID);
 
 	/**
 	 * Filters the text of a comment.
@@ -962,7 +962,7 @@ 
 	 * @param WP_Comment $comment         The comment object.
 	 * @param array      $args            An array of arguments.
 	 */
-	return apply_filters( 'get_comment_text', $comment->comment_content, $comment, $args );
+	return apply_filters('get_comment_text', $comment->comment_content, $comment, $args);
 }
 
 /**
@@ -977,10 +977,10 @@ 
  *                                    Default current comment.
  * @param array           $args       Optional. An array of arguments. Default empty array. Default empty.
  */
-function comment_text( $comment_ID = 0, $args = array() ) {
-	$comment = get_comment( $comment_ID );
+function comment_text($comment_ID = 0, $args = array()) {
+	$comment = get_comment($comment_ID);
 
-	$comment_text = get_comment_text( $comment, $args );
+	$comment_text = get_comment_text($comment, $args);
 	/**
 	 * Filters the text of a comment to be displayed.
 	 *
@@ -992,7 +992,7 @@ 
 	 * @param WP_Comment|null $comment      The comment object.
 	 * @param array           $args         An array of arguments.
 	 */
-	echo apply_filters( 'comment_text', $comment_text, $comment, $args );
+	echo apply_filters('comment_text', $comment_text, $comment, $args);
 }
 
 /**
@@ -1006,11 +1006,11 @@ 
  *                          Default true.
  * @return string The formatted time.
  */
-function get_comment_time( $d = '', $gmt = false, $translate = true ) {
+function get_comment_time($d = '', $gmt = false, $translate = true) {
 	$comment = get_comment();
 
 	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
-	if ( '' == $d )
+	if ('' == $d)
 		$date = mysql2date(get_option('time_format'), $comment_date, $translate);
 	else
 		$date = mysql2date($d, $comment_date, $translate);
@@ -1026,7 +1026,7 @@ 
 	 * @param bool       $translate Whether the time is translated.
 	 * @param WP_Comment $comment   The comment object.
 	 */
-	return apply_filters( 'get_comment_time', $date, $d, $gmt, $translate, $comment );
+	return apply_filters('get_comment_time', $date, $d, $gmt, $translate, $comment);
 }
 
 /**
@@ -1036,7 +1036,7 @@ 
  *
  * @param string $d Optional. The format of the time. Default user's settings.
  */
-function comment_time( $d = '' ) {
+function comment_time($d = '') {
 	echo get_comment_time($d);
 }
 
@@ -1050,9 +1050,9 @@ 
  *                                   Default current comment.
  * @return string The comment type.
  */
-function get_comment_type( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	if ( '' == $comment->comment_type )
+function get_comment_type($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	if ('' == $comment->comment_type)
 		$comment->comment_type = 'comment';
 
 	/**
@@ -1065,7 +1065,7 @@ 
 	 * @param int 	     $comment_ID   The comment ID.
 	 * @param WP_Comment $comment      The comment object.
 	 */
-	return apply_filters( 'get_comment_type', $comment->comment_type, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_type', $comment->comment_type, $comment->comment_ID, $comment);
 }
 
 /**
@@ -1077,12 +1077,12 @@ 
  * @param string $trackbacktxt Optional. String to display for trackback type. Default false.
  * @param string $pingbacktxt  Optional. String to display for pingback type. Default false.
  */
-function comment_type( $commenttxt = false, $trackbacktxt = false, $pingbacktxt = false ) {
-	if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-	if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-	if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+function comment_type($commenttxt = false, $trackbacktxt = false, $pingbacktxt = false) {
+	if (false === $commenttxt) $commenttxt = _x('Comment', 'noun');
+	if (false === $trackbacktxt) $trackbacktxt = __('Trackback');
+	if (false === $pingbacktxt) $pingbacktxt = __('Pingback');
 	$type = get_comment_type();
-	switch( $type ) {
+	switch ($type) {
 		case 'trackback' :
 			echo $trackbacktxt;
 			break;
@@ -1106,10 +1106,10 @@ 
  * @return string The trackback URL after being filtered.
  */
 function get_trackback_url() {
-	if ( '' != get_option('permalink_structure') )
-		$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
+	if ('' != get_option('permalink_structure'))
+		$tb_url = trailingslashit(get_permalink()).user_trailingslashit('trackback', 'single_trackback');
 	else
-		$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+		$tb_url = get_option('siteurl').'/wp-trackback.php?p='.get_the_ID();
 
 	/**
 	 * Filters the returned trackback URL.
@@ -1118,7 +1118,7 @@ 
 	 *
 	 * @param string $tb_url The trackback URL.
 	 */
-	return apply_filters( 'trackback_url', $tb_url );
+	return apply_filters('trackback_url', $tb_url);
 }
 
 /**
@@ -1130,17 +1130,17 @@ 
  * @return void|string Should only be used to echo the trackback URL, use get_trackback_url()
  *                     for the result instead.
  */
-function trackback_url( $deprecated_echo = true ) {
-	if ( true !== $deprecated_echo ) {
-		_deprecated_argument( __FUNCTION__, '2.5.0',
+function trackback_url($deprecated_echo = true) {
+	if (true !== $deprecated_echo) {
+		_deprecated_argument(__FUNCTION__, '2.5.0',
 			/* translators: %s: get_trackback_url() */
-			sprintf( __( 'Use %s instead if you do not want the value echoed.' ),
+			sprintf(__('Use %s instead if you do not want the value echoed.'),
 				'<code>get_trackback_url()</code>'
 			)
 		);
 	}
 
-	if ( $deprecated_echo ) {
+	if ($deprecated_echo) {
 		echo get_trackback_url();
 	} else {
 		return get_trackback_url();
@@ -1156,12 +1156,12 @@ 
  *
  * @param int $deprecated Not used (Was $timezone = 0).
  */
-function trackback_rdf( $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '2.5.0' );
+function trackback_rdf($deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '2.5.0');
 	}
 
-	if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && false !== stripos( $_SERVER['HTTP_USER_AGENT'], 'W3C_Validator' ) ) {
+	if (isset($_SERVER['HTTP_USER_AGENT']) && false !== stripos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator')) {
 		return;
 	}
 
@@ -1187,12 +1187,12 @@ 
  * @param int|WP_Post $post_id Post ID or WP_Post object. Default current post.
  * @return bool True if the comments are open.
  */
-function comments_open( $post_id = null ) {
+function comments_open($post_id = null) {
 
 	$_post = get_post($post_id);
 
 	$post_id = $_post ? $_post->ID : 0;
-	$open = ( 'open' == $_post->comment_status );
+	$open = ('open' == $_post->comment_status);
 
 	/**
 	 * Filters whether the current post is open for comments.
@@ -1202,7 +1202,7 @@ 
 	 * @param bool $open    Whether the current post is open for comments.
 	 * @param int  $post_id The post ID.
 	 */
-	return apply_filters( 'comments_open', $open, $post_id );
+	return apply_filters('comments_open', $open, $post_id);
 }
 
 /**
@@ -1213,12 +1213,12 @@ 
  * @param int|WP_Post $post_id Post ID or WP_Post object. Default current post.
  * @return bool True if pings are accepted
  */
-function pings_open( $post_id = null ) {
+function pings_open($post_id = null) {
 
 	$_post = get_post($post_id);
 
 	$post_id = $_post ? $_post->ID : 0;
-	$open = ( 'open' == $_post->ping_status );
+	$open = ('open' == $_post->ping_status);
 
 	/**
 	 * Filters whether the current post is open for pings.
@@ -1228,7 +1228,7 @@ 
 	 * @param bool $open    Whether the current post is open for pings.
 	 * @param int  $post_id The post ID.
 	 */
-	return apply_filters( 'pings_open', $open, $post_id );
+	return apply_filters('pings_open', $open, $post_id);
 }
 
 /**
@@ -1249,8 +1249,8 @@ 
 	$post = get_post();
 	$post_id = $post ? $post->ID : 0;
 
-	if ( current_user_can( 'unfiltered_html' ) ) {
-		wp_nonce_field( 'unfiltered-html-comment_' . $post_id, '_wp_unfiltered_html_comment_disabled', false );
+	if (current_user_can('unfiltered_html')) {
+		wp_nonce_field('unfiltered-html-comment_'.$post_id, '_wp_unfiltered_html_comment_disabled', false);
 		echo "<script>(function(){if(window===window.parent){document.getElementById('_wp_unfiltered_html_comment_disabled').name='_wp_unfiltered_html_comment';}})();</script>\n";
 	}
 }
@@ -1290,13 +1290,13 @@ 
  * @param bool   $separate_comments Optional. Whether to separate the comments by comment type.
  *                                  Default false.
  */
-function comments_template( $file = '/comments.php', $separate_comments = false ) {
+function comments_template($file = '/comments.php', $separate_comments = false) {
 	global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
 
-	if ( !(is_single() || is_page() || $withcomments) || empty($post) )
+	if ( ! (is_single() || is_page() || $withcomments) || empty($post))
 		return;
 
-	if ( empty($file) )
+	if (empty($file))
 		$file = '/comments.php';
 
 	$req = get_option('require_name_email');
@@ -1332,31 +1332,31 @@ 
 		'update_comment_meta_cache' => false, // We lazy-load comment meta for performance.
 	);
 
-	if ( get_option('thread_comments') ) {
+	if (get_option('thread_comments')) {
 		$comment_args['hierarchical'] = 'threaded';
 	} else {
 		$comment_args['hierarchical'] = false;
 	}
 
-	if ( $user_ID ) {
-		$comment_args['include_unapproved'] = array( $user_ID );
-	} elseif ( ! empty( $comment_author_email ) ) {
-		$comment_args['include_unapproved'] = array( $comment_author_email );
+	if ($user_ID) {
+		$comment_args['include_unapproved'] = array($user_ID);
+	} elseif ( ! empty($comment_author_email)) {
+		$comment_args['include_unapproved'] = array($comment_author_email);
 	}
 
 	$per_page = 0;
-	if ( get_option( 'page_comments' ) ) {
-		$per_page = (int) get_query_var( 'comments_per_page' );
-		if ( 0 === $per_page ) {
-			$per_page = (int) get_option( 'comments_per_page' );
+	if (get_option('page_comments')) {
+		$per_page = (int) get_query_var('comments_per_page');
+		if (0 === $per_page) {
+			$per_page = (int) get_option('comments_per_page');
 		}
 
 		$comment_args['number'] = $per_page;
-		$page = (int) get_query_var( 'cpage' );
+		$page = (int) get_query_var('cpage');
 
-		if ( $page ) {
-			$comment_args['offset'] = ( $page - 1 ) * $per_page;
-		} elseif ( 'oldest' === get_option( 'default_comments_page' ) ) {
+		if ($page) {
+			$comment_args['offset'] = ($page - 1) * $per_page;
+		} elseif ('oldest' === get_option('default_comments_page')) {
 			$comment_args['offset'] = 0;
 		} else {
 			// If fetching the first page of 'newest', we need a top-level comment count.
@@ -1368,17 +1368,17 @@ 
 				'status'  => 'approve',
 			);
 
-			if ( $comment_args['hierarchical'] ) {
+			if ($comment_args['hierarchical']) {
 				$top_level_args['parent'] = 0;
 			}
 
-			if ( isset( $comment_args['include_unapproved'] ) ) {
+			if (isset($comment_args['include_unapproved'])) {
 				$top_level_args['include_unapproved'] = $comment_args['include_unapproved'];
 			}
 
-			$top_level_count = $top_level_query->query( $top_level_args );
+			$top_level_count = $top_level_query->query($top_level_args);
 
-			$comment_args['offset'] = ( ceil( $top_level_count / $per_page ) - 1 ) * $per_page;
+			$comment_args['offset'] = (ceil($top_level_count / $per_page) - 1) * $per_page;
 		}
 	}
 
@@ -1405,22 +1405,22 @@ 
 	 *     @type int          $number                    Number of comments to fetch.
 	 * }
 	 */
-	$comment_args = apply_filters( 'comments_template_query_args', $comment_args );
-	$comment_query = new WP_Comment_Query( $comment_args );
+	$comment_args = apply_filters('comments_template_query_args', $comment_args);
+	$comment_query = new WP_Comment_Query($comment_args);
 	$_comments = $comment_query->comments;
 
 	// Trees must be flattened before they're passed to the walker.
-	if ( $comment_args['hierarchical'] ) {
+	if ($comment_args['hierarchical']) {
 		$comments_flat = array();
-		foreach ( $_comments as $_comment ) {
+		foreach ($_comments as $_comment) {
 			$comments_flat[]  = $_comment;
-			$comment_children = $_comment->get_children( array(
+			$comment_children = $_comment->get_children(array(
 				'format' => 'flat',
 				'status' => $comment_args['status'],
 				'orderby' => $comment_args['orderby']
-			) );
+			));
 
-			foreach ( $comment_children as $comment_child ) {
+			foreach ($comment_children as $comment_child) {
 				$comments_flat[] = $comment_child;
 			}
 		}
@@ -1436,13 +1436,13 @@ 
 	 * @param array $comments Array of comments supplied to the comments template.
 	 * @param int   $post_ID  Post ID.
 	 */
-	$wp_query->comments = apply_filters( 'comments_array', $comments_flat, $post->ID );
+	$wp_query->comments = apply_filters('comments_array', $comments_flat, $post->ID);
 
 	$comments = &$wp_query->comments;
 	$wp_query->comment_count = count($wp_query->comments);
 	$wp_query->max_num_comment_pages = $comment_query->max_num_pages;
 
-	if ( $separate_comments ) {
+	if ($separate_comments) {
 		$wp_query->comments_by_type = separate_comments($comments);
 		$comments_by_type = &$wp_query->comments_by_type;
 	} else {
@@ -1450,15 +1450,15 @@ 
 	}
 
 	$overridden_cpage = false;
-	if ( '' == get_query_var( 'cpage' ) && $wp_query->max_num_comment_pages > 1 ) {
-		set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
+	if ('' == get_query_var('cpage') && $wp_query->max_num_comment_pages > 1) {
+		set_query_var('cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1);
 		$overridden_cpage = true;
 	}
 
-	if ( !defined('COMMENTS_TEMPLATE') )
+	if ( ! defined('COMMENTS_TEMPLATE'))
 		define('COMMENTS_TEMPLATE', true);
 
-	$theme_template = STYLESHEETPATH . $file;
+	$theme_template = STYLESHEETPATH.$file;
 	/**
 	 * Filters the path to the theme template file used for the comments template.
 	 *
@@ -1466,13 +1466,13 @@ 
 	 *
 	 * @param string $theme_template The path to the theme template file.
 	 */
-	$include = apply_filters( 'comments_template', $theme_template );
-	if ( file_exists( $include ) )
-		require( $include );
-	elseif ( file_exists( TEMPLATEPATH . $file ) )
-		require( TEMPLATEPATH . $file );
+	$include = apply_filters('comments_template', $theme_template);
+	if (file_exists($include))
+		require($include);
+	elseif (file_exists(TEMPLATEPATH.$file))
+		require(TEMPLATEPATH.$file);
 	else // Backward compat code will be removed in a future release
-		require( ABSPATH . WPINC . '/theme-compat/comments.php');
+		require(ABSPATH.WPINC.'/theme-compat/comments.php');
 }
 
 /**
@@ -1489,45 +1489,45 @@ 
  * @param string $none      Optional. String to display when comments have been turned off.
  *                          Default false.
  */
-function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
+function comments_popup_link($zero = false, $one = false, $more = false, $css_class = '', $none = false) {
 	$id = get_the_ID();
 	$title = get_the_title();
-	$number = get_comments_number( $id );
+	$number = get_comments_number($id);
 
-	if ( false === $zero ) {
+	if (false === $zero) {
 		/* translators: %s: post title */
-		$zero = sprintf( __( 'No Comments<span class="screen-reader-text"> on %s</span>' ), $title );
+		$zero = sprintf(__('No Comments<span class="screen-reader-text"> on %s</span>'), $title);
 	}
 
-	if ( false === $one ) {
+	if (false === $one) {
 		/* translators: %s: post title */
-		$one = sprintf( __( '1 Comment<span class="screen-reader-text"> on %s</span>' ), $title );
+		$one = sprintf(__('1 Comment<span class="screen-reader-text"> on %s</span>'), $title);
 	}
 
-	if ( false === $more ) {
+	if (false === $more) {
 		/* translators: 1: Number of comments 2: post title */
-		$more = _n( '%1$s Comment<span class="screen-reader-text"> on %2$s</span>', '%1$s Comments<span class="screen-reader-text"> on %2$s</span>', $number );
-		$more = sprintf( $more, number_format_i18n( $number ), $title );
+		$more = _n('%1$s Comment<span class="screen-reader-text"> on %2$s</span>', '%1$s Comments<span class="screen-reader-text"> on %2$s</span>', $number);
+		$more = sprintf($more, number_format_i18n($number), $title);
 	}
 
-	if ( false === $none ) {
+	if (false === $none) {
 		/* translators: %s: post title */
-		$none = sprintf( __( 'Comments Off<span class="screen-reader-text"> on %s</span>' ), $title );
+		$none = sprintf(__('Comments Off<span class="screen-reader-text"> on %s</span>'), $title);
 	}
 
-	if ( 0 == $number && !comments_open() && !pings_open() ) {
-		echo '<span' . ((!empty($css_class)) ? ' class="' . esc_attr( $css_class ) . '"' : '') . '>' . $none . '</span>';
+	if (0 == $number && ! comments_open() && ! pings_open()) {
+		echo '<span'.(( ! empty($css_class)) ? ' class="'.esc_attr($css_class).'"' : '').'>'.$none.'</span>';
 		return;
 	}
 
-	if ( post_password_required() ) {
-		_e( 'Enter your password to view comments.' );
+	if (post_password_required()) {
+		_e('Enter your password to view comments.');
 		return;
 	}
 
 	echo '<a href="';
-	if ( 0 == $number ) {
-		$respond_link = get_permalink() . '#respond';
+	if (0 == $number) {
+		$respond_link = get_permalink().'#respond';
 		/**
 		 * Filters the respond link when a post has no comments.
 		 *
@@ -1536,13 +1536,13 @@ 
 		 * @param string $respond_link The default response link.
 		 * @param integer $id The post ID.
 		 */
-		echo apply_filters( 'respond_link', $respond_link, $id );
+		echo apply_filters('respond_link', $respond_link, $id);
 	} else {
 		comments_link();
 	}
 	echo '"';
 
-	if ( !empty( $css_class ) ) {
+	if ( ! empty($css_class)) {
 		echo ' class="'.$css_class.'" ';
 	}
 
@@ -1554,10 +1554,10 @@ 
 	 *
 	 * @param string $attributes The comments link attributes. Default empty.
 	 */
-	echo apply_filters( 'comments_popup_link_attributes', $attributes );
+	echo apply_filters('comments_popup_link_attributes', $attributes);
 
 	echo '>';
-	comments_number( $zero, $one, $more );
+	comments_number($zero, $one, $more);
 	echo '</a>';
 }
 
@@ -1589,35 +1589,35 @@ 
  *                                Default current post.
  * @return void|false|string Link to show comment form, if successful. False, if comments are closed.
  */
-function get_comment_reply_link( $args = array(), $comment = null, $post = null ) {
+function get_comment_reply_link($args = array(), $comment = null, $post = null) {
 	$defaults = array(
 		'add_below'     => 'comment',
 		'respond_id'    => 'respond',
-		'reply_text'    => __( 'Reply' ),
+		'reply_text'    => __('Reply'),
 		/* translators: Comment reply button text. 1: Comment author name */
-		'reply_to_text' => __( 'Reply to %s' ),
-		'login_text'    => __( 'Log in to Reply' ),
+		'reply_to_text' => __('Reply to %s'),
+		'login_text'    => __('Log in to Reply'),
 		'max_depth'     => 0,
 		'depth'         => 0,
 		'before'        => '',
 		'after'         => ''
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( 0 == $args['depth'] || $args['max_depth'] <= $args['depth'] ) {
+	if (0 == $args['depth'] || $args['max_depth'] <= $args['depth']) {
 		return;
 	}
 
-	$comment = get_comment( $comment );
+	$comment = get_comment($comment);
 
-	if ( empty( $post ) ) {
+	if (empty($post)) {
 		$post = $comment->comment_post_ID;
 	}
 
-	$post = get_post( $post );
+	$post = get_post($post);
 
-	if ( ! comments_open( $post->ID ) ) {
+	if ( ! comments_open($post->ID)) {
 		return false;
 	}
 
@@ -1631,22 +1631,22 @@ 
 	 * @param WP_Comment $comment The object of the comment being replied to.
 	 * @param WP_Post    $post    The WP_Post object.
 	 */
-	$args = apply_filters( 'comment_reply_link_args', $args, $comment, $post );
+	$args = apply_filters('comment_reply_link_args', $args, $comment, $post);
 
-	if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) {
-		$link = sprintf( '<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
-			esc_url( wp_login_url( get_permalink() ) ),
+	if (get_option('comment_registration') && ! is_user_logged_in()) {
+		$link = sprintf('<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
+			esc_url(wp_login_url(get_permalink())),
 			$args['login_text']
 		);
 	} else {
-		$onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "%2$s", "%3$s", "%4$s" )',
+		$onclick = sprintf('return addComment.moveForm( "%1$s-%2$s", "%2$s", "%3$s", "%4$s" )',
 			$args['add_below'], $comment->comment_ID, $args['respond_id'], $post->ID
 		);
 
-		$link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
-			esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . "#" . $args['respond_id'],
+		$link = sprintf("<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
+			esc_url(add_query_arg('replytocom', $comment->comment_ID, get_permalink($post->ID)))."#".$args['respond_id'],
 			$onclick,
-			esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
+			esc_attr(sprintf($args['reply_to_text'], $comment->comment_author)),
 			$args['reply_text']
 		);
 	}
@@ -1661,7 +1661,7 @@ 
 	 * @param object  $comment The object of the comment being replied.
 	 * @param WP_Post $post    The WP_Post object.
 	 */
-	return apply_filters( 'comment_reply_link', $args['before'] . $link . $args['after'], $args, $comment, $post );
+	return apply_filters('comment_reply_link', $args['before'].$link.$args['after'], $args, $comment, $post);
 }
 
 /**
@@ -1718,27 +1718,27 @@ 
 
 	$post = get_post($post);
 
-	if ( ! comments_open( $post->ID ) ) {
+	if ( ! comments_open($post->ID)) {
 		return false;
 	}
 
-	if ( get_option('comment_registration') && ! is_user_logged_in() ) {
-		$link = sprintf( '<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
-			wp_login_url( get_permalink() ),
+	if (get_option('comment_registration') && ! is_user_logged_in()) {
+		$link = sprintf('<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
+			wp_login_url(get_permalink()),
 			$args['login_text']
 		);
 	} else {
-		$onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
+		$onclick = sprintf('return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
 			$args['add_below'], $post->ID, $args['respond_id']
 		);
 
-		$link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s'>%s</a>",
-			get_permalink( $post->ID ) . '#' . $args['respond_id'],
+		$link = sprintf("<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s'>%s</a>",
+			get_permalink($post->ID).'#'.$args['respond_id'],
 			$onclick,
 			$args['reply_text']
 		);
 	}
-	$formatted_link = $args['before'] . $link . $args['after'];
+	$formatted_link = $args['before'].$link.$args['after'];
 
 	/**
 	 * Filters the formatted post comments link HTML.
@@ -1748,7 +1748,7 @@ 
 	 * @param string      $formatted The HTML-formatted post comments link.
 	 * @param int|WP_Post $post      The post ID or WP_Post object.
 	 */
-	return apply_filters( 'post_comments_link', $formatted_link, $post );
+	return apply_filters('post_comments_link', $formatted_link, $post);
 }
 
 /**
@@ -1775,14 +1775,14 @@ 
  * @param string $text Optional. Text to display for cancel reply link. Default empty.
  * @return string
  */
-function get_cancel_comment_reply_link( $text = '' ) {
-	if ( empty($text) )
+function get_cancel_comment_reply_link($text = '') {
+	if (empty($text))
 		$text = __('Click here to cancel reply.');
 
 	$style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
-	$link = esc_html( remove_query_arg('replytocom') ) . '#respond';
+	$link = esc_html(remove_query_arg('replytocom')).'#respond';
 
-	$formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="' . $link . '"' . $style . '>' . $text . '</a>';
+	$formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="'.$link.'"'.$style.'>'.$text.'</a>';
 
 	/**
 	 * Filters the cancel comment reply link HTML.
@@ -1793,7 +1793,7 @@ 
 	 * @param string $link           Cancel comment reply link URL.
 	 * @param string $text           Cancel comment reply link text.
 	 */
-	return apply_filters( 'cancel_comment_reply_link', $formatted_link, $link, $text );
+	return apply_filters('cancel_comment_reply_link', $formatted_link, $link, $text);
 }
 
 /**
@@ -1803,7 +1803,7 @@ 
  *
  * @param string $text Optional. Text to display for cancel reply link. Default empty.
  */
-function cancel_comment_reply_link( $text = '' ) {
+function cancel_comment_reply_link($text = '') {
 	echo get_cancel_comment_reply_link($text);
 }
 
@@ -1815,8 +1815,8 @@ 
  * @param int $id Optional. Post ID. Default current post ID.
  * @return string Hidden input HTML for replying to comments
  */
-function get_comment_id_fields( $id = 0 ) {
-	if ( empty( $id ) )
+function get_comment_id_fields($id = 0) {
+	if (empty($id))
 		$id = get_the_ID();
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
@@ -1832,7 +1832,7 @@ 
 	 * @param int    $id        The post ID.
 	 * @param int    $replytoid The id of the comment being replied to.
 	 */
-	return apply_filters( 'comment_id_fields', $result, $id, $replytoid );
+	return apply_filters('comment_id_fields', $result, $id, $replytoid);
 }
 
 /**
@@ -1842,8 +1842,8 @@ 
  *
  * @param int $id Optional. Post ID. Default current post ID.
  */
-function comment_id_fields( $id = 0 ) {
-	echo get_comment_id_fields( $id );
+function comment_id_fields($id = 0) {
+	echo get_comment_id_fields($id);
 }
 
 /**
@@ -1866,21 +1866,21 @@ 
  * @param string $linktoparent Optional. Boolean to control making the author's name a link
  *                             to their comment. Default true.
  */
-function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
+function comment_form_title($noreplytext = false, $replytext = false, $linktoparent = true) {
 	global $comment;
 
-	if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
-	if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
+	if (false === $noreplytext) $noreplytext = __('Leave a Reply');
+	if (false === $replytext) $replytext = __('Leave a Reply to %s');
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 
-	if ( 0 == $replytoid )
+	if (0 == $replytoid)
 		echo $noreplytext;
 	else {
 		// Sets the global so that template tags can be used in the comment form.
 		$comment = get_comment($replytoid);
-		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $comment ) . '</a>' : get_comment_author( $comment );
-		printf( $replytext, $author );
+		$author = ($linktoparent) ? '<a href="#comment-'.get_comment_ID().'">'.get_comment_author($comment).'</a>' : get_comment_author($comment);
+		printf($replytext, $author);
 	}
 }
 
@@ -1922,7 +1922,7 @@ 
  * }
  * @param array $comments Optional. Array of WP_Comment objects.
  */
-function wp_list_comments( $args = array(), $comments = null ) {
+function wp_list_comments($args = array(), $comments = null) {
 	global $wp_query, $comment_alt, $comment_depth, $comment_thread_alt, $overridden_cpage, $in_comment_loop;
 
 	$in_comment_loop = true;
@@ -1942,12 +1942,12 @@ 
 		'avatar_size'       => 32,
 		'reverse_top_level' => null,
 		'reverse_children'  => '',
-		'format'            => current_theme_supports( 'html5', 'comment-list' ) ? 'html5' : 'xhtml',
+		'format'            => current_theme_supports('html5', 'comment-list') ? 'html5' : 'xhtml',
 		'short_ping'        => false,
 		'echo'              => true,
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	/**
 	 * Filters the arguments used in retrieving the comment list.
@@ -1958,16 +1958,16 @@ 
 	 *
 	 * @param array $r An array of arguments for displaying comments.
 	 */
-	$r = apply_filters( 'wp_list_comments_args', $r );
+	$r = apply_filters('wp_list_comments_args', $r);
 
 	// Figure out what comments we'll be looping through ($_comments)
-	if ( null !== $comments ) {
+	if (null !== $comments) {
 		$comments = (array) $comments;
-		if ( empty($comments) )
+		if (empty($comments))
 			return;
-		if ( 'all' != $r['type'] ) {
+		if ('all' != $r['type']) {
 			$comments_by_type = separate_comments($comments);
-			if ( empty($comments_by_type[$r['type']]) )
+			if (empty($comments_by_type[$r['type']]))
 				return;
 			$_comments = $comments_by_type[$r['type']];
 		} else {
@@ -1978,14 +1978,14 @@ 
 		 * If 'page' or 'per_page' has been passed, and does not match what's in $wp_query,
 		 * perform a separate comment query and allow Walker_Comment to paginate.
 		 */
-		if ( $r['page'] || $r['per_page'] ) {
-			$current_cpage = get_query_var( 'cpage' );
-			if ( ! $current_cpage ) {
-				$current_cpage = 'newest' === get_option( 'default_comments_page' ) ? 1 : $wp_query->max_num_comment_pages;
+		if ($r['page'] || $r['per_page']) {
+			$current_cpage = get_query_var('cpage');
+			if ( ! $current_cpage) {
+				$current_cpage = 'newest' === get_option('default_comments_page') ? 1 : $wp_query->max_num_comment_pages;
 			}
 
-			$current_per_page = get_query_var( 'comments_per_page' );
-			if ( $r['page'] != $current_cpage || $r['per_page'] != $current_per_page ) {
+			$current_per_page = get_query_var('comments_per_page');
+			if ($r['page'] != $current_cpage || $r['per_page'] != $current_per_page) {
 				$comment_args = array(
 					'post_id' => get_the_ID(),
 					'orderby' => 'comment_date_gmt',
@@ -1993,24 +1993,24 @@ 
 					'status' => 'approve',
 				);
 
-				if ( is_user_logged_in() ) {
+				if (is_user_logged_in()) {
 					$comment_args['include_unapproved'] = get_current_user_id();
 				} else {
 					$commenter = wp_get_current_commenter();
-					if ( $commenter['comment_author_email'] ) {
+					if ($commenter['comment_author_email']) {
 						$comment_args['include_unapproved'] = $commenter['comment_author_email'];
 					}
 				}
 
-				$comments = get_comments( $comment_args );
+				$comments = get_comments($comment_args);
 
-				if ( 'all' != $r['type'] ) {
-					$comments_by_type = separate_comments( $comments );
-					if ( empty( $comments_by_type[ $r['type'] ] ) ) {
+				if ('all' != $r['type']) {
+					$comments_by_type = separate_comments($comments);
+					if (empty($comments_by_type[$r['type']])) {
 						return;
 					}
 
-					$_comments = $comments_by_type[ $r['type'] ];
+					$_comments = $comments_by_type[$r['type']];
 				} else {
 					$_comments = $comments;
 				}
@@ -2018,29 +2018,29 @@ 
 
 		// Otherwise, fall back on the comments from `$wp_query->comments`.
 		} else {
-			if ( empty($wp_query->comments) )
+			if (empty($wp_query->comments))
 				return;
-			if ( 'all' != $r['type'] ) {
-				if ( empty($wp_query->comments_by_type) )
+			if ('all' != $r['type']) {
+				if (empty($wp_query->comments_by_type))
 					$wp_query->comments_by_type = separate_comments($wp_query->comments);
-				if ( empty($wp_query->comments_by_type[$r['type']]) )
+				if (empty($wp_query->comments_by_type[$r['type']]))
 					return;
 				$_comments = $wp_query->comments_by_type[$r['type']];
 			} else {
 				$_comments = $wp_query->comments;
 			}
 
-			if ( $wp_query->max_num_comment_pages ) {
-				$default_comments_page = get_option( 'default_comments_page' );
-				$cpage = get_query_var( 'cpage' );
-				if ( 'newest' === $default_comments_page ) {
+			if ($wp_query->max_num_comment_pages) {
+				$default_comments_page = get_option('default_comments_page');
+				$cpage = get_query_var('cpage');
+				if ('newest' === $default_comments_page) {
 					$r['cpage'] = $cpage;
 
 				/*
 				 * When first page shows oldest comments, post permalink is the same as
 				 * the comment permalink.
 				 */
-				} elseif ( $cpage == 1 ) {
+				} elseif ($cpage == 1) {
 					$r['cpage'] = '';
 				} else {
 					$r['cpage'] = $cpage;
@@ -2052,52 +2052,52 @@ 
 		}
 	}
 
-	if ( '' === $r['per_page'] && get_option( 'page_comments' ) ) {
+	if ('' === $r['per_page'] && get_option('page_comments')) {
 		$r['per_page'] = get_query_var('comments_per_page');
 	}
 
-	if ( empty($r['per_page']) ) {
+	if (empty($r['per_page'])) {
 		$r['per_page'] = 0;
 		$r['page'] = 0;
 	}
 
-	if ( '' === $r['max_depth'] ) {
-		if ( get_option('thread_comments') )
+	if ('' === $r['max_depth']) {
+		if (get_option('thread_comments'))
 			$r['max_depth'] = get_option('thread_comments_depth');
 		else
 			$r['max_depth'] = -1;
 	}
 
-	if ( '' === $r['page'] ) {
-		if ( empty($overridden_cpage) ) {
+	if ('' === $r['page']) {
+		if (empty($overridden_cpage)) {
 			$r['page'] = get_query_var('cpage');
 		} else {
 			$threaded = ( -1 != $r['max_depth'] );
-			$r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
-			set_query_var( 'cpage', $r['page'] );
+			$r['page'] = ('newest' == get_option('default_comments_page')) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
+			set_query_var('cpage', $r['page']);
 		}
 	}
 	// Validation check
 	$r['page'] = intval($r['page']);
-	if ( 0 == $r['page'] && 0 != $r['per_page'] )
+	if (0 == $r['page'] && 0 != $r['per_page'])
 		$r['page'] = 1;
 
-	if ( null === $r['reverse_top_level'] )
-		$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+	if (null === $r['reverse_top_level'])
+		$r['reverse_top_level'] = ('desc' == get_option('comment_order'));
 
-	wp_queue_comments_for_comment_meta_lazyload( $_comments );
+	wp_queue_comments_for_comment_meta_lazyload($_comments);
 
-	if ( empty( $r['walker'] ) ) {
+	if (empty($r['walker'])) {
 		$walker = new Walker_Comment;
 	} else {
 		$walker = $r['walker'];
 	}
 
-	$output = $walker->paged_walk( $_comments, $r['max_depth'], $r['page'], $r['per_page'], $r );
+	$output = $walker->paged_walk($_comments, $r['max_depth'], $r['page'], $r['per_page'], $r);
 
 	$in_comment_loop = false;
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	} else {
 		return $output;
@@ -2166,18 +2166,18 @@ 
  * }
  * @param int|WP_Post $post_id Post ID or WP_Post object to generate the form for. Default current post.
  */
-function comment_form( $args = array(), $post_id = null ) {
-	if ( null === $post_id )
+function comment_form($args = array(), $post_id = null) {
+	if (null === $post_id)
 		$post_id = get_the_ID();
 
 	// Exit the function when comments for the post are closed.
-	if ( ! comments_open( $post_id ) ) {
+	if ( ! comments_open($post_id)) {
 		/**
 		 * Fires after the comment form if comments are closed.
 		 *
 		 * @since 3.0.0
 		 */
-		do_action( 'comment_form_comments_closed' );
+		do_action('comment_form_comments_closed');
 
 		return;
 	}
@@ -2186,24 +2186,24 @@ 
 	$user = wp_get_current_user();
 	$user_identity = $user->exists() ? $user->display_name : '';
 
-	$args = wp_parse_args( $args );
-	if ( ! isset( $args['format'] ) )
-		$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+	$args = wp_parse_args($args);
+	if ( ! isset($args['format']))
+		$args['format'] = current_theme_supports('html5', 'comment-form') ? 'html5' : 'xhtml';
 
-	$req      = get_option( 'require_name_email' );
-	$aria_req = ( $req ? " aria-required='true'" : '' );
-	$html_req = ( $req ? " required='required'" : '' );
+	$req      = get_option('require_name_email');
+	$aria_req = ($req ? " aria-required='true'" : '');
+	$html_req = ($req ? " required='required'" : '');
 	$html5    = 'html5' === $args['format'];
-	$fields   =  array(
-		'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_req . $html_req . ' /></p>',
-		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
-		'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
-		            '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
+	$fields   = array(
+		'author' => '<p class="comment-form-author">'.'<label for="author">'.__('Name').($req ? ' <span class="required">*</span>' : '').'</label> '.
+		            '<input id="author" name="author" type="text" value="'.esc_attr($commenter['comment_author']).'" size="30" maxlength="245"'.$aria_req.$html_req.' /></p>',
+		'email'  => '<p class="comment-form-email"><label for="email">'.__('Email').($req ? ' <span class="required">*</span>' : '').'</label> '.
+		            '<input id="email" name="email" '.($html5 ? 'type="email"' : 'type="text"').' value="'.esc_attr($commenter['comment_author_email']).'" size="30" maxlength="100" aria-describedby="email-notes"'.$aria_req.$html_req.' /></p>',
+		'url'    => '<p class="comment-form-url"><label for="url">'.__('Website').'</label> '.
+		            '<input id="url" name="url" '.($html5 ? 'type="url"' : 'type="text"').' value="'.esc_attr($commenter['comment_author_url']).'" size="30" maxlength="200" /></p>',
 	);
 
-	$required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
+	$required_text = sprintf(' '.__('Required fields are marked %s'), '<span class="required">*</span>');
 
 	/**
 	 * Filters the default comment form fields.
@@ -2212,42 +2212,42 @@ 
 	 *
 	 * @param array $fields The default comment fields.
 	 */
-	$fields = apply_filters( 'comment_form_default_fields', $fields );
+	$fields = apply_filters('comment_form_default_fields', $fields);
 	$defaults = array(
 		'fields'               => $fields,
-		'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
+		'comment_field'        => '<p class="comment-form-comment"><label for="comment">'._x('Comment', 'noun').'</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
 		/** This filter is documented in wp-includes/link-template.php */
-		'must_log_in'          => '<p class="must-log-in">' . sprintf(
+		'must_log_in'          => '<p class="must-log-in">'.sprintf(
 		                              /* translators: %s: login URL */
-		                              __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
-		                              wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
-		                          ) . '</p>',
+		                              __('You must be <a href="%s">logged in</a> to post a comment.'),
+		                              wp_login_url(apply_filters('the_permalink', get_permalink($post_id)))
+		                          ).'</p>',
 		/** This filter is documented in wp-includes/link-template.php */
-		'logged_in_as'         => '<p class="logged-in-as">' . sprintf(
+		'logged_in_as'         => '<p class="logged-in-as">'.sprintf(
 		                              /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
-		                              __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
+		                              __('<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>'),
 		                              get_edit_user_link(),
 		                              /* translators: %s: user name */
-		                              esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
+		                              esc_attr(sprintf(__('Logged in as %s. Edit your profile.'), $user_identity)),
 		                              $user_identity,
-		                              wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
-		                          ) . '</p>',
-		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>'. ( $req ? $required_text : '' ) . '</p>',
+		                              wp_logout_url(apply_filters('the_permalink', get_permalink($post_id)))
+		                          ).'</p>',
+		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">'.__('Your email address will not be published.').'</span>'.($req ? $required_text : '').'</p>',
 		'comment_notes_after'  => '',
-		'action'               => site_url( '/wp-comments-post.php' ),
+		'action'               => site_url('/wp-comments-post.php'),
 		'id_form'              => 'commentform',
 		'id_submit'            => 'submit',
 		'class_form'           => 'comment-form',
 		'class_submit'         => 'submit',
 		'name_submit'          => 'submit',
-		'title_reply'          => __( 'Leave a Reply' ),
-		'title_reply_to'       => __( 'Leave a Reply to %s' ),
+		'title_reply'          => __('Leave a Reply'),
+		'title_reply_to'       => __('Leave a Reply to %s'),
 		'title_reply_before'   => '<h3 id="reply-title" class="comment-reply-title">',
 		'title_reply_after'    => '</h3>',
 		'cancel_reply_before'  => ' <small>',
 		'cancel_reply_after'   => '</small>',
-		'cancel_reply_link'    => __( 'Cancel reply' ),
-		'label_submit'         => __( 'Post Comment' ),
+		'cancel_reply_link'    => __('Cancel reply'),
+		'label_submit'         => __('Post Comment'),
 		'submit_button'        => '<input name="%1$s" type="submit" id="%2$s" class="%3$s" value="%4$s" />',
 		'submit_field'         => '<p class="form-submit">%1$s %2$s</p>',
 		'format'               => 'xhtml',
@@ -2262,51 +2262,51 @@ 
 	 *
 	 * @param array $defaults The default comment form arguments.
 	 */
-	$args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
+	$args = wp_parse_args($args, apply_filters('comment_form_defaults', $defaults));
 
 	// Ensure that the filtered args contain all required default values.
-	$args = array_merge( $defaults, $args );
+	$args = array_merge($defaults, $args);
 
 	/**
 	 * Fires before the comment form.
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'comment_form_before' );
+	do_action('comment_form_before');
 	?>
 	<div id="respond" class="comment-respond">
 		<?php
 		echo $args['title_reply_before'];
 
-		comment_form_title( $args['title_reply'], $args['title_reply_to'] );
+		comment_form_title($args['title_reply'], $args['title_reply_to']);
 
 		echo $args['cancel_reply_before'];
 
-		cancel_comment_reply_link( $args['cancel_reply_link'] );
+		cancel_comment_reply_link($args['cancel_reply_link']);
 
 		echo $args['cancel_reply_after'];
 
 		echo $args['title_reply_after'];
 
-		if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) :
+		if (get_option('comment_registration') && ! is_user_logged_in()) :
 			echo $args['must_log_in'];
 			/**
 			 * Fires after the HTML-formatted 'must log in after' message in the comment form.
 			 *
 			 * @since 3.0.0
 			 */
-			do_action( 'comment_form_must_log_in_after' );
+			do_action('comment_form_must_log_in_after');
 		else : ?>
-			<form action="<?php echo esc_url( $args['action'] ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
+			<form action="<?php echo esc_url($args['action']); ?>" method="post" id="<?php echo esc_attr($args['id_form']); ?>" class="<?php echo esc_attr($args['class_form']); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
 				<?php
 				/**
 				 * Fires at the top of the comment form, inside the form tag.
 				 *
 				 * @since 3.0.0
 				 */
-				do_action( 'comment_form_top' );
+				do_action('comment_form_top');
 
-				if ( is_user_logged_in() ) :
+				if (is_user_logged_in()) :
 					/**
 					 * Filters the 'logged in' message for the comment form for display.
 					 *
@@ -2318,7 +2318,7 @@ 
 					 * @param string $user_identity  If the commenter is a registered user,
 					 *                               the display name, blank otherwise.
 					 */
-					echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity );
+					echo apply_filters('comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity);
 
 					/**
 					 * Fires after the is_user_logged_in() check in the comment form.
@@ -2330,7 +2330,7 @@ 
 					 * @param string $user_identity If the commenter is a registered user,
 					 *                              the display name, blank otherwise.
 					 */
-					do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
+					do_action('comment_form_logged_in_after', $commenter, $user_identity);
 
 				else :
 
@@ -2339,7 +2339,7 @@ 
 				endif;
 
 				// Prepare an array of all fields, including the textarea
-				$comment_fields = array( 'comment' => $args['comment_field'] ) + (array) $args['fields'];
+				$comment_fields = array('comment' => $args['comment_field']) + (array) $args['fields'];
 
 				/**
 				 * Filters the comment form fields, including the textarea.
@@ -2348,18 +2348,18 @@ 
 				 *
 				 * @param array $comment_fields The comment fields.
 				 */
-				$comment_fields = apply_filters( 'comment_form_fields', $comment_fields );
+				$comment_fields = apply_filters('comment_form_fields', $comment_fields);
 
 				// Get an array of field names, excluding the textarea
-				$comment_field_keys = array_diff( array_keys( $comment_fields ), array( 'comment' ) );
+				$comment_field_keys = array_diff(array_keys($comment_fields), array('comment'));
 
 				// Get the first and the last field name, excluding the textarea
-				$first_field = reset( $comment_field_keys );
-				$last_field  = end( $comment_field_keys );
+				$first_field = reset($comment_field_keys);
+				$last_field  = end($comment_field_keys);
 
-				foreach ( $comment_fields as $name => $field ) {
+				foreach ($comment_fields as $name => $field) {
 
-					if ( 'comment' === $name ) {
+					if ('comment' === $name) {
 
 						/**
 						 * Filters the content of the comment textarea field for display.
@@ -2368,19 +2368,19 @@ 
 						 *
 						 * @param string $args_comment_field The content of the comment textarea field.
 						 */
-						echo apply_filters( 'comment_form_field_comment', $field );
+						echo apply_filters('comment_form_field_comment', $field);
 
 						echo $args['comment_notes_after'];
 
-					} elseif ( ! is_user_logged_in() ) {
+					} elseif ( ! is_user_logged_in()) {
 
-						if ( $first_field === $name ) {
+						if ($first_field === $name) {
 							/**
 							 * Fires before the comment fields in the comment form, excluding the textarea.
 							 *
 							 * @since 3.0.0
 							 */
-							do_action( 'comment_form_before_fields' );
+							do_action('comment_form_before_fields');
 						}
 
 						/**
@@ -2393,25 +2393,25 @@ 
 						 *
 						 * @param string $field The HTML-formatted output of the comment form field.
 						 */
-						echo apply_filters( "comment_form_field_{$name}", $field ) . "\n";
+						echo apply_filters("comment_form_field_{$name}", $field)."\n";
 
-						if ( $last_field === $name ) {
+						if ($last_field === $name) {
 							/**
 							 * Fires after the comment fields in the comment form, excluding the textarea.
 							 *
 							 * @since 3.0.0
 							 */
-							do_action( 'comment_form_after_fields' );
+							do_action('comment_form_after_fields');
 						}
 					}
 				}
 
 				$submit_button = sprintf(
 					$args['submit_button'],
-					esc_attr( $args['name_submit'] ),
-					esc_attr( $args['id_submit'] ),
-					esc_attr( $args['class_submit'] ),
-					esc_attr( $args['label_submit'] )
+					esc_attr($args['name_submit']),
+					esc_attr($args['id_submit']),
+					esc_attr($args['class_submit']),
+					esc_attr($args['label_submit'])
 				);
 
 				/**
@@ -2422,12 +2422,12 @@ 
 				 * @param string $submit_button HTML markup for the submit button.
 				 * @param array  $args          Arguments passed to `comment_form()`.
 				 */
-				$submit_button = apply_filters( 'comment_form_submit_button', $submit_button, $args );
+				$submit_button = apply_filters('comment_form_submit_button', $submit_button, $args);
 
 				$submit_field = sprintf(
 					$args['submit_field'],
 					$submit_button,
-					get_comment_id_fields( $post_id )
+					get_comment_id_fields($post_id)
 				);
 
 				/**
@@ -2441,7 +2441,7 @@ 
 				 * @param string $submit_field HTML markup for the submit field.
 				 * @param array  $args         Arguments passed to comment_form().
 				 */
-				echo apply_filters( 'comment_form_submit_field', $submit_field, $args );
+				echo apply_filters('comment_form_submit_field', $submit_field, $args);
 
 				/**
 				 * Fires at the bottom of the comment form, inside the closing </form> tag.
@@ -2450,7 +2450,7 @@ 
 				 *
 				 * @param int $post_id The post ID.
 				 */
-				do_action( 'comment_form', $post_id );
+				do_action('comment_form', $post_id);
 				?>
 			</form>
 		<?php endif; ?>
@@ -2462,5 +2462,5 @@ 
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'comment_form_after' );
+	do_action('comment_form_after');
 }

src/wp-includes/link-template.php

Doc Comments +9 added lines, -9 removed lines

@@ -12,7 +12,7 @@ 
  * @since 1.2.0
  * @since 4.4.0 Added the `$post` parameter.
  *
- * @param int|WP_Post $post Optional. Post ID or post object. Default is the global `$post`.
+ * @param integer $post Optional. Post ID or post object. Default is the global `$post`.
  */
 function the_permalink( $post = 0 ) {
 	/**
@@ -97,7 +97,7 @@ 
  *
  * @see get_permalink()
  *
- * @param int|WP_Post $post      Optional. Post ID or post object. Default is the global `$post`.
+ * @param integer $post      Optional. Post ID or post object. Default is the global `$post`.
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  *
  * @return string|false The permalink URL or false if post does not exist.
@@ -111,7 +111,7 @@ 
  *
  * @since 1.0.0
  *
- * @param int|WP_Post $post      Optional. Post ID or post object. Default is the global `$post`.
+ * @param integer $post      Optional. Post ID or post object. Default is the global `$post`.
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  * @return string|false The permalink URL or false if post does not exist.
  */
@@ -1387,7 +1387,7 @@ 
  *
  * @since 2.3.0
  *
- * @param int|WP_Comment $comment_id Optional. Comment ID or WP_Comment object.
+ * @param integer $comment_id Optional. Comment ID or WP_Comment object.
  * @return string|void The edit comment link URL for the given comment.
  */
 function get_edit_comment_link( $comment_id = 0 ) {
@@ -1447,7 +1447,7 @@ 
  *
  * @since 2.7.0
  *
- * @param int|stdClass $link Optional. Bookmark ID. Default is the id of the current bookmark.
+ * @param integer $link Optional. Bookmark ID. Default is the id of the current bookmark.
  * @return string|void The edit bookmark link URL.
  */
 function get_edit_bookmark_link( $link = 0 ) {
@@ -1545,7 +1545,7 @@ 
  * @since 1.5.0
  *
  * @param bool         $in_same_term   Optional. Whether post should be in a same taxonomy term. Default false.
- * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
+ * @param string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no
  *                             corresponding post exists.
@@ -1560,7 +1560,7 @@ 
  * @since 1.5.0
  *
  * @param bool         $in_same_term   Optional. Whether post should be in a same taxonomy term. Default false.
- * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
+ * @param string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no
  *                             corresponding post exists.
@@ -1873,7 +1873,7 @@ 
  *
  * @param bool         $in_same_term   Optional. Whether returned post should be in a same taxonomy term.
  *                                     Default false.
- * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ * @param string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  *                                     Default empty.
  * @param bool         $start          Optional. Whether to retrieve first or last post. Default true
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
@@ -2761,7 +2761,7 @@ 
  * @global WP_Rewrite $wp_rewrite
  *
  * @param string|array $args Optional args. See paginate_links(). Default empty array.
- * @return string|void Markup for pagination links.
+ * @return string Markup for pagination links.
  */
 function paginate_comments_links( $args = array() ) {
 	global $wp_rewrite;

Spacing +826 added lines, -826 removed lines

@@ -14,7 +14,7 @@ 
  *
  * @param int|WP_Post $post Optional. Post ID or post object. Default is the global `$post`.
  */
-function the_permalink( $post = 0 ) {
+function the_permalink($post = 0) {
 	/**
 	 * Filters the display of the permalink for the current post.
 	 *
@@ -24,7 +24,7 @@ 
 	 * @param string      $permalink The permalink for the current post.
 	 * @param int|WP_Post $post      Post ID, WP_Post object, or 0. Default 0.
 	 */
-	echo esc_url( apply_filters( 'the_permalink', get_permalink( $post ), $post ) );
+	echo esc_url(apply_filters('the_permalink', get_permalink($post), $post));
 }
 
 /**
@@ -46,7 +46,7 @@ 
  */
 function user_trailingslashit($string, $type_of_url = '') {
 	global $wp_rewrite;
-	if ( $wp_rewrite->use_trailing_slashes )
+	if ($wp_rewrite->use_trailing_slashes)
 		$string = trailingslashit($string);
 	else
 		$string = untrailingslashit($string);
@@ -61,7 +61,7 @@ 
 	 *                            'single_feed', 'single_paged', 'commentpaged', 'paged', 'home', 'feed',
 	 *                            'category', 'page', 'year', 'month', 'day', 'post_type_archive'.
 	 */
-	return apply_filters( 'user_trailingslashit', $string, $type_of_url );
+	return apply_filters('user_trailingslashit', $string, $type_of_url);
 }
 
 /**
@@ -74,16 +74,16 @@ 
  *
  * @param string $mode Optional. Permalink mode. Accepts 'title' or 'id'. Default 'id'.
  */
-function permalink_anchor( $mode = 'id' ) {
+function permalink_anchor($mode = 'id') {
 	$post = get_post();
-	switch ( strtolower( $mode ) ) {
+	switch (strtolower($mode)) {
 		case 'title':
-			$title = sanitize_title( $post->post_title ) . '-' . $post->ID;
+			$title = sanitize_title($post->post_title).'-'.$post->ID;
 			echo '<a id="'.$title.'"></a>';
 			break;
 		case 'id':
 		default:
-			echo '<a id="post-' . $post->ID . '"></a>';
+			echo '<a id="post-'.$post->ID.'"></a>';
 			break;
 	}
 }
@@ -102,8 +102,8 @@ 
  *
  * @return string|false The permalink URL or false if post does not exist.
  */
-function get_the_permalink( $post = 0, $leavename = false ) {
-	return get_permalink( $post, $leavename );
+function get_the_permalink($post = 0, $leavename = false) {
+	return get_permalink($post, $leavename);
 }
 
 /**
@@ -115,7 +115,7 @@ 
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  * @return string|false The permalink URL or false if post does not exist.
  */
-function get_permalink( $post = 0, $leavename = false ) {
+function get_permalink($post = 0, $leavename = false) {
 	$rewritecode = array(
 		'%year%',
 		'%monthnum%',
@@ -123,28 +123,28 @@ 
 		'%hour%',
 		'%minute%',
 		'%second%',
-		$leavename? '' : '%postname%',
+		$leavename ? '' : '%postname%',
 		'%post_id%',
 		'%category%',
 		'%author%',
-		$leavename? '' : '%pagename%',
+		$leavename ? '' : '%pagename%',
 	);
 
-	if ( is_object( $post ) && isset( $post->filter ) && 'sample' == $post->filter ) {
+	if (is_object($post) && isset($post->filter) && 'sample' == $post->filter) {
 		$sample = true;
 	} else {
-		$post = get_post( $post );
+		$post = get_post($post);
 		$sample = false;
 	}
 
-	if ( empty($post->ID) )
+	if (empty($post->ID))
 		return false;
 
-	if ( $post->post_type == 'page' )
+	if ($post->post_type == 'page')
 		return get_page_link($post, $leavename, $sample);
-	elseif ( $post->post_type == 'attachment' )
-		return get_attachment_link( $post, $leavename );
-	elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) )
+	elseif ($post->post_type == 'attachment')
+		return get_attachment_link($post, $leavename);
+	elseif (in_array($post->post_type, get_post_types(array('_builtin' => false))))
 		return get_post_permalink($post, $leavename, $sample);
 
 	$permalink = get_option('permalink_structure');
@@ -160,18 +160,18 @@ 
 	 * @param WP_Post $post      The post in question.
 	 * @param bool    $leavename Whether to keep the post name.
 	 */
-	$permalink = apply_filters( 'pre_post_link', $permalink, $post, $leavename );
+	$permalink = apply_filters('pre_post_link', $permalink, $post, $leavename);
 
-	if ( '' != $permalink && !in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft', 'future' ) ) ) {
+	if ('' != $permalink && ! in_array($post->post_status, array('draft', 'pending', 'auto-draft', 'future'))) {
 		$unixtime = strtotime($post->post_date);
 
 		$category = '';
-		if ( strpos($permalink, '%category%') !== false ) {
+		if (strpos($permalink, '%category%') !== false) {
 			$cats = get_the_category($post->ID);
-			if ( $cats ) {
-				$cats = wp_list_sort( $cats, array(
+			if ($cats) {
+				$cats = wp_list_sort($cats, array(
 					'term_id' => 'ASC',
-				) );
+				));
 
 				/**
 				 * Filters the category that gets used in the %category% permalink token.
@@ -182,30 +182,30 @@ 
 				 * @param array    $cats Array of all categories (WP_Term objects) associated with the post.
 				 * @param WP_Post  $post The post in question.
 				 */
-				$category_object = apply_filters( 'post_link_category', $cats[0], $cats, $post );
+				$category_object = apply_filters('post_link_category', $cats[0], $cats, $post);
 
-				$category_object = get_term( $category_object, 'category' );
+				$category_object = get_term($category_object, 'category');
 				$category = $category_object->slug;
-				if ( $parent = $category_object->parent )
-					$category = get_category_parents($parent, false, '/', true) . $category;
+				if ($parent = $category_object->parent)
+					$category = get_category_parents($parent, false, '/', true).$category;
 			}
 			// show default category in permalinks, without
 			// having to assign it explicitly
-			if ( empty($category) ) {
-				$default_category = get_term( get_option( 'default_category' ), 'category' );
-				if ( $default_category && ! is_wp_error( $default_category ) ) {
+			if (empty($category)) {
+				$default_category = get_term(get_option('default_category'), 'category');
+				if ($default_category && ! is_wp_error($default_category)) {
 					$category = $default_category->slug;
 				}
 			}
 		}
 
 		$author = '';
-		if ( strpos($permalink, '%author%') !== false ) {
+		if (strpos($permalink, '%author%') !== false) {
 			$authordata = get_userdata($post->post_author);
 			$author = $authordata->user_nicename;
 		}
 
-		$date = explode(" ",date('Y m d H i s', $unixtime));
+		$date = explode(" ", date('Y m d H i s', $unixtime));
 		$rewritereplace =
 		array(
 			$date[0],
@@ -220,10 +220,10 @@ 
 			$author,
 			$post->post_name,
 		);
-		$permalink = home_url( str_replace($rewritecode, $rewritereplace, $permalink) );
+		$permalink = home_url(str_replace($rewritecode, $rewritereplace, $permalink));
 		$permalink = user_trailingslashit($permalink, 'single');
 	} else { // if they're not using the fancy permalink option
-		$permalink = home_url('?p=' . $post->ID);
+		$permalink = home_url('?p='.$post->ID);
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 * @param WP_Post $post      The post in question.
 	 * @param bool    $leavename Whether to keep the post name.
 	 */
-	return apply_filters( 'post_link', $permalink, $post, $leavename );
+	return apply_filters('post_link', $permalink, $post, $leavename);
 }
 
 /**
@@ -252,33 +252,33 @@ 
  * @param bool $sample    Optional, defaults to false. Is it a sample permalink. Default false.
  * @return string|WP_Error The post permalink.
  */
-function get_post_permalink( $id = 0, $leavename = false, $sample = false ) {
+function get_post_permalink($id = 0, $leavename = false, $sample = false) {
 	global $wp_rewrite;
 
 	$post = get_post($id);
 
-	if ( is_wp_error( $post ) )
+	if (is_wp_error($post))
 		return $post;
 
 	$post_link = $wp_rewrite->get_extra_permastruct($post->post_type);
 
 	$slug = $post->post_name;
 
-	$draft_or_pending = get_post_status( $id ) && in_array( get_post_status( $id ), array( 'draft', 'pending', 'auto-draft', 'future' ) );
+	$draft_or_pending = get_post_status($id) && in_array(get_post_status($id), array('draft', 'pending', 'auto-draft', 'future'));
 
 	$post_type = get_post_type_object($post->post_type);
 
-	if ( $post_type->hierarchical ) {
-		$slug = get_page_uri( $id );
+	if ($post_type->hierarchical) {
+		$slug = get_page_uri($id);
 	}
 
-	if ( !empty($post_link) && ( !$draft_or_pending || $sample ) ) {
-		if ( ! $leavename ) {
+	if ( ! empty($post_link) && ( ! $draft_or_pending || $sample)) {
+		if ( ! $leavename) {
 			$post_link = str_replace("%$post->post_type%", $slug, $post_link);
 		}
-		$post_link = home_url( user_trailingslashit($post_link) );
+		$post_link = home_url(user_trailingslashit($post_link));
 	} else {
-		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
+		if ($post_type->query_var && (isset($post->post_status) && ! $draft_or_pending))
 			$post_link = add_query_arg($post_type->query_var, $slug, '');
 		else
 			$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
@@ -295,7 +295,7 @@ 
 	 * @param bool    $leavename Whether to keep the post name.
 	 * @param bool    $sample    Is it a sample permalink.
 	 */
-	return apply_filters( 'post_type_link', $post_link, $post, $leavename, $sample );
+	return apply_filters('post_type_link', $post_link, $post, $leavename, $sample);
 }
 
 /**
@@ -311,13 +311,13 @@ 
  *                               Default false.
  * @return string The page permalink.
  */
-function get_page_link( $post = false, $leavename = false, $sample = false ) {
-	$post = get_post( $post );
+function get_page_link($post = false, $leavename = false, $sample = false) {
+	$post = get_post($post);
 
-	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) )
+	if ('page' == get_option('show_on_front') && $post->ID == get_option('page_on_front'))
 		$link = home_url('/');
 	else
-		$link = _get_page_link( $post, $leavename, $sample );
+		$link = _get_page_link($post, $leavename, $sample);
 
 	/**
 	 * Filters the permalink for a page.
@@ -328,7 +328,7 @@ 
 	 * @param int    $post_id The ID of the page.
 	 * @param bool   $sample  Is it a sample permalink.
 	 */
-	return apply_filters( 'page_link', $link, $post->ID, $sample );
+	return apply_filters('page_link', $link, $post->ID, $sample);
 }
 
 /**
@@ -347,24 +347,24 @@ 
  *                               Default false.
  * @return string The page permalink.
  */
-function _get_page_link( $post = false, $leavename = false, $sample = false ) {
+function _get_page_link($post = false, $leavename = false, $sample = false) {
 	global $wp_rewrite;
 
-	$post = get_post( $post );
+	$post = get_post($post);
 
-	$draft_or_pending = in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft' ) );
+	$draft_or_pending = in_array($post->post_status, array('draft', 'pending', 'auto-draft'));
 
 	$link = $wp_rewrite->get_page_permastruct();
 
-	if ( !empty($link) && ( ( isset($post->post_status) && !$draft_or_pending ) || $sample ) ) {
-		if ( ! $leavename ) {
-			$link = str_replace('%pagename%', get_page_uri( $post ), $link);
+	if ( ! empty($link) && ((isset($post->post_status) && ! $draft_or_pending) || $sample)) {
+		if ( ! $leavename) {
+			$link = str_replace('%pagename%', get_page_uri($post), $link);
 		}
 
 		$link = home_url($link);
 		$link = user_trailingslashit($link, 'page');
 	} else {
-		$link = home_url( '?page_id=' . $post->ID );
+		$link = home_url('?page_id='.$post->ID);
 	}
 
 	/**
@@ -375,7 +375,7 @@ 
 	 * @param string $link    The page's permalink.
 	 * @param int    $post_id The ID of the page.
 	 */
-	return apply_filters( '_get_page_link', $link, $post->ID );
+	return apply_filters('_get_page_link', $link, $post->ID);
 }
 
 /**
@@ -391,39 +391,39 @@ 
  * @param bool       $leavename Optional. Whether to keep the page name. Default false.
  * @return string The attachment permalink.
  */
-function get_attachment_link( $post = null, $leavename = false ) {
+function get_attachment_link($post = null, $leavename = false) {
 	global $wp_rewrite;
 
 	$link = false;
 
-	$post = get_post( $post );
-	$parent = ( $post->post_parent > 0 && $post->post_parent != $post->ID ) ? get_post( $post->post_parent ) : false;
-	if ( $parent && ! in_array( $parent->post_type, get_post_types() ) ) {
+	$post = get_post($post);
+	$parent = ($post->post_parent > 0 && $post->post_parent != $post->ID) ? get_post($post->post_parent) : false;
+	if ($parent && ! in_array($parent->post_type, get_post_types())) {
 		$parent = false;
 	}
 
-	if ( $wp_rewrite->using_permalinks() && $parent ) {
-		if ( 'page' == $parent->post_type )
-			$parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front
+	if ($wp_rewrite->using_permalinks() && $parent) {
+		if ('page' == $parent->post_type)
+			$parentlink = _get_page_link($post->post_parent); // Ignores page_on_front
 		else
-			$parentlink = get_permalink( $post->post_parent );
+			$parentlink = get_permalink($post->post_parent);
 
-		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') )
-			$name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
+		if (is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%'))
+			$name = 'attachment/'.$post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
 		else
 			$name = $post->post_name;
 
-		if ( strpos($parentlink, '?') === false )
-			$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		if (strpos($parentlink, '?') === false)
+			$link = user_trailingslashit(trailingslashit($parentlink).'%postname%');
 
-		if ( ! $leavename )
-			$link = str_replace( '%postname%', $name, $link );
-	} elseif ( $wp_rewrite->using_permalinks() && ! $leavename ) {
-		$link = home_url( user_trailingslashit( $post->post_name ) );
+		if ( ! $leavename)
+			$link = str_replace('%postname%', $name, $link);
+	} elseif ($wp_rewrite->using_permalinks() && ! $leavename) {
+		$link = home_url(user_trailingslashit($post->post_name));
 	}
 
-	if ( ! $link )
-		$link = home_url( '/?attachment_id=' . $post->ID );
+	if ( ! $link)
+		$link = home_url('/?attachment_id='.$post->ID);
 
 	/**
 	 * Filters the permalink for an attachment.
@@ -433,7 +433,7 @@ 
 	 * @param string $link    The attachment's permalink.
 	 * @param int    $post_id Attachment ID.
 	 */
-	return apply_filters( 'attachment_link', $link, $post->ID );
+	return apply_filters('attachment_link', $link, $post->ID);
 }
 
 /**
@@ -446,16 +446,16 @@ 
  * @param int|bool $year False for current year or year for permalink.
  * @return string The permalink for the specified year archive.
  */
-function get_year_link( $year ) {
+function get_year_link($year) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
 	$yearlink = $wp_rewrite->get_year_permastruct();
-	if ( !empty($yearlink) ) {
+	if ( ! empty($yearlink)) {
 		$yearlink = str_replace('%year%', $year, $yearlink);
-		$yearlink = home_url( user_trailingslashit( $yearlink, 'year' ) );
+		$yearlink = home_url(user_trailingslashit($yearlink, 'year'));
 	} else {
-		$yearlink = home_url( '?m=' . $year );
+		$yearlink = home_url('?m='.$year);
 	}
 
 	/**
@@ -466,7 +466,7 @@ 
 	 * @param string $yearlink Permalink for the year archive.
 	 * @param int    $year     Year for the archive.
 	 */
-	return apply_filters( 'year_link', $yearlink, $year );
+	return apply_filters('year_link', $yearlink, $year);
 }
 
 /**
@@ -482,17 +482,17 @@ 
  */
 function get_month_link($year, $month) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
+	if ( ! $month)
 		$month = gmdate('m', current_time('timestamp'));
 	$monthlink = $wp_rewrite->get_month_permastruct();
-	if ( !empty($monthlink) ) {
+	if ( ! empty($monthlink)) {
 		$monthlink = str_replace('%year%', $year, $monthlink);
 		$monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
-		$monthlink = home_url( user_trailingslashit( $monthlink, 'month' ) );
+		$monthlink = home_url(user_trailingslashit($monthlink, 'month'));
 	} else {
-		$monthlink = home_url( '?m=' . $year . zeroise( $month, 2 ) );
+		$monthlink = home_url('?m='.$year.zeroise($month, 2));
 	}
 
 	/**
@@ -504,7 +504,7 @@ 
 	 * @param int    $year      Year for the archive.
 	 * @param int    $month     The month for the archive.
 	 */
-	return apply_filters( 'month_link', $monthlink, $year, $month );
+	return apply_filters('month_link', $monthlink, $year, $month);
 }
 
 /**
@@ -521,21 +521,21 @@ 
  */
 function get_day_link($year, $month, $day) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
+	if ( ! $month)
 		$month = gmdate('m', current_time('timestamp'));
-	if ( !$day )
+	if ( ! $day)
 		$day = gmdate('j', current_time('timestamp'));
 
 	$daylink = $wp_rewrite->get_day_permastruct();
-	if ( !empty($daylink) ) {
+	if ( ! empty($daylink)) {
 		$daylink = str_replace('%year%', $year, $daylink);
 		$daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
 		$daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
-		$daylink = home_url( user_trailingslashit( $daylink, 'day' ) );
+		$daylink = home_url(user_trailingslashit($daylink, 'day'));
 	} else {
-		$daylink = home_url( '?m=' . $year . zeroise( $month, 2 ) . zeroise( $day, 2 ) );
+		$daylink = home_url('?m='.$year.zeroise($month, 2).zeroise($day, 2));
 	}
 
 	/**
@@ -548,7 +548,7 @@ 
 	 * @param int    $month   Month for the archive.
 	 * @param int    $day     The day for the archive.
 	 */
-	return apply_filters( 'day_link', $daylink, $year, $month, $day );
+	return apply_filters('day_link', $daylink, $year, $month, $day);
 }
 
 /**
@@ -559,8 +559,8 @@ 
  * @param string $anchor The link's anchor text.
  * @param string $feed   Optional. Feed type. Default empty.
  */
-function the_feed_link( $anchor, $feed = '' ) {
-	$link = '<a href="' . esc_url( get_feed_link( $feed ) ) . '">' . $anchor . '</a>';
+function the_feed_link($anchor, $feed = '') {
+	$link = '<a href="'.esc_url(get_feed_link($feed)).'">'.$anchor.'</a>';
 
 	/**
 	 * Filters the feed link anchor tag.
@@ -571,7 +571,7 @@ 
 	 * @param string $feed The feed type, or an empty string for the
 	 *                     default feed type.
 	 */
-	echo apply_filters( 'the_feed_link', $link, $feed );
+	echo apply_filters('the_feed_link', $link, $feed);
 }
 
 /**
@@ -584,27 +584,27 @@ 
  * @param string $feed Optional. Feed type. Default empty.
  * @return string The feed permalink.
  */
-function get_feed_link( $feed = '' ) {
+function get_feed_link($feed = '') {
 	global $wp_rewrite;
 
 	$permalink = $wp_rewrite->get_feed_permastruct();
-	if ( '' != $permalink ) {
-		if ( false !== strpos($feed, 'comments_') ) {
+	if ('' != $permalink) {
+		if (false !== strpos($feed, 'comments_')) {
 			$feed = str_replace('comments_', '', $feed);
 			$permalink = $wp_rewrite->get_comment_feed_permastruct();
 		}
 
-		if ( get_default_feed() == $feed )
+		if (get_default_feed() == $feed)
 			$feed = '';
 
 		$permalink = str_replace('%feed%', $feed, $permalink);
 		$permalink = preg_replace('#/+#', '/', "/$permalink");
-		$output =  home_url( user_trailingslashit($permalink, 'feed') );
+		$output = home_url(user_trailingslashit($permalink, 'feed'));
 	} else {
-		if ( empty($feed) )
+		if (empty($feed))
 			$feed = get_default_feed();
 
-		if ( false !== strpos($feed, 'comments_') )
+		if (false !== strpos($feed, 'comments_'))
 			$feed = str_replace('comments_', 'comments-', $feed);
 
 		$output = home_url("?feed={$feed}");
@@ -618,7 +618,7 @@ 
 	 * @param string $output The feed permalink.
 	 * @param string $feed   Feed type.
 	 */
-	return apply_filters( 'feed_link', $output, $feed );
+	return apply_filters('feed_link', $output, $feed);
 }
 
 /**
@@ -630,43 +630,43 @@ 
  * @param string $feed    Optional. Feed type. Default empty.
  * @return string The permalink for the comments feed for the given post.
  */
-function get_post_comments_feed_link( $post_id = 0, $feed = '' ) {
-	$post_id = absint( $post_id );
+function get_post_comments_feed_link($post_id = 0, $feed = '') {
+	$post_id = absint($post_id);
 
-	if ( ! $post_id )
+	if ( ! $post_id)
 		$post_id = get_the_ID();
 
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 	$unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_parent;
 
-	if ( '' != get_option('permalink_structure') ) {
-		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
-			$url = _get_page_link( $post_id );
+	if ('' != get_option('permalink_structure')) {
+		if ('page' == get_option('show_on_front') && $post_id == get_option('page_on_front'))
+			$url = _get_page_link($post_id);
 		else
 			$url = get_permalink($post_id);
 
-		if ( $unattached ) {
-			$url =  home_url( '/feed/' );
-			if ( $feed !== get_default_feed() ) {
+		if ($unattached) {
+			$url = home_url('/feed/');
+			if ($feed !== get_default_feed()) {
 				$url .= "$feed/";
 			}
-			$url = add_query_arg( 'attachment_id', $post_id, $url );
+			$url = add_query_arg('attachment_id', $post_id, $url);
 		} else {
-			$url = trailingslashit($url) . 'feed';
-			if ( $feed != get_default_feed() )
+			$url = trailingslashit($url).'feed';
+			if ($feed != get_default_feed())
 				$url .= "/$feed";
 			$url = user_trailingslashit($url, 'single_feed');
 		}
 	} else {
-		if ( $unattached ) {
-			$url = add_query_arg( array( 'feed' => $feed, 'attachment_id' => $post_id ), home_url( '/' ) );
-		} elseif ( 'page' == $post->post_type ) {
-			$url = add_query_arg( array( 'feed' => $feed, 'page_id' => $post_id ), home_url( '/' ) );
+		if ($unattached) {
+			$url = add_query_arg(array('feed' => $feed, 'attachment_id' => $post_id), home_url('/'));
+		} elseif ('page' == $post->post_type) {
+			$url = add_query_arg(array('feed' => $feed, 'page_id' => $post_id), home_url('/'));
 		} else {
-			$url = add_query_arg( array( 'feed' => $feed, 'p' => $post_id ), home_url( '/' ) );
+			$url = add_query_arg(array('feed' => $feed, 'p' => $post_id), home_url('/'));
 		}
 	}
 
@@ -677,7 +677,7 @@ 
 	 *
 	 * @param string $url Post comments feed permalink.
 	 */
-	return apply_filters( 'post_comments_feed_link', $url );
+	return apply_filters('post_comments_feed_link', $url);
 }
 
 /**
@@ -693,13 +693,13 @@ 
  * @param int    $post_id   Optional. Post ID. Default is the ID of the global `$post`.
  * @param string $feed      Optional. Feed format. Default empty.
  */
-function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) {
-	$url = get_post_comments_feed_link( $post_id, $feed );
-	if ( empty( $link_text ) ) {
+function post_comments_feed_link($link_text = '', $post_id = '', $feed = '') {
+	$url = get_post_comments_feed_link($post_id, $feed);
+	if (empty($link_text)) {
 		$link_text = __('Comments Feed');
 	}
 
-	$link = '<a href="' . esc_url( $url ) . '">' . $link_text . '</a>';
+	$link = '<a href="'.esc_url($url).'">'.$link_text.'</a>';
 	/**
 	 * Filters the post comment feed link anchor tag.
 	 *
@@ -709,7 +709,7 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $feed    The feed type, or an empty string for the default feed type.
 	 */
-	echo apply_filters( 'post_comments_feed_link_html', $link, $post_id, $feed );
+	echo apply_filters('post_comments_feed_link_html', $link, $post_id, $feed);
 }
 
 /**
@@ -724,23 +724,23 @@ 
  * @param string $feed      Optional. Feed type. Default empty.
  * @return string Link to the feed for the author specified by $author_id.
  */
-function get_author_feed_link( $author_id, $feed = '' ) {
+function get_author_feed_link($author_id, $feed = '') {
 	$author_id = (int) $author_id;
 	$permalink_structure = get_option('permalink_structure');
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	if ( '' == $permalink_structure ) {
-		$link = home_url("?feed=$feed&amp;author=" . $author_id);
+	if ('' == $permalink_structure) {
+		$link = home_url("?feed=$feed&amp;author=".$author_id);
 	} else {
 		$link = get_author_posts_url($author_id);
-		if ( $feed == get_default_feed() )
+		if ($feed == get_default_feed())
 			$feed_link = 'feed';
 		else
 			$feed_link = "feed/$feed";
 
-		$link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
+		$link = trailingslashit($link).user_trailingslashit($feed_link, 'feed');
 	}
 
 	/**
@@ -751,7 +751,7 @@ 
 	 * @param string $link The author feed link.
 	 * @param string $feed Feed type.
 	 */
-	$link = apply_filters( 'author_feed_link', $link, $feed );
+	$link = apply_filters('author_feed_link', $link, $feed);
 
 	return $link;
 }
@@ -768,8 +768,8 @@ 
  * @param string $feed   Optional. Feed type. Default empty.
  * @return string Link to the feed for the category specified by $cat_id.
  */
-function get_category_feed_link( $cat_id, $feed = '' ) {
-	return get_term_feed_link( $cat_id, 'category', $feed );
+function get_category_feed_link($cat_id, $feed = '') {
+	return get_term_feed_link($cat_id, 'category', $feed);
 }
 
 /**
@@ -785,40 +785,40 @@ 
  * @param string $feed     Optional. Feed type. Default empty.
  * @return string|false Link to the feed for the term specified by $term_id and $taxonomy.
  */
-function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) {
-	$term_id = ( int ) $term_id;
+function get_term_feed_link($term_id, $taxonomy = 'category', $feed = '') {
+	$term_id = (int) $term_id;
 
-	$term = get_term( $term_id, $taxonomy  );
+	$term = get_term($term_id, $taxonomy);
 
-	if ( empty( $term ) || is_wp_error( $term ) )
+	if (empty($term) || is_wp_error($term))
 		return false;
 
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	$permalink_structure = get_option( 'permalink_structure' );
+	$permalink_structure = get_option('permalink_structure');
 
-	if ( '' == $permalink_structure ) {
-		if ( 'category' == $taxonomy ) {
+	if ('' == $permalink_structure) {
+		if ('category' == $taxonomy) {
 			$link = home_url("?feed=$feed&amp;cat=$term_id");
 		}
-		elseif ( 'post_tag' == $taxonomy ) {
+		elseif ('post_tag' == $taxonomy) {
 			$link = home_url("?feed=$feed&amp;tag=$term->slug");
 		} else {
-			$t = get_taxonomy( $taxonomy );
+			$t = get_taxonomy($taxonomy);
 			$link = home_url("?feed=$feed&amp;$t->query_var=$term->slug");
 		}
 	} else {
-		$link = get_term_link( $term_id, $term->taxonomy );
-		if ( $feed == get_default_feed() )
+		$link = get_term_link($term_id, $term->taxonomy);
+		if ($feed == get_default_feed())
 			$feed_link = 'feed';
 		else
 			$feed_link = "feed/$feed";
 
-		$link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
+		$link = trailingslashit($link).user_trailingslashit($feed_link, 'feed');
 	}
 
-	if ( 'category' == $taxonomy ) {
+	if ('category' == $taxonomy) {
 		/**
 		 * Filters the category feed link.
 		 *
@@ -827,8 +827,8 @@ 
 		 * @param string $link The category feed link.
 		 * @param string $feed Feed type.
 		 */
-		$link = apply_filters( 'category_feed_link', $link, $feed );
-	} elseif ( 'post_tag' == $taxonomy ) {
+		$link = apply_filters('category_feed_link', $link, $feed);
+	} elseif ('post_tag' == $taxonomy) {
 		/**
 		 * Filters the post tag feed link.
 		 *
@@ -837,7 +837,7 @@ 
 		 * @param string $link The tag feed link.
 		 * @param string $feed Feed type.
 		 */
-		$link = apply_filters( 'tag_feed_link', $link, $feed );
+		$link = apply_filters('tag_feed_link', $link, $feed);
 	} else {
 		/**
 		 * Filters the feed link for a taxonomy other than 'category' or 'post_tag'.
@@ -848,7 +848,7 @@ 
 		 * @param string $feed Feed type.
 		 * @param string $taxonomy The taxonomy name.
 		 */
-		$link = apply_filters( 'taxonomy_feed_link', $link, $feed, $taxonomy );
+		$link = apply_filters('taxonomy_feed_link', $link, $feed, $taxonomy);
 	}
 
 	return $link;
@@ -863,8 +863,8 @@ 
  * @param string $feed   Optional. Feed type. Default empty.
  * @return string The feed permalink for the given tag.
  */
-function get_tag_feed_link( $tag_id, $feed = '' ) {
-	return get_term_feed_link( $tag_id, 'post_tag', $feed );
+function get_tag_feed_link($tag_id, $feed = '') {
+	return get_term_feed_link($tag_id, 'post_tag', $feed);
 }
 
 /**
@@ -876,7 +876,7 @@ 
  * @param string $taxonomy Optional. Taxonomy slug. Default 'post_tag'.
  * @return string The edit tag link URL for the given tag.
  */
-function get_edit_tag_link( $tag_id, $taxonomy = 'post_tag' ) {
+function get_edit_tag_link($tag_id, $taxonomy = 'post_tag') {
 	/**
 	 * Filters the edit link for a tag (or term in another taxonomy).
 	 *
@@ -884,7 +884,7 @@ 
 	 *
 	 * @param string $link The term edit link.
 	 */
-	return apply_filters( 'get_edit_tag_link', get_edit_term_link( $tag_id, $taxonomy ) );
+	return apply_filters('get_edit_tag_link', get_edit_term_link($tag_id, $taxonomy));
 }
 
 /**
@@ -898,8 +898,8 @@ 
  * @param WP_Term $tag    Optional. Term object. If null, the queried object will be inspected.
  *                        Default null.
  */
-function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) {
-	$link = edit_term_link( $link, '', '', $tag, false );
+function edit_tag_link($link = '', $before = '', $after = '', $tag = null) {
+	$link = edit_term_link($link, '', '', $tag, false);
 
 	/**
 	 * Filters the anchor tag for the edit link for a tag (or term in another taxonomy).
@@ -908,7 +908,7 @@ 
 	 *
 	 * @param string $link The anchor tag for the edit link.
 	 */
-	echo $before . apply_filters( 'edit_tag_link', $link ) . $after;
+	echo $before.apply_filters('edit_tag_link', $link).$after;
 }
 
 /**
@@ -925,14 +925,14 @@ 
  *                            with the taxonomy.
  * @return string|null The edit term link URL for the given term, or null on failure.
  */
-function get_edit_term_link( $term_id, $taxonomy = '', $object_type = '' ) {
-	$term = get_term( $term_id, $taxonomy );
-	if ( ! $term || is_wp_error( $term ) ) {
+function get_edit_term_link($term_id, $taxonomy = '', $object_type = '') {
+	$term = get_term($term_id, $taxonomy);
+	if ( ! $term || is_wp_error($term)) {
 		return;
 	}
 
-	$tax = get_taxonomy( $term->taxonomy );
-	if ( ! $tax || ! current_user_can( 'edit_term', $term->term_id ) ) {
+	$tax = get_taxonomy($term->taxonomy);
+	if ( ! $tax || ! current_user_can('edit_term', $term->term_id)) {
 		return;
 	}
 
@@ -941,14 +941,14 @@ 
 		'tag_ID'   => $term->term_id,
 	);
 
-	if ( $object_type ) {
+	if ($object_type) {
 		$args['post_type'] = $object_type;
-	} elseif ( ! empty( $tax->object_type ) ) {
-		$args['post_type'] = reset( $tax->object_type );
+	} elseif ( ! empty($tax->object_type)) {
+		$args['post_type'] = reset($tax->object_type);
 	}
 
-	if ( $tax->show_ui ) {
-		$location = add_query_arg( $args, admin_url( 'term.php' ) );
+	if ($tax->show_ui) {
+		$location = add_query_arg($args, admin_url('term.php'));
 	} else {
 		$location = '';
 	}
@@ -963,7 +963,7 @@ 
 	 * @param string $taxonomy    Taxonomy name.
 	 * @param string $object_type The object type (eg. the post type).
 	 */
-	return apply_filters( 'get_edit_term_link', $location, $term_id, $taxonomy, $object_type );
+	return apply_filters('get_edit_term_link', $location, $term_id, $taxonomy, $object_type);
 }
 
 /**
@@ -978,22 +978,22 @@ 
  * @param bool   $echo   Optional. Whether or not to echo the return. Default true.
  * @return string|void HTML content.
  */
-function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-	if ( is_null( $term ) )
+function edit_term_link($link = '', $before = '', $after = '', $term = null, $echo = true) {
+	if (is_null($term))
 		$term = get_queried_object();
 
-	if ( ! $term )
+	if ( ! $term)
 		return;
 
-	$tax = get_taxonomy( $term->taxonomy );
-	if ( ! current_user_can( 'edit_term', $term->term_id ) ) {
+	$tax = get_taxonomy($term->taxonomy);
+	if ( ! current_user_can('edit_term', $term->term_id)) {
 		return;
 	}
 
-	if ( empty( $link ) )
+	if (empty($link))
 		$link = __('Edit This');
 
-	$link = '<a href="' . get_edit_term_link( $term->term_id, $term->taxonomy ) . '">' . $link . '</a>';
+	$link = '<a href="'.get_edit_term_link($term->term_id, $term->taxonomy).'">'.$link.'</a>';
 
 	/**
 	 * Filters the anchor tag for the edit link of a term.
@@ -1003,9 +1003,9 @@ 
 	 * @param string $link    The anchor tag for the edit link.
 	 * @param int    $term_id Term ID.
 	 */
-	$link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
+	$link = $before.apply_filters('edit_term_link', $link, $term->term_id).$after;
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	else
 		return $link;
@@ -1021,23 +1021,23 @@ 
  * @param string $query Optional. The query string to use. If empty the current query is used. Default empty.
  * @return string The search permalink.
  */
-function get_search_link( $query = '' ) {
+function get_search_link($query = '') {
 	global $wp_rewrite;
 
-	if ( empty($query) )
-		$search = get_search_query( false );
+	if (empty($query))
+		$search = get_search_query(false);
 	else
 		$search = stripslashes($query);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty( $permastruct ) ) {
-		$link = home_url('?s=' . urlencode($search) );
+	if (empty($permastruct)) {
+		$link = home_url('?s='.urlencode($search));
 	} else {
 		$search = urlencode($search);
 		$search = str_replace('%2F', '/', $search); // %2F(/) is not valid within a URL, send it un-encoded.
-		$link = str_replace( '%search%', $search, $permastruct );
-		$link = home_url( user_trailingslashit( $link, 'search' ) );
+		$link = str_replace('%search%', $search, $permastruct);
+		$link = home_url(user_trailingslashit($link, 'search'));
 	}
 
 	/**
@@ -1048,7 +1048,7 @@ 
 	 * @param string $link   Search permalink.
 	 * @param string $search The URL-encoded search term.
 	 */
-	return apply_filters( 'search_link', $link, $search );
+	return apply_filters('search_link', $link, $search);
 }
 
 /**
@@ -1066,12 +1066,12 @@ 
 	global $wp_rewrite;
 	$link = get_search_link($search_query);
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) ) {
+	if (empty($permastruct)) {
 		$link = add_query_arg('feed', $feed, $link);
 	} else {
 		$link = trailingslashit($link);
@@ -1087,7 +1087,7 @@ 
 	 * @param string $feed Feed type.
 	 * @param string $type The search type. One of 'posts' or 'comments'.
 	 */
-	return apply_filters( 'search_feed_link', $link, $feed, 'posts' );
+	return apply_filters('search_feed_link', $link, $feed, 'posts');
 }
 
 /**
@@ -1104,20 +1104,20 @@ 
 function get_search_comments_feed_link($search_query = '', $feed = '') {
 	global $wp_rewrite;
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
 	$link = get_search_feed_link($search_query, $feed);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) )
-		$link = add_query_arg('feed', 'comments-' . $feed, $link);
+	if (empty($permastruct))
+		$link = add_query_arg('feed', 'comments-'.$feed, $link);
 	else
 		$link = add_query_arg('withcomments', 1, $link);
 
 	/** This filter is documented in wp-includes/link-template.php */
-	return apply_filters( 'search_feed_link', $link, $feed, 'comments' );
+	return apply_filters('search_feed_link', $link, $feed, 'comments');
 }
 
 /**
@@ -1131,36 +1131,36 @@ 
  * @param string $post_type Post type.
  * @return string|false The post type archive permalink.
  */
-function get_post_type_archive_link( $post_type ) {
+function get_post_type_archive_link($post_type) {
 	global $wp_rewrite;
-	if ( ! $post_type_obj = get_post_type_object( $post_type ) )
+	if ( ! $post_type_obj = get_post_type_object($post_type))
 		return false;
 
-	if ( 'post' === $post_type ) {
-		$show_on_front = get_option( 'show_on_front' );
-		$page_for_posts  = get_option( 'page_for_posts' );
+	if ('post' === $post_type) {
+		$show_on_front = get_option('show_on_front');
+		$page_for_posts = get_option('page_for_posts');
 
-		if ( 'page' == $show_on_front && $page_for_posts ) {
-			$link = get_permalink( $page_for_posts );
+		if ('page' == $show_on_front && $page_for_posts) {
+			$link = get_permalink($page_for_posts);
 		} else {
 			$link = get_home_url();
 		}
 		/** This filter is documented in wp-includes/link-template.php */
-		return apply_filters( 'post_type_archive_link', $link, $post_type );
+		return apply_filters('post_type_archive_link', $link, $post_type);
 	}
 
-	if ( ! $post_type_obj->has_archive )
+	if ( ! $post_type_obj->has_archive)
 		return false;
 
-	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) ) {
-		$struct = ( true === $post_type_obj->has_archive ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
-		if ( $post_type_obj->rewrite['with_front'] )
-			$struct = $wp_rewrite->front . $struct;
+	if (get_option('permalink_structure') && is_array($post_type_obj->rewrite)) {
+		$struct = (true === $post_type_obj->has_archive) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
+		if ($post_type_obj->rewrite['with_front'])
+			$struct = $wp_rewrite->front.$struct;
 		else
-			$struct = $wp_rewrite->root . $struct;
-		$link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );
+			$struct = $wp_rewrite->root.$struct;
+		$link = home_url(user_trailingslashit($struct, 'post_type_archive'));
 	} else {
-		$link = home_url( '?post_type=' . $post_type );
+		$link = home_url('?post_type='.$post_type);
 	}
 
 	/**
@@ -1171,7 +1171,7 @@ 
 	 * @param string $link      The post type archive permalink.
 	 * @param string $post_type Post type name.
 	 */
-	return apply_filters( 'post_type_archive_link', $link, $post_type );
+	return apply_filters('post_type_archive_link', $link, $post_type);
 }
 
 /**
@@ -1183,22 +1183,22 @@ 
  * @param string $feed      Optional. Feed type. Default empty.
  * @return string|false The post type feed permalink.
  */
-function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
+function get_post_type_archive_feed_link($post_type, $feed = '') {
 	$default_feed = get_default_feed();
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = $default_feed;
 
-	if ( ! $link = get_post_type_archive_link( $post_type ) )
+	if ( ! $link = get_post_type_archive_link($post_type))
 		return false;
 
-	$post_type_obj = get_post_type_object( $post_type );
-	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['feeds'] ) {
-		$link = trailingslashit( $link );
+	$post_type_obj = get_post_type_object($post_type);
+	if (get_option('permalink_structure') && is_array($post_type_obj->rewrite) && $post_type_obj->rewrite['feeds']) {
+		$link = trailingslashit($link);
 		$link .= 'feed/';
-		if ( $feed != $default_feed )
+		if ($feed != $default_feed)
 			$link .= "$feed/";
 	} else {
-		$link = add_query_arg( 'feed', $feed, $link );
+		$link = add_query_arg('feed', $feed, $link);
 	}
 
 	/**
@@ -1209,7 +1209,7 @@ 
 	 * @param string $link The post type archive feed link.
 	 * @param string $feed Feed type.
 	 */
-	return apply_filters( 'post_type_archive_feed_link', $link, $feed );
+	return apply_filters('post_type_archive_feed_link', $link, $feed);
 }
 
 /**
@@ -1226,20 +1226,20 @@ 
  *                                  post permalink. Default empty.
  * @return string|null URL used for the post preview, or null if the post does not exist.
  */
-function get_preview_post_link( $post = null, $query_args = array(), $preview_link = '' ) {
-	$post = get_post( $post );
-	if ( ! $post ) {
+function get_preview_post_link($post = null, $query_args = array(), $preview_link = '') {
+	$post = get_post($post);
+	if ( ! $post) {
 		return;
 	}
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( is_post_type_viewable( $post_type_object ) ) {
-		if ( ! $preview_link ) {
-			$preview_link = set_url_scheme( get_permalink( $post ) );
+	$post_type_object = get_post_type_object($post->post_type);
+	if (is_post_type_viewable($post_type_object)) {
+		if ( ! $preview_link) {
+			$preview_link = set_url_scheme(get_permalink($post));
 		}
 
 		$query_args['preview'] = 'true';
-		$preview_link = add_query_arg( $query_args, $preview_link );
+		$preview_link = add_query_arg($query_args, $preview_link);
 	}
 
 	/**
@@ -1251,7 +1251,7 @@ 
 	 * @param string  $preview_link URL used for the post preview.
 	 * @param WP_Post $post         Post object.
 	 */
-	return apply_filters( 'preview_post_link', $preview_link, $post );
+	return apply_filters('preview_post_link', $preview_link, $post);
 }
 
 /**
@@ -1267,26 +1267,26 @@ 
  * @return string|null The edit post link for the given post. null if the post type is invalid or does
  *                     not allow an editing UI.
  */
-function get_edit_post_link( $id = 0, $context = 'display' ) {
-	if ( ! $post = get_post( $id ) )
+function get_edit_post_link($id = 0, $context = 'display') {
+	if ( ! $post = get_post($id))
 		return;
 
-	if ( 'revision' === $post->post_type )
+	if ('revision' === $post->post_type)
 		$action = '';
-	elseif ( 'display' == $context )
+	elseif ('display' == $context)
 		$action = '&amp;action=edit';
 	else
 		$action = '&action=edit';
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
+	$post_type_object = get_post_type_object($post->post_type);
+	if ( ! $post_type_object)
 		return;
 
-	if ( !current_user_can( 'edit_post', $post->ID ) )
+	if ( ! current_user_can('edit_post', $post->ID))
 		return;
 
-	if ( $post_type_object->_edit_link ) {
-		$link = admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) );
+	if ($post_type_object->_edit_link) {
+		$link = admin_url(sprintf($post_type_object->_edit_link.$action, $post->ID));
 	} else {
 		$link = '';
 	}
@@ -1301,7 +1301,7 @@ 
 	 * @param string $context The link context. If set to 'display' then ampersands
 	 *                        are encoded.
 	 */
-	return apply_filters( 'get_edit_post_link', $link, $post->ID, $context );
+	return apply_filters('get_edit_post_link', $link, $post->ID, $context);
 }
 
 /**
@@ -1316,20 +1316,20 @@ 
  * @param int    $id     Optional. Post ID. Default is the ID of the global `$post`.
  * @param string $class  Optional. Add custom class to link. Default 'post-edit-link'.
  */
-function edit_post_link( $text = null, $before = '', $after = '', $id = 0, $class = 'post-edit-link' ) {
-	if ( ! $post = get_post( $id ) ) {
+function edit_post_link($text = null, $before = '', $after = '', $id = 0, $class = 'post-edit-link') {
+	if ( ! $post = get_post($id)) {
 		return;
 	}
 
-	if ( ! $url = get_edit_post_link( $post->ID ) ) {
+	if ( ! $url = get_edit_post_link($post->ID)) {
 		return;
 	}
 
-	if ( null === $text ) {
-		$text = __( 'Edit This' );
+	if (null === $text) {
+		$text = __('Edit This');
 	}
 
-	$link = '<a class="' . esc_attr( $class ) . '" href="' . esc_url( $url ) . '">' . $text . '</a>';
+	$link = '<a class="'.esc_attr($class).'" href="'.esc_url($url).'">'.$text.'</a>';
 
 	/**
 	 * Filters the post edit link anchor tag.
@@ -1340,7 +1340,7 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $text    Anchor text.
 	 */
-	echo $before . apply_filters( 'edit_post_link', $link, $post->ID, $text ) . $after;
+	echo $before.apply_filters('edit_post_link', $link, $post->ID, $text).$after;
 }
 
 /**
@@ -1355,23 +1355,23 @@ 
  * @param bool   $force_delete Optional. Whether to bypass trash and force deletion. Default false.
  * @return string|void The delete post link URL for the given post.
  */
-function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0.0' );
+function get_delete_post_link($id = 0, $deprecated = '', $force_delete = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '3.0.0');
 
-	if ( !$post = get_post( $id ) )
+	if ( ! $post = get_post($id))
 		return;
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
+	$post_type_object = get_post_type_object($post->post_type);
+	if ( ! $post_type_object)
 		return;
 
-	if ( !current_user_can( 'delete_post', $post->ID ) )
+	if ( ! current_user_can('delete_post', $post->ID))
 		return;
 
-	$action = ( $force_delete || !EMPTY_TRASH_DAYS ) ? 'delete' : 'trash';
+	$action = ($force_delete || ! EMPTY_TRASH_DAYS) ? 'delete' : 'trash';
 
-	$delete_link = add_query_arg( 'action', $action, admin_url( sprintf( $post_type_object->_edit_link, $post->ID ) ) );
+	$delete_link = add_query_arg('action', $action, admin_url(sprintf($post_type_object->_edit_link, $post->ID)));
 
 	/**
 	 * Filters the post delete link.
@@ -1382,7 +1382,7 @@ 
 	 * @param int    $post_id      Post ID.
 	 * @param bool   $force_delete Whether to bypass the trash and force deletion. Default false.
 	 */
-	return apply_filters( 'get_delete_post_link', wp_nonce_url( $delete_link, "$action-post_{$post->ID}" ), $post->ID, $force_delete );
+	return apply_filters('get_delete_post_link', wp_nonce_url($delete_link, "$action-post_{$post->ID}"), $post->ID, $force_delete);
 }
 
 /**
@@ -1393,13 +1393,13 @@ 
  * @param int|WP_Comment $comment_id Optional. Comment ID or WP_Comment object.
  * @return string|void The edit comment link URL for the given comment.
  */
-function get_edit_comment_link( $comment_id = 0 ) {
-	$comment = get_comment( $comment_id );
+function get_edit_comment_link($comment_id = 0) {
+	$comment = get_comment($comment_id);
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
+	if ( ! current_user_can('edit_comment', $comment->comment_ID))
 		return;
 
-	$location = admin_url('comment.php?action=editcomment&amp;c=') . $comment->comment_ID;
+	$location = admin_url('comment.php?action=editcomment&amp;c=').$comment->comment_ID;
 
 	/**
 	 * Filters the comment edit link.
@@ -1408,7 +1408,7 @@ 
 	 *
 	 * @param string $location The edit link.
 	 */
-	return apply_filters( 'get_edit_comment_link', $location );
+	return apply_filters('get_edit_comment_link', $location);
 }
 
 /**
@@ -1420,18 +1420,18 @@ 
  * @param string $before Optional. Display before edit link. Default empty.
  * @param string $after  Optional. Display after edit link. Default empty.
  */
-function edit_comment_link( $text = null, $before = '', $after = '' ) {
+function edit_comment_link($text = null, $before = '', $after = '') {
 	$comment = get_comment();
 
-	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+	if ( ! current_user_can('edit_comment', $comment->comment_ID)) {
 		return;
 	}
 
-	if ( null === $text ) {
-		$text = __( 'Edit This' );
+	if (null === $text) {
+		$text = __('Edit This');
 	}
 
-	$link = '<a class="comment-edit-link" href="' . esc_url( get_edit_comment_link( $comment ) ) . '">' . $text . '</a>';
+	$link = '<a class="comment-edit-link" href="'.esc_url(get_edit_comment_link($comment)).'">'.$text.'</a>';
 
 	/**
 	 * Filters the comment edit link anchor tag.
@@ -1442,7 +1442,7 @@ 
 	 * @param int    $comment_id Comment ID.
 	 * @param string $text       Anchor text.
 	 */
-	echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID, $text ) . $after;
+	echo $before.apply_filters('edit_comment_link', $link, $comment->comment_ID, $text).$after;
 }
 
 /**
@@ -1453,13 +1453,13 @@ 
  * @param int|stdClass $link Optional. Bookmark ID. Default is the id of the current bookmark.
  * @return string|void The edit bookmark link URL.
  */
-function get_edit_bookmark_link( $link = 0 ) {
-	$link = get_bookmark( $link );
+function get_edit_bookmark_link($link = 0) {
+	$link = get_bookmark($link);
 
-	if ( !current_user_can('manage_links') )
+	if ( ! current_user_can('manage_links'))
 		return;
 
-	$location = admin_url('link.php?action=edit&amp;link_id=') . $link->link_id;
+	$location = admin_url('link.php?action=edit&amp;link_id=').$link->link_id;
 
 	/**
 	 * Filters the bookmark edit link.
@@ -1469,7 +1469,7 @@ 
 	 * @param string $location The edit link.
 	 * @param int    $link_id  Bookmark ID.
 	 */
-	return apply_filters( 'get_edit_bookmark_link', $location, $link->link_id );
+	return apply_filters('get_edit_bookmark_link', $location, $link->link_id);
 }
 
 /**
@@ -1482,16 +1482,16 @@ 
  * @param string $after    Optional. Display after edit link. Default empty.
  * @param int    $bookmark Optional. Bookmark ID. Default is the current bookmark.
  */
-function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) {
+function edit_bookmark_link($link = '', $before = '', $after = '', $bookmark = null) {
 	$bookmark = get_bookmark($bookmark);
 
-	if ( !current_user_can('manage_links') )
+	if ( ! current_user_can('manage_links'))
 		return;
 
-	if ( empty($link) )
+	if (empty($link))
 		$link = __('Edit This');
 
-	$link = '<a href="' . esc_url( get_edit_bookmark_link( $bookmark ) ) . '">' . $link . '</a>';
+	$link = '<a href="'.esc_url(get_edit_bookmark_link($bookmark)).'">'.$link.'</a>';
 
 	/**
 	 * Filters the bookmark edit link anchor tag.
@@ -1501,7 +1501,7 @@ 
 	 * @param string $link    Anchor tag for the edit link.
 	 * @param int    $link_id Bookmark ID.
 	 */
-	echo $before . apply_filters( 'edit_bookmark_link', $link, $bookmark->link_id ) . $after;
+	echo $before.apply_filters('edit_bookmark_link', $link, $bookmark->link_id).$after;
 }
 
 /**
@@ -1512,22 +1512,22 @@ 
  * @param int $user_id Optional. User ID. Defaults to the current user.
  * @return string URL to edit user page or empty string.
  */
-function get_edit_user_link( $user_id = null ) {
-	if ( ! $user_id )
+function get_edit_user_link($user_id = null) {
+	if ( ! $user_id)
 		$user_id = get_current_user_id();
 
-	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) )
+	if (empty($user_id) || ! current_user_can('edit_user', $user_id))
 		return '';
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	if ( ! $user )
+	if ( ! $user)
 		return '';
 
-	if ( get_current_user_id() == $user->ID )
-		$link = get_edit_profile_url( $user->ID );
+	if (get_current_user_id() == $user->ID)
+		$link = get_edit_profile_url($user->ID);
 	else
-		$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+		$link = add_query_arg('user_id', $user->ID, self_admin_url('user-edit.php'));
 
 	/**
 	 * Filters the user edit link.
@@ -1537,7 +1537,7 @@ 
 	 * @param string $link    The edit link.
 	 * @param int    $user_id User ID.
 	 */
-	return apply_filters( 'get_edit_user_link', $link, $user->ID );
+	return apply_filters('get_edit_user_link', $link, $user->ID);
 }
 
 // Navigation links
@@ -1553,8 +1553,8 @@ 
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no
  *                             corresponding post exists.
  */
-function get_previous_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post( $in_same_term, $excluded_terms, true, $taxonomy );
+function get_previous_post($in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post($in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1568,8 +1568,8 @@ 
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no
  *                             corresponding post exists.
  */
-function get_next_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post( $in_same_term, $excluded_terms, false, $taxonomy );
+function get_next_post($in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post($in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1588,10 +1588,10 @@ 
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no
  *                             corresponding post exists.
  */
-function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
+function get_adjacent_post($in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
 	global $wpdb;
 
-	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) )
+	if (( ! $post = get_post()) || ! taxonomy_exists($taxonomy))
 		return null;
 
 	$current_post_date = $post->post_date;
@@ -1600,35 +1600,35 @@ 
 	$where = '';
 	$adjacent = $previous ? 'previous' : 'next';
 
-	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) && ! is_array( $excluded_terms ) ) {
+	if ($in_same_term || ! empty($excluded_terms)) {
+		if ( ! empty($excluded_terms) && ! is_array($excluded_terms)) {
 			// back-compat, $excluded_terms used to be $excluded_terms with IDs separated by " and "
-			if ( false !== strpos( $excluded_terms, ' and ' ) ) {
-				_deprecated_argument( __FUNCTION__, '3.3.0', sprintf( __( 'Use commas instead of %s to separate excluded terms.' ), "'and'" ) );
-				$excluded_terms = explode( ' and ', $excluded_terms );
+			if (false !== strpos($excluded_terms, ' and ')) {
+				_deprecated_argument(__FUNCTION__, '3.3.0', sprintf(__('Use commas instead of %s to separate excluded terms.'), "'and'"));
+				$excluded_terms = explode(' and ', $excluded_terms);
 			} else {
-				$excluded_terms = explode( ',', $excluded_terms );
+				$excluded_terms = explode(',', $excluded_terms);
 			}
 
-			$excluded_terms = array_map( 'intval', $excluded_terms );
+			$excluded_terms = array_map('intval', $excluded_terms);
 		}
 
-		if ( $in_same_term ) {
+		if ($in_same_term) {
 			$join .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
-			$where .= $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
+			$where .= $wpdb->prepare("AND tt.taxonomy = %s", $taxonomy);
 
-			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
+			if ( ! is_object_in_taxonomy($post->post_type, $taxonomy))
 				return '';
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+			$term_array = wp_get_object_terms($post->ID, $taxonomy, array('fields' => 'ids'));
 
 			// Remove any exclusions from the term array to include.
-			$term_array = array_diff( $term_array, (array) $excluded_terms );
-			$term_array = array_map( 'intval', $term_array );
+			$term_array = array_diff($term_array, (array) $excluded_terms);
+			$term_array = array_map('intval', $term_array);
 
-			if ( ! $term_array || is_wp_error( $term_array ) )
+			if ( ! $term_array || is_wp_error($term_array))
 				return '';
 
-			$where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
+			$where .= " AND tt.term_id IN (".implode(',', $term_array).")";
 		}
 
 		/**
@@ -1641,21 +1641,21 @@ 
 		 *
 		 * @param string $excluded_terms Array of excluded term IDs.
 		 */
-		$excluded_terms = apply_filters( "get_{$adjacent}_post_excluded_terms", $excluded_terms );
+		$excluded_terms = apply_filters("get_{$adjacent}_post_excluded_terms", $excluded_terms);
 
-		if ( ! empty( $excluded_terms ) ) {
-			$where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (" . implode( ',', array_map( 'intval', $excluded_terms ) ) . ') )';
+		if ( ! empty($excluded_terms)) {
+			$where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (".implode(',', array_map('intval', $excluded_terms)).') )';
 		}
 	}
 
 	// 'post_status' clause depends on the current user.
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		$user_id = get_current_user_id();
 
-		$post_type_object = get_post_type_object( $post->post_type );
-		if ( empty( $post_type_object ) ) {
+		$post_type_object = get_post_type_object($post->post_type);
+		if (empty($post_type_object)) {
 			$post_type_cap    = $post->post_type;
-			$read_private_cap = 'read_private_' . $post_type_cap . 's';
+			$read_private_cap = 'read_private_'.$post_type_cap.'s';
 		} else {
 			$read_private_cap = $post_type_object->cap->read_private_posts;
 		}
@@ -1664,13 +1664,13 @@ 
 		 * Results should include private posts belonging to the current user, or private posts where the
 		 * current user has the 'read_private_posts' cap.
 		 */
-		$private_states = get_post_stati( array( 'private' => true ) );
+		$private_states = get_post_stati(array('private' => true));
 		$where .= " AND ( p.post_status = 'publish'";
-		foreach ( (array) $private_states as $state ) {
-			if ( current_user_can( $read_private_cap ) ) {
-				$where .= $wpdb->prepare( " OR p.post_status = %s", $state );
+		foreach ((array) $private_states as $state) {
+			if (current_user_can($read_private_cap)) {
+				$where .= $wpdb->prepare(" OR p.post_status = %s", $state);
 			} else {
-				$where .= $wpdb->prepare( " OR (p.post_author = %d AND p.post_status = %s)", $user_id, $state );
+				$where .= $wpdb->prepare(" OR (p.post_author = %d AND p.post_status = %s)", $user_id, $state);
 			}
 		}
 		$where .= " )";
@@ -1696,7 +1696,7 @@ 
 	 * @param string  $taxonomy       Taxonomy. Used to identify the term used when `$in_same_term` is true.
 	 * @param WP_Post $post           WP_Post object.
 	 */
-	$join = apply_filters( "get_{$adjacent}_post_join", $join, $in_same_term, $excluded_terms, $taxonomy, $post );
+	$join = apply_filters("get_{$adjacent}_post_join", $join, $in_same_term, $excluded_terms, $taxonomy, $post);
 
 	/**
 	 * Filters the WHERE clause in the SQL for an adjacent post query.
@@ -1713,7 +1713,7 @@ 
 	 * @param string $taxonomy       Taxonomy. Used to identify the term used when `$in_same_term` is true.
 	 * @param WP_Post $post           WP_Post object.
 	 */
-	$where = apply_filters( "get_{$adjacent}_post_where", $wpdb->prepare( "WHERE p.post_date $op %s AND p.post_type = %s $where", $current_post_date, $post->post_type ), $in_same_term, $excluded_terms, $taxonomy, $post );
+	$where = apply_filters("get_{$adjacent}_post_where", $wpdb->prepare("WHERE p.post_date $op %s AND p.post_type = %s $where", $current_post_date, $post->post_type), $in_same_term, $excluded_terms, $taxonomy, $post);
 
 	/**
 	 * Filters the ORDER BY clause in the SQL for an adjacent post query.
@@ -1727,25 +1727,25 @@ 
 	 * @param string $order_by The `ORDER BY` clause in the SQL.
 	 * @param WP_Post $post    WP_Post object.
 	 */
-	$sort  = apply_filters( "get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1", $post );
+	$sort  = apply_filters("get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1", $post);
 
 	$query = "SELECT p.ID FROM $wpdb->posts AS p $join $where $sort";
-	$query_key = 'adjacent_post_' . md5( $query );
-	$result = wp_cache_get( $query_key, 'counts' );
-	if ( false !== $result ) {
-		if ( $result )
-			$result = get_post( $result );
+	$query_key = 'adjacent_post_'.md5($query);
+	$result = wp_cache_get($query_key, 'counts');
+	if (false !== $result) {
+		if ($result)
+			$result = get_post($result);
 		return $result;
 	}
 
-	$result = $wpdb->get_var( $query );
-	if ( null === $result )
+	$result = $wpdb->get_var($query);
+	if (null === $result)
 		$result = '';
 
-	wp_cache_set( $query_key, $result, 'counts' );
+	wp_cache_set($query_key, $result, 'counts');
 
-	if ( $result )
-		$result = get_post( $result );
+	if ($result)
+		$result = get_post($result);
 
 	return $result;
 }
@@ -1764,28 +1764,28 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string|void The adjacent post relational link URL.
  */
-function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() && $post = get_post() )
-		$post = get_post( $post->post_parent );
+function get_adjacent_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	if ($previous && is_attachment() && $post = get_post())
+		$post = get_post($post->post_parent);
 	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+		$post = get_adjacent_post($in_same_term, $excluded_terms, $previous, $taxonomy);
 
-	if ( empty( $post ) )
+	if (empty($post))
 		return;
 
-	$post_title = the_title_attribute( array( 'echo' => false, 'post' => $post ) );
+	$post_title = the_title_attribute(array('echo' => false, 'post' => $post));
 
-	if ( empty( $post_title ) )
-		$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	if (empty($post_title))
+		$post_title = $previous ? __('Previous Post') : __('Next Post');
 
-	$date = mysql2date( get_option( 'date_format' ), $post->post_date );
+	$date = mysql2date(get_option('date_format'), $post->post_date);
 
-	$title = str_replace( '%title', $post_title, $title );
-	$title = str_replace( '%date', $date, $title );
+	$title = str_replace('%title', $post_title, $title);
+	$title = str_replace('%date', $date, $title);
 
 	$link = $previous ? "<link rel='prev' title='" : "<link rel='next' title='";
-	$link .= esc_attr( $title );
-	$link .= "' href='" . get_permalink( $post ) . "' />\n";
+	$link .= esc_attr($title);
+	$link .= "' href='".get_permalink($post)."' />\n";
 
 	$adjacent = $previous ? 'previous' : 'next';
 
@@ -1799,7 +1799,7 @@ 
 	 *
 	 * @param string $link The relational link.
 	 */
-	return apply_filters( "{$adjacent}_post_rel_link", $link );
+	return apply_filters("{$adjacent}_post_rel_link", $link);
 }
 
 /**
@@ -1812,9 +1812,9 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function adjacent_posts_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, true, $taxonomy );
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, false, $taxonomy );
+function adjacent_posts_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, true, $taxonomy);
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1828,7 +1828,7 @@ 
  * @see adjacent_posts_rel_link()
  */
 function adjacent_posts_rel_link_wp_head() {
-	if ( ! is_single() || is_attachment() ) {
+	if ( ! is_single() || is_attachment()) {
 		return;
 	}
 	adjacent_posts_rel_link();
@@ -1846,8 +1846,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function next_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, false, $taxonomy );
+function next_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1862,8 +1862,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default true.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function prev_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, true, $taxonomy );
+function prev_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1882,9 +1882,9 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|array Array containing the boundary post object if successful, null otherwise.
  */
-function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category' ) {
+function get_boundary_post($in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category') {
 	$post = get_post();
-	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) )
+	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists($taxonomy))
 		return null;
 
 	$query_args = array(
@@ -1896,34 +1896,34 @@ 
 
 	$term_array = array();
 
-	if ( ! is_array( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) )
-			$excluded_terms = explode( ',', $excluded_terms );
+	if ( ! is_array($excluded_terms)) {
+		if ( ! empty($excluded_terms))
+			$excluded_terms = explode(',', $excluded_terms);
 		else
 			$excluded_terms = array();
 	}
 
-	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( $in_same_term )
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+	if ($in_same_term || ! empty($excluded_terms)) {
+		if ($in_same_term)
+			$term_array = wp_get_object_terms($post->ID, $taxonomy, array('fields' => 'ids'));
 
-		if ( ! empty( $excluded_terms ) ) {
-			$excluded_terms = array_map( 'intval', $excluded_terms );
-			$excluded_terms = array_diff( $excluded_terms, $term_array );
+		if ( ! empty($excluded_terms)) {
+			$excluded_terms = array_map('intval', $excluded_terms);
+			$excluded_terms = array_diff($excluded_terms, $term_array);
 
 			$inverse_terms = array();
-			foreach ( $excluded_terms as $excluded_term )
+			foreach ($excluded_terms as $excluded_term)
 				$inverse_terms[] = $excluded_term * -1;
 			$excluded_terms = $inverse_terms;
 		}
 
-		$query_args[ 'tax_query' ] = array( array(
+		$query_args['tax_query'] = array(array(
 			'taxonomy' => $taxonomy,
-			'terms' => array_merge( $term_array, $excluded_terms )
-		) );
+			'terms' => array_merge($term_array, $excluded_terms)
+		));
 	}
 
-	return get_posts( $query_args );
+	return get_posts($query_args);
 }
 
 /**
@@ -1938,8 +1938,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the previous post in relation to the current post.
  */
-function get_previous_post_link( $format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, true, $taxonomy );
+function get_previous_post_link($format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1955,8 +1955,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function previous_post_link( $format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_previous_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
+function previous_post_link($format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_previous_post_link($format, $link, $in_same_term, $excluded_terms, $taxonomy);
 }
 
 /**
@@ -1971,8 +1971,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the next post in relation to the current post.
  */
-function get_next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, false, $taxonomy );
+function get_next_post_link($format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1987,8 +1987,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	 echo get_next_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
+function next_post_link($format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	 echo get_next_post_link($format, $link, $in_same_term, $excluded_terms, $taxonomy);
 }
 
 /**
@@ -2006,32 +2006,32 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the previous or next post in relation to the current post.
  */
-function get_adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() )
-		$post = get_post( get_post()->post_parent );
+function get_adjacent_post_link($format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	if ($previous && is_attachment())
+		$post = get_post(get_post()->post_parent);
 	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+		$post = get_adjacent_post($in_same_term, $excluded_terms, $previous, $taxonomy);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		$output = '';
 	} else {
 		$title = $post->post_title;
 
-		if ( empty( $post->post_title ) )
-			$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		if (empty($post->post_title))
+			$title = $previous ? __('Previous Post') : __('Next Post');
 
 		/** This filter is documented in wp-includes/post-template.php */
-		$title = apply_filters( 'the_title', $title, $post->ID );
+		$title = apply_filters('the_title', $title, $post->ID);
 
-		$date = mysql2date( get_option( 'date_format' ), $post->post_date );
+		$date = mysql2date(get_option('date_format'), $post->post_date);
 		$rel = $previous ? 'prev' : 'next';
 
-		$string = '<a href="' . get_permalink( $post ) . '" rel="'.$rel.'">';
-		$inlink = str_replace( '%title', $title, $link );
-		$inlink = str_replace( '%date', $date, $inlink );
-		$inlink = $string . $inlink . '</a>';
+		$string = '<a href="'.get_permalink($post).'" rel="'.$rel.'">';
+		$inlink = str_replace('%title', $title, $link);
+		$inlink = str_replace('%date', $date, $inlink);
+		$inlink = $string.$inlink.'</a>';
 
-		$output = str_replace( '%link', $inlink, $format );
+		$output = str_replace('%link', $inlink, $format);
 	}
 
 	$adjacent = $previous ? 'previous' : 'next';
@@ -2051,7 +2051,7 @@ 
 	 * @param WP_Post $post     The adjacent post.
 	 * @param string  $adjacent Whether the post is previous or next.
 	 */
-	return apply_filters( "{$adjacent}_post_link", $output, $format, $link, $post, $adjacent );
+	return apply_filters("{$adjacent}_post_link", $output, $format, $link, $post, $adjacent);
 }
 
 /**
@@ -2068,8 +2068,8 @@ 
  * @param bool         $previous       Optional. Whether to display link to previous or next post. Default true.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	echo get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, $previous, $taxonomy );
+function adjacent_post_link($format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	echo get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, $previous, $taxonomy);
 }
 
 /**
@@ -2084,53 +2084,53 @@ 
  * 	                    Otherwise, prepares the URL with esc_url_raw().
  * @return string The link URL for the given page number.
  */
-function get_pagenum_link($pagenum = 1, $escape = true ) {
+function get_pagenum_link($pagenum = 1, $escape = true) {
 	global $wp_rewrite;
 
 	$pagenum = (int) $pagenum;
 
-	$request = remove_query_arg( 'paged' );
+	$request = remove_query_arg('paged');
 
 	$home_root = parse_url(home_url());
-	$home_root = ( isset($home_root['path']) ) ? $home_root['path'] : '';
-	$home_root = preg_quote( $home_root, '|' );
+	$home_root = (isset($home_root['path'])) ? $home_root['path'] : '';
+	$home_root = preg_quote($home_root, '|');
 
-	$request = preg_replace('|^'. $home_root . '|i', '', $request);
+	$request = preg_replace('|^'.$home_root.'|i', '', $request);
 	$request = preg_replace('|^/+|', '', $request);
 
-	if ( !$wp_rewrite->using_permalinks() || is_admin() ) {
-		$base = trailingslashit( get_bloginfo( 'url' ) );
+	if ( ! $wp_rewrite->using_permalinks() || is_admin()) {
+		$base = trailingslashit(get_bloginfo('url'));
 
-		if ( $pagenum > 1 ) {
-			$result = add_query_arg( 'paged', $pagenum, $base . $request );
+		if ($pagenum > 1) {
+			$result = add_query_arg('paged', $pagenum, $base.$request);
 		} else {
-			$result = $base . $request;
+			$result = $base.$request;
 		}
 	} else {
 		$qs_regex = '|\?.*?$|';
-		preg_match( $qs_regex, $request, $qs_match );
+		preg_match($qs_regex, $request, $qs_match);
 
-		if ( !empty( $qs_match[0] ) ) {
+		if ( ! empty($qs_match[0])) {
 			$query_string = $qs_match[0];
-			$request = preg_replace( $qs_regex, '', $request );
+			$request = preg_replace($qs_regex, '', $request);
 		} else {
 			$query_string = '';
 		}
 
-		$request = preg_replace( "|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
-		$request = preg_replace( '|^' . preg_quote( $wp_rewrite->index, '|' ) . '|i', '', $request);
+		$request = preg_replace("|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
+		$request = preg_replace('|^'.preg_quote($wp_rewrite->index, '|').'|i', '', $request);
 		$request = ltrim($request, '/');
 
-		$base = trailingslashit( get_bloginfo( 'url' ) );
+		$base = trailingslashit(get_bloginfo('url'));
 
-		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
-			$base .= $wp_rewrite->index . '/';
+		if ($wp_rewrite->using_index_permalinks() && ($pagenum > 1 || '' != $request))
+			$base .= $wp_rewrite->index.'/';
 
-		if ( $pagenum > 1 ) {
-			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
+		if ($pagenum > 1) {
+			$request = (( ! empty($request)) ? trailingslashit($request) : $request).user_trailingslashit($wp_rewrite->pagination_base."/".$pagenum, 'paged');
 		}
 
-		$result = $base . $request . $query_string;
+		$result = $base.$request.$query_string;
 	}
 
 	/**
@@ -2140,12 +2140,12 @@ 
 	 *
 	 * @param string $result The page number link.
 	 */
-	$result = apply_filters( 'get_pagenum_link', $result );
+	$result = apply_filters('get_pagenum_link', $result);
 
-	if ( $escape )
-		return esc_url( $result );
+	if ($escape)
+		return esc_url($result);
 	else
-		return esc_url_raw( $result );
+		return esc_url_raw($result);
 }
 
 /**
@@ -2163,11 +2163,11 @@ 
 function get_next_posts_page_link($max_page = 0) {
 	global $paged;
 
-	if ( !is_single() ) {
-		if ( !$paged )
+	if ( ! is_single()) {
+		if ( ! $paged)
 			$paged = 1;
 		$nextpage = intval($paged) + 1;
-		if ( !$max_page || $max_page >= $nextpage )
+		if ( ! $max_page || $max_page >= $nextpage)
 			return get_pagenum_link($nextpage);
 	}
 }
@@ -2181,10 +2181,10 @@ 
  * @param bool  $echo     Optional. Whether to echo the link. Default true.
  * @return string|void The link URL for next posts page if `$echo = false`.
  */
-function next_posts( $max_page = 0, $echo = true ) {
-	$output = esc_url( get_next_posts_page_link( $max_page ) );
+function next_posts($max_page = 0, $echo = true) {
+	$output = esc_url(get_next_posts_page_link($max_page));
 
-	if ( $echo )
+	if ($echo)
 		echo $output;
 	else
 		return $output;
@@ -2202,21 +2202,21 @@ 
  * @param int    $max_page Optional. Max pages. Default 0.
  * @return string|void HTML-formatted next posts page link.
  */
-function get_next_posts_link( $label = null, $max_page = 0 ) {
+function get_next_posts_link($label = null, $max_page = 0) {
 	global $paged, $wp_query;
 
-	if ( !$max_page )
+	if ( ! $max_page)
 		$max_page = $wp_query->max_num_pages;
 
-	if ( !$paged )
+	if ( ! $paged)
 		$paged = 1;
 
 	$nextpage = intval($paged) + 1;
 
-	if ( null === $label )
-		$label = __( 'Next Page &raquo;' );
+	if (null === $label)
+		$label = __('Next Page &raquo;');
 
-	if ( !is_single() && ( $nextpage <= $max_page ) ) {
+	if ( ! is_single() && ($nextpage <= $max_page)) {
 		/**
 		 * Filters the anchor tag attributes for the next posts page link.
 		 *
@@ -2224,9 +2224,9 @@ 
 		 *
 		 * @param string $attributes Attributes for the anchor tag.
 		 */
-		$attr = apply_filters( 'next_posts_link_attributes', '' );
+		$attr = apply_filters('next_posts_link_attributes', '');
 
-		return '<a href="' . next_posts( $max_page, false ) . "\" $attr>" . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) . '</a>';
+		return '<a href="'.next_posts($max_page, false)."\" $attr>".preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 	}
 }
 
@@ -2238,8 +2238,8 @@ 
  * @param string $label    Content for link text.
  * @param int    $max_page Optional. Max pages. Default 0.
  */
-function next_posts_link( $label = null, $max_page = 0 ) {
-	echo get_next_posts_link( $label, $max_page );
+function next_posts_link($label = null, $max_page = 0) {
+	echo get_next_posts_link($label, $max_page);
 }
 
 /**
@@ -2258,9 +2258,9 @@ 
 function get_previous_posts_page_link() {
 	global $paged;
 
-	if ( !is_single() ) {
+	if ( ! is_single()) {
 		$nextpage = intval($paged) - 1;
-		if ( $nextpage < 1 )
+		if ($nextpage < 1)
 			$nextpage = 1;
 		return get_pagenum_link($nextpage);
 	}
@@ -2274,10 +2274,10 @@ 
  * @param bool $echo Optional. Whether to echo the link. Default true.
  * @return string|void The previous posts page link if `$echo = false`.
  */
-function previous_posts( $echo = true ) {
-	$output = esc_url( get_previous_posts_page_link() );
+function previous_posts($echo = true) {
+	$output = esc_url(get_previous_posts_page_link());
 
-	if ( $echo )
+	if ($echo)
 		echo $output;
 	else
 		return $output;
@@ -2293,13 +2293,13 @@ 
  * @param string $label Optional. Previous page link text.
  * @return string|void HTML-formatted previous page link.
  */
-function get_previous_posts_link( $label = null ) {
+function get_previous_posts_link($label = null) {
 	global $paged;
 
-	if ( null === $label )
-		$label = __( '&laquo; Previous Page' );
+	if (null === $label)
+		$label = __('&laquo; Previous Page');
 
-	if ( !is_single() && $paged > 1 ) {
+	if ( ! is_single() && $paged > 1) {
 		/**
 		 * Filters the anchor tag attributes for the previous posts page link.
 		 *
@@ -2307,8 +2307,8 @@ 
 		 *
 		 * @param string $attributes Attributes for the anchor tag.
 		 */
-		$attr = apply_filters( 'previous_posts_link_attributes', '' );
-		return '<a href="' . previous_posts( false ) . "\" $attr>". preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) .'</a>';
+		$attr = apply_filters('previous_posts_link_attributes', '');
+		return '<a href="'.previous_posts(false)."\" $attr>".preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 	}
 }
 
@@ -2319,8 +2319,8 @@ 
  *
  * @param string $label Optional. Previous page link text.
  */
-function previous_posts_link( $label = null ) {
-	echo get_previous_posts_link( $label );
+function previous_posts_link($label = null) {
+	echo get_previous_posts_link($label);
 }
 
 /**
@@ -2341,18 +2341,18 @@ 
  * }
  * @return string The posts link navigation.
  */
-function get_posts_nav_link( $args = array() ) {
+function get_posts_nav_link($args = array()) {
 	global $wp_query;
 
 	$return = '';
 
-	if ( !is_singular() ) {
+	if ( ! is_singular()) {
 		$defaults = array(
 			'sep' => ' &#8212; ',
 			'prelabel' => __('&laquo; Previous Page'),
 			'nxtlabel' => __('Next Page &raquo;'),
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$max_num_pages = $wp_query->max_num_pages;
 		$paged = get_query_var('paged');
@@ -2362,7 +2362,7 @@ 
 			$args['sep'] = '';
 		}
 
-		if ( $max_num_pages > 1 ) {
+		if ($max_num_pages > 1) {
 			$return = get_previous_posts_link($args['prelabel']);
 			$return .= preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $args['sep']);
 			$return .= get_next_posts_link($args['nxtlabel']);
@@ -2381,8 +2381,8 @@ 
  * @param string $prelabel Optional. Label for previous pages. Default empty.
  * @param string $nxtlabel Optional Label for next pages. Default empty.
  */
-function posts_nav_link( $sep = '', $prelabel = '', $nxtlabel = '' ) {
-	$args = array_filter( compact('sep', 'prelabel', 'nxtlabel') );
+function posts_nav_link($sep = '', $prelabel = '', $nxtlabel = '') {
+	$args = array_filter(compact('sep', 'prelabel', 'nxtlabel'));
 	echo get_posts_nav_link($args);
 }
 
@@ -2404,15 +2404,15 @@ 
  * }
  * @return string Markup for post links.
  */
-function get_the_post_navigation( $args = array() ) {
-	$args = wp_parse_args( $args, array(
+function get_the_post_navigation($args = array()) {
+	$args = wp_parse_args($args, array(
 		'prev_text'          => '%title',
 		'next_text'          => '%title',
 		'in_same_term'       => false,
 		'excluded_terms'     => '',
 		'taxonomy'           => 'category',
-		'screen_reader_text' => __( 'Post navigation' ),
-	) );
+		'screen_reader_text' => __('Post navigation'),
+	));
 
 	$navigation = '';
 
@@ -2433,8 +2433,8 @@ 
 	);
 
 	// Only add markup if there's somewhere to navigate to.
-	if ( $previous || $next ) {
-		$navigation = _navigation_markup( $previous . $next, 'post-navigation', $args['screen_reader_text'] );
+	if ($previous || $next) {
+		$navigation = _navigation_markup($previous.$next, 'post-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2448,8 +2448,8 @@ 
  * @param array $args Optional. See get_the_post_navigation() for available arguments.
  *                    Default empty array.
  */
-function the_post_navigation( $args = array() ) {
-	echo get_the_post_navigation( $args );
+function the_post_navigation($args = array()) {
+	echo get_the_post_navigation($args);
 }
 
 /**
@@ -2471,29 +2471,29 @@ 
  * }
  * @return string Markup for posts links.
  */
-function get_the_posts_navigation( $args = array() ) {
+function get_the_posts_navigation($args = array()) {
 	$navigation = '';
 
 	// Don't print empty markup if there's only one page.
-	if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
-		$args = wp_parse_args( $args, array(
-			'prev_text'          => __( 'Older posts' ),
-			'next_text'          => __( 'Newer posts' ),
-			'screen_reader_text' => __( 'Posts navigation' ),
-		) );
-
-		$next_link = get_previous_posts_link( $args['next_text'] );
-		$prev_link = get_next_posts_link( $args['prev_text'] );
-
-		if ( $prev_link ) {
-			$navigation .= '<div class="nav-previous">' . $prev_link . '</div>';
+	if ($GLOBALS['wp_query']->max_num_pages > 1) {
+		$args = wp_parse_args($args, array(
+			'prev_text'          => __('Older posts'),
+			'next_text'          => __('Newer posts'),
+			'screen_reader_text' => __('Posts navigation'),
+		));
+
+		$next_link = get_previous_posts_link($args['next_text']);
+		$prev_link = get_next_posts_link($args['prev_text']);
+
+		if ($prev_link) {
+			$navigation .= '<div class="nav-previous">'.$prev_link.'</div>';
 		}
 
-		if ( $next_link ) {
-			$navigation .= '<div class="nav-next">' . $next_link . '</div>';
+		if ($next_link) {
+			$navigation .= '<div class="nav-next">'.$next_link.'</div>';
 		}
 
-		$navigation = _navigation_markup( $navigation, 'posts-navigation', $args['screen_reader_text'] );
+		$navigation = _navigation_markup($navigation, 'posts-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2507,8 +2507,8 @@ 
  * @param array $args Optional. See get_the_posts_navigation() for available arguments.
  *                    Default empty array.
  */
-function the_posts_navigation( $args = array() ) {
-	echo get_the_posts_navigation( $args );
+function the_posts_navigation($args = array()) {
+	echo get_the_posts_navigation($args);
 }
 
 /**
@@ -2524,28 +2524,28 @@ 
  * }
  * @return string Markup for pagination links.
  */
-function get_the_posts_pagination( $args = array() ) {
+function get_the_posts_pagination($args = array()) {
 	$navigation = '';
 
 	// Don't print empty markup if there's only one page.
-	if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
-		$args = wp_parse_args( $args, array(
+	if ($GLOBALS['wp_query']->max_num_pages > 1) {
+		$args = wp_parse_args($args, array(
 			'mid_size'           => 1,
-			'prev_text'          => _x( 'Previous', 'previous set of posts' ),
-			'next_text'          => _x( 'Next', 'next set of posts' ),
-			'screen_reader_text' => __( 'Posts navigation' ),
-		) );
+			'prev_text'          => _x('Previous', 'previous set of posts'),
+			'next_text'          => _x('Next', 'next set of posts'),
+			'screen_reader_text' => __('Posts navigation'),
+		));
 
 		// Make sure we get a string back. Plain is the next best thing.
-		if ( isset( $args['type'] ) && 'array' == $args['type'] ) {
+		if (isset($args['type']) && 'array' == $args['type']) {
 			$args['type'] = 'plain';
 		}
 
 		// Set up paginated links.
-		$links = paginate_links( $args );
+		$links = paginate_links($args);
 
-		if ( $links ) {
-			$navigation = _navigation_markup( $links, 'pagination', $args['screen_reader_text'] );
+		if ($links) {
+			$navigation = _navigation_markup($links, 'pagination', $args['screen_reader_text']);
 		}
 	}
 
@@ -2560,8 +2560,8 @@ 
  * @param array $args Optional. See get_the_posts_pagination() for available arguments.
  *                    Default empty array.
  */
-function the_posts_pagination( $args = array() ) {
-	echo get_the_posts_pagination( $args );
+function the_posts_pagination($args = array()) {
+	echo get_the_posts_pagination($args);
 }
 
 /**
@@ -2575,9 +2575,9 @@ 
  * @param string $screen_reader_text Optional. Screen reader text for nav element. Default: 'Posts navigation'.
  * @return string Navigation template tag.
  */
-function _navigation_markup( $links, $class = 'posts-navigation', $screen_reader_text = '' ) {
-	if ( empty( $screen_reader_text ) ) {
-		$screen_reader_text = __( 'Posts navigation' );
+function _navigation_markup($links, $class = 'posts-navigation', $screen_reader_text = '') {
+	if (empty($screen_reader_text)) {
+		$screen_reader_text = __('Posts navigation');
 	}
 
 	$template = '
@@ -2604,9 +2604,9 @@ 
 	 * @param string $class    The class passed by the calling function.
 	 * @return string Navigation template.
 	 */
-	$template = apply_filters( 'navigation_markup_template', $template, $class );
+	$template = apply_filters('navigation_markup_template', $template, $class);
 
-	return sprintf( $template, sanitize_html_class( $class ), esc_html( $screen_reader_text ), $links );
+	return sprintf($template, sanitize_html_class($class), esc_html($screen_reader_text), $links);
 }
 
 /**
@@ -2620,25 +2620,25 @@ 
  * @param int $max_page Optional. The maximum number of comment pages. Default 0.
  * @return string The comments page number link URL.
  */
-function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) {
+function get_comments_pagenum_link($pagenum = 1, $max_page = 0) {
 	global $wp_rewrite;
 
 	$pagenum = (int) $pagenum;
 
 	$result = get_permalink();
 
-	if ( 'newest' == get_option('default_comments_page') ) {
-		if ( $pagenum != $max_page ) {
-			if ( $wp_rewrite->using_permalinks() )
-				$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+	if ('newest' == get_option('default_comments_page')) {
+		if ($pagenum != $max_page) {
+			if ($wp_rewrite->using_permalinks())
+				$result = user_trailingslashit(trailingslashit($result).$wp_rewrite->comments_pagination_base.'-'.$pagenum, 'commentpaged');
 			else
-				$result = add_query_arg( 'cpage', $pagenum, $result );
+				$result = add_query_arg('cpage', $pagenum, $result);
 		}
-	} elseif ( $pagenum > 1 ) {
-		if ( $wp_rewrite->using_permalinks() )
-			$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+	} elseif ($pagenum > 1) {
+		if ($wp_rewrite->using_permalinks())
+			$result = user_trailingslashit(trailingslashit($result).$wp_rewrite->comments_pagination_base.'-'.$pagenum, 'commentpaged');
 		else
-			$result = add_query_arg( 'cpage', $pagenum, $result );
+			$result = add_query_arg('cpage', $pagenum, $result);
 	}
 
 	$result .= '#comments';
@@ -2650,7 +2650,7 @@ 
 	 *
 	 * @param string $result The comments page number link.
 	 */
-	return apply_filters( 'get_comments_pagenum_link', $result );
+	return apply_filters('get_comments_pagenum_link', $result);
 }
 
 /**
@@ -2664,30 +2664,30 @@ 
  * @param int    $max_page Optional. Max page. Default 0.
  * @return string|void HTML-formatted link for the next page of comments.
  */
-function get_next_comments_link( $label = '', $max_page = 0 ) {
+function get_next_comments_link($label = '', $max_page = 0) {
 	global $wp_query;
 
-	if ( ! is_singular() )
+	if ( ! is_singular())
 		return;
 
 	$page = get_query_var('cpage');
 
-	if ( ! $page ) {
+	if ( ! $page) {
 		$page = 1;
 	}
 
 	$nextpage = intval($page) + 1;
 
-	if ( empty($max_page) )
+	if (empty($max_page))
 		$max_page = $wp_query->max_num_comment_pages;
 
-	if ( empty($max_page) )
+	if (empty($max_page))
 		$max_page = get_comment_pages_count();
 
-	if ( $nextpage > $max_page )
+	if ($nextpage > $max_page)
 		return;
 
-	if ( empty($label) )
+	if (empty($label))
 		$label = __('Newer Comments &raquo;');
 
 	/**
@@ -2697,7 +2697,7 @@ 
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>'. preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
+	return '<a href="'.esc_url(get_comments_pagenum_link($nextpage, $max_page)).'" '.apply_filters('next_comments_link_attributes', '').'>'.preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 }
 
 /**
@@ -2708,8 +2708,8 @@ 
  * @param string $label    Optional. Label for link text. Default empty.
  * @param int    $max_page Optional. Max page. Default 0.
  */
-function next_comments_link( $label = '', $max_page = 0 ) {
-	echo get_next_comments_link( $label, $max_page );
+function next_comments_link($label = '', $max_page = 0) {
+	echo get_next_comments_link($label, $max_page);
 }
 
 /**
@@ -2720,18 +2720,18 @@ 
  * @param string $label Optional. Label for comments link text. Default empty.
  * @return string|void HTML-formatted link for the previous page of comments.
  */
-function get_previous_comments_link( $label = '' ) {
-	if ( ! is_singular() )
+function get_previous_comments_link($label = '') {
+	if ( ! is_singular())
 		return;
 
 	$page = get_query_var('cpage');
 
-	if ( intval($page) <= 1 )
+	if (intval($page) <= 1)
 		return;
 
 	$prevpage = intval($page) - 1;
 
-	if ( empty($label) )
+	if (empty($label))
 		$label = __('&laquo; Older Comments');
 
 	/**
@@ -2741,7 +2741,7 @@ 
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
+	return '<a href="'.esc_url(get_comments_pagenum_link($prevpage)).'" '.apply_filters('previous_comments_link_attributes', '').'>'.preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 }
 
 /**
@@ -2751,8 +2751,8 @@ 
  *
  * @param string $label Optional. Label for comments link text. Default empty.
  */
-function previous_comments_link( $label = '' ) {
-	echo get_previous_comments_link( $label );
+function previous_comments_link($label = '') {
+	echo get_previous_comments_link($label);
 }
 
 /**
@@ -2766,31 +2766,31 @@ 
  * @param string|array $args Optional args. See paginate_links(). Default empty array.
  * @return string|void Markup for pagination links.
  */
-function paginate_comments_links( $args = array() ) {
+function paginate_comments_links($args = array()) {
 	global $wp_rewrite;
 
-	if ( ! is_singular() )
+	if ( ! is_singular())
 		return;
 
 	$page = get_query_var('cpage');
-	if ( !$page )
+	if ( ! $page)
 		$page = 1;
 	$max_page = get_comment_pages_count();
 	$defaults = array(
-		'base' => add_query_arg( 'cpage', '%#%' ),
+		'base' => add_query_arg('cpage', '%#%'),
 		'format' => '',
 		'total' => $max_page,
 		'current' => $page,
 		'echo' => true,
 		'add_fragment' => '#comments'
 	);
-	if ( $wp_rewrite->using_permalinks() )
-		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	if ($wp_rewrite->using_permalinks())
+		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()).$wp_rewrite->comments_pagination_base.'-%#%', 'commentpaged');
 
-	$args = wp_parse_args( $args, $defaults );
-	$page_links = paginate_links( $args );
+	$args = wp_parse_args($args, $defaults);
+	$page_links = paginate_links($args);
 
-	if ( $args['echo'] )
+	if ($args['echo'])
 		echo $page_links;
 	else
 		return $page_links;
@@ -2812,29 +2812,29 @@ 
  * }
  * @return string Markup for comments links.
  */
-function get_the_comments_navigation( $args = array() ) {
+function get_the_comments_navigation($args = array()) {
 	$navigation = '';
 
 	// Are there comments to navigate through?
-	if ( get_comment_pages_count() > 1 ) {
-		$args = wp_parse_args( $args, array(
-			'prev_text'          => __( 'Older comments' ),
-			'next_text'          => __( 'Newer comments' ),
-			'screen_reader_text' => __( 'Comments navigation' ),
-		) );
-
-		$prev_link = get_previous_comments_link( $args['prev_text'] );
-		$next_link = get_next_comments_link( $args['next_text'] );
-
-		if ( $prev_link ) {
-			$navigation .= '<div class="nav-previous">' . $prev_link . '</div>';
+	if (get_comment_pages_count() > 1) {
+		$args = wp_parse_args($args, array(
+			'prev_text'          => __('Older comments'),
+			'next_text'          => __('Newer comments'),
+			'screen_reader_text' => __('Comments navigation'),
+		));
+
+		$prev_link = get_previous_comments_link($args['prev_text']);
+		$next_link = get_next_comments_link($args['next_text']);
+
+		if ($prev_link) {
+			$navigation .= '<div class="nav-previous">'.$prev_link.'</div>';
 		}
 
-		if ( $next_link ) {
-			$navigation .= '<div class="nav-next">' . $next_link . '</div>';
+		if ($next_link) {
+			$navigation .= '<div class="nav-next">'.$next_link.'</div>';
 		}
 
-		$navigation = _navigation_markup( $navigation, 'comment-navigation', $args['screen_reader_text'] );
+		$navigation = _navigation_markup($navigation, 'comment-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2847,8 +2847,8 @@ 
  *
  * @param array $args See get_the_comments_navigation() for available arguments. Default empty array.
  */
-function the_comments_navigation( $args = array() ) {
-	echo get_the_comments_navigation( $args );
+function the_comments_navigation($args = array()) {
+	echo get_the_comments_navigation($args);
 }
 
 /**
@@ -2865,20 +2865,20 @@ 
  * }
  * @return string Markup for pagination links.
  */
-function get_the_comments_pagination( $args = array() ) {
+function get_the_comments_pagination($args = array()) {
 	$navigation = '';
-	$args       = wp_parse_args( $args, array(
-		'screen_reader_text' => __( 'Comments navigation' ),
-	) );
+	$args       = wp_parse_args($args, array(
+		'screen_reader_text' => __('Comments navigation'),
+	));
 	$args['echo'] = false;
 
 	// Make sure we get plain links, so we get a string we can work with.
 	$args['type'] = 'plain';
 
-	$links = paginate_comments_links( $args );
+	$links = paginate_comments_links($args);
 
-	if ( $links ) {
-		$navigation = _navigation_markup( $links, 'comments-pagination', $args['screen_reader_text'] );
+	if ($links) {
+		$navigation = _navigation_markup($links, 'comments-pagination', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2891,8 +2891,8 @@ 
  *
  * @param array $args See get_the_comments_pagination() for available arguments. Default empty array.
  */
-function the_comments_pagination( $args = array() ) {
-	echo get_the_comments_pagination( $args );
+function the_comments_pagination($args = array()) {
+	echo get_the_comments_pagination($args);
 }
 
 /**
@@ -2905,11 +2905,11 @@ 
 function get_shortcut_link() {
 	global $is_IE;
 
-	include_once( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+	include_once(ABSPATH.'wp-admin/includes/class-wp-press-this.php');
 
 	$link = '';
 
-	if ( $is_IE ) {
+	if ($is_IE) {
 		/*
 		 * Return the old/shorter bookmarklet code for MSIE 8 and lower,
 		 * since they only support a max length of ~2000 characters for
@@ -2919,27 +2919,27 @@ 
 		 */
 		$ua = $_SERVER['HTTP_USER_AGENT'];
 
-		if ( ! empty( $ua ) && preg_match( '/\bMSIE (\d)/', $ua, $matches ) && (int) $matches[1] <= 8 ) {
-			$url = wp_json_encode( admin_url( 'press-this.php' ) );
+		if ( ! empty($ua) && preg_match('/\bMSIE (\d)/', $ua, $matches) && (int) $matches[1] <= 8) {
+			$url = wp_json_encode(admin_url('press-this.php'));
 
-			$link = 'javascript:var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,' .
-				's=(e?e():(k)?k():(x?x.createRange().text:0)),f=' . $url . ',l=d.location,e=encodeURIComponent,' .
-				'u=f+"?u="+e(l.href)+"&t="+e(d.title)+"&s="+e(s)+"&v=' . WP_Press_This::VERSION . '";' .
-				'a=function(){if(!w.open(u,"t","toolbar=0,resizable=1,scrollbars=1,status=1,width=600,height=700"))l.href=u;};' .
+			$link = 'javascript:var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,'.
+				's=(e?e():(k)?k():(x?x.createRange().text:0)),f='.$url.',l=d.location,e=encodeURIComponent,'.
+				'u=f+"?u="+e(l.href)+"&t="+e(d.title)+"&s="+e(s)+"&v='.WP_Press_This::VERSION.'";'.
+				'a=function(){if(!w.open(u,"t","toolbar=0,resizable=1,scrollbars=1,status=1,width=600,height=700"))l.href=u;};'.
 				'if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else a();void(0)';
 		}
 	}
 
-	if ( empty( $link ) ) {
-		$src = @file_get_contents( ABSPATH . 'wp-admin/js/bookmarklet.min.js' );
+	if (empty($link)) {
+		$src = @file_get_contents(ABSPATH.'wp-admin/js/bookmarklet.min.js');
 
-		if ( $src ) {
-			$url = wp_json_encode( admin_url( 'press-this.php' ) . '?v=' . WP_Press_This::VERSION );
-			$link = 'javascript:' . str_replace( 'window.pt_url', $url, $src );
+		if ($src) {
+			$url = wp_json_encode(admin_url('press-this.php').'?v='.WP_Press_This::VERSION);
+			$link = 'javascript:'.str_replace('window.pt_url', $url, $src);
 		}
 	}
 
-	$link = str_replace( array( "\r", "\n", "\t" ),  '', $link );
+	$link = str_replace(array("\r", "\n", "\t"), '', $link);
 
 	/**
 	 * Filters the Press This bookmarklet link.
@@ -2948,7 +2948,7 @@ 
 	 *
 	 * @param string $link The Press This bookmarklet link.
 	 */
-	return apply_filters( 'shortcut_link', $link );
+	return apply_filters('shortcut_link', $link);
 }
 
 /**
@@ -2965,8 +2965,8 @@ 
  *                             'http', 'https', 'relative', 'rest', or null. Default null.
  * @return string Home URL link with optional path appended.
  */
-function home_url( $path = '', $scheme = null ) {
-	return get_home_url( null, $path, $scheme );
+function home_url($path = '', $scheme = null) {
+	return get_home_url(null, $path, $scheme);
 }
 
 /**
@@ -2986,30 +2986,30 @@ 
  *                              'http', 'https', 'relative', 'rest', or null. Default null.
  * @return string Home URL link with optional path appended.
  */
-function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
+function get_home_url($blog_id = null, $path = '', $scheme = null) {
 	global $pagenow;
 
 	$orig_scheme = $scheme;
 
-	if ( empty( $blog_id ) || !is_multisite() ) {
-		$url = get_option( 'home' );
+	if (empty($blog_id) || ! is_multisite()) {
+		$url = get_option('home');
 	} else {
-		switch_to_blog( $blog_id );
-		$url = get_option( 'home' );
+		switch_to_blog($blog_id);
+		$url = get_option('home');
 		restore_current_blog();
 	}
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow )
+	if ( ! in_array($scheme, array('http', 'https', 'relative'))) {
+		if (is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow)
 			$scheme = 'https';
 		else
-			$scheme = parse_url( $url, PHP_URL_SCHEME );
+			$scheme = parse_url($url, PHP_URL_SCHEME);
 	}
 
-	$url = set_url_scheme( $url, $scheme );
+	$url = set_url_scheme($url, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filters the home URL.
@@ -3022,7 +3022,7 @@ 
 	 *                                 'relative', 'rest', or null.
 	 * @param int|null    $blog_id     Site ID, or null for the current site.
 	 */
-	return apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
+	return apply_filters('home_url', $url, $path, $orig_scheme, $blog_id);
 }
 
 /**
@@ -3039,8 +3039,8 @@ 
  * @param string $scheme Optional. Scheme to give the site URL context. See set_url_scheme().
  * @return string Site URL link with optional path appended.
  */
-function site_url( $path = '', $scheme = null ) {
-	return get_site_url( null, $path, $scheme );
+function site_url($path = '', $scheme = null) {
+	return get_site_url(null, $path, $scheme);
 }
 
 /**
@@ -3060,19 +3060,19 @@ 
  *                        'relative'. Default null.
  * @return string Site URL link with optional path appended.
  */
-function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
-	if ( empty( $blog_id ) || !is_multisite() ) {
-		$url = get_option( 'siteurl' );
+function get_site_url($blog_id = null, $path = '', $scheme = null) {
+	if (empty($blog_id) || ! is_multisite()) {
+		$url = get_option('siteurl');
 	} else {
-		switch_to_blog( $blog_id );
-		$url = get_option( 'siteurl' );
+		switch_to_blog($blog_id);
+		$url = get_option('siteurl');
 		restore_current_blog();
 	}
 
-	$url = set_url_scheme( $url, $scheme );
+	$url = set_url_scheme($url, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filters the site URL.
@@ -3085,7 +3085,7 @@ 
 	 *                             'login_post', 'admin', 'relative' or null.
 	 * @param int|null    $blog_id Site ID, or null for the current site.
 	 */
-	return apply_filters( 'site_url', $url, $path, $scheme, $blog_id );
+	return apply_filters('site_url', $url, $path, $scheme, $blog_id);
 }
 
 /**
@@ -3098,8 +3098,8 @@ 
  *                       'http' or 'https' can be passed to force those schemes.
  * @return string Admin URL link with optional path appended.
  */
-function admin_url( $path = '', $scheme = 'admin' ) {
-	return get_admin_url( null, $path, $scheme );
+function admin_url($path = '', $scheme = 'admin') {
+	return get_admin_url(null, $path, $scheme);
 }
 
 /**
@@ -3114,11 +3114,11 @@ 
  *                        force_ssl_admin() and is_ssl().
  * @return string Admin URL link with optional path appended.
  */
-function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
+function get_admin_url($blog_id = null, $path = '', $scheme = 'admin') {
 	$url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filters the admin area URL.
@@ -3129,7 +3129,7 @@ 
 	 * @param string   $path    Path relative to the admin area URL. Blank string if no path is specified.
 	 * @param int|null $blog_id Site ID, or null for the current site.
 	 */
-	return apply_filters( 'admin_url', $url, $path, $blog_id );
+	return apply_filters('admin_url', $url, $path, $blog_id);
 }
 
 /**
@@ -3142,10 +3142,10 @@ 
  *                       'http', 'https', or 'relative'. Default null.
  * @return string Includes URL link with optional path appended.
  */
-function includes_url( $path = '', $scheme = null ) {
-	$url = site_url( '/' . WPINC . '/', $scheme );
+function includes_url($path = '', $scheme = null) {
+	$url = site_url('/'.WPINC.'/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3157,7 +3157,7 @@ 
 	 * @param string $path Path relative to the URL to the wp-includes directory. Blank string
 	 *                     if no path is specified.
 	 */
-	return apply_filters( 'includes_url', $url, $path );
+	return apply_filters('includes_url', $url, $path);
 }
 
 /**
@@ -3168,11 +3168,11 @@ 
  * @param string $path Optional. Path relative to the content URL. Default empty.
  * @return string Content URL link with optional path appended.
  */
-function content_url( $path = '' ) {
-	$url = set_url_scheme( WP_CONTENT_URL );
+function content_url($path = '') {
+	$url = set_url_scheme(WP_CONTENT_URL);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filters the URL to the content directory.
@@ -3183,7 +3183,7 @@ 
 	 * @param string $path Path relative to the URL to the content directory. Blank string
 	 *                     if no path is specified.
 	 */
-	return apply_filters( 'content_url', $url, $path);
+	return apply_filters('content_url', $url, $path);
 }
 
 /**
@@ -3200,28 +3200,28 @@ 
  *                        Typically this is done by passing `__FILE__` as the argument.
  * @return string Plugins URL link with optional paths appended.
  */
-function plugins_url( $path = '', $plugin = '' ) {
+function plugins_url($path = '', $plugin = '') {
 
-	$path = wp_normalize_path( $path );
-	$plugin = wp_normalize_path( $plugin );
-	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
+	$path = wp_normalize_path($path);
+	$plugin = wp_normalize_path($plugin);
+	$mu_plugin_dir = wp_normalize_path(WPMU_PLUGIN_DIR);
 
-	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
+	if ( ! empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir))
 		$url = WPMU_PLUGIN_URL;
 	else
 		$url = WP_PLUGIN_URL;
 
 
-	$url = set_url_scheme( $url );
+	$url = set_url_scheme($url);
 
-	if ( !empty($plugin) && is_string($plugin) ) {
+	if ( ! empty($plugin) && is_string($plugin)) {
 		$folder = dirname(plugin_basename($plugin));
-		if ( '.' != $folder )
-			$url .= '/' . ltrim($folder, '/');
+		if ('.' != $folder)
+			$url .= '/'.ltrim($folder, '/');
 	}
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filters the URL to the plugins directory.
@@ -3234,7 +3234,7 @@ 
 	 * @param string $plugin The plugin file path to be relative to. Blank string if no plugin
 	 *                       is specified.
 	 */
-	return apply_filters( 'plugins_url', $url, $path, $plugin );
+	return apply_filters('plugins_url', $url, $path, $plugin);
 }
 
 /**
@@ -3253,19 +3253,19 @@ 
  *                       'http', 'https', or 'relative'. Default null.
  * @return string Site URL link with optional path appended.
  */
-function network_site_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
+function network_site_url($path = '', $scheme = null) {
+	if ( ! is_multisite())
 		return site_url($path, $scheme);
 
 	$current_network = get_network();
 
-	if ( 'relative' == $scheme )
+	if ('relative' == $scheme)
 		$url = $current_network->path;
 	else
-		$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+		$url = set_url_scheme('http://'.$current_network->domain.$current_network->path, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filters the network site URL.
@@ -3278,7 +3278,7 @@ 
 	 * @param string|null $scheme Scheme to give the URL context. Accepts 'http', 'https',
 	 *                            'relative' or null.
 	 */
-	return apply_filters( 'network_site_url', $url, $path, $scheme );
+	return apply_filters('network_site_url', $url, $path, $scheme);
 }
 
 /**
@@ -3295,23 +3295,23 @@ 
  *                        'http', 'https', or 'relative'. Default null.
  * @return string Home URL link with optional path appended.
  */
-function network_home_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
+function network_home_url($path = '', $scheme = null) {
+	if ( ! is_multisite())
 		return home_url($path, $scheme);
 
 	$current_network = get_network();
 	$orig_scheme = $scheme;
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
+	if ( ! in_array($scheme, array('http', 'https', 'relative')))
 		$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
 
-	if ( 'relative' == $scheme )
+	if ('relative' == $scheme)
 		$url = $current_network->path;
 	else
-		$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+		$url = set_url_scheme('http://'.$current_network->domain.$current_network->path, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filters the network home URL.
@@ -3324,7 +3324,7 @@ 
 	 * @param string|null $orig_scheme Scheme to give the URL context. Accepts 'http', 'https',
 	 *                                 'relative' or null.
 	 */
-	return apply_filters( 'network_home_url', $url, $path, $orig_scheme);
+	return apply_filters('network_home_url', $url, $path, $orig_scheme);
 }
 
 /**
@@ -3337,13 +3337,13 @@ 
  *                       and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin URL link with optional path appended.
  */
-function network_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( ! is_multisite() )
-		return admin_url( $path, $scheme );
+function network_admin_url($path = '', $scheme = 'admin') {
+	if ( ! is_multisite())
+		return admin_url($path, $scheme);
 
 	$url = network_site_url('wp-admin/network/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3355,7 +3355,7 @@ 
 	 * @param string $path Path relative to the network admin URL. Blank string if
 	 *                     no path is specified.
 	 */
-	return apply_filters( 'network_admin_url', $url, $path );
+	return apply_filters('network_admin_url', $url, $path);
 }
 
 /**
@@ -3368,10 +3368,10 @@ 
  *                       and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin URL link with optional path appended.
  */
-function user_admin_url( $path = '', $scheme = 'admin' ) {
+function user_admin_url($path = '', $scheme = 'admin') {
 	$url = network_site_url('wp-admin/user/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3383,7 +3383,7 @@ 
 	 * @param string $path Path relative to the URL. Blank string if
 	 *                     no path is specified.
 	 */
-	return apply_filters( 'user_admin_url', $url, $path );
+	return apply_filters('user_admin_url', $url, $path);
 }
 
 /**
@@ -3396,10 +3396,10 @@ 
  *                       and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin URL link with optional path appended.
  */
-function self_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( is_network_admin() )
+function self_admin_url($path = '', $scheme = 'admin') {
+	if (is_network_admin())
 		return network_admin_url($path, $scheme);
-	elseif ( is_user_admin() )
+	elseif (is_user_admin())
 		return user_admin_url($path, $scheme);
 	else
 		return admin_url($path, $scheme);
@@ -3416,27 +3416,27 @@ 
  *                            'login_post', 'admin', 'relative', 'rest', 'rpc', or null. Default null.
  * @return string $url URL with chosen scheme.
  */
-function set_url_scheme( $url, $scheme = null ) {
+function set_url_scheme($url, $scheme = null) {
 	$orig_scheme = $scheme;
 
-	if ( ! $scheme ) {
+	if ( ! $scheme) {
 		$scheme = is_ssl() ? 'https' : 'http';
-	} elseif ( $scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc' ) {
+	} elseif ($scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc') {
 		$scheme = is_ssl() || force_ssl_admin() ? 'https' : 'http';
-	} elseif ( $scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative' ) {
+	} elseif ($scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative') {
 		$scheme = is_ssl() ? 'https' : 'http';
 	}
 
-	$url = trim( $url );
-	if ( substr( $url, 0, 2 ) === '//' )
-		$url = 'http:' . $url;
+	$url = trim($url);
+	if (substr($url, 0, 2) === '//')
+		$url = 'http:'.$url;
 
-	if ( 'relative' == $scheme ) {
-		$url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
-		if ( $url !== '' && $url[0] === '/' )
-			$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+	if ('relative' == $scheme) {
+		$url = ltrim(preg_replace('#^\w+://[^/]*#', '', $url));
+		if ($url !== '' && $url[0] === '/')
+			$url = '/'.ltrim($url, "/ \t\n\r\0\x0B");
 	} else {
-		$url = preg_replace( '#^\w+://#', $scheme . '://', $url );
+		$url = preg_replace('#^\w+://#', $scheme.'://', $url);
 	}
 
 	/**
@@ -3449,7 +3449,7 @@ 
 	 * @param string|null $orig_scheme Scheme requested for the URL. One of 'http', 'https', 'login',
 	 *                                 'login_post', 'admin', 'relative', 'rest', 'rpc', or null.
 	 */
-	return apply_filters( 'set_url_scheme', $url, $scheme, $orig_scheme );
+	return apply_filters('set_url_scheme', $url, $scheme, $orig_scheme);
 }
 
 /**
@@ -3468,24 +3468,24 @@ 
  *                        and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Dashboard URL link with optional path appended.
  */
-function get_dashboard_url( $user_id = 0, $path = '', $scheme = 'admin' ) {
+function get_dashboard_url($user_id = 0, $path = '', $scheme = 'admin') {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	$blogs = get_blogs_of_user( $user_id );
-	if ( is_multisite() && ! user_can( $user_id, 'manage_network' ) && empty($blogs) ) {
-		$url = user_admin_url( $path, $scheme );
-	} elseif ( ! is_multisite() ) {
-		$url = admin_url( $path, $scheme );
+	$blogs = get_blogs_of_user($user_id);
+	if (is_multisite() && ! user_can($user_id, 'manage_network') && empty($blogs)) {
+		$url = user_admin_url($path, $scheme);
+	} elseif ( ! is_multisite()) {
+		$url = admin_url($path, $scheme);
 	} else {
 		$current_blog = get_current_blog_id();
-		if ( $current_blog  && ( user_can( $user_id, 'manage_network' ) || in_array( $current_blog, array_keys( $blogs ) ) ) ) {
-			$url = admin_url( $path, $scheme );
+		if ($current_blog && (user_can($user_id, 'manage_network') || in_array($current_blog, array_keys($blogs)))) {
+			$url = admin_url($path, $scheme);
 		} else {
-			$active = get_active_blog_for_user( $user_id );
-			if ( $active )
-				$url = get_admin_url( $active->blog_id, $path, $scheme );
+			$active = get_active_blog_for_user($user_id);
+			if ($active)
+				$url = get_admin_url($active->blog_id, $path, $scheme);
 			else
-				$url = user_admin_url( $path, $scheme );
+				$url = user_admin_url($path, $scheme);
 		}
 	}
 
@@ -3500,7 +3500,7 @@ 
 	 * @param string $scheme  Scheme to give the URL context. Accepts 'http', 'https', 'login',
 	 *                        'login_post', 'admin', 'relative' or null.
 	 */
-	return apply_filters( 'user_dashboard_url', $url, $user_id, $path, $scheme);
+	return apply_filters('user_dashboard_url', $url, $user_id, $path, $scheme);
 }
 
 /**
@@ -3513,15 +3513,15 @@ 
  *                        and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Dashboard URL link with optional path appended.
  */
-function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
+function get_edit_profile_url($user_id = 0, $scheme = 'admin') {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	if ( is_user_admin() )
-		$url = user_admin_url( 'profile.php', $scheme );
-	elseif ( is_network_admin() )
-		$url = network_admin_url( 'profile.php', $scheme );
+	if (is_user_admin())
+		$url = user_admin_url('profile.php', $scheme);
+	elseif (is_network_admin())
+		$url = network_admin_url('profile.php', $scheme);
 	else
-		$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+		$url = get_dashboard_url($user_id, 'profile.php', $scheme);
 
 	/**
 	 * Filters the URL for a user's profile editor.
@@ -3533,7 +3533,7 @@ 
 	 * @param string $scheme  Scheme to give the URL context. Accepts 'http', 'https', 'login',
 	 *                        'login_post', 'admin', 'relative' or null.
 	 */
-	return apply_filters( 'edit_profile_url', $url, $user_id, $scheme);
+	return apply_filters('edit_profile_url', $url, $user_id, $scheme);
 }
 
 /**
@@ -3548,33 +3548,33 @@ 
  * @return string|false The canonical URL, or false if the post does not exist or has not
  *                      been published yet.
  */
-function wp_get_canonical_url( $post = null ) {
-	$post = get_post( $post );
+function wp_get_canonical_url($post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( 'publish' !== $post->post_status ) {
+	if ('publish' !== $post->post_status) {
 		return false;
 	}
 
-	$canonical_url = get_permalink( $post );
+	$canonical_url = get_permalink($post);
 
 	// If a canonical is being generated for the current page, make sure it has pagination if needed.
-	if ( $post->ID === get_queried_object_id() ) {
-		$page = get_query_var( 'page', 0 );
-		if ( $page >= 2 ) {
-			if ( '' == get_option( 'permalink_structure' ) ) {
-				$canonical_url = add_query_arg( 'page', $page, $canonical_url );
+	if ($post->ID === get_queried_object_id()) {
+		$page = get_query_var('page', 0);
+		if ($page >= 2) {
+			if ('' == get_option('permalink_structure')) {
+				$canonical_url = add_query_arg('page', $page, $canonical_url);
 			} else {
-				$canonical_url = trailingslashit( $canonical_url ) . user_trailingslashit( $page, 'single_paged' );
+				$canonical_url = trailingslashit($canonical_url).user_trailingslashit($page, 'single_paged');
 			}
 		}
 
-		$cpage = get_query_var( 'cpage', 0 );
-		if ( $cpage ) {
-			$canonical_url = get_comments_pagenum_link( $cpage );
+		$cpage = get_query_var('cpage', 0);
+		if ($cpage) {
+			$canonical_url = get_comments_pagenum_link($cpage);
 		}
 	}
 
@@ -3586,7 +3586,7 @@ 
 	 * @param string  $canonical_url The post's canonical URL.
 	 * @param WP_Post $post          Post object.
 	 */
-	return apply_filters( 'get_canonical_url', $canonical_url, $post );
+	return apply_filters('get_canonical_url', $canonical_url, $post);
 }
 
 /**
@@ -3596,20 +3596,20 @@ 
  * @since 4.6.0 Adjusted to use wp_get_canonical_url().
  */
 function rel_canonical() {
-	if ( ! is_singular() ) {
+	if ( ! is_singular()) {
 		return;
 	}
 
 	$id = get_queried_object_id();
 
-	if ( 0 === $id ) {
+	if (0 === $id) {
 		return;
 	}
 
-	$url = wp_get_canonical_url( $id );
+	$url = wp_get_canonical_url($id);
 
-	if ( ! empty( $url ) ) {
-		echo '<link rel="canonical" href="' . esc_url( $url ) . '" />' . "\n";
+	if ( ! empty($url)) {
+		echo '<link rel="canonical" href="'.esc_url($url).'" />'."\n";
 	}
 }
 
@@ -3633,7 +3633,7 @@ 
  * @return string A shortlink or an empty string if no shortlink exists for the requested resource or if shortlinks
  *                are not enabled.
  */
-function wp_get_shortlink( $id = 0, $context = 'post', $allow_slugs = true ) {
+function wp_get_shortlink($id = 0, $context = 'post', $allow_slugs = true) {
 	/**
 	 * Filters whether to preempt generating a shortlink for the given post.
 	 *
@@ -3647,32 +3647,32 @@ 
 	 * @param string      $context     The context for the link. One of 'post' or 'query',
 	 * @param bool        $allow_slugs Whether to allow post slugs in the shortlink.
 	 */
-	$shortlink = apply_filters( 'pre_get_shortlink', false, $id, $context, $allow_slugs );
+	$shortlink = apply_filters('pre_get_shortlink', false, $id, $context, $allow_slugs);
 
-	if ( false !== $shortlink ) {
+	if (false !== $shortlink) {
 		return $shortlink;
 	}
 
 	$post_id = 0;
-	if ( 'query' == $context && is_singular() ) {
+	if ('query' == $context && is_singular()) {
 		$post_id = get_queried_object_id();
-		$post = get_post( $post_id );
-	} elseif ( 'post' == $context ) {
-		$post = get_post( $id );
-		if ( ! empty( $post->ID ) )
+		$post = get_post($post_id);
+	} elseif ('post' == $context) {
+		$post = get_post($id);
+		if ( ! empty($post->ID))
 			$post_id = $post->ID;
 	}
 
 	$shortlink = '';
 
 	// Return p= link for all public post types.
-	if ( ! empty( $post_id ) ) {
-		$post_type = get_post_type_object( $post->post_type );
+	if ( ! empty($post_id)) {
+		$post_type = get_post_type_object($post->post_type);
 
-		if ( 'page' === $post->post_type && $post->ID == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) ) {
-			$shortlink = home_url( '/' );
-		} elseif ( $post_type->public ) {
-			$shortlink = home_url( '?p=' . $post_id );
+		if ('page' === $post->post_type && $post->ID == get_option('page_on_front') && 'page' == get_option('show_on_front')) {
+			$shortlink = home_url('/');
+		} elseif ($post_type->public) {
+			$shortlink = home_url('?p='.$post_id);
 		}
 	}
 
@@ -3686,7 +3686,7 @@ 
 	 * @param string $context     The context for the link. One of 'post' or 'query',
 	 * @param bool   $allow_slugs Whether to allow post slugs in the shortlink. Not used by default.
 	 */
-	return apply_filters( 'get_shortlink', $shortlink, $id, $context, $allow_slugs );
+	return apply_filters('get_shortlink', $shortlink, $id, $context, $allow_slugs);
 }
 
 /**
@@ -3697,12 +3697,12 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_wp_head() {
-	$shortlink = wp_get_shortlink( 0, 'query' );
+	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty( $shortlink ) )
+	if (empty($shortlink))
 		return;
 
-	echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
+	echo "<link rel='shortlink' href='".esc_url($shortlink)."' />\n";
 }
 
 /**
@@ -3713,15 +3713,15 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_header() {
-	if ( headers_sent() )
+	if (headers_sent())
 		return;
 
 	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty($shortlink) )
+	if (empty($shortlink))
 		return;
 
-	header('Link: <' . $shortlink . '>; rel=shortlink', false);
+	header('Link: <'.$shortlink.'>; rel=shortlink', false);
 }
 
 /**
@@ -3738,19 +3738,19 @@ 
  * @param string $before Optional HTML to display before the link. Default empty.
  * @param string $after  Optional HTML to display after the link. Default empty.
  */
-function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
+function the_shortlink($text = '', $title = '', $before = '', $after = '') {
 	$post = get_post();
 
-	if ( empty( $text ) )
+	if (empty($text))
 		$text = __('This is the short link.');
 
-	if ( empty( $title ) )
-		$title = the_title_attribute( array( 'echo' => false ) );
+	if (empty($title))
+		$title = the_title_attribute(array('echo' => false));
 
-	$shortlink = wp_get_shortlink( $post->ID );
+	$shortlink = wp_get_shortlink($post->ID);
 
-	if ( !empty( $shortlink ) ) {
-		$link = '<a rel="shortlink" href="' . esc_url( $shortlink ) . '" title="' . $title . '">' . $text . '</a>';
+	if ( ! empty($shortlink)) {
+		$link = '<a rel="shortlink" href="'.esc_url($shortlink).'" title="'.$title.'">'.$text.'</a>';
 
 		/**
 		 * Filters the short link anchor tag for a post.
@@ -3762,7 +3762,7 @@ 
 		 * @param string $text      Shortlink's text.
 		 * @param string $title     Shortlink's title attribute.
 		 */
-		$link = apply_filters( 'the_shortlink', $link, $shortlink, $text, $title );
+		$link = apply_filters('the_shortlink', $link, $shortlink, $text, $title);
 		echo $before, $link, $after;
 	}
 }
@@ -3795,8 +3795,8 @@ 
  * }
  * @return false|string The URL of the avatar we found, or false if we couldn't find an avatar.
  */
-function get_avatar_url( $id_or_email, $args = null ) {
-	$args = get_avatar_data( $id_or_email, $args );
+function get_avatar_url($id_or_email, $args = null) {
+	$args = get_avatar_data($id_or_email, $args);
 	return $args['url'];
 }
 
@@ -3836,51 +3836,51 @@ 
  *     @type string $url          The URL of the avatar we found.
  * }
  */
-function get_avatar_data( $id_or_email, $args = null ) {
-	$args = wp_parse_args( $args, array(
+function get_avatar_data($id_or_email, $args = null) {
+	$args = wp_parse_args($args, array(
 		'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,
 		'processed_args' => null, // if used, should be a reference
 		'extra_attr'     => '',
-	) );
+	));
 
-	if ( is_numeric( $args['size'] ) ) {
-		$args['size'] = absint( $args['size'] );
-		if ( ! $args['size'] ) {
+	if (is_numeric($args['size'])) {
+		$args['size'] = absint($args['size']);
+		if ( ! $args['size']) {
 			$args['size'] = 96;
 		}
 	} else {
 		$args['size'] = 96;
 	}
 
-	if ( is_numeric( $args['height'] ) ) {
-		$args['height'] = absint( $args['height'] );
-		if ( ! $args['height'] ) {
+	if (is_numeric($args['height'])) {
+		$args['height'] = absint($args['height']);
+		if ( ! $args['height']) {
 			$args['height'] = $args['size'];
 		}
 	} else {
 		$args['height'] = $args['size'];
 	}
 
-	if ( is_numeric( $args['width'] ) ) {
-		$args['width'] = absint( $args['width'] );
-		if ( ! $args['width'] ) {
+	if (is_numeric($args['width'])) {
+		$args['width'] = absint($args['width']);
+		if ( ! $args['width']) {
 			$args['width'] = $args['size'];
 		}
 	} else {
 		$args['width'] = $args['size'];
 	}
 
-	if ( empty( $args['default'] ) ) {
-		$args['default'] = get_option( 'avatar_default', 'mystery' );
+	if (empty($args['default'])) {
+		$args['default'] = get_option('avatar_default', 'mystery');
 	}
 
-	switch ( $args['default'] ) {
+	switch ($args['default']) {
 		case 'mm' :
 		case 'mystery' :
 		case 'mysteryman' :
@@ -3893,7 +3893,7 @@ 
 
 	$args['force_default'] = (bool) $args['force_default'];
 
-	$args['rating'] = strtolower( $args['rating'] );
+	$args['rating'] = strtolower($args['rating']);
 
 	$args['found_avatar'] = false;
 
@@ -3910,38 +3910,38 @@ 
 	 * @param mixed  $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 */
-	$args = apply_filters( 'pre_get_avatar_data', $args, $id_or_email );
+	$args = apply_filters('pre_get_avatar_data', $args, $id_or_email);
 
-	if ( isset( $args['url'] ) && ! is_null( $args['url'] ) ) {
+	if (isset($args['url']) && ! is_null($args['url'])) {
 		/** This filter is documented in wp-includes/link-template.php */
-		return apply_filters( 'get_avatar_data', $args, $id_or_email );
+		return apply_filters('get_avatar_data', $args, $id_or_email);
 	}
 
 	$email_hash = '';
 	$user = $email = false;
 
-	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);
 	}
 
 	// Process the user identifier.
-	if ( is_numeric( $id_or_email ) ) {
-		$user = get_user_by( 'id', absint( $id_or_email ) );
-	} elseif ( is_string( $id_or_email ) ) {
-		if ( strpos( $id_or_email, '@md5.gravatar.com' ) ) {
+	if (is_numeric($id_or_email)) {
+		$user = get_user_by('id', absint($id_or_email));
+	} elseif (is_string($id_or_email)) {
+		if (strpos($id_or_email, '@md5.gravatar.com')) {
 			// md5 hash
-			list( $email_hash ) = explode( '@', $id_or_email );
+			list($email_hash) = explode('@', $id_or_email);
 		} else {
 			// email address
 			$email = $id_or_email;
 		}
-	} elseif ( $id_or_email instanceof WP_User ) {
+	} elseif ($id_or_email instanceof WP_User) {
 		// User Object
 		$user = $id_or_email;
-	} elseif ( $id_or_email instanceof WP_Post ) {
+	} elseif ($id_or_email instanceof WP_Post) {
 		// Post Object
-		$user = get_user_by( 'id', (int) $id_or_email->post_author );
-	} elseif ( $id_or_email instanceof WP_Comment ) {
+		$user = get_user_by('id', (int) $id_or_email->post_author);
+	} elseif ($id_or_email instanceof WP_Comment) {
 		/**
 		 * Filters the list of allowed comment types for retrieving avatars.
 		 *
@@ -3949,36 +3949,36 @@ 
 		 *
 		 * @param array $types An array of content types. Default only contains 'comment'.
 		 */
-		$allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
-		if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) {
+		$allowed_comment_types = apply_filters('get_avatar_comment_types', array('comment'));
+		if ( ! empty($id_or_email->comment_type) && ! in_array($id_or_email->comment_type, (array) $allowed_comment_types)) {
 			$args['url'] = false;
 			/** This filter is documented in wp-includes/link-template.php */
-			return apply_filters( 'get_avatar_data', $args, $id_or_email );
+			return apply_filters('get_avatar_data', $args, $id_or_email);
 		}
 
-		if ( ! empty( $id_or_email->user_id ) ) {
-			$user = get_user_by( 'id', (int) $id_or_email->user_id );
+		if ( ! empty($id_or_email->user_id)) {
+			$user = get_user_by('id', (int) $id_or_email->user_id);
 		}
-		if ( ( ! $user || is_wp_error( $user ) ) && ! empty( $id_or_email->comment_author_email ) ) {
+		if (( ! $user || is_wp_error($user)) && ! empty($id_or_email->comment_author_email)) {
 			$email = $id_or_email->comment_author_email;
 		}
 	}
 
-	if ( ! $email_hash ) {
-		if ( $user ) {
+	if ( ! $email_hash) {
+		if ($user) {
 			$email = $user->user_email;
 		}
 
-		if ( $email ) {
-			$email_hash = md5( strtolower( trim( $email ) ) );
+		if ($email) {
+			$email_hash = md5(strtolower(trim($email)));
 		}
 	}
 
-	if ( $email_hash ) {
+	if ($email_hash) {
 		$args['found_avatar'] = true;
-		$gravatar_server = hexdec( $email_hash[0] ) % 3;
+		$gravatar_server = hexdec($email_hash[0]) % 3;
 	} else {
-		$gravatar_server = rand( 0, 2 );
+		$gravatar_server = rand(0, 2);
 	}
 
 	$url_args = array(
@@ -3988,15 +3988,15 @@ 
 		'r' => $args['rating'],
 	);
 
-	if ( is_ssl() ) {
-		$url = 'https://secure.gravatar.com/avatar/' . $email_hash;
+	if (is_ssl()) {
+		$url = 'https://secure.gravatar.com/avatar/'.$email_hash;
 	} else {
-		$url = sprintf( 'http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash );
+		$url = sprintf('http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash);
 	}
 
 	$url = add_query_arg(
-		rawurlencode_deep( array_filter( $url_args ) ),
-		set_url_scheme( $url, $args['scheme'] )
+		rawurlencode_deep(array_filter($url_args)),
+		set_url_scheme($url, $args['scheme'])
 	);
 
 	/**
@@ -4009,7 +4009,7 @@ 
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 * @param array  $args        Arguments passed to get_avatar_data(), after processing.
 	 */
-	$args['url'] = apply_filters( 'get_avatar_url', $url, $id_or_email, $args );
+	$args['url'] = apply_filters('get_avatar_url', $url, $id_or_email, $args);
 
 	/**
 	 * Filters the avatar data.
@@ -4020,7 +4020,7 @@ 
 	 * @param mixed  $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 */
-	return apply_filters( 'get_avatar_data', $args, $id_or_email );
+	return apply_filters('get_avatar_data', $args, $id_or_email);
 }
 
 /**
@@ -4034,15 +4034,15 @@ 
  * @param string $file Optional. File to search for in the stylesheet directory.
  * @return string The URL of the file.
  */
-function get_theme_file_uri( $file = '' ) {
-	$file = ltrim( $file, '/' );
+function get_theme_file_uri($file = '') {
+	$file = ltrim($file, '/');
 
-	if ( empty( $file ) ) {
+	if (empty($file)) {
 		$url = get_stylesheet_directory_uri();
-	} elseif ( file_exists( get_stylesheet_directory() . '/' . $file ) ) {
-		$url = get_stylesheet_directory_uri() . '/' . $file;
+	} elseif (file_exists(get_stylesheet_directory().'/'.$file)) {
+		$url = get_stylesheet_directory_uri().'/'.$file;
 	} else {
-		$url = get_template_directory_uri() . '/' . $file;
+		$url = get_template_directory_uri().'/'.$file;
 	}
 
 	/**
@@ -4053,7 +4053,7 @@ 
 	 * @param string $url  The file URL.
 	 * @param string $file The requested file to search for.
 	 */
-	return apply_filters( 'theme_file_uri', $url, $file );
+	return apply_filters('theme_file_uri', $url, $file);
 }
 
 /**
@@ -4064,13 +4064,13 @@ 
  * @param string $file Optional. File to return the URL for in the template directory.
  * @return string The URL of the file.
  */
-function get_parent_theme_file_uri( $file = '' ) {
-	$file = ltrim( $file, '/' );
+function get_parent_theme_file_uri($file = '') {
+	$file = ltrim($file, '/');
 
-	if ( empty( $file ) ) {
+	if (empty($file)) {
 		$url = get_template_directory_uri();
 	} else {
-		$url = get_template_directory_uri() . '/' . $file;
+		$url = get_template_directory_uri().'/'.$file;
 	}
 
 	/**
@@ -4081,7 +4081,7 @@ 
 	 * @param string $url  The file URL.
 	 * @param string $file The requested file to search for.
 	 */
-	return apply_filters( 'parent_theme_file_uri', $url, $file );
+	return apply_filters('parent_theme_file_uri', $url, $file);
 }
 
 /**
@@ -4095,15 +4095,15 @@ 
  * @param string $file Optional. File to search for in the stylesheet directory.
  * @return string The path of the file.
  */
-function get_theme_file_path( $file = '' ) {
-	$file = ltrim( $file, '/' );
+function get_theme_file_path($file = '') {
+	$file = ltrim($file, '/');
 
-	if ( empty( $file ) ) {
+	if (empty($file)) {
 		$path = get_stylesheet_directory();
-	} elseif ( file_exists( get_stylesheet_directory() . '/' . $file ) ) {
-		$path = get_stylesheet_directory() . '/' . $file;
+	} elseif (file_exists(get_stylesheet_directory().'/'.$file)) {
+		$path = get_stylesheet_directory().'/'.$file;
 	} else {
-		$path = get_template_directory() . '/' . $file;
+		$path = get_template_directory().'/'.$file;
 	}
 
 	/**
@@ -4114,7 +4114,7 @@ 
 	 * @param string $path The file path.
 	 * @param string $file The requested file to search for.
 	 */
-	return apply_filters( 'theme_file_path', $path, $file );
+	return apply_filters('theme_file_path', $path, $file);
 }
 
 /**
@@ -4125,13 +4125,13 @@ 
  * @param string $file Optional. File to return the path for in the template directory.
  * @return string The path of the file.
  */
-function get_parent_theme_file_path( $file = '' ) {
-	$file = ltrim( $file, '/' );
+function get_parent_theme_file_path($file = '') {
+	$file = ltrim($file, '/');
 
-	if ( empty( $file ) ) {
+	if (empty($file)) {
 		$path = get_template_directory();
 	} else {
-		$path = get_template_directory() . '/' . $file;
+		$path = get_template_directory().'/'.$file;
 	}
 
 	/**
@@ -4142,5 +4142,5 @@ 
 	 * @param string $path The file path.
 	 * @param string $file The requested file to search for.
 	 */
-	return apply_filters( 'parent_theme_file_path', $path, $file );
+	return apply_filters('parent_theme_file_path', $path, $file);
 }

Braces +471 added lines, -338 removed lines

@@ -46,10 +46,11 @@ 
  */
 function user_trailingslashit($string, $type_of_url = '') {
 	global $wp_rewrite;
-	if ( $wp_rewrite->use_trailing_slashes )
-		$string = trailingslashit($string);
-	else
-		$string = untrailingslashit($string);
+	if ( $wp_rewrite->use_trailing_slashes ) {
+			$string = trailingslashit($string);
+	} else {
+			$string = untrailingslashit($string);
+	}
 
 	/**
 	 * Filters the trailing-slashed string, depending on whether the site is set to use trailing slashes.
@@ -137,15 +138,17 @@ 
 		$sample = false;
 	}
 
-	if ( empty($post->ID) )
-		return false;
+	if ( empty($post->ID) ) {
+			return false;
+	}
 
-	if ( $post->post_type == 'page' )
-		return get_page_link($post, $leavename, $sample);
-	elseif ( $post->post_type == 'attachment' )
-		return get_attachment_link( $post, $leavename );
-	elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) )
-		return get_post_permalink($post, $leavename, $sample);
+	if ( $post->post_type == 'page' ) {
+			return get_page_link($post, $leavename, $sample);
+	} elseif ( $post->post_type == 'attachment' ) {
+			return get_attachment_link( $post, $leavename );
+	} elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) ) {
+			return get_post_permalink($post, $leavename, $sample);
+	}
 
 	$permalink = get_option('permalink_structure');
 
@@ -186,8 +189,9 @@ 
 
 				$category_object = get_term( $category_object, 'category' );
 				$category = $category_object->slug;
-				if ( $parent = $category_object->parent )
-					$category = get_category_parents($parent, false, '/', true) . $category;
+				if ( $parent = $category_object->parent ) {
+									$category = get_category_parents($parent, false, '/', true) . $category;
+				}
 			}
 			// show default category in permalinks, without
 			// having to assign it explicitly
@@ -257,8 +261,9 @@ 
 
 	$post = get_post($id);
 
-	if ( is_wp_error( $post ) )
-		return $post;
+	if ( is_wp_error( $post ) ) {
+			return $post;
+	}
 
 	$post_link = $wp_rewrite->get_extra_permastruct($post->post_type);
 
@@ -278,10 +283,11 @@ 
 		}
 		$post_link = home_url( user_trailingslashit($post_link) );
 	} else {
-		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
-			$post_link = add_query_arg($post_type->query_var, $slug, '');
-		else
-			$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
+		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) ) {
+					$post_link = add_query_arg($post_type->query_var, $slug, '');
+		} else {
+					$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
+		}
 		$post_link = home_url($post_link);
 	}
 
@@ -314,10 +320,11 @@ 
 function get_page_link( $post = false, $leavename = false, $sample = false ) {
 	$post = get_post( $post );
 
-	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) )
-		$link = home_url('/');
-	else
-		$link = _get_page_link( $post, $leavename, $sample );
+	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) ) {
+			$link = home_url('/');
+	} else {
+			$link = _get_page_link( $post, $leavename, $sample );
+	}
 
 	/**
 	 * Filters the permalink for a page.
@@ -403,27 +410,36 @@ 
 	}
 
 	if ( $wp_rewrite->using_permalinks() && $parent ) {
-		if ( 'page' == $parent->post_type )
-			$parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front
-		else
-			$parentlink = get_permalink( $post->post_parent );
+		if ( 'page' == $parent->post_type ) {
+					$parentlink = _get_page_link( $post->post_parent );
+		}
+		// Ignores page_on_front
+		else {
+					$parentlink = get_permalink( $post->post_parent );
+		}
 
-		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') )
-			$name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
-		else
-			$name = $post->post_name;
+		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') ) {
+					$name = 'attachment/' . $post->post_name;
+		}
+		// <permalink>/<int>/ is paged so we use the explicit attachment marker
+		else {
+					$name = $post->post_name;
+		}
 
-		if ( strpos($parentlink, '?') === false )
-			$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		if ( strpos($parentlink, '?') === false ) {
+					$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		}
 
-		if ( ! $leavename )
-			$link = str_replace( '%postname%', $name, $link );
+		if ( ! $leavename ) {
+					$link = str_replace( '%postname%', $name, $link );
+		}
 	} elseif ( $wp_rewrite->using_permalinks() && ! $leavename ) {
 		$link = home_url( user_trailingslashit( $post->post_name ) );
 	}
 
-	if ( ! $link )
-		$link = home_url( '/?attachment_id=' . $post->ID );
+	if ( ! $link ) {
+			$link = home_url( '/?attachment_id=' . $post->ID );
+	}
 
 	/**
 	 * Filters the permalink for an attachment.
@@ -448,8 +464,9 @@ 
  */
 function get_year_link( $year ) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
 	$yearlink = $wp_rewrite->get_year_permastruct();
 	if ( !empty($yearlink) ) {
 		$yearlink = str_replace('%year%', $year, $yearlink);
@@ -482,10 +499,12 @@ 
  */
 function get_month_link($year, $month) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
-		$month = gmdate('m', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
+	if ( !$month ) {
+			$month = gmdate('m', current_time('timestamp'));
+	}
 	$monthlink = $wp_rewrite->get_month_permastruct();
 	if ( !empty($monthlink) ) {
 		$monthlink = str_replace('%year%', $year, $monthlink);
@@ -521,12 +540,15 @@ 
  */
 function get_day_link($year, $month, $day) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
-		$month = gmdate('m', current_time('timestamp'));
-	if ( !$day )
-		$day = gmdate('j', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
+	if ( !$month ) {
+			$month = gmdate('m', current_time('timestamp'));
+	}
+	if ( !$day ) {
+			$day = gmdate('j', current_time('timestamp'));
+	}
 
 	$daylink = $wp_rewrite->get_day_permastruct();
 	if ( !empty($daylink) ) {
@@ -594,18 +616,21 @@ 
 			$permalink = $wp_rewrite->get_comment_feed_permastruct();
 		}
 
-		if ( get_default_feed() == $feed )
-			$feed = '';
+		if ( get_default_feed() == $feed ) {
+					$feed = '';
+		}
 
 		$permalink = str_replace('%feed%', $feed, $permalink);
 		$permalink = preg_replace('#/+#', '/', "/$permalink");
 		$output =  home_url( user_trailingslashit($permalink, 'feed') );
 	} else {
-		if ( empty($feed) )
-			$feed = get_default_feed();
+		if ( empty($feed) ) {
+					$feed = get_default_feed();
+		}
 
-		if ( false !== strpos($feed, 'comments_') )
-			$feed = str_replace('comments_', 'comments-', $feed);
+		if ( false !== strpos($feed, 'comments_') ) {
+					$feed = str_replace('comments_', 'comments-', $feed);
+		}
 
 		$output = home_url("?feed={$feed}");
 	}
@@ -633,20 +658,23 @@ 
 function get_post_comments_feed_link( $post_id = 0, $feed = '' ) {
 	$post_id = absint( $post_id );
 
-	if ( ! $post_id )
-		$post_id = get_the_ID();
+	if ( ! $post_id ) {
+			$post_id = get_the_ID();
+	}
 
-	if ( empty( $feed ) )
-		$feed = get_default_feed();
+	if ( empty( $feed ) ) {
+			$feed = get_default_feed();
+	}
 
 	$post = get_post( $post_id );
 	$unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_parent;
 
 	if ( '' != get_option('permalink_structure') ) {
-		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
-			$url = _get_page_link( $post_id );
-		else
-			$url = get_permalink($post_id);
+		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') ) {
+					$url = _get_page_link( $post_id );
+		} else {
+					$url = get_permalink($post_id);
+		}
 
 		if ( $unattached ) {
 			$url =  home_url( '/feed/' );
@@ -656,8 +684,9 @@ 
 			$url = add_query_arg( 'attachment_id', $post_id, $url );
 		} else {
 			$url = trailingslashit($url) . 'feed';
-			if ( $feed != get_default_feed() )
-				$url .= "/$feed";
+			if ( $feed != get_default_feed() ) {
+							$url .= "/$feed";
+			}
 			$url = user_trailingslashit($url, 'single_feed');
 		}
 	} else {
@@ -728,17 +757,19 @@ 
 	$author_id = (int) $author_id;
 	$permalink_structure = get_option('permalink_structure');
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	if ( '' == $permalink_structure ) {
 		$link = home_url("?feed=$feed&amp;author=" . $author_id);
 	} else {
 		$link = get_author_posts_url($author_id);
-		if ( $feed == get_default_feed() )
-			$feed_link = 'feed';
-		else
-			$feed_link = "feed/$feed";
+		if ( $feed == get_default_feed() ) {
+					$feed_link = 'feed';
+		} else {
+					$feed_link = "feed/$feed";
+		}
 
 		$link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
 	}
@@ -790,19 +821,20 @@ 
 
 	$term = get_term( $term_id, $taxonomy  );
 
-	if ( empty( $term ) || is_wp_error( $term ) )
-		return false;
+	if ( empty( $term ) || is_wp_error( $term ) ) {
+			return false;
+	}
 
-	if ( empty( $feed ) )
-		$feed = get_default_feed();
+	if ( empty( $feed ) ) {
+			$feed = get_default_feed();
+	}
 
 	$permalink_structure = get_option( 'permalink_structure' );
 
 	if ( '' == $permalink_structure ) {
 		if ( 'category' == $taxonomy ) {
 			$link = home_url("?feed=$feed&amp;cat=$term_id");
-		}
-		elseif ( 'post_tag' == $taxonomy ) {
+		} elseif ( 'post_tag' == $taxonomy ) {
 			$link = home_url("?feed=$feed&amp;tag=$term->slug");
 		} else {
 			$t = get_taxonomy( $taxonomy );
@@ -810,10 +842,11 @@ 
 		}
 	} else {
 		$link = get_term_link( $term_id, $term->taxonomy );
-		if ( $feed == get_default_feed() )
-			$feed_link = 'feed';
-		else
-			$feed_link = "feed/$feed";
+		if ( $feed == get_default_feed() ) {
+					$feed_link = 'feed';
+		} else {
+					$feed_link = "feed/$feed";
+		}
 
 		$link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
 	}
@@ -979,19 +1012,22 @@ 
  * @return string|void HTML content.
  */
 function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-	if ( is_null( $term ) )
-		$term = get_queried_object();
+	if ( is_null( $term ) ) {
+			$term = get_queried_object();
+	}
 
-	if ( ! $term )
-		return;
+	if ( ! $term ) {
+			return;
+	}
 
 	$tax = get_taxonomy( $term->taxonomy );
 	if ( ! current_user_can( 'edit_term', $term->term_id ) ) {
 		return;
 	}
 
-	if ( empty( $link ) )
-		$link = __('Edit This');
+	if ( empty( $link ) ) {
+			$link = __('Edit This');
+	}
 
 	$link = '<a href="' . get_edit_term_link( $term->term_id, $term->taxonomy ) . '">' . $link . '</a>';
 
@@ -1005,11 +1041,12 @@ 
 	 */
 	$link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
 
-	if ( $echo )
-		echo $link;
-	else
-		return $link;
-}
+	if ( $echo ) {
+			echo $link;
+	} else {
+			return $link;
+	}
+	}
 
 /**
  * Retrieves the permalink for a search.
@@ -1024,10 +1061,11 @@ 
 function get_search_link( $query = '' ) {
 	global $wp_rewrite;
 
-	if ( empty($query) )
-		$search = get_search_query( false );
-	else
-		$search = stripslashes($query);
+	if ( empty($query) ) {
+			$search = get_search_query( false );
+	} else {
+			$search = stripslashes($query);
+	}
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
@@ -1066,8 +1104,9 @@ 
 	global $wp_rewrite;
 	$link = get_search_link($search_query);
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
@@ -1104,17 +1143,19 @@ 
 function get_search_comments_feed_link($search_query = '', $feed = '') {
 	global $wp_rewrite;
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	$link = get_search_feed_link($search_query, $feed);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) )
-		$link = add_query_arg('feed', 'comments-' . $feed, $link);
-	else
-		$link = add_query_arg('withcomments', 1, $link);
+	if ( empty($permastruct) ) {
+			$link = add_query_arg('feed', 'comments-' . $feed, $link);
+	} else {
+			$link = add_query_arg('withcomments', 1, $link);
+	}
 
 	/** This filter is documented in wp-includes/link-template.php */
 	return apply_filters( 'search_feed_link', $link, $feed, 'comments' );
@@ -1133,8 +1174,9 @@ 
  */
 function get_post_type_archive_link( $post_type ) {
 	global $wp_rewrite;
-	if ( ! $post_type_obj = get_post_type_object( $post_type ) )
-		return false;
+	if ( ! $post_type_obj = get_post_type_object( $post_type ) ) {
+			return false;
+	}
 
 	if ( 'post' === $post_type ) {
 		$show_on_front = get_option( 'show_on_front' );
@@ -1149,15 +1191,17 @@ 
 		return apply_filters( 'post_type_archive_link', $link, $post_type );
 	}
 
-	if ( ! $post_type_obj->has_archive )
-		return false;
+	if ( ! $post_type_obj->has_archive ) {
+			return false;
+	}
 
 	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) ) {
 		$struct = ( true === $post_type_obj->has_archive ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
-		if ( $post_type_obj->rewrite['with_front'] )
-			$struct = $wp_rewrite->front . $struct;
-		else
-			$struct = $wp_rewrite->root . $struct;
+		if ( $post_type_obj->rewrite['with_front'] ) {
+					$struct = $wp_rewrite->front . $struct;
+		} else {
+					$struct = $wp_rewrite->root . $struct;
+		}
 		$link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );
 	} else {
 		$link = home_url( '?post_type=' . $post_type );
@@ -1185,18 +1229,21 @@ 
  */
 function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
 	$default_feed = get_default_feed();
-	if ( empty( $feed ) )
-		$feed = $default_feed;
+	if ( empty( $feed ) ) {
+			$feed = $default_feed;
+	}
 
-	if ( ! $link = get_post_type_archive_link( $post_type ) )
-		return false;
+	if ( ! $link = get_post_type_archive_link( $post_type ) ) {
+			return false;
+	}
 
 	$post_type_obj = get_post_type_object( $post_type );
 	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['feeds'] ) {
 		$link = trailingslashit( $link );
 		$link .= 'feed/';
-		if ( $feed != $default_feed )
-			$link .= "$feed/";
+		if ( $feed != $default_feed ) {
+					$link .= "$feed/";
+		}
 	} else {
 		$link = add_query_arg( 'feed', $feed, $link );
 	}
@@ -1268,22 +1315,26 @@ 
  *                     not allow an editing UI.
  */
 function get_edit_post_link( $id = 0, $context = 'display' ) {
-	if ( ! $post = get_post( $id ) )
-		return;
+	if ( ! $post = get_post( $id ) ) {
+			return;
+	}
 
-	if ( 'revision' === $post->post_type )
-		$action = '';
-	elseif ( 'display' == $context )
-		$action = '&amp;action=edit';
-	else
-		$action = '&action=edit';
+	if ( 'revision' === $post->post_type ) {
+			$action = '';
+	} elseif ( 'display' == $context ) {
+			$action = '&amp;action=edit';
+	} else {
+			$action = '&action=edit';
+	}
 
 	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
-		return;
+	if ( !$post_type_object ) {
+			return;
+	}
 
-	if ( !current_user_can( 'edit_post', $post->ID ) )
-		return;
+	if ( !current_user_can( 'edit_post', $post->ID ) ) {
+			return;
+	}
 
 	if ( $post_type_object->_edit_link ) {
 		$link = admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) );
@@ -1356,18 +1407,22 @@ 
  * @return string|void The delete post link URL for the given post.
  */
 function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0.0' );
+	if ( ! empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '3.0.0' );
+	}
 
-	if ( !$post = get_post( $id ) )
-		return;
+	if ( !$post = get_post( $id ) ) {
+			return;
+	}
 
 	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
-		return;
+	if ( !$post_type_object ) {
+			return;
+	}
 
-	if ( !current_user_can( 'delete_post', $post->ID ) )
-		return;
+	if ( !current_user_can( 'delete_post', $post->ID ) ) {
+			return;
+	}
 
 	$action = ( $force_delete || !EMPTY_TRASH_DAYS ) ? 'delete' : 'trash';
 
@@ -1396,8 +1451,9 @@ 
 function get_edit_comment_link( $comment_id = 0 ) {
 	$comment = get_comment( $comment_id );
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		return;
+	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			return;
+	}
 
 	$location = admin_url('comment.php?action=editcomment&amp;c=') . $comment->comment_ID;
 
@@ -1456,8 +1512,9 @@ 
 function get_edit_bookmark_link( $link = 0 ) {
 	$link = get_bookmark( $link );
 
-	if ( !current_user_can('manage_links') )
-		return;
+	if ( !current_user_can('manage_links') ) {
+			return;
+	}
 
 	$location = admin_url('link.php?action=edit&amp;link_id=') . $link->link_id;
 
@@ -1485,11 +1542,13 @@ 
 function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) {
 	$bookmark = get_bookmark($bookmark);
 
-	if ( !current_user_can('manage_links') )
-		return;
+	if ( !current_user_can('manage_links') ) {
+			return;
+	}
 
-	if ( empty($link) )
-		$link = __('Edit This');
+	if ( empty($link) ) {
+			$link = __('Edit This');
+	}
 
 	$link = '<a href="' . esc_url( get_edit_bookmark_link( $bookmark ) ) . '">' . $link . '</a>';
 
@@ -1513,21 +1572,25 @@ 
  * @return string URL to edit user page or empty string.
  */
 function get_edit_user_link( $user_id = null ) {
-	if ( ! $user_id )
-		$user_id = get_current_user_id();
+	if ( ! $user_id ) {
+			$user_id = get_current_user_id();
+	}
 
-	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) )
-		return '';
+	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) ) {
+			return '';
+	}
 
 	$user = get_userdata( $user_id );
 
-	if ( ! $user )
-		return '';
+	if ( ! $user ) {
+			return '';
+	}
 
-	if ( get_current_user_id() == $user->ID )
-		$link = get_edit_profile_url( $user->ID );
-	else
-		$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+	if ( get_current_user_id() == $user->ID ) {
+			$link = get_edit_profile_url( $user->ID );
+	} else {
+			$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+	}
 
 	/**
 	 * Filters the user edit link.
@@ -1591,8 +1654,9 @@ 
 function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
 	global $wpdb;
 
-	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) )
-		return null;
+	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) ) {
+			return null;
+	}
 
 	$current_post_date = $post->post_date;
 
@@ -1617,16 +1681,18 @@ 
 			$join .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
 			$where .= $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
 
-			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
-				return '';
+			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) ) {
+							return '';
+			}
 			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
 
 			// Remove any exclusions from the term array to include.
 			$term_array = array_diff( $term_array, (array) $excluded_terms );
 			$term_array = array_map( 'intval', $term_array );
 
-			if ( ! $term_array || is_wp_error( $term_array ) )
-				return '';
+			if ( ! $term_array || is_wp_error( $term_array ) ) {
+							return '';
+			}
 
 			$where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
 		}
@@ -1733,19 +1799,22 @@ 
 	$query_key = 'adjacent_post_' . md5( $query );
 	$result = wp_cache_get( $query_key, 'counts' );
 	if ( false !== $result ) {
-		if ( $result )
-			$result = get_post( $result );
+		if ( $result ) {
+					$result = get_post( $result );
+		}
 		return $result;
 	}
 
 	$result = $wpdb->get_var( $query );
-	if ( null === $result )
-		$result = '';
+	if ( null === $result ) {
+			$result = '';
+	}
 
 	wp_cache_set( $query_key, $result, 'counts' );
 
-	if ( $result )
-		$result = get_post( $result );
+	if ( $result ) {
+			$result = get_post( $result );
+	}
 
 	return $result;
 }
@@ -1765,18 +1834,21 @@ 
  * @return string|void The adjacent post relational link URL.
  */
 function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() && $post = get_post() )
-		$post = get_post( $post->post_parent );
-	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	if ( $previous && is_attachment() && $post = get_post() ) {
+			$post = get_post( $post->post_parent );
+	} else {
+			$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	}
 
-	if ( empty( $post ) )
-		return;
+	if ( empty( $post ) ) {
+			return;
+	}
 
 	$post_title = the_title_attribute( array( 'echo' => false, 'post' => $post ) );
 
-	if ( empty( $post_title ) )
-		$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	if ( empty( $post_title ) ) {
+			$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	}
 
 	$date = mysql2date( get_option( 'date_format' ), $post->post_date );
 
@@ -1884,8 +1956,9 @@ 
  */
 function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category' ) {
 	$post = get_post();
-	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) )
-		return null;
+	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) ) {
+			return null;
+	}
 
 	$query_args = array(
 		'posts_per_page' => 1,
@@ -1897,23 +1970,26 @@ 
 	$term_array = array();
 
 	if ( ! is_array( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) )
-			$excluded_terms = explode( ',', $excluded_terms );
-		else
-			$excluded_terms = array();
+		if ( ! empty( $excluded_terms ) ) {
+					$excluded_terms = explode( ',', $excluded_terms );
+		} else {
+					$excluded_terms = array();
+		}
 	}
 
 	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( $in_same_term )
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+		if ( $in_same_term ) {
+					$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+		}
 
 		if ( ! empty( $excluded_terms ) ) {
 			$excluded_terms = array_map( 'intval', $excluded_terms );
 			$excluded_terms = array_diff( $excluded_terms, $term_array );
 
 			$inverse_terms = array();
-			foreach ( $excluded_terms as $excluded_term )
-				$inverse_terms[] = $excluded_term * -1;
+			foreach ( $excluded_terms as $excluded_term ) {
+							$inverse_terms[] = $excluded_term * -1;
+			}
 			$excluded_terms = $inverse_terms;
 		}
 
@@ -2007,18 +2083,20 @@ 
  * @return string The link URL of the previous or next post in relation to the current post.
  */
 function get_adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() )
-		$post = get_post( get_post()->post_parent );
-	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	if ( $previous && is_attachment() ) {
+			$post = get_post( get_post()->post_parent );
+	} else {
+			$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	}
 
 	if ( ! $post ) {
 		$output = '';
 	} else {
 		$title = $post->post_title;
 
-		if ( empty( $post->post_title ) )
-			$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		if ( empty( $post->post_title ) ) {
+					$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		}
 
 		/** This filter is documented in wp-includes/post-template.php */
 		$title = apply_filters( 'the_title', $title, $post->ID );
@@ -2123,8 +2201,9 @@ 
 
 		$base = trailingslashit( get_bloginfo( 'url' ) );
 
-		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
-			$base .= $wp_rewrite->index . '/';
+		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) ) {
+					$base .= $wp_rewrite->index . '/';
+		}
 
 		if ( $pagenum > 1 ) {
 			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
@@ -2142,11 +2221,12 @@ 
 	 */
 	$result = apply_filters( 'get_pagenum_link', $result );
 
-	if ( $escape )
-		return esc_url( $result );
-	else
-		return esc_url_raw( $result );
-}
+	if ( $escape ) {
+			return esc_url( $result );
+	} else {
+			return esc_url_raw( $result );
+	}
+	}
 
 /**
  * Retrieves the next posts page link.
@@ -2164,11 +2244,13 @@ 
 	global $paged;
 
 	if ( !is_single() ) {
-		if ( !$paged )
-			$paged = 1;
+		if ( !$paged ) {
+					$paged = 1;
+		}
 		$nextpage = intval($paged) + 1;
-		if ( !$max_page || $max_page >= $nextpage )
-			return get_pagenum_link($nextpage);
+		if ( !$max_page || $max_page >= $nextpage ) {
+					return get_pagenum_link($nextpage);
+		}
 	}
 }
 
@@ -2184,11 +2266,12 @@ 
 function next_posts( $max_page = 0, $echo = true ) {
 	$output = esc_url( get_next_posts_page_link( $max_page ) );
 
-	if ( $echo )
-		echo $output;
-	else
-		return $output;
-}
+	if ( $echo ) {
+			echo $output;
+	} else {
+			return $output;
+	}
+	}
 
 /**
  * Retrieves the next posts page link.
@@ -2205,16 +2288,19 @@ 
 function get_next_posts_link( $label = null, $max_page = 0 ) {
 	global $paged, $wp_query;
 
-	if ( !$max_page )
-		$max_page = $wp_query->max_num_pages;
+	if ( !$max_page ) {
+			$max_page = $wp_query->max_num_pages;
+	}
 
-	if ( !$paged )
-		$paged = 1;
+	if ( !$paged ) {
+			$paged = 1;
+	}
 
 	$nextpage = intval($paged) + 1;
 
-	if ( null === $label )
-		$label = __( 'Next Page &raquo;' );
+	if ( null === $label ) {
+			$label = __( 'Next Page &raquo;' );
+	}
 
 	if ( !is_single() && ( $nextpage <= $max_page ) ) {
 		/**
@@ -2260,8 +2346,9 @@ 
 
 	if ( !is_single() ) {
 		$nextpage = intval($paged) - 1;
-		if ( $nextpage < 1 )
-			$nextpage = 1;
+		if ( $nextpage < 1 ) {
+					$nextpage = 1;
+		}
 		return get_pagenum_link($nextpage);
 	}
 }
@@ -2277,11 +2364,12 @@ 
 function previous_posts( $echo = true ) {
 	$output = esc_url( get_previous_posts_page_link() );
 
-	if ( $echo )
-		echo $output;
-	else
-		return $output;
-}
+	if ( $echo ) {
+			echo $output;
+	} else {
+			return $output;
+	}
+	}
 
 /**
  * Retrieves the previous posts page link.
@@ -2296,8 +2384,9 @@ 
 function get_previous_posts_link( $label = null ) {
 	global $paged;
 
-	if ( null === $label )
-		$label = __( '&laquo; Previous Page' );
+	if ( null === $label ) {
+			$label = __( '&laquo; Previous Page' );
+	}
 
 	if ( !is_single() && $paged > 1 ) {
 		/**
@@ -2629,16 +2718,18 @@ 
 
 	if ( 'newest' == get_option('default_comments_page') ) {
 		if ( $pagenum != $max_page ) {
-			if ( $wp_rewrite->using_permalinks() )
-				$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
-			else
-				$result = add_query_arg( 'cpage', $pagenum, $result );
+			if ( $wp_rewrite->using_permalinks() ) {
+							$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+			} else {
+							$result = add_query_arg( 'cpage', $pagenum, $result );
+			}
 		}
 	} elseif ( $pagenum > 1 ) {
-		if ( $wp_rewrite->using_permalinks() )
-			$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
-		else
-			$result = add_query_arg( 'cpage', $pagenum, $result );
+		if ( $wp_rewrite->using_permalinks() ) {
+					$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+		} else {
+					$result = add_query_arg( 'cpage', $pagenum, $result );
+		}
 	}
 
 	$result .= '#comments';
@@ -2667,8 +2758,9 @@ 
 function get_next_comments_link( $label = '', $max_page = 0 ) {
 	global $wp_query;
 
-	if ( ! is_singular() )
-		return;
+	if ( ! is_singular() ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
 
@@ -2678,17 +2770,21 @@ 
 
 	$nextpage = intval($page) + 1;
 
-	if ( empty($max_page) )
-		$max_page = $wp_query->max_num_comment_pages;
+	if ( empty($max_page) ) {
+			$max_page = $wp_query->max_num_comment_pages;
+	}
 
-	if ( empty($max_page) )
-		$max_page = get_comment_pages_count();
+	if ( empty($max_page) ) {
+			$max_page = get_comment_pages_count();
+	}
 
-	if ( $nextpage > $max_page )
-		return;
+	if ( $nextpage > $max_page ) {
+			return;
+	}
 
-	if ( empty($label) )
-		$label = __('Newer Comments &raquo;');
+	if ( empty($label) ) {
+			$label = __('Newer Comments &raquo;');
+	}
 
 	/**
 	 * Filters the anchor tag attributes for the next comments page link.
@@ -2721,18 +2817,21 @@ 
  * @return string|void HTML-formatted link for the previous page of comments.
  */
 function get_previous_comments_link( $label = '' ) {
-	if ( ! is_singular() )
-		return;
+	if ( ! is_singular() ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
 
-	if ( intval($page) <= 1 )
-		return;
+	if ( intval($page) <= 1 ) {
+			return;
+	}
 
 	$prevpage = intval($page) - 1;
 
-	if ( empty($label) )
-		$label = __('&laquo; Older Comments');
+	if ( empty($label) ) {
+			$label = __('&laquo; Older Comments');
+	}
 
 	/**
 	 * Filters the anchor tag attributes for the previous comments page link.
@@ -2769,12 +2868,14 @@ 
 function paginate_comments_links( $args = array() ) {
 	global $wp_rewrite;
 
-	if ( ! is_singular() )
-		return;
+	if ( ! is_singular() ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
-	if ( !$page )
-		$page = 1;
+	if ( !$page ) {
+			$page = 1;
+	}
 	$max_page = get_comment_pages_count();
 	$defaults = array(
 		'base' => add_query_arg( 'cpage', '%#%' ),
@@ -2784,17 +2885,19 @@ 
 		'echo' => true,
 		'add_fragment' => '#comments'
 	);
-	if ( $wp_rewrite->using_permalinks() )
-		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	if ( $wp_rewrite->using_permalinks() ) {
+			$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	}
 
 	$args = wp_parse_args( $args, $defaults );
 	$page_links = paginate_links( $args );
 
-	if ( $args['echo'] )
-		echo $page_links;
-	else
-		return $page_links;
-}
+	if ( $args['echo'] ) {
+			echo $page_links;
+	} else {
+			return $page_links;
+	}
+	}
 
 /**
  * Retrieves navigation to next/previous set of comments, when applicable.
@@ -3000,16 +3103,18 @@ 
 	}
 
 	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow )
-			$scheme = 'https';
-		else
-			$scheme = parse_url( $url, PHP_URL_SCHEME );
+		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow ) {
+					$scheme = 'https';
+		} else {
+					$scheme = parse_url( $url, PHP_URL_SCHEME );
+		}
 	}
 
 	$url = set_url_scheme( $url, $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the home URL.
@@ -3071,8 +3176,9 @@ 
 
 	$url = set_url_scheme( $url, $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the site URL.
@@ -3117,8 +3223,9 @@ 
 function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
 	$url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the admin area URL.
@@ -3145,8 +3252,9 @@ 
 function includes_url( $path = '', $scheme = null ) {
 	$url = site_url( '/' . WPINC . '/', $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the URL to the includes directory.
@@ -3171,8 +3279,9 @@ 
 function content_url( $path = '' ) {
 	$url = set_url_scheme( WP_CONTENT_URL );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the URL to the content directory.
@@ -3206,22 +3315,25 @@ 
 	$plugin = wp_normalize_path( $plugin );
 	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
 
-	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
-		$url = WPMU_PLUGIN_URL;
-	else
-		$url = WP_PLUGIN_URL;
+	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) ) {
+			$url = WPMU_PLUGIN_URL;
+	} else {
+			$url = WP_PLUGIN_URL;
+	}
 
 
 	$url = set_url_scheme( $url );
 
 	if ( !empty($plugin) && is_string($plugin) ) {
 		$folder = dirname(plugin_basename($plugin));
-		if ( '.' != $folder )
-			$url .= '/' . ltrim($folder, '/');
+		if ( '.' != $folder ) {
+					$url .= '/' . ltrim($folder, '/');
+		}
 	}
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the URL to the plugins directory.
@@ -3254,18 +3366,21 @@ 
  * @return string Site URL link with optional path appended.
  */
 function network_site_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
-		return site_url($path, $scheme);
+	if ( ! is_multisite() ) {
+			return site_url($path, $scheme);
+	}
 
 	$current_network = get_network();
 
-	if ( 'relative' == $scheme )
-		$url = $current_network->path;
-	else
-		$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+	if ( 'relative' == $scheme ) {
+			$url = $current_network->path;
+	} else {
+			$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+	}
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the network site URL.
@@ -3296,22 +3411,26 @@ 
  * @return string Home URL link with optional path appended.
  */
 function network_home_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
-		return home_url($path, $scheme);
+	if ( ! is_multisite() ) {
+			return home_url($path, $scheme);
+	}
 
 	$current_network = get_network();
 	$orig_scheme = $scheme;
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
-		$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
+	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
+			$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
+	}
 
-	if ( 'relative' == $scheme )
-		$url = $current_network->path;
-	else
-		$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+	if ( 'relative' == $scheme ) {
+			$url = $current_network->path;
+	} else {
+			$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+	}
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the network home URL.
@@ -3338,13 +3457,15 @@ 
  * @return string Admin URL link with optional path appended.
  */
 function network_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( ! is_multisite() )
-		return admin_url( $path, $scheme );
+	if ( ! is_multisite() ) {
+			return admin_url( $path, $scheme );
+	}
 
 	$url = network_site_url('wp-admin/network/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the network admin URL.
@@ -3371,8 +3492,9 @@ 
 function user_admin_url( $path = '', $scheme = 'admin' ) {
 	$url = network_site_url('wp-admin/user/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the user admin URL for the current user.
@@ -3397,13 +3519,14 @@ 
  * @return string Admin URL link with optional path appended.
  */
 function self_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( is_network_admin() )
-		return network_admin_url($path, $scheme);
-	elseif ( is_user_admin() )
-		return user_admin_url($path, $scheme);
-	else
-		return admin_url($path, $scheme);
-}
+	if ( is_network_admin() ) {
+			return network_admin_url($path, $scheme);
+	} elseif ( is_user_admin() ) {
+			return user_admin_url($path, $scheme);
+	} else {
+			return admin_url($path, $scheme);
+	}
+	}
 
 /**
  * Sets the scheme for a URL.
@@ -3428,13 +3551,15 @@ 
 	}
 
 	$url = trim( $url );
-	if ( substr( $url, 0, 2 ) === '//' )
-		$url = 'http:' . $url;
+	if ( substr( $url, 0, 2 ) === '//' ) {
+			$url = 'http:' . $url;
+	}
 
 	if ( 'relative' == $scheme ) {
 		$url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
-		if ( $url !== '' && $url[0] === '/' )
-			$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+		if ( $url !== '' && $url[0] === '/' ) {
+					$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+		}
 	} else {
 		$url = preg_replace( '#^\w+://#', $scheme . '://', $url );
 	}
@@ -3482,10 +3607,11 @@ 
 			$url = admin_url( $path, $scheme );
 		} else {
 			$active = get_active_blog_for_user( $user_id );
-			if ( $active )
-				$url = get_admin_url( $active->blog_id, $path, $scheme );
-			else
-				$url = user_admin_url( $path, $scheme );
+			if ( $active ) {
+							$url = get_admin_url( $active->blog_id, $path, $scheme );
+			} else {
+							$url = user_admin_url( $path, $scheme );
+			}
 		}
 	}
 
@@ -3516,12 +3642,13 @@ 
 function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	if ( is_user_admin() )
-		$url = user_admin_url( 'profile.php', $scheme );
-	elseif ( is_network_admin() )
-		$url = network_admin_url( 'profile.php', $scheme );
-	else
-		$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+	if ( is_user_admin() ) {
+			$url = user_admin_url( 'profile.php', $scheme );
+	} elseif ( is_network_admin() ) {
+			$url = network_admin_url( 'profile.php', $scheme );
+	} else {
+			$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+	}
 
 	/**
 	 * Filters the URL for a user's profile editor.
@@ -3659,8 +3786,9 @@ 
 		$post = get_post( $post_id );
 	} elseif ( 'post' == $context ) {
 		$post = get_post( $id );
-		if ( ! empty( $post->ID ) )
-			$post_id = $post->ID;
+		if ( ! empty( $post->ID ) ) {
+					$post_id = $post->ID;
+		}
 	}
 
 	$shortlink = '';
@@ -3699,8 +3827,9 @@ 
 function wp_shortlink_wp_head() {
 	$shortlink = wp_get_shortlink( 0, 'query' );
 
-	if ( empty( $shortlink ) )
-		return;
+	if ( empty( $shortlink ) ) {
+			return;
+	}
 
 	echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
 }
@@ -3713,13 +3842,15 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_header() {
-	if ( headers_sent() )
-		return;
+	if ( headers_sent() ) {
+			return;
+	}
 
 	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty($shortlink) )
-		return;
+	if ( empty($shortlink) ) {
+			return;
+	}
 
 	header('Link: <' . $shortlink . '>; rel=shortlink', false);
 }
@@ -3741,11 +3872,13 @@ 
 function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
 	$post = get_post();
 
-	if ( empty( $text ) )
-		$text = __('This is the short link.');
+	if ( empty( $text ) ) {
+			$text = __('This is the short link.');
+	}
 
-	if ( empty( $title ) )
-		$title = the_title_attribute( array( 'echo' => false ) );
+	if ( empty( $title ) ) {
+			$title = the_title_attribute( array( 'echo' => false ) );
+	}
 
 	$shortlink = wp_get_shortlink( $post->ID );