ntwb / wordpress

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

Doc Comments +2 added lines, -2 removed lines

@@ -484,7 +484,7 @@ 
 
 	/**
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	protected function get_table_classes() {
 		return array( 'widefat', 'fixed', 'striped', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
@@ -1162,7 +1162,7 @@ 
 	 * @since 4.3.0
 	 * @access protected
 	 *
-	 * @param object $post        Post being acted upon.
+	 * @param WP_Post $post        Post being acted upon.
 	 * @param string $column_name Current column name.
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for posts.

Indentation +10 added lines, -10 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * List Table API: WP_Posts_List_Table class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 3.1.0
- */
+	 * List Table API: WP_Posts_List_Table class
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 3.1.0
+	 */
 
 /**
  * Core class used to implement displaying posts in a list table.
@@ -1131,10 +1131,10 @@ 
 		}
 
 		if ( $post->post_parent ) {
-		    $count = count( get_post_ancestors( $post->ID ) );
-		    $classes .= ' level-'. $count;
+			$count = count( get_post_ancestors( $post->ID ) );
+			$classes .= ' level-'. $count;
 		} else {
-		    $classes .= ' level-0';
+			$classes .= ' level-0';
 		}
 	?>
 		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
@@ -1508,7 +1508,7 @@ 
     				<?php
 					/** This filter is documented in wp-admin/includes/meta-boxes.php */
 					$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'quick-edit' );
-    				?>
+					?>
 					<option value="default"><?php echo esc_html( $default_title ); ?></option>
 					<?php page_template_dropdown() ?>
 				</select>

Spacing +419 added lines, -419 removed lines

@@ -77,35 +77,35 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $post_type_object, $wpdb;
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'posts',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 
 		$post_type        = $this->screen->post_type;
-		$post_type_object = get_post_type_object( $post_type );
+		$post_type_object = get_post_type_object($post_type);
 
-		$exclude_states   = get_post_stati( array(
+		$exclude_states   = get_post_stati(array(
 			'show_in_admin_all_list' => false,
-		) );
-		$this->user_posts_count = intval( $wpdb->get_var( $wpdb->prepare( "
+		));
+		$this->user_posts_count = intval($wpdb->get_var($wpdb->prepare("
 			SELECT COUNT( 1 )
 			FROM $wpdb->posts
 			WHERE post_type = %s
-			AND post_status NOT IN ( '" . implode( "','", $exclude_states ) . "' )
+			AND post_status NOT IN ( '".implode("','", $exclude_states)."' )
 			AND post_author = %d
-		", $post_type, get_current_user_id() ) ) );
+		", $post_type, get_current_user_id())));
 
-		if ( $this->user_posts_count && ! current_user_can( $post_type_object->cap->edit_others_posts ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['all_posts'] ) && empty( $_REQUEST['author'] ) && empty( $_REQUEST['show_sticky'] ) ) {
+		if ($this->user_posts_count && ! current_user_can($post_type_object->cap->edit_others_posts) && empty($_REQUEST['post_status']) && empty($_REQUEST['all_posts']) && empty($_REQUEST['author']) && empty($_REQUEST['show_sticky'])) {
 			$_GET['author'] = get_current_user_id();
 		}
 
-		if ( 'post' === $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
-			$sticky_posts = implode( ', ', array_map( 'absint', (array) $sticky_posts ) );
-			$this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status NOT IN ('trash', 'auto-draft') AND ID IN ($sticky_posts)", $post_type ) );
+		if ('post' === $post_type && $sticky_posts = get_option('sticky_posts')) {
+			$sticky_posts = implode(', ', array_map('absint', (array) $sticky_posts));
+			$this->sticky_posts_count = $wpdb->get_var($wpdb->prepare("SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status NOT IN ('trash', 'auto-draft') AND ID IN ($sticky_posts)", $post_type));
 		}
 	}
 
@@ -116,7 +116,7 @@ 
 	 *
 	 * @param bool $display Whether the table layout should be hierarchical.
 	 */
-	public function set_hierarchical_display( $display ) {
+	public function set_hierarchical_display($display) {
 		$this->hierarchical_display = $display;
 	}
 
@@ -125,7 +125,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_posts );
+		return current_user_can(get_post_type_object($this->screen->post_type)->cap->edit_posts);
 	}
 
 	/**
@@ -141,50 +141,50 @@ 
 		// is going to call wp()
 		$avail_post_stati = wp_edit_posts_query();
 
-		$this->set_hierarchical_display( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' === $wp_query->query['orderby'] );
+		$this->set_hierarchical_display(is_post_type_hierarchical($this->screen->post_type) && 'menu_order title' === $wp_query->query['orderby']);
 
 		$post_type = $this->screen->post_type;
-		$per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
+		$per_page = $this->get_items_per_page('edit_'.$post_type.'_per_page');
 
 		/** This filter is documented in wp-admin/includes/post.php */
- 		$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
+ 		$per_page = apply_filters('edit_posts_per_page', $per_page, $post_type);
 
-		if ( $this->hierarchical_display ) {
+		if ($this->hierarchical_display) {
 			$total_items = $wp_query->post_count;
-		} elseif ( $wp_query->found_posts || $this->get_pagenum() === 1 ) {
+		} elseif ($wp_query->found_posts || $this->get_pagenum() === 1) {
 			$total_items = $wp_query->found_posts;
 		} else {
-			$post_counts = (array) wp_count_posts( $post_type, 'readable' );
+			$post_counts = (array) wp_count_posts($post_type, 'readable');
 
-			if ( isset( $_REQUEST['post_status'] ) && in_array( $_REQUEST['post_status'] , $avail_post_stati ) ) {
-				$total_items = $post_counts[ $_REQUEST['post_status'] ];
-			} elseif ( isset( $_REQUEST['show_sticky'] ) && $_REQUEST['show_sticky'] ) {
+			if (isset($_REQUEST['post_status']) && in_array($_REQUEST['post_status'], $avail_post_stati)) {
+				$total_items = $post_counts[$_REQUEST['post_status']];
+			} elseif (isset($_REQUEST['show_sticky']) && $_REQUEST['show_sticky']) {
 				$total_items = $this->sticky_posts_count;
-			} elseif ( isset( $_GET['author'] ) && $_GET['author'] == get_current_user_id() ) {
+			} elseif (isset($_GET['author']) && $_GET['author'] == get_current_user_id()) {
 				$total_items = $this->user_posts_count;
 			} else {
-				$total_items = array_sum( $post_counts );
+				$total_items = array_sum($post_counts);
 
 				// Subtract post types that are not included in the admin all list.
-				foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
-					$total_items -= $post_counts[ $state ];
+				foreach (get_post_stati(array('show_in_admin_all_list' => false)) as $state) {
+					$total_items -= $post_counts[$state];
 				}
 			}
 		}
 
-		if ( ! empty( $_REQUEST['mode'] ) ) {
+		if ( ! empty($_REQUEST['mode'])) {
 			$mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
-			set_user_setting( 'posts_list_mode', $mode );
+			set_user_setting('posts_list_mode', $mode);
 		} else {
-			$mode = get_user_setting( 'posts_list_mode', 'list' );
+			$mode = get_user_setting('posts_list_mode', 'list');
 		}
 
-		$this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] === 'trash';
+		$this->is_trash = isset($_REQUEST['post_status']) && $_REQUEST['post_status'] === 'trash';
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'per_page' => $per_page
-		) );
+		));
 	}
 
 	/**
@@ -199,10 +199,10 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
+		if (isset($_REQUEST['post_status']) && 'trash' === $_REQUEST['post_status'])
+			echo get_post_type_object($this->screen->post_type)->labels->not_found_in_trash;
 		else
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+			echo get_post_type_object($this->screen->post_type)->labels->not_found;
 	}
 
 	/**
@@ -214,15 +214,15 @@ 
 	 */
 	protected function is_base_request() {
 		$vars = $_GET;
-		unset( $vars['paged'] );
+		unset($vars['paged']);
 
-		if ( empty( $vars ) ) {
+		if (empty($vars)) {
 			return true;
-		} elseif ( 1 === count( $vars ) && ! empty( $vars['post_type'] ) ) {
+		} elseif (1 === count($vars) && ! empty($vars['post_type'])) {
 			return $this->screen->post_type === $vars['post_type'];
 		}
 
-		return 1 === count( $vars ) && ! empty( $vars['mode'] );
+		return 1 === count($vars) && ! empty($vars['mode']);
 	}
 
 	/**
@@ -236,20 +236,20 @@ 
 	 * @param string $class Optional. Class attribute. Default empty string.
 	 * @return string The formatted link string.
 	 */
-	protected function get_edit_link( $args, $label, $class = '' ) {
-		$url = add_query_arg( $args, 'edit.php' );
+	protected function get_edit_link($args, $label, $class = '') {
+		$url = add_query_arg($args, 'edit.php');
 
 		$class_html = '';
-		if ( ! empty( $class ) ) {
+		if ( ! empty($class)) {
 			 $class_html = sprintf(
 				' class="%s"',
-				esc_attr( $class )
+				esc_attr($class)
 			);
 		}
 
 		return sprintf(
 			'<a href="%s"%s>%s</a>',
-			esc_url( $url ),
+			esc_url($url),
 			$class_html,
 			$label
 		);
@@ -266,25 +266,25 @@ 
 
 		$post_type = $this->screen->post_type;
 
-		if ( !empty($locked_post_status) )
+		if ( ! empty($locked_post_status))
 			return array();
 
 		$status_links = array();
-		$num_posts = wp_count_posts( $post_type, 'readable' );
-		$total_posts = array_sum( (array) $num_posts );
+		$num_posts = wp_count_posts($post_type, 'readable');
+		$total_posts = array_sum((array) $num_posts);
 		$class = '';
 
 		$current_user_id = get_current_user_id();
-		$all_args = array( 'post_type' => $post_type );
+		$all_args = array('post_type' => $post_type);
 		$mine = '';
 
 		// Subtract post types that are not included in the admin all list.
-		foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
+		foreach (get_post_stati(array('show_in_admin_all_list' => false)) as $state) {
 			$total_posts -= $num_posts->$state;
 		}
 
-		if ( $this->user_posts_count && $this->user_posts_count !== $total_posts ) {
-			if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) ) {
+		if ($this->user_posts_count && $this->user_posts_count !== $total_posts) {
+			if (isset($_GET['author']) && ($_GET['author'] == $current_user_id)) {
 				$class = 'current';
 			}
 
@@ -300,16 +300,16 @@ 
 					$this->user_posts_count,
 					'posts'
 				),
-				number_format_i18n( $this->user_posts_count )
+				number_format_i18n($this->user_posts_count)
 			);
 
-			$mine = $this->get_edit_link( $mine_args, $mine_inner_html, $class );
+			$mine = $this->get_edit_link($mine_args, $mine_inner_html, $class);
 
 			$all_args['all_posts'] = 1;
 			$class = '';
 		}
 
-		if ( empty( $class ) && ( $this->is_base_request() || isset( $_REQUEST['all_posts'] ) ) ) {
+		if (empty($class) && ($this->is_base_request() || isset($_REQUEST['all_posts']))) {
 			$class = 'current';
 		}
 
@@ -320,24 +320,24 @@ 
 				$total_posts,
 				'posts'
 			),
-			number_format_i18n( $total_posts )
+			number_format_i18n($total_posts)
 		);
 
-		$status_links['all'] = $this->get_edit_link( $all_args, $all_inner_html, $class );
-		if ( $mine ) {
+		$status_links['all'] = $this->get_edit_link($all_args, $all_inner_html, $class);
+		if ($mine) {
 			$status_links['mine'] = $mine;
 		}
 
-		foreach ( get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status ) {
+		foreach (get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status) {
 			$class = '';
 
 			$status_name = $status->name;
 
-			if ( ! in_array( $status_name, $avail_post_stati ) || empty( $num_posts->$status_name ) ) {
+			if ( ! in_array($status_name, $avail_post_stati) || empty($num_posts->$status_name)) {
 				continue;
 			}
 
-			if ( isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status'] ) {
+			if (isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status']) {
 				$class = 'current';
 			}
 
@@ -347,15 +347,15 @@ 
 			);
 
 			$status_label = sprintf(
-				translate_nooped_plural( $status->label_count, $num_posts->$status_name ),
-				number_format_i18n( $num_posts->$status_name )
+				translate_nooped_plural($status->label_count, $num_posts->$status_name),
+				number_format_i18n($num_posts->$status_name)
 			);
 
-			$status_links[ $status_name ] = $this->get_edit_link( $status_args, $status_label, $class );
+			$status_links[$status_name] = $this->get_edit_link($status_args, $status_label, $class);
 		}
 
-		if ( ! empty( $this->sticky_posts_count ) ) {
-			$class = ! empty( $_REQUEST['show_sticky'] ) ? 'current' : '';
+		if ( ! empty($this->sticky_posts_count)) {
+			$class = ! empty($_REQUEST['show_sticky']) ? 'current' : '';
 
 			$sticky_args = array(
 				'post_type'	=> $post_type,
@@ -369,16 +369,16 @@ 
 					$this->sticky_posts_count,
 					'posts'
 				),
-				number_format_i18n( $this->sticky_posts_count )
+				number_format_i18n($this->sticky_posts_count)
 			);
 
 			$sticky_link = array(
-				'sticky' => $this->get_edit_link( $sticky_args, $sticky_inner_html, $class )
+				'sticky' => $this->get_edit_link($sticky_args, $sticky_inner_html, $class)
 			);
 
 			// Sticky comes after Publish, or if not listed, after All.
-			$split = 1 + array_search( ( isset( $status_links['publish'] ) ? 'publish' : 'all' ), array_keys( $status_links ) );
-			$status_links = array_merge( array_slice( $status_links, 0, $split ), $sticky_link, array_slice( $status_links, $split ) );
+			$split = 1 + array_search((isset($status_links['publish']) ? 'publish' : 'all'), array_keys($status_links));
+			$status_links = array_merge(array_slice($status_links, 0, $split), $sticky_link, array_slice($status_links, $split));
 		}
 
 		return $status_links;
@@ -390,21 +390,21 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		$post_type_obj = get_post_type_object( $this->screen->post_type );
+		$post_type_obj = get_post_type_object($this->screen->post_type);
 
-		if ( current_user_can( $post_type_obj->cap->edit_posts ) ) {
-			if ( $this->is_trash ) {
-				$actions['untrash'] = __( 'Restore' );
+		if (current_user_can($post_type_obj->cap->edit_posts)) {
+			if ($this->is_trash) {
+				$actions['untrash'] = __('Restore');
 			} else {
-				$actions['edit'] = __( 'Edit' );
+				$actions['edit'] = __('Edit');
 			}
 		}
 
-		if ( current_user_can( $post_type_obj->cap->delete_posts ) ) {
-			if ( $this->is_trash || ! EMPTY_TRASH_DAYS ) {
-				$actions['delete'] = __( 'Delete Permanently' );
+		if (current_user_can($post_type_obj->cap->delete_posts)) {
+			if ($this->is_trash || ! EMPTY_TRASH_DAYS) {
+				$actions['delete'] = __('Delete Permanently');
 			} else {
-				$actions['trash'] = __( 'Move to Trash' );
+				$actions['trash'] = __('Move to Trash');
 			}
 		}
 
@@ -415,18 +415,18 @@ 
 	 * @global int $cat
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		global $cat;
 ?>
 		<div class="alignleft actions">
 <?php
-		if ( 'top' === $which && !is_singular() ) {
+		if ('top' === $which && ! is_singular()) {
 
-			$this->months_dropdown( $this->screen->post_type );
+			$this->months_dropdown($this->screen->post_type);
 
-			if ( is_object_in_taxonomy( $this->screen->post_type, 'category' ) ) {
+			if (is_object_in_taxonomy($this->screen->post_type, 'category')) {
 				$dropdown_options = array(
-					'show_option_all' => get_taxonomy( 'category' )->labels->all_items,
+					'show_option_all' => get_taxonomy('category')->labels->all_items,
 					'hide_empty' => 0,
 					'hierarchical' => 1,
 					'show_count' => 0,
@@ -434,8 +434,8 @@ 
 					'selected' => $cat
 				);
 
-				echo '<label class="screen-reader-text" for="cat">' . __( 'Filter by category' ) . '</label>';
-				wp_dropdown_categories( $dropdown_options );
+				echo '<label class="screen-reader-text" for="cat">'.__('Filter by category').'</label>';
+				wp_dropdown_categories($dropdown_options);
 			}
 
 			/**
@@ -449,13 +449,13 @@ 
 			 *
 			 * @param string $post_type The post type slug.
 			 */
-			do_action( 'restrict_manage_posts', $this->screen->post_type );
+			do_action('restrict_manage_posts', $this->screen->post_type);
 
-			submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+			submit_button(__('Filter'), 'button', 'filter_action', false, array('id' => 'post-query-submit'));
 		}
 
-		if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) ) {
-			submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+		if ($this->is_trash && current_user_can(get_post_type_object($this->screen->post_type)->cap->edit_others_posts)) {
+			submit_button(__('Empty Trash'), 'apply', 'delete_all', false);
 		}
 ?>
 		</div>
@@ -468,7 +468,7 @@ 
 		 *
 		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
 		 */
-		do_action( 'manage_posts_extra_tablenav', $which );
+		do_action('manage_posts_extra_tablenav', $which);
 	}
 
 	/**
@@ -476,7 +476,7 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
+		if (isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2']))
 			return 'delete_all';
 
 		return parent::current_action();
@@ -487,7 +487,7 @@ 
 	 * @return array
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', 'fixed', 'striped', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
+		return array('widefat', 'fixed', 'striped', is_post_type_hierarchical($this->screen->post_type) ? 'pages' : 'posts');
 	}
 
 	/**
@@ -502,14 +502,14 @@ 
 		$posts_columns['cb'] = '<input type="checkbox" />';
 
 		/* translators: manage posts column name */
-		$posts_columns['title'] = _x( 'Title', 'column name' );
+		$posts_columns['title'] = _x('Title', 'column name');
 
-		if ( post_type_supports( $post_type, 'author' ) ) {
-			$posts_columns['author'] = __( 'Author' );
+		if (post_type_supports($post_type, 'author')) {
+			$posts_columns['author'] = __('Author');
 		}
 
-		$taxonomies = get_object_taxonomies( $post_type, 'objects' );
-		$taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
+		$taxonomies = get_object_taxonomies($post_type, 'objects');
+		$taxonomies = wp_filter_object_list($taxonomies, array('show_admin_column' => true), 'and', 'name');
 
 		/**
 		 * Filter the taxonomy columns in the Posts list table.
@@ -522,27 +522,27 @@ 
 		 * @param array  $taxonomies Array of taxonomies to show columns for.
 		 * @param string $post_type  The post type.
 		 */
-		$taxonomies = apply_filters( "manage_taxonomies_for_{$post_type}_columns", $taxonomies, $post_type );
-		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
+		$taxonomies = apply_filters("manage_taxonomies_for_{$post_type}_columns", $taxonomies, $post_type);
+		$taxonomies = array_filter($taxonomies, 'taxonomy_exists');
 
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' === $taxonomy )
+		foreach ($taxonomies as $taxonomy) {
+			if ('category' === $taxonomy)
 				$column_key = 'categories';
-			elseif ( 'post_tag' === $taxonomy )
+			elseif ('post_tag' === $taxonomy)
 				$column_key = 'tags';
 			else
-				$column_key = 'taxonomy-' . $taxonomy;
+				$column_key = 'taxonomy-'.$taxonomy;
 
-			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
+			$posts_columns[$column_key] = get_taxonomy($taxonomy)->labels->name;
 		}
 
-		$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
-		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
-			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		$post_status = ! empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
+		if (post_type_supports($post_type, 'comments') && ! in_array($post_status, array('pending', 'draft', 'future')))
+			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="'.esc_attr__('Comments').'"><span class="screen-reader-text">'.__('Comments').'</span></span>';
 
-		$posts_columns['date'] = __( 'Date' );
+		$posts_columns['date'] = __('Date');
 
-		if ( 'page' === $post_type ) {
+		if ('page' === $post_type) {
 
 			/**
 			 * Filter the columns displayed in the Pages list table.
@@ -551,7 +551,7 @@ 
 			 *
 			 * @param array $post_columns An array of column names.
 			 */
-			$posts_columns = apply_filters( 'manage_pages_columns', $posts_columns );
+			$posts_columns = apply_filters('manage_pages_columns', $posts_columns);
 		} else {
 
 			/**
@@ -562,7 +562,7 @@ 
 			 * @param array  $posts_columns An array of column names.
 			 * @param string $post_type     The post type slug.
 			 */
-			$posts_columns = apply_filters( 'manage_posts_columns', $posts_columns, $post_type );
+			$posts_columns = apply_filters('manage_posts_columns', $posts_columns, $post_type);
 		}
 
 		/**
@@ -574,7 +574,7 @@ 
 		 *
 		 * @param array $post_columns An array of column names.
 		 */
-		return apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
+		return apply_filters("manage_{$post_type}_posts_columns", $posts_columns);
 	}
 
 	/**
@@ -586,7 +586,7 @@ 
 			'title'    => 'title',
 			'parent'   => 'parent',
 			'comments' => 'comment_count',
-			'date'     => array( 'date', true )
+			'date'     => array('date', true)
 		);
 	}
 
@@ -596,18 +596,18 @@ 
 	 * @param array $posts
 	 * @param int $level
 	 */
-	public function display_rows( $posts = array(), $level = 0 ) {
+	public function display_rows($posts = array(), $level = 0) {
 		global $wp_query, $per_page;
 
-		if ( empty( $posts ) )
+		if (empty($posts))
 			$posts = $wp_query->posts;
 
-		add_filter( 'the_title', 'esc_html' );
+		add_filter('the_title', 'esc_html');
 
-		if ( $this->hierarchical_display ) {
-			$this->_display_rows_hierarchical( $posts, $this->get_pagenum(), $per_page );
+		if ($this->hierarchical_display) {
+			$this->_display_rows_hierarchical($posts, $this->get_pagenum(), $per_page);
 		} else {
-			$this->_display_rows( $posts, $level );
+			$this->_display_rows($posts, $level);
 		}
 	}
 
@@ -615,17 +615,17 @@ 
 	 * @param array $posts
 	 * @param int $level
 	 */
-	private function _display_rows( $posts, $level = 0 ) {
+	private function _display_rows($posts, $level = 0) {
 		// Create array of post IDs.
 		$post_ids = array();
 
-		foreach ( $posts as $a_post )
+		foreach ($posts as $a_post)
 			$post_ids[] = $a_post->ID;
 
-		$this->comment_pending_count = get_pending_comments_num( $post_ids );
+		$this->comment_pending_count = get_pending_comments_num($post_ids);
 
-		foreach ( $posts as $post )
-			$this->single_row( $post, $level );
+		foreach ($posts as $post)
+			$this->single_row($post, $level);
 	}
 
 	/**
@@ -635,15 +635,15 @@ 
 	 * @param int $pagenum
 	 * @param int $per_page
 	 */
-	private function _display_rows_hierarchical( $pages, $pagenum = 1, $per_page = 20 ) {
+	private function _display_rows_hierarchical($pages, $pagenum = 1, $per_page = 20) {
 		global $wpdb;
 
 		$level = 0;
 
-		if ( ! $pages ) {
-			$pages = get_pages( array( 'sort_column' => 'menu_order' ) );
+		if ( ! $pages) {
+			$pages = get_pages(array('sort_column' => 'menu_order'));
 
-			if ( ! $pages )
+			if ( ! $pages)
 				return;
 		}
 
@@ -654,56 +654,56 @@ 
 		 * It only takes O( N ) to arrange this and it takes O( 1 ) for subsequent lookup operations
 		 * If searching, ignore hierarchy and treat everything as top level
 		 */
-		if ( empty( $_REQUEST['s'] ) ) {
+		if (empty($_REQUEST['s'])) {
 
 			$top_level_pages = array();
 			$children_pages = array();
 
-			foreach ( $pages as $page ) {
+			foreach ($pages as $page) {
 
 				// Catch and repair bad pages.
-				if ( $page->post_parent == $page->ID ) {
+				if ($page->post_parent == $page->ID) {
 					$page->post_parent = 0;
-					$wpdb->update( $wpdb->posts, array( 'post_parent' => 0 ), array( 'ID' => $page->ID ) );
-					clean_post_cache( $page );
+					$wpdb->update($wpdb->posts, array('post_parent' => 0), array('ID' => $page->ID));
+					clean_post_cache($page);
 				}
 
-				if ( 0 == $page->post_parent )
+				if (0 == $page->post_parent)
 					$top_level_pages[] = $page;
 				else
-					$children_pages[ $page->post_parent ][] = $page;
+					$children_pages[$page->post_parent][] = $page;
 			}
 
 			$pages = &$top_level_pages;
 		}
 
 		$count = 0;
-		$start = ( $pagenum - 1 ) * $per_page;
+		$start = ($pagenum - 1) * $per_page;
 		$end = $start + $per_page;
 		$to_display = array();
 
-		foreach ( $pages as $page ) {
-			if ( $count >= $end )
+		foreach ($pages as $page) {
+			if ($count >= $end)
 				break;
 
-			if ( $count >= $start ) {
+			if ($count >= $start) {
 				$to_display[$page->ID] = $level;
 			}
 
 			$count++;
 
-			if ( isset( $children_pages ) )
-				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			if (isset($children_pages))
+				$this->_page_rows($children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display);
 		}
 
 		// If it is the last pagenum and there are orphaned pages, display them with paging as well.
-		if ( isset( $children_pages ) && $count < $end ){
-			foreach ( $children_pages as $orphans ){
-				foreach ( $orphans as $op ) {
-					if ( $count >= $end )
+		if (isset($children_pages) && $count < $end) {
+			foreach ($children_pages as $orphans) {
+				foreach ($orphans as $op) {
+					if ($count >= $end)
 						break;
 
-					if ( $count >= $start ) {
+					if ($count >= $start) {
 						$to_display[$op->ID] = 0;
 					}
 
@@ -712,16 +712,16 @@ 
 			}
 		}
 
-		$ids = array_keys( $to_display );
-		_prime_post_caches( $ids );
+		$ids = array_keys($to_display);
+		_prime_post_caches($ids);
 
-		if ( ! isset( $GLOBALS['post'] ) ) {
-			$GLOBALS['post'] = reset( $ids );
+		if ( ! isset($GLOBALS['post'])) {
+			$GLOBALS['post'] = reset($ids);
 		}
 
-		foreach ( $to_display as $page_id => $level ) {
+		foreach ($to_display as $page_id => $level) {
 			echo "\t";
-			$this->single_row( $page_id, $level );
+			$this->single_row($page_id, $level);
 		}
 	}
 
@@ -740,51 +740,51 @@ 
 	 * @param int $per_page
 	 * @param array $to_display List of pages to be displayed. Passed by reference.
 	 */
-	private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
-		if ( ! isset( $children_pages[$parent] ) )
+	private function _page_rows(&$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display) {
+		if ( ! isset($children_pages[$parent]))
 			return;
 
-		$start = ( $pagenum - 1 ) * $per_page;
+		$start = ($pagenum - 1) * $per_page;
 		$end = $start + $per_page;
 
-		foreach ( $children_pages[$parent] as $page ) {
-			if ( $count >= $end )
+		foreach ($children_pages[$parent] as $page) {
+			if ($count >= $end)
 				break;
 
 			// If the page starts in a subtree, print the parents.
-			if ( $count == $start && $page->post_parent > 0 ) {
+			if ($count == $start && $page->post_parent > 0) {
 				$my_parents = array();
 				$my_parent = $page->post_parent;
-				while ( $my_parent ) {
+				while ($my_parent) {
 					// Get the ID from the list or the attribute if my_parent is an object
 					$parent_id = $my_parent;
-					if ( is_object( $my_parent ) ) {
+					if (is_object($my_parent)) {
 						$parent_id = $my_parent->ID;
 					}
 
-					$my_parent = get_post( $parent_id );
+					$my_parent = get_post($parent_id);
 					$my_parents[] = $my_parent;
-					if ( !$my_parent->post_parent )
+					if ( ! $my_parent->post_parent)
 						break;
 					$my_parent = $my_parent->post_parent;
 				}
-				$num_parents = count( $my_parents );
-				while ( $my_parent = array_pop( $my_parents ) ) {
+				$num_parents = count($my_parents);
+				while ($my_parent = array_pop($my_parents)) {
 					$to_display[$my_parent->ID] = $level - $num_parents;
 					$num_parents--;
 				}
 			}
 
-			if ( $count >= $start ) {
+			if ($count >= $start) {
 				$to_display[$page->ID] = $level;
 			}
 
 			$count++;
 
-			$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			$this->_page_rows($children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display);
 		}
 
-		unset( $children_pages[$parent] ); //required in order to keep track of orphans
+		unset($children_pages[$parent]); //required in order to keep track of orphans
 	}
 
 	/**
@@ -795,10 +795,10 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_cb( $post ) {
-		if ( current_user_can( 'edit_post', $post->ID ) ): ?>
+	public function column_cb($post) {
+		if (current_user_can('edit_post', $post->ID)): ?>
 			<label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php
-				printf( __( 'Select %s' ), _draft_or_post_title() );
+				printf(__('Select %s'), _draft_or_post_title());
 			?></label>
 			<input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
 			<div class="locked-indicator"></div>
@@ -814,10 +814,10 @@ 
 	 * @param string  $data
 	 * @param string  $primary
 	 */
-	protected function _column_title( $post, $classes, $data, $primary ) {
-		echo '<td class="' . $classes . ' page-title" ', $data, '>';
-		echo $this->column_title( $post );
-		echo $this->handle_row_actions( $post, 'title', $primary );
+	protected function _column_title($post, $classes, $data, $primary) {
+		echo '<td class="'.$classes.' page-title" ', $data, '>';
+		echo $this->column_title($post);
+		echo $this->handle_row_actions($post, 'title', $primary);
 		echo '</td>';
 	}
 
@@ -831,90 +831,90 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_title( $post ) {
+	public function column_title($post) {
 		global $mode;
 
-		if ( $this->hierarchical_display ) {
-			if ( 0 === $this->current_level && (int) $post->post_parent > 0 ) {
+		if ($this->hierarchical_display) {
+			if (0 === $this->current_level && (int) $post->post_parent > 0) {
 				// Sent level 0 by accident, by default, or because we don't know the actual level.
 				$find_main_page = (int) $post->post_parent;
-				while ( $find_main_page > 0 ) {
-					$parent = get_post( $find_main_page );
+				while ($find_main_page > 0) {
+					$parent = get_post($find_main_page);
 
-					if ( is_null( $parent ) ) {
+					if (is_null($parent)) {
 						break;
 					}
 
 					$this->current_level++;
 					$find_main_page = (int) $parent->post_parent;
 
-					if ( ! isset( $parent_name ) ) {
+					if ( ! isset($parent_name)) {
 						/** This filter is documented in wp-includes/post-template.php */
-						$parent_name = apply_filters( 'the_title', $parent->post_title, $parent->ID );
+						$parent_name = apply_filters('the_title', $parent->post_title, $parent->ID);
 					}
 				}
 			}
 		}
 
-		$pad = str_repeat( '&#8212; ', $this->current_level );
+		$pad = str_repeat('&#8212; ', $this->current_level);
 		echo "<strong>";
 
-		$format = get_post_format( $post->ID );
-		if ( $format ) {
-			$label = get_post_format_string( $format );
+		$format = get_post_format($post->ID);
+		if ($format) {
+			$label = get_post_format_string($format);
 
-			$format_class = 'post-state-format post-format-icon post-format-' . $format;
+			$format_class = 'post-state-format post-format-icon post-format-'.$format;
 
 			$format_args = array(
 				'post_format' => $format,
 				'post_type' => $post->post_type
 			);
 
-			echo $this->get_edit_link( $format_args, $label . ':', $format_class );
+			echo $this->get_edit_link($format_args, $label.':', $format_class);
 		}
 
-		$can_edit_post = current_user_can( 'edit_post', $post->ID );
+		$can_edit_post = current_user_can('edit_post', $post->ID);
 		$title = _draft_or_post_title();
 
-		if ( $can_edit_post && $post->post_status != 'trash' ) {
+		if ($can_edit_post && $post->post_status != 'trash') {
 			printf(
 				'<a class="row-title" href="%s" aria-label="%s">%s%s</a>',
-				get_edit_post_link( $post->ID ),
+				get_edit_post_link($post->ID),
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $title ) ),
+				esc_attr(sprintf(__('&#8220;%s&#8221; (Edit)'), $title)),
 				$pad,
 				$title
 			);
 		} else {
-			echo $pad . $title;
+			echo $pad.$title;
 		}
-		_post_states( $post );
+		_post_states($post);
 
-		if ( isset( $parent_name ) ) {
-			$post_type_object = get_post_type_object( $post->post_type );
-			echo ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name );
+		if (isset($parent_name)) {
+			$post_type_object = get_post_type_object($post->post_type);
+			echo ' | '.$post_type_object->labels->parent_item_colon.' '.esc_html($parent_name);
 		}
 		echo "</strong>\n";
 
-		if ( $can_edit_post && $post->post_status != 'trash' ) {
-			$lock_holder = wp_check_post_lock( $post->ID );
+		if ($can_edit_post && $post->post_status != 'trash') {
+			$lock_holder = wp_check_post_lock($post->ID);
 
-			if ( $lock_holder ) {
-				$lock_holder = get_userdata( $lock_holder );
-				$locked_avatar = get_avatar( $lock_holder->ID, 18 );
-				$locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
+			if ($lock_holder) {
+				$lock_holder = get_userdata($lock_holder);
+				$locked_avatar = get_avatar($lock_holder->ID, 18);
+				$locked_text = esc_html(sprintf(__('%s is currently editing'), $lock_holder->display_name));
 			} else {
 				$locked_avatar = $locked_text = '';
 			}
 
-			echo '<div class="locked-info"><span class="locked-avatar">' . $locked_avatar . '</span> <span class="locked-text">' . $locked_text . "</span></div>\n";
+			echo '<div class="locked-info"><span class="locked-avatar">'.$locked_avatar.'</span> <span class="locked-text">'.$locked_text."</span></div>\n";
 		}
 
-		if ( ! is_post_type_hierarchical( $this->screen->post_type ) && 'excerpt' === $mode && current_user_can( 'read_post', $post->ID ) ) {
+		if ( ! is_post_type_hierarchical($this->screen->post_type) && 'excerpt' === $mode && current_user_can('read_post', $post->ID)) {
 			the_excerpt();
 		}
 
-		get_inline_data( $post );
+		get_inline_data($post);
 	}
 
 	/**
@@ -927,39 +927,39 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_date( $post ) {
+	public function column_date($post) {
 		global $mode;
 
-		if ( '0000-00-00 00:00:00' === $post->post_date ) {
-			$t_time = $h_time = __( 'Unpublished' );
+		if ('0000-00-00 00:00:00' === $post->post_date) {
+			$t_time = $h_time = __('Unpublished');
 			$time_diff = 0;
 		} else {
-			$t_time = get_the_time( __( 'Y/m/d g:i:s a' ) );
+			$t_time = get_the_time(__('Y/m/d g:i:s a'));
 			$m_time = $post->post_date;
-			$time = get_post_time( 'G', true, $post );
+			$time = get_post_time('G', true, $post);
 
 			$time_diff = time() - $time;
 
-			if ( $time_diff > 0 && $time_diff < DAY_IN_SECONDS ) {
-				$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+			if ($time_diff > 0 && $time_diff < DAY_IN_SECONDS) {
+				$h_time = sprintf(__('%s ago'), human_time_diff($time));
 			} else {
-				$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
+				$h_time = mysql2date(__('Y/m/d'), $m_time);
 			}
 		}
 
-		if ( 'publish' === $post->post_status ) {
-			_e( 'Published' );
-		} elseif ( 'future' === $post->post_status ) {
-			if ( $time_diff > 0 ) {
-				echo '<strong class="error-message">' . __( 'Missed schedule' ) . '</strong>';
+		if ('publish' === $post->post_status) {
+			_e('Published');
+		} elseif ('future' === $post->post_status) {
+			if ($time_diff > 0) {
+				echo '<strong class="error-message">'.__('Missed schedule').'</strong>';
 			} else {
-				_e( 'Scheduled' );
+				_e('Scheduled');
 			}
 		} else {
-			_e( 'Last Modified' );
+			_e('Last Modified');
 		}
 		echo '<br />';
-		if ( 'excerpt' === $mode ) {
+		if ('excerpt' === $mode) {
 			/**
 			 * Filter the published time of the post.
 			 *
@@ -974,11 +974,11 @@ 
 			 * @param string  $column_name The column name.
 			 * @param string  $mode        The list display mode ('excerpt' or 'list').
 			 */
-			echo apply_filters( 'post_date_column_time', $t_time, $post, 'date', $mode );
+			echo apply_filters('post_date_column_time', $t_time, $post, 'date', $mode);
 		} else {
 
 			/** This filter is documented in wp-admin/includes/class-wp-posts-list-table.php */
-			echo '<abbr title="' . $t_time . '">' . apply_filters( 'post_date_column_time', $h_time, $post, 'date', $mode ) . '</abbr>';
+			echo '<abbr title="'.$t_time.'">'.apply_filters('post_date_column_time', $h_time, $post, 'date', $mode).'</abbr>';
 		}
 	}
 
@@ -990,13 +990,13 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_comments( $post ) {
+	public function column_comments($post) {
 		?>
 		<div class="post-com-count-wrapper">
 		<?php
-			$pending_comments = isset( $this->comment_pending_count[$post->ID] ) ? $this->comment_pending_count[$post->ID] : 0;
+			$pending_comments = isset($this->comment_pending_count[$post->ID]) ? $this->comment_pending_count[$post->ID] : 0;
 
-			$this->comments_bubble( $post->ID, $pending_comments );
+			$this->comments_bubble($post->ID, $pending_comments);
 		?>
 		</div>
 		<?php
@@ -1010,12 +1010,12 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_author( $post ) {
+	public function column_author($post) {
 		$args = array(
 			'post_type' => $post->post_type,
-			'author' => get_the_author_meta( 'ID' )
+			'author' => get_the_author_meta('ID')
 		);
-		echo $this->get_edit_link( $args, get_the_author() );
+		echo $this->get_edit_link($args, get_the_author());
 	}
 
 	/**
@@ -1027,45 +1027,45 @@ 
 	 * @param WP_Post $post        The current WP_Post object.
 	 * @param string  $column_name The current column name.
 	 */
-	public function column_default( $post, $column_name ) {
-		if ( 'categories' === $column_name ) {
+	public function column_default($post, $column_name) {
+		if ('categories' === $column_name) {
 			$taxonomy = 'category';
-		} elseif ( 'tags' === $column_name ) {
+		} elseif ('tags' === $column_name) {
 			$taxonomy = 'post_tag';
-		} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
-			$taxonomy = substr( $column_name, 9 );
+		} elseif (0 === strpos($column_name, 'taxonomy-')) {
+			$taxonomy = substr($column_name, 9);
 		} else {
 			$taxonomy = false;
 		}
-		if ( $taxonomy ) {
-			$taxonomy_object = get_taxonomy( $taxonomy );
-			$terms = get_the_terms( $post->ID, $taxonomy );
-			if ( is_array( $terms ) ) {
+		if ($taxonomy) {
+			$taxonomy_object = get_taxonomy($taxonomy);
+			$terms = get_the_terms($post->ID, $taxonomy);
+			if (is_array($terms)) {
 				$out = array();
-				foreach ( $terms as $t ) {
+				foreach ($terms as $t) {
 					$posts_in_term_qv = array();
-					if ( 'post' != $post->post_type ) {
+					if ('post' != $post->post_type) {
 						$posts_in_term_qv['post_type'] = $post->post_type;
 					}
-					if ( $taxonomy_object->query_var ) {
-						$posts_in_term_qv[ $taxonomy_object->query_var ] = $t->slug;
+					if ($taxonomy_object->query_var) {
+						$posts_in_term_qv[$taxonomy_object->query_var] = $t->slug;
 					} else {
 						$posts_in_term_qv['taxonomy'] = $taxonomy;
 						$posts_in_term_qv['term'] = $t->slug;
 					}
 
-					$label = esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) );
-					$out[] = $this->get_edit_link( $posts_in_term_qv, $label );
+					$label = esc_html(sanitize_term_field('name', $t->name, $t->term_id, $taxonomy, 'display'));
+					$out[] = $this->get_edit_link($posts_in_term_qv, $label);
 				}
 				/* translators: used between list items, there is a space after the comma */
-				echo join( __( ', ' ), $out );
+				echo join(__(', '), $out);
 			} else {
-				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . $taxonomy_object->labels->no_terms . '</span>';
+				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">'.$taxonomy_object->labels->no_terms.'</span>';
 			}
 			return;
 		}
 
-		if ( is_post_type_hierarchical( $post->post_type ) ) {
+		if (is_post_type_hierarchical($post->post_type)) {
 
 			/**
 			 * Fires in each custom column on the Posts list table.
@@ -1078,7 +1078,7 @@ 
 			 * @param string $column_name The name of the column to display.
 			 * @param int    $post_id     The current post ID.
 			 */
-			do_action( 'manage_pages_custom_column', $column_name, $post->ID );
+			do_action('manage_pages_custom_column', $column_name, $post->ID);
 		} else {
 
 			/**
@@ -1092,7 +1092,7 @@ 
 			 * @param string $column_name The name of the column to display.
 			 * @param int    $post_id     The current post ID.
 			 */
-			do_action( 'manage_posts_custom_column', $column_name, $post->ID );
+			do_action('manage_posts_custom_column', $column_name, $post->ID);
 		}
 
 		/**
@@ -1105,7 +1105,7 @@ 
 		 * @param string $column_name The name of the column to display.
 		 * @param int    $post_id     The current post ID.
 		 */
-		do_action( "manage_{$post->post_type}_posts_custom_column", $column_name, $post->ID );
+		do_action("manage_{$post->post_type}_posts_custom_column", $column_name, $post->ID);
 	}
 
 	/**
@@ -1114,31 +1114,31 @@ 
 	 * @param int|WP_Post $post
 	 * @param int         $level
 	 */
-	public function single_row( $post, $level = 0 ) {
+	public function single_row($post, $level = 0) {
 		$global_post = get_post();
 
-		$post = get_post( $post );
+		$post = get_post($post);
 		$this->current_level = $level;
 
 		$GLOBALS['post'] = $post;
-		setup_postdata( $post );
+		setup_postdata($post);
 
-		$classes = 'iedit author-' . ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
+		$classes = 'iedit author-'.(get_current_user_id() == $post->post_author ? 'self' : 'other');
 
-		$lock_holder = wp_check_post_lock( $post->ID );
-		if ( $lock_holder ) {
+		$lock_holder = wp_check_post_lock($post->ID);
+		if ($lock_holder) {
 			$classes .= ' wp-locked';
 		}
 
-		if ( $post->post_parent ) {
-		    $count = count( get_post_ancestors( $post->ID ) );
-		    $classes .= ' level-'. $count;
+		if ($post->post_parent) {
+		    $count = count(get_post_ancestors($post->ID));
+		    $classes .= ' level-'.$count;
 		} else {
 		    $classes .= ' level-0';
 		}
 	?>
-		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
-			<?php $this->single_row_columns( $post ); ?>
+		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode(' ', get_post_class($classes, $post->ID)); ?>">
+			<?php $this->single_row_columns($post); ?>
 		</tr>
 	<?php
 		$GLOBALS['post'] = $global_post;
@@ -1167,85 +1167,85 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for posts.
 	 */
-	protected function handle_row_actions( $post, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($post, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
-		$post_type_object = get_post_type_object( $post->post_type );
-		$can_edit_post = current_user_can( 'edit_post', $post->ID );
+		$post_type_object = get_post_type_object($post->post_type);
+		$can_edit_post = current_user_can('edit_post', $post->ID);
 		$actions = array();
 		$title = _draft_or_post_title();
 
-		if ( $can_edit_post && 'trash' != $post->post_status ) {
+		if ($can_edit_post && 'trash' != $post->post_status) {
 			$actions['edit'] = sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
-				get_edit_post_link( $post->ID ),
+				get_edit_post_link($post->ID),
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ),
-				__( 'Edit' )
+				esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)),
+				__('Edit')
 			);
 			$actions['inline hide-if-no-js'] = sprintf(
 				'<a href="#" class="editinline" aria-label="%s">%s</a>',
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( 'Quick edit &#8220;%s&#8221; inline' ), $title ) ),
-				__( 'Quick&nbsp;Edit' )
+				esc_attr(sprintf(__('Quick edit &#8220;%s&#8221; inline'), $title)),
+				__('Quick&nbsp;Edit')
 			);
 		}
 
-		if ( current_user_can( 'delete_post', $post->ID ) ) {
-			if ( 'trash' === $post->post_status ) {
+		if (current_user_can('delete_post', $post->ID)) {
+			if ('trash' === $post->post_status) {
 				$actions['untrash'] = sprintf(
 					'<a href="%s" aria-label="%s">%s</a>',
-					wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ),
+					wp_nonce_url(admin_url(sprintf($post_type_object->_edit_link.'&amp;action=untrash', $post->ID)), 'untrash-post_'.$post->ID),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'Restore &#8220;%s&#8221; from the Trash' ), $title ) ),
-					__( 'Restore' )
+					esc_attr(sprintf(__('Restore &#8220;%s&#8221; from the Trash'), $title)),
+					__('Restore')
 				);
-			} elseif ( EMPTY_TRASH_DAYS ) {
+			} elseif (EMPTY_TRASH_DAYS) {
 				$actions['trash'] = sprintf(
 					'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
-					get_delete_post_link( $post->ID ),
+					get_delete_post_link($post->ID),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash' ), $title ) ),
-					_x( 'Trash', 'verb' )
+					esc_attr(sprintf(__('Move &#8220;%s&#8221; to the Trash'), $title)),
+					_x('Trash', 'verb')
 				);
 			}
-			if ( 'trash' === $post->post_status || ! EMPTY_TRASH_DAYS ) {
+			if ('trash' === $post->post_status || ! EMPTY_TRASH_DAYS) {
 				$actions['delete'] = sprintf(
 					'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
-					get_delete_post_link( $post->ID, '', true ),
+					get_delete_post_link($post->ID, '', true),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $title ) ),
-					__( 'Delete Permanently' )
+					esc_attr(sprintf(__('Delete &#8220;%s&#8221; permanently'), $title)),
+					__('Delete Permanently')
 				);
 			}
 		}
 
-		if ( is_post_type_viewable( $post_type_object ) ) {
-			if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
-				if ( $can_edit_post ) {
-					$preview_link = get_preview_post_link( $post );
+		if (is_post_type_viewable($post_type_object)) {
+			if (in_array($post->post_status, array('pending', 'draft', 'future'))) {
+				if ($can_edit_post) {
+					$preview_link = get_preview_post_link($post);
 					$actions['view'] = sprintf(
 						'<a href="%s" rel="permalink" aria-label="%s">%s</a>',
-						esc_url( $preview_link ),
+						esc_url($preview_link),
 						/* translators: %s: post title */
-						esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ),
-						__( 'Preview' )
+						esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)),
+						__('Preview')
 					);
 				}
-			} elseif ( 'trash' != $post->post_status ) {
+			} elseif ('trash' != $post->post_status) {
 				$actions['view'] = sprintf(
 					'<a href="%s" rel="permalink" aria-label="%s">%s</a>',
-					get_permalink( $post->ID ),
+					get_permalink($post->ID),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ),
-					__( 'View' )
+					esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)),
+					__('View')
 				);
 			}
 		}
 
-		if ( is_post_type_hierarchical( $post->post_type ) ) {
+		if (is_post_type_hierarchical($post->post_type)) {
 
 			/**
 			 * Filter the array of row action links on the Pages list table.
@@ -1259,7 +1259,7 @@ 
 			 *                         'Delete Permanently', 'Preview', and 'View'.
 			 * @param WP_Post $post The post object.
 			 */
-			$actions = apply_filters( 'page_row_actions', $actions, $post );
+			$actions = apply_filters('page_row_actions', $actions, $post);
 		} else {
 
 			/**
@@ -1274,10 +1274,10 @@ 
 			 *                         'Delete Permanently', 'Preview', and 'View'.
 			 * @param WP_Post $post The post object.
 			 */
-			$actions = apply_filters( 'post_row_actions', $actions, $post );
+			$actions = apply_filters('post_row_actions', $actions, $post);
 		}
 
-		return $this->row_actions( $actions );
+		return $this->row_actions($actions);
 	}
 
 	/**
@@ -1292,15 +1292,15 @@ 
 
 		$screen = $this->screen;
 
-		$post = get_default_post_to_edit( $screen->post_type );
-		$post_type_object = get_post_type_object( $screen->post_type );
+		$post = get_default_post_to_edit($screen->post_type);
+		$post_type_object = get_post_type_object($screen->post_type);
 
-		$taxonomy_names = get_object_taxonomies( $screen->post_type );
+		$taxonomy_names = get_object_taxonomies($screen->post_type);
 		$hierarchical_taxonomies = array();
 		$flat_taxonomies = array();
-		foreach ( $taxonomy_names as $taxonomy_name ) {
+		foreach ($taxonomy_names as $taxonomy_name) {
 
-			$taxonomy = get_taxonomy( $taxonomy_name );
+			$taxonomy = get_taxonomy($taxonomy_name);
 
 			$show_in_quick_edit = $taxonomy->show_in_quick_edit;
 
@@ -1313,39 +1313,39 @@ 
 			 * @param string $taxonomy_name      Taxonomy name.
 			 * @param string $post_type          Post type of current Quick Edit post.
 			 */
-			if ( ! apply_filters( 'quick_edit_show_taxonomy', $show_in_quick_edit, $taxonomy_name, $screen->post_type ) ) {
+			if ( ! apply_filters('quick_edit_show_taxonomy', $show_in_quick_edit, $taxonomy_name, $screen->post_type)) {
 				continue;
 			}
 
-			if ( $taxonomy->hierarchical )
+			if ($taxonomy->hierarchical)
 				$hierarchical_taxonomies[] = $taxonomy;
 			else
 				$flat_taxonomies[] = $taxonomy;
 		}
 
-		$m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
-		$can_publish = current_user_can( $post_type_object->cap->publish_posts );
-		$core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
+		$m = (isset($mode) && 'excerpt' === $mode) ? 'excerpt' : 'list';
+		$can_publish = current_user_can($post_type_object->cap->publish_posts);
+		$core_columns = array('cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true);
 
 	?>
 
 	<form method="get"><table style="display: none"><tbody id="inlineedit">
 		<?php
-		$hclass = count( $hierarchical_taxonomies ) ? 'post' : 'page';
+		$hclass = count($hierarchical_taxonomies) ? 'post' : 'page';
 		$bulk = 0;
-		while ( $bulk < 2 ) { ?>
+		while ($bulk < 2) { ?>
 
-		<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-" . $screen->post_type;
+		<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-".$screen->post_type;
 			echo $bulk ? " bulk-edit-row bulk-edit-row-$hclass bulk-edit-{$screen->post_type}" : " quick-edit-row quick-edit-row-$hclass inline-edit-{$screen->post_type}";
 		?>" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
 
 		<fieldset class="inline-edit-col-left">
-			<legend class="inline-edit-legend"><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></legend>
+			<legend class="inline-edit-legend"><?php echo $bulk ? __('Bulk Edit') : __('Quick Edit'); ?></legend>
 			<div class="inline-edit-col">
 	<?php
 
-	if ( post_type_supports( $screen->post_type, 'title' ) ) :
-		if ( $bulk ) : ?>
+	if (post_type_supports($screen->post_type, 'title')) :
+		if ($bulk) : ?>
 			<div id="bulk-title-div">
 				<div id="bulk-titles"></div>
 			</div>
@@ -1353,30 +1353,30 @@ 
 	<?php else : // $bulk ?>
 
 			<label>
-				<span class="title"><?php _e( 'Title' ); ?></span>
+				<span class="title"><?php _e('Title'); ?></span>
 				<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 			</label>
 
 			<label>
-				<span class="title"><?php _e( 'Slug' ); ?></span>
+				<span class="title"><?php _e('Slug'); ?></span>
 				<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
 			</label>
 
 	<?php endif; // $bulk
 	endif; // post_type_supports title ?>
 
-	<?php if ( !$bulk ) : ?>
+	<?php if ( ! $bulk) : ?>
 			<fieldset class="inline-edit-date">
-			<legend><span class="title"><?php _e( 'Date' ); ?></span></legend>
-				<?php touch_time( 1, 1, 0, 1 ); ?>
+			<legend><span class="title"><?php _e('Date'); ?></span></legend>
+				<?php touch_time(1, 1, 0, 1); ?>
 			</fieldset>
 			<br class="clear" />
 	<?php endif; // $bulk
 
-		if ( post_type_supports( $screen->post_type, 'author' ) ) :
+		if (post_type_supports($screen->post_type, 'author')) :
 			$authors_dropdown = '';
 
-			if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) ) :
+			if (is_super_admin() || current_user_can($post_type_object->cap->edit_others_posts)) :
 				$users_opt = array(
 					'hide_if_only_one_author' => false,
 					'who' => 'authors',
@@ -1386,39 +1386,39 @@ 
 					'echo' => 0,
 					'show' => 'display_name_with_login',
 				);
-				if ( $bulk )
-					$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				if ($bulk)
+					$users_opt['show_option_none'] = __('&mdash; No Change &mdash;');
 
-				if ( $authors = wp_dropdown_users( $users_opt ) ) :
+				if ($authors = wp_dropdown_users($users_opt)) :
 					$authors_dropdown  = '<label class="inline-edit-author">';
-					$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
+					$authors_dropdown .= '<span class="title">'.__('Author').'</span>';
 					$authors_dropdown .= $authors;
 					$authors_dropdown .= '</label>';
 				endif;
 			endif; // authors
 	?>
 
-	<?php if ( !$bulk ) echo $authors_dropdown;
+	<?php if ( ! $bulk) echo $authors_dropdown;
 	endif; // post_type_supports author
 
-	if ( !$bulk && $can_publish ) :
+	if ( ! $bulk && $can_publish) :
 	?>
 
 			<div class="inline-edit-group wp-clearfix">
 				<label class="alignleft">
-					<span class="title"><?php _e( 'Password' ); ?></span>
+					<span class="title"><?php _e('Password'); ?></span>
 					<span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
 				</label>
 
 				<em class="alignleft inline-edit-or">
 					<?php
 					/* translators: Between password field and private checkbox on post quick edit interface */
-					_e( '&ndash;OR&ndash;' );
+					_e('&ndash;OR&ndash;');
 					?>
 				</em>
 				<label class="alignleft inline-edit-private">
 					<input type="checkbox" name="keep_private" value="private" />
-					<span class="checkbox-title"><?php _e( 'Private' ); ?></span>
+					<span class="checkbox-title"><?php _e('Private'); ?></span>
 				</label>
 			</div>
 
@@ -1426,16 +1426,16 @@ 
 
 		</div></fieldset>
 
-	<?php if ( count( $hierarchical_taxonomies ) && !$bulk ) : ?>
+	<?php if (count($hierarchical_taxonomies) && ! $bulk) : ?>
 
 		<fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
 
-	<?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
+	<?php foreach ($hierarchical_taxonomies as $taxonomy) : ?>
 
-			<span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
-			<input type="hidden" name="<?php echo ( $taxonomy->name === 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
-			<ul class="cat-checklist <?php echo esc_attr( $taxonomy->name )?>-checklist">
-				<?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ) ?>
+			<span class="title inline-edit-categories-label"><?php echo esc_html($taxonomy->labels->name) ?></span>
+			<input type="hidden" name="<?php echo ($taxonomy->name === 'category') ? 'post_category[]' : 'tax_input['.esc_attr($taxonomy->name).'][]'; ?>" value="0" />
+			<ul class="cat-checklist <?php echo esc_attr($taxonomy->name)?>-checklist">
+				<?php wp_terms_checklist(null, array('taxonomy' => $taxonomy->name)) ?>
 			</ul>
 
 	<?php endforeach; //$hierarchical_taxonomies as $taxonomy ?>
@@ -1447,27 +1447,27 @@ 
 		<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
 
 	<?php
-		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
+		if (post_type_supports($screen->post_type, 'author') && $bulk)
 			echo $authors_dropdown;
 
-		if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
+		if (post_type_supports($screen->post_type, 'page-attributes')) :
 
-			if ( $post_type_object->hierarchical ) :
+			if ($post_type_object->hierarchical) :
 		?>
 			<label>
-				<span class="title"><?php _e( 'Parent' ); ?></span>
+				<span class="title"><?php _e('Parent'); ?></span>
 	<?php
 		$dropdown_args = array(
 			'post_type'         => $post_type_object->name,
 			'selected'          => $post->post_parent,
 			'name'              => 'post_parent',
-			'show_option_none'  => __( 'Main Page (no parent)' ),
+			'show_option_none'  => __('Main Page (no parent)'),
 			'option_none_value' => 0,
 			'sort_column'       => 'menu_order, post_title',
 		);
 
-		if ( $bulk )
-			$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		if ($bulk)
+			$dropdown_args['show_option_no_change'] = __('&mdash; No Change &mdash;');
 
 		/**
 		 * Filter the arguments used to generate the Quick Edit page-parent drop-down.
@@ -1478,38 +1478,38 @@ 
 		 *
 		 * @param array $dropdown_args An array of arguments.
 		 */
-		$dropdown_args = apply_filters( 'quick_edit_dropdown_pages_args', $dropdown_args );
+		$dropdown_args = apply_filters('quick_edit_dropdown_pages_args', $dropdown_args);
 
-		wp_dropdown_pages( $dropdown_args );
+		wp_dropdown_pages($dropdown_args);
 	?>
 			</label>
 
 	<?php
 			endif; // hierarchical
 
-			if ( !$bulk ) : ?>
+			if ( ! $bulk) : ?>
 
 			<label>
-				<span class="title"><?php _e( 'Order' ); ?></span>
+				<span class="title"><?php _e('Order'); ?></span>
 				<span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order ?>" /></span>
 			</label>
 
 	<?php	endif; // !$bulk
 
-			if ( 'page' === $screen->post_type ) :
+			if ('page' === $screen->post_type) :
 	?>
 
 			<label>
-				<span class="title"><?php _e( 'Template' ); ?></span>
+				<span class="title"><?php _e('Template'); ?></span>
 				<select name="page_template">
-	<?php	if ( $bulk ) : ?>
-					<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+	<?php	if ($bulk) : ?>
+					<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
 	<?php	endif; // $bulk ?>
     				<?php
 					/** This filter is documented in wp-admin/includes/meta-boxes.php */
-					$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'quick-edit' );
+					$default_title = apply_filters('default_page_template_title', __('Default Template'), 'quick-edit');
     				?>
-					<option value="default"><?php echo esc_html( $default_title ); ?></option>
+					<option value="default"><?php echo esc_html($default_title); ?></option>
 					<?php page_template_dropdown() ?>
 				</select>
 			</label>
@@ -1519,13 +1519,13 @@ 
 		endif; // page-attributes
 	?>
 
-	<?php if ( count( $flat_taxonomies ) && !$bulk ) : ?>
+	<?php if (count($flat_taxonomies) && ! $bulk) : ?>
 
-	<?php foreach ( $flat_taxonomies as $taxonomy ) : ?>
-		<?php if ( current_user_can( $taxonomy->cap->assign_terms ) ) : ?>
+	<?php foreach ($flat_taxonomies as $taxonomy) : ?>
+		<?php if (current_user_can($taxonomy->cap->assign_terms)) : ?>
 			<label class="inline-edit-tags">
-				<span class="title"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
-				<textarea cols="22" rows="1" name="tax_input[<?php echo esc_attr( $taxonomy->name )?>]" class="tax_input_<?php echo esc_attr( $taxonomy->name )?>"></textarea>
+				<span class="title"><?php echo esc_html($taxonomy->labels->name) ?></span>
+				<textarea cols="22" rows="1" name="tax_input[<?php echo esc_attr($taxonomy->name)?>]" class="tax_input_<?php echo esc_attr($taxonomy->name)?>"></textarea>
 			</label>
 		<?php endif; ?>
 
@@ -1533,26 +1533,26 @@ 
 
 	<?php endif; // count( $flat_taxonomies ) && !$bulk  ?>
 
-	<?php if ( post_type_supports( $screen->post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) :
-		if ( $bulk ) : ?>
+	<?php if (post_type_supports($screen->post_type, 'comments') || post_type_supports($screen->post_type, 'trackbacks')) :
+		if ($bulk) : ?>
 
 			<div class="inline-edit-group wp-clearfix">
-		<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
+		<?php if (post_type_supports($screen->post_type, 'comments')) : ?>
 			<label class="alignleft">
-				<span class="title"><?php _e( 'Comments' ); ?></span>
+				<span class="title"><?php _e('Comments'); ?></span>
 				<select name="comment_status">
-					<option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-					<option value="open"><?php _e( 'Allow' ); ?></option>
-					<option value="closed"><?php _e( 'Do not allow' ); ?></option>
+					<option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
+					<option value="open"><?php _e('Allow'); ?></option>
+					<option value="closed"><?php _e('Do not allow'); ?></option>
 				</select>
 			</label>
-		<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
+		<?php endif; if (post_type_supports($screen->post_type, 'trackbacks')) : ?>
 			<label class="alignright">
-				<span class="title"><?php _e( 'Pings' ); ?></span>
+				<span class="title"><?php _e('Pings'); ?></span>
 				<select name="ping_status">
-					<option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-					<option value="open"><?php _e( 'Allow' ); ?></option>
-					<option value="closed"><?php _e( 'Do not allow' ); ?></option>
+					<option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
+					<option value="open"><?php _e('Allow'); ?></option>
+					<option value="closed"><?php _e('Do not allow'); ?></option>
 				</select>
 			</label>
 		<?php endif; ?>
@@ -1561,15 +1561,15 @@ 
 	<?php else : // $bulk ?>
 
 			<div class="inline-edit-group wp-clearfix">
-			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
+			<?php if (post_type_supports($screen->post_type, 'comments')) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="comment_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
+					<span class="checkbox-title"><?php _e('Allow Comments'); ?></span>
 				</label>
-			<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
+			<?php endif; if (post_type_supports($screen->post_type, 'trackbacks')) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="ping_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Pings' ); ?></span>
+					<span class="checkbox-title"><?php _e('Allow Pings'); ?></span>
 				</label>
 			<?php endif; ?>
 			</div>
@@ -1579,33 +1579,33 @@ 
 
 			<div class="inline-edit-group wp-clearfix">
 				<label class="inline-edit-status alignleft">
-					<span class="title"><?php _e( 'Status' ); ?></span>
+					<span class="title"><?php _e('Status'); ?></span>
 					<select name="_status">
-	<?php if ( $bulk ) : ?>
-						<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+	<?php if ($bulk) : ?>
+						<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
 	<?php endif; // $bulk ?>
-					<?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>
-						<option value="publish"><?php _e( 'Published' ); ?></option>
-						<option value="future"><?php _e( 'Scheduled' ); ?></option>
-	<?php if ( $bulk ) : ?>
-						<option value="private"><?php _e( 'Private' ) ?></option>
+					<?php if ($can_publish) : // Contributors only get "Unpublished" and "Pending Review" ?>
+						<option value="publish"><?php _e('Published'); ?></option>
+						<option value="future"><?php _e('Scheduled'); ?></option>
+	<?php if ($bulk) : ?>
+						<option value="private"><?php _e('Private') ?></option>
 	<?php endif; // $bulk ?>
 					<?php endif; ?>
-						<option value="pending"><?php _e( 'Pending Review' ); ?></option>
-						<option value="draft"><?php _e( 'Draft' ); ?></option>
+						<option value="pending"><?php _e('Pending Review'); ?></option>
+						<option value="draft"><?php _e('Draft'); ?></option>
 					</select>
 				</label>
 
-	<?php if ( 'post' === $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
+	<?php if ('post' === $screen->post_type && $can_publish && current_user_can($post_type_object->cap->edit_others_posts)) : ?>
 
-	<?php	if ( $bulk ) : ?>
+	<?php	if ($bulk) : ?>
 
 				<label class="alignright">
-					<span class="title"><?php _e( 'Sticky' ); ?></span>
+					<span class="title"><?php _e('Sticky'); ?></span>
 					<select name="sticky">
-						<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-						<option value="sticky"><?php _e( 'Sticky' ); ?></option>
-						<option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>
+						<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
+						<option value="sticky"><?php _e('Sticky'); ?></option>
+						<option value="unsticky"><?php _e('Not Sticky'); ?></option>
 					</select>
 				</label>
 
@@ -1613,7 +1613,7 @@ 
 
 				<label class="alignleft">
 					<input type="checkbox" name="sticky" value="sticky" />
-					<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
+					<span class="checkbox-title"><?php _e('Make this post sticky'); ?></span>
 				</label>
 
 	<?php	endif; // $bulk ?>
@@ -1624,20 +1624,20 @@ 
 
 	<?php
 
-	if ( $bulk && current_theme_supports( 'post-formats' ) && post_type_supports( $screen->post_type, 'post-formats' ) ) {
-		$post_formats = get_theme_support( 'post-formats' );
+	if ($bulk && current_theme_supports('post-formats') && post_type_supports($screen->post_type, 'post-formats')) {
+		$post_formats = get_theme_support('post-formats');
 
 		?>
 		<label class="alignleft">
-		<span class="title"><?php _ex( 'Format', 'post format' ); ?></span>
+		<span class="title"><?php _ex('Format', 'post format'); ?></span>
 		<select name="post_format">
-			<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-			<option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
+			<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
+			<option value="0"><?php echo get_post_format_string('standard'); ?></option>
 			<?php
-			if ( is_array( $post_formats[0] ) ) {
-				foreach ( $post_formats[0] as $format ) {
+			if (is_array($post_formats[0])) {
+				foreach ($post_formats[0] as $format) {
 					?>
-					<option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
+					<option value="<?php echo esc_attr($format); ?>"><?php echo esc_html(get_post_format_string($format)); ?></option>
 					<?php
 				}
 			}
@@ -1652,13 +1652,13 @@ 
 		</div></fieldset>
 
 	<?php
-		list( $columns ) = $this->get_column_info();
+		list($columns) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
-			if ( isset( $core_columns[$column_name] ) )
+		foreach ($columns as $column_name => $column_display_name) {
+			if (isset($core_columns[$column_name]))
 				continue;
 
-			if ( $bulk ) {
+			if ($bulk) {
 
 				/**
 				 * Fires once for each column in Bulk Edit mode.
@@ -1668,7 +1668,7 @@ 
 				 * @param string  $column_name Name of the column to edit.
 				 * @param WP_Post $post_type   The post type slug.
 				 */
-				do_action( 'bulk_edit_custom_box', $column_name, $screen->post_type );
+				do_action('bulk_edit_custom_box', $column_name, $screen->post_type);
 			} else {
 
 				/**
@@ -1679,25 +1679,25 @@ 
 				 * @param string $column_name Name of the column to edit.
 				 * @param string $post_type   The post type slug.
 				 */
-				do_action( 'quick_edit_custom_box', $column_name, $screen->post_type );
+				do_action('quick_edit_custom_box', $column_name, $screen->post_type);
 			}
 
 		}
 	?>
 		<p class="submit inline-edit-save">
-			<button type="button" class="button-secondary cancel alignleft"><?php _e( 'Cancel' ); ?></button>
-			<?php if ( ! $bulk ) {
-				wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
+			<button type="button" class="button-secondary cancel alignleft"><?php _e('Cancel'); ?></button>
+			<?php if ( ! $bulk) {
+				wp_nonce_field('inlineeditnonce', '_inline_edit', false);
 				?>
-				<button type="button" class="button-primary save alignright"><?php _e( 'Update' ); ?></button>
+				<button type="button" class="button-primary save alignright"><?php _e('Update'); ?></button>
 				<span class="spinner"></span>
 			<?php } else {
-				submit_button( __( 'Update' ), 'button-primary alignright', 'bulk_edit', false );
+				submit_button(__('Update'), 'button-primary alignright', 'bulk_edit', false);
 			} ?>
-			<input type="hidden" name="post_view" value="<?php echo esc_attr( $m ); ?>" />
-			<input type="hidden" name="screen" value="<?php echo esc_attr( $screen->id ); ?>" />
-			<?php if ( ! $bulk && ! post_type_supports( $screen->post_type, 'author' ) ) { ?>
-				<input type="hidden" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
+			<input type="hidden" name="post_view" value="<?php echo esc_attr($m); ?>" />
+			<input type="hidden" name="screen" value="<?php echo esc_attr($screen->id); ?>" />
+			<?php if ( ! $bulk && ! post_type_supports($screen->post_type, 'author')) { ?>
+				<input type="hidden" name="post_author" value="<?php echo esc_attr($post->post_author); ?>" />
 			<?php } ?>
 			<span class="error" style="display:none"></span>
 			<br class="clear" />

Braces +91 added lines, -59 removed lines

@@ -199,10 +199,11 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
-		else
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) {
+					echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
+		} else {
+					echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+		}
 	}
 
 	/**
@@ -266,8 +267,9 @@ 
 
 		$post_type = $this->screen->post_type;
 
-		if ( !empty($locked_post_status) )
-			return array();
+		if ( !empty($locked_post_status) ) {
+					return array();
+		}
 
 		$status_links = array();
 		$num_posts = wp_count_posts( $post_type, 'readable' );
@@ -476,8 +478,9 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
-			return 'delete_all';
+		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
+					return 'delete_all';
+		}
 
 		return parent::current_action();
 	}
@@ -526,19 +529,21 @@ 
 		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
 
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' === $taxonomy )
-				$column_key = 'categories';
-			elseif ( 'post_tag' === $taxonomy )
-				$column_key = 'tags';
-			else
-				$column_key = 'taxonomy-' . $taxonomy;
+			if ( 'category' === $taxonomy ) {
+							$column_key = 'categories';
+			} elseif ( 'post_tag' === $taxonomy ) {
+							$column_key = 'tags';
+			} else {
+							$column_key = 'taxonomy-' . $taxonomy;
+			}
 
 			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
 		}
 
 		$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
-		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
-			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) ) {
+					$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		}
 
 		$posts_columns['date'] = __( 'Date' );
 
@@ -599,8 +604,9 @@ 
 	public function display_rows( $posts = array(), $level = 0 ) {
 		global $wp_query, $per_page;
 
-		if ( empty( $posts ) )
-			$posts = $wp_query->posts;
+		if ( empty( $posts ) ) {
+					$posts = $wp_query->posts;
+		}
 
 		add_filter( 'the_title', 'esc_html' );
 
@@ -619,13 +625,15 @@ 
 		// Create array of post IDs.
 		$post_ids = array();
 
-		foreach ( $posts as $a_post )
-			$post_ids[] = $a_post->ID;
+		foreach ( $posts as $a_post ) {
+					$post_ids[] = $a_post->ID;
+		}
 
 		$this->comment_pending_count = get_pending_comments_num( $post_ids );
 
-		foreach ( $posts as $post )
-			$this->single_row( $post, $level );
+		foreach ( $posts as $post ) {
+					$this->single_row( $post, $level );
+		}
 	}
 
 	/**
@@ -643,8 +651,9 @@ 
 		if ( ! $pages ) {
 			$pages = get_pages( array( 'sort_column' => 'menu_order' ) );
 
-			if ( ! $pages )
-				return;
+			if ( ! $pages ) {
+							return;
+			}
 		}
 
 		/*
@@ -668,10 +677,11 @@ 
 					clean_post_cache( $page );
 				}
 
-				if ( 0 == $page->post_parent )
-					$top_level_pages[] = $page;
-				else
-					$children_pages[ $page->post_parent ][] = $page;
+				if ( 0 == $page->post_parent ) {
+									$top_level_pages[] = $page;
+				} else {
+									$children_pages[ $page->post_parent ][] = $page;
+				}
 			}
 
 			$pages = &$top_level_pages;
@@ -683,8 +693,9 @@ 
 		$to_display = array();
 
 		foreach ( $pages as $page ) {
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
 			if ( $count >= $start ) {
 				$to_display[$page->ID] = $level;
@@ -692,16 +703,18 @@ 
 
 			$count++;
 
-			if ( isset( $children_pages ) )
-				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			if ( isset( $children_pages ) ) {
+							$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			}
 		}
 
 		// If it is the last pagenum and there are orphaned pages, display them with paging as well.
 		if ( isset( $children_pages ) && $count < $end ){
 			foreach ( $children_pages as $orphans ){
 				foreach ( $orphans as $op ) {
-					if ( $count >= $end )
-						break;
+					if ( $count >= $end ) {
+											break;
+					}
 
 					if ( $count >= $start ) {
 						$to_display[$op->ID] = 0;
@@ -741,15 +754,17 @@ 
 	 * @param array $to_display List of pages to be displayed. Passed by reference.
 	 */
 	private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
-		if ( ! isset( $children_pages[$parent] ) )
-			return;
+		if ( ! isset( $children_pages[$parent] ) ) {
+					return;
+		}
 
 		$start = ( $pagenum - 1 ) * $per_page;
 		$end = $start + $per_page;
 
 		foreach ( $children_pages[$parent] as $page ) {
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
 			// If the page starts in a subtree, print the parents.
 			if ( $count == $start && $page->post_parent > 0 ) {
@@ -764,8 +779,9 @@ 
 
 					$my_parent = get_post( $parent_id );
 					$my_parents[] = $my_parent;
-					if ( !$my_parent->post_parent )
-						break;
+					if ( !$my_parent->post_parent ) {
+											break;
+					}
 					$my_parent = $my_parent->post_parent;
 				}
 				$num_parents = count( $my_parents );
@@ -1317,10 +1333,11 @@ 
 				continue;
 			}
 
-			if ( $taxonomy->hierarchical )
-				$hierarchical_taxonomies[] = $taxonomy;
-			else
-				$flat_taxonomies[] = $taxonomy;
+			if ( $taxonomy->hierarchical ) {
+							$hierarchical_taxonomies[] = $taxonomy;
+			} else {
+							$flat_taxonomies[] = $taxonomy;
+			}
 		}
 
 		$m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
@@ -1350,10 +1367,13 @@ 
 				<div id="bulk-titles"></div>
 			</div>
 
-	<?php else : // $bulk ?>
+	<?php else {
+	: // $bulk ?>
 
 			<label>
-				<span class="title"><?php _e( 'Title' ); ?></span>
+				<span class="title"><?php _e( 'Title' );
+}
+?></span>
 				<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 			</label>
 
@@ -1386,8 +1406,9 @@ 
 					'echo' => 0,
 					'show' => 'display_name_with_login',
 				);
-				if ( $bulk )
-					$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				if ( $bulk ) {
+									$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				}
 
 				if ( $authors = wp_dropdown_users( $users_opt ) ) :
 					$authors_dropdown  = '<label class="inline-edit-author">';
@@ -1398,7 +1419,9 @@ 
 			endif; // authors
 	?>
 
-	<?php if ( !$bulk ) echo $authors_dropdown;
+	<?php if ( !$bulk ) {
+	echo $authors_dropdown;
+}
 	endif; // post_type_supports author
 
 	if ( !$bulk && $can_publish ) :
@@ -1447,8 +1470,9 @@ 
 		<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
 
 	<?php
-		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
-			echo $authors_dropdown;
+		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk ) {
+					echo $authors_dropdown;
+		}
 
 		if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
 
@@ -1466,8 +1490,9 @@ 
 			'sort_column'       => 'menu_order, post_title',
 		);
 
-		if ( $bulk )
-			$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		if ( $bulk ) {
+					$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		}
 
 		/**
 		 * Filter the arguments used to generate the Quick Edit page-parent drop-down.
@@ -1558,13 +1583,16 @@ 
 		<?php endif; ?>
 			</div>
 
-	<?php else : // $bulk ?>
+	<?php else {
+	: // $bulk ?>
 
 			<div class="inline-edit-group wp-clearfix">
 			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="comment_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
+					<span class="checkbox-title"><?php _e( 'Allow Comments' );
+}
+?></span>
 				</label>
 			<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
 				<label class="alignleft">
@@ -1609,11 +1637,14 @@ 
 					</select>
 				</label>
 
-	<?php	else : // $bulk ?>
+	<?php	else {
+	: // $bulk ?>
 
 				<label class="alignleft">
 					<input type="checkbox" name="sticky" value="sticky" />
-					<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
+					<span class="checkbox-title"><?php _e( 'Make this post sticky' );
+}
+?></span>
 				</label>
 
 	<?php	endif; // $bulk ?>
@@ -1655,8 +1686,9 @@ 
 		list( $columns ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			if ( isset( $core_columns[$column_name] ) )
-				continue;
+			if ( isset( $core_columns[$column_name] ) ) {
+							continue;
+			}
 
 			if ( $bulk ) {
 

src/wp-admin/includes/image.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  * @param int $dst_h The destination height.
  * @param int $src_abs Optional. If the source crop points are absolute.
  * @param string $dst_file Optional. The destination file to write to.
- * @return string|WP_Error New filepath on success, WP_Error on failure.
+ * @return string New filepath on success, WP_Error on failure.
  */
 function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
 	$src_file = $src;

Spacing +163 added lines, -163 removed lines

@@ -22,41 +22,41 @@ 
  * @param string $dst_file Optional. The destination file to write to.
  * @return string|WP_Error New filepath on success, WP_Error on failure.
  */
-function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
+function wp_crop_image($src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false) {
 	$src_file = $src;
-	if ( is_numeric( $src ) ) { // Handle int as attachment ID
-		$src_file = get_attached_file( $src );
+	if (is_numeric($src)) { // Handle int as attachment ID
+		$src_file = get_attached_file($src);
 
-		if ( ! file_exists( $src_file ) ) {
+		if ( ! file_exists($src_file)) {
 			// If the file doesn't exist, attempt a URL fopen on the src link.
 			// This can occur with certain file replication plugins.
-			$src = _load_image_to_edit_path( $src, 'full' );
+			$src = _load_image_to_edit_path($src, 'full');
 		} else {
 			$src = $src_file;
 		}
 	}
 
-	$editor = wp_get_image_editor( $src );
-	if ( is_wp_error( $editor ) )
+	$editor = wp_get_image_editor($src);
+	if (is_wp_error($editor))
 		return $editor;
 
-	$src = $editor->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs );
-	if ( is_wp_error( $src ) )
+	$src = $editor->crop($src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs);
+	if (is_wp_error($src))
 		return $src;
 
-	if ( ! $dst_file )
-		$dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
+	if ( ! $dst_file)
+		$dst_file = str_replace(basename($src_file), 'cropped-'.basename($src_file), $src_file);
 
 	/*
 	 * The directory containing the original file may no longer exist when
 	 * using a replication plugin.
 	 */
-	wp_mkdir_p( dirname( $dst_file ) );
+	wp_mkdir_p(dirname($dst_file));
 
-	$dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
+	$dst_file = dirname($dst_file).'/'.wp_unique_filename(dirname($dst_file), basename($dst_file));
 
-	$result = $editor->save( $dst_file );
-	if ( is_wp_error( $result ) )
+	$result = $editor->save($dst_file);
+	if (is_wp_error($result))
 		return $result;
 
 	return $dst_file;
@@ -73,13 +73,13 @@ 
  * @param string $file Filepath of the Attached image.
  * @return mixed Metadata for attachment.
  */
-function wp_generate_attachment_metadata( $attachment_id, $file ) {
-	$attachment = get_post( $attachment_id );
+function wp_generate_attachment_metadata($attachment_id, $file) {
+	$attachment = get_post($attachment_id);
 
 	$metadata = array();
 	$support = false;
-	if ( preg_match('!^image/!', get_post_mime_type( $attachment )) && file_is_displayable_image($file) ) {
-		$imagesize = getimagesize( $file );
+	if (preg_match('!^image/!', get_post_mime_type($attachment)) && file_is_displayable_image($file)) {
+		$imagesize = getimagesize($file);
 		$metadata['width'] = $imagesize[0];
 		$metadata['height'] = $imagesize[1];
 
@@ -90,20 +90,20 @@ 
 		global $_wp_additional_image_sizes;
 
 		$sizes = array();
-		foreach ( get_intermediate_image_sizes() as $s ) {
-			$sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => false );
-			if ( isset( $_wp_additional_image_sizes[$s]['width'] ) )
-				$sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); // For theme-added sizes
+		foreach (get_intermediate_image_sizes() as $s) {
+			$sizes[$s] = array('width' => '', 'height' => '', 'crop' => false);
+			if (isset($_wp_additional_image_sizes[$s]['width']))
+				$sizes[$s]['width'] = intval($_wp_additional_image_sizes[$s]['width']); // For theme-added sizes
 			else
-				$sizes[$s]['width'] = get_option( "{$s}_size_w" ); // For default sizes set in options
-			if ( isset( $_wp_additional_image_sizes[$s]['height'] ) )
-				$sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] ); // For theme-added sizes
+				$sizes[$s]['width'] = get_option("{$s}_size_w"); // For default sizes set in options
+			if (isset($_wp_additional_image_sizes[$s]['height']))
+				$sizes[$s]['height'] = intval($_wp_additional_image_sizes[$s]['height']); // For theme-added sizes
 			else
-				$sizes[$s]['height'] = get_option( "{$s}_size_h" ); // For default sizes set in options
-			if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) )
+				$sizes[$s]['height'] = get_option("{$s}_size_h"); // For default sizes set in options
+			if (isset($_wp_additional_image_sizes[$s]['crop']))
 				$sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop']; // For theme-added sizes
 			else
-				$sizes[$s]['crop'] = get_option( "{$s}_crop" ); // For default sizes set in options
+				$sizes[$s]['crop'] = get_option("{$s}_crop"); // For default sizes set in options
 		}
 
 		/**
@@ -115,34 +115,34 @@ 
 		 * @param array $sizes    An associative array of image sizes.
 		 * @param array $metadata An associative array of image metadata: width, height, file.
 		 */
-		$sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes, $metadata );
+		$sizes = apply_filters('intermediate_image_sizes_advanced', $sizes, $metadata);
 
-		if ( $sizes ) {
-			$editor = wp_get_image_editor( $file );
+		if ($sizes) {
+			$editor = wp_get_image_editor($file);
 
-			if ( ! is_wp_error( $editor ) )
-				$metadata['sizes'] = $editor->multi_resize( $sizes );
+			if ( ! is_wp_error($editor))
+				$metadata['sizes'] = $editor->multi_resize($sizes);
 		} else {
 			$metadata['sizes'] = array();
 		}
 
 		// Fetch additional metadata from EXIF/IPTC.
-		$image_meta = wp_read_image_metadata( $file );
-		if ( $image_meta )
+		$image_meta = wp_read_image_metadata($file);
+		if ($image_meta)
 			$metadata['image_meta'] = $image_meta;
 
-	} elseif ( wp_attachment_is( 'video', $attachment ) ) {
-		$metadata = wp_read_video_metadata( $file );
-		$support = current_theme_supports( 'post-thumbnails', 'attachment:video' ) || post_type_supports( 'attachment:video', 'thumbnail' );
-	} elseif ( wp_attachment_is( 'audio', $attachment ) ) {
-		$metadata = wp_read_audio_metadata( $file );
-		$support = current_theme_supports( 'post-thumbnails', 'attachment:audio' ) || post_type_supports( 'attachment:audio', 'thumbnail' );
+	} elseif (wp_attachment_is('video', $attachment)) {
+		$metadata = wp_read_video_metadata($file);
+		$support = current_theme_supports('post-thumbnails', 'attachment:video') || post_type_supports('attachment:video', 'thumbnail');
+	} elseif (wp_attachment_is('audio', $attachment)) {
+		$metadata = wp_read_audio_metadata($file);
+		$support = current_theme_supports('post-thumbnails', 'attachment:audio') || post_type_supports('attachment:audio', 'thumbnail');
 	}
 
-	if ( $support && ! empty( $metadata['image']['data'] ) ) {
+	if ($support && ! empty($metadata['image']['data'])) {
 		// Check for existing cover.
-		$hash = md5( $metadata['image']['data'] );
-		$posts = get_posts( array(
+		$hash = md5($metadata['image']['data']);
+		$posts = get_posts(array(
 			'fields' => 'ids',
 			'post_type' => 'attachment',
 			'post_mime_type' => $metadata['image']['mime'],
@@ -150,14 +150,14 @@ 
 			'posts_per_page' => 1,
 			'meta_key' => '_cover_hash',
 			'meta_value' => $hash
-		) );
-		$exists = reset( $posts );
+		));
+		$exists = reset($posts);
 
-		if ( ! empty( $exists ) ) {
-			update_post_meta( $attachment_id, '_thumbnail_id', $exists );
+		if ( ! empty($exists)) {
+			update_post_meta($attachment_id, '_thumbnail_id', $exists);
 		} else {
 			$ext = '.jpg';
-			switch ( $metadata['image']['mime'] ) {
+			switch ($metadata['image']['mime']) {
 			case 'image/gif':
 				$ext = '.gif';
 				break;
@@ -165,9 +165,9 @@ 
 				$ext = '.png';
 				break;
 			}
-			$basename = str_replace( '.', '-', basename( $file ) ) . '-image' . $ext;
-			$uploaded = wp_upload_bits( $basename, '', $metadata['image']['data'] );
-			if ( false === $uploaded['error'] ) {
+			$basename = str_replace('.', '-', basename($file)).'-image'.$ext;
+			$uploaded = wp_upload_bits($basename, '', $metadata['image']['data']);
+			if (false === $uploaded['error']) {
 				$image_attachment = array(
 					'post_mime_type' => $metadata['image']['mime'],
 					'post_type' => 'attachment',
@@ -182,20 +182,20 @@ 
 				 * @param array $metadata         Current attachment metadata.
 				 * @param array $uploaded         An array containing the thumbnail path and url.
 				 */
-				$image_attachment = apply_filters( 'attachment_thumbnail_args', $image_attachment, $metadata, $uploaded );
+				$image_attachment = apply_filters('attachment_thumbnail_args', $image_attachment, $metadata, $uploaded);
 
-				$sub_attachment_id = wp_insert_attachment( $image_attachment, $uploaded['file'] );
-				add_post_meta( $sub_attachment_id, '_cover_hash', $hash );
-				$attach_data = wp_generate_attachment_metadata( $sub_attachment_id, $uploaded['file'] );
-				wp_update_attachment_metadata( $sub_attachment_id, $attach_data );
-				update_post_meta( $attachment_id, '_thumbnail_id', $sub_attachment_id );
+				$sub_attachment_id = wp_insert_attachment($image_attachment, $uploaded['file']);
+				add_post_meta($sub_attachment_id, '_cover_hash', $hash);
+				$attach_data = wp_generate_attachment_metadata($sub_attachment_id, $uploaded['file']);
+				wp_update_attachment_metadata($sub_attachment_id, $attach_data);
+				update_post_meta($attachment_id, '_thumbnail_id', $sub_attachment_id);
 			}
 		}
 	}
 
 	// Remove the blob of binary data from the array.
-	if ( $metadata ) {
-		unset( $metadata['image']['data'] );
+	if ($metadata) {
+		unset($metadata['image']['data']);
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 	 * @param array $metadata      An array of attachment meta data.
 	 * @param int   $attachment_id Current attachment ID.
 	 */
-	return apply_filters( 'wp_generate_attachment_metadata', $metadata, $attachment_id );
+	return apply_filters('wp_generate_attachment_metadata', $metadata, $attachment_id);
 }
 
 /**
@@ -218,8 +218,8 @@ 
  * @return int|float
  */
 function wp_exif_frac2dec($str) {
-	@list( $n, $d ) = explode( '/', $str );
-	if ( !empty($d) )
+	@list($n, $d) = explode('/', $str);
+	if ( ! empty($d))
 		return $n / $d;
 	return $str;
 }
@@ -233,10 +233,10 @@ 
  * @return int
  */
 function wp_exif_date2ts($str) {
-	@list( $date, $time ) = explode( ' ', trim($str) );
-	@list( $y, $m, $d ) = explode( ':', $date );
+	@list($date, $time) = explode(' ', trim($str));
+	@list($y, $m, $d) = explode(':', $date);
 
-	return strtotime( "{$y}-{$m}-{$d} {$time}" );
+	return strtotime("{$y}-{$m}-{$d} {$time}");
 }
 
 /**
@@ -255,11 +255,11 @@ 
  * @param string $file
  * @return bool|array False on failure. Image metadata array on success.
  */
-function wp_read_image_metadata( $file ) {
-	if ( ! file_exists( $file ) )
+function wp_read_image_metadata($file) {
+	if ( ! file_exists($file))
 		return false;
 
-	list( , , $sourceImageType ) = getimagesize( $file );
+	list(,, $sourceImageType) = getimagesize($file);
 
 	/*
 	 * EXIF contains a bunch of data we'll probably never need formatted in ways
@@ -287,31 +287,31 @@ 
 	 * Read IPTC first, since it might contain data not available in exif such
 	 * as caption, description etc.
 	 */
-	if ( is_callable( 'iptcparse' ) ) {
-		getimagesize( $file, $info );
+	if (is_callable('iptcparse')) {
+		getimagesize($file, $info);
 
-		if ( ! empty( $info['APP13'] ) ) {
-			$iptc = iptcparse( $info['APP13'] );
+		if ( ! empty($info['APP13'])) {
+			$iptc = iptcparse($info['APP13']);
 
 			// Headline, "A brief synopsis of the caption."
-			if ( ! empty( $iptc['2#105'][0] ) ) {
-				$meta['title'] = trim( $iptc['2#105'][0] );
+			if ( ! empty($iptc['2#105'][0])) {
+				$meta['title'] = trim($iptc['2#105'][0]);
 			/*
 			 * Title, "Many use the Title field to store the filename of the image,
 			 * though the field may be used in many ways."
 			 */
-			} elseif ( ! empty( $iptc['2#005'][0] ) ) {
-				$meta['title'] = trim( $iptc['2#005'][0] );
+			} elseif ( ! empty($iptc['2#005'][0])) {
+				$meta['title'] = trim($iptc['2#005'][0]);
 			}
 
-			if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption
-				$caption = trim( $iptc['2#120'][0] );
+			if ( ! empty($iptc['2#120'][0])) { // description / legacy caption
+				$caption = trim($iptc['2#120'][0]);
 
 				mbstring_binary_safe_encoding();
-				$caption_length = strlen( $caption );
+				$caption_length = strlen($caption);
 				reset_mbstring_encoding();
 
-				if ( empty( $meta['title'] ) && $caption_length < 80 ) {
+				if (empty($meta['title']) && $caption_length < 80) {
 					// Assume the title is stored in 2:120 if it's short.
 					$meta['title'] = $caption;
 				}
@@ -319,19 +319,19 @@ 
 				$meta['caption'] = $caption;
 			}
 
-			if ( ! empty( $iptc['2#110'][0] ) ) // credit
-				$meta['credit'] = trim( $iptc['2#110'][0] );
-			elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline
-				$meta['credit'] = trim( $iptc['2#080'][0] );
+			if ( ! empty($iptc['2#110'][0])) // credit
+				$meta['credit'] = trim($iptc['2#110'][0]);
+			elseif ( ! empty($iptc['2#080'][0])) // creator / legacy byline
+				$meta['credit'] = trim($iptc['2#080'][0]);
 
-			if ( ! empty( $iptc['2#055'][0] ) && ! empty( $iptc['2#060'][0] ) ) // created date and time
-				$meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] );
+			if ( ! empty($iptc['2#055'][0]) && ! empty($iptc['2#060'][0])) // created date and time
+				$meta['created_timestamp'] = strtotime($iptc['2#055'][0].' '.$iptc['2#060'][0]);
 
-			if ( ! empty( $iptc['2#116'][0] ) ) // copyright
-				$meta['copyright'] = trim( $iptc['2#116'][0] );
+			if ( ! empty($iptc['2#116'][0])) // copyright
+				$meta['copyright'] = trim($iptc['2#116'][0]);
 
-			if ( ! empty( $iptc['2#025'][0] ) ) { // keywords array
-				$meta['keywords'] = array_values( $iptc['2#025'] );
+			if ( ! empty($iptc['2#025'][0])) { // keywords array
+				$meta['keywords'] = array_values($iptc['2#025']);
 			}
 		 }
 	}
@@ -343,78 +343,78 @@ 
 	 *
 	 * @param array $image_types Image types to check for exif data.
 	 */
-	if ( is_callable( 'exif_read_data' ) && in_array( $sourceImageType, apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) ) ) ) {
-		$exif = @exif_read_data( $file );
+	if (is_callable('exif_read_data') && in_array($sourceImageType, apply_filters('wp_read_image_metadata_types', array(IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM)))) {
+		$exif = @exif_read_data($file);
 
-		if ( ! empty( $exif['ImageDescription'] ) ) {
+		if ( ! empty($exif['ImageDescription'])) {
 			mbstring_binary_safe_encoding();
-			$description_length = strlen( $exif['ImageDescription'] );
+			$description_length = strlen($exif['ImageDescription']);
 			reset_mbstring_encoding();
 
-			if ( empty( $meta['title'] ) && $description_length < 80 ) {
+			if (empty($meta['title']) && $description_length < 80) {
 				// Assume the title is stored in ImageDescription
-				$meta['title'] = trim( $exif['ImageDescription'] );
+				$meta['title'] = trim($exif['ImageDescription']);
 			}
 
-			if ( empty( $meta['caption'] ) && ! empty( $exif['COMPUTED']['UserComment'] ) ) {
-				$meta['caption'] = trim( $exif['COMPUTED']['UserComment'] );
+			if (empty($meta['caption']) && ! empty($exif['COMPUTED']['UserComment'])) {
+				$meta['caption'] = trim($exif['COMPUTED']['UserComment']);
 			}
 
-			if ( empty( $meta['caption'] ) ) {
-				$meta['caption'] = trim( $exif['ImageDescription'] );
+			if (empty($meta['caption'])) {
+				$meta['caption'] = trim($exif['ImageDescription']);
 			}
-		} elseif ( empty( $meta['caption'] ) && ! empty( $exif['Comments'] ) ) {
-			$meta['caption'] = trim( $exif['Comments'] );
+		} elseif (empty($meta['caption']) && ! empty($exif['Comments'])) {
+			$meta['caption'] = trim($exif['Comments']);
 		}
 
-		if ( empty( $meta['credit'] ) ) {
-			if ( ! empty( $exif['Artist'] ) ) {
-				$meta['credit'] = trim( $exif['Artist'] );
-			} elseif ( ! empty($exif['Author'] ) ) {
-				$meta['credit'] = trim( $exif['Author'] );
+		if (empty($meta['credit'])) {
+			if ( ! empty($exif['Artist'])) {
+				$meta['credit'] = trim($exif['Artist']);
+			} elseif ( ! empty($exif['Author'])) {
+				$meta['credit'] = trim($exif['Author']);
 			}
 		}
 
-		if ( empty( $meta['copyright'] ) && ! empty( $exif['Copyright'] ) ) {
-			$meta['copyright'] = trim( $exif['Copyright'] );
+		if (empty($meta['copyright']) && ! empty($exif['Copyright'])) {
+			$meta['copyright'] = trim($exif['Copyright']);
 		}
-		if ( ! empty( $exif['FNumber'] ) ) {
-			$meta['aperture'] = round( wp_exif_frac2dec( $exif['FNumber'] ), 2 );
+		if ( ! empty($exif['FNumber'])) {
+			$meta['aperture'] = round(wp_exif_frac2dec($exif['FNumber']), 2);
 		}
-		if ( ! empty( $exif['Model'] ) ) {
-			$meta['camera'] = trim( $exif['Model'] );
+		if ( ! empty($exif['Model'])) {
+			$meta['camera'] = trim($exif['Model']);
 		}
-		if ( empty( $meta['created_timestamp'] ) && ! empty( $exif['DateTimeDigitized'] ) ) {
-			$meta['created_timestamp'] = wp_exif_date2ts( $exif['DateTimeDigitized'] );
+		if (empty($meta['created_timestamp']) && ! empty($exif['DateTimeDigitized'])) {
+			$meta['created_timestamp'] = wp_exif_date2ts($exif['DateTimeDigitized']);
 		}
-		if ( ! empty( $exif['FocalLength'] ) ) {
-			$meta['focal_length'] = (string) wp_exif_frac2dec( $exif['FocalLength'] );
+		if ( ! empty($exif['FocalLength'])) {
+			$meta['focal_length'] = (string) wp_exif_frac2dec($exif['FocalLength']);
 		}
-		if ( ! empty( $exif['ISOSpeedRatings'] ) ) {
-			$meta['iso'] = is_array( $exif['ISOSpeedRatings'] ) ? reset( $exif['ISOSpeedRatings'] ) : $exif['ISOSpeedRatings'];
-			$meta['iso'] = trim( $meta['iso'] );
+		if ( ! empty($exif['ISOSpeedRatings'])) {
+			$meta['iso'] = is_array($exif['ISOSpeedRatings']) ? reset($exif['ISOSpeedRatings']) : $exif['ISOSpeedRatings'];
+			$meta['iso'] = trim($meta['iso']);
 		}
-		if ( ! empty( $exif['ExposureTime'] ) ) {
-			$meta['shutter_speed'] = (string) wp_exif_frac2dec( $exif['ExposureTime'] );
+		if ( ! empty($exif['ExposureTime'])) {
+			$meta['shutter_speed'] = (string) wp_exif_frac2dec($exif['ExposureTime']);
 		}
-		if ( ! empty( $exif['Orientation'] ) ) {
+		if ( ! empty($exif['Orientation'])) {
 			$meta['orientation'] = $exif['Orientation'];
 		}
 	}
 
-	foreach ( array( 'title', 'caption', 'credit', 'copyright', 'camera', 'iso' ) as $key ) {
-		if ( $meta[ $key ] && ! seems_utf8( $meta[ $key ] ) ) {
-			$meta[ $key ] = utf8_encode( $meta[ $key ] );
+	foreach (array('title', 'caption', 'credit', 'copyright', 'camera', 'iso') as $key) {
+		if ($meta[$key] && ! seems_utf8($meta[$key])) {
+			$meta[$key] = utf8_encode($meta[$key]);
 		}
 	}
 
-	foreach ( $meta['keywords'] as $key => $keyword ) {
-		if ( ! seems_utf8( $keyword ) ) {
-			$meta['keywords'][ $key ] = utf8_encode( $keyword );
+	foreach ($meta['keywords'] as $key => $keyword) {
+		if ( ! seems_utf8($keyword)) {
+			$meta['keywords'][$key] = utf8_encode($keyword);
 		}
 	}
 
-	$meta = wp_kses_post_deep( $meta );
+	$meta = wp_kses_post_deep($meta);
 
 	/**
 	 * Filter the array of meta data read from an image's exif data.
@@ -427,7 +427,7 @@ 
 	 * @param int    $sourceImageType Type of image.
 	 * @param array  $iptc            IPTC data.
 	 */
-	return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType, $iptc );
+	return apply_filters('wp_read_image_metadata', $meta, $file, $sourceImageType, $iptc);
 
 }
 
@@ -441,7 +441,7 @@ 
  */
 function file_is_valid_image($path) {
 	$size = @getimagesize($path);
-	return !empty($size);
+	return ! empty($size);
 }
 
 /**
@@ -453,12 +453,12 @@ 
  * @return bool True if suitable, false if not suitable.
  */
 function file_is_displayable_image($path) {
-	$displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP );
+	$displayable_image_types = array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP);
 
-	$info = @getimagesize( $path );
-	if ( empty( $info ) ) {
+	$info = @getimagesize($path);
+	if (empty($info)) {
 		$result = false;
-	} elseif ( ! in_array( $info[2], $displayable_image_types ) ) {
+	} elseif ( ! in_array($info[2], $displayable_image_types)) {
 		$result = false;
 	} else {
 		$result = true;
@@ -472,7 +472,7 @@ 
 	 * @param bool   $result Whether the image can be displayed. Default true.
 	 * @param string $path   Path to the image.
 	 */
-	return apply_filters( 'file_is_displayable_image', $result, $path );
+	return apply_filters('file_is_displayable_image', $result, $path);
 }
 
 /**
@@ -485,12 +485,12 @@ 
  * @param string $size Optional. Image size, defaults to 'full'.
  * @return resource|false The resulting image resource on success, false on failure.
  */
-function load_image_to_edit( $attachment_id, $mime_type, $size = 'full' ) {
-	$filepath = _load_image_to_edit_path( $attachment_id, $size );
-	if ( empty( $filepath ) )
+function load_image_to_edit($attachment_id, $mime_type, $size = 'full') {
+	$filepath = _load_image_to_edit_path($attachment_id, $size);
+	if (empty($filepath))
 		return false;
 
-	switch ( $mime_type ) {
+	switch ($mime_type) {
 		case 'image/jpeg':
 			$image = imagecreatefromjpeg($filepath);
 			break;
@@ -504,7 +504,7 @@ 
 			$image = false;
 			break;
 	}
-	if ( is_resource($image) ) {
+	if (is_resource($image)) {
 		/**
 		 * Filter the current image being loaded for editing.
 		 *
@@ -514,8 +514,8 @@ 
 		 * @param string   $attachment_id Attachment ID.
 		 * @param string   $size          Image size.
 		 */
-		$image = apply_filters( 'load_image_to_edit', $image, $attachment_id, $size );
-		if ( function_exists('imagealphablending') && function_exists('imagesavealpha') ) {
+		$image = apply_filters('load_image_to_edit', $image, $attachment_id, $size);
+		if (function_exists('imagealphablending') && function_exists('imagesavealpha')) {
 			imagealphablending($image, false);
 			imagesavealpha($image, true);
 		}
@@ -536,11 +536,11 @@ 
  * @param string $size Optional. Image size, defaults to 'full'.
  * @return string|false File path or url on success, false on failure.
  */
-function _load_image_to_edit_path( $attachment_id, $size = 'full' ) {
-	$filepath = get_attached_file( $attachment_id );
+function _load_image_to_edit_path($attachment_id, $size = 'full') {
+	$filepath = get_attached_file($attachment_id);
 
-	if ( $filepath && file_exists( $filepath ) ) {
-		if ( 'full' != $size && ( $data = image_get_intermediate_size( $attachment_id, $size ) ) ) {
+	if ($filepath && file_exists($filepath)) {
+		if ('full' != $size && ($data = image_get_intermediate_size($attachment_id, $size))) {
 			/**
 			 * Filter the path to the current image.
 			 *
@@ -552,9 +552,9 @@ 
 			 * @param string $attachment_id Attachment ID.
 			 * @param string $size          Size of the image.
 			 */
-			$filepath = apply_filters( 'load_image_to_edit_filesystempath', path_join( dirname( $filepath ), $data['file'] ), $attachment_id, $size );
+			$filepath = apply_filters('load_image_to_edit_filesystempath', path_join(dirname($filepath), $data['file']), $attachment_id, $size);
 		}
-	} elseif ( function_exists( 'fopen' ) && function_exists( 'ini_get' ) && true == ini_get( 'allow_url_fopen' ) ) {
+	} elseif (function_exists('fopen') && function_exists('ini_get') && true == ini_get('allow_url_fopen')) {
 		/**
 		 * Filter the image URL if not in the local filesystem.
 		 *
@@ -566,7 +566,7 @@ 
 		 * @param string $attachment_id Attachment ID.
 		 * @param string $size          Size of the image.
 		 */
-		$filepath = apply_filters( 'load_image_to_edit_attachmenturl', wp_get_attachment_url( $attachment_id ), $attachment_id, $size );
+		$filepath = apply_filters('load_image_to_edit_attachmenturl', wp_get_attachment_url($attachment_id), $attachment_id, $size);
 	}
 
 	/**
@@ -578,7 +578,7 @@ 
 	 * @param string      $attachment_id Attachment ID.
 	 * @param string      $size          Size of the image.
 	 */
-	return apply_filters( 'load_image_to_edit_path', $filepath, $attachment_id, $size );
+	return apply_filters('load_image_to_edit_path', $filepath, $attachment_id, $size);
 }
 
 /**
@@ -590,22 +590,22 @@ 
  * @param string $attachment_id Attachment ID.
  * @return string|false New file path on success, false on failure.
  */
-function _copy_image_file( $attachment_id ) {
-	$dst_file = $src_file = get_attached_file( $attachment_id );
-	if ( ! file_exists( $src_file ) )
-		$src_file = _load_image_to_edit_path( $attachment_id );
+function _copy_image_file($attachment_id) {
+	$dst_file = $src_file = get_attached_file($attachment_id);
+	if ( ! file_exists($src_file))
+		$src_file = _load_image_to_edit_path($attachment_id);
 
-	if ( $src_file ) {
-		$dst_file = str_replace( basename( $dst_file ), 'copy-' . basename( $dst_file ), $dst_file );
-		$dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
+	if ($src_file) {
+		$dst_file = str_replace(basename($dst_file), 'copy-'.basename($dst_file), $dst_file);
+		$dst_file = dirname($dst_file).'/'.wp_unique_filename(dirname($dst_file), basename($dst_file));
 
 		/*
 		 * The directory containing the original file may no longer
 		 * exist when using a replication plugin.
 		 */
-		wp_mkdir_p( dirname( $dst_file ) );
+		wp_mkdir_p(dirname($dst_file));
 
-		if ( ! @copy( $src_file, $dst_file ) )
+		if ( ! @copy($src_file, $dst_file))
 			$dst_file = false;
 	} else {
 		$dst_file = false;

src/wp-admin/includes/post.php

Doc Comments +1 added lines, -1 removed lines

@@ -1372,7 +1372,7 @@
  * @global array $_wp_additional_image_sizes
  *
  * @param int $thumbnail_id ID of the attachment used for thumbnail
- * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post.
+ * @param integer $post The post ID or object associated with the thumbnail, defaults to global $post.
  * @return string html
  */
 function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {

Spacing +507 added lines, -507 removed lines

@@ -18,151 +18,151 @@ 
  * @param array $post_data Array of post data. Defaults to the contents of $_POST.
  * @return object|bool WP_Error on failure, true on success.
  */
-function _wp_translate_postdata( $update = false, $post_data = null ) {
+function _wp_translate_postdata($update = false, $post_data = null) {
 
-	if ( empty($post_data) )
+	if (empty($post_data))
 		$post_data = &$_POST;
 
-	if ( $update )
+	if ($update)
 		$post_data['ID'] = (int) $post_data['post_ID'];
 
-	$ptype = get_post_type_object( $post_data['post_type'] );
+	$ptype = get_post_type_object($post_data['post_type']);
 
-	if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+	if ($update && ! current_user_can('edit_post', $post_data['ID'])) {
+		if ('page' == $post_data['post_type'])
+			return new WP_Error('edit_others_pages', __('You are not allowed to edit pages as this user.'));
 		else
-			return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
-	} elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+			return new WP_Error('edit_others_posts', __('You are not allowed to edit posts as this user.'));
+	} elseif ( ! $update && ! current_user_can($ptype->cap->create_posts)) {
+		if ('page' == $post_data['post_type'])
+			return new WP_Error('edit_others_pages', __('You are not allowed to create pages as this user.'));
 		else
-			return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+			return new WP_Error('edit_others_posts', __('You are not allowed to create posts as this user.'));
 	}
 
-	if ( isset( $post_data['content'] ) )
+	if (isset($post_data['content']))
 		$post_data['post_content'] = $post_data['content'];
 
-	if ( isset( $post_data['excerpt'] ) )
+	if (isset($post_data['excerpt']))
 		$post_data['post_excerpt'] = $post_data['excerpt'];
 
-	if ( isset( $post_data['parent_id'] ) )
+	if (isset($post_data['parent_id']))
 		$post_data['post_parent'] = (int) $post_data['parent_id'];
 
-	if ( isset($post_data['trackback_url']) )
+	if (isset($post_data['trackback_url']))
 		$post_data['to_ping'] = $post_data['trackback_url'];
 
 	$post_data['user_ID'] = get_current_user_id();
 
-	if (!empty ( $post_data['post_author_override'] ) ) {
+	if ( ! empty ($post_data['post_author_override'])) {
 		$post_data['post_author'] = (int) $post_data['post_author_override'];
 	} else {
-		if (!empty ( $post_data['post_author'] ) ) {
+		if ( ! empty ($post_data['post_author'])) {
 			$post_data['post_author'] = (int) $post_data['post_author'];
 		} else {
 			$post_data['post_author'] = (int) $post_data['user_ID'];
 		}
 	}
 
-	if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
-		 && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
-		if ( $update ) {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+	if (isset($post_data['user_ID']) && ($post_data['post_author'] != $post_data['user_ID'])
+		 && ! current_user_can($ptype->cap->edit_others_posts)) {
+		if ($update) {
+			if ('page' == $post_data['post_type'])
+				return new WP_Error('edit_others_pages', __('You are not allowed to edit pages as this user.'));
 			else
-				return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+				return new WP_Error('edit_others_posts', __('You are not allowed to edit posts as this user.'));
 		} else {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+			if ('page' == $post_data['post_type'])
+				return new WP_Error('edit_others_pages', __('You are not allowed to create pages as this user.'));
 			else
-				return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+				return new WP_Error('edit_others_posts', __('You are not allowed to create posts as this user.'));
 		}
 	}
 
-	if ( ! empty( $post_data['post_status'] ) ) {
-		$post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+	if ( ! empty($post_data['post_status'])) {
+		$post_data['post_status'] = sanitize_key($post_data['post_status']);
 
 		// No longer an auto-draft
-		if ( 'auto-draft' === $post_data['post_status'] ) {
+		if ('auto-draft' === $post_data['post_status']) {
 			$post_data['post_status'] = 'draft';
 		}
 
-		if ( ! get_post_status_object( $post_data['post_status'] ) ) {
-			unset( $post_data['post_status'] );
+		if ( ! get_post_status_object($post_data['post_status'])) {
+			unset($post_data['post_status']);
 		}
 	}
 
 	// What to do based on which button they pressed
-	if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] )
+	if (isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'])
 		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] )
+	if (isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'])
 		$post_data['post_status'] = 'private';
-	if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( !isset($post_data['post_status']) || $post_data['post_status'] != 'private' ) )
+	if (isset($post_data['publish']) && ('' != $post_data['publish']) && ( ! isset($post_data['post_status']) || $post_data['post_status'] != 'private'))
 		$post_data['post_status'] = 'publish';
-	if ( isset($post_data['advanced']) && '' != $post_data['advanced'] )
+	if (isset($post_data['advanced']) && '' != $post_data['advanced'])
 		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['pending']) && '' != $post_data['pending'] )
+	if (isset($post_data['pending']) && '' != $post_data['pending'])
 		$post_data['post_status'] = 'pending';
 
-	if ( isset( $post_data['ID'] ) )
+	if (isset($post_data['ID']))
 		$post_id = $post_data['ID'];
 	else
 		$post_id = false;
-	$previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false;
+	$previous_status = $post_id ? get_post_field('post_status', $post_id) : false;
 
-	if ( isset( $post_data['post_status'] ) && 'private' == $post_data['post_status'] && ! current_user_can( $ptype->cap->publish_posts ) ) {
+	if (isset($post_data['post_status']) && 'private' == $post_data['post_status'] && ! current_user_can($ptype->cap->publish_posts)) {
 		$post_data['post_status'] = $previous_status ? $previous_status : 'pending';
 	}
 
-	$published_statuses = array( 'publish', 'future' );
+	$published_statuses = array('publish', 'future');
 
 	// Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
 	// Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
-	if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) )
-		if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) )
+	if (isset($post_data['post_status']) && (in_array($post_data['post_status'], $published_statuses) && ! current_user_can($ptype->cap->publish_posts)))
+		if ( ! in_array($previous_status, $published_statuses) || ! current_user_can('edit_post', $post_id))
 			$post_data['post_status'] = 'pending';
 
-	if ( ! isset( $post_data['post_status'] ) ) {
+	if ( ! isset($post_data['post_status'])) {
 		$post_data['post_status'] = 'auto-draft' === $previous_status ? 'draft' : $previous_status;
 	}
 
-	if ( isset( $post_data['post_password'] ) && ! current_user_can( $ptype->cap->publish_posts ) ) {
-		unset( $post_data['post_password'] );
+	if (isset($post_data['post_password']) && ! current_user_can($ptype->cap->publish_posts)) {
+		unset($post_data['post_password']);
 	}
 
-	if (!isset( $post_data['comment_status'] ))
+	if ( ! isset($post_data['comment_status']))
 		$post_data['comment_status'] = 'closed';
 
-	if (!isset( $post_data['ping_status'] ))
+	if ( ! isset($post_data['ping_status']))
 		$post_data['ping_status'] = 'closed';
 
-	foreach ( array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
-		if ( !empty( $post_data['hidden_' . $timeunit] ) && $post_data['hidden_' . $timeunit] != $post_data[$timeunit] ) {
+	foreach (array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit) {
+		if ( ! empty($post_data['hidden_'.$timeunit]) && $post_data['hidden_'.$timeunit] != $post_data[$timeunit]) {
 			$post_data['edit_date'] = '1';
 			break;
 		}
 	}
 
-	if ( !empty( $post_data['edit_date'] ) ) {
+	if ( ! empty($post_data['edit_date'])) {
 		$aa = $post_data['aa'];
 		$mm = $post_data['mm'];
 		$jj = $post_data['jj'];
 		$hh = $post_data['hh'];
 		$mn = $post_data['mn'];
 		$ss = $post_data['ss'];
-		$aa = ($aa <= 0 ) ? date('Y') : $aa;
-		$mm = ($mm <= 0 ) ? date('n') : $mm;
-		$jj = ($jj > 31 ) ? 31 : $jj;
-		$jj = ($jj <= 0 ) ? date('j') : $jj;
-		$hh = ($hh > 23 ) ? $hh -24 : $hh;
-		$mn = ($mn > 59 ) ? $mn -60 : $mn;
-		$ss = ($ss > 59 ) ? $ss -60 : $ss;
-		$post_data['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
-		$valid_date = wp_checkdate( $mm, $jj, $aa, $post_data['post_date'] );
-		if ( !$valid_date ) {
-			return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) );
+		$aa = ($aa <= 0) ? date('Y') : $aa;
+		$mm = ($mm <= 0) ? date('n') : $mm;
+		$jj = ($jj > 31) ? 31 : $jj;
+		$jj = ($jj <= 0) ? date('j') : $jj;
+		$hh = ($hh > 23) ? $hh - 24 : $hh;
+		$mn = ($mn > 59) ? $mn - 60 : $mn;
+		$ss = ($ss > 59) ? $ss - 60 : $ss;
+		$post_data['post_date'] = sprintf("%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss);
+		$valid_date = wp_checkdate($mm, $jj, $aa, $post_data['post_date']);
+		if ( ! $valid_date) {
+			return new WP_Error('invalid_date', __('Whoops, the provided date is invalid.'));
 		}
-		$post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
+		$post_data['post_date_gmt'] = get_gmt_from_date($post_data['post_date']);
 	}
 
 	return $post_data;
@@ -178,149 +178,149 @@ 
  * @param array $post_data Optional.
  * @return int Post ID.
  */
-function edit_post( $post_data = null ) {
+function edit_post($post_data = null) {
 	global $wpdb;
 
-	if ( empty($post_data) )
+	if (empty($post_data))
 		$post_data = &$_POST;
 
 	// Clear out any data in internal vars.
-	unset( $post_data['filter'] );
+	unset($post_data['filter']);
 
 	$post_ID = (int) $post_data['post_ID'];
-	$post = get_post( $post_ID );
+	$post = get_post($post_ID);
 	$post_data['post_type'] = $post->post_type;
 	$post_data['post_mime_type'] = $post->post_mime_type;
 
-	if ( ! empty( $post_data['post_status'] ) ) {
-		$post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+	if ( ! empty($post_data['post_status'])) {
+		$post_data['post_status'] = sanitize_key($post_data['post_status']);
 
-		if ( 'inherit' == $post_data['post_status'] ) {
-			unset( $post_data['post_status'] );
+		if ('inherit' == $post_data['post_status']) {
+			unset($post_data['post_status']);
 		}
 	}
 
 	$ptype = get_post_type_object($post_data['post_type']);
-	if ( !current_user_can( 'edit_post', $post_ID ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			wp_die( __('You are not allowed to edit this page.' ));
+	if ( ! current_user_can('edit_post', $post_ID)) {
+		if ('page' == $post_data['post_type'])
+			wp_die(__('You are not allowed to edit this page.'));
 		else
-			wp_die( __('You are not allowed to edit this post.' ));
+			wp_die(__('You are not allowed to edit this post.'));
 	}
 
-	if ( post_type_supports( $ptype->name, 'revisions' ) ) {
-		$revisions = wp_get_post_revisions( $post_ID, array( 'order' => 'ASC', 'posts_per_page' => 1 ) );
-		$revision = current( $revisions );
+	if (post_type_supports($ptype->name, 'revisions')) {
+		$revisions = wp_get_post_revisions($post_ID, array('order' => 'ASC', 'posts_per_page' => 1));
+		$revision = current($revisions);
 
 		// Check if the revisions have been upgraded
-		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 )
-			_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+		if ($revisions && _wp_get_post_revision_version($revision) < 1)
+			_wp_upgrade_revisions_of_post($post, wp_get_post_revisions($post_ID));
 	}
 
-	if ( isset($post_data['visibility']) ) {
-		switch ( $post_data['visibility'] ) {
+	if (isset($post_data['visibility'])) {
+		switch ($post_data['visibility']) {
 			case 'public' :
 				$post_data['post_password'] = '';
 				break;
 			case 'password' :
-				unset( $post_data['sticky'] );
+				unset($post_data['sticky']);
 				break;
 			case 'private' :
 				$post_data['post_status'] = 'private';
 				$post_data['post_password'] = '';
-				unset( $post_data['sticky'] );
+				unset($post_data['sticky']);
 				break;
 		}
 	}
 
-	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error($post_data) )
-		wp_die( $post_data->get_error_message() );
+	$post_data = _wp_translate_postdata(true, $post_data);
+	if (is_wp_error($post_data))
+		wp_die($post_data->get_error_message());
 
 	// Post Formats
-	if ( isset( $post_data['post_format'] ) )
-		set_post_format( $post_ID, $post_data['post_format'] );
+	if (isset($post_data['post_format']))
+		set_post_format($post_ID, $post_data['post_format']);
 
-	$format_meta_urls = array( 'url', 'link_url', 'quote_source_url' );
-	foreach ( $format_meta_urls as $format_meta_url ) {
-		$keyed = '_format_' . $format_meta_url;
-		if ( isset( $post_data[ $keyed ] ) )
-			update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
+	$format_meta_urls = array('url', 'link_url', 'quote_source_url');
+	foreach ($format_meta_urls as $format_meta_url) {
+		$keyed = '_format_'.$format_meta_url;
+		if (isset($post_data[$keyed]))
+			update_post_meta($post_ID, $keyed, wp_slash(esc_url_raw(wp_unslash($post_data[$keyed]))));
 	}
 
-	$format_keys = array( 'quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed' );
+	$format_keys = array('quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed');
 
-	foreach ( $format_keys as $key ) {
-		$keyed = '_format_' . $key;
-		if ( isset( $post_data[ $keyed ] ) ) {
-			if ( current_user_can( 'unfiltered_html' ) )
-				update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
+	foreach ($format_keys as $key) {
+		$keyed = '_format_'.$key;
+		if (isset($post_data[$keyed])) {
+			if (current_user_can('unfiltered_html'))
+				update_post_meta($post_ID, $keyed, $post_data[$keyed]);
 			else
-				update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+				update_post_meta($post_ID, $keyed, wp_filter_post_kses($post_data[$keyed]));
 		}
 	}
 
-	if ( 'attachment' === $post_data['post_type'] && preg_match( '#^(audio|video)/#', $post_data['post_mime_type'] ) ) {
-		$id3data = wp_get_attachment_metadata( $post_ID );
-		if ( ! is_array( $id3data ) ) {
+	if ('attachment' === $post_data['post_type'] && preg_match('#^(audio|video)/#', $post_data['post_mime_type'])) {
+		$id3data = wp_get_attachment_metadata($post_ID);
+		if ( ! is_array($id3data)) {
 			$id3data = array();
 		}
 
-		foreach ( wp_get_attachment_id3_keys( $post, 'edit' ) as $key => $label ) {
-			if ( isset( $post_data[ 'id3_' . $key ] ) ) {
-				$id3data[ $key ] = sanitize_text_field( wp_unslash( $post_data[ 'id3_' . $key ] ) );
+		foreach (wp_get_attachment_id3_keys($post, 'edit') as $key => $label) {
+			if (isset($post_data['id3_'.$key])) {
+				$id3data[$key] = sanitize_text_field(wp_unslash($post_data['id3_'.$key]));
 			}
 		}
-		wp_update_attachment_metadata( $post_ID, $id3data );
+		wp_update_attachment_metadata($post_ID, $id3data);
 	}
 
 	// Meta Stuff
-	if ( isset($post_data['meta']) && $post_data['meta'] ) {
-		foreach ( $post_data['meta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
+	if (isset($post_data['meta']) && $post_data['meta']) {
+		foreach ($post_data['meta'] as $key => $value) {
+			if ( ! $meta = get_post_meta_by_id($key))
 				continue;
-			if ( $meta->post_id != $post_ID )
+			if ($meta->post_id != $post_ID)
 				continue;
-			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) )
+			if (is_protected_meta($value['key'], 'post') || ! current_user_can('edit_post_meta', $post_ID, $value['key']))
 				continue;
-			update_meta( $key, $value['key'], $value['value'] );
+			update_meta($key, $value['key'], $value['value']);
 		}
 	}
 
-	if ( isset($post_data['deletemeta']) && $post_data['deletemeta'] ) {
-		foreach ( $post_data['deletemeta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
+	if (isset($post_data['deletemeta']) && $post_data['deletemeta']) {
+		foreach ($post_data['deletemeta'] as $key => $value) {
+			if ( ! $meta = get_post_meta_by_id($key))
 				continue;
-			if ( $meta->post_id != $post_ID )
+			if ($meta->post_id != $post_ID)
 				continue;
-			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) )
+			if (is_protected_meta($meta->meta_key, 'post') || ! current_user_can('delete_post_meta', $post_ID, $meta->meta_key))
 				continue;
-			delete_meta( $key );
+			delete_meta($key);
 		}
 	}
 
 	// Attachment stuff
-	if ( 'attachment' == $post_data['post_type'] ) {
-		if ( isset( $post_data[ '_wp_attachment_image_alt' ] ) ) {
-			$image_alt = wp_unslash( $post_data['_wp_attachment_image_alt'] );
-			if ( $image_alt != get_post_meta( $post_ID, '_wp_attachment_image_alt', true ) ) {
-				$image_alt = wp_strip_all_tags( $image_alt, true );
+	if ('attachment' == $post_data['post_type']) {
+		if (isset($post_data['_wp_attachment_image_alt'])) {
+			$image_alt = wp_unslash($post_data['_wp_attachment_image_alt']);
+			if ($image_alt != get_post_meta($post_ID, '_wp_attachment_image_alt', true)) {
+				$image_alt = wp_strip_all_tags($image_alt, true);
 				// update_meta expects slashed.
-				update_post_meta( $post_ID, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
+				update_post_meta($post_ID, '_wp_attachment_image_alt', wp_slash($image_alt));
 			}
 		}
 
-		$attachment_data = isset( $post_data['attachments'][ $post_ID ] ) ? $post_data['attachments'][ $post_ID ] : array();
+		$attachment_data = isset($post_data['attachments'][$post_ID]) ? $post_data['attachments'][$post_ID] : array();
 
 		/** This filter is documented in wp-admin/includes/media.php */
-		$post_data = apply_filters( 'attachment_fields_to_save', $post_data, $attachment_data );
+		$post_data = apply_filters('attachment_fields_to_save', $post_data, $attachment_data);
 	}
 
 	// Convert taxonomy input to term IDs, to avoid ambiguity.
-	if ( isset( $post_data['tax_input'] ) ) {
-		foreach ( (array) $post_data['tax_input'] as $taxonomy => $terms ) {
+	if (isset($post_data['tax_input'])) {
+		foreach ((array) $post_data['tax_input'] as $taxonomy => $terms) {
 			// Hierarchical taxonomy data is already sent as term IDs, so no conversion is necessary.
-			if ( is_taxonomy_hierarchical( $taxonomy ) ) {
+			if (is_taxonomy_hierarchical($taxonomy)) {
 				continue;
 			}
 
@@ -329,67 +329,67 @@ 
 			 * Some languages may use a character other than a comma as a delimiter, so we standardize on
 			 * commas before parsing the list.
 			 */
-			if ( ! is_array( $terms ) ) {
-				$comma = _x( ',', 'tag delimiter' );
-				if ( ',' !== $comma ) {
-					$terms = str_replace( $comma, ',', $terms );
+			if ( ! is_array($terms)) {
+				$comma = _x(',', 'tag delimiter');
+				if (',' !== $comma) {
+					$terms = str_replace($comma, ',', $terms);
 				}
-				$terms = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
+				$terms = explode(',', trim($terms, " \n\t\r\0\x0B,"));
 			}
 
 			$clean_terms = array();
-			foreach ( $terms as $term ) {
+			foreach ($terms as $term) {
 				// Empty terms are invalid input.
-				if ( empty( $term ) ) {
+				if (empty($term)) {
 					continue;
 				}
 
-				$_term = get_terms( $taxonomy, array(
+				$_term = get_terms($taxonomy, array(
 					'name' => $term,
 					'fields' => 'ids',
 					'hide_empty' => false,
-				) );
+				));
 
-				if ( ! empty( $_term ) ) {
-					$clean_terms[] = intval( $_term[0] );
+				if ( ! empty($_term)) {
+					$clean_terms[] = intval($_term[0]);
 				} else {
 					// No existing term was found, so pass the string. A new term will be created.
 					$clean_terms[] = $term;
 				}
 			}
 
-			$post_data['tax_input'][ $taxonomy ] = $clean_terms;
+			$post_data['tax_input'][$taxonomy] = $clean_terms;
 		}
 	}
 
-	add_meta( $post_ID );
+	add_meta($post_ID);
 
-	update_post_meta( $post_ID, '_edit_last', get_current_user_id() );
+	update_post_meta($post_ID, '_edit_last', get_current_user_id());
 
-	$success = wp_update_post( $post_data );
+	$success = wp_update_post($post_data);
 	// If the save failed, see if we can sanity check the main fields and try again
-	if ( ! $success && is_callable( array( $wpdb, 'strip_invalid_text_for_column' ) ) ) {
-		$fields = array( 'post_title', 'post_content', 'post_excerpt' );
+	if ( ! $success && is_callable(array($wpdb, 'strip_invalid_text_for_column'))) {
+		$fields = array('post_title', 'post_content', 'post_excerpt');
 
-		foreach ( $fields as $field ) {
-			if ( isset( $post_data[ $field ] ) ) {
-				$post_data[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->posts, $field, $post_data[ $field ] );
+		foreach ($fields as $field) {
+			if (isset($post_data[$field])) {
+				$post_data[$field] = $wpdb->strip_invalid_text_for_column($wpdb->posts, $field, $post_data[$field]);
 			}
 		}
 
-		wp_update_post( $post_data );
+		wp_update_post($post_data);
 	}
 
 	// Now that we have an ID we can fix any attachment anchor hrefs
-	_fix_attachment_links( $post_ID );
+	_fix_attachment_links($post_ID);
 
-	wp_set_post_lock( $post_ID );
+	wp_set_post_lock($post_ID);
 
-	if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) {
-		if ( ! empty( $post_data['sticky'] ) )
-			stick_post( $post_ID );
+	if (current_user_can($ptype->cap->edit_others_posts) && current_user_can($ptype->cap->publish_posts)) {
+		if ( ! empty($post_data['sticky']))
+			stick_post($post_ID);
 		else
-			unstick_post( $post_ID );
+			unstick_post($post_ID);
 	}
 
 	return $post_ID;
@@ -408,22 +408,22 @@ 
  * @param array $post_data Optional, the array of post data to process if not provided will use $_POST superglobal.
  * @return array
  */
-function bulk_edit_posts( $post_data = null ) {
+function bulk_edit_posts($post_data = null) {
 	global $wpdb;
 
-	if ( empty($post_data) )
+	if (empty($post_data))
 		$post_data = &$_POST;
 
-	if ( isset($post_data['post_type']) )
+	if (isset($post_data['post_type']))
 		$ptype = get_post_type_object($post_data['post_type']);
 	else
 		$ptype = get_post_type_object('post');
 
-	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			wp_die( __('You are not allowed to edit pages.'));
+	if ( ! current_user_can($ptype->cap->edit_posts)) {
+		if ('page' == $ptype->name)
+			wp_die(__('You are not allowed to edit pages.'));
 		else
-			wp_die( __('You are not allowed to edit posts.'));
+			wp_die(__('You are not allowed to edit posts.'));
 	}
 
 	if ( -1 == $post_data['_status'] ) {
@@ -434,15 +434,15 @@ 
 	}
 	unset($post_data['_status']);
 
-	if ( ! empty( $post_data['post_status'] ) ) {
-		$post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+	if ( ! empty($post_data['post_status'])) {
+		$post_data['post_status'] = sanitize_key($post_data['post_status']);
 
-		if ( 'inherit' == $post_data['post_status'] ) {
-			unset( $post_data['post_status'] );
+		if ('inherit' == $post_data['post_status']) {
+			unset($post_data['post_status']);
 		}
 	}
 
-	$post_IDs = array_map( 'intval', (array) $post_data['post'] );
+	$post_IDs = array_map('intval', (array) $post_data['post']);
 
 	$reset = array(
 		'post_author', 'post_status', 'post_password',
@@ -451,43 +451,43 @@ 
 		'post_category', 'sticky', 'post_format',
 	);
 
-	foreach ( $reset as $field ) {
-		if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) )
+	foreach ($reset as $field) {
+		if (isset($post_data[$field]) && ('' == $post_data[$field] || -1 == $post_data[$field]))
 			unset($post_data[$field]);
 	}
 
-	if ( isset($post_data['post_category']) ) {
-		if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) )
-			$new_cats = array_map( 'absint', $post_data['post_category'] );
+	if (isset($post_data['post_category'])) {
+		if (is_array($post_data['post_category']) && ! empty($post_data['post_category']))
+			$new_cats = array_map('absint', $post_data['post_category']);
 		else
 			unset($post_data['post_category']);
 	}
 
 	$tax_input = array();
-	if ( isset($post_data['tax_input'])) {
-		foreach ( $post_data['tax_input'] as $tax_name => $terms ) {
-			if ( empty($terms) )
+	if (isset($post_data['tax_input'])) {
+		foreach ($post_data['tax_input'] as $tax_name => $terms) {
+			if (empty($terms))
 				continue;
-			if ( is_taxonomy_hierarchical( $tax_name ) ) {
-				$tax_input[ $tax_name ] = array_map( 'absint', $terms );
+			if (is_taxonomy_hierarchical($tax_name)) {
+				$tax_input[$tax_name] = array_map('absint', $terms);
 			} else {
-				$comma = _x( ',', 'tag delimiter' );
-				if ( ',' !== $comma )
-					$terms = str_replace( $comma, ',', $terms );
-				$tax_input[ $tax_name ] = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
+				$comma = _x(',', 'tag delimiter');
+				if (',' !== $comma)
+					$terms = str_replace($comma, ',', $terms);
+				$tax_input[$tax_name] = explode(',', trim($terms, " \n\t\r\0\x0B,"));
 			}
 		}
 	}
 
-	if ( isset($post_data['post_parent']) && ($parent = (int) $post_data['post_parent']) ) {
+	if (isset($post_data['post_parent']) && ($parent = (int) $post_data['post_parent'])) {
 		$pages = $wpdb->get_results("SELECT ID, post_parent FROM $wpdb->posts WHERE post_type = 'page'");
 		$children = array();
 
-		for ( $i = 0; $i < 50 && $parent > 0; $i++ ) {
+		for ($i = 0; $i < 50 && $parent > 0; $i++) {
 			$children[] = $parent;
 
-			foreach ( $pages as $page ) {
-				if ( $page->ID == $parent ) {
+			foreach ($pages as $page) {
+				if ($page->ID == $parent) {
 					$parent = $page->post_parent;
 					break;
 				}
@@ -498,78 +498,78 @@ 
 	$updated = $skipped = $locked = array();
 	$shared_post_data = $post_data;
 
-	foreach ( $post_IDs as $post_ID ) {
+	foreach ($post_IDs as $post_ID) {
 		// Start with fresh post data with each iteration.
 		$post_data = $shared_post_data;
 
-		$post_type_object = get_post_type_object( get_post_type( $post_ID ) );
+		$post_type_object = get_post_type_object(get_post_type($post_ID));
 
-		if ( !isset( $post_type_object ) || ( isset($children) && in_array($post_ID, $children) ) || !current_user_can( 'edit_post', $post_ID ) ) {
+		if ( ! isset($post_type_object) || (isset($children) && in_array($post_ID, $children)) || ! current_user_can('edit_post', $post_ID)) {
 			$skipped[] = $post_ID;
 			continue;
 		}
 
-		if ( wp_check_post_lock( $post_ID ) ) {
+		if (wp_check_post_lock($post_ID)) {
 			$locked[] = $post_ID;
 			continue;
 		}
 
-		$post = get_post( $post_ID );
-		$tax_names = get_object_taxonomies( $post );
-		foreach ( $tax_names as $tax_name ) {
+		$post = get_post($post_ID);
+		$tax_names = get_object_taxonomies($post);
+		foreach ($tax_names as $tax_name) {
 			$taxonomy_obj = get_taxonomy($tax_name);
-			if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
+			if (isset($tax_input[$tax_name]) && current_user_can($taxonomy_obj->cap->assign_terms))
 				$new_terms = $tax_input[$tax_name];
 			else
 				$new_terms = array();
 
-			if ( $taxonomy_obj->hierarchical )
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
+			if ($taxonomy_obj->hierarchical)
+				$current_terms = (array) wp_get_object_terms($post_ID, $tax_name, array('fields' => 'ids'));
 			else
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
+				$current_terms = (array) wp_get_object_terms($post_ID, $tax_name, array('fields' => 'names'));
 
-			$post_data['tax_input'][$tax_name] = array_merge( $current_terms, $new_terms );
+			$post_data['tax_input'][$tax_name] = array_merge($current_terms, $new_terms);
 		}
 
-		if ( isset($new_cats) && in_array( 'category', $tax_names ) ) {
+		if (isset($new_cats) && in_array('category', $tax_names)) {
 			$cats = (array) wp_get_post_categories($post_ID);
-			$post_data['post_category'] = array_unique( array_merge($cats, $new_cats) );
-			unset( $post_data['tax_input']['category'] );
+			$post_data['post_category'] = array_unique(array_merge($cats, $new_cats));
+			unset($post_data['tax_input']['category']);
 		}
 
 		$post_data['post_type'] = $post->post_type;
 		$post_data['post_mime_type'] = $post->post_mime_type;
 		$post_data['guid'] = $post->guid;
 
-		foreach ( array( 'comment_status', 'ping_status', 'post_author' ) as $field ) {
-			if ( ! isset( $post_data[ $field ] ) ) {
-				$post_data[ $field ] = $post->$field;
+		foreach (array('comment_status', 'ping_status', 'post_author') as $field) {
+			if ( ! isset($post_data[$field])) {
+				$post_data[$field] = $post->$field;
 			}
 		}
 
 		$post_data['ID'] = $post_ID;
 		$post_data['post_ID'] = $post_ID;
 
-		$post_data = _wp_translate_postdata( true, $post_data );
-		if ( is_wp_error( $post_data ) ) {
+		$post_data = _wp_translate_postdata(true, $post_data);
+		if (is_wp_error($post_data)) {
 			$skipped[] = $post_ID;
 			continue;
 		}
 
-		$updated[] = wp_update_post( $post_data );
+		$updated[] = wp_update_post($post_data);
 
-		if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
-			if ( 'sticky' == $post_data['sticky'] )
-				stick_post( $post_ID );
+		if (isset($post_data['sticky']) && current_user_can($ptype->cap->edit_others_posts)) {
+			if ('sticky' == $post_data['sticky'])
+				stick_post($post_ID);
 			else
-				unstick_post( $post_ID );
+				unstick_post($post_ID);
 		}
 
-		if ( isset( $post_data['post_format'] ) )
-			set_post_format( $post_ID, $post_data['post_format'] );
+		if (isset($post_data['post_format']))
+			set_post_format($post_ID, $post_data['post_format']);
 	}
 
-	return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked );
+	return array('updated' => $updated, 'skipped' => $skipped, 'locked' => $locked);
 }
 
 /**
@@ -581,24 +581,24 @@ 
  * @param bool   $create_in_db Optional. Whether to insert the post into database. Default false.
  * @return WP_Post Post object containing all the default post data as attributes
  */
-function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
+function get_default_post_to_edit($post_type = 'post', $create_in_db = false) {
 	$post_title = '';
-	if ( !empty( $_REQUEST['post_title'] ) )
-		$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ));
+	if ( ! empty($_REQUEST['post_title']))
+		$post_title = esc_html(wp_unslash($_REQUEST['post_title']));
 
 	$post_content = '';
-	if ( !empty( $_REQUEST['content'] ) )
-		$post_content = esc_html( wp_unslash( $_REQUEST['content'] ));
+	if ( ! empty($_REQUEST['content']))
+		$post_content = esc_html(wp_unslash($_REQUEST['content']));
 
 	$post_excerpt = '';
-	if ( !empty( $_REQUEST['excerpt'] ) )
-		$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ));
-
-	if ( $create_in_db ) {
-		$post_id = wp_insert_post( array( 'post_title' => __( 'Auto Draft' ), 'post_type' => $post_type, 'post_status' => 'auto-draft' ) );
-		$post = get_post( $post_id );
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) )
-			set_post_format( $post, get_option( 'default_post_format' ) );
+	if ( ! empty($_REQUEST['excerpt']))
+		$post_excerpt = esc_html(wp_unslash($_REQUEST['excerpt']));
+
+	if ($create_in_db) {
+		$post_id = wp_insert_post(array('post_title' => __('Auto Draft'), 'post_type' => $post_type, 'post_status' => 'auto-draft'));
+		$post = get_post($post_id);
+		if (current_theme_supports('post-formats') && post_type_supports($post->post_type, 'post-formats') && get_option('default_post_format'))
+			set_post_format($post, get_option('default_post_format'));
 	} else {
 		$post = new stdClass;
 		$post->ID = 0;
@@ -611,14 +611,14 @@ 
 		$post->post_status = 'draft';
 		$post->to_ping = '';
 		$post->pinged = '';
-		$post->comment_status = get_default_comment_status( $post_type );
-		$post->ping_status = get_default_comment_status( $post_type, 'pingback' );
-		$post->post_pingback = get_option( 'default_pingback_flag' );
-		$post->post_category = get_option( 'default_category' );
+		$post->comment_status = get_default_comment_status($post_type);
+		$post->ping_status = get_default_comment_status($post_type, 'pingback');
+		$post->post_pingback = get_option('default_pingback_flag');
+		$post->post_category = get_option('default_category');
 		$post->page_template = 'default';
 		$post->post_parent = 0;
 		$post->menu_order = 0;
-		$post = new WP_Post( $post );
+		$post = new WP_Post($post);
 	}
 
 	/**
@@ -629,7 +629,7 @@ 
 	 * @param string  $post_content Default post content.
 	 * @param WP_Post $post         Post object.
 	 */
-	$post->post_content = apply_filters( 'default_content', $post_content, $post );
+	$post->post_content = apply_filters('default_content', $post_content, $post);
 
 	/**
 	 * Filter the default post title initially used in the "Write Post" form.
@@ -639,7 +639,7 @@ 
 	 * @param string  $post_title Default post title.
 	 * @param WP_Post $post       Post object.
 	 */
-	$post->post_title = apply_filters( 'default_title', $post_title, $post );
+	$post->post_title = apply_filters('default_title', $post_title, $post);
 
 	/**
 	 * Filter the default post excerpt initially used in the "Write Post" form.
@@ -649,7 +649,7 @@ 
 	 * @param string  $post_excerpt Default post excerpt.
 	 * @param WP_Post $post         Post object.
 	 */
-	$post->post_excerpt = apply_filters( 'default_excerpt', $post_excerpt, $post );
+	$post->post_excerpt = apply_filters('default_excerpt', $post_excerpt, $post);
 
 	return $post;
 }
@@ -669,30 +669,30 @@ 
 function post_exists($title, $content = '', $date = '') {
 	global $wpdb;
 
-	$post_title = wp_unslash( sanitize_post_field( 'post_title', $title, 0, 'db' ) );
-	$post_content = wp_unslash( sanitize_post_field( 'post_content', $content, 0, 'db' ) );
-	$post_date = wp_unslash( sanitize_post_field( 'post_date', $date, 0, 'db' ) );
+	$post_title = wp_unslash(sanitize_post_field('post_title', $title, 0, 'db'));
+	$post_content = wp_unslash(sanitize_post_field('post_content', $content, 0, 'db'));
+	$post_date = wp_unslash(sanitize_post_field('post_date', $date, 0, 'db'));
 
 	$query = "SELECT ID FROM $wpdb->posts WHERE 1=1";
 	$args = array();
 
-	if ( !empty ( $date ) ) {
+	if ( ! empty ($date)) {
 		$query .= ' AND post_date = %s';
 		$args[] = $post_date;
 	}
 
-	if ( !empty ( $title ) ) {
+	if ( ! empty ($title)) {
 		$query .= ' AND post_title = %s';
 		$args[] = $post_title;
 	}
 
-	if ( !empty ( $content ) ) {
+	if ( ! empty ($content)) {
 		$query .= ' AND post_content = %s';
 		$args[] = $post_content;
 	}
 
-	if ( !empty ( $args ) )
-		return (int) $wpdb->get_var( $wpdb->prepare($query, $args) );
+	if ( ! empty ($args))
+		return (int) $wpdb->get_var($wpdb->prepare($query, $args));
 
 	return 0;
 }
@@ -707,63 +707,63 @@ 
  * @return int|WP_Error
  */
 function wp_write_post() {
-	if ( isset($_POST['post_type']) )
+	if (isset($_POST['post_type']))
 		$ptype = get_post_type_object($_POST['post_type']);
 	else
 		$ptype = get_post_type_object('post');
 
-	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
+	if ( ! current_user_can($ptype->cap->edit_posts)) {
+		if ('page' == $ptype->name)
+			return new WP_Error('edit_pages', __('You are not allowed to create pages on this site.'));
 		else
-			return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
+			return new WP_Error('edit_posts', __('You are not allowed to create posts or drafts on this site.'));
 	}
 
 	$_POST['post_mime_type'] = '';
 
 	// Clear out any data in internal vars.
-	unset( $_POST['filter'] );
+	unset($_POST['filter']);
 
 	// Edit don't write if we have a post id.
-	if ( isset( $_POST['post_ID'] ) )
+	if (isset($_POST['post_ID']))
 		return edit_post();
 
-	if ( isset($_POST['visibility']) ) {
-		switch ( $_POST['visibility'] ) {
+	if (isset($_POST['visibility'])) {
+		switch ($_POST['visibility']) {
 			case 'public' :
 				$_POST['post_password'] = '';
 				break;
 			case 'password' :
-				unset( $_POST['sticky'] );
+				unset($_POST['sticky']);
 				break;
 			case 'private' :
 				$_POST['post_status'] = 'private';
 				$_POST['post_password'] = '';
-				unset( $_POST['sticky'] );
+				unset($_POST['sticky']);
 				break;
 		}
 	}
 
-	$translated = _wp_translate_postdata( false );
-	if ( is_wp_error($translated) )
+	$translated = _wp_translate_postdata(false);
+	if (is_wp_error($translated))
 		return $translated;
 
 	// Create the post.
-	$post_ID = wp_insert_post( $_POST );
-	if ( is_wp_error( $post_ID ) )
+	$post_ID = wp_insert_post($_POST);
+	if (is_wp_error($post_ID))
 		return $post_ID;
 
-	if ( empty($post_ID) )
+	if (empty($post_ID))
 		return 0;
 
-	add_meta( $post_ID );
+	add_meta($post_ID);
 
-	add_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );
+	add_post_meta($post_ID, '_edit_last', $GLOBALS['current_user']->ID);
 
 	// Now that we have an ID we can fix any attachment anchor hrefs
-	_fix_attachment_links( $post_ID );
+	_fix_attachment_links($post_ID);
 
-	wp_set_post_lock( $post_ID );
+	wp_set_post_lock($post_ID);
 
 	return $post_ID;
 }
@@ -777,8 +777,8 @@ 
  */
 function write_post() {
 	$result = wp_write_post();
-	if ( is_wp_error( $result ) )
-		wp_die( $result->get_error_message() );
+	if (is_wp_error($result))
+		wp_die($result->get_error_message());
 	else
 		return $result;
 }
@@ -795,32 +795,32 @@ 
  * @param int $post_ID
  * @return int|bool
  */
-function add_meta( $post_ID ) {
+function add_meta($post_ID) {
 	$post_ID = (int) $post_ID;
 
-	$metakeyselect = isset($_POST['metakeyselect']) ? wp_unslash( trim( $_POST['metakeyselect'] ) ) : '';
-	$metakeyinput = isset($_POST['metakeyinput']) ? wp_unslash( trim( $_POST['metakeyinput'] ) ) : '';
+	$metakeyselect = isset($_POST['metakeyselect']) ? wp_unslash(trim($_POST['metakeyselect'])) : '';
+	$metakeyinput = isset($_POST['metakeyinput']) ? wp_unslash(trim($_POST['metakeyinput'])) : '';
 	$metavalue = isset($_POST['metavalue']) ? $_POST['metavalue'] : '';
-	if ( is_string( $metavalue ) )
-		$metavalue = trim( $metavalue );
+	if (is_string($metavalue))
+		$metavalue = trim($metavalue);
 
-	if ( ('0' === $metavalue || ! empty ( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput ) ) ) {
+	if (('0' === $metavalue || ! empty ($metavalue)) && ((('#NONE#' != $metakeyselect) && ! empty ($metakeyselect)) || ! empty ($metakeyinput))) {
 		/*
 		 * We have a key/value pair. If both the select and the input
 		 * for the key have data, the input takes precedence.
 		 */
- 		if ( '#NONE#' != $metakeyselect )
+ 		if ('#NONE#' != $metakeyselect)
 			$metakey = $metakeyselect;
 
-		if ( $metakeyinput )
+		if ($metakeyinput)
 			$metakey = $metakeyinput; // default
 
-		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) )
+		if (is_protected_meta($metakey, 'post') || ! current_user_can('add_post_meta', $post_ID, $metakey))
 			return false;
 
-		$metakey = wp_slash( $metakey );
+		$metakey = wp_slash($metakey);
 
-		return add_post_meta( $post_ID, $metakey, $metavalue );
+		return add_post_meta($post_ID, $metakey, $metavalue);
 	}
 
 	return false;
@@ -834,8 +834,8 @@ 
  * @param int $mid
  * @return bool
  */
-function delete_meta( $mid ) {
-	return delete_metadata_by_mid( 'post' , $mid );
+function delete_meta($mid) {
+	return delete_metadata_by_mid('post', $mid);
 }
 
 /**
@@ -850,11 +850,11 @@ 
 function get_meta_keys() {
 	global $wpdb;
 
-	$keys = $wpdb->get_col( "
+	$keys = $wpdb->get_col("
 			SELECT meta_key
 			FROM $wpdb->postmeta
 			GROUP BY meta_key
-			ORDER BY meta_key" );
+			ORDER BY meta_key");
 
 	return $keys;
 }
@@ -867,8 +867,8 @@ 
  * @param int $mid
  * @return object|bool
  */
-function get_post_meta_by_id( $mid ) {
-	return get_metadata_by_mid( 'post', $mid );
+function get_post_meta_by_id($mid) {
+	return get_metadata_by_mid('post', $mid);
 }
 
 /**
@@ -881,12 +881,12 @@ 
  * @param int $postid
  * @return mixed
  */
-function has_meta( $postid ) {
+function has_meta($postid) {
 	global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare("SELECT meta_key, meta_value, meta_id, post_id
+	return $wpdb->get_results($wpdb->prepare("SELECT meta_key, meta_value, meta_id, post_id
 			FROM $wpdb->postmeta WHERE post_id = %d
-			ORDER BY meta_key,meta_id", $postid), ARRAY_A );
+			ORDER BY meta_key,meta_id", $postid), ARRAY_A);
 }
 
 /**
@@ -899,11 +899,11 @@ 
  * @param string $meta_value Expect Slashed
  * @return bool
  */
-function update_meta( $meta_id, $meta_key, $meta_value ) {
-	$meta_key = wp_unslash( $meta_key );
-	$meta_value = wp_unslash( $meta_value );
+function update_meta($meta_id, $meta_key, $meta_value) {
+	$meta_key = wp_unslash($meta_key);
+	$meta_value = wp_unslash($meta_value);
 
-	return update_metadata_by_mid( 'post', $meta_id, $meta_value, $meta_key );
+	return update_metadata_by_mid('post', $meta_id, $meta_value, $meta_key);
 }
 
 //
@@ -919,42 +919,42 @@ 
  * @param int|object $post Post ID or post object.
  * @return void|int|WP_Error Void if nothing fixed. 0 or WP_Error on update failure. The post ID on update success.
  */
-function _fix_attachment_links( $post ) {
-	$post = get_post( $post, ARRAY_A );
+function _fix_attachment_links($post) {
+	$post = get_post($post, ARRAY_A);
 	$content = $post['post_content'];
 
 	// Don't run if no pretty permalinks or post is not published, scheduled, or privately published.
-	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ) ) )
+	if ( ! get_option('permalink_structure') || ! in_array($post['post_status'], array('publish', 'future', 'private')))
 		return;
 
 	// Short if there aren't any links or no '?attachment_id=' strings (strpos cannot be zero)
-	if ( !strpos($content, '?attachment_id=') || !preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) )
+	if ( ! strpos($content, '?attachment_id=') || ! preg_match_all('/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches))
 		return;
 
 	$site_url = get_bloginfo('url');
-	$site_url = substr( $site_url, (int) strpos($site_url, '://') ); // remove the http(s)
+	$site_url = substr($site_url, (int) strpos($site_url, '://')); // remove the http(s)
 	$replace = '';
 
-	foreach ( $link_matches[1] as $key => $value ) {
-		if ( !strpos($value, '?attachment_id=') || !strpos($value, 'wp-att-')
-			|| !preg_match( '/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match )
-			|| !preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) )
+	foreach ($link_matches[1] as $key => $value) {
+		if ( ! strpos($value, '?attachment_id=') || ! strpos($value, 'wp-att-')
+			|| ! preg_match('/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match)
+			|| ! preg_match('/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match))
 				continue;
 
 		$quote = $url_match[1]; // the quote (single or double)
 		$url_id = (int) $url_match[2];
 		$rel_id = (int) $rel_match[1];
 
-		if ( !$url_id || !$rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false )
+		if ( ! $url_id || ! $rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false)
 			continue;
 
 		$link = $link_matches[0][$key];
-		$replace = str_replace( $url_match[0], 'href=' . $quote . get_attachment_link( $url_id ) . $quote, $link );
+		$replace = str_replace($url_match[0], 'href='.$quote.get_attachment_link($url_id).$quote, $link);
 
-		$content = str_replace( $link, $replace, $content );
+		$content = str_replace($link, $replace, $content);
 	}
 
-	if ( $replace ) {
+	if ($replace) {
 		$post['post_content'] = $content;
 		// Escape data pulled from DB.
 		$post = add_magic_quotes($post);
@@ -985,40 +985,40 @@ 
  * @param array|bool $q Array of query variables to use to build the query or false to use $_GET superglobal.
  * @return array
  */
-function wp_edit_posts_query( $q = false ) {
-	if ( false === $q )
+function wp_edit_posts_query($q = false) {
+	if (false === $q)
 		$q = $_GET;
 	$q['m'] = isset($q['m']) ? (int) $q['m'] : 0;
 	$q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
-	$post_stati  = get_post_stati();
+	$post_stati = get_post_stati();
 
-	if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) )
+	if (isset($q['post_type']) && in_array($q['post_type'], get_post_types()))
 		$post_type = $q['post_type'];
 	else
 		$post_type = 'post';
 
 	$avail_post_stati = get_available_post_statuses($post_type);
 
-	if ( isset($q['post_status']) && in_array( $q['post_status'], $post_stati ) ) {
+	if (isset($q['post_status']) && in_array($q['post_status'], $post_stati)) {
 		$post_status = $q['post_status'];
 		$perm = 'readable';
 	}
 
-	if ( isset( $q['orderby'] ) ) {
+	if (isset($q['orderby'])) {
 		$orderby = $q['orderby'];
-	} elseif ( isset( $q['post_status'] ) && in_array( $q['post_status'], array( 'pending', 'draft' ) ) ) {
+	} elseif (isset($q['post_status']) && in_array($q['post_status'], array('pending', 'draft'))) {
 		$orderby = 'modified';
 	}
 
-	if ( isset( $q['order'] ) ) {
+	if (isset($q['order'])) {
 		$order = $q['order'];
-	} elseif ( isset( $q['post_status'] ) && 'pending' == $q['post_status'] ) {
+	} elseif (isset($q['post_status']) && 'pending' == $q['post_status']) {
 		$order = 'ASC';
 	}
 
 	$per_page = "edit_{$post_type}_per_page";
-	$posts_per_page = (int) get_user_option( $per_page );
-	if ( empty( $posts_per_page ) || $posts_per_page < 1 )
+	$posts_per_page = (int) get_user_option($per_page);
+	if (empty($posts_per_page) || $posts_per_page < 1)
 		$posts_per_page = 20;
 
 	/**
@@ -1034,7 +1034,7 @@ 
 	 * @param int $posts_per_page Number of posts to display per page for the given post
 	 *                            type. Default 20.
 	 */
-	$posts_per_page = apply_filters( "edit_{$post_type}_per_page", $posts_per_page );
+	$posts_per_page = apply_filters("edit_{$post_type}_per_page", $posts_per_page);
 
 	/**
 	 * Filter the number of posts displayed per page when specifically listing "posts".
@@ -1044,12 +1044,12 @@ 
 	 * @param int    $posts_per_page Number of posts to be displayed. Default 20.
 	 * @param string $post_type      The post type.
 	 */
-	$posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page, $post_type );
+	$posts_per_page = apply_filters('edit_posts_per_page', $posts_per_page, $post_type);
 
 	$query = compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page');
 
 	// Hierarchical types require special args.
-	if ( is_post_type_hierarchical( $post_type ) && !isset($orderby) ) {
+	if (is_post_type_hierarchical($post_type) && ! isset($orderby)) {
 		$query['orderby'] = 'menu_order title';
 		$query['order'] = 'asc';
 		$query['posts_per_page'] = -1;
@@ -1057,10 +1057,10 @@ 
 		$query['fields'] = 'id=>parent';
 	}
 
-	if ( ! empty( $q['show_sticky'] ) )
-		$query['post__in'] = (array) get_option( 'sticky_posts' );
+	if ( ! empty($q['show_sticky']))
+		$query['post__in'] = (array) get_option('sticky_posts');
 
-	wp( $query );
+	wp($query);
 
 	return $avail_post_stati;
 }
@@ -1091,24 +1091,24 @@ 
  *                       to use $_GET superglobal. Default false.
  * @return array The parsed query vars.
  */
-function wp_edit_attachments_query_vars( $q = false ) {
-	if ( false === $q ) {
+function wp_edit_attachments_query_vars($q = false) {
+	if (false === $q) {
 		$q = $_GET;
 	}
-	$q['m']   = isset( $q['m'] ) ? (int) $q['m'] : 0;
-	$q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
+	$q['m']   = isset($q['m']) ? (int) $q['m'] : 0;
+	$q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
 	$q['post_type'] = 'attachment';
-	$post_type = get_post_type_object( 'attachment' );
+	$post_type = get_post_type_object('attachment');
 	$states = 'inherit';
-	if ( current_user_can( $post_type->cap->read_private_posts ) ) {
+	if (current_user_can($post_type->cap->read_private_posts)) {
 		$states .= ',private';
 	}
 
-	$q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : $states;
-	$q['post_status'] = isset( $q['attachment-filter'] ) && 'trash' == $q['attachment-filter'] ? 'trash' : $states;
+	$q['post_status'] = isset($q['status']) && 'trash' == $q['status'] ? 'trash' : $states;
+	$q['post_status'] = isset($q['attachment-filter']) && 'trash' == $q['attachment-filter'] ? 'trash' : $states;
 
-	$media_per_page = (int) get_user_option( 'upload_per_page' );
-	if ( empty( $media_per_page ) || $media_per_page < 1 ) {
+	$media_per_page = (int) get_user_option('upload_per_page');
+	if (empty($media_per_page) || $media_per_page < 1) {
 		$media_per_page = 20;
 	}
 
@@ -1119,21 +1119,21 @@ 
 	 *
 	 * @param int $media_per_page Number of media to list. Default 20.
 	 */
-	$q['posts_per_page'] = apply_filters( 'upload_per_page', $media_per_page );
+	$q['posts_per_page'] = apply_filters('upload_per_page', $media_per_page);
 
 	$post_mime_types = get_post_mime_types();
-	if ( isset($q['post_mime_type']) && !array_intersect( (array) $q['post_mime_type'], array_keys($post_mime_types) ) ) {
+	if (isset($q['post_mime_type']) && ! array_intersect((array) $q['post_mime_type'], array_keys($post_mime_types))) {
 		unset($q['post_mime_type']);
 	}
 
-	foreach ( array_keys( $post_mime_types ) as $type ) {
-		if ( isset( $q['attachment-filter'] ) && "post_mime_type:$type" == $q['attachment-filter'] ) {
+	foreach (array_keys($post_mime_types) as $type) {
+		if (isset($q['attachment-filter']) && "post_mime_type:$type" == $q['attachment-filter']) {
 			$q['post_mime_type'] = $type;
 			break;
 		}
 	}
 
-	if ( isset( $q['detached'] ) || ( isset( $q['attachment-filter'] ) && 'detached' == $q['attachment-filter'] ) ) {
+	if (isset($q['detached']) || (isset($q['attachment-filter']) && 'detached' == $q['attachment-filter'])) {
 		$q['post_parent'] = 0;
 	}
 
@@ -1149,13 +1149,13 @@ 
  * @param array|false $q Array of query variables to use to build the query or false to use $_GET superglobal.
  * @return array
  */
-function wp_edit_attachments_query( $q = false ) {
-	wp( wp_edit_attachments_query_vars( $q ) );
+function wp_edit_attachments_query($q = false) {
+	wp(wp_edit_attachments_query_vars($q));
 
 	$post_mime_types = get_post_mime_types();
-	$avail_post_mime_types = get_available_post_mime_types( 'attachment' );
+	$avail_post_mime_types = get_available_post_mime_types('attachment');
 
-	return array( $post_mime_types, $avail_post_mime_types );
+	return array($post_mime_types, $avail_post_mime_types);
 }
 
 /**
@@ -1167,17 +1167,17 @@ 
  * @param string $page
  * @return string
  */
-function postbox_classes( $id, $page ) {
-	if ( isset( $_GET['edit'] ) && $_GET['edit'] == $id ) {
-		$classes = array( '' );
-	} elseif ( $closed = get_user_option('closedpostboxes_'.$page ) ) {
-		if ( !is_array( $closed ) ) {
-			$classes = array( '' );
+function postbox_classes($id, $page) {
+	if (isset($_GET['edit']) && $_GET['edit'] == $id) {
+		$classes = array('');
+	} elseif ($closed = get_user_option('closedpostboxes_'.$page)) {
+		if ( ! is_array($closed)) {
+			$classes = array('');
 		} else {
-			$classes = in_array( $id, $closed ) ? array( 'closed' ) : array( '' );
+			$classes = in_array($id, $closed) ? array('closed') : array('');
 		}
 	} else {
-		$classes = array( '' );
+		$classes = array('');
 	}
 
 	/**
@@ -1190,8 +1190,8 @@ 
 	 *
 	 * @param array $classes An array of postbox classes.
 	 */
-	$classes = apply_filters( "postbox_classes_{$page}_{$id}", $classes );
-	return implode( ' ', $classes );
+	$classes = apply_filters("postbox_classes_{$page}_{$id}", $classes);
+	return implode(' ', $classes);
 }
 
 /**
@@ -1205,9 +1205,9 @@ 
  * @return array Array with two entries of type string.
  */
 function get_sample_permalink($id, $title = null, $name = null) {
-	$post = get_post( $id );
-	if ( ! $post )
-		return array( '', '' );
+	$post = get_post($id);
+	if ( ! $post)
+		return array('', '');
 
 	$ptype = get_post_type_object($post->post_type);
 
@@ -1216,14 +1216,14 @@ 
 	$original_name = $post->post_name;
 
 	// Hack: get_permalink() would return ugly permalink for drafts, so we will fake that our post is published.
-	if ( in_array( $post->post_status, array( 'draft', 'pending', 'future' ) ) ) {
+	if (in_array($post->post_status, array('draft', 'pending', 'future'))) {
 		$post->post_status = 'publish';
 		$post->post_name = sanitize_title($post->post_name ? $post->post_name : $post->post_title, $post->ID);
 	}
 
 	// If the user wants to set a new name -- override the current one
 	// Note: if empty name is supplied -- use the title instead, see #6072
-	if ( !is_null($name) )
+	if ( ! is_null($name))
 		$post->post_name = sanitize_title($name ? $name : $title, $post->ID);
 
 	$post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
@@ -1236,23 +1236,23 @@ 
 	$permalink = str_replace("%$post->post_type%", '%pagename%', $permalink);
 
 	// Handle page hierarchy
-	if ( $ptype->hierarchical ) {
+	if ($ptype->hierarchical) {
 		$uri = get_page_uri($post);
-		if ( $uri ) {
+		if ($uri) {
 			$uri = untrailingslashit($uri);
-			$uri = strrev( stristr( strrev( $uri ), '/' ) );
+			$uri = strrev(stristr(strrev($uri), '/'));
 			$uri = untrailingslashit($uri);
 		}
 
 		/** This filter is documented in wp-admin/edit-tag-form.php */
-		$uri = apply_filters( 'editable_slug', $uri, $post );
-		if ( !empty($uri) )
+		$uri = apply_filters('editable_slug', $uri, $post);
+		if ( ! empty($uri))
 			$uri .= '/';
 		$permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink);
 	}
 
 	/** This filter is documented in wp-admin/edit-tag-form.php */
-	$permalink = array( $permalink, apply_filters( 'editable_slug', $post->post_name, $post ) );
+	$permalink = array($permalink, apply_filters('editable_slug', $post->post_name, $post));
 	$post->post_status = $original_status;
 	$post->post_date = $original_date;
 	$post->post_name = $original_name;
@@ -1269,7 +1269,7 @@ 
 	 * @param string  $name      Post name (slug).
 	 * @param WP_Post $post      Post object.
 	 */
-	return apply_filters( 'get_sample_permalink', $permalink, $post->ID, $title, $name, $post );
+	return apply_filters('get_sample_permalink', $permalink, $post->ID, $title, $name, $post);
 }
 
 /**
@@ -1282,9 +1282,9 @@ 
  * @param string $new_slug  Optional. New slug. Default null.
  * @return string The HTML of the sample permalink slug editor.
  */
-function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
-	$post = get_post( $id );
-	if ( ! $post )
+function get_sample_permalink_html($id, $new_title = null, $new_slug = null) {
+	$post = get_post($id);
+	if ( ! $post)
 		return '';
 
 	list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
@@ -1292,58 +1292,58 @@ 
 	$view_link = false;
 	$preview_target = '';
 
-	if ( current_user_can( 'read_post', $post->ID ) ) {
-		if ( 'draft' === $post->post_status ) {
-			$view_link = get_preview_post_link( $post );
+	if (current_user_can('read_post', $post->ID)) {
+		if ('draft' === $post->post_status) {
+			$view_link = get_preview_post_link($post);
 			$preview_target = " target='wp-preview-{$post->ID}'";
 		} else {
-			if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) {
-				$view_link = get_permalink( $post );
+			if ('publish' === $post->post_status || 'attachment' === $post->post_type) {
+				$view_link = get_permalink($post);
 			} else {
 				// Allow non-published (private, future) to be viewed at a pretty permalink.
-				$view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, $permalink );
+				$view_link = str_replace(array('%pagename%', '%postname%'), $post->post_name, $permalink);
 			}
 		}
 	}
 
 	// Permalinks without a post/page name placeholder don't have anything to edit
-	if ( false === strpos( $permalink, '%postname%' ) && false === strpos( $permalink, '%pagename%' ) ) {
-		$return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
+	if (false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%')) {
+		$return = '<strong>'.__('Permalink:')."</strong>\n";
 
-		if ( false !== $view_link ) {
-			$display_link = urldecode( $view_link );
-			$return .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $display_link . "</a>\n";
+		if (false !== $view_link) {
+			$display_link = urldecode($view_link);
+			$return .= '<a id="sample-permalink" href="'.esc_url($view_link).'"'.$preview_target.'>'.$display_link."</a>\n";
 		} else {
-			$return .= '<span id="sample-permalink">' . $permalink . "</span>\n";
+			$return .= '<span id="sample-permalink">'.$permalink."</span>\n";
 		}
 
 		// Encourage a pretty permalink setting
-		if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) ) {
-			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
+		if ('' == get_option('permalink_structure') && current_user_can('manage_options') && ! ('page' == get_option('show_on_front') && $id == get_option('page_on_front'))) {
+			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">'.__('Change Permalinks')."</a></span>\n";
 		}
 	} else {
-		if ( function_exists( 'mb_strlen' ) ) {
-			if ( mb_strlen( $post_name ) > 34 ) {
-				$post_name_abridged = mb_substr( $post_name, 0, 16 ) . '&hellip;' . mb_substr( $post_name, -16 );
+		if (function_exists('mb_strlen')) {
+			if (mb_strlen($post_name) > 34) {
+				$post_name_abridged = mb_substr($post_name, 0, 16).'&hellip;'.mb_substr($post_name, -16);
 			} else {
 				$post_name_abridged = $post_name;
 			}
 		} else {
-			if ( strlen( $post_name ) > 34 ) {
-				$post_name_abridged = substr( $post_name, 0, 16 ) . '&hellip;' . substr( $post_name, -16 );
+			if (strlen($post_name) > 34) {
+				$post_name_abridged = substr($post_name, 0, 16).'&hellip;'.substr($post_name, -16);
 			} else {
 				$post_name_abridged = $post_name;
 			}
 		}
 
-		$post_name_html = '<span id="editable-post-name">' . $post_name_abridged . '</span>';
-		$display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, urldecode( $permalink ) );
+		$post_name_html = '<span id="editable-post-name">'.$post_name_abridged.'</span>';
+		$display_link = str_replace(array('%pagename%', '%postname%'), $post_name_html, urldecode($permalink));
 
-		$return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
-		$return .= '<span id="sample-permalink"><a href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $display_link . "</a></span>\n";
+		$return = '<strong>'.__('Permalink:')."</strong>\n";
+		$return .= '<span id="sample-permalink"><a href="'.esc_url($view_link).'"'.$preview_target.'>'.$display_link."</a></span>\n";
 		$return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
-		$return .= '<span id="edit-slug-buttons"><button type="button" class="edit-slug button button-small hide-if-no-js" aria-label="' . __( 'Edit permalink' ) . '">' . __( 'Edit' ) . "</button></span>\n";
-		$return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
+		$return .= '<span id="edit-slug-buttons"><button type="button" class="edit-slug button button-small hide-if-no-js" aria-label="'.__('Edit permalink').'">'.__('Edit')."</button></span>\n";
+		$return .= '<span id="editable-post-name-full">'.$post_name."</span>\n";
 	}
 
 	/**
@@ -1358,7 +1358,7 @@ 
 	 * @param string  $new_slug  New sample permalink slug.
 	 * @param WP_Post $post      Post object.
 	 */
-	$return = apply_filters( 'get_sample_permalink_html', $return, $post->ID, $new_title, $new_slug, $post );
+	$return = apply_filters('get_sample_permalink_html', $return, $post->ID, $new_title, $new_slug, $post);
 
 	return $return;
 }
@@ -1375,22 +1375,22 @@ 
  * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post.
  * @return string html
  */
-function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
+function _wp_post_thumbnail_html($thumbnail_id = null, $post = null) {
 	global $content_width, $_wp_additional_image_sizes;
 
-	$post               = get_post( $post );
-	$post_type_object   = get_post_type_object( $post->post_type );
+	$post               = get_post($post);
+	$post_type_object   = get_post_type_object($post->post_type);
 	$set_thumbnail_link = '<p class="hide-if-no-js"><a href="%s" id="set-post-thumbnail"%s class="thickbox">%s</a></p>';
-	$upload_iframe_src  = get_upload_iframe_src( 'image', $post->ID );
+	$upload_iframe_src  = get_upload_iframe_src('image', $post->ID);
 
-	$content = sprintf( $set_thumbnail_link,
-		esc_url( $upload_iframe_src ),
+	$content = sprintf($set_thumbnail_link,
+		esc_url($upload_iframe_src),
 		'', // Empty when there's no featured image set, `aria-describedby` attribute otherwise.
-		esc_html( $post_type_object->labels->set_featured_image )
+		esc_html($post_type_object->labels->set_featured_image)
 	);
 
-	if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
-		$size = isset( $_wp_additional_image_sizes['post-thumbnail'] ) ? 'post-thumbnail' : array( 266, 266 );
+	if ($thumbnail_id && get_post($thumbnail_id)) {
+		$size = isset($_wp_additional_image_sizes['post-thumbnail']) ? 'post-thumbnail' : array(266, 266);
 
 		/**
 		 * Filter the size used to display the post thumbnail image in the 'Featured Image' meta box.
@@ -1409,19 +1409,19 @@ 
 		 * @param int          $thumbnail_id Post thumbnail attachment ID.
 		 * @param WP_Post      $post         The post object associated with the thumbnail.
 		 */
-		$size = apply_filters( 'admin_post_thumbnail_size', $size, $thumbnail_id, $post );
+		$size = apply_filters('admin_post_thumbnail_size', $size, $thumbnail_id, $post);
 
-		$thumbnail_html = wp_get_attachment_image( $thumbnail_id, $size );
+		$thumbnail_html = wp_get_attachment_image($thumbnail_id, $size);
 
-		if ( !empty( $thumbnail_html ) ) {
-			$ajax_nonce = wp_create_nonce( 'set_post_thumbnail-' . $post->ID );
-			$content = sprintf( $set_thumbnail_link,
-				esc_url( $upload_iframe_src ),
+		if ( ! empty($thumbnail_html)) {
+			$ajax_nonce = wp_create_nonce('set_post_thumbnail-'.$post->ID);
+			$content = sprintf($set_thumbnail_link,
+				esc_url($upload_iframe_src),
 				' aria-describedby="set-post-thumbnail-desc"',
 				$thumbnail_html
 			);
-			$content .= '<p class="hide-if-no-js howto" id="set-post-thumbnail-desc">' . __( 'Click the image to edit or update' ) . '</p>';
-			$content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail(\'' . $ajax_nonce . '\');return false;">' . esc_html( $post_type_object->labels->remove_featured_image ) . '</a></p>';
+			$content .= '<p class="hide-if-no-js howto" id="set-post-thumbnail-desc">'.__('Click the image to edit or update').'</p>';
+			$content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail(\''.$ajax_nonce.'\');return false;">'.esc_html($post_type_object->labels->remove_featured_image).'</a></p>';
 		}
 	}
 
@@ -1433,7 +1433,7 @@ 
 	 * @param string $content Admin post thumbnail HTML markup.
 	 * @param int    $post_id Post ID.
 	 */
-	return apply_filters( 'admin_post_thumbnail_html', $content, $post->ID );
+	return apply_filters('admin_post_thumbnail_html', $content, $post->ID);
 }
 
 /**
@@ -1444,21 +1444,21 @@ 
  * @param int $post_id ID of the post to check for editing
  * @return integer False: not locked or locked by current user. Int: user ID of user with lock.
  */
-function wp_check_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
+function wp_check_post_lock($post_id) {
+	if ( ! $post = get_post($post_id))
 		return false;
 
-	if ( !$lock = get_post_meta( $post->ID, '_edit_lock', true ) )
+	if ( ! $lock = get_post_meta($post->ID, '_edit_lock', true))
 		return false;
 
-	$lock = explode( ':', $lock );
+	$lock = explode(':', $lock);
 	$time = $lock[0];
-	$user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
+	$user = isset($lock[1]) ? $lock[1] : get_post_meta($post->ID, '_edit_last', true);
 
 	/** This filter is documented in wp-admin/includes/ajax-actions.php */
-	$time_window = apply_filters( 'wp_check_post_lock_window', 150 );
+	$time_window = apply_filters('wp_check_post_lock_window', 150);
 
-	if ( $time && $time > time() - $time_window && $user != get_current_user_id() )
+	if ($time && $time > time() - $time_window && $user != get_current_user_id())
 		return $user;
 	return false;
 }
@@ -1472,17 +1472,17 @@ 
  * @return bool|array Returns false if the post doesn't exist of there is no current user, or
  * 	an array of the lock time and the user ID.
  */
-function wp_set_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
+function wp_set_post_lock($post_id) {
+	if ( ! $post = get_post($post_id))
 		return false;
-	if ( 0 == ($user_id = get_current_user_id()) )
+	if (0 == ($user_id = get_current_user_id()))
 		return false;
 
 	$now = time();
 	$lock = "$now:$user_id";
 
-	update_post_meta( $post->ID, '_edit_lock', $lock );
-	return array( $now, $user_id );
+	update_post_meta($post->ID, '_edit_lock', $lock);
+	return array($now, $user_id);
 }
 
 /**
@@ -1492,14 +1492,14 @@ 
  * @return none
  */
 function _admin_notice_post_locked() {
-	if ( ! $post = get_post() )
+	if ( ! $post = get_post())
 		return;
 
 	$user = null;
-	if (  $user_id = wp_check_post_lock( $post->ID ) )
-		$user = get_userdata( $user_id );
+	if ($user_id = wp_check_post_lock($post->ID))
+		$user = get_userdata($user_id);
 
-	if ( $user ) {
+	if ($user) {
 
 		/**
 		 * Filter whether to show the post locked dialog.
@@ -1511,7 +1511,7 @@ 
 		 * @param bool         $display Whether to display the dialog. Default true.
 		 * @param WP_User|bool $user    WP_User object on success, false otherwise.
 		 */
-		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) )
+		if ( ! apply_filters('show_post_locked_dialog', true, $post, $user))
 			return;
 
 		$locked = true;
@@ -1519,17 +1519,17 @@ 
 		$locked = false;
 	}
 
-	if ( $locked && ( $sendback = wp_get_referer() ) &&
-		false === strpos( $sendback, 'post.php' ) && false === strpos( $sendback, 'post-new.php' ) ) {
+	if ($locked && ($sendback = wp_get_referer()) &&
+		false === strpos($sendback, 'post.php') && false === strpos($sendback, 'post-new.php')) {
 
 		$sendback_text = __('Go back');
 	} else {
-		$sendback = admin_url( 'edit.php' );
+		$sendback = admin_url('edit.php');
 
-		if ( 'post' != $post->post_type )
-			$sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
+		if ('post' != $post->post_type)
+			$sendback = add_query_arg('post_type', $post->post_type, $sendback);
 
-		$sendback_text = get_post_type_object( $post->post_type )->labels->all_items;
+		$sendback_text = get_post_type_object($post->post_type)->labels->all_items;
 	}
 
 	$hidden = $locked ? '' : ' hidden';
@@ -1540,18 +1540,18 @@ 
 	<div class="notification-dialog">
 	<?php
 
-	if ( $locked ) {
+	if ($locked) {
 		$query_args = array();
-		if ( get_post_type_object( $post->post_type )->public ) {
-			if ( 'publish' == $post->post_status || $user->ID != $post->post_author ) {
+		if (get_post_type_object($post->post_type)->public) {
+			if ('publish' == $post->post_status || $user->ID != $post->post_author) {
 				// Latest content is in autosave
-				$nonce = wp_create_nonce( 'post_preview_' . $post->ID );
+				$nonce = wp_create_nonce('post_preview_'.$post->ID);
 				$query_args['preview_id'] = $post->ID;
 				$query_args['preview_nonce'] = $nonce;
 			}
 		}
 
-		$preview_link = get_preview_post_link( $post->ID, $query_args );
+		$preview_link = get_preview_post_link($post->ID, $query_args);
 
 		/**
 		 * Filter whether to allow the post lock to be overridden.
@@ -1565,17 +1565,17 @@ 
 		 * @param WP_Post $post     Post object.
 		 * @param WP_User $user     User object.
 		 */
-		$override = apply_filters( 'override_post_lock', true, $post, $user );
+		$override = apply_filters('override_post_lock', true, $post, $user);
 		$tab_last = $override ? '' : ' wp-tab-last';
 
 		?>
 		<div class="post-locked-message">
-		<div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div>
+		<div class="post-locked-avatar"><?php echo get_avatar($user->ID, 64); ?></div>
 		<p class="currently-editing wp-tab-first" tabindex="0">
 		<?php
-			_e( 'This content is currently locked.' );
-			if ( $override )
-				printf( ' ' . __( 'If you take over, %s will be blocked from continuing to edit.' ), esc_html( $user->display_name ) );
+			_e('This content is currently locked.');
+			if ($override)
+				printf(' '.__('If you take over, %s will be blocked from continuing to edit.'), esc_html($user->display_name));
 		?>
 		</p>
 		<?php
@@ -1586,19 +1586,19 @@ 
 		 *
 		 * @param WP_Post $post Post object.
 		 */
-		do_action( 'post_locked_dialog', $post );
+		do_action('post_locked_dialog', $post);
 		?>
 		<p>
-		<a class="button" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a>
-		<?php if ( $preview_link ) { ?>
-		<a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url( $preview_link ); ?>"><?php _e('Preview'); ?></a>
+		<a class="button" href="<?php echo esc_url($sendback); ?>"><?php echo $sendback_text; ?></a>
+		<?php if ($preview_link) { ?>
+		<a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url($preview_link); ?>"><?php _e('Preview'); ?></a>
 		<?php
 		}
 
 		// Allow plugins to prevent some users overriding the post lock
-		if ( $override ) {
+		if ($override) {
 			?>
-			<a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', wp_nonce_url( get_edit_post_link( $post->ID, 'url' ), 'lock-post_' . $post->ID ) ) ); ?>"><?php _e('Take over'); ?></a>
+			<a class="button button-primary wp-tab-last" href="<?php echo esc_url(add_query_arg('get-post-lock', '1', wp_nonce_url(get_edit_post_link($post->ID, 'url'), 'lock-post_'.$post->ID))); ?>"><?php _e('Take over'); ?></a>
 			<?php
 		}
 
@@ -1612,7 +1612,7 @@ 
 			<div class="post-locked-avatar"></div>
 			<p class="wp-tab-first" tabindex="0">
 			<span class="currently-editing"></span><br />
-			<span class="locked-saving hidden"><img src="<?php echo esc_url( admin_url( 'images/spinner-2x.gif' ) ); ?>" width="16" height="16" alt="" /> <?php _e( 'Saving revision&hellip;' ); ?></span>
+			<span class="locked-saving hidden"><img src="<?php echo esc_url(admin_url('images/spinner-2x.gif')); ?>" width="16" height="16" alt="" /> <?php _e('Saving revision&hellip;'); ?></span>
 			<span class="locked-saved hidden"><?php _e('Your latest changes were saved as a revision.'); ?></span>
 			</p>
 			<?php
@@ -1623,9 +1623,9 @@ 
 			 *
 			 * @param WP_Post $post Post object.
 			 */
-			do_action( 'post_lock_lost_dialog', $post );
+			do_action('post_lock_lost_dialog', $post);
 			?>
-			<p><a class="button button-primary wp-tab-last" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a></p>
+			<p><a class="button button-primary wp-tab-last" href="<?php echo esc_url($sendback); ?>"><?php echo $sendback_text; ?></a></p>
 		</div>
 		<?php
 	}
@@ -1646,38 +1646,38 @@ 
  * @param mixed $post_data Associative array containing the post data or int post ID.
  * @return mixed The autosave revision ID. WP_Error or 0 on error.
  */
-function wp_create_post_autosave( $post_data ) {
-	if ( is_numeric( $post_data ) ) {
+function wp_create_post_autosave($post_data) {
+	if (is_numeric($post_data)) {
 		$post_id = $post_data;
 		$post_data = $_POST;
 	} else {
 		$post_id = (int) $post_data['post_ID'];
 	}
 
-	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error( $post_data ) )
+	$post_data = _wp_translate_postdata(true, $post_data);
+	if (is_wp_error($post_data))
 		return $post_data;
 
 	$post_author = get_current_user_id();
 
 	// Store one autosave per author. If there is already an autosave, overwrite it.
-	if ( $old_autosave = wp_get_post_autosave( $post_id, $post_author ) ) {
-		$new_autosave = _wp_post_revision_data( $post_data, true );
+	if ($old_autosave = wp_get_post_autosave($post_id, $post_author)) {
+		$new_autosave = _wp_post_revision_data($post_data, true);
 		$new_autosave['ID'] = $old_autosave->ID;
 		$new_autosave['post_author'] = $post_author;
 
 		// If the new autosave has the same content as the post, delete the autosave.
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 		$autosave_is_different = false;
-		foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields( $post ) ) ) as $field ) {
-			if ( normalize_whitespace( $new_autosave[ $field ] ) != normalize_whitespace( $post->$field ) ) {
+		foreach (array_intersect(array_keys($new_autosave), array_keys(_wp_post_revision_fields($post))) as $field) {
+			if (normalize_whitespace($new_autosave[$field]) != normalize_whitespace($post->$field)) {
 				$autosave_is_different = true;
 				break;
 			}
 		}
 
-		if ( ! $autosave_is_different ) {
-			wp_delete_post_revision( $old_autosave->ID );
+		if ( ! $autosave_is_different) {
+			wp_delete_post_revision($old_autosave->ID);
 			return 0;
 		}
 
@@ -1688,16 +1688,16 @@ 
 		 *
 		 * @param array $new_autosave Post array - the autosave that is about to be saved.
 		 */
-		do_action( 'wp_creating_autosave', $new_autosave );
+		do_action('wp_creating_autosave', $new_autosave);
 
-		return wp_update_post( $new_autosave );
+		return wp_update_post($new_autosave);
 	}
 
 	// _wp_put_post_revision() expects unescaped.
-	$post_data = wp_unslash( $post_data );
+	$post_data = wp_unslash($post_data);
 
 	// Otherwise create the new autosave as a special post revision
-	return _wp_put_post_revision( $post_data, true );
+	return _wp_put_post_revision($post_data, true);
 }
 
 /**
@@ -1713,41 +1713,41 @@ 
 	$post_ID = (int) $_POST['post_ID'];
 	$_POST['ID'] = $post_ID;
 
-	if ( ! $post = get_post( $post_ID ) ) {
-		wp_die( __( 'You are not allowed to edit this post.' ) );
+	if ( ! $post = get_post($post_ID)) {
+		wp_die(__('You are not allowed to edit this post.'));
 	}
 
-	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
-		wp_die( __( 'You are not allowed to edit this post.' ) );
+	if ( ! current_user_can('edit_post', $post->ID)) {
+		wp_die(__('You are not allowed to edit this post.'));
 	}
 
 	$is_autosave = false;
 
-	if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'draft' == $post->post_status || 'auto-draft' == $post->post_status ) ) {
+	if ( ! wp_check_post_lock($post->ID) && get_current_user_id() == $post->post_author && ('draft' == $post->post_status || 'auto-draft' == $post->post_status)) {
 		$saved_post_id = edit_post();
 	} else {
 		$is_autosave = true;
 
-		if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] )
+		if (isset($_POST['post_status']) && 'auto-draft' == $_POST['post_status'])
 			$_POST['post_status'] = 'draft';
 
-		$saved_post_id = wp_create_post_autosave( $post->ID );
+		$saved_post_id = wp_create_post_autosave($post->ID);
 	}
 
-	if ( is_wp_error( $saved_post_id ) )
-		wp_die( $saved_post_id->get_error_message() );
+	if (is_wp_error($saved_post_id))
+		wp_die($saved_post_id->get_error_message());
 
 	$query_args = array();
 
-	if ( $is_autosave && $saved_post_id ) {
+	if ($is_autosave && $saved_post_id) {
 		$query_args['preview_id'] = $post->ID;
-		$query_args['preview_nonce'] = wp_create_nonce( 'post_preview_' . $post->ID );
+		$query_args['preview_nonce'] = wp_create_nonce('post_preview_'.$post->ID);
 
-		if ( isset( $_POST['post_format'] ) )
-			$query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
+		if (isset($_POST['post_format']))
+			$query_args['post_format'] = empty($_POST['post_format']) ? 'standard' : sanitize_key($_POST['post_format']);
 	}
 
-	return get_preview_post_link( $post, $query_args );
+	return get_preview_post_link($post, $query_args);
 }
 
 /**
@@ -1761,36 +1761,36 @@ 
  * @return mixed The value 0 or WP_Error on failure. The saved post ID on success.
  *               The ID can be the draft post_id or the autosave revision post_id.
  */
-function wp_autosave( $post_data ) {
+function wp_autosave($post_data) {
 	// Back-compat
-	if ( ! defined( 'DOING_AUTOSAVE' ) )
-		define( 'DOING_AUTOSAVE', true );
+	if ( ! defined('DOING_AUTOSAVE'))
+		define('DOING_AUTOSAVE', true);
 
 	$post_id = (int) $post_data['post_id'];
 	$post_data['ID'] = $post_data['post_ID'] = $post_id;
 
-	if ( false === wp_verify_nonce( $post_data['_wpnonce'], 'update-post_' . $post_id ) ) {
-		return new WP_Error( 'invalid_nonce', __( 'Error while saving.' ) );
+	if (false === wp_verify_nonce($post_data['_wpnonce'], 'update-post_'.$post_id)) {
+		return new WP_Error('invalid_nonce', __('Error while saving.'));
 	}
 
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
-		return new WP_Error( 'edit_posts', __( 'You are not allowed to edit this item.' ) );
+	if ( ! current_user_can('edit_post', $post->ID)) {
+		return new WP_Error('edit_posts', __('You are not allowed to edit this item.'));
 	}
 
-	if ( 'auto-draft' == $post->post_status )
+	if ('auto-draft' == $post->post_status)
 		$post_data['post_status'] = 'draft';
 
-	if ( $post_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) )
-		$post_data['post_category'] = explode( ',', $post_data['catslist'] );
+	if ($post_data['post_type'] != 'page' && ! empty($post_data['catslist']))
+		$post_data['post_category'] = explode(',', $post_data['catslist']);
 
-	if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) ) {
+	if ( ! wp_check_post_lock($post->ID) && get_current_user_id() == $post->post_author && ('auto-draft' == $post->post_status || 'draft' == $post->post_status)) {
 		// Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked
-		return edit_post( wp_slash( $post_data ) );
+		return edit_post(wp_slash($post_data));
 	} else {
 		// Non drafts or other users drafts are not overwritten. The autosave is stored in a special post revision for each user.
-		return wp_create_post_autosave( wp_slash( $post_data ) );
+		return wp_create_post_autosave(wp_slash($post_data));
 	}
 }
 
@@ -1800,11 +1800,11 @@ 
  * @param int $post_id Optional. Post ID.
  */
 function redirect_post($post_id = '') {
-	if ( isset($_POST['save']) || isset($_POST['publish']) ) {
-		$status = get_post_status( $post_id );
+	if (isset($_POST['save']) || isset($_POST['publish'])) {
+		$status = get_post_status($post_id);
 
-		if ( isset( $_POST['publish'] ) ) {
-			switch ( $status ) {
+		if (isset($_POST['publish'])) {
+			switch ($status) {
 				case 'pending':
 					$message = 8;
 					break;
@@ -1818,17 +1818,17 @@ 
 			$message = 'draft' == $status ? 10 : 1;
 		}
 
-		$location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) );
-	} elseif ( isset($_POST['addmeta']) && $_POST['addmeta'] ) {
-		$location = add_query_arg( 'message', 2, wp_get_referer() );
+		$location = add_query_arg('message', $message, get_edit_post_link($post_id, 'url'));
+	} elseif (isset($_POST['addmeta']) && $_POST['addmeta']) {
+		$location = add_query_arg('message', 2, wp_get_referer());
 		$location = explode('#', $location);
-		$location = $location[0] . '#postcustom';
-	} elseif ( isset($_POST['deletemeta']) && $_POST['deletemeta'] ) {
-		$location = add_query_arg( 'message', 3, wp_get_referer() );
+		$location = $location[0].'#postcustom';
+	} elseif (isset($_POST['deletemeta']) && $_POST['deletemeta']) {
+		$location = add_query_arg('message', 3, wp_get_referer());
 		$location = explode('#', $location);
-		$location = $location[0] . '#postcustom';
+		$location = $location[0].'#postcustom';
 	} else {
-		$location = add_query_arg( 'message', 4, get_edit_post_link( $post_id, 'url' ) );
+		$location = add_query_arg('message', 4, get_edit_post_link($post_id, 'url'));
 	}
 
 	/**
@@ -1839,6 +1839,6 @@ 
 	 * @param string $location The destination URL.
 	 * @param int    $post_id  The post ID.
 	 */
-	wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
+	wp_redirect(apply_filters('redirect_post_location', $location, $post_id));
 	exit;
 }

Braces +306 added lines, -216 removed lines

@@ -20,37 +20,45 @@ 
  */
 function _wp_translate_postdata( $update = false, $post_data = null ) {
 
-	if ( empty($post_data) )
-		$post_data = &$_POST;
+	if ( empty($post_data) ) {
+			$post_data = &$_POST;
+	}
 
-	if ( $update )
-		$post_data['ID'] = (int) $post_data['post_ID'];
+	if ( $update ) {
+			$post_data['ID'] = (int) $post_data['post_ID'];
+	}
 
 	$ptype = get_post_type_object( $post_data['post_type'] );
 
 	if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
-		else
-			return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+		if ( 'page' == $post_data['post_type'] ) {
+					return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+		} else {
+					return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+		}
 	} elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
-		else
-			return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+		if ( 'page' == $post_data['post_type'] ) {
+					return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+		} else {
+					return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+		}
 	}
 
-	if ( isset( $post_data['content'] ) )
-		$post_data['post_content'] = $post_data['content'];
+	if ( isset( $post_data['content'] ) ) {
+			$post_data['post_content'] = $post_data['content'];
+	}
 
-	if ( isset( $post_data['excerpt'] ) )
-		$post_data['post_excerpt'] = $post_data['excerpt'];
+	if ( isset( $post_data['excerpt'] ) ) {
+			$post_data['post_excerpt'] = $post_data['excerpt'];
+	}
 
-	if ( isset( $post_data['parent_id'] ) )
-		$post_data['post_parent'] = (int) $post_data['parent_id'];
+	if ( isset( $post_data['parent_id'] ) ) {
+			$post_data['post_parent'] = (int) $post_data['parent_id'];
+	}
 
-	if ( isset($post_data['trackback_url']) )
-		$post_data['to_ping'] = $post_data['trackback_url'];
+	if ( isset($post_data['trackback_url']) ) {
+			$post_data['to_ping'] = $post_data['trackback_url'];
+	}
 
 	$post_data['user_ID'] = get_current_user_id();
 
@@ -67,15 +75,17 @@ 
 	if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
 		 && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
 		if ( $update ) {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
-			else
-				return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+			if ( 'page' == $post_data['post_type'] ) {
+							return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+			} else {
+							return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+			}
 		} else {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
-			else
-				return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+			if ( 'page' == $post_data['post_type'] ) {
+							return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+			} else {
+							return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+			}
 		}
 	}
 
@@ -93,21 +103,27 @@ 
 	}
 
 	// What to do based on which button they pressed
-	if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] )
-		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] )
-		$post_data['post_status'] = 'private';
-	if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( !isset($post_data['post_status']) || $post_data['post_status'] != 'private' ) )
-		$post_data['post_status'] = 'publish';
-	if ( isset($post_data['advanced']) && '' != $post_data['advanced'] )
-		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['pending']) && '' != $post_data['pending'] )
-		$post_data['post_status'] = 'pending';
-
-	if ( isset( $post_data['ID'] ) )
-		$post_id = $post_data['ID'];
-	else
-		$post_id = false;
+	if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] ) {
+			$post_data['post_status'] = 'draft';
+	}
+	if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] ) {
+			$post_data['post_status'] = 'private';
+	}
+	if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( !isset($post_data['post_status']) || $post_data['post_status'] != 'private' ) ) {
+			$post_data['post_status'] = 'publish';
+	}
+	if ( isset($post_data['advanced']) && '' != $post_data['advanced'] ) {
+			$post_data['post_status'] = 'draft';
+	}
+	if ( isset($post_data['pending']) && '' != $post_data['pending'] ) {
+			$post_data['post_status'] = 'pending';
+	}
+
+	if ( isset( $post_data['ID'] ) ) {
+			$post_id = $post_data['ID'];
+	} else {
+			$post_id = false;
+	}
 	$previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false;
 
 	if ( isset( $post_data['post_status'] ) && 'private' == $post_data['post_status'] && ! current_user_can( $ptype->cap->publish_posts ) ) {
@@ -118,9 +134,10 @@ 
 
 	// Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
 	// Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
-	if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) )
-		if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) )
+	if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) ) {
+			if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) )
 			$post_data['post_status'] = 'pending';
+	}
 
 	if ( ! isset( $post_data['post_status'] ) ) {
 		$post_data['post_status'] = 'auto-draft' === $previous_status ? 'draft' : $previous_status;
@@ -130,11 +147,13 @@ 
 		unset( $post_data['post_password'] );
 	}
 
-	if (!isset( $post_data['comment_status'] ))
-		$post_data['comment_status'] = 'closed';
+	if (!isset( $post_data['comment_status'] )) {
+			$post_data['comment_status'] = 'closed';
+	}
 
-	if (!isset( $post_data['ping_status'] ))
-		$post_data['ping_status'] = 'closed';
+	if (!isset( $post_data['ping_status'] )) {
+			$post_data['ping_status'] = 'closed';
+	}
 
 	foreach ( array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
 		if ( !empty( $post_data['hidden_' . $timeunit] ) && $post_data['hidden_' . $timeunit] != $post_data[$timeunit] ) {
@@ -181,8 +200,9 @@ 
 function edit_post( $post_data = null ) {
 	global $wpdb;
 
-	if ( empty($post_data) )
-		$post_data = &$_POST;
+	if ( empty($post_data) ) {
+			$post_data = &$_POST;
+	}
 
 	// Clear out any data in internal vars.
 	unset( $post_data['filter'] );
@@ -202,10 +222,11 @@ 
 
 	$ptype = get_post_type_object($post_data['post_type']);
 	if ( !current_user_can( 'edit_post', $post_ID ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			wp_die( __('You are not allowed to edit this page.' ));
-		else
-			wp_die( __('You are not allowed to edit this post.' ));
+		if ( 'page' == $post_data['post_type'] ) {
+					wp_die( __('You are not allowed to edit this page.' ));
+		} else {
+					wp_die( __('You are not allowed to edit this post.' ));
+		}
 	}
 
 	if ( post_type_supports( $ptype->name, 'revisions' ) ) {
@@ -213,8 +234,9 @@ 
 		$revision = current( $revisions );
 
 		// Check if the revisions have been upgraded
-		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 )
-			_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 ) {
+					_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+		}
 	}
 
 	if ( isset($post_data['visibility']) ) {
@@ -234,18 +256,21 @@ 
 	}
 
 	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error($post_data) )
-		wp_die( $post_data->get_error_message() );
+	if ( is_wp_error($post_data) ) {
+			wp_die( $post_data->get_error_message() );
+	}
 
 	// Post Formats
-	if ( isset( $post_data['post_format'] ) )
-		set_post_format( $post_ID, $post_data['post_format'] );
+	if ( isset( $post_data['post_format'] ) ) {
+			set_post_format( $post_ID, $post_data['post_format'] );
+	}
 
 	$format_meta_urls = array( 'url', 'link_url', 'quote_source_url' );
 	foreach ( $format_meta_urls as $format_meta_url ) {
 		$keyed = '_format_' . $format_meta_url;
-		if ( isset( $post_data[ $keyed ] ) )
-			update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
+		if ( isset( $post_data[ $keyed ] ) ) {
+					update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
+		}
 	}
 
 	$format_keys = array( 'quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed' );
@@ -253,10 +278,11 @@ 
 	foreach ( $format_keys as $key ) {
 		$keyed = '_format_' . $key;
 		if ( isset( $post_data[ $keyed ] ) ) {
-			if ( current_user_can( 'unfiltered_html' ) )
-				update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
-			else
-				update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+			if ( current_user_can( 'unfiltered_html' ) ) {
+							update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
+			} else {
+							update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+			}
 		}
 	}
 
@@ -277,24 +303,30 @@ 
 	// Meta Stuff
 	if ( isset($post_data['meta']) && $post_data['meta'] ) {
 		foreach ( $post_data['meta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
-				continue;
-			if ( $meta->post_id != $post_ID )
-				continue;
-			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) )
-				continue;
+			if ( !$meta = get_post_meta_by_id( $key ) ) {
+							continue;
+			}
+			if ( $meta->post_id != $post_ID ) {
+							continue;
+			}
+			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) ) {
+							continue;
+			}
 			update_meta( $key, $value['key'], $value['value'] );
 		}
 	}
 
 	if ( isset($post_data['deletemeta']) && $post_data['deletemeta'] ) {
 		foreach ( $post_data['deletemeta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
-				continue;
-			if ( $meta->post_id != $post_ID )
-				continue;
-			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) )
-				continue;
+			if ( !$meta = get_post_meta_by_id( $key ) ) {
+							continue;
+			}
+			if ( $meta->post_id != $post_ID ) {
+							continue;
+			}
+			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) ) {
+							continue;
+			}
 			delete_meta( $key );
 		}
 	}
@@ -386,10 +418,11 @@ 
 	wp_set_post_lock( $post_ID );
 
 	if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) {
-		if ( ! empty( $post_data['sticky'] ) )
-			stick_post( $post_ID );
-		else
-			unstick_post( $post_ID );
+		if ( ! empty( $post_data['sticky'] ) ) {
+					stick_post( $post_ID );
+		} else {
+					unstick_post( $post_ID );
+		}
 	}
 
 	return $post_ID;
@@ -411,19 +444,22 @@ 
 function bulk_edit_posts( $post_data = null ) {
 	global $wpdb;
 
-	if ( empty($post_data) )
-		$post_data = &$_POST;
+	if ( empty($post_data) ) {
+			$post_data = &$_POST;
+	}
 
-	if ( isset($post_data['post_type']) )
-		$ptype = get_post_type_object($post_data['post_type']);
-	else
-		$ptype = get_post_type_object('post');
+	if ( isset($post_data['post_type']) ) {
+			$ptype = get_post_type_object($post_data['post_type']);
+	} else {
+			$ptype = get_post_type_object('post');
+	}
 
 	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			wp_die( __('You are not allowed to edit pages.'));
-		else
-			wp_die( __('You are not allowed to edit posts.'));
+		if ( 'page' == $ptype->name ) {
+					wp_die( __('You are not allowed to edit pages.'));
+		} else {
+					wp_die( __('You are not allowed to edit posts.'));
+		}
 	}
 
 	if ( -1 == $post_data['_status'] ) {
@@ -452,28 +488,32 @@ 
 	);
 
 	foreach ( $reset as $field ) {
-		if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) )
-			unset($post_data[$field]);
+		if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) ) {
+					unset($post_data[$field]);
+		}
 	}
 
 	if ( isset($post_data['post_category']) ) {
-		if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) )
-			$new_cats = array_map( 'absint', $post_data['post_category'] );
-		else
-			unset($post_data['post_category']);
+		if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) ) {
+					$new_cats = array_map( 'absint', $post_data['post_category'] );
+		} else {
+					unset($post_data['post_category']);
+		}
 	}
 
 	$tax_input = array();
 	if ( isset($post_data['tax_input'])) {
 		foreach ( $post_data['tax_input'] as $tax_name => $terms ) {
-			if ( empty($terms) )
-				continue;
+			if ( empty($terms) ) {
+							continue;
+			}
 			if ( is_taxonomy_hierarchical( $tax_name ) ) {
 				$tax_input[ $tax_name ] = array_map( 'absint', $terms );
 			} else {
 				$comma = _x( ',', 'tag delimiter' );
-				if ( ',' !== $comma )
-					$terms = str_replace( $comma, ',', $terms );
+				if ( ',' !== $comma ) {
+									$terms = str_replace( $comma, ',', $terms );
+				}
 				$tax_input[ $tax_name ] = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
 			}
 		}
@@ -518,15 +558,17 @@ 
 		$tax_names = get_object_taxonomies( $post );
 		foreach ( $tax_names as $tax_name ) {
 			$taxonomy_obj = get_taxonomy($tax_name);
-			if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
-				$new_terms = $tax_input[$tax_name];
-			else
-				$new_terms = array();
+			if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) ) {
+							$new_terms = $tax_input[$tax_name];
+			} else {
+							$new_terms = array();
+			}
 
-			if ( $taxonomy_obj->hierarchical )
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
-			else
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
+			if ( $taxonomy_obj->hierarchical ) {
+							$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
+			} else {
+							$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
+			}
 
 			$post_data['tax_input'][$tax_name] = array_merge( $current_terms, $new_terms );
 		}
@@ -559,14 +601,16 @@ 
 		$updated[] = wp_update_post( $post_data );
 
 		if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
-			if ( 'sticky' == $post_data['sticky'] )
-				stick_post( $post_ID );
-			else
-				unstick_post( $post_ID );
+			if ( 'sticky' == $post_data['sticky'] ) {
+							stick_post( $post_ID );
+			} else {
+							unstick_post( $post_ID );
+			}
 		}
 
-		if ( isset( $post_data['post_format'] ) )
-			set_post_format( $post_ID, $post_data['post_format'] );
+		if ( isset( $post_data['post_format'] ) ) {
+					set_post_format( $post_ID, $post_data['post_format'] );
+		}
 	}
 
 	return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked );
@@ -583,22 +627,26 @@ 
  */
 function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
 	$post_title = '';
-	if ( !empty( $_REQUEST['post_title'] ) )
-		$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ));
+	if ( !empty( $_REQUEST['post_title'] ) ) {
+			$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ));
+	}
 
 	$post_content = '';
-	if ( !empty( $_REQUEST['content'] ) )
-		$post_content = esc_html( wp_unslash( $_REQUEST['content'] ));
+	if ( !empty( $_REQUEST['content'] ) ) {
+			$post_content = esc_html( wp_unslash( $_REQUEST['content'] ));
+	}
 
 	$post_excerpt = '';
-	if ( !empty( $_REQUEST['excerpt'] ) )
-		$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ));
+	if ( !empty( $_REQUEST['excerpt'] ) ) {
+			$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ));
+	}
 
 	if ( $create_in_db ) {
 		$post_id = wp_insert_post( array( 'post_title' => __( 'Auto Draft' ), 'post_type' => $post_type, 'post_status' => 'auto-draft' ) );
 		$post = get_post( $post_id );
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) )
-			set_post_format( $post, get_option( 'default_post_format' ) );
+		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) ) {
+					set_post_format( $post, get_option( 'default_post_format' ) );
+		}
 	} else {
 		$post = new stdClass;
 		$post->ID = 0;
@@ -691,8 +739,9 @@ 
 		$args[] = $post_content;
 	}
 
-	if ( !empty ( $args ) )
-		return (int) $wpdb->get_var( $wpdb->prepare($query, $args) );
+	if ( !empty ( $args ) ) {
+			return (int) $wpdb->get_var( $wpdb->prepare($query, $args) );
+	}
 
 	return 0;
 }
@@ -707,16 +756,18 @@ 
  * @return int|WP_Error
  */
 function wp_write_post() {
-	if ( isset($_POST['post_type']) )
-		$ptype = get_post_type_object($_POST['post_type']);
-	else
-		$ptype = get_post_type_object('post');
+	if ( isset($_POST['post_type']) ) {
+			$ptype = get_post_type_object($_POST['post_type']);
+	} else {
+			$ptype = get_post_type_object('post');
+	}
 
 	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
-		else
-			return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
+		if ( 'page' == $ptype->name ) {
+					return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
+		} else {
+					return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
+		}
 	}
 
 	$_POST['post_mime_type'] = '';
@@ -725,8 +776,9 @@ 
 	unset( $_POST['filter'] );
 
 	// Edit don't write if we have a post id.
-	if ( isset( $_POST['post_ID'] ) )
-		return edit_post();
+	if ( isset( $_POST['post_ID'] ) ) {
+			return edit_post();
+	}
 
 	if ( isset($_POST['visibility']) ) {
 		switch ( $_POST['visibility'] ) {
@@ -745,16 +797,19 @@ 
 	}
 
 	$translated = _wp_translate_postdata( false );
-	if ( is_wp_error($translated) )
-		return $translated;
+	if ( is_wp_error($translated) ) {
+			return $translated;
+	}
 
 	// Create the post.
 	$post_ID = wp_insert_post( $_POST );
-	if ( is_wp_error( $post_ID ) )
-		return $post_ID;
+	if ( is_wp_error( $post_ID ) ) {
+			return $post_ID;
+	}
 
-	if ( empty($post_ID) )
-		return 0;
+	if ( empty($post_ID) ) {
+			return 0;
+	}
 
 	add_meta( $post_ID );
 
@@ -777,11 +832,12 @@ 
  */
 function write_post() {
 	$result = wp_write_post();
-	if ( is_wp_error( $result ) )
-		wp_die( $result->get_error_message() );
-	else
-		return $result;
-}
+	if ( is_wp_error( $result ) ) {
+			wp_die( $result->get_error_message() );
+	} else {
+			return $result;
+	}
+	}
 
 //
 // Post Meta
@@ -801,22 +857,27 @@ 
 	$metakeyselect = isset($_POST['metakeyselect']) ? wp_unslash( trim( $_POST['metakeyselect'] ) ) : '';
 	$metakeyinput = isset($_POST['metakeyinput']) ? wp_unslash( trim( $_POST['metakeyinput'] ) ) : '';
 	$metavalue = isset($_POST['metavalue']) ? $_POST['metavalue'] : '';
-	if ( is_string( $metavalue ) )
-		$metavalue = trim( $metavalue );
+	if ( is_string( $metavalue ) ) {
+			$metavalue = trim( $metavalue );
+	}
 
 	if ( ('0' === $metavalue || ! empty ( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput ) ) ) {
 		/*
 		 * We have a key/value pair. If both the select and the input
 		 * for the key have data, the input takes precedence.
 		 */
- 		if ( '#NONE#' != $metakeyselect )
-			$metakey = $metakeyselect;
+ 		if ( '#NONE#' != $metakeyselect ) {
+ 					$metakey = $metakeyselect;
+ 		}
 
-		if ( $metakeyinput )
-			$metakey = $metakeyinput; // default
+		if ( $metakeyinput ) {
+					$metakey = $metakeyinput;
+		}
+		// default
 
-		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) )
-			return false;
+		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) ) {
+					return false;
+		}
 
 		$metakey = wp_slash( $metakey );
 
@@ -924,12 +985,14 @@ 
 	$content = $post['post_content'];
 
 	// Don't run if no pretty permalinks or post is not published, scheduled, or privately published.
-	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ) ) )
-		return;
+	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ) ) ) {
+			return;
+	}
 
 	// Short if there aren't any links or no '?attachment_id=' strings (strpos cannot be zero)
-	if ( !strpos($content, '?attachment_id=') || !preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) )
-		return;
+	if ( !strpos($content, '?attachment_id=') || !preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) ) {
+			return;
+	}
 
 	$site_url = get_bloginfo('url');
 	$site_url = substr( $site_url, (int) strpos($site_url, '://') ); // remove the http(s)
@@ -938,15 +1001,17 @@ 
 	foreach ( $link_matches[1] as $key => $value ) {
 		if ( !strpos($value, '?attachment_id=') || !strpos($value, 'wp-att-')
 			|| !preg_match( '/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match )
-			|| !preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) )
-				continue;
+			|| !preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) ) {
+						continue;
+		}
 
 		$quote = $url_match[1]; // the quote (single or double)
 		$url_id = (int) $url_match[2];
 		$rel_id = (int) $rel_match[1];
 
-		if ( !$url_id || !$rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false )
-			continue;
+		if ( !$url_id || !$rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false ) {
+					continue;
+		}
 
 		$link = $link_matches[0][$key];
 		$replace = str_replace( $url_match[0], 'href=' . $quote . get_attachment_link( $url_id ) . $quote, $link );
@@ -986,16 +1051,18 @@ 
  * @return array
  */
 function wp_edit_posts_query( $q = false ) {
-	if ( false === $q )
-		$q = $_GET;
+	if ( false === $q ) {
+			$q = $_GET;
+	}
 	$q['m'] = isset($q['m']) ? (int) $q['m'] : 0;
 	$q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
 	$post_stati  = get_post_stati();
 
-	if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) )
-		$post_type = $q['post_type'];
-	else
-		$post_type = 'post';
+	if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) ) {
+			$post_type = $q['post_type'];
+	} else {
+			$post_type = 'post';
+	}
 
 	$avail_post_stati = get_available_post_statuses($post_type);
 
@@ -1018,8 +1085,9 @@ 
 
 	$per_page = "edit_{$post_type}_per_page";
 	$posts_per_page = (int) get_user_option( $per_page );
-	if ( empty( $posts_per_page ) || $posts_per_page < 1 )
-		$posts_per_page = 20;
+	if ( empty( $posts_per_page ) || $posts_per_page < 1 ) {
+			$posts_per_page = 20;
+	}
 
 	/**
 	 * Filter the number of items per page to show for a specific 'per_page' type.
@@ -1057,8 +1125,9 @@ 
 		$query['fields'] = 'id=>parent';
 	}
 
-	if ( ! empty( $q['show_sticky'] ) )
-		$query['post__in'] = (array) get_option( 'sticky_posts' );
+	if ( ! empty( $q['show_sticky'] ) ) {
+			$query['post__in'] = (array) get_option( 'sticky_posts' );
+	}
 
 	wp( $query );
 
@@ -1206,8 +1275,9 @@ 
  */
 function get_sample_permalink($id, $title = null, $name = null) {
 	$post = get_post( $id );
-	if ( ! $post )
-		return array( '', '' );
+	if ( ! $post ) {
+			return array( '', '' );
+	}
 
 	$ptype = get_post_type_object($post->post_type);
 
@@ -1223,8 +1293,9 @@ 
 
 	// If the user wants to set a new name -- override the current one
 	// Note: if empty name is supplied -- use the title instead, see #6072
-	if ( !is_null($name) )
-		$post->post_name = sanitize_title($name ? $name : $title, $post->ID);
+	if ( !is_null($name) ) {
+			$post->post_name = sanitize_title($name ? $name : $title, $post->ID);
+	}
 
 	$post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
 
@@ -1246,8 +1317,9 @@ 
 
 		/** This filter is documented in wp-admin/edit-tag-form.php */
 		$uri = apply_filters( 'editable_slug', $uri, $post );
-		if ( !empty($uri) )
-			$uri .= '/';
+		if ( !empty($uri) ) {
+					$uri .= '/';
+		}
 		$permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink);
 	}
 
@@ -1284,8 +1356,9 @@ 
  */
 function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
 	$post = get_post( $id );
-	if ( ! $post )
-		return '';
+	if ( ! $post ) {
+			return '';
+	}
 
 	list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
 
@@ -1445,11 +1518,13 @@ 
  * @return integer False: not locked or locked by current user. Int: user ID of user with lock.
  */
 function wp_check_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
 
-	if ( !$lock = get_post_meta( $post->ID, '_edit_lock', true ) )
-		return false;
+	if ( !$lock = get_post_meta( $post->ID, '_edit_lock', true ) ) {
+			return false;
+	}
 
 	$lock = explode( ':', $lock );
 	$time = $lock[0];
@@ -1458,8 +1533,9 @@ 
 	/** This filter is documented in wp-admin/includes/ajax-actions.php */
 	$time_window = apply_filters( 'wp_check_post_lock_window', 150 );
 
-	if ( $time && $time > time() - $time_window && $user != get_current_user_id() )
-		return $user;
+	if ( $time && $time > time() - $time_window && $user != get_current_user_id() ) {
+			return $user;
+	}
 	return false;
 }
 
@@ -1473,10 +1549,12 @@ 
  * 	an array of the lock time and the user ID.
  */
 function wp_set_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
-		return false;
-	if ( 0 == ($user_id = get_current_user_id()) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
+	if ( 0 == ($user_id = get_current_user_id()) ) {
+			return false;
+	}
 
 	$now = time();
 	$lock = "$now:$user_id";
@@ -1492,12 +1570,14 @@ 
  * @return none
  */
 function _admin_notice_post_locked() {
-	if ( ! $post = get_post() )
-		return;
+	if ( ! $post = get_post() ) {
+			return;
+	}
 
 	$user = null;
-	if (  $user_id = wp_check_post_lock( $post->ID ) )
-		$user = get_userdata( $user_id );
+	if (  $user_id = wp_check_post_lock( $post->ID ) ) {
+			$user = get_userdata( $user_id );
+	}
 
 	if ( $user ) {
 
@@ -1511,8 +1591,9 @@ 
 		 * @param bool         $display Whether to display the dialog. Default true.
 		 * @param WP_User|bool $user    WP_User object on success, false otherwise.
 		 */
-		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) )
-			return;
+		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) ) {
+					return;
+		}
 
 		$locked = true;
 	} else {
@@ -1526,8 +1607,9 @@ 
 	} else {
 		$sendback = admin_url( 'edit.php' );
 
-		if ( 'post' != $post->post_type )
-			$sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
+		if ( 'post' != $post->post_type ) {
+					$sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
+		}
 
 		$sendback_text = get_post_type_object( $post->post_type )->labels->all_items;
 	}
@@ -1574,8 +1656,9 @@ 
 		<p class="currently-editing wp-tab-first" tabindex="0">
 		<?php
 			_e( 'This content is currently locked.' );
-			if ( $override )
-				printf( ' ' . __( 'If you take over, %s will be blocked from continuing to edit.' ), esc_html( $user->display_name ) );
+			if ( $override ) {
+							printf( ' ' . __( 'If you take over, %s will be blocked from continuing to edit.' ), esc_html( $user->display_name ) );
+			}
 		?>
 		</p>
 		<?php
@@ -1655,8 +1738,9 @@ 
 	}
 
 	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error( $post_data ) )
-		return $post_data;
+	if ( is_wp_error( $post_data ) ) {
+			return $post_data;
+	}
 
 	$post_author = get_current_user_id();
 
@@ -1728,14 +1812,16 @@ 
 	} else {
 		$is_autosave = true;
 
-		if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] )
-			$_POST['post_status'] = 'draft';
+		if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] ) {
+					$_POST['post_status'] = 'draft';
+		}
 
 		$saved_post_id = wp_create_post_autosave( $post->ID );
 	}
 
-	if ( is_wp_error( $saved_post_id ) )
-		wp_die( $saved_post_id->get_error_message() );
+	if ( is_wp_error( $saved_post_id ) ) {
+			wp_die( $saved_post_id->get_error_message() );
+	}
 
 	$query_args = array();
 
@@ -1743,8 +1829,9 @@ 
 		$query_args['preview_id'] = $post->ID;
 		$query_args['preview_nonce'] = wp_create_nonce( 'post_preview_' . $post->ID );
 
-		if ( isset( $_POST['post_format'] ) )
-			$query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
+		if ( isset( $_POST['post_format'] ) ) {
+					$query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
+		}
 	}
 
 	return get_preview_post_link( $post, $query_args );
@@ -1763,8 +1850,9 @@ 
  */
 function wp_autosave( $post_data ) {
 	// Back-compat
-	if ( ! defined( 'DOING_AUTOSAVE' ) )
-		define( 'DOING_AUTOSAVE', true );
+	if ( ! defined( 'DOING_AUTOSAVE' ) ) {
+			define( 'DOING_AUTOSAVE', true );
+	}
 
 	$post_id = (int) $post_data['post_id'];
 	$post_data['ID'] = $post_data['post_ID'] = $post_id;
@@ -1779,11 +1867,13 @@ 
 		return new WP_Error( 'edit_posts', __( 'You are not allowed to edit this item.' ) );
 	}
 
-	if ( 'auto-draft' == $post->post_status )
-		$post_data['post_status'] = 'draft';
+	if ( 'auto-draft' == $post->post_status ) {
+			$post_data['post_status'] = 'draft';
+	}
 
-	if ( $post_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) )
-		$post_data['post_category'] = explode( ',', $post_data['catslist'] );
+	if ( $post_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) ) {
+			$post_data['post_category'] = explode( ',', $post_data['catslist'] );
+	}
 
 	if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) ) {
 		// Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked

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

Doc Comments +2 added lines, -2 removed lines

@@ -339,8 +339,8 @@
 	 *
 	 * @since 3.4.0
 	 *
-	 * @param mixed $ajax_message AJAX return
-	 * @param mixed $message UI message
+	 * @param integer $ajax_message AJAX return
+	 * @param string $message UI message
 	 */
 	protected function wp_die( $ajax_message, $message = null ) {
 		if ( $this->doing_ajax() || isset( $_POST['customized'] ) ) {

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * WordPress Customize Manager classes
- *
- * @package WordPress
- * @subpackage Customize
- * @since 3.4.0
- */
+	 * WordPress Customize Manager classes
+	 *
+	 * @package WordPress
+	 * @subpackage Customize
+	 * @since 3.4.0
+	 */
 
 /**
  * Customize Manager class.

Spacing +503 added lines, -503 removed lines

@@ -109,7 +109,7 @@ 
 	 * @access protected
 	 * @var array
 	 */
-	protected $components = array( 'widgets', 'nav_menus', 'selective_refresh' );
+	protected $components = array('widgets', 'nav_menus', 'selective_refresh');
 
 	/**
 	 * Registered instances of WP_Customize_Section.
@@ -205,41 +205,41 @@ 
 	 * @since 3.4.0
 	 */
 	public function __construct() {
-		require_once( ABSPATH . WPINC . '/class-wp-customize-setting.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-panel.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-section.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-control.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-color-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-media-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-upload-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menus-panel.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-themes-section.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-sidebar-section.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-section.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-setting.php' );
+		require_once(ABSPATH.WPINC.'/class-wp-customize-setting.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-panel.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-section.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-control.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-color-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-media-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-upload-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-cropped-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-site-icon-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-theme-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-widget-area-customize-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-widget-form-customize-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-location-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-name-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-auto-add-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-new-menu-control.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menus-panel.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-themes-section.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-sidebar-section.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-section.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-new-menu-section.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-filter-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-setting.php');
 
 		/**
 		 * Filter the core Customizer components to load.
@@ -256,54 +256,54 @@ 
 		 * @param array                $components List of core components to load.
 		 * @param WP_Customize_Manager $this       WP_Customize_Manager instance.
 		 */
-		$components = apply_filters( 'customize_loaded_components', $this->components, $this );
+		$components = apply_filters('customize_loaded_components', $this->components, $this);
 
-		if ( in_array( 'widgets', $components, true ) ) {
-			require_once( ABSPATH . WPINC . '/class-wp-customize-widgets.php' );
-			$this->widgets = new WP_Customize_Widgets( $this );
+		if (in_array('widgets', $components, true)) {
+			require_once(ABSPATH.WPINC.'/class-wp-customize-widgets.php');
+			$this->widgets = new WP_Customize_Widgets($this);
 		}
 
-		if ( in_array( 'nav_menus', $components, true ) ) {
-			require_once( ABSPATH . WPINC . '/class-wp-customize-nav-menus.php' );
-			$this->nav_menus = new WP_Customize_Nav_Menus( $this );
+		if (in_array('nav_menus', $components, true)) {
+			require_once(ABSPATH.WPINC.'/class-wp-customize-nav-menus.php');
+			$this->nav_menus = new WP_Customize_Nav_Menus($this);
 		}
 
-		if ( in_array( 'selective_refresh', $components, true ) ) {
-			require_once( ABSPATH . WPINC . '/customize/class-wp-customize-selective-refresh.php' );
-			$this->selective_refresh = new WP_Customize_Selective_Refresh( $this );
+		if (in_array('selective_refresh', $components, true)) {
+			require_once(ABSPATH.WPINC.'/customize/class-wp-customize-selective-refresh.php');
+			$this->selective_refresh = new WP_Customize_Selective_Refresh($this);
 		}
 
-		add_filter( 'wp_die_handler', array( $this, 'wp_die_handler' ) );
+		add_filter('wp_die_handler', array($this, 'wp_die_handler'));
 
-		add_action( 'setup_theme', array( $this, 'setup_theme' ) );
-		add_action( 'wp_loaded',   array( $this, 'wp_loaded' ) );
+		add_action('setup_theme', array($this, 'setup_theme'));
+		add_action('wp_loaded', array($this, 'wp_loaded'));
 
 		// Run wp_redirect_status late to make sure we override the status last.
-		add_action( 'wp_redirect_status', array( $this, 'wp_redirect_status' ), 1000 );
+		add_action('wp_redirect_status', array($this, 'wp_redirect_status'), 1000);
 
 		// Do not spawn cron (especially the alternate cron) while running the Customizer.
-		remove_action( 'init', 'wp_cron' );
+		remove_action('init', 'wp_cron');
 
 		// Do not run update checks when rendering the controls.
-		remove_action( 'admin_init', '_maybe_update_core' );
-		remove_action( 'admin_init', '_maybe_update_plugins' );
-		remove_action( 'admin_init', '_maybe_update_themes' );
+		remove_action('admin_init', '_maybe_update_core');
+		remove_action('admin_init', '_maybe_update_plugins');
+		remove_action('admin_init', '_maybe_update_themes');
 
-		add_action( 'wp_ajax_customize_save',           array( $this, 'save' ) );
-		add_action( 'wp_ajax_customize_refresh_nonces', array( $this, 'refresh_nonces' ) );
+		add_action('wp_ajax_customize_save', array($this, 'save'));
+		add_action('wp_ajax_customize_refresh_nonces', array($this, 'refresh_nonces'));
 
-		add_action( 'customize_register',                 array( $this, 'register_controls' ) );
-		add_action( 'customize_register',                 array( $this, 'register_dynamic_settings' ), 11 ); // allow code to create settings first
-		add_action( 'customize_controls_init',            array( $this, 'prepare_controls' ) );
-		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_control_scripts' ) );
+		add_action('customize_register', array($this, 'register_controls'));
+		add_action('customize_register', array($this, 'register_dynamic_settings'), 11); // allow code to create settings first
+		add_action('customize_controls_init', array($this, 'prepare_controls'));
+		add_action('customize_controls_enqueue_scripts', array($this, 'enqueue_control_scripts'));
 
 		// Render Panel, Section, and Control templates.
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_panel_templates' ), 1 );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_section_templates' ), 1 );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_control_templates' ), 1 );
+		add_action('customize_controls_print_footer_scripts', array($this, 'render_panel_templates'), 1);
+		add_action('customize_controls_print_footer_scripts', array($this, 'render_section_templates'), 1);
+		add_action('customize_controls_print_footer_scripts', array($this, 'render_control_templates'), 1);
 
 		// Export the settings to JS via the _wpCustomizeSettings variable.
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'customize_pane_settings' ), 1000 );
+		add_action('customize_controls_print_footer_scripts', array($this, 'customize_pane_settings'), 1000);
 	}
 
 	/**
@@ -316,20 +316,20 @@ 
 	 * @param string|null $action Whether the supplied AJAX action is being run.
 	 * @return bool True if it's an AJAX request, false otherwise.
 	 */
-	public function doing_ajax( $action = null ) {
-		$doing_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
-		if ( ! $doing_ajax ) {
+	public function doing_ajax($action = null) {
+		$doing_ajax = (defined('DOING_AJAX') && DOING_AJAX);
+		if ( ! $doing_ajax) {
 			return false;
 		}
 
-		if ( ! $action ) {
+		if ( ! $action) {
 			return true;
 		} else {
 			/*
 			 * Note: we can't just use doing_action( "wp_ajax_{$action}" ) because we need
 			 * to check before admin-ajax.php gets to that point.
 			 */
-			return isset( $_REQUEST['action'] ) && wp_unslash( $_REQUEST['action'] ) === $action;
+			return isset($_REQUEST['action']) && wp_unslash($_REQUEST['action']) === $action;
 		}
 	}
 
@@ -342,16 +342,16 @@ 
 	 * @param mixed $ajax_message AJAX return
 	 * @param mixed $message UI message
 	 */
-	protected function wp_die( $ajax_message, $message = null ) {
-		if ( $this->doing_ajax() || isset( $_POST['customized'] ) ) {
-			wp_die( $ajax_message );
+	protected function wp_die($ajax_message, $message = null) {
+		if ($this->doing_ajax() || isset($_POST['customized'])) {
+			wp_die($ajax_message);
 		}
 
-		if ( ! $message ) {
-			$message = __( 'Cheatin’ uh?' );
+		if ( ! $message) {
+			$message = __('Cheatin’ uh?');
 		}
 
-		wp_die( $message );
+		wp_die($message);
 	}
 
 	/**
@@ -362,7 +362,7 @@ 
 	 * @return string
 	 */
 	public function wp_die_handler() {
-		if ( $this->doing_ajax() || isset( $_POST['customized'] ) ) {
+		if ($this->doing_ajax() || isset($_POST['customized'])) {
 			return '_ajax_wp_die_handler';
 		}
 
@@ -379,41 +379,41 @@ 
 	public function setup_theme() {
 		send_origin_headers();
 
-		$doing_ajax_or_is_customized = ( $this->doing_ajax() || isset( $_POST['customized'] ) );
-		if ( is_admin() && ! $doing_ajax_or_is_customized ) {
+		$doing_ajax_or_is_customized = ($this->doing_ajax() || isset($_POST['customized']));
+		if (is_admin() && ! $doing_ajax_or_is_customized) {
 			auth_redirect();
-		} elseif ( $doing_ajax_or_is_customized && ! is_user_logged_in() ) {
-			$this->wp_die( 0, __( 'You must be logged in to complete this action.' ) );
+		} elseif ($doing_ajax_or_is_customized && ! is_user_logged_in()) {
+			$this->wp_die(0, __('You must be logged in to complete this action.'));
 		}
 
-		show_admin_bar( false );
+		show_admin_bar(false);
 
-		if ( ! current_user_can( 'customize' ) ) {
-			$this->wp_die( -1, __( 'You are not allowed to customize the appearance of this site.' ) );
+		if ( ! current_user_can('customize')) {
+			$this->wp_die( -1, __('You are not allowed to customize the appearance of this site.') );
 		}
 
 		$this->original_stylesheet = get_stylesheet();
 
-		$this->theme = wp_get_theme( isset( $_REQUEST['theme'] ) ? $_REQUEST['theme'] : null );
+		$this->theme = wp_get_theme(isset($_REQUEST['theme']) ? $_REQUEST['theme'] : null);
 
-		if ( $this->is_theme_active() ) {
+		if ($this->is_theme_active()) {
 			// Once the theme is loaded, we'll validate it.
-			add_action( 'after_setup_theme', array( $this, 'after_setup_theme' ) );
+			add_action('after_setup_theme', array($this, 'after_setup_theme'));
 		} else {
 			// If the requested theme is not the active theme and the user doesn't have the
 			// switch_themes cap, bail.
-			if ( ! current_user_can( 'switch_themes' ) ) {
-				$this->wp_die( -1, __( 'You are not allowed to edit theme options on this site.' ) );
+			if ( ! current_user_can('switch_themes')) {
+				$this->wp_die( -1, __('You are not allowed to edit theme options on this site.') );
 			}
 
 			// If the theme has errors while loading, bail.
-			if ( $this->theme()->errors() ) {
+			if ($this->theme()->errors()) {
 				$this->wp_die( -1, $this->theme()->errors()->get_error_message() );
 			}
 
 			// If the theme isn't allowed per multisite settings, bail.
-			if ( ! $this->theme()->is_allowed() ) {
-				$this->wp_die( -1, __( 'The requested theme does not exist.' ) );
+			if ( ! $this->theme()->is_allowed()) {
+				$this->wp_die( -1, __('The requested theme does not exist.') );
 			}
 		}
 
@@ -426,9 +426,9 @@ 
 	 * @since 3.4.0
 	 */
 	public function after_setup_theme() {
-		$doing_ajax_or_is_customized = ( $this->doing_ajax() || isset( $_SERVER['customized'] ) );
-		if ( ! $doing_ajax_or_is_customized && ! validate_current_theme() ) {
-			wp_redirect( 'themes.php?broken=true' );
+		$doing_ajax_or_is_customized = ($this->doing_ajax() || isset($_SERVER['customized']));
+		if ( ! $doing_ajax_or_is_customized && ! validate_current_theme()) {
+			wp_redirect('themes.php?broken=true');
 			exit;
 		}
 	}
@@ -441,24 +441,24 @@ 
 	 */
 	public function start_previewing_theme() {
 		// Bail if we're already previewing.
-		if ( $this->is_preview() ) {
+		if ($this->is_preview()) {
 			return;
 		}
 
 		$this->previewing = true;
 
-		if ( ! $this->is_theme_active() ) {
-			add_filter( 'template', array( $this, 'get_template' ) );
-			add_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
-			add_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
+		if ( ! $this->is_theme_active()) {
+			add_filter('template', array($this, 'get_template'));
+			add_filter('stylesheet', array($this, 'get_stylesheet'));
+			add_filter('pre_option_current_theme', array($this, 'current_theme'));
 
 			// @link: https://core.trac.wordpress.org/ticket/20027
-			add_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
-			add_filter( 'pre_option_template', array( $this, 'get_template' ) );
+			add_filter('pre_option_stylesheet', array($this, 'get_stylesheet'));
+			add_filter('pre_option_template', array($this, 'get_template'));
 
 			// Handle custom theme roots.
-			add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
-			add_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
+			add_filter('pre_option_stylesheet_root', array($this, 'get_stylesheet_root'));
+			add_filter('pre_option_template_root', array($this, 'get_template_root'));
 		}
 
 		/**
@@ -468,7 +468,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'start_previewing_theme', $this );
+		do_action('start_previewing_theme', $this);
 	}
 
 	/**
@@ -479,24 +479,24 @@ 
 	 * @since 3.4.0
 	 */
 	public function stop_previewing_theme() {
-		if ( ! $this->is_preview() ) {
+		if ( ! $this->is_preview()) {
 			return;
 		}
 
 		$this->previewing = false;
 
-		if ( ! $this->is_theme_active() ) {
-			remove_filter( 'template', array( $this, 'get_template' ) );
-			remove_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
-			remove_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
+		if ( ! $this->is_theme_active()) {
+			remove_filter('template', array($this, 'get_template'));
+			remove_filter('stylesheet', array($this, 'get_stylesheet'));
+			remove_filter('pre_option_current_theme', array($this, 'current_theme'));
 
 			// @link: https://core.trac.wordpress.org/ticket/20027
-			remove_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
-			remove_filter( 'pre_option_template', array( $this, 'get_template' ) );
+			remove_filter('pre_option_stylesheet', array($this, 'get_stylesheet'));
+			remove_filter('pre_option_template', array($this, 'get_template'));
 
 			// Handle custom theme roots.
-			remove_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
-			remove_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
+			remove_filter('pre_option_stylesheet_root', array($this, 'get_stylesheet_root'));
+			remove_filter('pre_option_template_root', array($this, 'get_template_root'));
 		}
 
 		/**
@@ -506,7 +506,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'stop_previewing_theme', $this );
+		do_action('stop_previewing_theme', $this);
 	}
 
 	/**
@@ -517,7 +517,7 @@ 
 	 * @return WP_Theme
 	 */
 	public function theme() {
-		if ( ! $this->theme ) {
+		if ( ! $this->theme) {
 			$this->theme = wp_get_theme();
 		}
 		return $this->theme;
@@ -604,9 +604,9 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_register', $this );
+		do_action('customize_register', $this);
 
-		if ( $this->is_preview() && ! is_admin() )
+		if ($this->is_preview() && ! is_admin())
 			$this->customize_preview_init();
 	}
 
@@ -621,8 +621,8 @@ 
 	 * @param $status
 	 * @return int
 	 */
-	public function wp_redirect_status( $status ) {
-		if ( $this->is_preview() && ! is_admin() )
+	public function wp_redirect_status($status) {
+		if ($this->is_preview() && ! is_admin())
 			return 200;
 
 		return $status;
@@ -637,15 +637,15 @@ 
 	 * @return array
 	 */
 	public function unsanitized_post_values() {
-		if ( ! isset( $this->_post_values ) ) {
-			if ( isset( $_POST['customized'] ) ) {
-				$this->_post_values = json_decode( wp_unslash( $_POST['customized'] ), true );
+		if ( ! isset($this->_post_values)) {
+			if (isset($_POST['customized'])) {
+				$this->_post_values = json_decode(wp_unslash($_POST['customized']), true);
 			}
-			if ( empty( $this->_post_values ) ) { // if not isset or if JSON error
+			if (empty($this->_post_values)) { // if not isset or if JSON error
 				$this->_post_values = array();
 			}
 		}
-		if ( empty( $this->_post_values ) ) {
+		if (empty($this->_post_values)) {
 			return array();
 		} else {
 			return $this->_post_values;
@@ -662,10 +662,10 @@ 
 	 * @param mixed $default value returned $setting has no post value (added in 4.2.0).
 	 * @return string|mixed $post_value Sanitized value or the $default provided
 	 */
-	public function post_value( $setting, $default = null ) {
+	public function post_value($setting, $default = null) {
 		$post_values = $this->unsanitized_post_values();
-		if ( array_key_exists( $setting->id, $post_values ) ) {
-			return $setting->sanitize( $post_values[ $setting->id ] );
+		if (array_key_exists($setting->id, $post_values)) {
+			return $setting->sanitize($post_values[$setting->id]);
 		} else {
 			return $default;
 		}
@@ -680,9 +680,9 @@ 
 	 * @param string $setting_id ID for the WP_Customize_Setting instance.
 	 * @param mixed  $value      Post value.
 	 */
-	public function set_post_value( $setting_id, $value ) {
+	public function set_post_value($setting_id, $value) {
 		$this->unsanitized_post_values();
-		$this->_post_values[ $setting_id ] = $value;
+		$this->_post_values[$setting_id] = $value;
 
 		/**
 		 * Announce when a specific setting's unsanitized post value has been set.
@@ -696,7 +696,7 @@ 
 		 * @param mixed                $value Unsanitized setting post value.
 		 * @param WP_Customize_Manager $this  WP_Customize_Manager instance.
 		 */
-		do_action( "customize_post_value_set_{$setting_id}", $value, $this );
+		do_action("customize_post_value_set_{$setting_id}", $value, $this);
 
 		/**
 		 * Announce when any setting's unsanitized post value has been set.
@@ -712,7 +712,7 @@ 
 		 * @param mixed                $value      Unsanitized setting post value.
 		 * @param WP_Customize_Manager $this       WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_post_value_set', $setting_id, $value, $this );
+		do_action('customize_post_value_set', $setting_id, $value, $this);
 	}
 
 	/**
@@ -721,20 +721,20 @@ 
 	 * @since 3.4.0
 	 */
 	public function customize_preview_init() {
-		$this->nonce_tick = check_ajax_referer( 'preview-customize_' . $this->get_stylesheet(), 'nonce' );
+		$this->nonce_tick = check_ajax_referer('preview-customize_'.$this->get_stylesheet(), 'nonce');
 
 		$this->prepare_controls();
 
-		wp_enqueue_script( 'customize-preview' );
-		add_action( 'wp', array( $this, 'customize_preview_override_404_status' ) );
-		add_action( 'wp_head', array( $this, 'customize_preview_base' ) );
-		add_action( 'wp_head', array( $this, 'customize_preview_html5' ) );
-		add_action( 'wp_head', array( $this, 'customize_preview_loading_style' ) );
-		add_action( 'wp_footer', array( $this, 'customize_preview_settings' ), 20 );
-		add_action( 'shutdown', array( $this, 'customize_preview_signature' ), 1000 );
-		add_filter( 'wp_die_handler', array( $this, 'remove_preview_signature' ) );
+		wp_enqueue_script('customize-preview');
+		add_action('wp', array($this, 'customize_preview_override_404_status'));
+		add_action('wp_head', array($this, 'customize_preview_base'));
+		add_action('wp_head', array($this, 'customize_preview_html5'));
+		add_action('wp_head', array($this, 'customize_preview_loading_style'));
+		add_action('wp_footer', array($this, 'customize_preview_settings'), 20);
+		add_action('shutdown', array($this, 'customize_preview_signature'), 1000);
+		add_filter('wp_die_handler', array($this, 'remove_preview_signature'));
 
-		foreach ( $this->settings as $setting ) {
+		foreach ($this->settings as $setting) {
 			$setting->preview();
 		}
 
@@ -746,7 +746,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_preview_init', $this );
+		do_action('customize_preview_init', $this);
 	}
 
 	/**
@@ -757,8 +757,8 @@ 
 	 * @access public
 	 */
 	public function customize_preview_override_404_status() {
-		if ( is_404() ) {
-			status_header( 200 );
+		if (is_404()) {
+			status_header(200);
 		}
 	}
 
@@ -768,7 +768,7 @@ 
 	 * @since 3.4.0
 	 */
 	public function customize_preview_base() {
-		?><base href="<?php echo home_url( '/' ); ?>" /><?php
+		?><base href="<?php echo home_url('/'); ?>" /><?php
 	}
 
 	/**
@@ -821,43 +821,43 @@ 
 				'active'     => $this->is_theme_active(),
 			),
 			'url' => array(
-				'self' => empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+				'self' => empty($_SERVER['REQUEST_URI']) ? home_url('/') : esc_url_raw(wp_unslash($_SERVER['REQUEST_URI'])),
 			),
-			'channel' => wp_unslash( $_POST['customize_messenger_channel'] ),
+			'channel' => wp_unslash($_POST['customize_messenger_channel']),
 			'activePanels' => array(),
 			'activeSections' => array(),
 			'activeControls' => array(),
 			'nonce' => $this->get_nonces(),
 			'l10n' => array(
-				'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
+				'shiftClickToEdit' => __('Shift-click to edit this element.'),
 			),
-			'_dirty' => array_keys( $this->unsanitized_post_values() ),
+			'_dirty' => array_keys($this->unsanitized_post_values()),
 		);
 
-		foreach ( $this->panels as $panel_id => $panel ) {
-			if ( $panel->check_capabilities() ) {
-				$settings['activePanels'][ $panel_id ] = $panel->active();
-				foreach ( $panel->sections as $section_id => $section ) {
-					if ( $section->check_capabilities() ) {
-						$settings['activeSections'][ $section_id ] = $section->active();
+		foreach ($this->panels as $panel_id => $panel) {
+			if ($panel->check_capabilities()) {
+				$settings['activePanels'][$panel_id] = $panel->active();
+				foreach ($panel->sections as $section_id => $section) {
+					if ($section->check_capabilities()) {
+						$settings['activeSections'][$section_id] = $section->active();
 					}
 				}
 			}
 		}
-		foreach ( $this->sections as $id => $section ) {
-			if ( $section->check_capabilities() ) {
-				$settings['activeSections'][ $id ] = $section->active();
+		foreach ($this->sections as $id => $section) {
+			if ($section->check_capabilities()) {
+				$settings['activeSections'][$id] = $section->active();
 			}
 		}
-		foreach ( $this->controls as $id => $control ) {
-			if ( $control->check_capabilities() ) {
-				$settings['activeControls'][ $id ] = $control->active();
+		foreach ($this->controls as $id => $control) {
+			if ($control->check_capabilities()) {
+				$settings['activeControls'][$id] = $control->active();
 			}
 		}
 
 		?>
 		<script type="text/javascript">
-			var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+			var _wpCustomizeSettings = <?php echo wp_json_encode($settings); ?>;
 			_wpCustomizeSettings.values = {};
 			(function( v ) {
 				<?php
@@ -866,12 +866,12 @@ 
 				 * serialization in order to avoid a peak memory usage spike.
 				 * @todo We may not even need to export the values at all since the pane syncs them anyway.
 				 */
-				foreach ( $this->settings as $id => $setting ) {
-					if ( $setting->check_capabilities() ) {
+				foreach ($this->settings as $id => $setting) {
+					if ($setting->check_capabilities()) {
 						printf(
 							"v[%s] = %s;\n",
-							wp_json_encode( $id ),
-							wp_json_encode( $setting->js_value() )
+							wp_json_encode($id),
+							wp_json_encode($setting->js_value())
 						);
 					}
 				}
@@ -898,8 +898,8 @@ 
 	 * @param mixed $return Value passed through for wp_die_handler filter.
 	 * @return mixed Value passed through for wp_die_handler filter.
 	 */
-	public function remove_preview_signature( $return = null ) {
-		remove_action( 'shutdown', array( $this, 'customize_preview_signature' ), 1000 );
+	public function remove_preview_signature($return = null) {
+		remove_action('shutdown', array($this, 'customize_preview_signature'), 1000);
 
 		return $return;
 	}
@@ -945,7 +945,7 @@ 
 	 * @return string Theme root.
 	 */
 	public function get_template_root() {
-		return get_raw_theme_root( $this->get_template(), true );
+		return get_raw_theme_root($this->get_template(), true);
 	}
 
 	/**
@@ -956,7 +956,7 @@ 
 	 * @return string Theme root.
 	 */
 	public function get_stylesheet_root() {
-		return get_raw_theme_root( $this->get_stylesheet(), true );
+		return get_raw_theme_root($this->get_stylesheet(), true);
 	}
 
 	/**
@@ -967,7 +967,7 @@ 
 	 * @param $current_theme {@internal Parameter is not used}
 	 * @return string Theme name.
 	 */
-	public function current_theme( $current_theme ) {
+	public function current_theme($current_theme) {
 		return $this->theme()->display('Name');
 	}
 
@@ -977,22 +977,22 @@ 
 	 * @since 3.4.0
 	 */
 	public function save() {
-		if ( ! $this->is_preview() ) {
-			wp_send_json_error( 'not_preview' );
+		if ( ! $this->is_preview()) {
+			wp_send_json_error('not_preview');
 		}
 
-		$action = 'save-customize_' . $this->get_stylesheet();
-		if ( ! check_ajax_referer( $action, 'nonce', false ) ) {
-			wp_send_json_error( 'invalid_nonce' );
+		$action = 'save-customize_'.$this->get_stylesheet();
+		if ( ! check_ajax_referer($action, 'nonce', false)) {
+			wp_send_json_error('invalid_nonce');
 		}
 
 		// Do we have to switch themes?
-		if ( ! $this->is_theme_active() ) {
+		if ( ! $this->is_theme_active()) {
 			// Temporarily stop previewing the theme to allow switch_themes()
 			// to operate properly.
 			$this->stop_previewing_theme();
-			switch_theme( $this->get_stylesheet() );
-			update_option( 'theme_switched_via_customizer', true );
+			switch_theme($this->get_stylesheet());
+			update_option('theme_switched_via_customizer', true);
 			$this->start_previewing_theme();
 		}
 
@@ -1004,9 +1004,9 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_save', $this );
+		do_action('customize_save', $this);
 
-		foreach ( $this->settings as $setting ) {
+		foreach ($this->settings as $setting) {
 			$setting->save();
 		}
 
@@ -1017,7 +1017,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_save_after', $this );
+		do_action('customize_save_after', $this);
 
 		/**
 		 * Filter response data for a successful customize_save AJAX request.
@@ -1030,8 +1030,8 @@ 
 		 *                                   event on `wp.customize`.
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		$response = apply_filters( 'customize_save_response', array(), $this );
-		wp_send_json_success( $response );
+		$response = apply_filters('customize_save_response', array(), $this);
+		wp_send_json_success($response);
 	}
 
 	/**
@@ -1040,11 +1040,11 @@ 
 	 * @since 4.2.0
 	 */
 	public function refresh_nonces() {
-		if ( ! $this->is_preview() ) {
-			wp_send_json_error( 'not_preview' );
+		if ( ! $this->is_preview()) {
+			wp_send_json_error('not_preview');
 		}
 
-		wp_send_json_success( $this->get_nonces() );
+		wp_send_json_success($this->get_nonces());
 	}
 
 	/**
@@ -1059,22 +1059,22 @@ 
 	 *                                          constructor.
 	 * @return WP_Customize_Setting             The instance of the setting that was added.
 	 */
-	public function add_setting( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Setting ) {
+	public function add_setting($id, $args = array()) {
+		if ($id instanceof WP_Customize_Setting) {
 			$setting = $id;
 		} else {
 			$class = 'WP_Customize_Setting';
 
 			/** This filter is documented in wp-includes/class-wp-customize-manager.php */
-			$args = apply_filters( 'customize_dynamic_setting_args', $args, $id );
+			$args = apply_filters('customize_dynamic_setting_args', $args, $id);
 
 			/** This filter is documented in wp-includes/class-wp-customize-manager.php */
-			$class = apply_filters( 'customize_dynamic_setting_class', $class, $id, $args );
+			$class = apply_filters('customize_dynamic_setting_class', $class, $id, $args);
 
-			$setting = new $class( $this, $id, $args );
+			$setting = new $class($this, $id, $args);
 		}
 
-		$this->settings[ $setting->id ] = $setting;
+		$this->settings[$setting->id] = $setting;
 		return $setting;
 	}
 
@@ -1093,11 +1093,11 @@ 
 	 * @param array $setting_ids The setting IDs to add.
 	 * @return array The WP_Customize_Setting objects added.
 	 */
-	public function add_dynamic_settings( $setting_ids ) {
+	public function add_dynamic_settings($setting_ids) {
 		$new_settings = array();
-		foreach ( $setting_ids as $setting_id ) {
+		foreach ($setting_ids as $setting_id) {
 			// Skip settings already created
-			if ( $this->get_setting( $setting_id ) ) {
+			if ($this->get_setting($setting_id)) {
 				continue;
 			}
 
@@ -1116,8 +1116,8 @@ 
 			 * @param false|array $setting_args The arguments to the WP_Customize_Setting constructor.
 			 * @param string      $setting_id   ID for dynamic setting, usually coming from `$_POST['customized']`.
 			 */
-			$setting_args = apply_filters( 'customize_dynamic_setting_args', $setting_args, $setting_id );
-			if ( false === $setting_args ) {
+			$setting_args = apply_filters('customize_dynamic_setting_args', $setting_args, $setting_id);
+			if (false === $setting_args) {
 				continue;
 			}
 
@@ -1130,11 +1130,11 @@ 
 			 * @param string $setting_id    ID for dynamic setting, usually coming from `$_POST['customized']`.
 			 * @param array  $setting_args  WP_Customize_Setting or a subclass.
 			 */
-			$setting_class = apply_filters( 'customize_dynamic_setting_class', $setting_class, $setting_id, $setting_args );
+			$setting_class = apply_filters('customize_dynamic_setting_class', $setting_class, $setting_id, $setting_args);
 
-			$setting = new $setting_class( $this, $setting_id, $setting_args );
+			$setting = new $setting_class($this, $setting_id, $setting_args);
 
-			$this->add_setting( $setting );
+			$this->add_setting($setting);
 			$new_settings[] = $setting;
 		}
 		return $new_settings;
@@ -1148,9 +1148,9 @@ 
 	 * @param string $id Customize Setting ID.
 	 * @return WP_Customize_Setting|void The setting, if set.
 	 */
-	public function get_setting( $id ) {
-		if ( isset( $this->settings[ $id ] ) ) {
-			return $this->settings[ $id ];
+	public function get_setting($id) {
+		if (isset($this->settings[$id])) {
+			return $this->settings[$id];
 		}
 	}
 
@@ -1161,8 +1161,8 @@ 
 	 *
 	 * @param string $id Customize Setting ID.
 	 */
-	public function remove_setting( $id ) {
-		unset( $this->settings[ $id ] );
+	public function remove_setting($id) {
+		unset($this->settings[$id]);
 	}
 
 	/**
@@ -1177,14 +1177,14 @@ 
 	 *
 	 * @return WP_Customize_Panel             The instance of the panel that was added.
 	 */
-	public function add_panel( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Panel ) {
+	public function add_panel($id, $args = array()) {
+		if ($id instanceof WP_Customize_Panel) {
 			$panel = $id;
 		} else {
-			$panel = new WP_Customize_Panel( $this, $id, $args );
+			$panel = new WP_Customize_Panel($this, $id, $args);
 		}
 
-		$this->panels[ $panel->id ] = $panel;
+		$this->panels[$panel->id] = $panel;
 		return $panel;
 	}
 
@@ -1197,9 +1197,9 @@ 
 	 * @param string $id Panel ID to get.
 	 * @return WP_Customize_Panel|void Requested panel instance, if set.
 	 */
-	public function get_panel( $id ) {
-		if ( isset( $this->panels[ $id ] ) ) {
-			return $this->panels[ $id ];
+	public function get_panel($id) {
+		if (isset($this->panels[$id])) {
+			return $this->panels[$id];
 		}
 	}
 
@@ -1211,18 +1211,18 @@ 
 	 *
 	 * @param string $id Panel ID to remove.
 	 */
-	public function remove_panel( $id ) {
+	public function remove_panel($id) {
 		// Removing core components this way is _doing_it_wrong().
-		if ( in_array( $id, $this->components, true ) ) {
+		if (in_array($id, $this->components, true)) {
 			/* translators: 1: panel id, 2: link to 'customize_loaded_components' filter reference */
-			$message = sprintf( __( 'Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.' ),
+			$message = sprintf(__('Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.'),
 				$id,
-				'<a href="' . esc_url( 'https://developer.wordpress.org/reference/hooks/customize_loaded_components/' ) . '"><code>customize_loaded_components</code></a>'
+				'<a href="'.esc_url('https://developer.wordpress.org/reference/hooks/customize_loaded_components/').'"><code>customize_loaded_components</code></a>'
 			);
 
-			_doing_it_wrong( __METHOD__, $message, '4.5' );
+			_doing_it_wrong(__METHOD__, $message, '4.5');
 		}
-		unset( $this->panels[ $id ] );
+		unset($this->panels[$id]);
 	}
 
 	/**
@@ -1237,7 +1237,7 @@ 
 	 *
 	 * @param string $panel Name of a custom panel which is a subclass of WP_Customize_Panel.
 	 */
-	public function register_panel_type( $panel ) {
+	public function register_panel_type($panel) {
 		$this->registered_panel_types[] = $panel;
 	}
 
@@ -1248,8 +1248,8 @@ 
 	 * @access public
 	 */
 	public function render_panel_templates() {
-		foreach ( $this->registered_panel_types as $panel_type ) {
-			$panel = new $panel_type( $this, 'temp', array() );
+		foreach ($this->registered_panel_types as $panel_type) {
+			$panel = new $panel_type($this, 'temp', array());
 			$panel->print_template();
 		}
 	}
@@ -1266,14 +1266,14 @@ 
 	 *
 	 * @return WP_Customize_Section             The instance of the section that was added.
 	 */
-	public function add_section( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Section ) {
+	public function add_section($id, $args = array()) {
+		if ($id instanceof WP_Customize_Section) {
 			$section = $id;
 		} else {
-			$section = new WP_Customize_Section( $this, $id, $args );
+			$section = new WP_Customize_Section($this, $id, $args);
 		}
 
-		$this->sections[ $section->id ] = $section;
+		$this->sections[$section->id] = $section;
 		return $section;
 	}
 
@@ -1285,9 +1285,9 @@ 
 	 * @param string $id Section ID.
 	 * @return WP_Customize_Section|void The section, if set.
 	 */
-	public function get_section( $id ) {
-		if ( isset( $this->sections[ $id ] ) )
-			return $this->sections[ $id ];
+	public function get_section($id) {
+		if (isset($this->sections[$id]))
+			return $this->sections[$id];
 	}
 
 	/**
@@ -1297,8 +1297,8 @@ 
 	 *
 	 * @param string $id Section ID.
 	 */
-	public function remove_section( $id ) {
-		unset( $this->sections[ $id ] );
+	public function remove_section($id) {
+		unset($this->sections[$id]);
 	}
 
 	/**
@@ -1313,7 +1313,7 @@ 
 	 *
 	 * @param string $section Name of a custom section which is a subclass of WP_Customize_Section.
 	 */
-	public function register_section_type( $section ) {
+	public function register_section_type($section) {
 		$this->registered_section_types[] = $section;
 	}
 
@@ -1324,8 +1324,8 @@ 
 	 * @access public
 	 */
 	public function render_section_templates() {
-		foreach ( $this->registered_section_types as $section_type ) {
-			$section = new $section_type( $this, 'temp', array() );
+		foreach ($this->registered_section_types as $section_type) {
+			$section = new $section_type($this, 'temp', array());
 			$section->print_template();
 		}
 	}
@@ -1342,14 +1342,14 @@ 
 	 *                                          constructor.
 	 * @return WP_Customize_Control             The instance of the control that was added.
 	 */
-	public function add_control( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Control ) {
+	public function add_control($id, $args = array()) {
+		if ($id instanceof WP_Customize_Control) {
 			$control = $id;
 		} else {
-			$control = new WP_Customize_Control( $this, $id, $args );
+			$control = new WP_Customize_Control($this, $id, $args);
 		}
 
-		$this->controls[ $control->id ] = $control;
+		$this->controls[$control->id] = $control;
 		return $control;
 	}
 
@@ -1361,9 +1361,9 @@ 
 	 * @param string $id ID of the control.
 	 * @return WP_Customize_Control|void The control object, if set.
 	 */
-	public function get_control( $id ) {
-		if ( isset( $this->controls[ $id ] ) )
-			return $this->controls[ $id ];
+	public function get_control($id) {
+		if (isset($this->controls[$id]))
+			return $this->controls[$id];
 	}
 
 	/**
@@ -1373,8 +1373,8 @@ 
 	 *
 	 * @param string $id ID of the control.
 	 */
-	public function remove_control( $id ) {
-		unset( $this->controls[ $id ] );
+	public function remove_control($id) {
+		unset($this->controls[$id]);
 	}
 
 	/**
@@ -1388,7 +1388,7 @@ 
 	 * @param string $control Name of a custom control which is a subclass of
 	 *                        {@see WP_Customize_Control}.
 	 */
-	public function register_control_type( $control ) {
+	public function register_control_type($control) {
 		$this->registered_control_types[] = $control;
 	}
 
@@ -1399,10 +1399,10 @@ 
 	 * @access public
 	 */
 	public function render_control_templates() {
-		foreach ( $this->registered_control_types as $control_type ) {
-			$control = new $control_type( $this, 'temp', array(
+		foreach ($this->registered_control_types as $control_type) {
+			$control = new $control_type($this, 'temp', array(
 				'settings' => array(),
-			) );
+			));
 			$control->print_template();
 		}
 	}
@@ -1416,8 +1416,8 @@ 
 	 * @param WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control $b Object B.
 	 * @return int
 	 */
-	protected function _cmp_priority( $a, $b ) {
-		if ( $a->priority === $b->priority ) {
+	protected function _cmp_priority($a, $b) {
+		if ($a->priority === $b->priority) {
 			return $a->instance_number - $b->instance_number;
 		} else {
 			return $a->priority - $b->priority;
@@ -1436,58 +1436,58 @@ 
 	public function prepare_controls() {
 
 		$controls = array();
-		uasort( $this->controls, array( $this, '_cmp_priority' ) );
+		uasort($this->controls, array($this, '_cmp_priority'));
 
-		foreach ( $this->controls as $id => $control ) {
-			if ( ! isset( $this->sections[ $control->section ] ) || ! $control->check_capabilities() ) {
+		foreach ($this->controls as $id => $control) {
+			if ( ! isset($this->sections[$control->section]) || ! $control->check_capabilities()) {
 				continue;
 			}
 
-			$this->sections[ $control->section ]->controls[] = $control;
-			$controls[ $id ] = $control;
+			$this->sections[$control->section]->controls[] = $control;
+			$controls[$id] = $control;
 		}
 		$this->controls = $controls;
 
 		// Prepare sections.
-		uasort( $this->sections, array( $this, '_cmp_priority' ) );
+		uasort($this->sections, array($this, '_cmp_priority'));
 		$sections = array();
 
-		foreach ( $this->sections as $section ) {
-			if ( ! $section->check_capabilities() ) {
+		foreach ($this->sections as $section) {
+			if ( ! $section->check_capabilities()) {
 				continue;
 			}
 
-			usort( $section->controls, array( $this, '_cmp_priority' ) );
+			usort($section->controls, array($this, '_cmp_priority'));
 
-			if ( ! $section->panel ) {
+			if ( ! $section->panel) {
 				// Top-level section.
-				$sections[ $section->id ] = $section;
+				$sections[$section->id] = $section;
 			} else {
 				// This section belongs to a panel.
-				if ( isset( $this->panels [ $section->panel ] ) ) {
-					$this->panels[ $section->panel ]->sections[ $section->id ] = $section;
+				if (isset($this->panels [$section->panel])) {
+					$this->panels[$section->panel]->sections[$section->id] = $section;
 				}
 			}
 		}
 		$this->sections = $sections;
 
 		// Prepare panels.
-		uasort( $this->panels, array( $this, '_cmp_priority' ) );
+		uasort($this->panels, array($this, '_cmp_priority'));
 		$panels = array();
 
-		foreach ( $this->panels as $panel ) {
-			if ( ! $panel->check_capabilities() ) {
+		foreach ($this->panels as $panel) {
+			if ( ! $panel->check_capabilities()) {
 				continue;
 			}
 
-			uasort( $panel->sections, array( $this, '_cmp_priority' ) );
-			$panels[ $panel->id ] = $panel;
+			uasort($panel->sections, array($this, '_cmp_priority'));
+			$panels[$panel->id] = $panel;
 		}
 		$this->panels = $panels;
 
 		// Sort panels and top-level sections together.
-		$this->containers = array_merge( $this->panels, $this->sections );
-		uasort( $this->containers, array( $this, '_cmp_priority' ) );
+		$this->containers = array_merge($this->panels, $this->sections);
+		uasort($this->containers, array($this, '_cmp_priority'));
 	}
 
 	/**
@@ -1496,7 +1496,7 @@ 
 	 * @since 3.4.0
 	 */
 	public function enqueue_control_scripts() {
-		foreach ( $this->controls as $control ) {
+		foreach ($this->controls as $control) {
 			$control->enqueue();
 		}
 	}
@@ -1510,7 +1510,7 @@ 
 	 * @return bool Whether the user agent is iOS.
 	 */
 	public function is_ios() {
-		return wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] );
+		return wp_is_mobile() && preg_match('/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT']);
 	}
 
 	/**
@@ -1522,14 +1522,14 @@ 
 	 * @return string The template string for the document title.
 	 */
 	public function get_document_title_template() {
-		if ( $this->is_theme_active() ) {
+		if ($this->is_theme_active()) {
 			/* translators: %s: document title from the preview */
-			$document_title_tmpl = __( 'Customize: %s' );
+			$document_title_tmpl = __('Customize: %s');
 		} else {
 			/* translators: %s: document title from the preview */
-			$document_title_tmpl = __( 'Live Preview: %s' );
+			$document_title_tmpl = __('Live Preview: %s');
 		}
-		$document_title_tmpl = html_entity_decode( $document_title_tmpl, ENT_QUOTES, 'UTF-8' ); // Because exported to JS and assigned to document.title.
+		$document_title_tmpl = html_entity_decode($document_title_tmpl, ENT_QUOTES, 'UTF-8'); // Because exported to JS and assigned to document.title.
 		return $document_title_tmpl;
 	}
 
@@ -1543,8 +1543,8 @@ 
 	 *
 	 * @param string $preview_url URL to be previewed.
 	 */
-	public function set_preview_url( $preview_url ) {
-		$this->preview_url = wp_validate_redirect( $preview_url, home_url( '/' ) );
+	public function set_preview_url($preview_url) {
+		$this->preview_url = wp_validate_redirect($preview_url, home_url('/'));
 	}
 
 	/**
@@ -1556,8 +1556,8 @@ 
 	 * @return string URL being previewed.
 	 */
 	public function get_preview_url() {
-		if ( empty( $this->preview_url ) ) {
-			$preview_url = home_url( '/' );
+		if (empty($this->preview_url)) {
+			$preview_url = home_url('/');
 		} else {
 			$preview_url = $this->preview_url;
 		}
@@ -1574,9 +1574,9 @@ 
 	 *
 	 * @param string $return_url URL for return link.
 	 */
-	public function set_return_url( $return_url ) {
-		$return_url = remove_query_arg( wp_removable_query_args(), $return_url );
-		$return_url = wp_validate_redirect( $return_url );
+	public function set_return_url($return_url) {
+		$return_url = remove_query_arg(wp_removable_query_args(), $return_url);
+		$return_url = wp_validate_redirect($return_url);
 		$this->return_url = $return_url;
 	}
 
@@ -1590,16 +1590,16 @@ 
 	 */
 	public function get_return_url() {
 		$referer = wp_get_referer();
-		$excluded_referer_basenames = array( 'customize.php', 'wp-login.php' );
+		$excluded_referer_basenames = array('customize.php', 'wp-login.php');
 
-		if ( $this->return_url ) {
+		if ($this->return_url) {
 			$return_url = $this->return_url;
-		} else if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
+		} else if ($referer && ! in_array(basename(parse_url($referer, PHP_URL_PATH)), $excluded_referer_basenames, true)) {
 			$return_url = $referer;
-		} else if ( $this->preview_url ) {
+		} else if ($this->preview_url) {
 			$return_url = $this->preview_url;
 		} else {
-			$return_url = home_url( '/' );
+			$return_url = home_url('/');
 		}
 		return $return_url;
 	}
@@ -1618,8 +1618,8 @@ 
 	 *     @type string [$panel]    ID for panel to be autofocused.
 	 * }
 	 */
-	public function set_autofocus( $autofocus ) {
-		$this->autofocus = array_filter( wp_array_slice_assoc( $autofocus, array( 'panel', 'section', 'control' ) ), 'is_string' );
+	public function set_autofocus($autofocus) {
+		$this->autofocus = array_filter(wp_array_slice_assoc($autofocus, array('panel', 'section', 'control')), 'is_string');
 	}
 
 	/**
@@ -1648,8 +1648,8 @@ 
 	 */
 	public function get_nonces() {
 		$nonces = array(
-			'save' => wp_create_nonce( 'save-customize_' . $this->get_stylesheet() ),
-			'preview' => wp_create_nonce( 'preview-customize_' . $this->get_stylesheet() ),
+			'save' => wp_create_nonce('save-customize_'.$this->get_stylesheet()),
+			'preview' => wp_create_nonce('preview-customize_'.$this->get_stylesheet()),
 		);
 
 		/**
@@ -1661,7 +1661,7 @@ 
 		 *                                     preview actions.
 		 * @param WP_Customize_Manager $this   WP_Customize_Manager instance.
 		 */
-		$nonces = apply_filters( 'customize_refresh_nonces', $nonces, $this );
+		$nonces = apply_filters('customize_refresh_nonces', $nonces, $this);
 
 		return $nonces;
 	}
@@ -1681,13 +1681,13 @@ 
 		 * using the customize_allowed_urls filter.
 		 */
 
-		$allowed_urls = array( home_url( '/' ) );
-		$admin_origin = parse_url( admin_url() );
-		$home_origin  = parse_url( home_url() );
-		$cross_domain = ( strtolower( $admin_origin['host'] ) !== strtolower( $home_origin['host'] ) );
+		$allowed_urls = array(home_url('/'));
+		$admin_origin = parse_url(admin_url());
+		$home_origin  = parse_url(home_url());
+		$cross_domain = (strtolower($admin_origin['host']) !== strtolower($home_origin['host']));
 
-		if ( is_ssl() && ! $cross_domain ) {
-			$allowed_urls[] = home_url( '/', 'https' );
+		if (is_ssl() && ! $cross_domain) {
+			$allowed_urls[] = home_url('/', 'https');
 		}
 
 		/**
@@ -1697,12 +1697,12 @@ 
 		 *
 		 * @param array $allowed_urls An array of allowed URLs.
 		 */
-		$allowed_urls = array_unique( apply_filters( 'customize_allowed_urls', $allowed_urls ) );
+		$allowed_urls = array_unique(apply_filters('customize_allowed_urls', $allowed_urls));
 
-		$login_url = add_query_arg( array(
+		$login_url = add_query_arg(array(
 			'interim-login' => 1,
 			'customize-login' => 1,
-		), wp_login_url() );
+		), wp_login_url());
 
 		// Prepare Customizer settings to pass to JavaScript.
 		$settings = array(
@@ -1711,14 +1711,14 @@ 
 				'active'     => $this->is_theme_active(),
 			),
 			'url'      => array(
-				'preview'       => esc_url_raw( $this->get_preview_url() ),
-				'parent'        => esc_url_raw( admin_url() ),
-				'activated'     => esc_url_raw( home_url( '/' ) ),
-				'ajax'          => esc_url_raw( admin_url( 'admin-ajax.php', 'relative' ) ),
-				'allowed'       => array_map( 'esc_url_raw', $allowed_urls ),
+				'preview'       => esc_url_raw($this->get_preview_url()),
+				'parent'        => esc_url_raw(admin_url()),
+				'activated'     => esc_url_raw(home_url('/')),
+				'ajax'          => esc_url_raw(admin_url('admin-ajax.php', 'relative')),
+				'allowed'       => array_map('esc_url_raw', $allowed_urls),
 				'isCrossDomain' => $cross_domain,
-				'home'          => esc_url_raw( home_url( '/' ) ),
-				'login'         => esc_url_raw( $login_url ),
+				'home'          => esc_url_raw(home_url('/')),
+				'login'         => esc_url_raw($login_url),
 			),
 			'browser'  => array(
 				'mobile' => wp_is_mobile(),
@@ -1730,23 +1730,23 @@ 
 			'autofocus' => $this->get_autofocus(),
 			'documentTitleTmpl' => $this->get_document_title_template(),
 			'previewableDevices' => $this->get_previewable_devices(),
-			'selectiveRefreshEnabled' => isset( $this->selective_refresh ),
+			'selectiveRefreshEnabled' => isset($this->selective_refresh),
 		);
 
 		// Prepare Customize Section objects to pass to JavaScript.
-		foreach ( $this->sections() as $id => $section ) {
-			if ( $section->check_capabilities() ) {
-				$settings['sections'][ $id ] = $section->json();
+		foreach ($this->sections() as $id => $section) {
+			if ($section->check_capabilities()) {
+				$settings['sections'][$id] = $section->json();
 			}
 		}
 
 		// Prepare Customize Panel objects to pass to JavaScript.
-		foreach ( $this->panels() as $panel_id => $panel ) {
-			if ( $panel->check_capabilities() ) {
-				$settings['panels'][ $panel_id ] = $panel->json();
-				foreach ( $panel->sections as $section_id => $section ) {
-					if ( $section->check_capabilities() ) {
-						$settings['sections'][ $section_id ] = $section->json();
+		foreach ($this->panels() as $panel_id => $panel) {
+			if ($panel->check_capabilities()) {
+				$settings['panels'][$panel_id] = $panel->json();
+				foreach ($panel->sections as $section_id => $section) {
+					if ($section->check_capabilities()) {
+						$settings['sections'][$section_id] = $section->json();
 					}
 				}
 			}
@@ -1754,23 +1754,23 @@ 
 
 		?>
 		<script type="text/javascript">
-			var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+			var _wpCustomizeSettings = <?php echo wp_json_encode($settings); ?>;
 			_wpCustomizeSettings.controls = {};
 			_wpCustomizeSettings.settings = {};
 			<?php
 
 			// Serialize settings one by one to improve memory usage.
 			echo "(function ( s ){\n";
-			foreach ( $this->settings() as $setting ) {
-				if ( $setting->check_capabilities() ) {
+			foreach ($this->settings() as $setting) {
+				if ($setting->check_capabilities()) {
 					printf(
 						"s[%s] = %s;\n",
-						wp_json_encode( $setting->id ),
-						wp_json_encode( array(
+						wp_json_encode($setting->id),
+						wp_json_encode(array(
 							'value'     => $setting->js_value(),
 							'transport' => $setting->transport,
 							'dirty'     => $setting->dirty,
-						) )
+						))
 					);
 				}
 			}
@@ -1778,12 +1778,12 @@ 
 
 			// Serialize controls one by one to improve memory usage.
 			echo "(function ( c ){\n";
-			foreach ( $this->controls() as $control ) {
-				if ( $control->check_capabilities() ) {
+			foreach ($this->controls() as $control) {
+				if ($control->check_capabilities()) {
 					printf(
 						"c[%s] = %s;\n",
-						wp_json_encode( $control->id ),
-						wp_json_encode( $control->json() )
+						wp_json_encode($control->id),
+						wp_json_encode($control->json())
 					);
 				}
 			}
@@ -1804,14 +1804,14 @@ 
 	public function get_previewable_devices() {
 		$devices = array(
 			'desktop' => array(
-				'label' => __( 'Enter desktop preview mode' ),
+				'label' => __('Enter desktop preview mode'),
 				'default' => true,
 			),
 			'tablet' => array(
-				'label' => __( 'Enter tablet preview mode' ),
+				'label' => __('Enter tablet preview mode'),
 			),
 			'mobile' => array(
-				'label' => __( 'Enter mobile preview mode' ),
+				'label' => __('Enter mobile preview mode'),
 			),
 		);
 
@@ -1824,7 +1824,7 @@ 
 		 *
 		 * @param array $devices List of devices with labels and default setting.
 		 */
-		$devices = apply_filters( 'customize_previewable_devices', $devices );
+		$devices = apply_filters('customize_previewable_devices', $devices);
 
 		return $devices;
 	}
@@ -1837,248 +1837,248 @@ 
 	public function register_controls() {
 
 		/* Panel, Section, and Control Types */
-		$this->register_panel_type( 'WP_Customize_Panel' );
-		$this->register_section_type( 'WP_Customize_Section' );
-		$this->register_section_type( 'WP_Customize_Sidebar_Section' );
-		$this->register_control_type( 'WP_Customize_Color_Control' );
-		$this->register_control_type( 'WP_Customize_Media_Control' );
-		$this->register_control_type( 'WP_Customize_Upload_Control' );
-		$this->register_control_type( 'WP_Customize_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Background_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Cropped_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Site_Icon_Control' );
-		$this->register_control_type( 'WP_Customize_Theme_Control' );
+		$this->register_panel_type('WP_Customize_Panel');
+		$this->register_section_type('WP_Customize_Section');
+		$this->register_section_type('WP_Customize_Sidebar_Section');
+		$this->register_control_type('WP_Customize_Color_Control');
+		$this->register_control_type('WP_Customize_Media_Control');
+		$this->register_control_type('WP_Customize_Upload_Control');
+		$this->register_control_type('WP_Customize_Image_Control');
+		$this->register_control_type('WP_Customize_Background_Image_Control');
+		$this->register_control_type('WP_Customize_Cropped_Image_Control');
+		$this->register_control_type('WP_Customize_Site_Icon_Control');
+		$this->register_control_type('WP_Customize_Theme_Control');
 
 		/* Themes */
 
-		$this->add_section( new WP_Customize_Themes_Section( $this, 'themes', array(
-			'title'      => $this->theme()->display( 'Name' ),
+		$this->add_section(new WP_Customize_Themes_Section($this, 'themes', array(
+			'title'      => $this->theme()->display('Name'),
 			'capability' => 'switch_themes',
 			'priority'   => 0,
-		) ) );
+		)));
 
 		// Themes Setting (unused - the theme is considerably more fundamental to the Customizer experience).
-		$this->add_setting( new WP_Customize_Filter_Setting( $this, 'active_theme', array(
+		$this->add_setting(new WP_Customize_Filter_Setting($this, 'active_theme', array(
 			'capability' => 'switch_themes',
-		) ) );
+		)));
 
-		require_once( ABSPATH . 'wp-admin/includes/theme.php' );
+		require_once(ABSPATH.'wp-admin/includes/theme.php');
 
 		// Theme Controls.
 
 		// Add a control for the active/original theme.
-		if ( ! $this->is_theme_active() ) {
-			$themes = wp_prepare_themes_for_js( array( wp_get_theme( $this->original_stylesheet ) ) );
-			$active_theme = current( $themes );
+		if ( ! $this->is_theme_active()) {
+			$themes = wp_prepare_themes_for_js(array(wp_get_theme($this->original_stylesheet)));
+			$active_theme = current($themes);
 			$active_theme['isActiveTheme'] = true;
-			$this->add_control( new WP_Customize_Theme_Control( $this, $active_theme['id'], array(
+			$this->add_control(new WP_Customize_Theme_Control($this, $active_theme['id'], array(
 				'theme'    => $active_theme,
 				'section'  => 'themes',
 				'settings' => 'active_theme',
-			) ) );
+			)));
 		}
 
 		$themes = wp_prepare_themes_for_js();
-		foreach ( $themes as $theme ) {
-			if ( $theme['active'] || $theme['id'] === $this->original_stylesheet ) {
+		foreach ($themes as $theme) {
+			if ($theme['active'] || $theme['id'] === $this->original_stylesheet) {
 				continue;
 			}
 
-			$theme_id = 'theme_' . $theme['id'];
+			$theme_id = 'theme_'.$theme['id'];
 			$theme['isActiveTheme'] = false;
-			$this->add_control( new WP_Customize_Theme_Control( $this, $theme_id, array(
+			$this->add_control(new WP_Customize_Theme_Control($this, $theme_id, array(
 				'theme'    => $theme,
 				'section'  => 'themes',
 				'settings' => 'active_theme',
-			) ) );
+			)));
 		}
 
 		/* Site Identity */
 
-		$this->add_section( 'title_tagline', array(
-			'title'    => __( 'Site Identity' ),
+		$this->add_section('title_tagline', array(
+			'title'    => __('Site Identity'),
 			'priority' => 20,
-		) );
+		));
 
-		$this->add_setting( 'blogname', array(
-			'default'    => get_option( 'blogname' ),
+		$this->add_setting('blogname', array(
+			'default'    => get_option('blogname'),
 			'type'       => 'option',
 			'capability' => 'manage_options',
-		) );
+		));
 
-		$this->add_control( 'blogname', array(
-			'label'      => __( 'Site Title' ),
+		$this->add_control('blogname', array(
+			'label'      => __('Site Title'),
 			'section'    => 'title_tagline',
-		) );
+		));
 
-		$this->add_setting( 'blogdescription', array(
-			'default'    => get_option( 'blogdescription' ),
+		$this->add_setting('blogdescription', array(
+			'default'    => get_option('blogdescription'),
 			'type'       => 'option',
 			'capability' => 'manage_options',
-		) );
+		));
 
-		$this->add_control( 'blogdescription', array(
-			'label'      => __( 'Tagline' ),
+		$this->add_control('blogdescription', array(
+			'label'      => __('Tagline'),
 			'section'    => 'title_tagline',
-		) );
+		));
 
 		// Add a setting to hide header text if the theme doesn't support custom headers.
-		if ( ! current_theme_supports( 'custom-header', 'header-text' ) ) {
-			$this->add_setting( 'header_text', array(
-				'theme_supports'    => array( 'custom-logo', 'header-text' ),
+		if ( ! current_theme_supports('custom-header', 'header-text')) {
+			$this->add_setting('header_text', array(
+				'theme_supports'    => array('custom-logo', 'header-text'),
 				'default'           => 1,
 				'sanitize_callback' => 'absint',
-			) );
+			));
 
-			$this->add_control( 'header_text', array(
-				'label'    => __( 'Display Site Title and Tagline' ),
+			$this->add_control('header_text', array(
+				'label'    => __('Display Site Title and Tagline'),
 				'section'  => 'title_tagline',
 				'settings' => 'header_text',
 				'type'     => 'checkbox',
-			) );
+			));
 		}
 
-		$this->add_setting( 'site_icon', array(
+		$this->add_setting('site_icon', array(
 			'type'       => 'option',
 			'capability' => 'manage_options',
 			'transport'  => 'postMessage', // Previewed with JS in the Customizer controls window.
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Site_Icon_Control( $this, 'site_icon', array(
-			'label'       => __( 'Site Icon' ),
+		$this->add_control(new WP_Customize_Site_Icon_Control($this, 'site_icon', array(
+			'label'       => __('Site Icon'),
 			'description' => sprintf(
 				/* translators: %s: site icon size in pixels */
-				__( 'The Site Icon is used as a browser and app icon for your site. Icons must be square, and at least %s pixels wide and tall.' ),
+				__('The Site Icon is used as a browser and app icon for your site. Icons must be square, and at least %s pixels wide and tall.'),
 				'<strong>512</strong>'
 			),
 			'section'     => 'title_tagline',
 			'priority'    => 60,
 			'height'      => 512,
 			'width'       => 512,
-		) ) );
+		)));
 
-		$this->add_setting( 'custom_logo', array(
-			'theme_supports' => array( 'custom-logo' ),
+		$this->add_setting('custom_logo', array(
+			'theme_supports' => array('custom-logo'),
 			'transport'      => 'postMessage',
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Media_Control( $this, 'custom_logo', array(
-			'label'    => __( 'Logo' ),
+		$this->add_control(new WP_Customize_Media_Control($this, 'custom_logo', array(
+			'label'    => __('Logo'),
 			'section'  => 'title_tagline',
 			'priority' => 8,
 			'mime_type' => 'image',
 			'button_labels' => array(
-				'select'       => __( 'Select logo' ),
-				'change'       => __( 'Change logo' ),
-				'remove'       => __( 'Remove' ),
-				'default'      => __( 'Default' ),
-				'placeholder'  => __( 'No logo selected' ),
-				'frame_title'  => __( 'Select logo' ),
-				'frame_button' => __( 'Choose logo' ),
+				'select'       => __('Select logo'),
+				'change'       => __('Change logo'),
+				'remove'       => __('Remove'),
+				'default'      => __('Default'),
+				'placeholder'  => __('No logo selected'),
+				'frame_title'  => __('Select logo'),
+				'frame_button' => __('Choose logo'),
 			),
-		) ) );
+		)));
 
-		if ( isset( $this->selective_refresh ) ) {
-			$this->selective_refresh->add_partial( 'custom_logo', array(
-				'settings'            => array( 'custom_logo' ),
+		if (isset($this->selective_refresh)) {
+			$this->selective_refresh->add_partial('custom_logo', array(
+				'settings'            => array('custom_logo'),
 				'selector'            => '.custom-logo-link',
-				'render_callback'     => array( $this, '_render_custom_logo_partial' ),
+				'render_callback'     => array($this, '_render_custom_logo_partial'),
 				'container_inclusive' => true,
-			) );
+			));
 		}
 
 		/* Colors */
 
-		$this->add_section( 'colors', array(
-			'title'          => __( 'Colors' ),
+		$this->add_section('colors', array(
+			'title'          => __('Colors'),
 			'priority'       => 40,
-		) );
+		));
 
-		$this->add_setting( 'header_textcolor', array(
-			'theme_supports' => array( 'custom-header', 'header-text' ),
-			'default'        => get_theme_support( 'custom-header', 'default-text-color' ),
+		$this->add_setting('header_textcolor', array(
+			'theme_supports' => array('custom-header', 'header-text'),
+			'default'        => get_theme_support('custom-header', 'default-text-color'),
 
-			'sanitize_callback'    => array( $this, '_sanitize_header_textcolor' ),
+			'sanitize_callback'    => array($this, '_sanitize_header_textcolor'),
 			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
+		));
 
 		// Input type: checkbox
 		// With custom value
-		$this->add_control( 'display_header_text', array(
+		$this->add_control('display_header_text', array(
 			'settings' => 'header_textcolor',
-			'label'    => __( 'Display Site Title and Tagline' ),
+			'label'    => __('Display Site Title and Tagline'),
 			'section'  => 'title_tagline',
 			'type'     => 'checkbox',
 			'priority' => 40,
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Color_Control( $this, 'header_textcolor', array(
-			'label'   => __( 'Header Text Color' ),
+		$this->add_control(new WP_Customize_Color_Control($this, 'header_textcolor', array(
+			'label'   => __('Header Text Color'),
 			'section' => 'colors',
-		) ) );
+		)));
 
 		// Input type: Color
 		// With sanitize_callback
-		$this->add_setting( 'background_color', array(
-			'default'        => get_theme_support( 'custom-background', 'default-color' ),
+		$this->add_setting('background_color', array(
+			'default'        => get_theme_support('custom-background', 'default-color'),
 			'theme_supports' => 'custom-background',
 
 			'sanitize_callback'    => 'sanitize_hex_color_no_hash',
 			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Color_Control( $this, 'background_color', array(
-			'label'   => __( 'Background Color' ),
+		$this->add_control(new WP_Customize_Color_Control($this, 'background_color', array(
+			'label'   => __('Background Color'),
 			'section' => 'colors',
-		) ) );
+		)));
 
 
 		/* Custom Header */
 
-		$this->add_section( 'header_image', array(
-			'title'          => __( 'Header Image' ),
+		$this->add_section('header_image', array(
+			'title'          => __('Header Image'),
 			'theme_supports' => 'custom-header',
 			'priority'       => 60,
-		) );
+		));
 
-		$this->add_setting( new WP_Customize_Filter_Setting( $this, 'header_image', array(
-			'default'        => get_theme_support( 'custom-header', 'default-image' ),
+		$this->add_setting(new WP_Customize_Filter_Setting($this, 'header_image', array(
+			'default'        => get_theme_support('custom-header', 'default-image'),
 			'theme_supports' => 'custom-header',
-		) ) );
+		)));
 
-		$this->add_setting( new WP_Customize_Header_Image_Setting( $this, 'header_image_data', array(
+		$this->add_setting(new WP_Customize_Header_Image_Setting($this, 'header_image_data', array(
 			// 'default'        => get_theme_support( 'custom-header', 'default-image' ),
 			'theme_supports' => 'custom-header',
-		) ) );
+		)));
 
-		$this->add_control( new WP_Customize_Header_Image_Control( $this ) );
+		$this->add_control(new WP_Customize_Header_Image_Control($this));
 
 		/* Custom Background */
 
-		$this->add_section( 'background_image', array(
-			'title'          => __( 'Background Image' ),
+		$this->add_section('background_image', array(
+			'title'          => __('Background Image'),
 			'theme_supports' => 'custom-background',
 			'priority'       => 80,
-		) );
+		));
 
-		$this->add_setting( 'background_image', array(
-			'default'        => get_theme_support( 'custom-background', 'default-image' ),
+		$this->add_setting('background_image', array(
+			'default'        => get_theme_support('custom-background', 'default-image'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_setting( new WP_Customize_Background_Image_Setting( $this, 'background_image_thumb', array(
+		$this->add_setting(new WP_Customize_Background_Image_Setting($this, 'background_image_thumb', array(
 			'theme_supports' => 'custom-background',
-		) ) );
+		)));
 
-		$this->add_control( new WP_Customize_Background_Image_Control( $this ) );
+		$this->add_control(new WP_Customize_Background_Image_Control($this));
 
-		$this->add_setting( 'background_repeat', array(
-			'default'        => get_theme_support( 'custom-background', 'default-repeat' ),
+		$this->add_setting('background_repeat', array(
+			'default'        => get_theme_support('custom-background', 'default-repeat'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_repeat', array(
-			'label'      => __( 'Background Repeat' ),
+		$this->add_control('background_repeat', array(
+			'label'      => __('Background Repeat'),
 			'section'    => 'background_image',
 			'type'       => 'radio',
 			'choices'    => array(
@@ -2087,15 +2087,15 @@ 
 				'repeat-x'   => __('Tile Horizontally'),
 				'repeat-y'   => __('Tile Vertically'),
 			),
-		) );
+		));
 
-		$this->add_setting( 'background_position_x', array(
-			'default'        => get_theme_support( 'custom-background', 'default-position-x' ),
+		$this->add_setting('background_position_x', array(
+			'default'        => get_theme_support('custom-background', 'default-position-x'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_position_x', array(
-			'label'      => __( 'Background Position' ),
+		$this->add_control('background_position_x', array(
+			'label'      => __('Background Position'),
 			'section'    => 'background_image',
 			'type'       => 'radio',
 			'choices'    => array(
@@ -2103,28 +2103,28 @@ 
 				'center'     => __('Center'),
 				'right'      => __('Right'),
 			),
-		) );
+		));
 
-		$this->add_setting( 'background_attachment', array(
-			'default'        => get_theme_support( 'custom-background', 'default-attachment' ),
+		$this->add_setting('background_attachment', array(
+			'default'        => get_theme_support('custom-background', 'default-attachment'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_attachment', array(
-			'label'      => __( 'Background Attachment' ),
+		$this->add_control('background_attachment', array(
+			'label'      => __('Background Attachment'),
 			'section'    => 'background_image',
 			'type'       => 'radio',
 			'choices'    => array(
 				'scroll'     => __('Scroll'),
 				'fixed'      => __('Fixed'),
 			),
-		) );
+		));
 
 		// If the theme is using the default background callback, we can update
 		// the background CSS using postMessage.
-		if ( get_theme_support( 'custom-background', 'wp-head-callback' ) === '_custom_background_cb' ) {
-			foreach ( array( 'color', 'image', 'position_x', 'repeat', 'attachment' ) as $prop ) {
-				$this->get_setting( 'background_' . $prop )->transport = 'postMessage';
+		if (get_theme_support('custom-background', 'wp-head-callback') === '_custom_background_cb') {
+			foreach (array('color', 'image', 'position_x', 'repeat', 'attachment') as $prop) {
+				$this->get_setting('background_'.$prop)->transport = 'postMessage';
 			}
 		}
 
@@ -2132,54 +2132,54 @@ 
 		// #WP19627
 
 		// Replicate behavior from options-reading.php and hide front page options if there are no pages
-		if ( get_pages() ) {
-			$this->add_section( 'static_front_page', array(
-				'title'          => __( 'Static Front Page' ),
+		if (get_pages()) {
+			$this->add_section('static_front_page', array(
+				'title'          => __('Static Front Page'),
 			//	'theme_supports' => 'static-front-page',
 				'priority'       => 120,
-				'description'    => __( 'Your theme supports a static front page.' ),
-			) );
+				'description'    => __('Your theme supports a static front page.'),
+			));
 
-			$this->add_setting( 'show_on_front', array(
-				'default'        => get_option( 'show_on_front' ),
+			$this->add_setting('show_on_front', array(
+				'default'        => get_option('show_on_front'),
 				'capability'     => 'manage_options',
 				'type'           => 'option',
 			//	'theme_supports' => 'static-front-page',
-			) );
+			));
 
-			$this->add_control( 'show_on_front', array(
-				'label'   => __( 'Front page displays' ),
+			$this->add_control('show_on_front', array(
+				'label'   => __('Front page displays'),
 				'section' => 'static_front_page',
 				'type'    => 'radio',
 				'choices' => array(
-					'posts' => __( 'Your latest posts' ),
-					'page'  => __( 'A static page' ),
+					'posts' => __('Your latest posts'),
+					'page'  => __('A static page'),
 				),
-			) );
+			));
 
-			$this->add_setting( 'page_on_front', array(
+			$this->add_setting('page_on_front', array(
 				'type'       => 'option',
 				'capability' => 'manage_options',
 			//	'theme_supports' => 'static-front-page',
-			) );
+			));
 
-			$this->add_control( 'page_on_front', array(
-				'label'      => __( 'Front page' ),
+			$this->add_control('page_on_front', array(
+				'label'      => __('Front page'),
 				'section'    => 'static_front_page',
 				'type'       => 'dropdown-pages',
-			) );
+			));
 
-			$this->add_setting( 'page_for_posts', array(
+			$this->add_setting('page_for_posts', array(
 				'type'           => 'option',
 				'capability'     => 'manage_options',
 			//	'theme_supports' => 'static-front-page',
-			) );
+			));
 
-			$this->add_control( 'page_for_posts', array(
-				'label'      => __( 'Posts page' ),
+			$this->add_control('page_for_posts', array(
+				'label'      => __('Posts page'),
 				'section'    => 'static_front_page',
 				'type'       => 'dropdown-pages',
-			) );
+			));
 		}
 	}
 
@@ -2192,7 +2192,7 @@ 
 	 * @see add_dynamic_settings()
 	 */
 	public function register_dynamic_settings() {
-		$this->add_dynamic_settings( array_keys( $this->unsanitized_post_values() ) );
+		$this->add_dynamic_settings(array_keys($this->unsanitized_post_values()));
 	}
 
 	/**
@@ -2206,13 +2206,13 @@ 
 	 * @param string $color
 	 * @return mixed
 	 */
-	public function _sanitize_header_textcolor( $color ) {
-		if ( 'blank' === $color )
+	public function _sanitize_header_textcolor($color) {
+		if ('blank' === $color)
 			return 'blank';
 
-		$color = sanitize_hex_color_no_hash( $color );
-		if ( empty( $color ) )
-			$color = get_theme_support( 'custom-header', 'default-text-color' );
+		$color = sanitize_hex_color_no_hash($color);
+		if (empty($color))
+			$color = get_theme_support('custom-header', 'default-text-color');
 
 		return $color;
 	}
@@ -2249,12 +2249,12 @@ 
  * @param string $color
  * @return string|void
  */
-function sanitize_hex_color( $color ) {
-	if ( '' === $color )
+function sanitize_hex_color($color) {
+	if ('' === $color)
 		return '';
 
 	// 3 or 6 hex digits, or the empty string.
-	if ( preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color ) )
+	if (preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color))
 		return $color;
 }
 
@@ -2272,13 +2272,13 @@ 
  * @param string $color
  * @return string|null
  */
-function sanitize_hex_color_no_hash( $color ) {
-	$color = ltrim( $color, '#' );
+function sanitize_hex_color_no_hash($color) {
+	$color = ltrim($color, '#');
 
-	if ( '' === $color )
+	if ('' === $color)
 		return '';
 
-	return sanitize_hex_color( '#' . $color ) ? $color : null;
+	return sanitize_hex_color('#'.$color) ? $color : null;
 }
 
 /**
@@ -2292,9 +2292,9 @@ 
  * @param string $color
  * @return string
  */
-function maybe_hash_hex_color( $color ) {
-	if ( $unhashed = sanitize_hex_color_no_hash( $color ) )
-		return '#' . $unhashed;
+function maybe_hash_hex_color($color) {
+	if ($unhashed = sanitize_hex_color_no_hash($color))
+		return '#'.$unhashed;
 
 	return $color;
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -279,7 +279,7 @@
 	 * @param int    $dst_h       The destination height.
 	 * @param string $filter_name Optional. The Imagick filter to use when resizing. Default 'FILTER_TRIANGLE'.
 	 * @param bool   $strip_meta  Optional. Strip all profiles, excluding color profiles, from the image. Default true.
-	 * @return bool|WP_Error
+	 * @return null|WP_Error
 	 */
 	protected function thumbnail_image( $dst_w, $dst_h, $filter_name = 'FILTER_TRIANGLE', $strip_meta = true ) {
 		$allowed_filters = array(

Spacing +157 added lines, -157 removed lines

@@ -24,7 +24,7 @@ 
 	protected $image;
 
 	public function __destruct() {
-		if ( $this->image instanceof Imagick ) {
+		if ($this->image instanceof Imagick) {
 			// we don't need the original in memory anymore
 			$this->image->clear();
 			$this->image->destroy();
@@ -45,13 +45,13 @@ 
 	 * @param array $args
 	 * @return bool
 	 */
-	public static function test( $args = array() ) {
+	public static function test($args = array()) {
 
 		// First, test Imagick's extension and classes.
-		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick', false ) || ! class_exists( 'ImagickPixel', false ) )
+		if ( ! extension_loaded('imagick') || ! class_exists('Imagick', false) || ! class_exists('ImagickPixel', false))
 			return false;
 
-		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) )
+		if (version_compare(phpversion('imagick'), '2.2.0', '<'))
 			return false;
 
 		$required_methods = array(
@@ -76,16 +76,16 @@ 
 		);
 
 		// Now, test for deep requirements within Imagick.
-		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) )
+		if ( ! defined('imagick::COMPRESSION_JPEG'))
 			return false;
 
-		$class_methods = array_map( 'strtolower', get_class_methods( 'Imagick' ) );
-		if ( array_diff( $required_methods, $class_methods ) ) {
+		$class_methods = array_map('strtolower', get_class_methods('Imagick'));
+		if (array_diff($required_methods, $class_methods)) {
 			return false;
 		}
 
 		// HHVM Imagick does not support loading from URL, so fail to allow fallback to GD.
-		if ( defined( 'HHVM_VERSION' ) && isset( $args['path'] ) && preg_match( '|^https?://|', $args['path'] ) ) {
+		if (defined('HHVM_VERSION') && isset($args['path']) && preg_match('|^https?://|', $args['path'])) {
 			return false;
 		}
 
@@ -103,21 +103,21 @@ 
 	 * @param string $mime_type
 	 * @return bool
 	 */
-	public static function supports_mime_type( $mime_type ) {
-		$imagick_extension = strtoupper( self::get_extension( $mime_type ) );
+	public static function supports_mime_type($mime_type) {
+		$imagick_extension = strtoupper(self::get_extension($mime_type));
 
-		if ( ! $imagick_extension )
+		if ( ! $imagick_extension)
 			return false;
 
 		// setIteratorIndex is optional unless mime is an animated format.
 		// Here, we just say no if you are missing it and aren't loading a jpeg.
-		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' )
+		if ( ! method_exists('Imagick', 'setIteratorIndex') && $mime_type != 'image/jpeg')
 				return false;
 
 		try {
-			return ( (bool) @Imagick::queryFormats( $imagick_extension ) );
+			return ((bool) @Imagick::queryFormats($imagick_extension));
 		}
-		catch ( Exception $e ) {
+		catch (Exception $e) {
 			return false;
 		}
 	}
@@ -131,34 +131,34 @@ 
 	 * @return true|WP_Error True if loaded; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image instanceof Imagick )
+		if ($this->image instanceof Imagick)
 			return true;
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		if ( ! is_file($this->file) && ! preg_match('|^https?://|', $this->file))
+			return new WP_Error('error_loading_image', __('File doesn&#8217;t exist?'), $this->file);
 
 		/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
 		// Even though Imagick uses less PHP memory than GD, set higher limit for users that have low PHP.ini limits
-		@ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+		@ini_set('memory_limit', apply_filters('image_memory_limit', WP_MAX_MEMORY_LIMIT));
 
 		try {
-			$this->image = new Imagick( $this->file );
+			$this->image = new Imagick($this->file);
 
-			if ( ! $this->image->valid() )
-				return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
+			if ( ! $this->image->valid())
+				return new WP_Error('invalid_image', __('File is not an image.'), $this->file);
 
 			// Select the first frame to handle animated images properly
-			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) )
+			if (is_callable(array($this->image, 'setIteratorIndex')))
 				$this->image->setIteratorIndex(0);
 
-			$this->mime_type = $this->get_mime_type( $this->image->getImageFormat() );
+			$this->mime_type = $this->get_mime_type($this->image->getImageFormat());
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'invalid_image', $e->getMessage(), $this->file );
+		catch (Exception $e) {
+			return new WP_Error('invalid_image', $e->getMessage(), $this->file);
 		}
 
 		$updated_size = $this->update_size();
-		if ( is_wp_error( $updated_size ) ) {
+		if (is_wp_error($updated_size)) {
 			return $updated_size;
 		}
 
@@ -174,25 +174,25 @@ 
 	 * @param int $quality Compression Quality. Range: [1,100]
 	 * @return true|WP_Error True if set successfully; WP_Error on failure.
 	 */
-	public function set_quality( $quality = null ) {
-		$quality_result = parent::set_quality( $quality );
-		if ( is_wp_error( $quality_result ) ) {
+	public function set_quality($quality = null) {
+		$quality_result = parent::set_quality($quality);
+		if (is_wp_error($quality_result)) {
 			return $quality_result;
 		} else {
 			$quality = $this->get_quality();
 		}
 
 		try {
-			if ( 'image/jpeg' == $this->mime_type ) {
-				$this->image->setImageCompressionQuality( $quality );
-				$this->image->setImageCompression( imagick::COMPRESSION_JPEG );
+			if ('image/jpeg' == $this->mime_type) {
+				$this->image->setImageCompressionQuality($quality);
+				$this->image->setImageCompression(imagick::COMPRESSION_JPEG);
 			}
 			else {
-				$this->image->setImageCompressionQuality( $quality );
+				$this->image->setImageCompressionQuality($quality);
 			}
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_quality_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_quality_error', $e->getMessage());
 		}
 
 		return true;
@@ -209,24 +209,24 @@ 
 	 *
 	 * @return true|WP_Error
 	 */
-	protected function update_size( $width = null, $height = null ) {
+	protected function update_size($width = null, $height = null) {
 		$size = null;
-		if ( !$width || !$height ) {
+		if ( ! $width || ! $height) {
 			try {
 				$size = $this->image->getImageGeometry();
 			}
-			catch ( Exception $e ) {
-				return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );
+			catch (Exception $e) {
+				return new WP_Error('invalid_image', __('Could not read image size.'), $this->file);
 			}
 		}
 
-		if ( ! $width )
+		if ( ! $width)
 			$width = $size['width'];
 
-		if ( ! $height )
+		if ( ! $height)
 			$height = $size['height'];
 
-		return parent::update_size( $width, $height );
+		return parent::update_size($width, $height);
 	}
 
 	/**
@@ -244,26 +244,26 @@ 
 	 * @param  bool     $crop
 	 * @return bool|WP_Error
 	 */
-	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
+	public function resize($max_w, $max_h, $crop = false) {
+		if (($this->size['width'] == $max_w) && ($this->size['height'] == $max_h))
 			return true;
 
-		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
-		if ( ! $dims )
-			return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
-		list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
+		$dims = image_resize_dimensions($this->size['width'], $this->size['height'], $max_w, $max_h, $crop);
+		if ( ! $dims)
+			return new WP_Error('error_getting_dimensions', __('Could not calculate resized image dimensions'));
+		list($dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h) = $dims;
 
-		if ( $crop ) {
-			return $this->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h );
+		if ($crop) {
+			return $this->crop($src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h);
 		}
 
 		// Execute the resize
-		$thumb_result = $this->thumbnail_image( $dst_w, $dst_h );
-		if ( is_wp_error( $thumb_result ) ) {
+		$thumb_result = $this->thumbnail_image($dst_w, $dst_h);
+		if (is_wp_error($thumb_result)) {
 			return $thumb_result;
 		}
 
-		return $this->update_size( $dst_w, $dst_h );
+		return $this->update_size($dst_w, $dst_h);
 	}
 
 	/**
@@ -281,7 +281,7 @@ 
 	 * @param bool   $strip_meta  Optional. Strip all profiles, excluding color profiles, from the image. Default true.
 	 * @return bool|WP_Error
 	 */
-	protected function thumbnail_image( $dst_w, $dst_h, $filter_name = 'FILTER_TRIANGLE', $strip_meta = true ) {
+	protected function thumbnail_image($dst_w, $dst_h, $filter_name = 'FILTER_TRIANGLE', $strip_meta = true) {
 		$allowed_filters = array(
 			'FILTER_POINT',
 			'FILTER_BOX',
@@ -304,10 +304,10 @@ 
 		 * Set the filter value if '$filter_name' name is in our whitelist and the related
 		 * Imagick constant is defined or fall back to our default filter.
 		 */
-		if ( in_array( $filter_name, $allowed_filters ) && defined( 'Imagick::' . $filter_name ) ) {
-			$filter = constant( 'Imagick::' . $filter_name );
+		if (in_array($filter_name, $allowed_filters) && defined('Imagick::'.$filter_name)) {
+			$filter = constant('Imagick::'.$filter_name);
 		} else {
-			$filter = defined( 'Imagick::FILTER_TRIANGLE' ) ? Imagick::FILTER_TRIANGLE : false;
+			$filter = defined('Imagick::FILTER_TRIANGLE') ? Imagick::FILTER_TRIANGLE : false;
 		}
 
 		/**
@@ -320,7 +320,7 @@ 
 		 *
 		 * @param bool $strip_meta Whether to strip image metadata during resizing. Default true.
 		 */
-		if ( apply_filters( 'image_strip_meta', $strip_meta ) ) {
+		if (apply_filters('image_strip_meta', $strip_meta)) {
 			$this->strip_meta(); // Fail silently if not supported.
 		}
 
@@ -330,12 +330,12 @@ 
 			 * whenever the output size is less that 1/3 of the original image size (1/3^2 ~= .111),
 			 * unless we would be resampling to a scale smaller than 128x128.
 			 */
-			if ( is_callable( array( $this->image, 'sampleImage' ) ) ) {
-				$resize_ratio = ( $dst_w / $this->size['width'] ) * ( $dst_h / $this->size['height'] );
+			if (is_callable(array($this->image, 'sampleImage'))) {
+				$resize_ratio = ($dst_w / $this->size['width']) * ($dst_h / $this->size['height']);
 				$sample_factor = 5;
 
-				if ( $resize_ratio < .111 && ( $dst_w * $sample_factor > 128 && $dst_h * $sample_factor > 128 ) ) {
-					$this->image->sampleImage( $dst_w * $sample_factor, $dst_h * $sample_factor );
+				if ($resize_ratio < .111 && ($dst_w * $sample_factor > 128 && $dst_h * $sample_factor > 128)) {
+					$this->image->sampleImage($dst_w * $sample_factor, $dst_h * $sample_factor);
 				}
 			}
 
@@ -345,27 +345,27 @@ 
 			 * results in better image quality over resizeImage() with default filter
 			 * settings and retains backwards compatibility with pre 4.5 functionality.
 			 */
-			if ( is_callable( array( $this->image, 'resizeImage' ) ) && $filter ) {
-				$this->image->setOption( 'filter:support', '2.0' );
-				$this->image->resizeImage( $dst_w, $dst_h, $filter, 1 );
+			if (is_callable(array($this->image, 'resizeImage')) && $filter) {
+				$this->image->setOption('filter:support', '2.0');
+				$this->image->resizeImage($dst_w, $dst_h, $filter, 1);
 			} else {
-				$this->image->scaleImage( $dst_w, $dst_h );
+				$this->image->scaleImage($dst_w, $dst_h);
 			}
 
 			// Set appropriate quality settings after resizing.
-			if ( 'image/jpeg' == $this->mime_type ) {
-				if ( is_callable( array( $this->image, 'unsharpMaskImage' ) ) ) {
-					$this->image->unsharpMaskImage( 0.25, 0.25, 8, 0.065 );
+			if ('image/jpeg' == $this->mime_type) {
+				if (is_callable(array($this->image, 'unsharpMaskImage'))) {
+					$this->image->unsharpMaskImage(0.25, 0.25, 8, 0.065);
 				}
 
-				$this->image->setOption( 'jpeg:fancy-upsampling', 'off' );
+				$this->image->setOption('jpeg:fancy-upsampling', 'off');
 			}
 
-			if ( 'image/png' === $this->mime_type ) {
-				$this->image->setOption( 'png:compression-filter', '5' );
-				$this->image->setOption( 'png:compression-level', '9' );
-				$this->image->setOption( 'png:compression-strategy', '1' );
-				$this->image->setOption( 'png:exclude-chunk', 'all' );
+			if ('image/png' === $this->mime_type) {
+				$this->image->setOption('png:compression-filter', '5');
+				$this->image->setOption('png:compression-level', '9');
+				$this->image->setOption('png:compression-strategy', '1');
+				$this->image->setOption('png:exclude-chunk', 'all');
 			}
 
 			/*
@@ -374,30 +374,30 @@ 
 			 * Note that Imagick::getImageAlphaChannel() is only available if Imagick
 			 * has been compiled against ImageMagick version 6.4.0 or newer.
 			 */
-			if ( is_callable( array( $this->image, 'getImageAlphaChannel' ) )
-				&& is_callable( array( $this->image, 'setImageAlphaChannel' ) )
-				&& defined( Imagick::ALPHACHANNEL_UNDEFINED )
-				&& defined( Imagick::ALPHACHANNEL_OPAQUE )
+			if (is_callable(array($this->image, 'getImageAlphaChannel'))
+				&& is_callable(array($this->image, 'setImageAlphaChannel'))
+				&& defined(Imagick::ALPHACHANNEL_UNDEFINED)
+				&& defined(Imagick::ALPHACHANNEL_OPAQUE)
 			) {
-				if ( $this->image->getImageAlphaChannel() === Imagick::ALPHACHANNEL_UNDEFINED ) {
-					$this->image->setImageAlphaChannel( Imagick::ALPHACHANNEL_OPAQUE );
+				if ($this->image->getImageAlphaChannel() === Imagick::ALPHACHANNEL_UNDEFINED) {
+					$this->image->setImageAlphaChannel(Imagick::ALPHACHANNEL_OPAQUE);
 				}
 			}
 
 			// Limit the bit depth of resized images to 8 bits per channel.
-			if ( is_callable( array( $this->image, 'getImageDepth' ) ) && is_callable( array( $this->image, 'setImageDepth' ) ) ) {
-				if ( 8 < $this->image->getImageDepth() ) {
-					$this->image->setImageDepth( 8 );
+			if (is_callable(array($this->image, 'getImageDepth')) && is_callable(array($this->image, 'setImageDepth'))) {
+				if (8 < $this->image->getImageDepth()) {
+					$this->image->setImageDepth(8);
 				}
 			}
 
-			if ( is_callable( array( $this->image, 'setInterlaceScheme' ) ) && defined( 'Imagick::INTERLACE_NO' ) ) {
-				$this->image->setInterlaceScheme( Imagick::INTERLACE_NO );
+			if (is_callable(array($this->image, 'setInterlaceScheme')) && defined('Imagick::INTERLACE_NO')) {
+				$this->image->setInterlaceScheme(Imagick::INTERLACE_NO);
 			}
 
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_resize_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_resize_error', $e->getMessage());
 		}
 	}
 
@@ -424,42 +424,42 @@ 
 	 * }
 	 * @return array An array of resized images' metadata by size.
 	 */
-	public function multi_resize( $sizes ) {
+	public function multi_resize($sizes) {
 		$metadata = array();
 		$orig_size = $this->size;
 		$orig_image = $this->image->getImage();
 
-		foreach ( $sizes as $size => $size_data ) {
-			if ( ! $this->image )
+		foreach ($sizes as $size => $size_data) {
+			if ( ! $this->image)
 				$this->image = $orig_image->getImage();
 
-			if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
+			if ( ! isset($size_data['width']) && ! isset($size_data['height'])) {
 				continue;
 			}
 
-			if ( ! isset( $size_data['width'] ) ) {
+			if ( ! isset($size_data['width'])) {
 				$size_data['width'] = null;
 			}
-			if ( ! isset( $size_data['height'] ) ) {
+			if ( ! isset($size_data['height'])) {
 				$size_data['height'] = null;
 			}
 
-			if ( ! isset( $size_data['crop'] ) ) {
+			if ( ! isset($size_data['crop'])) {
 				$size_data['crop'] = false;
 			}
 
-			$resize_result = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
-			$duplicate = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
+			$resize_result = $this->resize($size_data['width'], $size_data['height'], $size_data['crop']);
+			$duplicate = (($orig_size['width'] == $size_data['width']) && ($orig_size['height'] == $size_data['height']));
 
-			if ( ! is_wp_error( $resize_result ) && ! $duplicate ) {
-				$resized = $this->_save( $this->image );
+			if ( ! is_wp_error($resize_result) && ! $duplicate) {
+				$resized = $this->_save($this->image);
 
 				$this->image->clear();
 				$this->image->destroy();
 				$this->image = null;
 
-				if ( ! is_wp_error( $resized ) && $resized ) {
-					unset( $resized['path'] );
+				if ( ! is_wp_error($resized) && $resized) {
+					unset($resized['path']);
 					$metadata[$size] = $resized;
 				}
 			}
@@ -487,34 +487,34 @@ 
 	 * @param bool $src_abs Optional. If the source crop points are absolute.
 	 * @return bool|WP_Error
 	 */
-	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
-		if ( $src_abs ) {
+	public function crop($src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false) {
+		if ($src_abs) {
 			$src_w -= $src_x;
 			$src_h -= $src_y;
 		}
 
 		try {
-			$this->image->cropImage( $src_w, $src_h, $src_x, $src_y );
-			$this->image->setImagePage( $src_w, $src_h, 0, 0);
+			$this->image->cropImage($src_w, $src_h, $src_x, $src_y);
+			$this->image->setImagePage($src_w, $src_h, 0, 0);
 
-			if ( $dst_w || $dst_h ) {
+			if ($dst_w || $dst_h) {
 				// If destination width/height isn't specified, use same as
 				// width/height from source.
-				if ( ! $dst_w )
+				if ( ! $dst_w)
 					$dst_w = $src_w;
-				if ( ! $dst_h )
+				if ( ! $dst_h)
 					$dst_h = $src_h;
 
-				$thumb_result = $this->thumbnail_image( $dst_w, $dst_h );
-				if ( is_wp_error( $thumb_result ) ) {
+				$thumb_result = $this->thumbnail_image($dst_w, $dst_h);
+				if (is_wp_error($thumb_result)) {
 					return $thumb_result;
 				}
 
 				return $this->update_size();
 			}
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_crop_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_crop_error', $e->getMessage());
 		}
 		return $this->update_size();
 	}
@@ -528,23 +528,23 @@ 
 	 * @param float $angle
 	 * @return true|WP_Error
 	 */
-	public function rotate( $angle ) {
+	public function rotate($angle) {
 		/**
 		 * $angle is 360-$angle because Imagick rotates clockwise
 		 * (GD rotates counter-clockwise)
 		 */
 		try {
-			$this->image->rotateImage( new ImagickPixel('none'), 360-$angle );
+			$this->image->rotateImage(new ImagickPixel('none'), 360 - $angle);
 
 			// Since this changes the dimensions of the image, update the size.
 			$result = $this->update_size();
-			if ( is_wp_error( $result ) )
+			if (is_wp_error($result))
 				return $result;
 
-			$this->image->setImagePage( $this->size['width'], $this->size['height'], 0, 0 );
+			$this->image->setImagePage($this->size['width'], $this->size['height'], 0, 0);
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_rotate_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_rotate_error', $e->getMessage());
 		}
 		return true;
 	}
@@ -559,16 +559,16 @@ 
 	 * @param bool $vert Flip along Vertical Axis
 	 * @return true|WP_Error
 	 */
-	public function flip( $horz, $vert ) {
+	public function flip($horz, $vert) {
 		try {
-			if ( $horz )
+			if ($horz)
 				$this->image->flipImage();
 
-			if ( $vert )
+			if ($vert)
 				$this->image->flopImage();
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_flip_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_flip_error', $e->getMessage());
 		}
 		return true;
 	}
@@ -583,18 +583,18 @@ 
 	 * @param string $mime_type
 	 * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
 	 */
-	public function save( $destfilename = null, $mime_type = null ) {
-		$saved = $this->_save( $this->image, $destfilename, $mime_type );
+	public function save($destfilename = null, $mime_type = null) {
+		$saved = $this->_save($this->image, $destfilename, $mime_type);
 
-		if ( ! is_wp_error( $saved ) ) {
+		if ( ! is_wp_error($saved)) {
 			$this->file = $saved['path'];
 			$this->mime_type = $saved['mime-type'];
 
 			try {
-				$this->image->setImageFormat( strtoupper( $this->get_extension( $this->mime_type ) ) );
+				$this->image->setImageFormat(strtoupper($this->get_extension($this->mime_type)));
 			}
-			catch ( Exception $e ) {
-				return new WP_Error( 'image_save_error', $e->getMessage(), $this->file );
+			catch (Exception $e) {
+				return new WP_Error('image_save_error', $e->getMessage(), $this->file);
 			}
 		}
 
@@ -608,35 +608,35 @@ 
 	 * @param string $mime_type
 	 * @return array|WP_Error
 	 */
-	protected function _save( $image, $filename = null, $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
+	protected function _save($image, $filename = null, $mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format($filename, $mime_type);
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename)
+			$filename = $this->generate_filename(null, null, $extension);
 
 		try {
 			// Store initial Format
 			$orig_format = $this->image->getImageFormat();
 
-			$this->image->setImageFormat( strtoupper( $this->get_extension( $mime_type ) ) );
-			$this->make_image( $filename, array( $image, 'writeImage' ), array( $filename ) );
+			$this->image->setImageFormat(strtoupper($this->get_extension($mime_type)));
+			$this->make_image($filename, array($image, 'writeImage'), array($filename));
 
 			// Reset original Format
-			$this->image->setImageFormat( $orig_format );
+			$this->image->setImageFormat($orig_format);
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_save_error', $e->getMessage(), $filename );
+		catch (Exception $e) {
+			return new WP_Error('image_save_error', $e->getMessage(), $filename);
 		}
 
 		// Set correct file permissions
-		$stat = stat( dirname( $filename ) );
+		$stat = stat(dirname($filename));
 		$perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
-		@ chmod( $filename, $perms );
+		@ chmod($filename, $perms);
 
 		/** This filter is documented in wp-includes/class-wp-image-editor-gd.php */
 		return array(
 			'path'      => $filename,
-			'file'      => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ),
+			'file'      => wp_basename(apply_filters('image_make_intermediate_size', $filename)),
 			'width'     => $this->size['width'],
 			'height'    => $this->size['height'],
 			'mime-type' => $mime_type,
@@ -652,22 +652,22 @@ 
 	 * @param string $mime_type
 	 * @return true|WP_Error
 	 */
-	public function stream( $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( null, $mime_type );
+	public function stream($mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format(null, $mime_type);
 
 		try {
 			// Temporarily change format for stream
-			$this->image->setImageFormat( strtoupper( $extension ) );
+			$this->image->setImageFormat(strtoupper($extension));
 
 			// Output stream of image content
-			header( "Content-Type: $mime_type" );
+			header("Content-Type: $mime_type");
 			print $this->image->getImageBlob();
 
 			// Reset Image to original Format
-			$this->image->setImageFormat( $this->get_extension( $this->mime_type ) );
+			$this->image->setImageFormat($this->get_extension($this->mime_type));
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_stream_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_stream_error', $e->getMessage());
 		}
 
 		return true;
@@ -683,14 +683,14 @@ 
 	 */
 	protected function strip_meta() {
 
-		if ( ! is_callable( array( $this->image, 'getImageProfiles' ) ) ) {
+		if ( ! is_callable(array($this->image, 'getImageProfiles'))) {
 			/* translators: %s: ImageMagick method name */
-			return new WP_Error( 'image_strip_meta_error', sprintf( __( '%s is required to strip image meta.' ), '<code>Imagick::getImageProfiles()</code>' ) );
+			return new WP_Error('image_strip_meta_error', sprintf(__('%s is required to strip image meta.'), '<code>Imagick::getImageProfiles()</code>'));
 		}
 
-		if ( ! is_callable( array( $this->image, 'removeImageProfile' ) ) ) {
+		if ( ! is_callable(array($this->image, 'removeImageProfile'))) {
 			/* translators: %s: ImageMagick method name */
-			return new WP_Error( 'image_strip_meta_error', sprintf( __( '%s is required to strip image meta.' ), '<code>Imagick::removeImageProfile()</code>' ) );
+			return new WP_Error('image_strip_meta_error', sprintf(__('%s is required to strip image meta.'), '<code>Imagick::removeImageProfile()</code>'));
 		}
 
 		/*
@@ -712,14 +712,14 @@ 
 
 		try {
 			// Strip profiles.
-			foreach ( $this->image->getImageProfiles( '*', true ) as $key => $value ) {
-				if ( ! in_array( $key, $protected_profiles ) ) {
-					$this->image->removeImageProfile( $key );
+			foreach ($this->image->getImageProfiles('*', true) as $key => $value) {
+				if ( ! in_array($key, $protected_profiles)) {
+					$this->image->removeImageProfile($key);
 				}
 			}
 
-		} catch ( Exception $e ) {
-			return new WP_Error( 'image_strip_meta_error', $e->getMessage() );
+		} catch (Exception $e) {
+			return new WP_Error('image_strip_meta_error', $e->getMessage());
 		}
 
 		return true;

Braces +72 added lines, -64 removed lines

@@ -48,11 +48,13 @@ 
 	public static function test( $args = array() ) {
 
 		// First, test Imagick's extension and classes.
-		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick', false ) || ! class_exists( 'ImagickPixel', false ) )
-			return false;
+		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick', false ) || ! class_exists( 'ImagickPixel', false ) ) {
+					return false;
+		}
 
-		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) )
-			return false;
+		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) ) {
+					return false;
+		}
 
 		$required_methods = array(
 			'clear',
@@ -76,8 +78,9 @@ 
 		);
 
 		// Now, test for deep requirements within Imagick.
-		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) )
-			return false;
+		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) ) {
+					return false;
+		}
 
 		$class_methods = array_map( 'strtolower', get_class_methods( 'Imagick' ) );
 		if ( array_diff( $required_methods, $class_methods ) ) {
@@ -106,18 +109,19 @@ 
 	public static function supports_mime_type( $mime_type ) {
 		$imagick_extension = strtoupper( self::get_extension( $mime_type ) );
 
-		if ( ! $imagick_extension )
-			return false;
+		if ( ! $imagick_extension ) {
+					return false;
+		}
 
 		// setIteratorIndex is optional unless mime is an animated format.
 		// Here, we just say no if you are missing it and aren't loading a jpeg.
-		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' )
-				return false;
+		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' ) {
+						return false;
+		}
 
 		try {
 			return ( (bool) @Imagick::queryFormats( $imagick_extension ) );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return false;
 		}
 	}
@@ -131,11 +135,13 @@ 
 	 * @return true|WP_Error True if loaded; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image instanceof Imagick )
-			return true;
+		if ( $this->image instanceof Imagick ) {
+					return true;
+		}
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) ) {
+					return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		}
 
 		/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
 		// Even though Imagick uses less PHP memory than GD, set higher limit for users that have low PHP.ini limits
@@ -144,16 +150,17 @@ 
 		try {
 			$this->image = new Imagick( $this->file );
 
-			if ( ! $this->image->valid() )
-				return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
+			if ( ! $this->image->valid() ) {
+							return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
+			}
 
 			// Select the first frame to handle animated images properly
-			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) )
-				$this->image->setIteratorIndex(0);
+			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) ) {
+							$this->image->setIteratorIndex(0);
+			}
 
 			$this->mime_type = $this->get_mime_type( $this->image->getImageFormat() );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'invalid_image', $e->getMessage(), $this->file );
 		}
 
@@ -186,12 +193,10 @@ 
 			if ( 'image/jpeg' == $this->mime_type ) {
 				$this->image->setImageCompressionQuality( $quality );
 				$this->image->setImageCompression( imagick::COMPRESSION_JPEG );
-			}
-			else {
+			} else {
 				$this->image->setImageCompressionQuality( $quality );
 			}
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_quality_error', $e->getMessage() );
 		}
 
@@ -214,17 +219,18 @@ 
 		if ( !$width || !$height ) {
 			try {
 				$size = $this->image->getImageGeometry();
-			}
-			catch ( Exception $e ) {
+			} catch ( Exception $e ) {
 				return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );
 			}
 		}
 
-		if ( ! $width )
-			$width = $size['width'];
+		if ( ! $width ) {
+					$width = $size['width'];
+		}
 
-		if ( ! $height )
-			$height = $size['height'];
+		if ( ! $height ) {
+					$height = $size['height'];
+		}
 
 		return parent::update_size( $width, $height );
 	}
@@ -245,12 +251,14 @@ 
 	 * @return bool|WP_Error
 	 */
 	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
-			return true;
+		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) ) {
+					return true;
+		}
 
 		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
-		if ( ! $dims )
-			return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
+		if ( ! $dims ) {
+					return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
+		}
 		list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
 
 		if ( $crop ) {
@@ -395,8 +403,7 @@ 
 				$this->image->setInterlaceScheme( Imagick::INTERLACE_NO );
 			}
 
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_resize_error', $e->getMessage() );
 		}
 	}
@@ -430,8 +437,9 @@ 
 		$orig_image = $this->image->getImage();
 
 		foreach ( $sizes as $size => $size_data ) {
-			if ( ! $this->image )
-				$this->image = $orig_image->getImage();
+			if ( ! $this->image ) {
+							$this->image = $orig_image->getImage();
+			}
 
 			if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
 				continue;
@@ -500,10 +508,12 @@ 
 			if ( $dst_w || $dst_h ) {
 				// If destination width/height isn't specified, use same as
 				// width/height from source.
-				if ( ! $dst_w )
-					$dst_w = $src_w;
-				if ( ! $dst_h )
-					$dst_h = $src_h;
+				if ( ! $dst_w ) {
+									$dst_w = $src_w;
+				}
+				if ( ! $dst_h ) {
+									$dst_h = $src_h;
+				}
 
 				$thumb_result = $this->thumbnail_image( $dst_w, $dst_h );
 				if ( is_wp_error( $thumb_result ) ) {
@@ -512,8 +522,7 @@ 
 
 				return $this->update_size();
 			}
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_crop_error', $e->getMessage() );
 		}
 		return $this->update_size();
@@ -538,12 +547,12 @@ 
 
 			// Since this changes the dimensions of the image, update the size.
 			$result = $this->update_size();
-			if ( is_wp_error( $result ) )
-				return $result;
+			if ( is_wp_error( $result ) ) {
+							return $result;
+			}
 
 			$this->image->setImagePage( $this->size['width'], $this->size['height'], 0, 0 );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_rotate_error', $e->getMessage() );
 		}
 		return true;
@@ -561,13 +570,14 @@ 
 	 */
 	public function flip( $horz, $vert ) {
 		try {
-			if ( $horz )
-				$this->image->flipImage();
+			if ( $horz ) {
+							$this->image->flipImage();
+			}
 
-			if ( $vert )
-				$this->image->flopImage();
-		}
-		catch ( Exception $e ) {
+			if ( $vert ) {
+							$this->image->flopImage();
+			}
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_flip_error', $e->getMessage() );
 		}
 		return true;
@@ -592,8 +602,7 @@ 
 
 			try {
 				$this->image->setImageFormat( strtoupper( $this->get_extension( $this->mime_type ) ) );
-			}
-			catch ( Exception $e ) {
+			} catch ( Exception $e ) {
 				return new WP_Error( 'image_save_error', $e->getMessage(), $this->file );
 			}
 		}
@@ -611,8 +620,9 @@ 
 	protected function _save( $image, $filename = null, $mime_type = null ) {
 		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename ) {
+					$filename = $this->generate_filename( null, null, $extension );
+		}
 
 		try {
 			// Store initial Format
@@ -623,8 +633,7 @@ 
 
 			// Reset original Format
 			$this->image->setImageFormat( $orig_format );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_save_error', $e->getMessage(), $filename );
 		}
 
@@ -665,8 +674,7 @@ 
 
 			// Reset Image to original Format
 			$this->image->setImageFormat( $this->get_extension( $this->mime_type ) );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_stream_error', $e->getMessage() );
 		}
 

src/wp-includes/class-wp-metadata-lazyloader.php

Doc Comments +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
 	 *
 	 * @param string $object_type Type of object whose meta is to be lazy-loaded. Accepts 'term' or 'comment'.
 	 * @param array  $object_ids  Array of object IDs.
-	 * @return bool|WP_Error True on success, WP_Error on failure.
+	 * @return WP_Error|null True on success, WP_Error on failure.
 	 */
 	public function queue_objects( $object_type, $object_ids ) {
 		if ( ! isset( $this->settings[ $object_type ] ) ) {
@@ -115,7 +115,7 @@ 
 	 * @access public
 	 *
 	 * @param string $object_type Object type. Accepts 'comment' or 'term'.
-	 * @return bool|WP_Error True on success, WP_Error on failure.
+	 * @return WP_Error|null True on success, WP_Error on failure.
 	 */
 	public function reset_queue( $object_type ) {
 		if ( ! isset( $this->settings[ $object_type ] ) ) {

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Meta API: WP_Metadata_Lazyloader class
- *
- * @package WordPress
- * @subpackage Meta
- * @since 4.5.0
- */
+	 * Meta API: WP_Metadata_Lazyloader class
+	 *
+	 * @package WordPress
+	 * @subpackage Meta
+	 * @since 4.5.0
+	 */
 
 /**
  * Core class used for lazy-loading object metadata.

Spacing +27 added lines, -27 removed lines

@@ -57,11 +57,11 @@ 
 		$this->settings = array(
 			'term' => array(
 				'filter'   => 'get_term_metadata',
-				'callback' => array( $this, 'lazyload_term_meta' ),
+				'callback' => array($this, 'lazyload_term_meta'),
 			),
 			'comment' => array(
 				'filter'   => 'get_comment_metadata',
-				'callback' => array( $this, 'lazyload_comment_meta' ),
+				'callback' => array($this, 'lazyload_comment_meta'),
 			),
 		);
 	}
@@ -76,25 +76,25 @@ 
 	 * @param array  $object_ids  Array of object IDs.
 	 * @return bool|WP_Error True on success, WP_Error on failure.
 	 */
-	public function queue_objects( $object_type, $object_ids ) {
-		if ( ! isset( $this->settings[ $object_type ] ) ) {
-			return new WP_Error( 'invalid_object_type', __( 'Invalid object type' ) );
+	public function queue_objects($object_type, $object_ids) {
+		if ( ! isset($this->settings[$object_type])) {
+			return new WP_Error('invalid_object_type', __('Invalid object type'));
 		}
 
-		$type_settings = $this->settings[ $object_type ];
+		$type_settings = $this->settings[$object_type];
 
-		if ( ! isset( $this->pending_objects[ $object_type ] ) ) {
-			$this->pending_objects[ $object_type ] = array();
+		if ( ! isset($this->pending_objects[$object_type])) {
+			$this->pending_objects[$object_type] = array();
 		}
 
-		foreach ( $object_ids as $object_id ) {
+		foreach ($object_ids as $object_id) {
 			// Keyed by ID for faster lookup.
-			if ( ! isset( $this->pending_objects[ $object_type ][ $object_id ] ) ) {
-				$this->pending_objects[ $object_type ][ $object_id ] = 1;
+			if ( ! isset($this->pending_objects[$object_type][$object_id])) {
+				$this->pending_objects[$object_type][$object_id] = 1;
 			}
 		}
 
-		add_filter( $type_settings['filter'], $type_settings['callback'] );
+		add_filter($type_settings['filter'], $type_settings['callback']);
 
 		/**
 		 * Fires after objects are added to the metadata lazy-load queue.
@@ -105,7 +105,7 @@ 
 		 * @param string                 $object_type Type of object being queued.
 		 * @param WP_Metadata_Lazyloader $lazyloader  The lazy-loader object.
 		 */
-		do_action( 'metadata_lazyloader_queued_objects', $object_ids, $object_type, $this );
+		do_action('metadata_lazyloader_queued_objects', $object_ids, $object_type, $this);
 	}
 
 	/**
@@ -117,15 +117,15 @@ 
 	 * @param string $object_type Object type. Accepts 'comment' or 'term'.
 	 * @return bool|WP_Error True on success, WP_Error on failure.
 	 */
-	public function reset_queue( $object_type ) {
-		if ( ! isset( $this->settings[ $object_type ] ) ) {
-			return new WP_Error( 'invalid_object_type', __( 'Invalid object type' ) );
+	public function reset_queue($object_type) {
+		if ( ! isset($this->settings[$object_type])) {
+			return new WP_Error('invalid_object_type', __('Invalid object type'));
 		}
 
-		$type_settings = $this->settings[ $object_type ];
+		$type_settings = $this->settings[$object_type];
 
-		$this->pending_objects[ $object_type ] = array();
-		remove_filter( $type_settings['filter'], $type_settings['callback'] );
+		$this->pending_objects[$object_type] = array();
+		remove_filter($type_settings['filter'], $type_settings['callback']);
 	}
 
 	/**
@@ -141,12 +141,12 @@ 
 	 * @return mixed In order not to short-circuit `get_metadata()`. Generally, this is `null`, but it could be
 	 *               another value if filtered by a plugin.
 	 */
-	public function lazyload_term_meta( $check ) {
-		if ( ! empty( $this->pending_objects['term'] ) ) {
-			update_termmeta_cache( array_keys( $this->pending_objects['term'] ) );
+	public function lazyload_term_meta($check) {
+		if ( ! empty($this->pending_objects['term'])) {
+			update_termmeta_cache(array_keys($this->pending_objects['term']));
 
 			// No need to run again for this set of terms.
-			$this->reset_queue( 'term' );
+			$this->reset_queue('term');
 		}
 
 		return $check;
@@ -163,12 +163,12 @@ 
 	 * @param mixed $check The `$check` param passed from the 'get_comment_metadata' hook.
 	 * @return mixed The original value of `$check`, so as not to short-circuit `get_comment_metadata()`.
 	 */
-	public function lazyload_comment_meta( $check ) {
-		if ( ! empty( $this->pending_objects['comment'] ) ) {
-			update_meta_cache( 'comment', array_keys( $this->pending_objects['comment'] ) );
+	public function lazyload_comment_meta($check) {
+		if ( ! empty($this->pending_objects['comment'])) {
+			update_meta_cache('comment', array_keys($this->pending_objects['comment']));
 
 			// No need to run again for this set of comments.
-			$this->reset_queue( 'comment' );
+			$this->reset_queue('comment');
 		}
 
 		return $check;

src/wp-includes/comment-template.php

Doc Comments +19 added lines, -19 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 ) {
@@ -201,7 +201,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.
  */
@@ -235,7 +235,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 ) {
@@ -248,7 +248,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.
  */
@@ -274,7 +274,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 ) {
@@ -287,7 +287,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.
  */
@@ -315,7 +315,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 ) {
@@ -513,7 +513,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.
  */
@@ -542,7 +542,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 ) {
@@ -559,7 +559,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.
  */
@@ -605,7 +605,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 ) {
@@ -775,7 +775,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 ) {
@@ -814,7 +814,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 ) {
@@ -902,7 +902,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.
@@ -932,7 +932,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.
  */
@@ -1005,7 +1005,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.
  */

Indentation +15 added lines, -15 removed lines

@@ -2126,11 +2126,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>' );
@@ -2148,20 +2148,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'  => '',
 		'id_form'              => 'commentform',

Spacing +402 added lines, -402 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);
 
 	/**
 	 * Filter 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);
 
 	/**
 	 * Filter 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);
 
 	/**
 	 * Filter 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);
 }
 
 /**
@@ -144,8 +144,8 @@ 
  * @param string $before   Optional. Text or HTML to display before the email link. Default empty.
  * @param string $after    Optional. Text or HTML to display after the email link. Default empty.
  */
-function comment_author_email_link( $linktext = '', $before = '', $after = '' ) {
-	if ( $link = get_comment_author_email_link( $linktext, $before, $after ) )
+function comment_author_email_link($linktext = '', $before = '', $after = '') {
+	if ($link = get_comment_author_email_link($linktext, $before, $after))
 		echo $link;
 }
 
@@ -166,7 +166,7 @@ 
  * @param string $after    Optional. Text or HTML to display after the email link. Default empty.
  * @return string
  */
-function get_comment_author_email_link( $linktext = '', $before = '', $after = '' ) {
+function get_comment_author_email_link($linktext = '', $before = '', $after = '') {
 	$comment = get_comment();
 	/**
 	 * Filter the comment author's email for display.
@@ -180,11 +180,11 @@ 
 	 * @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 );
-	if ((!empty($email)) && ($email != '@')) {
+	$email = apply_filters('comment_email', $comment->comment_author_email, $comment);
+	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 {
@@ -205,12 +205,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>";
@@ -226,7 +226,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);
 }
 
 /**
@@ -238,8 +238,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);
 }
 
 /**
@@ -252,8 +252,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);
 
 	/**
 	 * Filter the comment author's returned IP address.
@@ -265,7 +265,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);
 }
 
 /**
@@ -277,8 +277,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));
 }
 
 /**
@@ -291,10 +291,10 @@ 
  *									 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 = ('http://' == $comment->comment_author_url) ? '' : $comment->comment_author_url;
-	$url = esc_url( $url, array('http', 'https') );
+	$url = esc_url($url, array('http', 'https'));
 
 	/**
 	 * Filter the comment author's URL.
@@ -306,7 +306,7 @@ 
 	 * @param int        $comment_ID The comment ID.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_author_url', $url, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_author_url', $url, $comment->comment_ID, $comment);
 }
 
 /**
@@ -318,9 +318,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);
 
 	/**
 	 * Filter the comment author's URL for display.
@@ -331,7 +331,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);
 }
 
 /**
@@ -354,13 +354,13 @@ 
  *                         Default empty.
  * @return string The HTML link between the $before and $after parameters.
  */
-function get_comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
+function get_comment_author_url_link($linktext = '', $before = '', $after = '') {
 	$url = get_comment_author_url();
 	$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);
 	}
 
@@ -373,7 +373,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);
 }
 
 /**
@@ -388,8 +388,8 @@ 
  * @param string $after    Optional. Text or HTML to display after the email link.
  *                         Default empty.
  */
-function comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
-	echo get_comment_author_url_link( $linktext, $before, $after );
+function comment_author_url_link($linktext = '', $before = '', $after = '') {
+	echo get_comment_author_url_link($linktext, $before, $after);
 }
 
 /**
@@ -406,10 +406,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;
@@ -430,39 +430,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 {
@@ -472,8 +472,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 {
@@ -484,8 +484,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);
 	}
@@ -503,7 +503,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);
 }
 
 /**
@@ -517,9 +517,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);
@@ -532,7 +532,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);
 }
 
 /**
@@ -545,8 +545,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);
 }
 
 /**
@@ -563,10 +563,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);
 
 	/**
 	 * Filter the amount of words used in the comment excerpt.
@@ -575,15 +575,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;';
 	}
 	/**
@@ -596,7 +596,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);
 }
 
 /**
@@ -608,9 +608,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);
 
 	/**
 	 * Filter the comment excerpt for display.
@@ -621,7 +621,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);
 }
 
 /**
@@ -643,7 +643,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);
 }
 
 /**
@@ -679,14 +679,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);
 
 	// Backwards compat
-	if ( ! is_array( $args ) ) {
-		$args = array( 'page' => $args );
+	if ( ! is_array($args)) {
+		$args = array('page' => $args);
 	}
 
 	$defaults = array(
@@ -696,33 +696,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);
 			}
 		}
 
@@ -730,29 +730,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;
 
 	/**
 	 * Filter the returned single comment permalink.
@@ -767,7 +767,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);
 }
 
 /**
@@ -778,9 +778,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;
 
 	/**
 	 * Filter the returned post comments permalink.
@@ -790,7 +790,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);
 }
 
 /**
@@ -801,12 +801,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' );
-	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');
+	echo esc_url(get_comments_link());
 }
 
 /**
@@ -817,10 +817,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;
@@ -835,7 +835,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);
 }
 
 /**
@@ -848,11 +848,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' );
+function comments_number($zero = false, $one = false, $more = false, $deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '1.3');
 	}
-	echo get_comments_number_text( $zero, $one, $more );
+	echo get_comments_number_text($zero, $one, $more);
 }
 
 /**
@@ -864,21 +864,21 @@ 
  * @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
-			$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;
 	}
 	/**
 	 * Filter the comments count for display.
@@ -891,7 +891,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);
 }
 
 /**
@@ -907,8 +907,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);
 
 	/**
 	 * Filter the text of a comment.
@@ -921,7 +921,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);
 }
 
 /**
@@ -936,10 +936,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);
 	/**
 	 * Filter the text of a comment to be displayed.
 	 *
@@ -951,7 +951,7 @@ 
 	 * @param WP_Comment $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);
 }
 
 /**
@@ -965,11 +965,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);
@@ -985,7 +985,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);
 }
 
 /**
@@ -995,7 +995,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);
 }
 
@@ -1009,9 +1009,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';
 
 	/**
@@ -1024,7 +1024,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);
 }
 
 /**
@@ -1036,12 +1036,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;
@@ -1065,10 +1065,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();
 
 	/**
 	 * Filter the returned trackback URL.
@@ -1077,7 +1077,7 @@ 
 	 *
 	 * @param string $tb_url The trackback URL.
 	 */
-	return apply_filters( 'trackback_url', $tb_url );
+	return apply_filters('trackback_url', $tb_url);
 }
 
 /**
@@ -1089,17 +1089,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',
+function trackback_url($deprecated_echo = true) {
+	if (true !== $deprecated_echo) {
+		_deprecated_argument(__FUNCTION__, '2.5',
 			/* 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();
@@ -1115,12 +1115,12 @@ 
  *
  * @param int $deprecated Not used (Was $timezone = 0).
  */
-function trackback_rdf( $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '2.5' );
+function trackback_rdf($deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '2.5');
 	}
 
-	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;
 	}
 
@@ -1146,11 +1146,11 @@ 
  * @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);
 
-	$open = ( 'open' == $_post->comment_status );
+	$open = ('open' == $_post->comment_status);
 
 	/**
 	 * Filter whether the current post is open for comments.
@@ -1160,7 +1160,7 @@ 
 	 * @param bool        $open    Whether the current post is open for comments.
 	 * @param int|WP_Post $post_id The post ID or WP_Post object.
 	 */
-	return apply_filters( 'comments_open', $open, $post_id );
+	return apply_filters('comments_open', $open, $post_id);
 }
 
 /**
@@ -1171,11 +1171,11 @@ 
  * @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);
 
-	$open = ( 'open' == $_post->ping_status );
+	$open = ('open' == $_post->ping_status);
 
 	/**
 	 * Filter whether the current post is open for pings.
@@ -1185,7 +1185,7 @@ 
 	 * @param bool        $open    Whether the current post is open for pings.
 	 * @param int|WP_Post $post_id The post ID or WP_Post object.
 	 */
-	return apply_filters( 'pings_open', $open, $post_id );
+	return apply_filters('pings_open', $open, $post_id);
 }
 
 /**
@@ -1206,8 +1206,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";
 	}
 }
@@ -1247,13 +1247,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');
@@ -1289,31 +1289,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.
@@ -1325,17 +1325,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;
 		}
 	}
 
@@ -1362,22 +1362,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;
 			}
 		}
@@ -1393,13 +1393,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 {
@@ -1407,15 +1407,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;
 	/**
 	 * Filter the path to the theme template file used for the comments template.
 	 *
@@ -1423,13 +1423,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');
 }
 
 /**
@@ -1446,45 +1446,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';
 		/**
 		 * Filter the respond link when a post has no comments.
 		 *
@@ -1493,13 +1493,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.'" ';
 	}
 
@@ -1511,10 +1511,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>';
 }
 
@@ -1545,33 +1545,33 @@ 
  *                                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_to_text' => __( 'Reply to %s' ),
-		'login_text'    => __( 'Log in to Reply' ),
+		'reply_text'    => __('Reply'),
+		'reply_to_text' => __('Reply to %s'),
+		'login_text'    => __('Log in to Reply'),
 		'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;
 	}
 
@@ -1585,22 +1585,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']
 		);
 	}
@@ -1615,7 +1615,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);
 }
 
 /**
@@ -1672,27 +1672,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'];
 
 	/**
 	 * Filter the formatted post comments link HTML.
@@ -1702,7 +1702,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);
 }
 
 /**
@@ -1729,14 +1729,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>';
 
 	/**
 	 * Filter the cancel comment reply link HTML.
@@ -1747,7 +1747,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);
 }
 
 /**
@@ -1757,7 +1757,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);
 }
 
@@ -1769,8 +1769,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;
@@ -1786,7 +1786,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);
 }
 
 /**
@@ -1796,8 +1796,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);
 }
 
 /**
@@ -1820,21 +1820,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);
 	}
 }
 
@@ -1876,7 +1876,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;
@@ -1896,12 +1896,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);
 
 	/**
 	 * Filter the arguments used in retrieving the comment list.
@@ -1912,16 +1912,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 {
@@ -1932,29 +1932,29 @@ 
 		 * 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) {
 
-				$comments = get_comments( array(
+				$comments = get_comments(array(
 					'post_id' => get_the_ID(),
 					'orderby' => 'comment_date_gmt',
 					'order' => 'ASC',
 					'status' => 'all',
-				) );
+				));
 
-				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;
 				}
@@ -1962,29 +1962,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;
@@ -1996,52 +1996,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;
@@ -2108,32 +2108,32 @@ 
  * }
  * @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();
 
 	$commenter = wp_get_current_commenter();
 	$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>');
 
 	/**
 	 * Filter the default comment form fields.
@@ -2142,41 +2142,41 @@ 
 	 *
 	 * @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'  => '',
 		'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',
@@ -2191,53 +2191,53 @@ 
 	 *
 	 * @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);
 
-	if ( comments_open( $post_id ) ) : ?>
+	if (comments_open($post_id)) : ?>
 		<?php
 		/**
 		 * 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 site_url( '/wp-comments-post.php' ); ?>" 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 site_url('/wp-comments-post.php'); ?>" 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()) :
 						/**
 						 * Filter the 'logged in' message for the comment form for display.
 						 *
@@ -2249,7 +2249,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.
@@ -2261,7 +2261,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 :
 
@@ -2270,7 +2270,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'];
 
 					/**
 					 * Filter the comment form fields, including the textarea.
@@ -2279,18 +2279,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) {
 
 							/**
 							 * Filter the content of the comment textarea field for display.
@@ -2299,19 +2299,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');
 							}
 
 							/**
@@ -2324,25 +2324,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'])
 					);
 
 					/**
@@ -2353,12 +2353,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)
 					);
 
 					/**
@@ -2372,7 +2372,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.
@@ -2381,7 +2381,7 @@ 
 					 *
 					 * @param int $post_id The post ID.
 					 */
-					do_action( 'comment_form', $post_id );
+					do_action('comment_form', $post_id);
 					?>
 				</form>
 			<?php endif; ?>
@@ -2392,13 +2392,13 @@ 
 		 *
 		 * @since 3.0.0
 		 */
-		do_action( 'comment_form_after' );
+		do_action('comment_form_after');
 	else :
 		/**
 		 * 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');
 	endif;
 }

Braces +140 added lines, -92 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;
 	}
@@ -145,9 +146,10 @@ 
  * @param string $after    Optional. Text or HTML to display after the email link. Default empty.
  */
 function comment_author_email_link( $linktext = '', $before = '', $after = '' ) {
-	if ( $link = get_comment_author_email_link( $linktext, $before, $after ) )
-		echo $link;
-}
+	if ( $link = get_comment_author_email_link( $linktext, $before, $after ) ) {
+			echo $link;
+	}
+	}
 
 /**
  * Return the html email link to the author of the current comment.
@@ -210,10 +212,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>";
+	}
 
 	/**
 	 * Filter the comment author's link for display.
@@ -409,11 +412,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.
@@ -455,12 +459,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';
@@ -485,8 +492,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);
 	}
 
@@ -519,10 +527,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);
+	}
 	/**
 	 * Filter the returned comment date.
 	 *
@@ -802,10 +811,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' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '0.72' );
+	}
+	if ( !empty( $deprecated_2 ) ) {
+			_deprecated_argument( __FUNCTION__, '1.3' );
+	}
 	echo esc_url( get_comments_link() );
 }
 
@@ -969,10 +980,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);
+	}
 
 	/**
 	 * Filter the returned comment time.
@@ -1011,8 +1023,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';
+	}
 
 	/**
 	 * Filter the returned comment type.
@@ -1037,9 +1050,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' :
@@ -1065,10 +1084,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();
+	}
 
 	/**
 	 * Filter the returned trackback URL.
@@ -1250,11 +1270,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');
 
@@ -1412,8 +1434,9 @@ 
 		$overridden_cpage = true;
 	}
 
-	if ( !defined('COMMENTS_TEMPLATE') )
-		define('COMMENTS_TEMPLATE', true);
+	if ( !defined('COMMENTS_TEMPLATE') ) {
+			define('COMMENTS_TEMPLATE', true);
+	}
 
 	$theme_template = STYLESHEETPATH . $file;
 	/**
@@ -1424,13 +1447,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.
@@ -1730,8 +1755,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';
@@ -1770,8 +1796,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";
@@ -1823,14 +1850,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 );
@@ -1917,12 +1948,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;
@@ -1962,13 +1995,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;
@@ -2006,10 +2042,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'] ) {
@@ -2023,11 +2060,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 );
 
@@ -2109,16 +2148,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 )
-		$post_id = get_the_ID();
+	if ( null === $post_id ) {
+			$post_id = get_the_ID();
+	}
 
 	$commenter = wp_get_current_commenter();
 	$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';
+	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'" : '' );
@@ -2227,8 +2268,11 @@ 
 				 * @since 3.0.0
 				 */
 				do_action( 'comment_form_must_log_in_after' );
-			else : ?>
-				<form action="<?php echo site_url( '/wp-comments-post.php' ); ?>" 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 site_url( '/wp-comments-post.php' );
+			}
+			?>" 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.
@@ -2263,9 +2307,11 @@ 
 						 */
 						do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
 
-					else :
+					else {
+						:
 
 						echo $args['comment_notes_before'];
+					}
 
 					endif;
 
@@ -2393,12 +2439,14 @@ 
 		 * @since 3.0.0
 		 */
 		do_action( 'comment_form_after' );
-	else :
+	else {
+		:
 		/**
 		 * Fires after the comment form if comments are closed.
 		 *
 		 * @since 3.0.0
 		 */
 		do_action( 'comment_form_comments_closed' );
+	}
 	endif;
 }

src/wp-includes/comment.php

Doc Comments +4 added lines, -4 removed lines

@@ -978,7 +978,7 @@ 
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @return array Maximum character length for the comment form fields.
+ * @return string Maximum character length for the comment form fields.
  */
 function wp_get_comment_fields_max_lengths() {
 	global $wpdb;
@@ -1492,7 +1492,7 @@ 
  *
  * @since 2.0.4
  *
- * @return array Comment author, email, url respectively.
+ * @return string Comment author, email, url respectively.
  */
 function wp_get_current_commenter() {
 	// Cookies should already be sanitized.
@@ -1558,7 +1558,7 @@ 
  *                                            new comment.
  *     @type int        $user_id              ID of the user who submitted the comment. Default 0.
  * }
- * @return int|false The new comment's ID on success, false on failure.
+ * @return string The new comment's ID on success, false on failure.
  */
 function wp_insert_comment( $commentdata ) {
 	global $wpdb;
@@ -2644,7 +2644,7 @@ 
  *
  * @param WP_Post  $posts Post data object.
  * @param WP_Query $query Query object.
- * @return array
+ * @return WP_Post
  */
 function _close_comments_for_old_posts( $posts, $query ) {
 	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Core Comment API
- *
- * @package WordPress
- * @subpackage Comment
- */
+	 * Core Comment API
+	 *
+	 * @package WordPress
+	 * @subpackage Comment
+	 */
 
 /**
  * Check whether a comment passes internal checks to be allowed to add.

Spacing +518 added lines, -518 removed lines

@@ -40,15 +40,15 @@ 
 	global $wpdb;
 
 	// If manual moderation is enabled, skip all checks and return false.
-	if ( 1 == get_option('comment_moderation') )
+	if (1 == get_option('comment_moderation'))
 		return false;
 
 	/** This filter is documented in wp-includes/comment-template.php */
-	$comment = apply_filters( 'comment_text', $comment );
+	$comment = apply_filters('comment_text', $comment);
 
 	// Check for the number of external links if a max allowed number is set.
-	if ( $max_links = get_option( 'comment_max_links' ) ) {
-		$num_links = preg_match_all( '/<a [^>]*href/i', $comment, $out );
+	if ($max_links = get_option('comment_max_links')) {
+		$num_links = preg_match_all('/<a [^>]*href/i', $comment, $out);
 
 		/**
 		 * Filter the maximum number of links allowed in a comment.
@@ -58,27 +58,27 @@ 
 		 * @param int    $num_links The number of links allowed.
 		 * @param string $url       Comment author's URL. Included in allowed links total.
 		 */
-		$num_links = apply_filters( 'comment_max_links_url', $num_links, $url );
+		$num_links = apply_filters('comment_max_links_url', $num_links, $url);
 
 		/*
 		 * If the number of links in the comment exceeds the allowed amount,
 		 * fail the check by returning false.
 		 */
-		if ( $num_links >= $max_links )
+		if ($num_links >= $max_links)
 			return false;
 	}
 
 	$mod_keys = trim(get_option('moderation_keys'));
 
 	// If moderation 'keys' (keywords) are set, process them.
-	if ( !empty($mod_keys) ) {
-		$words = explode("\n", $mod_keys );
+	if ( ! empty($mod_keys)) {
+		$words = explode("\n", $mod_keys);
 
-		foreach ( (array) $words as $word) {
+		foreach ((array) $words as $word) {
 			$word = trim($word);
 
 			// Skip empty lines.
-			if ( empty($word) )
+			if (empty($word))
 				continue;
 
 			/*
@@ -92,12 +92,12 @@ 
 			 * fail the check for the given field by returning false.
 			 */
 			$pattern = "#$word#i";
-			if ( preg_match($pattern, $author) ) return false;
-			if ( preg_match($pattern, $email) ) return false;
-			if ( preg_match($pattern, $url) ) return false;
-			if ( preg_match($pattern, $comment) ) return false;
-			if ( preg_match($pattern, $user_ip) ) return false;
-			if ( preg_match($pattern, $user_agent) ) return false;
+			if (preg_match($pattern, $author)) return false;
+			if (preg_match($pattern, $email)) return false;
+			if (preg_match($pattern, $url)) return false;
+			if (preg_match($pattern, $comment)) return false;
+			if (preg_match($pattern, $user_ip)) return false;
+			if (preg_match($pattern, $user_agent)) return false;
 		}
 	}
 
@@ -108,12 +108,12 @@ 
 	 * as well as whether there are any moderation keywords (if set) present in the author
 	 * email address. If both checks pass, return true. Otherwise, return false.
 	 */
-	if ( 1 == get_option('comment_whitelist')) {
-		if ( 'trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '' ) {
+	if (1 == get_option('comment_whitelist')) {
+		if ('trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '') {
 			// expected_slashed ($author, $email)
 			$ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1");
-			if ( ( 1 == $ok_to_comment ) &&
-				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) )
+			if ((1 == $ok_to_comment) &&
+				(empty($mod_keys) || false === strpos($email, $mod_keys)))
 					return true;
 			else
 				return false;
@@ -136,8 +136,8 @@ 
  * @return int|array $comments The approved comments, or number of comments if `$count`
  *                             argument is true.
  */
-function get_approved_comments( $post_id, $args = array() ) {
-	if ( ! $post_id ) {
+function get_approved_comments($post_id, $args = array()) {
+	if ( ! $post_id) {
 		return array();
 	}
 
@@ -146,10 +146,10 @@ 
 		'post_id' => $post_id,
 		'order'   => 'ASC',
 	);
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	$query = new WP_Comment_Query;
-	return $query->query( $r );
+	return $query->query($r);
 }
 
 /**
@@ -167,20 +167,20 @@ 
  * @param string $output Optional. OBJECT or ARRAY_A or ARRAY_N constants.
  * @return WP_Comment|array|null Depends on $output value.
  */
-function get_comment( &$comment = null, $output = OBJECT ) {
-	if ( empty( $comment ) && isset( $GLOBALS['comment'] ) ) {
+function get_comment(&$comment = null, $output = OBJECT) {
+	if (empty($comment) && isset($GLOBALS['comment'])) {
 		$comment = $GLOBALS['comment'];
 	}
 
-	if ( $comment instanceof WP_Comment ) {
+	if ($comment instanceof WP_Comment) {
 		$_comment = $comment;
-	} elseif ( is_object( $comment ) ) {
-		$_comment = new WP_Comment( $comment );
+	} elseif (is_object($comment)) {
+		$_comment = new WP_Comment($comment);
 	} else {
-		$_comment = WP_Comment::get_instance( $comment );
+		$_comment = WP_Comment::get_instance($comment);
 	}
 
-	if ( ! $_comment ) {
+	if ( ! $_comment) {
 		return null;
 	}
 
@@ -191,14 +191,14 @@ 
 	 *
 	 * @param mixed $_comment Comment data.
 	 */
-	$_comment = apply_filters( 'get_comment', $_comment );
+	$_comment = apply_filters('get_comment', $_comment);
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $_comment;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		return $_comment->to_array();
-	} elseif ( $output == ARRAY_N ) {
-		return array_values( $_comment->to_array() );
+	} elseif ($output == ARRAY_N) {
+		return array_values($_comment->to_array());
 	}
 	return $_comment;
 }
@@ -214,9 +214,9 @@ 
  *                           for information on accepted arguments. Default empty.
  * @return int|array List of comments or number of found comments if `$count` argument is true.
  */
-function get_comments( $args = '' ) {
+function get_comments($args = '') {
 	$query = new WP_Comment_Query;
-	return $query->query( $args );
+	return $query->query($args);
 }
 
 /**
@@ -231,10 +231,10 @@ 
  */
 function get_comment_statuses() {
 	$status = array(
-		'hold'		=> __( 'Unapproved' ),
-		'approve'	=> _x( 'Approved', 'comment status' ),
-		'spam'		=> _x( 'Spam', 'comment status' ),
-		'trash'		=> _x( 'Trash', 'comment status' ),
+		'hold'		=> __('Unapproved'),
+		'approve'	=> _x('Approved', 'comment status'),
+		'spam'		=> _x('Spam', 'comment status'),
+		'trash'		=> _x('Trash', 'comment status'),
 	);
 
 	return $status;
@@ -249,8 +249,8 @@ 
  * @param string $comment_type Optional. Comment type. Default 'comment'.
  * @return string Expected return value is 'open' or 'closed'.
  */
-function get_default_comment_status( $post_type = 'post', $comment_type = 'comment' ) {
-	switch ( $comment_type ) {
+function get_default_comment_status($post_type = 'post', $comment_type = 'comment') {
+	switch ($comment_type) {
 		case 'pingback' :
 		case 'trackback' :
 			$supports = 'trackbacks';
@@ -262,10 +262,10 @@ 
 	}
 
 	// Set the status.
-	if ( 'page' === $post_type ) {
+	if ('page' === $post_type) {
 		$status = 'closed';
-	} elseif ( post_type_supports( $post_type, $supports ) ) {
-		$status = get_option( "default_{$option}_status" );
+	} elseif (post_type_supports($post_type, $supports)) {
+		$status = get_option("default_{$option}_status");
 	} else {
 		$status = 'closed';
 	}
@@ -280,7 +280,7 @@ 
 	 * @param string $post_type    Post type. Default is `post`.
 	 * @param string $comment_type Type of comment. Default is `comment`.
 	 */
-	return apply_filters( 'get_default_comment_status' , $status, $post_type, $comment_type );
+	return apply_filters('get_default_comment_status', $status, $post_type, $comment_type);
 }
 
 /**
@@ -299,12 +299,12 @@ 
 	global $wpdb;
 	static $cache_lastcommentmodified = array();
 
-	if ( isset($cache_lastcommentmodified[$timezone]) )
+	if (isset($cache_lastcommentmodified[$timezone]))
 		return $cache_lastcommentmodified[$timezone];
 
 	$add_seconds_server = date('Z');
 
-	switch ( strtolower($timezone)) {
+	switch (strtolower($timezone)) {
 		case 'gmt':
 			$lastcommentmodified = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1");
 			break;
@@ -335,13 +335,13 @@ 
  * @param int $post_id Optional. Comment amount in post if > 0, else total comments blog wide.
  * @return array The amount of spam, approved, awaiting moderation, and total comments.
  */
-function get_comment_count( $post_id = 0 ) {
+function get_comment_count($post_id = 0) {
 	global $wpdb;
 
 	$post_id = (int) $post_id;
 
 	$where = '';
-	if ( $post_id > 0 ) {
+	if ($post_id > 0) {
 		$where = $wpdb->prepare("WHERE comment_post_ID = %d", $post_id);
 	}
 
@@ -362,8 +362,8 @@ 
 		'all'                 => 0,
 	);
 
-	foreach ( $totals as $row ) {
-		switch ( $row['comment_approved'] ) {
+	foreach ($totals as $row) {
+		switch ($row['comment_approved']) {
 			case 'trash':
 				$comment_count['trash'] = $row['total'];
 				break;
@@ -475,20 +475,20 @@ 
  *
  * @param array $comments Array of comment objects.
  */
-function wp_queue_comments_for_comment_meta_lazyload( $comments ) {
+function wp_queue_comments_for_comment_meta_lazyload($comments) {
 	// Don't use `wp_list_pluck()` to avoid by-reference manipulation.
 	$comment_ids = array();
-	if ( is_array( $comments ) ) {
-		foreach ( $comments as $comment ) {
-			if ( $comment instanceof WP_Comment ) {
+	if (is_array($comments)) {
+		foreach ($comments as $comment) {
+			if ($comment instanceof WP_Comment) {
 				$comment_ids[] = $comment->comment_ID;
 			}
 		}
 	}
 
-	if ( $comment_ids ) {
+	if ($comment_ids) {
 		$lazyloader = wp_metadata_lazyloader();
-		$lazyloader->queue_objects( 'comment', $comment_ids );
+		$lazyloader->queue_objects('comment', $comment_ids);
 	}
 }
 
@@ -502,7 +502,7 @@ 
  * @since 3.4.0
  */
 function wp_set_comment_cookies($comment, $user) {
-	if ( $user->exists() )
+	if ($user->exists())
 		return;
 
 	/**
@@ -512,11 +512,11 @@ 
 	 *
 	 * @param int $seconds Comment cookie lifetime. Default 30000000.
 	 */
-	$comment_cookie_lifetime = apply_filters( 'comment_cookie_lifetime', 30000000 );
-	$secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
-	setcookie( 'comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
-	setcookie( 'comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
-	setcookie( 'comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
+	$comment_cookie_lifetime = apply_filters('comment_cookie_lifetime', 30000000);
+	$secure = ('https' === parse_url(home_url(), PHP_URL_SCHEME));
+	setcookie('comment_author_'.COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure);
+	setcookie('comment_author_email_'.COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure);
+	setcookie('comment_author_url_'.COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure);
 }
 
 /**
@@ -528,7 +528,7 @@ 
  * @since 2.0.4
  */
 function sanitize_comment_cookies() {
-	if ( isset( $_COOKIE['comment_author_' . COOKIEHASH] ) ) {
+	if (isset($_COOKIE['comment_author_'.COOKIEHASH])) {
 		/**
 		 * Filter the comment author's name cookie before it is set.
 		 *
@@ -539,13 +539,13 @@ 
 		 *
 		 * @param string $author_cookie The comment author name cookie.
 		 */
-		$comment_author = apply_filters( 'pre_comment_author_name', $_COOKIE['comment_author_' . COOKIEHASH] );
+		$comment_author = apply_filters('pre_comment_author_name', $_COOKIE['comment_author_'.COOKIEHASH]);
 		$comment_author = wp_unslash($comment_author);
 		$comment_author = esc_attr($comment_author);
-		$_COOKIE['comment_author_' . COOKIEHASH] = $comment_author;
+		$_COOKIE['comment_author_'.COOKIEHASH] = $comment_author;
 	}
 
-	if ( isset( $_COOKIE['comment_author_email_' . COOKIEHASH] ) ) {
+	if (isset($_COOKIE['comment_author_email_'.COOKIEHASH])) {
 		/**
 		 * Filter the comment author's email cookie before it is set.
 		 *
@@ -556,13 +556,13 @@ 
 		 *
 		 * @param string $author_email_cookie The comment author email cookie.
 		 */
-		$comment_author_email = apply_filters( 'pre_comment_author_email', $_COOKIE['comment_author_email_' . COOKIEHASH] );
+		$comment_author_email = apply_filters('pre_comment_author_email', $_COOKIE['comment_author_email_'.COOKIEHASH]);
 		$comment_author_email = wp_unslash($comment_author_email);
 		$comment_author_email = esc_attr($comment_author_email);
 		$_COOKIE['comment_author_email_'.COOKIEHASH] = $comment_author_email;
 	}
 
-	if ( isset( $_COOKIE['comment_author_url_' . COOKIEHASH] ) ) {
+	if (isset($_COOKIE['comment_author_url_'.COOKIEHASH])) {
 		/**
 		 * Filter the comment author's URL cookie before it is set.
 		 *
@@ -573,7 +573,7 @@ 
 		 *
 		 * @param string $author_url_cookie The comment author URL cookie.
 		 */
-		$comment_author_url = apply_filters( 'pre_comment_author_url', $_COOKIE['comment_author_url_' . COOKIEHASH] );
+		$comment_author_url = apply_filters('pre_comment_author_url', $_COOKIE['comment_author_url_'.COOKIEHASH]);
 		$comment_author_url = wp_unslash($comment_author_url);
 		$_COOKIE['comment_author_url_'.COOKIEHASH] = $comment_author_url;
 	}
@@ -589,29 +589,29 @@ 
  * @param array $commentdata Contains information on the comment
  * @return int|string Signifies the approval status (0|1|'spam')
  */
-function wp_allow_comment( $commentdata ) {
+function wp_allow_comment($commentdata) {
 	global $wpdb;
 
 	// Simple duplicate check
 	// expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)
 	$dupe = $wpdb->prepare(
 		"SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = %s AND comment_approved != 'trash' AND ( comment_author = %s ",
-		wp_unslash( $commentdata['comment_post_ID'] ),
-		wp_unslash( $commentdata['comment_parent'] ),
-		wp_unslash( $commentdata['comment_author'] )
+		wp_unslash($commentdata['comment_post_ID']),
+		wp_unslash($commentdata['comment_parent']),
+		wp_unslash($commentdata['comment_author'])
 	);
-	if ( $commentdata['comment_author_email'] ) {
+	if ($commentdata['comment_author_email']) {
 		$dupe .= $wpdb->prepare(
 			"OR comment_author_email = %s ",
-			wp_unslash( $commentdata['comment_author_email'] )
+			wp_unslash($commentdata['comment_author_email'])
 		);
 	}
 	$dupe .= $wpdb->prepare(
 		") AND comment_content = %s LIMIT 1",
-		wp_unslash( $commentdata['comment_content'] )
+		wp_unslash($commentdata['comment_content'])
 	);
 
-	$dupe_id = $wpdb->get_var( $dupe );
+	$dupe_id = $wpdb->get_var($dupe);
 
 	/**
 	 * Filters the ID, if any, of the duplicate comment found when creating a new comment.
@@ -623,9 +623,9 @@ 
 	 * @param int   $dupe_id     ID of the comment identified as a duplicate.
 	 * @param array $commentdata Data for the comment being created.
 	 */
-	$dupe_id = apply_filters( 'duplicate_comment_id', $dupe_id, $commentdata );
+	$dupe_id = apply_filters('duplicate_comment_id', $dupe_id, $commentdata);
 
-	if ( $dupe_id ) {
+	if ($dupe_id) {
 		/**
 		 * Fires immediately after a duplicate comment is detected.
 		 *
@@ -633,11 +633,11 @@ 
 		 *
 		 * @param array $commentdata Comment data.
 		 */
-		do_action( 'comment_duplicate_trigger', $commentdata );
-		if ( defined( 'DOING_AJAX' ) ) {
-			die( __('Duplicate comment detected; it looks as though you&#8217;ve already said that!') );
+		do_action('comment_duplicate_trigger', $commentdata);
+		if (defined('DOING_AJAX')) {
+			die(__('Duplicate comment detected; it looks as though you&#8217;ve already said that!'));
 		}
-		wp_die( __( 'Duplicate comment detected; it looks as though you&#8217;ve already said that!' ), 409 );
+		wp_die(__('Duplicate comment detected; it looks as though you&#8217;ve already said that!'), 409);
 	}
 
 	/**
@@ -658,20 +658,20 @@ 
 		$commentdata['comment_date_gmt']
 	);
 
-	if ( ! empty( $commentdata['user_id'] ) ) {
-		$user = get_userdata( $commentdata['user_id'] );
-		$post_author = $wpdb->get_var( $wpdb->prepare(
+	if ( ! empty($commentdata['user_id'])) {
+		$user = get_userdata($commentdata['user_id']);
+		$post_author = $wpdb->get_var($wpdb->prepare(
 			"SELECT post_author FROM $wpdb->posts WHERE ID = %d LIMIT 1",
 			$commentdata['comment_post_ID']
-		) );
+		));
 	}
 
-	if ( isset( $user ) && ( $commentdata['user_id'] == $post_author || $user->has_cap( 'moderate_comments' ) ) ) {
+	if (isset($user) && ($commentdata['user_id'] == $post_author || $user->has_cap('moderate_comments'))) {
 		// The author and the admins get respect.
 		$approved = 1;
 	} else {
 		// Everyone else's comments will be checked.
-		if ( check_comment(
+		if (check_comment(
 			$commentdata['comment_author'],
 			$commentdata['comment_author_email'],
 			$commentdata['comment_author_url'],
@@ -679,20 +679,20 @@ 
 			$commentdata['comment_author_IP'],
 			$commentdata['comment_agent'],
 			$commentdata['comment_type']
-		) ) {
+		)) {
 			$approved = 1;
 		} else {
 			$approved = 0;
 		}
 
-		if ( wp_blacklist_check(
+		if (wp_blacklist_check(
 			$commentdata['comment_author'],
 			$commentdata['comment_author_email'],
 			$commentdata['comment_author_url'],
 			$commentdata['comment_content'],
 			$commentdata['comment_author_IP'],
 			$commentdata['comment_agent']
-		) ) {
+		)) {
 			$approved = EMPTY_TRASH_DAYS ? 'trash' : 'spam';
 		}
 	}
@@ -705,7 +705,7 @@ 
 	 * @param bool|string $approved    The approval status. Accepts 1, 0, or 'spam'.
 	 * @param array       $commentdata Comment data.
 	 */
-	$approved = apply_filters( 'pre_comment_approved', $approved, $commentdata );
+	$approved = apply_filters('pre_comment_approved', $approved, $commentdata);
 	return $approved;
 }
 
@@ -723,15 +723,15 @@ 
  * @param string $email Comment author email address.
  * @param string $date MySQL time string.
  */
-function check_comment_flood_db( $ip, $email, $date ) {
+function check_comment_flood_db($ip, $email, $date) {
 	global $wpdb;
 	// don't throttle admins or moderators
-	if ( current_user_can( 'manage_options' ) || current_user_can( 'moderate_comments' ) ) {
+	if (current_user_can('manage_options') || current_user_can('moderate_comments')) {
 		return;
 	}
-	$hour_ago = gmdate( 'Y-m-d H:i:s', time() - HOUR_IN_SECONDS );
+	$hour_ago = gmdate('Y-m-d H:i:s', time() - HOUR_IN_SECONDS);
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		$user = get_current_user_id();
 		$check_column = '`user_id`';
 	} else {
@@ -745,8 +745,8 @@ 
 		$user,
 		$email
 	);
-	$lasttime = $wpdb->get_var( $sql );
-	if ( $lasttime ) {
+	$lasttime = $wpdb->get_var($sql);
+	if ($lasttime) {
 		$time_lastcomment = mysql2date('U', $lasttime, false);
 		$time_newcomment  = mysql2date('U', $date, false);
 		/**
@@ -758,8 +758,8 @@ 
 		 * @param int  $time_lastcomment Timestamp of when the last comment was posted.
 		 * @param int  $time_newcomment  Timestamp of when the new comment was posted.
 		 */
-		$flood_die = apply_filters( 'comment_flood_filter', false, $time_lastcomment, $time_newcomment );
-		if ( $flood_die ) {
+		$flood_die = apply_filters('comment_flood_filter', false, $time_lastcomment, $time_newcomment);
+		if ($flood_die) {
 			/**
 			 * Fires before the comment flood message is triggered.
 			 *
@@ -768,12 +768,12 @@ 
 			 * @param int $time_lastcomment Timestamp of when the last comment was posted.
 			 * @param int $time_newcomment  Timestamp of when the new comment was posted.
 			 */
-			do_action( 'comment_flood_trigger', $time_lastcomment, $time_newcomment );
+			do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
 
-			if ( defined('DOING_AJAX') )
-				die( __('You are posting comments too quickly. Slow down.') );
+			if (defined('DOING_AJAX'))
+				die(__('You are posting comments too quickly. Slow down.'));
 
-			wp_die( __( 'You are posting comments too quickly. Slow down.' ), 429 );
+			wp_die(__('You are posting comments too quickly. Slow down.'), 429);
 		}
 	}
 }
@@ -789,12 +789,12 @@ 
 function separate_comments(&$comments) {
 	$comments_by_type = array('comment' => array(), 'trackback' => array(), 'pingback' => array(), 'pings' => array());
 	$count = count($comments);
-	for ( $i = 0; $i < $count; $i++ ) {
+	for ($i = 0; $i < $count; $i++) {
 		$type = $comments[$i]->comment_type;
-		if ( empty($type) )
+		if (empty($type))
 			$type = 'comment';
 		$comments_by_type[$type][] = &$comments[$i];
-		if ( 'trackback' == $type || 'pingback' == $type )
+		if ('trackback' == $type || 'pingback' == $type)
 			$comments_by_type['pings'][] = &$comments[$i];
 	}
 
@@ -815,37 +815,37 @@ 
  * @param bool  $threaded Optional control over flat or threaded comments.
  * @return int Number of comment pages.
  */
-function get_comment_pages_count( $comments = null, $per_page = null, $threaded = null ) {
+function get_comment_pages_count($comments = null, $per_page = null, $threaded = null) {
 	global $wp_query;
 
-	if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) )
+	if (null === $comments && null === $per_page && null === $threaded && ! empty($wp_query->max_num_comment_pages))
 		return $wp_query->max_num_comment_pages;
 
-	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments )  )
+	if (( ! $comments || ! is_array($comments)) && ! empty($wp_query->comments))
 		$comments = $wp_query->comments;
 
-	if ( empty($comments) )
+	if (empty($comments))
 		return 0;
 
-	if ( ! get_option( 'page_comments' ) ) {
+	if ( ! get_option('page_comments')) {
 		return 1;
 	}
 
-	if ( !isset($per_page) )
+	if ( ! isset($per_page))
 		$per_page = (int) get_query_var('comments_per_page');
-	if ( 0 === $per_page )
+	if (0 === $per_page)
 		$per_page = (int) get_option('comments_per_page');
-	if ( 0 === $per_page )
+	if (0 === $per_page)
 		return 1;
 
-	if ( !isset($threaded) )
+	if ( ! isset($threaded))
 		$threaded = get_option('thread_comments');
 
-	if ( $threaded ) {
+	if ($threaded) {
 		$walker = new Walker_Comment;
-		$count = ceil( $walker->get_number_of_root_elements( $comments ) / $per_page );
+		$count = ceil($walker->get_number_of_root_elements($comments) / $per_page);
 	} else {
-		$count = ceil( count( $comments ) / $per_page );
+		$count = ceil(count($comments) / $per_page);
 	}
 
 	return $count;
@@ -871,49 +871,49 @@ 
  * } *
  * @return int|null Comment page number or null on error.
  */
-function get_page_of_comment( $comment_ID, $args = array() ) {
+function get_page_of_comment($comment_ID, $args = array()) {
 	global $wpdb;
 
 	$page = null;
 
-	if ( !$comment = get_comment( $comment_ID ) )
+	if ( ! $comment = get_comment($comment_ID))
 		return;
 
-	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '');
+	$args = wp_parse_args($args, $defaults);
 	$original_args = $args;
 
 	// Order of precedence: 1. `$args['per_page']`, 2. 'comments_per_page' query_var, 3. 'comments_per_page' option.
-	if ( get_option( 'page_comments' ) ) {
-		if ( '' === $args['per_page'] ) {
-			$args['per_page'] = get_query_var( 'comments_per_page' );
+	if (get_option('page_comments')) {
+		if ('' === $args['per_page']) {
+			$args['per_page'] = get_query_var('comments_per_page');
 		}
 
-		if ( '' === $args['per_page'] ) {
-			$args['per_page'] = get_option( 'comments_per_page' );
+		if ('' === $args['per_page']) {
+			$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;
 	}
 
-	if ( $args['per_page'] < 1 ) {
+	if ($args['per_page'] < 1) {
 		$page = 1;
 	}
 
-	if ( null === $page ) {
-		if ( '' === $args['max_depth'] ) {
-			if ( get_option('thread_comments') )
+	if (null === $page) {
+		if ('' === $args['max_depth']) {
+			if (get_option('thread_comments'))
 				$args['max_depth'] = get_option('thread_comments_depth');
 			else
 				$args['max_depth'] = -1;
 		}
 
 		// Find this comment's top level parent if threading is enabled
-		if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent )
-			return get_page_of_comment( $comment->comment_parent, $args );
+		if ($args['max_depth'] > 1 && 0 != $comment->comment_parent)
+			return get_page_of_comment($comment->comment_parent, $args);
 
 		$comment_args = array(
 			'type'       => $args['type'],
@@ -931,15 +931,15 @@ 
 		);
 
 		$comment_query = new WP_Comment_Query();
-		$older_comment_count = $comment_query->query( $comment_args );
+		$older_comment_count = $comment_query->query($comment_args);
 
 		// No older comments? Then it's page #1.
-		if ( 0 == $older_comment_count ) {
+		if (0 == $older_comment_count) {
 			$page = 1;
 
 		// Divide comments older than this one by comments per page to get this comment's page number
 		} else {
-			$page = ceil( ( $older_comment_count + 1 ) / $args['per_page'] );
+			$page = ceil(($older_comment_count + 1) / $args['per_page']);
 		}
 	}
 
@@ -968,7 +968,7 @@ 
 	 *     @type int    $max_depth Maximum comment threading depth allowed.
 	 * }
 	 */
-	return apply_filters( 'get_page_of_comment', (int) $page, $args, $original_args );
+	return apply_filters('get_page_of_comment', (int) $page, $args, $original_args);
 }
 
 /**
@@ -990,28 +990,28 @@ 
 		'comment_content'      => 65525,
 	);
 
-	if ( $wpdb->is_mysql ) {
-		foreach ( $lengths as $column => $length ) {
-			$col_length = $wpdb->get_col_length( $wpdb->comments, $column );
+	if ($wpdb->is_mysql) {
+		foreach ($lengths as $column => $length) {
+			$col_length = $wpdb->get_col_length($wpdb->comments, $column);
 			$max_length = 0;
 
 			// No point if we can't get the DB column lengths
-			if ( is_wp_error( $col_length ) ) {
+			if (is_wp_error($col_length)) {
 				break;
 			}
 
-			if ( ! is_array( $col_length ) && (int) $col_length > 0 ) {
+			if ( ! is_array($col_length) && (int) $col_length > 0) {
 				$max_length = (int) $col_length;
-			} elseif ( is_array( $col_length ) && isset( $col_length['length'] ) && intval( $col_length['length'] ) > 0 ) {
+			} elseif (is_array($col_length) && isset($col_length['length']) && intval($col_length['length']) > 0) {
 				$max_length = (int) $col_length['length'];
 
-				if ( ! empty( $col_length['type'] ) && 'byte' === $col_length['type'] ) {
+				if ( ! empty($col_length['type']) && 'byte' === $col_length['type']) {
 					$max_length = $max_length - 10;
 				}
 			}
 
-			if ( $max_length > 0 ) {
-				$lengths[ $column ] = $max_length;
+			if ($max_length > 0) {
+				$lengths[$column] = $max_length;
 			}
 		}
 	}
@@ -1023,7 +1023,7 @@ 
 	 *
 	 * @param array $lengths Associative array `'field_name' => 'maximum length'`.
 	 */
-	return apply_filters( 'wp_get_comment_fields_max_lengths', $lengths );
+	return apply_filters('wp_get_comment_fields_max_lengths', $lengths);
 }
 
 /**
@@ -1052,18 +1052,18 @@ 
 	 * @param string $user_ip    Comment author's IP address.
 	 * @param string $user_agent Comment author's browser user agent.
 	 */
-	do_action( 'wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent );
+	do_action('wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent);
 
-	$mod_keys = trim( get_option('blacklist_keys') );
-	if ( '' == $mod_keys )
+	$mod_keys = trim(get_option('blacklist_keys'));
+	if ('' == $mod_keys)
 		return false; // If moderation keys are empty
-	$words = explode("\n", $mod_keys );
+	$words = explode("\n", $mod_keys);
 
-	foreach ( (array) $words as $word ) {
+	foreach ((array) $words as $word) {
 		$word = trim($word);
 
 		// Skip empty lines
-		if ( empty($word) ) { continue; }
+		if (empty($word)) { continue; }
 
 		// Do some escaping magic so that '#' chars in the
 		// spam words don't break things:
@@ -1099,7 +1099,7 @@ 
  * @param int $post_id Optional. Post ID.
  * @return object|array Comment stats.
  */
-function wp_count_comments( $post_id = 0 ) {
+function wp_count_comments($post_id = 0) {
 	$post_id = (int) $post_id;
 
 	/**
@@ -1110,22 +1110,22 @@ 
 	 * @param array $count   An empty array.
 	 * @param int   $post_id The post ID.
 	 */
-	$filtered = apply_filters( 'wp_count_comments', array(), $post_id );
-	if ( ! empty( $filtered ) ) {
+	$filtered = apply_filters('wp_count_comments', array(), $post_id);
+	if ( ! empty($filtered)) {
 		return $filtered;
 	}
 
-	$count = wp_cache_get( "comments-{$post_id}", 'counts' );
-	if ( false !== $count ) {
+	$count = wp_cache_get("comments-{$post_id}", 'counts');
+	if (false !== $count) {
 		return $count;
 	}
 
-	$stats = get_comment_count( $post_id );
+	$stats = get_comment_count($post_id);
 	$stats['moderated'] = $stats['awaiting_moderation'];
-	unset( $stats['awaiting_moderation'] );
+	unset($stats['awaiting_moderation']);
 
 	$stats_object = (object) $stats;
-	wp_cache_set( "comments-{$post_id}", $stats_object, 'counts' );
+	wp_cache_set("comments-{$post_id}", $stats_object, 'counts');
 
 	return $stats_object;
 }
@@ -1149,10 +1149,10 @@ 
  */
 function wp_delete_comment($comment_id, $force_delete = false) {
 	global $wpdb;
-	if (!$comment = get_comment($comment_id))
+	if ( ! $comment = get_comment($comment_id))
 		return false;
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status( $comment ), array( 'trash', 'spam' ) ) )
+	if ( ! $force_delete && EMPTY_TRASH_DAYS && ! in_array(wp_get_comment_status($comment), array('trash', 'spam')))
 		return wp_trash_comment($comment_id);
 
 	/**
@@ -1162,21 +1162,21 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'delete_comment', $comment->comment_ID );
+	do_action('delete_comment', $comment->comment_ID);
 
 	// Move children up a level.
-	$children = $wpdb->get_col( $wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment->comment_ID) );
-	if ( !empty($children) ) {
+	$children = $wpdb->get_col($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment->comment_ID));
+	if ( ! empty($children)) {
 		$wpdb->update($wpdb->comments, array('comment_parent' => $comment->comment_parent), array('comment_parent' => $comment->comment_ID));
 		clean_comment_cache($children);
 	}
 
 	// Delete metadata
-	$meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment->comment_ID ) );
-	foreach ( $meta_ids as $mid )
-		delete_metadata_by_mid( 'comment', $mid );
+	$meta_ids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment->comment_ID));
+	foreach ($meta_ids as $mid)
+		delete_metadata_by_mid('comment', $mid);
 
-	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment->comment_ID ) ) )
+	if ( ! $wpdb->delete($wpdb->comments, array('comment_ID' => $comment->comment_ID)))
 		return false;
 
 	/**
@@ -1186,16 +1186,16 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'deleted_comment', $comment->comment_ID );
+	do_action('deleted_comment', $comment->comment_ID);
 
 	$post_id = $comment->comment_post_ID;
-	if ( $post_id && $comment->comment_approved == 1 )
+	if ($post_id && $comment->comment_approved == 1)
 		wp_update_comment_count($post_id);
 
-	clean_comment_cache( $comment->comment_ID );
+	clean_comment_cache($comment->comment_ID);
 
 	/** This action is documented in wp-includes/comment.php */
-	do_action( 'wp_set_comment_status', $comment->comment_ID, 'delete' );
+	do_action('wp_set_comment_status', $comment->comment_ID, 'delete');
 
 	wp_transition_comment_status('delete', $comment->comment_approved, $comment);
 	return true;
@@ -1212,10 +1212,10 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_trash_comment($comment_id) {
-	if ( !EMPTY_TRASH_DAYS )
+	if ( ! EMPTY_TRASH_DAYS)
 		return wp_delete_comment($comment_id, true);
 
-	if ( !$comment = get_comment($comment_id) )
+	if ( ! $comment = get_comment($comment_id))
 		return false;
 
 	/**
@@ -1225,13 +1225,13 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'trash_comment', $comment->comment_ID );
+	do_action('trash_comment', $comment->comment_ID);
 
-	if ( wp_set_comment_status( $comment, 'trash' ) ) {
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
-		add_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', $comment->comment_approved );
-		add_comment_meta( $comment->comment_ID, '_wp_trash_meta_time', time() );
+	if (wp_set_comment_status($comment, 'trash')) {
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_status');
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_time');
+		add_comment_meta($comment->comment_ID, '_wp_trash_meta_status', $comment->comment_approved);
+		add_comment_meta($comment->comment_ID, '_wp_trash_meta_time', time());
 
 		/**
 		 * Fires immediately after a comment is sent to Trash.
@@ -1240,7 +1240,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'trashed_comment', $comment->comment_ID );
+		do_action('trashed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1256,8 +1256,8 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_untrash_comment($comment_id) {
-	$comment = get_comment( $comment_id );
-	if ( ! $comment ) {
+	$comment = get_comment($comment_id);
+	if ( ! $comment) {
 		return false;
 	}
 
@@ -1268,15 +1268,15 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'untrash_comment', $comment->comment_ID );
+	do_action('untrash_comment', $comment->comment_ID);
 
-	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
+	$status = (string) get_comment_meta($comment->comment_ID, '_wp_trash_meta_status', true);
+	if (empty($status))
 		$status = '0';
 
-	if ( wp_set_comment_status( $comment, $status ) ) {
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
+	if (wp_set_comment_status($comment, $status)) {
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_time');
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_status');
 		/**
 		 * Fires immediately after a comment is restored from the Trash.
 		 *
@@ -1284,7 +1284,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'untrashed_comment', $comment->comment_ID );
+		do_action('untrashed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1299,9 +1299,9 @@ 
  * @param int|WP_Comment $comment_id Comment ID or WP_Comment object.
  * @return bool True on success, false on failure.
  */
-function wp_spam_comment( $comment_id ) {
-	$comment = get_comment( $comment_id );
-	if ( ! $comment ) {
+function wp_spam_comment($comment_id) {
+	$comment = get_comment($comment_id);
+	if ( ! $comment) {
 		return false;
 	}
 
@@ -1312,13 +1312,13 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'spam_comment', $comment->comment_ID );
+	do_action('spam_comment', $comment->comment_ID);
 
-	if ( wp_set_comment_status( $comment, 'spam' ) ) {
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
-		add_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', $comment->comment_approved );
-		add_comment_meta( $comment->comment_ID, '_wp_trash_meta_time', time() );
+	if (wp_set_comment_status($comment, 'spam')) {
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_status');
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_time');
+		add_comment_meta($comment->comment_ID, '_wp_trash_meta_status', $comment->comment_approved);
+		add_comment_meta($comment->comment_ID, '_wp_trash_meta_time', time());
 		/**
 		 * Fires immediately after a comment is marked as Spam.
 		 *
@@ -1326,7 +1326,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'spammed_comment', $comment->comment_ID );
+		do_action('spammed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1341,9 +1341,9 @@ 
  * @param int|WP_Comment $comment_id Comment ID or WP_Comment object.
  * @return bool True on success, false on failure.
  */
-function wp_unspam_comment( $comment_id ) {
-	$comment = get_comment( $comment_id );
-	if ( ! $comment ) {
+function wp_unspam_comment($comment_id) {
+	$comment = get_comment($comment_id);
+	if ( ! $comment) {
 		return false;
 	}
 
@@ -1354,15 +1354,15 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'unspam_comment', $comment->comment_ID );
+	do_action('unspam_comment', $comment->comment_ID);
 
-	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
+	$status = (string) get_comment_meta($comment->comment_ID, '_wp_trash_meta_status', true);
+	if (empty($status))
 		$status = '0';
 
-	if ( wp_set_comment_status( $comment, $status ) ) {
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
+	if (wp_set_comment_status($comment, $status)) {
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_status');
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_time');
 		/**
 		 * Fires immediately after a comment is unmarked as Spam.
 		 *
@@ -1370,7 +1370,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'unspammed_comment', $comment->comment_ID );
+		do_action('unspammed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1387,20 +1387,20 @@ 
  */
 function wp_get_comment_status($comment_id) {
 	$comment = get_comment($comment_id);
-	if ( !$comment )
+	if ( ! $comment)
 		return false;
 
 	$approved = $comment->comment_approved;
 
-	if ( $approved == null )
+	if ($approved == null)
 		return false;
-	elseif ( $approved == '1' )
+	elseif ($approved == '1')
 		return 'approved';
-	elseif ( $approved == '0' )
+	elseif ($approved == '0')
 		return 'unapproved';
-	elseif ( $approved == 'spam' )
+	elseif ($approved == 'spam')
 		return 'spam';
-	elseif ( $approved == 'trash' )
+	elseif ($approved == 'trash')
 		return 'trash';
 	else
 		return false;
@@ -1438,11 +1438,11 @@ 
 		1         => 'approved',
 		'approve' => 'approved', // wp_set_comment_status() uses "approve"
 	);
-	if ( isset($comment_statuses[$new_status]) ) $new_status = $comment_statuses[$new_status];
-	if ( isset($comment_statuses[$old_status]) ) $old_status = $comment_statuses[$old_status];
+	if (isset($comment_statuses[$new_status])) $new_status = $comment_statuses[$new_status];
+	if (isset($comment_statuses[$old_status])) $old_status = $comment_statuses[$old_status];
 
 	// Call the hooks
-	if ( $new_status != $old_status ) {
+	if ($new_status != $old_status) {
 		/**
 		 * Fires when the comment status is in transition.
 		 *
@@ -1452,7 +1452,7 @@ 
 		 * @param int|string $old_status The old comment status.
 		 * @param object     $comment    The comment data.
 		 */
-		do_action( 'transition_comment_status', $new_status, $old_status, $comment );
+		do_action('transition_comment_status', $new_status, $old_status, $comment);
 		/**
 		 * Fires when the comment status is in transition from one specific status to another.
 		 *
@@ -1463,7 +1463,7 @@ 
 		 *
 		 * @param WP_Comment $comment Comment object.
 		 */
-		do_action( "comment_{$old_status}_to_{$new_status}", $comment );
+		do_action("comment_{$old_status}_to_{$new_status}", $comment);
 	}
 	/**
 	 * Fires when the status of a specific comment type is in transition.
@@ -1479,7 +1479,7 @@ 
 	 * @param int        $comment_ID The comment ID.
 	 * @param WP_Comment $comment    Comment object.
 	 */
-	do_action( "comment_{$new_status}_{$comment->comment_type}", $comment->comment_ID, $comment );
+	do_action("comment_{$new_status}_{$comment->comment_type}", $comment->comment_ID, $comment);
 }
 
 /**
@@ -1498,15 +1498,15 @@ 
 	// Cookies should already be sanitized.
 
 	$comment_author = '';
-	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) )
+	if (isset($_COOKIE['comment_author_'.COOKIEHASH]))
 		$comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
 
 	$comment_author_email = '';
-	if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) )
+	if (isset($_COOKIE['comment_author_email_'.COOKIEHASH]))
 		$comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
 
 	$comment_author_url = '';
-	if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) )
+	if (isset($_COOKIE['comment_author_url_'.COOKIEHASH]))
 		$comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
 
 	/**
@@ -1522,7 +1522,7 @@ 
 	 *     @type string $comment_author_url   The URL address of the `$comment_author`. Default empty.
 	 * }
 	 */
-	return apply_filters( 'wp_get_current_commenter', compact('comment_author', 'comment_author_email', 'comment_author_url') );
+	return apply_filters('wp_get_current_commenter', compact('comment_author', 'comment_author_email', 'comment_author_url'));
 }
 
 /**
@@ -1560,44 +1560,44 @@ 
  * }
  * @return int|false The new comment's ID on success, false on failure.
  */
-function wp_insert_comment( $commentdata ) {
+function wp_insert_comment($commentdata) {
 	global $wpdb;
-	$data = wp_unslash( $commentdata );
+	$data = wp_unslash($commentdata);
 
-	$comment_author       = ! isset( $data['comment_author'] )       ? '' : $data['comment_author'];
-	$comment_author_email = ! isset( $data['comment_author_email'] ) ? '' : $data['comment_author_email'];
-	$comment_author_url   = ! isset( $data['comment_author_url'] )   ? '' : $data['comment_author_url'];
-	$comment_author_IP    = ! isset( $data['comment_author_IP'] )    ? '' : $data['comment_author_IP'];
+	$comment_author       = ! isset($data['comment_author']) ? '' : $data['comment_author'];
+	$comment_author_email = ! isset($data['comment_author_email']) ? '' : $data['comment_author_email'];
+	$comment_author_url   = ! isset($data['comment_author_url']) ? '' : $data['comment_author_url'];
+	$comment_author_IP    = ! isset($data['comment_author_IP']) ? '' : $data['comment_author_IP'];
 
-	$comment_date     = ! isset( $data['comment_date'] )     ? current_time( 'mysql' )            : $data['comment_date'];
-	$comment_date_gmt = ! isset( $data['comment_date_gmt'] ) ? get_gmt_from_date( $comment_date ) : $data['comment_date_gmt'];
+	$comment_date     = ! isset($data['comment_date']) ? current_time('mysql') : $data['comment_date'];
+	$comment_date_gmt = ! isset($data['comment_date_gmt']) ? get_gmt_from_date($comment_date) : $data['comment_date_gmt'];
 
-	$comment_post_ID  = ! isset( $data['comment_post_ID'] )  ? 0  : $data['comment_post_ID'];
-	$comment_content  = ! isset( $data['comment_content'] )  ? '' : $data['comment_content'];
-	$comment_karma    = ! isset( $data['comment_karma'] )    ? 0  : $data['comment_karma'];
-	$comment_approved = ! isset( $data['comment_approved'] ) ? 1  : $data['comment_approved'];
-	$comment_agent    = ! isset( $data['comment_agent'] )    ? '' : $data['comment_agent'];
-	$comment_type     = ! isset( $data['comment_type'] )     ? '' : $data['comment_type'];
-	$comment_parent   = ! isset( $data['comment_parent'] )   ? 0  : $data['comment_parent'];
+	$comment_post_ID  = ! isset($data['comment_post_ID']) ? 0 : $data['comment_post_ID'];
+	$comment_content  = ! isset($data['comment_content']) ? '' : $data['comment_content'];
+	$comment_karma    = ! isset($data['comment_karma']) ? 0 : $data['comment_karma'];
+	$comment_approved = ! isset($data['comment_approved']) ? 1 : $data['comment_approved'];
+	$comment_agent    = ! isset($data['comment_agent']) ? '' : $data['comment_agent'];
+	$comment_type     = ! isset($data['comment_type']) ? '' : $data['comment_type'];
+	$comment_parent   = ! isset($data['comment_parent']) ? 0 : $data['comment_parent'];
 
-	$user_id  = ! isset( $data['user_id'] ) ? 0 : $data['user_id'];
+	$user_id = ! isset($data['user_id']) ? 0 : $data['user_id'];
 
-	$compacted = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id' );
-	if ( ! $wpdb->insert( $wpdb->comments, $compacted ) ) {
+	$compacted = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id');
+	if ( ! $wpdb->insert($wpdb->comments, $compacted)) {
 		return false;
 	}
 
 	$id = (int) $wpdb->insert_id;
 
-	if ( $comment_approved == 1 ) {
-		wp_update_comment_count( $comment_post_ID );
+	if ($comment_approved == 1) {
+		wp_update_comment_count($comment_post_ID);
 	}
-	$comment = get_comment( $id );
+	$comment = get_comment($id);
 
 	// If metadata is provided, store it.
-	if ( isset( $commentdata['comment_meta'] ) && is_array( $commentdata['comment_meta'] ) ) {
-		foreach ( $commentdata['comment_meta'] as $meta_key => $meta_value ) {
-			add_comment_meta( $comment->comment_ID, $meta_key, $meta_value, true );
+	if (isset($commentdata['comment_meta']) && is_array($commentdata['comment_meta'])) {
+		foreach ($commentdata['comment_meta'] as $meta_key => $meta_value) {
+			add_comment_meta($comment->comment_ID, $meta_key, $meta_value, true);
 		}
 	}
 
@@ -1609,9 +1609,9 @@ 
 	 * @param int        $id      The comment ID.
 	 * @param WP_Comment $comment Comment object.
 	 */
-	do_action( 'wp_insert_comment', $id, $comment );
+	do_action('wp_insert_comment', $id, $comment);
 
-	wp_cache_set( 'last_changed', microtime(), 'comment' );
+	wp_cache_set('last_changed', microtime(), 'comment');
 
 	return $id;
 }
@@ -1629,7 +1629,7 @@ 
  * @return array Parsed comment information.
  */
 function wp_filter_comment($commentdata) {
-	if ( isset( $commentdata['user_ID'] ) ) {
+	if (isset($commentdata['user_ID'])) {
 		/**
 		 * Filter the comment author's user id before it is set.
 		 *
@@ -1640,10 +1640,10 @@ 
 		 *
 		 * @param int $user_ID The comment author's user ID.
 		 */
-		$commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_ID'] );
-	} elseif ( isset( $commentdata['user_id'] ) ) {
+		$commentdata['user_id'] = apply_filters('pre_user_id', $commentdata['user_ID']);
+	} elseif (isset($commentdata['user_id'])) {
 		/** This filter is documented in wp-includes/comment.php */
-		$commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_id'] );
+		$commentdata['user_id'] = apply_filters('pre_user_id', $commentdata['user_id']);
 	}
 
 	/**
@@ -1653,9 +1653,9 @@ 
 	 *
 	 * @param string $comment_agent The comment author's browser user agent.
 	 */
-	$commentdata['comment_agent'] = apply_filters( 'pre_comment_user_agent', ( isset( $commentdata['comment_agent'] ) ? $commentdata['comment_agent'] : '' ) );
+	$commentdata['comment_agent'] = apply_filters('pre_comment_user_agent', (isset($commentdata['comment_agent']) ? $commentdata['comment_agent'] : ''));
 	/** This filter is documented in wp-includes/comment.php */
-	$commentdata['comment_author'] = apply_filters( 'pre_comment_author_name', $commentdata['comment_author'] );
+	$commentdata['comment_author'] = apply_filters('pre_comment_author_name', $commentdata['comment_author']);
 	/**
 	 * Filter the comment content before it is set.
 	 *
@@ -1663,7 +1663,7 @@ 
 	 *
 	 * @param string $comment_content The comment content.
 	 */
-	$commentdata['comment_content'] = apply_filters( 'pre_comment_content', $commentdata['comment_content'] );
+	$commentdata['comment_content'] = apply_filters('pre_comment_content', $commentdata['comment_content']);
 	/**
 	 * Filter the comment author's IP before it is set.
 	 *
@@ -1671,11 +1671,11 @@ 
 	 *
 	 * @param string $comment_author_ip The comment author's IP.
 	 */
-	$commentdata['comment_author_IP'] = apply_filters( 'pre_comment_user_ip', $commentdata['comment_author_IP'] );
+	$commentdata['comment_author_IP'] = apply_filters('pre_comment_user_ip', $commentdata['comment_author_IP']);
 	/** This filter is documented in wp-includes/comment.php */
-	$commentdata['comment_author_url'] = apply_filters( 'pre_comment_author_url', $commentdata['comment_author_url'] );
+	$commentdata['comment_author_url'] = apply_filters('pre_comment_author_url', $commentdata['comment_author_url']);
 	/** This filter is documented in wp-includes/comment.php */
-	$commentdata['comment_author_email'] = apply_filters( 'pre_comment_author_email', $commentdata['comment_author_email'] );
+	$commentdata['comment_author_email'] = apply_filters('pre_comment_author_email', $commentdata['comment_author_email']);
 	$commentdata['filtered'] = true;
 	return $commentdata;
 }
@@ -1691,9 +1691,9 @@ 
  * @return bool Whether comment should be blocked.
  */
 function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment) {
-	if ( $block ) // a plugin has already blocked... we'll let that decision stand
+	if ($block) // a plugin has already blocked... we'll let that decision stand
 		return $block;
-	if ( ($time_newcomment - $time_lastcomment) < 15 )
+	if (($time_newcomment - $time_lastcomment) < 15)
 		return true;
 	return false;
 }
@@ -1737,14 +1737,14 @@ 
  * }
  * @return int|false The ID of the comment on success, false on failure.
  */
-function wp_new_comment( $commentdata ) {
+function wp_new_comment($commentdata) {
 	global $wpdb;
 
-	if ( isset( $commentdata['user_ID'] ) ) {
+	if (isset($commentdata['user_ID'])) {
 		$commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
 	}
 
-	$prefiltered_user_id = ( isset( $commentdata['user_id'] ) ) ? (int) $commentdata['user_id'] : 0;
+	$prefiltered_user_id = (isset($commentdata['user_id'])) ? (int) $commentdata['user_id'] : 0;
 
 	/**
 	 * Filter a comment's data before it is sanitized and inserted into the database.
@@ -1753,35 +1753,35 @@ 
 	 *
 	 * @param array $commentdata Comment data.
 	 */
-	$commentdata = apply_filters( 'preprocess_comment', $commentdata );
+	$commentdata = apply_filters('preprocess_comment', $commentdata);
 
 	$commentdata['comment_post_ID'] = (int) $commentdata['comment_post_ID'];
-	if ( isset( $commentdata['user_ID'] ) && $prefiltered_user_id !== (int) $commentdata['user_ID'] ) {
+	if (isset($commentdata['user_ID']) && $prefiltered_user_id !== (int) $commentdata['user_ID']) {
 		$commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
-	} elseif ( isset( $commentdata['user_id'] ) ) {
+	} elseif (isset($commentdata['user_id'])) {
 		$commentdata['user_id'] = (int) $commentdata['user_id'];
 	}
 
 	$commentdata['comment_parent'] = isset($commentdata['comment_parent']) ? absint($commentdata['comment_parent']) : 0;
-	$parent_status = ( 0 < $commentdata['comment_parent'] ) ? wp_get_comment_status($commentdata['comment_parent']) : '';
-	$commentdata['comment_parent'] = ( 'approved' == $parent_status || 'unapproved' == $parent_status ) ? $commentdata['comment_parent'] : 0;
+	$parent_status = (0 < $commentdata['comment_parent']) ? wp_get_comment_status($commentdata['comment_parent']) : '';
+	$commentdata['comment_parent'] = ('approved' == $parent_status || 'unapproved' == $parent_status) ? $commentdata['comment_parent'] : 0;
 
-	if ( ! isset( $commentdata['comment_author_IP'] ) ) {
+	if ( ! isset($commentdata['comment_author_IP'])) {
 		$commentdata['comment_author_IP'] = $_SERVER['REMOTE_ADDR'];
 	}
-	$commentdata['comment_author_IP'] = preg_replace( '/[^0-9a-fA-F:., ]/', '', $commentdata['comment_author_IP'] );
+	$commentdata['comment_author_IP'] = preg_replace('/[^0-9a-fA-F:., ]/', '', $commentdata['comment_author_IP']);
 
-	if ( ! isset( $commentdata['comment_agent'] ) ) {
-		$commentdata['comment_agent'] = isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT']: '';
+	if ( ! isset($commentdata['comment_agent'])) {
+		$commentdata['comment_agent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
 	}
-	$commentdata['comment_agent'] = substr( $commentdata['comment_agent'], 0, 254 );
+	$commentdata['comment_agent'] = substr($commentdata['comment_agent'], 0, 254);
 
-	if ( empty( $commentdata['comment_date'] ) ) {
+	if (empty($commentdata['comment_date'])) {
 		$commentdata['comment_date'] = current_time('mysql');
 	}
 
-	if ( empty( $commentdata['comment_date_gmt'] ) ) {
-		$commentdata['comment_date_gmt'] = current_time( 'mysql', 1 );
+	if (empty($commentdata['comment_date_gmt'])) {
+		$commentdata['comment_date_gmt'] = current_time('mysql', 1);
 	}
 
 	$commentdata = wp_filter_comment($commentdata);
@@ -1789,21 +1789,21 @@ 
 	$commentdata['comment_approved'] = wp_allow_comment($commentdata);
 
 	$comment_ID = wp_insert_comment($commentdata);
-	if ( ! $comment_ID ) {
-		$fields = array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content' );
+	if ( ! $comment_ID) {
+		$fields = array('comment_author', 'comment_author_email', 'comment_author_url', 'comment_content');
 
-		foreach ( $fields as $field ) {
-			if ( isset( $commentdata[ $field ] ) ) {
-				$commentdata[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->comments, $field, $commentdata[ $field ] );
+		foreach ($fields as $field) {
+			if (isset($commentdata[$field])) {
+				$commentdata[$field] = $wpdb->strip_invalid_text_for_column($wpdb->comments, $field, $commentdata[$field]);
 			}
 		}
 
-		$commentdata = wp_filter_comment( $commentdata );
+		$commentdata = wp_filter_comment($commentdata);
 
-		$commentdata['comment_approved'] = wp_allow_comment( $commentdata );
+		$commentdata['comment_approved'] = wp_allow_comment($commentdata);
 
-		$comment_ID = wp_insert_comment( $commentdata );
-		if ( ! $comment_ID ) {
+		$comment_ID = wp_insert_comment($commentdata);
+		if ( ! $comment_ID) {
 			return false;
 		}
 	}
@@ -1818,7 +1818,7 @@ 
 	 * @param int|string $comment_approved 1 if the comment is approved, 0 if not, 'spam' if spam.
 	 * @param array      $commentdata      Comment data.
 	 */
-	do_action( 'comment_post', $comment_ID, $commentdata['comment_approved'], $commentdata );
+	do_action('comment_post', $comment_ID, $commentdata['comment_approved'], $commentdata);
 
 	return $comment_ID;
 }
@@ -1831,20 +1831,20 @@ 
  * @param int $comment_ID ID of the comment.
  * @return bool True on success, false on failure.
  */
-function wp_new_comment_notify_moderator( $comment_ID ) {
-	$comment = get_comment( $comment_ID );
+function wp_new_comment_notify_moderator($comment_ID) {
+	$comment = get_comment($comment_ID);
 
 	// Only send notifications for pending comments.
-	$maybe_notify = ( '0' == $comment->comment_approved );
+	$maybe_notify = ('0' == $comment->comment_approved);
 
 	/** This filter is documented in wp-includes/comment.php */
-	$maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_ID );
+	$maybe_notify = apply_filters('notify_moderator', $maybe_notify, $comment_ID);
 
-	if ( ! $maybe_notify ) {
+	if ( ! $maybe_notify) {
 		return false;
 	}
 
-	return wp_notify_moderator( $comment_ID );
+	return wp_notify_moderator($comment_ID);
 }
 
 /**
@@ -1858,10 +1858,10 @@ 
  * @param int $comment_ID Comment ID.
  * @return bool True on success, false on failure.
  */
-function wp_new_comment_notify_postauthor( $comment_ID ) {
-	$comment = get_comment( $comment_ID );
+function wp_new_comment_notify_postauthor($comment_ID) {
+	$comment = get_comment($comment_ID);
 
-	$maybe_notify = get_option( 'comments_notify' );
+	$maybe_notify = get_option('comments_notify');
 
 	/**
 	 * Filter whether to send the post author new comment notification emails,
@@ -1872,22 +1872,22 @@ 
 	 * @param bool $maybe_notify Whether to notify the post author about the new comment.
 	 * @param int  $comment_ID   The ID of the comment for the notification.
 	 */
-	$maybe_notify = apply_filters( 'notify_post_author', $maybe_notify, $comment_ID );
+	$maybe_notify = apply_filters('notify_post_author', $maybe_notify, $comment_ID);
 
 	/*
 	 * wp_notify_postauthor() checks if notifying the author of their own comment.
 	 * By default, it won't, but filters can override this.
 	 */
-	if ( ! $maybe_notify ) {
+	if ( ! $maybe_notify) {
 		return false;
 	}
 
 	// Only send notifications for approved comments.
-	if ( ! isset( $comment->comment_approved ) || '1' != $comment->comment_approved ) {
+	if ( ! isset($comment->comment_approved) || '1' != $comment->comment_approved) {
 		return false;
 	}
 
-	return wp_notify_postauthor( $comment_ID );
+	return wp_notify_postauthor($comment_ID);
 }
 
 /**
@@ -1908,7 +1908,7 @@ 
 function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {
 	global $wpdb;
 
-	switch ( $comment_status ) {
+	switch ($comment_status) {
 		case 'hold':
 		case '0':
 			$status = '0';
@@ -1916,7 +1916,7 @@ 
 		case 'approve':
 		case '1':
 			$status = '1';
-			add_action( 'wp_set_comment_status', 'wp_new_comment_notify_postauthor' );
+			add_action('wp_set_comment_status', 'wp_new_comment_notify_postauthor');
 			break;
 		case 'spam':
 			$status = 'spam';
@@ -1930,16 +1930,16 @@ 
 
 	$comment_old = clone get_comment($comment_id);
 
-	if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array( 'comment_ID' => $comment_old->comment_ID ) ) ) {
-		if ( $wp_error )
+	if ( ! $wpdb->update($wpdb->comments, array('comment_approved' => $status), array('comment_ID' => $comment_old->comment_ID))) {
+		if ($wp_error)
 			return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
 		else
 			return false;
 	}
 
-	clean_comment_cache( $comment_old->comment_ID );
+	clean_comment_cache($comment_old->comment_ID);
 
-	$comment = get_comment( $comment_old->comment_ID );
+	$comment = get_comment($comment_old->comment_ID);
 
 	/**
 	 * Fires immediately before transitioning a comment's status from one to another
@@ -1951,7 +1951,7 @@ 
 	 * @param string|bool $comment_status Current comment status. Possible values include
 	 *                                    'hold', 'approve', 'spam', 'trash', or false.
 	 */
-	do_action( 'wp_set_comment_status', $comment->comment_ID, $comment_status );
+	do_action('wp_set_comment_status', $comment->comment_ID, $comment_status);
 
 	wp_transition_comment_status($comment_status, $comment_old->comment_approved, $comment);
 
@@ -1977,12 +1977,12 @@ 
 
 	// First, get all of the original fields
 	$comment = get_comment($commentarr['comment_ID'], ARRAY_A);
-	if ( empty( $comment ) ) {
+	if (empty($comment)) {
 		return 0;
 	}
 
 	// Make sure that the comment post ID is valid (if specified).
-	if ( ! empty( $commentarr['comment_post_ID'] ) && ! get_post( $commentarr['comment_post_ID'] ) ) {
+	if ( ! empty($commentarr['comment_post_ID']) && ! get_post($commentarr['comment_post_ID'])) {
 		return 0;
 	}
 
@@ -1994,10 +1994,10 @@ 
 	// Merge old and new fields with new fields overwriting old ones.
 	$commentarr = array_merge($comment, $commentarr);
 
-	$commentarr = wp_filter_comment( $commentarr );
+	$commentarr = wp_filter_comment($commentarr);
 
 	// Now extract the merged array.
-	$data = wp_unslash( $commentarr );
+	$data = wp_unslash($commentarr);
 
 	/**
 	 * Filter the comment content before it is updated in the database.
@@ -2006,26 +2006,26 @@ 
 	 *
 	 * @param string $comment_content The comment data.
 	 */
-	$data['comment_content'] = apply_filters( 'comment_save_pre', $data['comment_content'] );
+	$data['comment_content'] = apply_filters('comment_save_pre', $data['comment_content']);
 
-	$data['comment_date_gmt'] = get_gmt_from_date( $data['comment_date'] );
+	$data['comment_date_gmt'] = get_gmt_from_date($data['comment_date']);
 
-	if ( ! isset( $data['comment_approved'] ) ) {
+	if ( ! isset($data['comment_approved'])) {
 		$data['comment_approved'] = 1;
-	} elseif ( 'hold' == $data['comment_approved'] ) {
+	} elseif ('hold' == $data['comment_approved']) {
 		$data['comment_approved'] = 0;
-	} elseif ( 'approve' == $data['comment_approved'] ) {
+	} elseif ('approve' == $data['comment_approved']) {
 		$data['comment_approved'] = 1;
 	}
 
 	$comment_ID = $data['comment_ID'];
 	$comment_post_ID = $data['comment_post_ID'];
-	$keys = array( 'comment_post_ID', 'comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt', 'comment_type', 'comment_parent', 'user_id', 'comment_agent', 'comment_author_IP' );
-	$data = wp_array_slice_assoc( $data, $keys );
-	$rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) );
+	$keys = array('comment_post_ID', 'comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt', 'comment_type', 'comment_parent', 'user_id', 'comment_agent', 'comment_author_IP');
+	$data = wp_array_slice_assoc($data, $keys);
+	$rval = $wpdb->update($wpdb->comments, $data, compact('comment_ID'));
 
-	clean_comment_cache( $comment_ID );
-	wp_update_comment_count( $comment_post_ID );
+	clean_comment_cache($comment_ID);
+	wp_update_comment_count($comment_post_ID);
 	/**
 	 * Fires immediately after a comment is updated in the database.
 	 *
@@ -2035,7 +2035,7 @@ 
 	 *
 	 * @param int $comment_ID The comment ID.
 	 */
-	do_action( 'edit_comment', $comment_ID );
+	do_action('edit_comment', $comment_ID);
 	$comment = get_comment($comment_ID);
 	wp_transition_comment_status($comment->comment_approved, $old_status, $comment);
 	return $rval;
@@ -2055,14 +2055,14 @@ 
  * @param bool $defer
  * @return bool
  */
-function wp_defer_comment_counting($defer=null) {
+function wp_defer_comment_counting($defer = null) {
 	static $_defer = false;
 
-	if ( is_bool($defer) ) {
+	if (is_bool($defer)) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
-			wp_update_comment_count( null, true );
+		if ( ! $defer)
+			wp_update_comment_count(null, true);
 	}
 
 	return $_defer;
@@ -2090,26 +2090,26 @@ 
  * @return bool|void True on success, false on failure or if post with ID does
  *                   not exist.
  */
-function wp_update_comment_count($post_id, $do_deferred=false) {
+function wp_update_comment_count($post_id, $do_deferred = false) {
 	static $_deferred = array();
 
-	if ( empty( $post_id ) && ! $do_deferred ) {
+	if (empty($post_id) && ! $do_deferred) {
 		return false;
 	}
 
-	if ( $do_deferred ) {
+	if ($do_deferred) {
 		$_deferred = array_unique($_deferred);
-		foreach ( $_deferred as $i => $_post_id ) {
+		foreach ($_deferred as $i => $_post_id) {
 			wp_update_comment_count_now($_post_id);
-			unset( $_deferred[$i] ); /** @todo Move this outside of the foreach and reset $_deferred to an array instead */
+			unset($_deferred[$i]); /** @todo Move this outside of the foreach and reset $_deferred to an array instead */
 		}
 	}
 
-	if ( wp_defer_comment_counting() ) {
+	if (wp_defer_comment_counting()) {
 		$_deferred[] = $post_id;
 		return true;
 	}
-	elseif ( $post_id ) {
+	elseif ($post_id) {
 		return wp_update_comment_count_now($post_id);
 	}
 
@@ -2128,13 +2128,13 @@ 
 function wp_update_comment_count_now($post_id) {
 	global $wpdb;
 	$post_id = (int) $post_id;
-	if ( !$post_id )
+	if ( ! $post_id)
 		return false;
 
-	wp_cache_delete( 'comments-0', 'counts' );
-	wp_cache_delete( "comments-{$post_id}", 'counts' );
+	wp_cache_delete('comments-0', 'counts');
+	wp_cache_delete("comments-{$post_id}", 'counts');
 
-	if ( !$post = get_post($post_id) )
+	if ( ! $post = get_post($post_id))
 		return false;
 
 	$old = (int) $post->comment_count;
@@ -2148,17 +2148,17 @@ 
 	 * @param int $old     The old comment count.
 	 * @param int $post_id Post ID.
 	 */
-	$new = apply_filters( 'pre_wp_update_comment_count_now', null, $old, $post_id );
+	$new = apply_filters('pre_wp_update_comment_count_now', null, $old, $post_id);
 
-	if ( is_null( $new ) ) {
-		$new = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id ) );
+	if (is_null($new)) {
+		$new = (int) $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id));
 	} else {
 		$new = (int) $new;
 	}
 
-	$wpdb->update( $wpdb->posts, array('comment_count' => $new), array('ID' => $post_id) );
+	$wpdb->update($wpdb->posts, array('comment_count' => $new), array('ID' => $post_id));
 
-	clean_post_cache( $post );
+	clean_post_cache($post);
 
 	/**
 	 * Fires immediately after a post's comment count is updated in the database.
@@ -2169,9 +2169,9 @@ 
 	 * @param int $new     The new comment count.
 	 * @param int $old     The old comment count.
 	 */
-	do_action( 'wp_update_comment_count', $post_id, $new, $old );
+	do_action('wp_update_comment_count', $post_id, $new, $old);
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post_id, $post );
+	do_action('edit_post', $post_id, $post);
 
 	return true;
 }
@@ -2193,9 +2193,9 @@ 
  * @param int $deprecated Not Used.
  * @return false|string False on failure, string containing URI on success.
  */
-function discover_pingback_server_uri( $url, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7' );
+function discover_pingback_server_uri($url, $deprecated = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.7');
 
 	$pingback_str_dquote = 'rel="pingback"';
 	$pingback_str_squote = 'rel=\'pingback\'';
@@ -2203,47 +2203,47 @@ 
 	/** @todo Should use Filter Extension or custom preg_match instead. */
 	$parsed_url = parse_url($url);
 
-	if ( ! isset( $parsed_url['host'] ) ) // Not a URL. This should never happen.
+	if ( ! isset($parsed_url['host'])) // Not a URL. This should never happen.
 		return false;
 
 	//Do not search for a pingback server on our own uploads
 	$uploads_dir = wp_get_upload_dir();
-	if ( 0 === strpos($url, $uploads_dir['baseurl']) )
+	if (0 === strpos($url, $uploads_dir['baseurl']))
 		return false;
 
-	$response = wp_safe_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
+	$response = wp_safe_remote_head($url, array('timeout' => 2, 'httpversion' => '1.0'));
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) )
-		return wp_remote_retrieve_header( $response, 'x-pingback' );
+	if (wp_remote_retrieve_header($response, 'x-pingback'))
+		return wp_remote_retrieve_header($response, 'x-pingback');
 
 	// Not an (x)html, sgml, or xml page, no use going further.
-	if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) )
+	if (preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header($response, 'content-type')))
 		return false;
 
 	// Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file)
-	$response = wp_safe_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
+	$response = wp_safe_remote_get($url, array('timeout' => 2, 'httpversion' => '1.0'));
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	$contents = wp_remote_retrieve_body( $response );
+	$contents = wp_remote_retrieve_body($response);
 
 	$pingback_link_offset_dquote = strpos($contents, $pingback_str_dquote);
 	$pingback_link_offset_squote = strpos($contents, $pingback_str_squote);
-	if ( $pingback_link_offset_dquote || $pingback_link_offset_squote ) {
+	if ($pingback_link_offset_dquote || $pingback_link_offset_squote) {
 		$quote = ($pingback_link_offset_dquote) ? '"' : '\'';
-		$pingback_link_offset = ($quote=='"') ? $pingback_link_offset_dquote : $pingback_link_offset_squote;
+		$pingback_link_offset = ($quote == '"') ? $pingback_link_offset_dquote : $pingback_link_offset_squote;
 		$pingback_href_pos = @strpos($contents, 'href=', $pingback_link_offset);
-		$pingback_href_start = $pingback_href_pos+6;
+		$pingback_href_start = $pingback_href_pos + 6;
 		$pingback_href_end = @strpos($contents, $quote, $pingback_href_start);
 		$pingback_server_url_len = $pingback_href_end - $pingback_href_start;
 		$pingback_server_url = substr($contents, $pingback_href_start, $pingback_server_url_len);
 
 		// We may find rel="pingback" but an incomplete pingback URL
-		if ( $pingback_server_url_len > 0 ) { // We got it!
+		if ($pingback_server_url_len > 0) { // We got it!
 			return $pingback_server_url;
 		}
 	}
@@ -2263,20 +2263,20 @@ 
 
 	// Do pingbacks
 	while ($ping = $wpdb->get_row("SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_pingme' LIMIT 1")) {
-		delete_metadata_by_mid( 'post', $ping->meta_id );
-		pingback( $ping->post_content, $ping->ID );
+		delete_metadata_by_mid('post', $ping->meta_id);
+		pingback($ping->post_content, $ping->ID);
 	}
 
 	// Do Enclosures
 	while ($enclosure = $wpdb->get_row("SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_encloseme' LIMIT 1")) {
-		delete_metadata_by_mid( 'post', $enclosure->meta_id );
-		do_enclose( $enclosure->post_content, $enclosure->ID );
+		delete_metadata_by_mid('post', $enclosure->meta_id);
+		do_enclose($enclosure->post_content, $enclosure->ID);
 	}
 
 	// Do Trackbacks
 	$trackbacks = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE to_ping <> '' AND post_status = 'publish'");
-	if ( is_array($trackbacks) )
-		foreach ( $trackbacks as $trackback )
+	if (is_array($trackbacks))
+		foreach ($trackbacks as $trackback)
 			do_trackbacks($trackback);
 
 	//Do Update Services/Generic Pings
@@ -2295,37 +2295,37 @@ 
 function do_trackbacks($post_id) {
 	global $wpdb;
 
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 	$to_ping = get_to_ping($post_id);
 	$pinged  = get_pung($post_id);
-	if ( empty($to_ping) ) {
-		$wpdb->update($wpdb->posts, array('to_ping' => ''), array('ID' => $post_id) );
+	if (empty($to_ping)) {
+		$wpdb->update($wpdb->posts, array('to_ping' => ''), array('ID' => $post_id));
 		return;
 	}
 
-	if ( empty($post->post_excerpt) ) {
+	if (empty($post->post_excerpt)) {
 		/** This filter is documented in wp-includes/post-template.php */
-		$excerpt = apply_filters( 'the_content', $post->post_content, $post->ID );
+		$excerpt = apply_filters('the_content', $post->post_content, $post->ID);
 	} else {
 		/** This filter is documented in wp-includes/post-template.php */
-		$excerpt = apply_filters( 'the_excerpt', $post->post_excerpt );
+		$excerpt = apply_filters('the_excerpt', $post->post_excerpt);
 	}
 
 	$excerpt = str_replace(']]>', ']]&gt;', $excerpt);
 	$excerpt = wp_html_excerpt($excerpt, 252, '&#8230;');
 
 	/** This filter is documented in wp-includes/post-template.php */
-	$post_title = apply_filters( 'the_title', $post->post_title, $post->ID );
+	$post_title = apply_filters('the_title', $post->post_title, $post->ID);
 	$post_title = strip_tags($post_title);
 
-	if ( $to_ping ) {
-		foreach ( (array) $to_ping as $tb_ping ) {
+	if ($to_ping) {
+		foreach ((array) $to_ping as $tb_ping) {
 			$tb_ping = trim($tb_ping);
-			if ( !in_array($tb_ping, $pinged) ) {
+			if ( ! in_array($tb_ping, $pinged)) {
 				trackback($tb_ping, $post_title, $excerpt, $post_id);
 				$pinged[] = $tb_ping;
 			} else {
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id) );
+				$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id));
 			}
 		}
 	}
@@ -2339,13 +2339,13 @@ 
  * @param int $post_id Post ID.
  * @return int Same as Post ID from parameter
  */
-function generic_ping( $post_id = 0 ) {
+function generic_ping($post_id = 0) {
 	$services = get_option('ping_sites');
 
 	$services = explode("\n", $services);
-	foreach ( (array) $services as $service ) {
+	foreach ((array) $services as $service) {
 		$service = trim($service);
-		if ( '' != $service )
+		if ('' != $service)
 			weblog_ping($service);
 	}
 
@@ -2364,8 +2364,8 @@ 
  */
 function pingback($content, $post_ID) {
 	global $wp_version;
-	include_once(ABSPATH . WPINC . '/class-IXR.php');
-	include_once(ABSPATH . WPINC . '/class-wp-http-ixr-client.php');
+	include_once(ABSPATH.WPINC.'/class-IXR.php');
+	include_once(ABSPATH.WPINC.'/class-wp-http-ixr-client.php');
 
 	// original code by Mort (http://mort.mine.nu:8080)
 	$post_links = array();
@@ -2374,7 +2374,7 @@ 
 
 	// Step 1
 	// Parsing the post, external links (if any) are stored in the $post_links array
-	$post_links_temp = wp_extract_urls( $content );
+	$post_links_temp = wp_extract_urls($content);
 
 	// Step 2.
 	// Walking thru the links array
@@ -2385,19 +2385,19 @@ 
 	// http://dummy-weblog.org/post.php
 	// We don't wanna ping first and second types, even if they have a valid <link/>
 
-	foreach ( (array) $post_links_temp as $link_test ) :
-		if ( !in_array($link_test, $pung) && (url_to_postid($link_test) != $post_ID) // If we haven't pung it already and it isn't a link to itself
-				&& !is_local_attachment($link_test) ) : // Also, let's never ping local attachments.
-			if ( $test = @parse_url($link_test) ) {
-				if ( isset($test['query']) )
+	foreach ((array) $post_links_temp as $link_test) :
+		if ( ! in_array($link_test, $pung) && (url_to_postid($link_test) != $post_ID) // If we haven't pung it already and it isn't a link to itself
+				&& ! is_local_attachment($link_test)) : // Also, let's never ping local attachments.
+			if ($test = @parse_url($link_test)) {
+				if (isset($test['query']))
 					$post_links[] = $link_test;
-				elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) )
+				elseif (isset($test['path']) && ($test['path'] != '/') && ($test['path'] != ''))
 					$post_links[] = $link_test;
 			}
 		endif;
 	endforeach;
 
-	$post_links = array_unique( $post_links );
+	$post_links = array_unique($post_links);
 	/**
 	 * Fires just before pinging back links found in a post.
 	 *
@@ -2407,13 +2407,13 @@ 
 	 * @param array &$pung       Whether a link has already been pinged, passed by reference.
 	 * @param int   $post_ID     The post ID.
 	 */
-	do_action_ref_array( 'pre_ping', array( &$post_links, &$pung, $post_ID ) );
+	do_action_ref_array('pre_ping', array(&$post_links, &$pung, $post_ID));
 
-	foreach ( (array) $post_links as $pagelinkedto ) {
-		$pingback_server_url = discover_pingback_server_uri( $pagelinkedto );
+	foreach ((array) $post_links as $pagelinkedto) {
+		$pingback_server_url = discover_pingback_server_uri($pagelinkedto);
 
-		if ( $pingback_server_url ) {
-			@ set_time_limit( 60 );
+		if ($pingback_server_url) {
+			@ set_time_limit(60);
 			// Now, the RPC call
 			$pagelinkedfrom = get_permalink($post_ID);
 
@@ -2432,12 +2432,12 @@ 
 			 * @param string $pagelinkedto        URL of page linked to.
 			 * @param string $pagelinkedfrom      URL of page linked from.
 			 */
-			$client->useragent = apply_filters( 'pingback_useragent', $client->useragent . ' -- WordPress/' . $wp_version, $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom );
+			$client->useragent = apply_filters('pingback_useragent', $client->useragent.' -- WordPress/'.$wp_version, $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom);
 			// when set to true, this outputs debug messages by itself
 			$client->debug = false;
 
-			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) // Already registered
-				add_ping( $post_ID, $pagelinkedto );
+			if ($client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || (isset($client->error->code) && 48 == $client->error->code)) // Already registered
+				add_ping($post_ID, $pagelinkedto);
 		}
 	}
 }
@@ -2451,7 +2451,7 @@ 
  * @return mixed Empty string if blog is not public, returns $sites, if site is public.
  */
 function privacy_ping_filter($sites) {
-	if ( '0' != get_option('blog_public') )
+	if ('0' != get_option('blog_public'))
 		return $sites;
 	else
 		return '';
@@ -2475,7 +2475,7 @@ 
 function trackback($trackback_url, $title, $excerpt, $ID) {
 	global $wpdb;
 
-	if ( empty($trackback_url) )
+	if (empty($trackback_url))
 		return;
 
 	$options = array();
@@ -2487,13 +2487,13 @@ 
 		'excerpt' => $excerpt
 	);
 
-	$response = wp_safe_remote_post( $trackback_url, $options );
+	$response = wp_safe_remote_post($trackback_url, $options);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return;
 
-	$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID) );
-	return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID) );
+	$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID));
+	return $wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID));
 }
 
 /**
@@ -2508,18 +2508,18 @@ 
  */
 function weblog_ping($server = '', $path = '') {
 	global $wp_version;
-	include_once(ABSPATH . WPINC . '/class-IXR.php');
-	include_once(ABSPATH . WPINC . '/class-wp-http-ixr-client.php');
+	include_once(ABSPATH.WPINC.'/class-IXR.php');
+	include_once(ABSPATH.WPINC.'/class-wp-http-ixr-client.php');
 
 	// using a timeout of 3 seconds should be enough to cover slow servers
-	$client = new WP_HTTP_IXR_Client($server, ((!strlen(trim($path)) || ('/' == $path)) ? false : $path));
+	$client = new WP_HTTP_IXR_Client($server, (( ! strlen(trim($path)) || ('/' == $path)) ? false : $path));
 	$client->timeout = 3;
 	$client->useragent .= ' -- WordPress/'.$wp_version;
 
 	// when set to true, this outputs debug messages by itself
 	$client->debug = false;
-	$home = trailingslashit( home_url() );
-	if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
+	$home = trailingslashit(home_url());
+	if ( ! $client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url'))) // then try a normal ping
 		$client->query('weblogUpdates.ping', get_option('blogname'), $home);
 }
 
@@ -2532,8 +2532,8 @@ 
  * @param string $source_uri
  * @return string
  */
-function pingback_ping_source_uri( $source_uri ) {
-	return (string) wp_http_validate_url( $source_uri );
+function pingback_ping_source_uri($source_uri) {
+	return (string) wp_http_validate_url($source_uri);
 }
 
 /**
@@ -2548,10 +2548,10 @@ 
  * @param IXR_Error $ixr_error
  * @return IXR_Error
  */
-function xmlrpc_pingback_error( $ixr_error ) {
-	if ( $ixr_error->code === 48 )
+function xmlrpc_pingback_error($ixr_error) {
+	if ($ixr_error->code === 48)
 		return $ixr_error;
-	return new IXR_Error( 0, '' );
+	return new IXR_Error(0, '');
 }
 
 //
@@ -2566,8 +2566,8 @@ 
  * @param int|array $ids Comment ID or an array of comment IDs to remove from cache.
  */
 function clean_comment_cache($ids) {
-	foreach ( (array) $ids as $id ) {
-		wp_cache_delete( $id, 'comment' );
+	foreach ((array) $ids as $id) {
+		wp_cache_delete($id, 'comment');
 
 		/**
 		 * Fires immediately after a comment has been removed from the object cache.
@@ -2576,10 +2576,10 @@ 
 		 *
 		 * @param int $id Comment ID.
 		 */
-		do_action( 'clean_comment_cache', $id );
+		do_action('clean_comment_cache', $id);
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'comment' );
+	wp_cache_set('last_changed', microtime(), 'comment');
 }
 
 /**
@@ -2595,17 +2595,17 @@ 
  * @param array $comments          Array of comment row objects
  * @param bool  $update_meta_cache Whether to update commentmeta cache. Default true.
  */
-function update_comment_cache( $comments, $update_meta_cache = true ) {
-	foreach ( (array) $comments as $comment )
+function update_comment_cache($comments, $update_meta_cache = true) {
+	foreach ((array) $comments as $comment)
 		wp_cache_add($comment->comment_ID, $comment, 'comment');
 
-	if ( $update_meta_cache ) {
+	if ($update_meta_cache) {
 		// Avoid `wp_list_pluck()` in case `$comments` is passed by reference.
 		$comment_ids = array();
-		foreach ( $comments as $comment ) {
+		foreach ($comments as $comment) {
 			$comment_ids[] = $comment->comment_ID;
 		}
-		update_meta_cache( 'comment', $comment_ids );
+		update_meta_cache('comment', $comment_ids);
 	}
 }
 
@@ -2621,14 +2621,14 @@ 
  * @param array $comment_ids       Array of comment IDs.
  * @param bool  $update_meta_cache Optional. Whether to update the meta cache. Default true.
  */
-function _prime_comment_caches( $comment_ids, $update_meta_cache = true ) {
+function _prime_comment_caches($comment_ids, $update_meta_cache = true) {
 	global $wpdb;
 
-	$non_cached_ids = _get_non_cached_ids( $comment_ids, 'comment' );
-	if ( !empty( $non_cached_ids ) ) {
-		$fresh_comments = $wpdb->get_results( sprintf( "SELECT $wpdb->comments.* FROM $wpdb->comments WHERE comment_ID IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+	$non_cached_ids = _get_non_cached_ids($comment_ids, 'comment');
+	if ( ! empty($non_cached_ids)) {
+		$fresh_comments = $wpdb->get_results(sprintf("SELECT $wpdb->comments.* FROM $wpdb->comments WHERE comment_ID IN (%s)", join(",", array_map('intval', $non_cached_ids))));
 
-		update_comment_cache( $fresh_comments, $update_meta_cache );
+		update_comment_cache($fresh_comments, $update_meta_cache);
 	}
 }
 
@@ -2646,8 +2646,8 @@ 
  * @param WP_Query $query Query object.
  * @return array
  */
-function _close_comments_for_old_posts( $posts, $query ) {
-	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )
+function _close_comments_for_old_posts($posts, $query) {
+	if (empty($posts) || ! $query->is_singular() || ! get_option('close_comments_for_old_posts'))
 		return $posts;
 
 	/**
@@ -2657,15 +2657,15 @@ 
 	 *
 	 * @param array $post_types An array of registered post types. Default array with 'post'.
 	 */
-	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $posts[0]->post_type, $post_types ) )
+	$post_types = apply_filters('close_comments_for_post_types', array('post'));
+	if ( ! in_array($posts[0]->post_type, $post_types))
 		return $posts;
 
-	$days_old = (int) get_option( 'close_comments_days_old' );
-	if ( ! $days_old )
+	$days_old = (int) get_option('close_comments_days_old');
+	if ( ! $days_old)
 		return $posts;
 
-	if ( time() - strtotime( $posts[0]->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
+	if (time() - strtotime($posts[0]->post_date_gmt) > ($days_old * DAY_IN_SECONDS)) {
 		$posts[0]->comment_status = 'closed';
 		$posts[0]->ping_status = 'closed';
 	}
@@ -2683,30 +2683,30 @@ 
  * @param int $post_id Post ID
  * @return bool $open
  */
-function _close_comments_for_old_post( $open, $post_id ) {
-	if ( ! $open )
+function _close_comments_for_old_post($open, $post_id) {
+	if ( ! $open)
 		return $open;
 
-	if ( !get_option('close_comments_for_old_posts') )
+	if ( ! get_option('close_comments_for_old_posts'))
 		return $open;
 
 	$days_old = (int) get_option('close_comments_days_old');
-	if ( !$days_old )
+	if ( ! $days_old)
 		return $open;
 
 	$post = get_post($post_id);
 
 	/** This filter is documented in wp-includes/comment.php */
-	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $post->post_type, $post_types ) )
+	$post_types = apply_filters('close_comments_for_post_types', array('post'));
+	if ( ! in_array($post->post_type, $post_types))
 		return $open;
 
 	// Undated drafts should not show up as comments closed.
-	if ( '0000-00-00 00:00:00' === $post->post_date_gmt ) {
+	if ('0000-00-00 00:00:00' === $post->post_date_gmt) {
 		return $open;
 	}
 
-	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) )
+	if (time() - strtotime($post->post_date_gmt) > ($days_old * DAY_IN_SECONDS))
 		return false;
 
 	return $open;
@@ -2733,36 +2733,36 @@ 
  * }
  * @return WP_Comment|WP_Error A WP_Comment object on success, a WP_Error object on failure.
  */
-function wp_handle_comment_submission( $comment_data ) {
+function wp_handle_comment_submission($comment_data) {
 
 	$comment_post_ID = $comment_parent = 0;
 	$comment_author = $comment_author_email = $comment_author_url = $comment_content = $_wp_unfiltered_html_comment = null;
 
-	if ( isset( $comment_data['comment_post_ID'] ) ) {
+	if (isset($comment_data['comment_post_ID'])) {
 		$comment_post_ID = (int) $comment_data['comment_post_ID'];
 	}
-	if ( isset( $comment_data['author'] ) && is_string( $comment_data['author'] ) ) {
-		$comment_author = trim( strip_tags( $comment_data['author'] ) );
+	if (isset($comment_data['author']) && is_string($comment_data['author'])) {
+		$comment_author = trim(strip_tags($comment_data['author']));
 	}
-	if ( isset( $comment_data['email'] ) && is_string( $comment_data['email'] ) ) {
-		$comment_author_email = trim( $comment_data['email'] );
+	if (isset($comment_data['email']) && is_string($comment_data['email'])) {
+		$comment_author_email = trim($comment_data['email']);
 	}
-	if ( isset( $comment_data['url'] ) && is_string( $comment_data['url'] ) ) {
-		$comment_author_url = trim( $comment_data['url'] );
+	if (isset($comment_data['url']) && is_string($comment_data['url'])) {
+		$comment_author_url = trim($comment_data['url']);
 	}
-	if ( isset( $comment_data['comment'] ) && is_string( $comment_data['comment'] ) ) {
-		$comment_content = trim( $comment_data['comment'] );
+	if (isset($comment_data['comment']) && is_string($comment_data['comment'])) {
+		$comment_content = trim($comment_data['comment']);
 	}
-	if ( isset( $comment_data['comment_parent'] ) ) {
-		$comment_parent = absint( $comment_data['comment_parent'] );
+	if (isset($comment_data['comment_parent'])) {
+		$comment_parent = absint($comment_data['comment_parent']);
 	}
-	if ( isset( $comment_data['_wp_unfiltered_html_comment'] ) && is_string( $comment_data['_wp_unfiltered_html_comment'] ) ) {
-		$_wp_unfiltered_html_comment = trim( $comment_data['_wp_unfiltered_html_comment'] );
+	if (isset($comment_data['_wp_unfiltered_html_comment']) && is_string($comment_data['_wp_unfiltered_html_comment'])) {
+		$_wp_unfiltered_html_comment = trim($comment_data['_wp_unfiltered_html_comment']);
 	}
 
-	$post = get_post( $comment_post_ID );
+	$post = get_post($comment_post_ID);
 
-	if ( empty( $post->comment_status ) ) {
+	if (empty($post->comment_status)) {
 
 		/**
 		 * Fires when a comment is attempted on a post that does not exist.
@@ -2771,22 +2771,22 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_id_not_found', $comment_post_ID );
+		do_action('comment_id_not_found', $comment_post_ID);
 
-		return new WP_Error( 'comment_id_not_found' );
+		return new WP_Error('comment_id_not_found');
 
 	}
 
 	// get_post_status() will get the parent status for attachments.
-	$status = get_post_status( $post );
+	$status = get_post_status($post);
 
-	if ( ( 'private' == $status ) && ! current_user_can( 'read_post', $comment_post_ID ) ) {
-		return new WP_Error( 'comment_id_not_found' );
+	if (('private' == $status) && ! current_user_can('read_post', $comment_post_ID)) {
+		return new WP_Error('comment_id_not_found');
 	}
 
-	$status_obj = get_post_status_object( $status );
+	$status_obj = get_post_status_object($status);
 
-	if ( ! comments_open( $comment_post_ID ) ) {
+	if ( ! comments_open($comment_post_ID)) {
 
 		/**
 		 * Fires when a comment is attempted on a post that has comments closed.
@@ -2795,11 +2795,11 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_closed', $comment_post_ID );
+		do_action('comment_closed', $comment_post_ID);
 
-		return new WP_Error( 'comment_closed', __( 'Sorry, comments are closed for this item.' ), 403 );
+		return new WP_Error('comment_closed', __('Sorry, comments are closed for this item.'), 403);
 
-	} elseif ( 'trash' == $status ) {
+	} elseif ('trash' == $status) {
 
 		/**
 		 * Fires when a comment is attempted on a trashed post.
@@ -2808,11 +2808,11 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_on_trash', $comment_post_ID );
+		do_action('comment_on_trash', $comment_post_ID);
 
-		return new WP_Error( 'comment_on_trash' );
+		return new WP_Error('comment_on_trash');
 
-	} elseif ( ! $status_obj->public && ! $status_obj->private ) {
+	} elseif ( ! $status_obj->public && ! $status_obj->private) {
 
 		/**
 		 * Fires when a comment is attempted on a post in draft mode.
@@ -2821,11 +2821,11 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_on_draft', $comment_post_ID );
+		do_action('comment_on_draft', $comment_post_ID);
 
-		return new WP_Error( 'comment_on_draft' );
+		return new WP_Error('comment_on_draft');
 
-	} elseif ( post_password_required( $comment_post_ID ) ) {
+	} elseif (post_password_required($comment_post_ID)) {
 
 		/**
 		 * Fires when a comment is attempted on a password-protected post.
@@ -2834,9 +2834,9 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_on_password_protected', $comment_post_ID );
+		do_action('comment_on_password_protected', $comment_post_ID);
 
-		return new WP_Error( 'comment_on_password_protected' );
+		return new WP_Error('comment_on_password_protected');
 
 	} else {
 
@@ -2847,61 +2847,61 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'pre_comment_on_post', $comment_post_ID );
+		do_action('pre_comment_on_post', $comment_post_ID);
 
 	}
 
 	// If the user is logged in
 	$user = wp_get_current_user();
-	if ( $user->exists() ) {
-		if ( empty( $user->display_name ) ) {
-			$user->display_name=$user->user_login;
+	if ($user->exists()) {
+		if (empty($user->display_name)) {
+			$user->display_name = $user->user_login;
 		}
 		$comment_author       = $user->display_name;
 		$comment_author_email = $user->user_email;
 		$comment_author_url   = $user->user_url;
 		$user_ID              = $user->ID;
-		if ( current_user_can( 'unfiltered_html' ) ) {
-			if ( ! isset( $comment_data['_wp_unfiltered_html_comment'] )
-				|| ! wp_verify_nonce( $comment_data['_wp_unfiltered_html_comment'], 'unfiltered-html-comment_' . $comment_post_ID )
+		if (current_user_can('unfiltered_html')) {
+			if ( ! isset($comment_data['_wp_unfiltered_html_comment'])
+				|| ! wp_verify_nonce($comment_data['_wp_unfiltered_html_comment'], 'unfiltered-html-comment_'.$comment_post_ID)
 			) {
 				kses_remove_filters(); // start with a clean slate
 				kses_init_filters(); // set up the filters
 			}
 		}
 	} else {
-		if ( get_option( 'comment_registration' ) ) {
-			return new WP_Error( 'not_logged_in', __( 'Sorry, you must be logged in to post a comment.' ), 403 );
+		if (get_option('comment_registration')) {
+			return new WP_Error('not_logged_in', __('Sorry, you must be logged in to post a comment.'), 403);
 		}
 	}
 
 	$comment_type = '';
 	$max_lengths = wp_get_comment_fields_max_lengths();
 
-	if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
-		if ( 6 > strlen( $comment_author_email ) || '' == $comment_author ) {
-			return new WP_Error( 'require_name_email', __( '<strong>ERROR</strong>: please fill the required fields (name, email).' ), 200 );
-		} elseif ( ! is_email( $comment_author_email ) ) {
-			return new WP_Error( 'require_valid_email', __( '<strong>ERROR</strong>: please enter a valid email address.' ), 200 );
+	if (get_option('require_name_email') && ! $user->exists()) {
+		if (6 > strlen($comment_author_email) || '' == $comment_author) {
+			return new WP_Error('require_name_email', __('<strong>ERROR</strong>: please fill the required fields (name, email).'), 200);
+		} elseif ( ! is_email($comment_author_email)) {
+			return new WP_Error('require_valid_email', __('<strong>ERROR</strong>: please enter a valid email address.'), 200);
 		}
 	}
 
-	if ( isset( $comment_author ) && $max_lengths['comment_author'] < mb_strlen( $comment_author, '8bit' ) ) {
-		return new WP_Error( 'comment_author_column_length', __( '<strong>ERROR</strong>: your name is too long.' ), 200 );
+	if (isset($comment_author) && $max_lengths['comment_author'] < mb_strlen($comment_author, '8bit')) {
+		return new WP_Error('comment_author_column_length', __('<strong>ERROR</strong>: your name is too long.'), 200);
 	}
 
-	if ( isset( $comment_author_email ) && $max_lengths['comment_author_email'] < strlen( $comment_author_email ) ) {
-		return new WP_Error( 'comment_author_email_column_length', __( '<strong>ERROR</strong>: your email address is too long.' ), 200 );
+	if (isset($comment_author_email) && $max_lengths['comment_author_email'] < strlen($comment_author_email)) {
+		return new WP_Error('comment_author_email_column_length', __('<strong>ERROR</strong>: your email address is too long.'), 200);
 	}
 
-	if ( isset( $comment_author_url ) && $max_lengths['comment_author_url'] < strlen( $comment_author_url ) ) {
-		return new WP_Error( 'comment_author_url_column_length', __( '<strong>ERROR</strong>: your url is too long.' ), 200 );
+	if (isset($comment_author_url) && $max_lengths['comment_author_url'] < strlen($comment_author_url)) {
+		return new WP_Error('comment_author_url_column_length', __('<strong>ERROR</strong>: your url is too long.'), 200);
 	}
 
-	if ( '' == $comment_content ) {
-		return new WP_Error( 'require_valid_comment', __( '<strong>ERROR</strong>: please type a comment.' ), 200 );
-	} elseif ( $max_lengths['comment_content'] < mb_strlen( $comment_content, '8bit' ) ) {
-		return new WP_Error( 'comment_content_column_length', __( '<strong>ERROR</strong>: your comment is too long.' ), 200 );
+	if ('' == $comment_content) {
+		return new WP_Error('require_valid_comment', __('<strong>ERROR</strong>: please type a comment.'), 200);
+	} elseif ($max_lengths['comment_content'] < mb_strlen($comment_content, '8bit')) {
+		return new WP_Error('comment_content_column_length', __('<strong>ERROR</strong>: your comment is too long.'), 200);
 	}
 
 	$commentdata = compact(
@@ -2915,11 +2915,11 @@ 
 		'user_ID'
 	);
 
-	$comment_id = wp_new_comment( wp_slash( $commentdata ) );
-	if ( ! $comment_id ) {
-		return new WP_Error( 'comment_save_error', __( '<strong>ERROR</strong>: The comment could not be saved. Please try again later.' ), 500 );
+	$comment_id = wp_new_comment(wp_slash($commentdata));
+	if ( ! $comment_id) {
+		return new WP_Error('comment_save_error', __('<strong>ERROR</strong>: The comment could not be saved. Please try again later.'), 500);
 	}
 
-	return get_comment( $comment_id );
+	return get_comment($comment_id);
 
 }

Braces +247 added lines, -161 removed lines

@@ -40,8 +40,9 @@ 
 	global $wpdb;
 
 	// If manual moderation is enabled, skip all checks and return false.
-	if ( 1 == get_option('comment_moderation') )
-		return false;
+	if ( 1 == get_option('comment_moderation') ) {
+			return false;
+	}
 
 	/** This filter is documented in wp-includes/comment-template.php */
 	$comment = apply_filters( 'comment_text', $comment );
@@ -64,8 +65,9 @@ 
 		 * If the number of links in the comment exceeds the allowed amount,
 		 * fail the check by returning false.
 		 */
-		if ( $num_links >= $max_links )
-			return false;
+		if ( $num_links >= $max_links ) {
+					return false;
+		}
 	}
 
 	$mod_keys = trim(get_option('moderation_keys'));
@@ -78,8 +80,9 @@ 
 			$word = trim($word);
 
 			// Skip empty lines.
-			if ( empty($word) )
-				continue;
+			if ( empty($word) ) {
+							continue;
+			}
 
 			/*
 			 * Do some escaping magic so that '#' (number of) characters in the spam
@@ -92,12 +95,24 @@ 
 			 * fail the check for the given field by returning false.
 			 */
 			$pattern = "#$word#i";
-			if ( preg_match($pattern, $author) ) return false;
-			if ( preg_match($pattern, $email) ) return false;
-			if ( preg_match($pattern, $url) ) return false;
-			if ( preg_match($pattern, $comment) ) return false;
-			if ( preg_match($pattern, $user_ip) ) return false;
-			if ( preg_match($pattern, $user_agent) ) return false;
+			if ( preg_match($pattern, $author) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $email) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $url) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $comment) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $user_ip) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $user_agent) ) {
+				return false;
+			}
 		}
 	}
 
@@ -113,10 +128,11 @@ 
 			// expected_slashed ($author, $email)
 			$ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1");
 			if ( ( 1 == $ok_to_comment ) &&
-				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) )
-					return true;
-			else
-				return false;
+				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) ) {
+								return true;
+			} else {
+							return false;
+			}
 		} else {
 			return false;
 		}
@@ -299,8 +315,9 @@ 
 	global $wpdb;
 	static $cache_lastcommentmodified = array();
 
-	if ( isset($cache_lastcommentmodified[$timezone]) )
-		return $cache_lastcommentmodified[$timezone];
+	if ( isset($cache_lastcommentmodified[$timezone]) ) {
+			return $cache_lastcommentmodified[$timezone];
+	}
 
 	$add_seconds_server = date('Z');
 
@@ -502,8 +519,9 @@ 
  * @since 3.4.0
  */
 function wp_set_comment_cookies($comment, $user) {
-	if ( $user->exists() )
-		return;
+	if ( $user->exists() ) {
+			return;
+	}
 
 	/**
 	 * Filter the lifetime of the comment cookie in seconds.
@@ -770,8 +788,9 @@ 
 			 */
 			do_action( 'comment_flood_trigger', $time_lastcomment, $time_newcomment );
 
-			if ( defined('DOING_AJAX') )
-				die( __('You are posting comments too quickly. Slow down.') );
+			if ( defined('DOING_AJAX') ) {
+							die( __('You are posting comments too quickly. Slow down.') );
+			}
 
 			wp_die( __( 'You are posting comments too quickly. Slow down.' ), 429 );
 		}
@@ -791,11 +810,13 @@ 
 	$count = count($comments);
 	for ( $i = 0; $i < $count; $i++ ) {
 		$type = $comments[$i]->comment_type;
-		if ( empty($type) )
-			$type = 'comment';
+		if ( empty($type) ) {
+					$type = 'comment';
+		}
 		$comments_by_type[$type][] = &$comments[$i];
-		if ( 'trackback' == $type || 'pingback' == $type )
-			$comments_by_type['pings'][] = &$comments[$i];
+		if ( 'trackback' == $type || 'pingback' == $type ) {
+					$comments_by_type['pings'][] = &$comments[$i];
+		}
 	}
 
 	return $comments_by_type;
@@ -818,28 +839,35 @@ 
 function get_comment_pages_count( $comments = null, $per_page = null, $threaded = null ) {
 	global $wp_query;
 
-	if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) )
-		return $wp_query->max_num_comment_pages;
+	if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) ) {
+			return $wp_query->max_num_comment_pages;
+	}
 
-	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments )  )
-		$comments = $wp_query->comments;
+	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments )  ) {
+			$comments = $wp_query->comments;
+	}
 
-	if ( empty($comments) )
-		return 0;
+	if ( empty($comments) ) {
+			return 0;
+	}
 
 	if ( ! get_option( 'page_comments' ) ) {
 		return 1;
 	}
 
-	if ( !isset($per_page) )
-		$per_page = (int) get_query_var('comments_per_page');
-	if ( 0 === $per_page )
-		$per_page = (int) get_option('comments_per_page');
-	if ( 0 === $per_page )
-		return 1;
+	if ( !isset($per_page) ) {
+			$per_page = (int) get_query_var('comments_per_page');
+	}
+	if ( 0 === $per_page ) {
+			$per_page = (int) get_option('comments_per_page');
+	}
+	if ( 0 === $per_page ) {
+			return 1;
+	}
 
-	if ( !isset($threaded) )
-		$threaded = get_option('thread_comments');
+	if ( !isset($threaded) ) {
+			$threaded = get_option('thread_comments');
+	}
 
 	if ( $threaded ) {
 		$walker = new Walker_Comment;
@@ -876,8 +904,9 @@ 
 
 	$page = null;
 
-	if ( !$comment = get_comment( $comment_ID ) )
-		return;
+	if ( !$comment = get_comment( $comment_ID ) ) {
+			return;
+	}
 
 	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
 	$args = wp_parse_args( $args, $defaults );
@@ -905,15 +934,17 @@ 
 
 	if ( null === $page ) {
 		if ( '' === $args['max_depth'] ) {
-			if ( get_option('thread_comments') )
-				$args['max_depth'] = get_option('thread_comments_depth');
-			else
-				$args['max_depth'] = -1;
+			if ( get_option('thread_comments') ) {
+							$args['max_depth'] = get_option('thread_comments_depth');
+			} else {
+							$args['max_depth'] = -1;
+			}
 		}
 
 		// Find this comment's top level parent if threading is enabled
-		if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent )
-			return get_page_of_comment( $comment->comment_parent, $args );
+		if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent ) {
+					return get_page_of_comment( $comment->comment_parent, $args );
+		}
 
 		$comment_args = array(
 			'type'       => $args['type'],
@@ -1055,8 +1086,10 @@ 
 	do_action( 'wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent );
 
 	$mod_keys = trim( get_option('blacklist_keys') );
-	if ( '' == $mod_keys )
-		return false; // If moderation keys are empty
+	if ( '' == $mod_keys ) {
+			return false;
+	}
+	// If moderation keys are empty
 	$words = explode("\n", $mod_keys );
 
 	foreach ( (array) $words as $word ) {
@@ -1077,8 +1110,9 @@ 
 			|| preg_match($pattern, $comment)
 			|| preg_match($pattern, $user_ip)
 			|| preg_match($pattern, $user_agent)
-		 )
-			return true;
+		 ) {
+					return true;
+		}
 	}
 	return false;
 }
@@ -1149,11 +1183,13 @@ 
  */
 function wp_delete_comment($comment_id, $force_delete = false) {
 	global $wpdb;
-	if (!$comment = get_comment($comment_id))
-		return false;
+	if (!$comment = get_comment($comment_id)) {
+			return false;
+	}
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status( $comment ), array( 'trash', 'spam' ) ) )
-		return wp_trash_comment($comment_id);
+	if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status( $comment ), array( 'trash', 'spam' ) ) ) {
+			return wp_trash_comment($comment_id);
+	}
 
 	/**
 	 * Fires immediately before a comment is deleted from the database.
@@ -1173,11 +1209,13 @@ 
 
 	// Delete metadata
 	$meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment->comment_ID ) );
-	foreach ( $meta_ids as $mid )
-		delete_metadata_by_mid( 'comment', $mid );
+	foreach ( $meta_ids as $mid ) {
+			delete_metadata_by_mid( 'comment', $mid );
+	}
 
-	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment->comment_ID ) ) )
-		return false;
+	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment->comment_ID ) ) ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately after a comment is deleted from the database.
@@ -1189,8 +1227,9 @@ 
 	do_action( 'deleted_comment', $comment->comment_ID );
 
 	$post_id = $comment->comment_post_ID;
-	if ( $post_id && $comment->comment_approved == 1 )
-		wp_update_comment_count($post_id);
+	if ( $post_id && $comment->comment_approved == 1 ) {
+			wp_update_comment_count($post_id);
+	}
 
 	clean_comment_cache( $comment->comment_ID );
 
@@ -1212,11 +1251,13 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_trash_comment($comment_id) {
-	if ( !EMPTY_TRASH_DAYS )
-		return wp_delete_comment($comment_id, true);
+	if ( !EMPTY_TRASH_DAYS ) {
+			return wp_delete_comment($comment_id, true);
+	}
 
-	if ( !$comment = get_comment($comment_id) )
-		return false;
+	if ( !$comment = get_comment($comment_id) ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately before a comment is sent to the Trash.
@@ -1271,8 +1312,9 @@ 
 	do_action( 'untrash_comment', $comment->comment_ID );
 
 	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
-		$status = '0';
+	if ( empty($status) ) {
+			$status = '0';
+	}
 
 	if ( wp_set_comment_status( $comment, $status ) ) {
 		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
@@ -1357,8 +1399,9 @@ 
 	do_action( 'unspam_comment', $comment->comment_ID );
 
 	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
-		$status = '0';
+	if ( empty($status) ) {
+			$status = '0';
+	}
 
 	if ( wp_set_comment_status( $comment, $status ) ) {
 		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
@@ -1387,24 +1430,26 @@ 
  */
 function wp_get_comment_status($comment_id) {
 	$comment = get_comment($comment_id);
-	if ( !$comment )
-		return false;
+	if ( !$comment ) {
+			return false;
+	}
 
 	$approved = $comment->comment_approved;
 
-	if ( $approved == null )
-		return false;
-	elseif ( $approved == '1' )
-		return 'approved';
-	elseif ( $approved == '0' )
-		return 'unapproved';
-	elseif ( $approved == 'spam' )
-		return 'spam';
-	elseif ( $approved == 'trash' )
-		return 'trash';
-	else
-		return false;
-}
+	if ( $approved == null ) {
+			return false;
+	} elseif ( $approved == '1' ) {
+			return 'approved';
+	} elseif ( $approved == '0' ) {
+			return 'unapproved';
+	} elseif ( $approved == 'spam' ) {
+			return 'spam';
+	} elseif ( $approved == 'trash' ) {
+			return 'trash';
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Call hooks for when a comment status transition occurs.
@@ -1438,8 +1483,12 @@ 
 		1         => 'approved',
 		'approve' => 'approved', // wp_set_comment_status() uses "approve"
 	);
-	if ( isset($comment_statuses[$new_status]) ) $new_status = $comment_statuses[$new_status];
-	if ( isset($comment_statuses[$old_status]) ) $old_status = $comment_statuses[$old_status];
+	if ( isset($comment_statuses[$new_status]) ) {
+		$new_status = $comment_statuses[$new_status];
+	}
+	if ( isset($comment_statuses[$old_status]) ) {
+		$old_status = $comment_statuses[$old_status];
+	}
 
 	// Call the hooks
 	if ( $new_status != $old_status ) {
@@ -1498,16 +1547,19 @@ 
 	// Cookies should already be sanitized.
 
 	$comment_author = '';
-	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) )
-		$comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
+	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) ) {
+			$comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
+	}
 
 	$comment_author_email = '';
-	if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) )
-		$comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
+	if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) ) {
+			$comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
+	}
 
 	$comment_author_url = '';
-	if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) )
-		$comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
+	if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) ) {
+			$comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
+	}
 
 	/**
 	 * Filter the current commenter's name, email, and URL.
@@ -1691,10 +1743,13 @@ 
  * @return bool Whether comment should be blocked.
  */
 function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment) {
-	if ( $block ) // a plugin has already blocked... we'll let that decision stand
+	if ( $block ) {
+		// a plugin has already blocked... we'll let that decision stand
 		return $block;
-	if ( ($time_newcomment - $time_lastcomment) < 15 )
-		return true;
+	}
+	if ( ($time_newcomment - $time_lastcomment) < 15 ) {
+			return true;
+	}
 	return false;
 }
 
@@ -1931,10 +1986,11 @@ 
 	$comment_old = clone get_comment($comment_id);
 
 	if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array( 'comment_ID' => $comment_old->comment_ID ) ) ) {
-		if ( $wp_error )
-			return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
-		else
-			return false;
+		if ( $wp_error ) {
+					return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
+		} else {
+					return false;
+		}
 	}
 
 	clean_comment_cache( $comment_old->comment_ID );
@@ -2061,8 +2117,9 @@ 
 	if ( is_bool($defer) ) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
-			wp_update_comment_count( null, true );
+		if ( !$defer ) {
+					wp_update_comment_count( null, true );
+		}
 	}
 
 	return $_defer;
@@ -2108,8 +2165,7 @@ 
 	if ( wp_defer_comment_counting() ) {
 		$_deferred[] = $post_id;
 		return true;
-	}
-	elseif ( $post_id ) {
+	} elseif ( $post_id ) {
 		return wp_update_comment_count_now($post_id);
 	}
 
@@ -2128,14 +2184,16 @@ 
 function wp_update_comment_count_now($post_id) {
 	global $wpdb;
 	$post_id = (int) $post_id;
-	if ( !$post_id )
-		return false;
+	if ( !$post_id ) {
+			return false;
+	}
 
 	wp_cache_delete( 'comments-0', 'counts' );
 	wp_cache_delete( "comments-{$post_id}", 'counts' );
 
-	if ( !$post = get_post($post_id) )
-		return false;
+	if ( !$post = get_post($post_id) ) {
+			return false;
+	}
 
 	$old = (int) $post->comment_count;
 
@@ -2194,8 +2252,9 @@ 
  * @return false|string False on failure, string containing URI on success.
  */
 function discover_pingback_server_uri( $url, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.7' );
+	}
 
 	$pingback_str_dquote = 'rel="pingback"';
 	$pingback_str_squote = 'rel=\'pingback\'';
@@ -2203,31 +2262,38 @@ 
 	/** @todo Should use Filter Extension or custom preg_match instead. */
 	$parsed_url = parse_url($url);
 
-	if ( ! isset( $parsed_url['host'] ) ) // Not a URL. This should never happen.
+	if ( ! isset( $parsed_url['host'] ) ) {
+		// Not a URL. This should never happen.
 		return false;
+	}
 
 	//Do not search for a pingback server on our own uploads
 	$uploads_dir = wp_get_upload_dir();
-	if ( 0 === strpos($url, $uploads_dir['baseurl']) )
-		return false;
+	if ( 0 === strpos($url, $uploads_dir['baseurl']) ) {
+			return false;
+	}
 
 	$response = wp_safe_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
-	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) )
-		return wp_remote_retrieve_header( $response, 'x-pingback' );
+	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) ) {
+			return wp_remote_retrieve_header( $response, 'x-pingback' );
+	}
 
 	// Not an (x)html, sgml, or xml page, no use going further.
-	if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) )
-		return false;
+	if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) ) {
+			return false;
+	}
 
 	// Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file)
 	$response = wp_safe_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	$contents = wp_remote_retrieve_body( $response );
 
@@ -2275,9 +2341,10 @@ 
 
 	// Do Trackbacks
 	$trackbacks = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE to_ping <> '' AND post_status = 'publish'");
-	if ( is_array($trackbacks) )
-		foreach ( $trackbacks as $trackback )
+	if ( is_array($trackbacks) ) {
+			foreach ( $trackbacks as $trackback )
 			do_trackbacks($trackback);
+	}
 
 	//Do Update Services/Generic Pings
 	generic_ping();
@@ -2345,8 +2412,9 @@ 
 	$services = explode("\n", $services);
 	foreach ( (array) $services as $service ) {
 		$service = trim($service);
-		if ( '' != $service )
-			weblog_ping($service);
+		if ( '' != $service ) {
+					weblog_ping($service);
+		}
 	}
 
 	return $post_id;
@@ -2389,10 +2457,11 @@ 
 		if ( !in_array($link_test, $pung) && (url_to_postid($link_test) != $post_ID) // If we haven't pung it already and it isn't a link to itself
 				&& !is_local_attachment($link_test) ) : // Also, let's never ping local attachments.
 			if ( $test = @parse_url($link_test) ) {
-				if ( isset($test['query']) )
-					$post_links[] = $link_test;
-				elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) )
-					$post_links[] = $link_test;
+				if ( isset($test['query']) ) {
+									$post_links[] = $link_test;
+				} elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) ) {
+									$post_links[] = $link_test;
+				}
 			}
 		endif;
 	endforeach;
@@ -2436,8 +2505,10 @@ 
 			// when set to true, this outputs debug messages by itself
 			$client->debug = false;
 
-			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) // Already registered
+			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) {
+				// Already registered
 				add_ping( $post_ID, $pagelinkedto );
+			}
 		}
 	}
 }
@@ -2451,11 +2522,12 @@ 
  * @return mixed Empty string if blog is not public, returns $sites, if site is public.
  */
 function privacy_ping_filter($sites) {
-	if ( '0' != get_option('blog_public') )
-		return $sites;
-	else
-		return '';
-}
+	if ( '0' != get_option('blog_public') ) {
+			return $sites;
+	} else {
+			return '';
+	}
+	}
 
 /**
  * Send a Trackback.
@@ -2475,8 +2547,9 @@ 
 function trackback($trackback_url, $title, $excerpt, $ID) {
 	global $wpdb;
 
-	if ( empty($trackback_url) )
-		return;
+	if ( empty($trackback_url) ) {
+			return;
+	}
 
 	$options = array();
 	$options['timeout'] = 10;
@@ -2489,8 +2562,9 @@ 
 
 	$response = wp_safe_remote_post( $trackback_url, $options );
 
-	if ( is_wp_error( $response ) )
-		return;
+	if ( is_wp_error( $response ) ) {
+			return;
+	}
 
 	$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID) );
 	return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID) );
@@ -2519,9 +2593,11 @@ 
 	// when set to true, this outputs debug messages by itself
 	$client->debug = false;
 	$home = trailingslashit( home_url() );
-	if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
+	if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) {
+		// then try a normal ping
 		$client->query('weblogUpdates.ping', get_option('blogname'), $home);
-}
+	}
+	}
 
 /**
  * Default filter attached to pingback_ping_source_uri to validate the pingback's Source URI
@@ -2549,8 +2625,9 @@ 
  * @return IXR_Error
  */
 function xmlrpc_pingback_error( $ixr_error ) {
-	if ( $ixr_error->code === 48 )
-		return $ixr_error;
+	if ( $ixr_error->code === 48 ) {
+			return $ixr_error;
+	}
 	return new IXR_Error( 0, '' );
 }
 
@@ -2596,8 +2673,9 @@ 
  * @param bool  $update_meta_cache Whether to update commentmeta cache. Default true.
  */
 function update_comment_cache( $comments, $update_meta_cache = true ) {
-	foreach ( (array) $comments as $comment )
-		wp_cache_add($comment->comment_ID, $comment, 'comment');
+	foreach ( (array) $comments as $comment ) {
+			wp_cache_add($comment->comment_ID, $comment, 'comment');
+	}
 
 	if ( $update_meta_cache ) {
 		// Avoid `wp_list_pluck()` in case `$comments` is passed by reference.
@@ -2647,8 +2725,9 @@ 
  * @return array
  */
 function _close_comments_for_old_posts( $posts, $query ) {
-	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )
-		return $posts;
+	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) ) {
+			return $posts;
+	}
 
 	/**
 	 * Filter the list of post types to automatically close comments for.
@@ -2658,12 +2737,14 @@ 
 	 * @param array $post_types An array of registered post types. Default array with 'post'.
 	 */
 	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $posts[0]->post_type, $post_types ) )
-		return $posts;
+	if ( ! in_array( $posts[0]->post_type, $post_types ) ) {
+			return $posts;
+	}
 
 	$days_old = (int) get_option( 'close_comments_days_old' );
-	if ( ! $days_old )
-		return $posts;
+	if ( ! $days_old ) {
+			return $posts;
+	}
 
 	if ( time() - strtotime( $posts[0]->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
 		$posts[0]->comment_status = 'closed';
@@ -2684,30 +2765,35 @@ 
  * @return bool $open
  */
 function _close_comments_for_old_post( $open, $post_id ) {
-	if ( ! $open )
-		return $open;
+	if ( ! $open ) {
+			return $open;
+	}
 
-	if ( !get_option('close_comments_for_old_posts') )
-		return $open;
+	if ( !get_option('close_comments_for_old_posts') ) {
+			return $open;
+	}
 
 	$days_old = (int) get_option('close_comments_days_old');
-	if ( !$days_old )
-		return $open;
+	if ( !$days_old ) {
+			return $open;
+	}
 
 	$post = get_post($post_id);
 
 	/** This filter is documented in wp-includes/comment.php */
 	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $post->post_type, $post_types ) )
-		return $open;
+	if ( ! in_array( $post->post_type, $post_types ) ) {
+			return $open;
+	}
 
 	// Undated drafts should not show up as comments closed.
 	if ( '0000-00-00 00:00:00' === $post->post_date_gmt ) {
 		return $open;
 	}
 
-	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) )
-		return false;
+	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
+			return false;
+	}
 
 	return $open;
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -274,7 +274,7 @@
 	 *
 	 * @param WP_Customize_Partial $partial Partial.
 	 * @param array                $context Context.
-	 * @return string|array|false
+	 * @return boolean
 	 */
 	public function render_callback( WP_Customize_Partial $partial, $context = array() ) {
 		unset( $partial, $context );

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Customize API: WP_Customize_Partial class
- *
- * @package WordPress
- * @subpackage Customize
- * @since 4.5.0
- */
+	 * Customize API: WP_Customize_Partial class
+	 *
+	 * @package WordPress
+	 * @subpackage Customize
+	 * @since 4.5.0
+	 */
 
 /**
  * Core Customizer class for implementing selective refresh partials.

Spacing +28 added lines, -28 removed lines

@@ -151,32 +151,32 @@ 
 	 *     @type array|string $settings All settings IDs tied to the partial. If undefined, `$id` will be used.
 	 * }
 	 */
-	public function __construct( WP_Customize_Selective_Refresh $component, $id, $args = array() ) {
-		$keys = array_keys( get_object_vars( $this ) );
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+	public function __construct(WP_Customize_Selective_Refresh $component, $id, $args = array()) {
+		$keys = array_keys(get_object_vars($this));
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
 		$this->component       = $component;
 		$this->id              = $id;
-		$this->id_data['keys'] = preg_split( '/\[/', str_replace( ']', '', $this->id ) );
-		$this->id_data['base'] = array_shift( $this->id_data['keys'] );
+		$this->id_data['keys'] = preg_split('/\[/', str_replace(']', '', $this->id));
+		$this->id_data['base'] = array_shift($this->id_data['keys']);
 
-		if ( empty( $this->render_callback ) ) {
-			$this->render_callback = array( $this, 'render_callback' );
+		if (empty($this->render_callback)) {
+			$this->render_callback = array($this, 'render_callback');
 		}
 
 		// Process settings.
-		if ( ! isset( $this->settings ) ) {
-			$this->settings = array( $id );
-		} else if ( is_string( $this->settings ) ) {
-			$this->settings = array( $this->settings );
+		if ( ! isset($this->settings)) {
+			$this->settings = array($id);
+		} else if (is_string($this->settings)) {
+			$this->settings = array($this->settings);
 		}
 
-		if ( empty( $this->primary_setting ) ) {
-			$this->primary_setting = current( $this->settings );
+		if (empty($this->primary_setting)) {
+			$this->primary_setting = current($this->settings);
 		}
 	}
 
@@ -208,17 +208,17 @@ 
 	 * @return string|array|false The rendered partial as a string, raw data array (for client-side JS template),
 	 *                            or false if no render applied.
 	 */
-	final public function render( $container_context = array() ) {
+	final public function render($container_context = array()) {
 		$partial  = $this;
 		$rendered = false;
 
-		if ( ! empty( $this->render_callback ) ) {
+		if ( ! empty($this->render_callback)) {
 			ob_start();
-			$return_render = call_user_func( $this->render_callback, $this, $container_context );
+			$return_render = call_user_func($this->render_callback, $this, $container_context);
 			$ob_render = ob_get_clean();
 
-			if ( null !== $return_render && '' !== $ob_render ) {
-				_doing_it_wrong( __FUNCTION__, __( 'Partial render must echo the content or return the content string (or array), but not both.' ), '4.5.0' );
+			if (null !== $return_render && '' !== $ob_render) {
+				_doing_it_wrong(__FUNCTION__, __('Partial render must echo the content or return the content string (or array), but not both.'), '4.5.0');
 			}
 
 			/*
@@ -238,7 +238,7 @@ 
 		 * @param array                $container_context Optional array of context data associated with
 		 *                                                the target container.
 		 */
-		$rendered = apply_filters( 'customize_partial_render', $rendered, $partial, $container_context );
+		$rendered = apply_filters('customize_partial_render', $rendered, $partial, $container_context);
 
 		/**
 		 * Filters partial rendering for a specific partial.
@@ -252,7 +252,7 @@ 
 		 * @param array                $container_context Optional array of context data associated with
 		 *                                                the target container.
 		 */
-		$rendered = apply_filters( "customize_partial_render_{$partial->id}", $rendered, $partial, $container_context );
+		$rendered = apply_filters("customize_partial_render_{$partial->id}", $rendered, $partial, $container_context);
 
 		return $rendered;
 	}
@@ -276,8 +276,8 @@ 
 	 * @param array                $context Context.
 	 * @return string|array|false
 	 */
-	public function render_callback( WP_Customize_Partial $partial, $context = array() ) {
-		unset( $partial, $context );
+	public function render_callback(WP_Customize_Partial $partial, $context = array()) {
+		unset($partial, $context);
 		return false;
 	}
 
@@ -314,12 +314,12 @@ 
 	 *                    or if one of the associated settings does not exist.
 	 */
 	final public function check_capabilities() {
-		if ( ! empty( $this->capability ) && ! current_user_can( $this->capability ) ) {
+		if ( ! empty($this->capability) && ! current_user_can($this->capability)) {
 			return false;
 		}
-		foreach ( $this->settings as $setting_id ) {
-			$setting = $this->component->manager->get_setting( $setting_id );
-			if ( ! $setting || ! $setting->check_capabilities() ) {
+		foreach ($this->settings as $setting_id) {
+			$setting = $this->component->manager->get_setting($setting_id);
+			if ( ! $setting || ! $setting->check_capabilities()) {
 				return false;
 			}
 		}