ntwb / wordpress

src/wp-includes/customize/class-wp-customize-media-control.php

Spacing +24 added lines, -24 removed lines

@@ -52,19 +52,19 @@ 
 	 * @param string               $id      Control ID.
 	 * @param array                $args    Optional. Arguments to override class property defaults.
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		parent::__construct( $manager, $id, $args );
+	public function __construct($manager, $id, $args = array()) {
+		parent::__construct($manager, $id, $args);
 
-		if ( ! ( $this instanceof WP_Customize_Image_Control ) ) {
-			$this->button_labels = wp_parse_args( $this->button_labels, array(
-				'select'       => __( 'Select File' ),
-				'change'       => __( 'Change File' ),
-				'default'      => __( 'Default' ),
-				'remove'       => __( 'Remove' ),
-				'placeholder'  => __( 'No file selected' ),
-				'frame_title'  => __( 'Select File' ),
-				'frame_button' => __( 'Choose File' ),
-			) );
+		if ( ! ($this instanceof WP_Customize_Image_Control)) {
+			$this->button_labels = wp_parse_args($this->button_labels, array(
+				'select'       => __('Select File'),
+				'change'       => __('Change File'),
+				'default'      => __('Default'),
+				'remove'       => __('Remove'),
+				'placeholder'  => __('No file selected'),
+				'frame_title'  => __('Select File'),
+				'frame_button' => __('Choose File'),
+			));
 		}
 	}
 
@@ -88,40 +88,40 @@ 
 	 */
 	public function to_json() {
 		parent::to_json();
-		$this->json['label'] = html_entity_decode( $this->label, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$this->json['label'] = html_entity_decode($this->label, ENT_QUOTES, get_bloginfo('charset'));
 		$this->json['mime_type'] = $this->mime_type;
 		$this->json['button_labels'] = $this->button_labels;
-		$this->json['canUpload'] = current_user_can( 'upload_files' );
+		$this->json['canUpload'] = current_user_can('upload_files');
 
 		$value = $this->value();
 
-		if ( is_object( $this->setting ) ) {
-			if ( $this->setting->default ) {
+		if (is_object($this->setting)) {
+			if ($this->setting->default) {
 				// Fake an attachment model - needs all fields used by template.
 				// Note that the default value must be a URL, NOT an attachment ID.
-				$type = in_array( substr( $this->setting->default, -3 ), array( 'jpg', 'png', 'gif', 'bmp' ) ) ? 'image' : 'document';
+				$type = in_array(substr($this->setting->default, -3), array('jpg', 'png', 'gif', 'bmp')) ? 'image' : 'document';
 				$default_attachment = array(
 					'id' => 1,
 					'url' => $this->setting->default,
 					'type' => $type,
-					'icon' => wp_mime_type_icon( $type ),
-					'title' => basename( $this->setting->default ),
+					'icon' => wp_mime_type_icon($type),
+					'title' => basename($this->setting->default),
 				);
 
-				if ( 'image' === $type ) {
+				if ('image' === $type) {
 					$default_attachment['sizes'] = array(
-						'full' => array( 'url' => $this->setting->default ),
+						'full' => array('url' => $this->setting->default),
 					);
 				}
 
 				$this->json['defaultAttachment'] = $default_attachment;
 			}
 
-			if ( $value && $this->setting->default && $value === $this->setting->default ) {
+			if ($value && $this->setting->default && $value === $this->setting->default) {
 				// Set the default as the attachment.
 				$this->json['attachment'] = $this->json['defaultAttachment'];
-			} elseif ( $value ) {
-				$this->json['attachment'] = wp_prepare_attachment_for_js( $value );
+			} elseif ($value) {
+				$this->json['attachment'] = wp_prepare_attachment_for_js($value);
 			}
 		}
 	}

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

Braces +12 added lines, -8 removed lines

@@ -136,8 +136,9 @@ 
 	 * }
 	 */
 	public function __construct( $meta_query = false ) {
-		if ( !$meta_query )
-			return;
+		if ( !$meta_query ) {
+					return;
+		}
 
 		if ( isset( $meta_query['relation'] ) && strtoupper( $meta_query['relation'] ) == 'OR' ) {
 			$this->relation = 'OR';
@@ -290,16 +291,19 @@ 
 	 * @return string MySQL type.
 	 */
 	public function get_cast_for_type( $type = '' ) {
-		if ( empty( $type ) )
-			return 'CHAR';
+		if ( empty( $type ) ) {
+					return 'CHAR';
+		}
 
 		$meta_type = strtoupper( $type );
 
-		if ( ! preg_match( '/^(?:BINARY|CHAR|DATE|DATETIME|SIGNED|UNSIGNED|TIME|NUMERIC(?:\(\d+(?:,\s?\d+)?\))?|DECIMAL(?:\(\d+(?:,\s?\d+)?\))?)$/', $meta_type ) )
-			return 'CHAR';
+		if ( ! preg_match( '/^(?:BINARY|CHAR|DATE|DATETIME|SIGNED|UNSIGNED|TIME|NUMERIC(?:\(\d+(?:,\s?\d+)?\))?|DECIMAL(?:\(\d+(?:,\s?\d+)?\))?)$/', $meta_type ) ) {
+					return 'CHAR';
+		}
 
-		if ( 'NUMERIC' == $meta_type )
-			$meta_type = 'SIGNED';
+		if ( 'NUMERIC' == $meta_type ) {
+					$meta_type = 'SIGNED';
+		}
 
 		return $meta_type;
 	}

Spacing +117 added lines, -117 removed lines

@@ -136,17 +136,17 @@ 
 	 *     }
 	 * }
 	 */
-	public function __construct( $meta_query = false ) {
-		if ( !$meta_query )
+	public function __construct($meta_query = false) {
+		if ( ! $meta_query)
 			return;
 
-		if ( isset( $meta_query['relation'] ) && strtoupper( $meta_query['relation'] ) == 'OR' ) {
+		if (isset($meta_query['relation']) && strtoupper($meta_query['relation']) == 'OR') {
 			$this->relation = 'OR';
 		} else {
 			$this->relation = 'AND';
 		}
 
-		$this->queries = $this->sanitize_query( $meta_query );
+		$this->queries = $this->sanitize_query($meta_query);
 	}
 
 	/**
@@ -160,44 +160,44 @@ 
 	 * @param array $queries Array of query clauses.
 	 * @return array Sanitized array of query clauses.
 	 */
-	public function sanitize_query( $queries ) {
+	public function sanitize_query($queries) {
 		$clean_queries = array();
 
-		if ( ! is_array( $queries ) ) {
+		if ( ! is_array($queries)) {
 			return $clean_queries;
 		}
 
-		foreach ( $queries as $key => $query ) {
-			if ( 'relation' === $key ) {
+		foreach ($queries as $key => $query) {
+			if ('relation' === $key) {
 				$relation = $query;
 
-			} elseif ( ! is_array( $query ) ) {
+			} elseif ( ! is_array($query)) {
 				continue;
 
 			// First-order clause.
-			} elseif ( $this->is_first_order_clause( $query ) ) {
-				if ( isset( $query['value'] ) && array() === $query['value'] ) {
-					unset( $query['value'] );
+			} elseif ($this->is_first_order_clause($query)) {
+				if (isset($query['value']) && array() === $query['value']) {
+					unset($query['value']);
 				}
 
-				$clean_queries[ $key ] = $query;
+				$clean_queries[$key] = $query;
 
 			// Otherwise, it's a nested query, so we recurse.
 			} else {
-				$cleaned_query = $this->sanitize_query( $query );
+				$cleaned_query = $this->sanitize_query($query);
 
-				if ( ! empty( $cleaned_query ) ) {
-					$clean_queries[ $key ] = $cleaned_query;
+				if ( ! empty($cleaned_query)) {
+					$clean_queries[$key] = $cleaned_query;
 				}
 			}
 		}
 
-		if ( empty( $clean_queries ) ) {
+		if (empty($clean_queries)) {
 			return $clean_queries;
 		}
 
 		// Sanitize the 'relation' key provided in the query.
-		if ( isset( $relation ) && 'OR' === strtoupper( $relation ) ) {
+		if (isset($relation) && 'OR' === strtoupper($relation)) {
 			$clean_queries['relation'] = 'OR';
 			$this->has_or_relation = true;
 
@@ -206,7 +206,7 @@ 
 		 * This value will not actually be used to join clauses, but it
 		 * simplifies the logic around combining key-only queries.
 		 */
-		} elseif ( 1 === count( $clean_queries ) ) {
+		} elseif (1 === count($clean_queries)) {
 			$clean_queries['relation'] = 'OR';
 
 		// Default to AND.
@@ -229,8 +229,8 @@ 
 	 * @param array $query Meta query arguments.
 	 * @return bool Whether the query clause is a first-order clause.
 	 */
-	protected function is_first_order_clause( $query ) {
-		return isset( $query['key'] ) || isset( $query['value'] );
+	protected function is_first_order_clause($query) {
+		return isset($query['key']) || isset($query['value']);
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 	 *
 	 * @param array $qv The query variables
 	 */
-	public function parse_query_vars( $qv ) {
+	public function parse_query_vars($qv) {
 		$meta_query = array();
 
 		/*
@@ -251,34 +251,34 @@ 
 		 * the rest of the meta_query).
 		 */
 		$primary_meta_query = array();
-		foreach ( array( 'key', 'compare', 'type' ) as $key ) {
-			if ( ! empty( $qv[ "meta_$key" ] ) ) {
-				$primary_meta_query[ $key ] = $qv[ "meta_$key" ];
+		foreach (array('key', 'compare', 'type') as $key) {
+			if ( ! empty($qv["meta_$key"])) {
+				$primary_meta_query[$key] = $qv["meta_$key"];
 			}
 		}
 
 		// WP_Query sets 'meta_value' = '' by default.
-		if ( isset( $qv['meta_value'] ) && '' !== $qv['meta_value'] && ( ! is_array( $qv['meta_value'] ) || $qv['meta_value'] ) ) {
+		if (isset($qv['meta_value']) && '' !== $qv['meta_value'] && ( ! is_array($qv['meta_value']) || $qv['meta_value'])) {
 			$primary_meta_query['value'] = $qv['meta_value'];
 		}
 
-		$existing_meta_query = isset( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ? $qv['meta_query'] : array();
+		$existing_meta_query = isset($qv['meta_query']) && is_array($qv['meta_query']) ? $qv['meta_query'] : array();
 
-		if ( ! empty( $primary_meta_query ) && ! empty( $existing_meta_query ) ) {
+		if ( ! empty($primary_meta_query) && ! empty($existing_meta_query)) {
 			$meta_query = array(
 				'relation' => 'AND',
 				$primary_meta_query,
 				$existing_meta_query,
 			);
-		} elseif ( ! empty( $primary_meta_query ) ) {
+		} elseif ( ! empty($primary_meta_query)) {
 			$meta_query = array(
 				$primary_meta_query,
 			);
-		} elseif ( ! empty( $existing_meta_query ) ) {
+		} elseif ( ! empty($existing_meta_query)) {
 			$meta_query = $existing_meta_query;
 		}
 
-		$this->__construct( $meta_query );
+		$this->__construct($meta_query);
 	}
 
 	/**
@@ -290,16 +290,16 @@ 
 	 * @param string $type MySQL type to cast meta_value.
 	 * @return string MySQL type.
 	 */
-	public function get_cast_for_type( $type = '' ) {
-		if ( empty( $type ) )
+	public function get_cast_for_type($type = '') {
+		if (empty($type))
 			return 'CHAR';
 
-		$meta_type = strtoupper( $type );
+		$meta_type = strtoupper($type);
 
-		if ( ! preg_match( '/^(?:BINARY|CHAR|DATE|DATETIME|SIGNED|UNSIGNED|TIME|NUMERIC(?:\(\d+(?:,\s?\d+)?\))?|DECIMAL(?:\(\d+(?:,\s?\d+)?\))?)$/', $meta_type ) )
+		if ( ! preg_match('/^(?:BINARY|CHAR|DATE|DATETIME|SIGNED|UNSIGNED|TIME|NUMERIC(?:\(\d+(?:,\s?\d+)?\))?|DECIMAL(?:\(\d+(?:,\s?\d+)?\))?)$/', $meta_type))
 			return 'CHAR';
 
-		if ( 'NUMERIC' == $meta_type )
+		if ('NUMERIC' == $meta_type)
 			$meta_type = 'SIGNED';
 
 		return $meta_type;
@@ -322,15 +322,15 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	public function get_sql( $type, $primary_table, $primary_id_column, $context = null ) {
-		if ( ! $meta_table = _get_meta_table( $type ) ) {
+	public function get_sql($type, $primary_table, $primary_id_column, $context = null) {
+		if ( ! $meta_table = _get_meta_table($type)) {
 			return false;
 		}
 
 		$this->table_aliases = array();
 
 		$this->meta_table     = $meta_table;
-		$this->meta_id_column = sanitize_key( $type . '_id' );
+		$this->meta_id_column = sanitize_key($type.'_id');
 
 		$this->primary_table     = $primary_table;
 		$this->primary_id_column = $primary_id_column;
@@ -341,8 +341,8 @@ 
 		 * If any JOINs are LEFT JOINs (as in the case of NOT EXISTS), then all JOINs should
 		 * be LEFT. Otherwise posts with no metadata will be excluded from results.
 		 */
-		if ( false !== strpos( $sql['join'], 'LEFT JOIN' ) ) {
-			$sql['join'] = str_replace( 'INNER JOIN', 'LEFT JOIN', $sql['join'] );
+		if (false !== strpos($sql['join'], 'LEFT JOIN')) {
+			$sql['join'] = str_replace('INNER JOIN', 'LEFT JOIN', $sql['join']);
 		}
 
 		/**
@@ -357,7 +357,7 @@ 
 		 * @param string $primary_id_column Primary column ID.
 		 * @param object $context           The main query object.
 		 */
-		return apply_filters_ref_array( 'get_meta_sql', array( $sql, $this->queries, $type, $primary_table, $primary_id_column, $context ) );
+		return apply_filters_ref_array('get_meta_sql', array($sql, $this->queries, $type, $primary_table, $primary_id_column, $context));
 	}
 
 	/**
@@ -382,10 +382,10 @@ 
 		 * To keep $this->queries unaltered, pass a copy.
 		 */
 		$queries = $this->queries;
-		$sql = $this->get_sql_for_query( $queries );
+		$sql = $this->get_sql_for_query($queries);
 
-		if ( ! empty( $sql['where'] ) ) {
-			$sql['where'] = ' AND ' . $sql['where'];
+		if ( ! empty($sql['where'])) {
+			$sql['where'] = ' AND '.$sql['where'];
 		}
 
 		return $sql;
@@ -410,7 +410,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_query( &$query, $depth = 0 ) {
+	protected function get_sql_for_query(&$query, $depth = 0) {
 		$sql_chunks = array(
 			'join'  => array(),
 			'where' => array(),
@@ -422,32 +422,32 @@ 
 		);
 
 		$indent = '';
-		for ( $i = 0; $i < $depth; $i++ ) {
+		for ($i = 0; $i < $depth; $i++) {
 			$indent .= "  ";
 		}
 
-		foreach ( $query as $key => &$clause ) {
-			if ( 'relation' === $key ) {
+		foreach ($query as $key => &$clause) {
+			if ('relation' === $key) {
 				$relation = $query['relation'];
-			} elseif ( is_array( $clause ) ) {
+			} elseif (is_array($clause)) {
 
 				// This is a first-order clause.
-				if ( $this->is_first_order_clause( $clause ) ) {
-					$clause_sql = $this->get_sql_for_clause( $clause, $query, $key );
+				if ($this->is_first_order_clause($clause)) {
+					$clause_sql = $this->get_sql_for_clause($clause, $query, $key);
 
-					$where_count = count( $clause_sql['where'] );
-					if ( ! $where_count ) {
+					$where_count = count($clause_sql['where']);
+					if ( ! $where_count) {
 						$sql_chunks['where'][] = '';
-					} elseif ( 1 === $where_count ) {
+					} elseif (1 === $where_count) {
 						$sql_chunks['where'][] = $clause_sql['where'][0];
 					} else {
-						$sql_chunks['where'][] = '( ' . implode( ' AND ', $clause_sql['where'] ) . ' )';
+						$sql_chunks['where'][] = '( '.implode(' AND ', $clause_sql['where']).' )';
 					}
 
-					$sql_chunks['join'] = array_merge( $sql_chunks['join'], $clause_sql['join'] );
+					$sql_chunks['join'] = array_merge($sql_chunks['join'], $clause_sql['join']);
 				// This is a subquery, so we recurse.
 				} else {
-					$clause_sql = $this->get_sql_for_query( $clause, $depth + 1 );
+					$clause_sql = $this->get_sql_for_query($clause, $depth + 1);
 
 					$sql_chunks['where'][] = $clause_sql['where'];
 					$sql_chunks['join'][]  = $clause_sql['join'];
@@ -456,21 +456,21 @@ 
 		}
 
 		// Filter to remove empties.
-		$sql_chunks['join']  = array_filter( $sql_chunks['join'] );
-		$sql_chunks['where'] = array_filter( $sql_chunks['where'] );
+		$sql_chunks['join']  = array_filter($sql_chunks['join']);
+		$sql_chunks['where'] = array_filter($sql_chunks['where']);
 
-		if ( empty( $relation ) ) {
+		if (empty($relation)) {
 			$relation = 'AND';
 		}
 
 		// Filter duplicate JOIN clauses and combine into a single string.
-		if ( ! empty( $sql_chunks['join'] ) ) {
-			$sql['join'] = implode( ' ', array_unique( $sql_chunks['join'] ) );
+		if ( ! empty($sql_chunks['join'])) {
+			$sql['join'] = implode(' ', array_unique($sql_chunks['join']));
 		}
 
 		// Generate a single WHERE clause with proper brackets and indentation.
-		if ( ! empty( $sql_chunks['where'] ) ) {
-			$sql['where'] = '( ' . "\n  " . $indent . implode( ' ' . "\n  " . $indent . $relation . ' ' . "\n  " . $indent, $sql_chunks['where'] ) . "\n" . $indent . ')';
+		if ( ! empty($sql_chunks['where'])) {
+			$sql['where'] = '( '."\n  ".$indent.implode(' '."\n  ".$indent.$relation.' '."\n  ".$indent, $sql_chunks['where'])."\n".$indent.')';
 		}
 
 		return $sql;
@@ -497,7 +497,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	public function get_sql_for_clause( &$clause, $parent_query, $clause_key = '' ) {
+	public function get_sql_for_clause(&$clause, $parent_query, $clause_key = '') {
 		global $wpdb;
 
 		$sql_chunks = array(
@@ -505,20 +505,20 @@ 
 			'join' => array(),
 		);
 
-		if ( isset( $clause['compare'] ) ) {
-			$clause['compare'] = strtoupper( $clause['compare'] );
+		if (isset($clause['compare'])) {
+			$clause['compare'] = strtoupper($clause['compare']);
 		} else {
-			$clause['compare'] = isset( $clause['value'] ) && is_array( $clause['value'] ) ? 'IN' : '=';
+			$clause['compare'] = isset($clause['value']) && is_array($clause['value']) ? 'IN' : '=';
 		}
 
-		if ( ! in_array( $clause['compare'], array(
+		if ( ! in_array($clause['compare'], array(
 			'=', '!=', '>', '>=', '<', '<=',
 			'LIKE', 'NOT LIKE',
 			'IN', 'NOT IN',
 			'BETWEEN', 'NOT BETWEEN',
 			'EXISTS', 'NOT EXISTS',
 			'REGEXP', 'NOT REGEXP', 'RLIKE'
-		) ) ) {
+		))) {
 			$clause['compare'] = '=';
 		}
 
@@ -528,16 +528,16 @@ 
 		$join = '';
 
 		// We prefer to avoid joins if possible. Look for an existing join compatible with this clause.
-		$alias = $this->find_compatible_table_alias( $clause, $parent_query );
-		if ( false === $alias ) {
-			$i = count( $this->table_aliases );
-			$alias = $i ? 'mt' . $i : $this->meta_table;
+		$alias = $this->find_compatible_table_alias($clause, $parent_query);
+		if (false === $alias) {
+			$i = count($this->table_aliases);
+			$alias = $i ? 'mt'.$i : $this->meta_table;
 
 			// JOIN clauses for NOT EXISTS have their own syntax.
-			if ( 'NOT EXISTS' === $meta_compare ) {
+			if ('NOT EXISTS' === $meta_compare) {
 				$join .= " LEFT JOIN $this->meta_table";
 				$join .= $i ? " AS $alias" : '';
-				$join .= $wpdb->prepare( " ON ($this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column AND $alias.meta_key = %s )", $clause['key'] );
+				$join .= $wpdb->prepare(" ON ($this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column AND $alias.meta_key = %s )", $clause['key']);
 
 			// All other JOIN clauses.
 			} else {
@@ -554,72 +554,72 @@ 
 		$clause['alias'] = $alias;
 
 		// Determine the data type.
-		$_meta_type = isset( $clause['type'] ) ? $clause['type'] : '';
-		$meta_type  = $this->get_cast_for_type( $_meta_type );
+		$_meta_type = isset($clause['type']) ? $clause['type'] : '';
+		$meta_type  = $this->get_cast_for_type($_meta_type);
 		$clause['cast'] = $meta_type;
 
 		// Fallback for clause keys is the table alias. Key must be a string.
-		if ( is_int( $clause_key ) || ! $clause_key ) {
+		if (is_int($clause_key) || ! $clause_key) {
 			$clause_key = $clause['alias'];
 		}
 
 		// Ensure unique clause keys, so none are overwritten.
 		$iterator = 1;
 		$clause_key_base = $clause_key;
-		while ( isset( $this->clauses[ $clause_key ] ) ) {
-			$clause_key = $clause_key_base . '-' . $iterator;
+		while (isset($this->clauses[$clause_key])) {
+			$clause_key = $clause_key_base.'-'.$iterator;
 			$iterator++;
 		}
 
 		// Store the clause in our flat array.
-		$this->clauses[ $clause_key ] =& $clause;
+		$this->clauses[$clause_key] = & $clause;
 
 		// Next, build the WHERE clause.
 
 		// meta_key.
-		if ( array_key_exists( 'key', $clause ) ) {
-			if ( 'NOT EXISTS' === $meta_compare ) {
-				$sql_chunks['where'][] = $alias . '.' . $this->meta_id_column . ' IS NULL';
+		if (array_key_exists('key', $clause)) {
+			if ('NOT EXISTS' === $meta_compare) {
+				$sql_chunks['where'][] = $alias.'.'.$this->meta_id_column.' IS NULL';
 			} else {
-				$sql_chunks['where'][] = $wpdb->prepare( "$alias.meta_key = %s", trim( $clause['key'] ) );
+				$sql_chunks['where'][] = $wpdb->prepare("$alias.meta_key = %s", trim($clause['key']));
 			}
 		}
 
 		// meta_value.
-		if ( array_key_exists( 'value', $clause ) ) {
+		if (array_key_exists('value', $clause)) {
 			$meta_value = $clause['value'];
 
-			if ( in_array( $meta_compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
-				if ( ! is_array( $meta_value ) ) {
-					$meta_value = preg_split( '/[,\s]+/', $meta_value );
+			if (in_array($meta_compare, array('IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'))) {
+				if ( ! is_array($meta_value)) {
+					$meta_value = preg_split('/[,\s]+/', $meta_value);
 				}
 			} else {
-				$meta_value = trim( $meta_value );
+				$meta_value = trim($meta_value);
 			}
 
-			switch ( $meta_compare ) {
+			switch ($meta_compare) {
 				case 'IN' :
 				case 'NOT IN' :
-					$meta_compare_string = '(' . substr( str_repeat( ',%s', count( $meta_value ) ), 1 ) . ')';
-					$where = $wpdb->prepare( $meta_compare_string, $meta_value );
+					$meta_compare_string = '('.substr(str_repeat(',%s', count($meta_value)), 1).')';
+					$where = $wpdb->prepare($meta_compare_string, $meta_value);
 					break;
 
 				case 'BETWEEN' :
 				case 'NOT BETWEEN' :
-					$meta_value = array_slice( $meta_value, 0, 2 );
-					$where = $wpdb->prepare( '%s AND %s', $meta_value );
+					$meta_value = array_slice($meta_value, 0, 2);
+					$where = $wpdb->prepare('%s AND %s', $meta_value);
 					break;
 
 				case 'LIKE' :
 				case 'NOT LIKE' :
-					$meta_value = '%' . $wpdb->esc_like( $meta_value ) . '%';
-					$where = $wpdb->prepare( '%s', $meta_value );
+					$meta_value = '%'.$wpdb->esc_like($meta_value).'%';
+					$where = $wpdb->prepare('%s', $meta_value);
 					break;
 
 				// EXISTS with a value is interpreted as '='.
 				case 'EXISTS' :
 					$meta_compare = '=';
-					$where = $wpdb->prepare( '%s', $meta_value );
+					$where = $wpdb->prepare('%s', $meta_value);
 					break;
 
 				// 'value' is ignored for NOT EXISTS.
@@ -628,13 +628,13 @@ 
 					break;
 
 				default :
-					$where = $wpdb->prepare( '%s', $meta_value );
+					$where = $wpdb->prepare('%s', $meta_value);
 					break;
 
 			}
 
-			if ( $where ) {
-				if ( 'CHAR' === $meta_type ) {
+			if ($where) {
+				if ('CHAR' === $meta_type) {
 					$sql_chunks['where'][] = "$alias.meta_value {$meta_compare} {$where}";
 				} else {
 					$sql_chunks['where'][] = "CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$where}";
@@ -646,8 +646,8 @@ 
 		 * Multiple WHERE clauses (for meta_key and meta_value) should
 		 * be joined in parentheses.
 		 */
-		if ( 1 < count( $sql_chunks['where'] ) ) {
-			$sql_chunks['where'] = array( '( ' . implode( ' AND ', $sql_chunks['where'] ) . ' )' );
+		if (1 < count($sql_chunks['where'])) {
+			$sql_chunks['where'] = array('( '.implode(' AND ', $sql_chunks['where']).' )');
 		}
 
 		return $sql_chunks;
@@ -689,34 +689,34 @@ 
 	 * @param  array       $parent_query Parent query of $clause.
 	 * @return string|bool Table alias if found, otherwise false.
 	 */
-	protected function find_compatible_table_alias( $clause, $parent_query ) {
+	protected function find_compatible_table_alias($clause, $parent_query) {
 		$alias = false;
 
-		foreach ( $parent_query as $sibling ) {
+		foreach ($parent_query as $sibling) {
 			// If the sibling has no alias yet, there's nothing to check.
-			if ( empty( $sibling['alias'] ) ) {
+			if (empty($sibling['alias'])) {
 				continue;
 			}
 
 			// We're only interested in siblings that are first-order clauses.
-			if ( ! is_array( $sibling ) || ! $this->is_first_order_clause( $sibling ) ) {
+			if ( ! is_array($sibling) || ! $this->is_first_order_clause($sibling)) {
 				continue;
 			}
 
 			$compatible_compares = array();
 
 			// Clauses connected by OR can share joins as long as they have "positive" operators.
-			if ( 'OR' === $parent_query['relation'] ) {
-				$compatible_compares = array( '=', 'IN', 'BETWEEN', 'LIKE', 'REGEXP', 'RLIKE', '>', '>=', '<', '<=' );
+			if ('OR' === $parent_query['relation']) {
+				$compatible_compares = array('=', 'IN', 'BETWEEN', 'LIKE', 'REGEXP', 'RLIKE', '>', '>=', '<', '<=');
 
 			// Clauses joined by AND with "negative" operators share a join only if they also share a key.
-			} elseif ( isset( $sibling['key'] ) && isset( $clause['key'] ) && $sibling['key'] === $clause['key'] ) {
-				$compatible_compares = array( '!=', 'NOT IN', 'NOT LIKE' );
+			} elseif (isset($sibling['key']) && isset($clause['key']) && $sibling['key'] === $clause['key']) {
+				$compatible_compares = array('!=', 'NOT IN', 'NOT LIKE');
 			}
 
-			$clause_compare  = strtoupper( $clause['compare'] );
-			$sibling_compare = strtoupper( $sibling['compare'] );
-			if ( in_array( $clause_compare, $compatible_compares ) && in_array( $sibling_compare, $compatible_compares ) ) {
+			$clause_compare  = strtoupper($clause['compare']);
+			$sibling_compare = strtoupper($sibling['compare']);
+			if (in_array($clause_compare, $compatible_compares) && in_array($sibling_compare, $compatible_compares)) {
 				$alias = $sibling['alias'];
 				break;
 			}
@@ -732,7 +732,7 @@ 
 		 * @param array       $parent_query Parent of $clause.
 		 * @param object      $this         WP_Meta_Query object.
 		 */
-		return apply_filters( 'meta_query_find_compatible_table_alias', $alias, $clause, $parent_query, $this ) ;
+		return apply_filters('meta_query_find_compatible_table_alias', $alias, $clause, $parent_query, $this);
 	}
 
 	/**

src/wp-includes/theme-compat/footer-embed.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  *
  * @since 4.4.0
  */
-do_action( 'embed_footer' );
+do_action('embed_footer');
 ?>
 </body>
 </html>

src/wp-includes/theme-compat/comments.php

Braces +8 added lines, -4 removed lines

@@ -17,8 +17,9 @@ 
 );
 
 // Do not delete these lines
-	if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
-		die ('Please do not load this page directly. Thanks!');
+	if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME'])) {
+			die ('Please do not load this page directly. Thanks!');
+	}
 
 	if ( post_password_required() ) { ?>
 		<p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p>
@@ -56,14 +57,17 @@ 
 		<div class="alignleft"><?php previous_comments_link() ?></div>
 		<div class="alignright"><?php next_comments_link() ?></div>
 	</div>
- <?php else : // this is displayed if there are no comments so far ?>
+ <?php else {
+	: // this is displayed if there are no comments so far ?>
 
 	<?php if ( comments_open() ) : ?>
 		<!-- If comments are open, but there are no comments. -->
 
 	 <?php else : // comments are closed ?>
 		<!-- If comments are closed. -->
-		<p class="nocomments"><?php _e('Comments are closed.'); ?></p>
+		<p class="nocomments"><?php _e('Comments are closed.');
+}
+?></p>
 
 	<?php endif; ?>
 <?php endif; ?>

Spacing +11 added lines, -11 removed lines

@@ -9,18 +9,18 @@ 
  */
 _deprecated_file(
 	/* translators: %s: template name */
-	sprintf( __( 'Theme without %s' ), basename( __FILE__ ) ),
+	sprintf(__('Theme without %s'), basename(__FILE__)),
 	'3.0.0',
 	null,
 	/* translators: %s: template name */
-	sprintf( __( 'Please include a %s template in your theme.' ), basename( __FILE__ ) )
+	sprintf(__('Please include a %s template in your theme.'), basename(__FILE__))
 );
 
 // Do not delete these lines
-	if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
+	if ( ! empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
 		die ('Please do not load this page directly. Thanks!');
 
-	if ( post_password_required() ) { ?>
+	if (post_password_required()) { ?>
 		<p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p>
 	<?php
 		return;
@@ -29,16 +29,16 @@ 
 
 <!-- You can start editing here. -->
 
-<?php if ( have_comments() ) : ?>
+<?php if (have_comments()) : ?>
 	<h3 id="comments">
 		<?php
-			if ( 1 == get_comments_number() ) {
+			if (1 == get_comments_number()) {
 				/* translators: %s: post title */
-				printf( __( 'One response to %s' ),  '&#8220;' . get_the_title() . '&#8221;' );
+				printf(__('One response to %s'), '&#8220;'.get_the_title().'&#8221;');
 			} else {
 				/* translators: 1: number of comments, 2: post title */
-				printf( _n( '%1$s response to %2$s', '%1$s responses to %2$s', get_comments_number() ),
-					number_format_i18n( get_comments_number() ),  '&#8220;' . get_the_title() . '&#8221;' );
+				printf(_n('%1$s response to %2$s', '%1$s responses to %2$s', get_comments_number()),
+					number_format_i18n(get_comments_number()), '&#8220;'.get_the_title().'&#8221;');
 			}
 		?>
 	</h3>
@@ -49,7 +49,7 @@ 
 	</div>
 
 	<ol class="commentlist">
-	<?php wp_list_comments();?>
+	<?php wp_list_comments(); ?>
 	</ol>
 
 	<div class="navigation">
@@ -58,7 +58,7 @@ 
 	</div>
  <?php else : // this is displayed if there are no comments so far ?>
 
-	<?php if ( comments_open() ) : ?>
+	<?php if (comments_open()) : ?>
 		<!-- If comments are open, but there are no comments. -->
 
 	 <?php else : // comments are closed ?>

src/wp-includes/theme-compat/embed-404.php

Spacing +4 added lines, -4 removed lines

@@ -12,15 +12,15 @@ 
  */
 ?>
 <div class="wp-embed">
-	<p class="wp-embed-heading"><?php _e( 'Oops! That embed can&#8217;t be found.' ); ?></p>
+	<p class="wp-embed-heading"><?php _e('Oops! That embed can&#8217;t be found.'); ?></p>
 
 	<div class="wp-embed-excerpt">
 		<p>
 			<?php
 			printf(
 				/* translators: %s: a link to the embedded site */
-				__( 'It looks like nothing was found at this location. Maybe try visiting %s directly?' ),
-				'<strong><a href="' . esc_url( home_url() ) . '">' . esc_html( get_bloginfo( 'name' ) ) . '</a></strong>'
+				__('It looks like nothing was found at this location. Maybe try visiting %s directly?'),
+				'<strong><a href="'.esc_url(home_url()).'">'.esc_html(get_bloginfo('name')).'</a></strong>'
 			);
 			?>
 		</p>
@@ -28,7 +28,7 @@ 
 
 	<?php
 	/** This filter is documented in wp-includes/theme-compat/embed-content.php */
-	do_action( 'embed_content' );
+	do_action('embed_content');
 	?>
 
 	<div class="wp-embed-footer">

src/wp-includes/theme-compat/header-embed.php

Spacing +3 added lines, -3 removed lines

@@ -11,8 +11,8 @@ 
  * @since 4.5.0
  */
 
-if ( ! headers_sent() ) {
-	header( 'X-WP-embed: true' );
+if ( ! headers_sent()) {
+	header('X-WP-embed: true');
 }
 
 ?>
@@ -27,7 +27,7 @@ 
 	 *
 	 * @since 4.4.0
 	 */
-	do_action( 'embed_head' );
+	do_action('embed_head');
 	?>
 </head>
 <body <?php body_class(); ?>>

src/wp-includes/theme-compat/embed.php

Spacing +6 added lines, -6 removed lines

@@ -10,14 +10,14 @@
  * @since 4.4.0
  */
 
-get_header( 'embed' );
+get_header('embed');
 
-if ( have_posts() ) :
-	while ( have_posts() ) : the_post();
-		get_template_part( 'embed', 'content' );
+if (have_posts()) :
+	while (have_posts()) : the_post();
+		get_template_part('embed', 'content');
 	endwhile;
 else :
-	get_template_part( 'embed', '404' );
+	get_template_part('embed', '404');
 endif;
 
-get_footer( 'embed' );
+get_footer('embed');

Braces +3 added lines, -1 removed lines

@@ -16,8 +16,10 @@
 	while ( have_posts() ) : the_post();
 		get_template_part( 'embed', 'content' );
 	endwhile;
-else :
+else {
+	:
 	get_template_part( 'embed', '404' );
+}
 endif;
 
 get_footer( 'embed' );

src/wp-includes/class-walker-category-dropdown.php

Braces +6 added lines, -4 removed lines

@@ -58,12 +58,14 @@
 		$output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $category->{$value_field} ) . "\"";
 
 		// Type-juggling causes false matches, so we force everything to a string.
-		if ( (string) $category->{$value_field} === (string) $args['selected'] )
-			$output .= ' selected="selected"';
+		if ( (string) $category->{$value_field} === (string) $args['selected'] ) {
+					$output .= ' selected="selected"';
+		}
 		$output .= '>';
 		$output .= $pad.$cat_name;
-		if ( $args['show_count'] )
-			$output .= '&nbsp;&nbsp;('. number_format_i18n( $category->count ) .')';
+		if ( $args['show_count'] ) {
+					$output .= '&nbsp;&nbsp;('. number_format_i18n( $category->count ) .')';
+		}
 		$output .= "</option>\n";
 	}
 }

Spacing +8 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
 	 *
 	 * @see Walker::$db_fields
 	 */
-	public $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
+	public $db_fields = array('parent' => 'parent', 'id' => 'term_id');
 
 	/**
 	 * Starts the element output.
@@ -54,27 +54,27 @@ 
 	 *                         See wp_dropdown_categories().
 	 * @param int    $id       Optional. ID of the current category. Default 0 (unused).
 	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $category, $depth = 0, $args = array(), $id = 0) {
 		$pad = str_repeat(' ', $depth * 3);
 
 		/** This filter is documented in wp-includes/category-template.php */
-		$cat_name = apply_filters( 'list_cats', $category->name, $category );
+		$cat_name = apply_filters('list_cats', $category->name, $category);
 
-		if ( isset( $args['value_field'] ) && isset( $category->{$args['value_field']} ) ) {
+		if (isset($args['value_field']) && isset($category->{$args['value_field']} )) {
 			$value_field = $args['value_field'];
 		} else {
 			$value_field = 'term_id';
 		}
 
-		$output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $category->{$value_field} ) . "\"";
+		$output .= "\t<option class=\"level-$depth\" value=\"".esc_attr($category->{$value_field} )."\"";
 
 		// Type-juggling causes false matches, so we force everything to a string.
-		if ( (string) $category->{$value_field} === (string) $args['selected'] )
+		if ((string) $category->{$value_field} === (string) $args['selected'])
 			$output .= ' selected="selected"';
 		$output .= '>';
 		$output .= $pad.$cat_name;
-		if ( $args['show_count'] )
-			$output .= '&nbsp;&nbsp;('. number_format_i18n( $category->count ) .')';
+		if ($args['show_count'])
+			$output .= '&nbsp;&nbsp;('.number_format_i18n($category->count).')';
 		$output .= "</option>\n";
 	}
 }

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

Braces +14 added lines, -10 removed lines

@@ -382,21 +382,24 @@ 
 		$all_instances = $this->get_settings();
 
 		// We need to update the data
-		if ( $this->updated )
-			return;
+		if ( $this->updated ) {
+					return;
+		}
 
 		if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
 			// Delete the settings for this instance of the widget
-			if ( isset($_POST['the-widget-id']) )
-				$del_id = $_POST['the-widget-id'];
-			else
-				return;
+			if ( isset($_POST['the-widget-id']) ) {
+							$del_id = $_POST['the-widget-id'];
+			} else {
+							return;
+			}
 
 			if ( isset($wp_registered_widgets[$del_id]['params'][0]['number']) ) {
 				$number = $wp_registered_widgets[$del_id]['params'][0]['number'];
 
-				if ( $this->id_base . '-' . $number == $del_id )
-					unset($all_instances[$number]);
+				if ( $this->id_base . '-' . $number == $del_id ) {
+									unset($all_instances[$number]);
+				}
 			}
 		} else {
 			if ( isset($_POST['widget-' . $this->id_base]) && is_array($_POST['widget-' . $this->id_base]) ) {
@@ -461,8 +464,9 @@ 
 	 * @return string|null
 	 */
 	public function form_callback( $widget_args = 1 ) {
-		if ( is_numeric($widget_args) )
-			$widget_args = array( 'number' => $widget_args );
+		if ( is_numeric($widget_args) ) {
+					$widget_args = array( 'number' => $widget_args );
+		}
 
 		$widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
 		$all_instances = $this->get_settings();

Doc Comments +2 added lines, -2 removed lines

@@ -333,7 +333,7 @@ 
 	 *
 	 * @param array     $args        Display arguments. See WP_Widget::widget() for information
 	 *                               on accepted arguments.
-	 * @param int|array $widget_args {
+	 * @param integer $widget_args {
 	 *     Optional. Internal order number of the widget instance, or array of multi-widget arguments.
 	 *     Default 1.
 	 *
@@ -473,7 +473,7 @@ 
 	 * @since 2.8.0
 	 * @access public
 	 *
-	 * @param int|array $widget_args {
+	 * @param integer $widget_args {
 	 *     Optional. Internal order number of the widget instance, or array of multi-widget arguments.
 	 *     Default 1.
 	 *

Spacing +82 added lines, -82 removed lines

@@ -119,7 +119,7 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance The settings for the particular instance of the widget.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		die('function WP_Widget::widget() must be over-ridden in a sub-class.');
 	}
 
@@ -138,7 +138,7 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Settings to save or bool false to cancel saving.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		return $new_instance;
 	}
 
@@ -151,8 +151,8 @@ 
 	 * @param array $instance Current settings.
 	 * @return string Default return is 'noform'.
 	 */
-	public function form( $instance ) {
-		echo '<p class="no-options-widget">' . __('There are no options for this widget.') . '</p>';
+	public function form($instance) {
+		echo '<p class="no-options-widget">'.__('There are no options for this widget.').'</p>';
 		return 'noform';
 	}
 
@@ -172,12 +172,12 @@ 
 	 * @param array  $control_options Optional. Widget control options. See wp_register_widget_control() for
 	 *                                information on accepted arguments. Default empty array.
 	 */
-	public function __construct( $id_base, $name, $widget_options = array(), $control_options = array() ) {
-		$this->id_base = empty($id_base) ? preg_replace( '/(wp_)?widget_/', '', strtolower(get_class($this)) ) : strtolower($id_base);
+	public function __construct($id_base, $name, $widget_options = array(), $control_options = array()) {
+		$this->id_base = empty($id_base) ? preg_replace('/(wp_)?widget_/', '', strtolower(get_class($this))) : strtolower($id_base);
 		$this->name = $name;
-		$this->option_name = 'widget_' . $this->id_base;
-		$this->widget_options = wp_parse_args( $widget_options, array( 'classname' => $this->option_name, 'customize_selective_refresh' => false ) );
-		$this->control_options = wp_parse_args( $control_options, array( 'id_base' => $this->id_base ) );
+		$this->option_name = 'widget_'.$this->id_base;
+		$this->widget_options = wp_parse_args($widget_options, array('classname' => $this->option_name, 'customize_selective_refresh' => false));
+		$this->control_options = wp_parse_args($control_options, array('id_base' => $this->id_base));
 	}
 
 	/**
@@ -196,9 +196,9 @@ 
 	 * @param array  $control_options Optional. Widget control options. See wp_register_widget_control() for
 	 *                                information on accepted arguments. Default empty array.
 	 */
-	public function WP_Widget( $id_base, $name, $widget_options = array(), $control_options = array() ) {
-		_deprecated_constructor( 'WP_Widget', '4.3.0', get_class( $this ) );
-		WP_Widget::__construct( $id_base, $name, $widget_options, $control_options );
+	public function WP_Widget($id_base, $name, $widget_options = array(), $control_options = array()) {
+		_deprecated_constructor('WP_Widget', '4.3.0', get_class($this));
+		WP_Widget::__construct($id_base, $name, $widget_options, $control_options);
 	}
 
 	/**
@@ -215,10 +215,10 @@ 
 	 * @return string Name attribute for $field_name
 	 */
 	public function get_field_name($field_name) {
-		if ( false === $pos = strpos( $field_name, '[' ) ) {
-			return 'widget-' . $this->id_base . '[' . $this->number . '][' . $field_name . ']';
+		if (false === $pos = strpos($field_name, '[')) {
+			return 'widget-'.$this->id_base.'['.$this->number.']['.$field_name.']';
 		} else {
-			return 'widget-' . $this->id_base . '[' . $this->number . '][' . substr_replace( $field_name, '][', $pos, strlen( '[' ) );
+			return 'widget-'.$this->id_base.'['.$this->number.']['.substr_replace($field_name, '][', $pos, strlen('['));
 		}
 	}
 
@@ -235,8 +235,8 @@ 
 	 * @param string $field_name Field name.
 	 * @return string ID attribute for `$field_name`.
 	 */
-	public function get_field_id( $field_name ) {
-		return 'widget-' . $this->id_base . '-' . $this->number . '-' . trim( str_replace( array( '[]', '[', ']' ), array( '', '-', '' ), $field_name ), '-' );
+	public function get_field_id($field_name) {
+		return 'widget-'.$this->id_base.'-'.$this->number.'-'.trim(str_replace(array('[]', '[', ']'), array('', '-', ''), $field_name), '-');
 	}
 
 	/**
@@ -250,23 +250,23 @@ 
 		$empty = true;
 
 		// When $settings is an array-like object, get an intrinsic array for use with array_keys().
-		if ( $settings instanceof ArrayObject || $settings instanceof ArrayIterator ) {
+		if ($settings instanceof ArrayObject || $settings instanceof ArrayIterator) {
 			$settings = $settings->getArrayCopy();
 		}
 
-		if ( is_array( $settings ) ) {
-			foreach ( array_keys( $settings ) as $number ) {
-				if ( is_numeric( $number ) ) {
-					$this->_set( $number );
-					$this->_register_one( $number );
+		if (is_array($settings)) {
+			foreach (array_keys($settings) as $number) {
+				if (is_numeric($number)) {
+					$this->_set($number);
+					$this->_register_one($number);
 					$empty = false;
 				}
 			}
 		}
 
-		if ( $empty ) {
+		if ($empty) {
 			// If there are none, we register the widget's existence with a generic template.
-			$this->_set( 1 );
+			$this->_set(1);
 			$this->_register_one();
 		}
 	}
@@ -282,7 +282,7 @@ 
 	 */
 	public function _set($number) {
 		$this->number = $number;
-		$this->id = $this->id_base . '-' . $number;
+		$this->id = $this->id_base.'-'.$number;
 	}
 
 	/**
@@ -338,7 +338,7 @@ 
 	 */
 	public function is_preview() {
 		global $wp_customize;
-		return ( isset( $wp_customize ) && $wp_customize->is_preview() ) ;
+		return (isset($wp_customize) && $wp_customize->is_preview());
 	}
 
 	/**
@@ -358,17 +358,17 @@ 
 	 *     @type int $number Number increment used for multiples of the same widget.
 	 * }
 	 */
-	public function display_callback( $args, $widget_args = 1 ) {
-		if ( is_numeric( $widget_args ) ) {
-			$widget_args = array( 'number' => $widget_args );
+	public function display_callback($args, $widget_args = 1) {
+		if (is_numeric($widget_args)) {
+			$widget_args = array('number' => $widget_args);
 		}
 
-		$widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
-		$this->_set( $widget_args['number'] );
+		$widget_args = wp_parse_args($widget_args, array('number' => -1));
+		$this->_set($widget_args['number']);
 		$instances = $this->get_settings();
 
-		if ( array_key_exists( $this->number, $instances ) ) {
-			$instance = $instances[ $this->number ];
+		if (array_key_exists($this->number, $instances)) {
+			$instance = $instances[$this->number];
 
 			/**
 			 * Filters the settings for a particular widget instance.
@@ -381,21 +381,21 @@ 
 			 * @param WP_Widget $this     The current widget instance.
 			 * @param array     $args     An array of default widget arguments.
 			 */
-			$instance = apply_filters( 'widget_display_callback', $instance, $this, $args );
+			$instance = apply_filters('widget_display_callback', $instance, $this, $args);
 
-			if ( false === $instance ) {
+			if (false === $instance) {
 				return;
 			}
 
 			$was_cache_addition_suspended = wp_suspend_cache_addition();
-			if ( $this->is_preview() && ! $was_cache_addition_suspended ) {
-				wp_suspend_cache_addition( true );
+			if ($this->is_preview() && ! $was_cache_addition_suspended) {
+				wp_suspend_cache_addition(true);
 			}
 
-			$this->widget( $args, $instance );
+			$this->widget($args, $instance);
 
-			if ( $this->is_preview() ) {
-				wp_suspend_cache_addition( $was_cache_addition_suspended );
+			if ($this->is_preview()) {
+				wp_suspend_cache_addition($was_cache_addition_suspended);
 			}
 		}
 	}
@@ -410,53 +410,53 @@ 
 	 *
 	 * @param int $deprecated Not used.
 	 */
-	public function update_callback( $deprecated = 1 ) {
+	public function update_callback($deprecated = 1) {
 		global $wp_registered_widgets;
 
 		$all_instances = $this->get_settings();
 
 		// We need to update the data
-		if ( $this->updated )
+		if ($this->updated)
 			return;
 
-		if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
+		if (isset($_POST['delete_widget']) && $_POST['delete_widget']) {
 			// Delete the settings for this instance of the widget
-			if ( isset($_POST['the-widget-id']) )
+			if (isset($_POST['the-widget-id']))
 				$del_id = $_POST['the-widget-id'];
 			else
 				return;
 
-			if ( isset($wp_registered_widgets[$del_id]['params'][0]['number']) ) {
+			if (isset($wp_registered_widgets[$del_id]['params'][0]['number'])) {
 				$number = $wp_registered_widgets[$del_id]['params'][0]['number'];
 
-				if ( $this->id_base . '-' . $number == $del_id )
+				if ($this->id_base.'-'.$number == $del_id)
 					unset($all_instances[$number]);
 			}
 		} else {
-			if ( isset($_POST['widget-' . $this->id_base]) && is_array($_POST['widget-' . $this->id_base]) ) {
-				$settings = $_POST['widget-' . $this->id_base];
-			} elseif ( isset($_POST['id_base']) && $_POST['id_base'] == $this->id_base ) {
+			if (isset($_POST['widget-'.$this->id_base]) && is_array($_POST['widget-'.$this->id_base])) {
+				$settings = $_POST['widget-'.$this->id_base];
+			} elseif (isset($_POST['id_base']) && $_POST['id_base'] == $this->id_base) {
 				$num = $_POST['multi_number'] ? (int) $_POST['multi_number'] : (int) $_POST['widget_number'];
-				$settings = array( $num => array() );
+				$settings = array($num => array());
 			} else {
 				return;
 			}
 
-			foreach ( $settings as $number => $new_instance ) {
+			foreach ($settings as $number => $new_instance) {
 				$new_instance = stripslashes_deep($new_instance);
 				$this->_set($number);
 
 				$old_instance = isset($all_instances[$number]) ? $all_instances[$number] : array();
 
 				$was_cache_addition_suspended = wp_suspend_cache_addition();
-				if ( $this->is_preview() && ! $was_cache_addition_suspended ) {
-					wp_suspend_cache_addition( true );
+				if ($this->is_preview() && ! $was_cache_addition_suspended) {
+					wp_suspend_cache_addition(true);
 				}
 
-				$instance = $this->update( $new_instance, $old_instance );
+				$instance = $this->update($new_instance, $old_instance);
 
-				if ( $this->is_preview() ) {
-					wp_suspend_cache_addition( $was_cache_addition_suspended );
+				if ($this->is_preview()) {
+					wp_suspend_cache_addition($was_cache_addition_suspended);
 				}
 
 				/**
@@ -472,8 +472,8 @@ 
 				 * @param array     $old_instance Array of old widget settings.
 				 * @param WP_Widget $this         The current widget instance.
 				 */
-				$instance = apply_filters( 'widget_update_callback', $instance, $new_instance, $old_instance, $this );
-				if ( false !== $instance ) {
+				$instance = apply_filters('widget_update_callback', $instance, $new_instance, $old_instance, $this);
+				if (false !== $instance) {
 					$all_instances[$number] = $instance;
 				}
 
@@ -499,11 +499,11 @@ 
 	 * }
 	 * @return string|null
 	 */
-	public function form_callback( $widget_args = 1 ) {
-		if ( is_numeric($widget_args) )
-			$widget_args = array( 'number' => $widget_args );
+	public function form_callback($widget_args = 1) {
+		if (is_numeric($widget_args))
+			$widget_args = array('number' => $widget_args);
 
-		$widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
+		$widget_args = wp_parse_args($widget_args, array('number' => -1));
 		$all_instances = $this->get_settings();
 
 		if ( -1 == $widget_args['number'] ) {
@@ -512,7 +512,7 @@ 
 			$instance = array();
 		} else {
 			$this->_set($widget_args['number']);
-			$instance = $all_instances[ $widget_args['number'] ];
+			$instance = $all_instances[$widget_args['number']];
 		}
 
 		/**
@@ -525,10 +525,10 @@ 
 		 * @param array     $instance The current widget instance's settings.
 		 * @param WP_Widget $this     The current widget instance.
 		 */
-		$instance = apply_filters( 'widget_form_callback', $instance, $this );
+		$instance = apply_filters('widget_form_callback', $instance, $this);
 
 		$return = null;
-		if ( false !== $instance ) {
+		if (false !== $instance) {
 			$return = $this->form($instance);
 
 			/**
@@ -547,7 +547,7 @@ 
 			 * @param null      $return   Return null if new fields are added.
 			 * @param array     $instance An array of the widget's settings.
 			 */
-			do_action_ref_array( 'in_widget_form', array( &$this, &$return, $instance ) );
+			do_action_ref_array('in_widget_form', array(&$this, &$return, $instance));
 		}
 		return $return;
 	}
@@ -561,10 +561,10 @@ 
 	 * @param integer $number Optional. The unique order number of this widget instance
 	 *                        compared to other instances of the same class. Default -1.
 	 */
-	public function _register_one( $number = -1 ) {
-		wp_register_sidebar_widget(	$this->id, $this->name,	$this->_get_display_callback(), $this->widget_options, array( 'number' => $number ) );
-		_register_widget_update_callback( $this->id_base, $this->_get_update_callback(), $this->control_options, array( 'number' => -1 ) );
-		_register_widget_form_callback(	$this->id, $this->name,	$this->_get_form_callback(), $this->control_options, array( 'number' => $number ) );
+	public function _register_one($number = -1) {
+		wp_register_sidebar_widget($this->id, $this->name, $this->_get_display_callback(), $this->widget_options, array('number' => $number));
+		_register_widget_update_callback($this->id_base, $this->_get_update_callback(), $this->control_options, array('number' => -1));
+		_register_widget_form_callback($this->id, $this->name, $this->_get_form_callback(), $this->control_options, array('number' => $number));
 	}
 
 	/**
@@ -575,9 +575,9 @@ 
 	 *
 	 * @param array $settings Multi-dimensional array of widget instance settings.
 	 */
-	public function save_settings( $settings ) {
+	public function save_settings($settings) {
 		$settings['_multiwidget'] = 1;
-		update_option( $this->option_name, $settings );
+		update_option($this->option_name, $settings);
 	}
 
 	/**
@@ -590,27 +590,27 @@ 
 	 */
 	public function get_settings() {
 
-		$settings = get_option( $this->option_name );
+		$settings = get_option($this->option_name);
 
-		if ( false === $settings ) {
-			if ( isset( $this->alt_option_name ) ) {
-				$settings = get_option( $this->alt_option_name );
+		if (false === $settings) {
+			if (isset($this->alt_option_name)) {
+				$settings = get_option($this->alt_option_name);
 			} else {
 				// Save an option so it can be autoloaded next time.
-				$this->save_settings( array() );
+				$this->save_settings(array());
 			}
 		}
 
-		if ( ! is_array( $settings ) && ! ( $settings instanceof ArrayObject || $settings instanceof ArrayIterator ) ) {
+		if ( ! is_array($settings) && ! ($settings instanceof ArrayObject || $settings instanceof ArrayIterator)) {
 			$settings = array();
 		}
 
-		if ( ! empty( $settings ) && ! isset( $settings['_multiwidget'] ) ) {
+		if ( ! empty($settings) && ! isset($settings['_multiwidget'])) {
 			// Old format, convert if single widget.
-			$settings = wp_convert_widget_settings( $this->id_base, $this->option_name, $settings );
+			$settings = wp_convert_widget_settings($this->id_base, $this->option_name, $settings);
 		}
 
-		unset( $settings['_multiwidget'], $settings['__i__'] );
+		unset($settings['_multiwidget'], $settings['__i__']);
 		return $settings;
 	}
 }