ntwb / wordpress

src/wp-admin/upgrade-functions.php

Spacing +2 added lines, -2 removed lines

@@ -8,5 +8,5 @@
  * @subpackage Administration
  */
 
-_deprecated_file( basename(__FILE__), '2.5.0', 'wp-admin/includes/upgrade.php' );
-require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+_deprecated_file(basename(__FILE__), '2.5.0', 'wp-admin/includes/upgrade.php');
+require_once(ABSPATH.'wp-admin/includes/upgrade.php');

src/wp-admin/includes/import.php

Braces +9 added lines, -6 removed lines

@@ -53,8 +53,9 @@ 
  */
 function register_importer( $id, $name, $description, $callback ) {
 	global $wp_importers;
-	if ( is_wp_error( $callback ) )
-		return $callback;
+	if ( is_wp_error( $callback ) ) {
+			return $callback;
+	}
 	$wp_importers[$id] = array ( $name, $description, $callback );
 }
 
@@ -147,13 +148,15 @@ 
 
 	if ( is_array( $popular_importers ) ) {
 		// If the data was received as translated, return it as-is.
-		if ( $popular_importers['translated'] )
-			return $popular_importers['importers'];
+		if ( $popular_importers['translated'] ) {
+					return $popular_importers['importers'];
+		}
 
 		foreach ( $popular_importers['importers'] as &$importer ) {
 			$importer['description'] = translate( $importer['description'] );
-			if ( $importer['name'] != 'WordPress' )
-				$importer['name'] = translate( $importer['name'] );
+			if ( $importer['name'] != 'WordPress' ) {
+							$importer['name'] = translate( $importer['name'] );
+			}
 		}
 		return $popular_importers['importers'];
 	}

Spacing +50 added lines, -50 removed lines

@@ -16,8 +16,8 @@ 
  */
 function get_importers() {
 	global $wp_importers;
-	if ( is_array( $wp_importers ) ) {
-		uasort( $wp_importers, '_usort_by_first_member' );
+	if (is_array($wp_importers)) {
+		uasort($wp_importers, '_usort_by_first_member');
 	}
 	return $wp_importers;
 }
@@ -34,8 +34,8 @@ 
  * @param array $b
  * @return int
  */
-function _usort_by_first_member( $a, $b ) {
-	return strnatcasecmp( $a[0], $b[0] );
+function _usort_by_first_member($a, $b) {
+	return strnatcasecmp($a[0], $b[0]);
 }
 
 /**
@@ -51,11 +51,11 @@ 
  * @param callable $callback    Callback to run.
  * @return WP_Error Returns WP_Error when $callback is WP_Error.
  */
-function register_importer( $id, $name, $description, $callback ) {
+function register_importer($id, $name, $description, $callback) {
 	global $wp_importers;
-	if ( is_wp_error( $callback ) )
+	if (is_wp_error($callback))
 		return $callback;
-	$wp_importers[$id] = array ( $name, $description, $callback );
+	$wp_importers[$id] = array($name, $description, $callback);
 }
 
 /**
@@ -67,8 +67,8 @@ 
  *
  * @param string $id Importer ID.
  */
-function wp_import_cleanup( $id ) {
-	wp_delete_attachment( $id );
+function wp_import_cleanup($id) {
+	wp_delete_attachment($id);
 }
 
 /**
@@ -79,23 +79,23 @@ 
  * @return array Uploaded file's details on success, error message on failure
  */
 function wp_import_handle_upload() {
-	if ( ! isset( $_FILES['import'] ) ) {
+	if ( ! isset($_FILES['import'])) {
 		return array(
-			'error' => __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' )
+			'error' => __('File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.')
 		);
 	}
 
-	$overrides = array( 'test_form' => false, 'test_type' => false );
+	$overrides = array('test_form' => false, 'test_type' => false);
 	$_FILES['import']['name'] .= '.txt';
-	$upload = wp_handle_upload( $_FILES['import'], $overrides );
+	$upload = wp_handle_upload($_FILES['import'], $overrides);
 
-	if ( isset( $upload['error'] ) ) {
+	if (isset($upload['error'])) {
 		return $upload;
 	}
 
 	// Construct the object array
 	$object = array(
-		'post_title' => basename( $upload['file'] ),
+		'post_title' => basename($upload['file']),
 		'post_content' => $upload['url'],
 		'post_mime_type' => $upload['type'],
 		'guid' => $upload['url'],
@@ -104,15 +104,15 @@ 
 	);
 
 	// Save the data
-	$id = wp_insert_attachment( $object, $upload['file'] );
+	$id = wp_insert_attachment($object, $upload['file']);
 
 	/*
 	 * Schedule a cleanup for one day from now in case of failed
 	 * import or missing wp_import_cleanup() call.
 	 */
-	wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) );
+	wp_schedule_single_event(time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array($id));
 
-	return array( 'file' => $upload['file'], 'id' => $id );
+	return array('file' => $upload['file'], 'id' => $id);
 }
 
 /**
@@ -123,37 +123,37 @@ 
  * @return array Importers with metadata for each.
  */
 function wp_get_popular_importers() {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 
 	$locale = get_user_locale();
-	$cache_key = 'popular_importers_' . md5( $locale . $wp_version );
-	$popular_importers = get_site_transient( $cache_key );
+	$cache_key = 'popular_importers_'.md5($locale.$wp_version);
+	$popular_importers = get_site_transient($cache_key);
 
-	if ( ! $popular_importers ) {
-		$url = add_query_arg( array(
+	if ( ! $popular_importers) {
+		$url = add_query_arg(array(
 			'locale'  => get_user_locale(),
 			'version' => $wp_version,
-		), 'http://api.wordpress.org/core/importers/1.1/' );
-		$options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() );
-		$response = wp_remote_get( $url, $options );
-		$popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );
+		), 'http://api.wordpress.org/core/importers/1.1/');
+		$options = array('user-agent' => 'WordPress/'.$wp_version.'; '.home_url());
+		$response = wp_remote_get($url, $options);
+		$popular_importers = json_decode(wp_remote_retrieve_body($response), true);
 
-		if ( is_array( $popular_importers ) ) {
-			set_site_transient( $cache_key, $popular_importers, 2 * DAY_IN_SECONDS );
+		if (is_array($popular_importers)) {
+			set_site_transient($cache_key, $popular_importers, 2 * DAY_IN_SECONDS);
 		} else {
 			$popular_importers = false;
 		}
 	}
 
-	if ( is_array( $popular_importers ) ) {
+	if (is_array($popular_importers)) {
 		// If the data was received as translated, return it as-is.
-		if ( $popular_importers['translated'] )
+		if ($popular_importers['translated'])
 			return $popular_importers['importers'];
 
-		foreach ( $popular_importers['importers'] as &$importer ) {
-			$importer['description'] = translate( $importer['description'] );
-			if ( $importer['name'] != 'WordPress' )
-				$importer['name'] = translate( $importer['name'] );
+		foreach ($popular_importers['importers'] as &$importer) {
+			$importer['description'] = translate($importer['description']);
+			if ($importer['name'] != 'WordPress')
+				$importer['name'] = translate($importer['name']);
 		}
 		return $popular_importers['importers'];
 	}
@@ -161,50 +161,50 @@ 
 	return array(
 		// slug => name, description, plugin slug, and register_importer() slug
 		'blogger' => array(
-			'name' => __( 'Blogger' ),
-			'description' => __( 'Import posts, comments, and users from a Blogger blog.' ),
+			'name' => __('Blogger'),
+			'description' => __('Import posts, comments, and users from a Blogger blog.'),
 			'plugin-slug' => 'blogger-importer',
 			'importer-id' => 'blogger',
 		),
 		'wpcat2tag' => array(
-			'name' => __( 'Categories and Tags Converter' ),
-			'description' => __( 'Convert existing categories to tags or tags to categories, selectively.' ),
+			'name' => __('Categories and Tags Converter'),
+			'description' => __('Convert existing categories to tags or tags to categories, selectively.'),
 			'plugin-slug' => 'wpcat2tag-importer',
 			'importer-id' => 'wp-cat2tag',
 		),
 		'livejournal' => array(
-			'name' => __( 'LiveJournal' ),
-			'description' => __( 'Import posts from LiveJournal using their API.' ),
+			'name' => __('LiveJournal'),
+			'description' => __('Import posts from LiveJournal using their API.'),
 			'plugin-slug' => 'livejournal-importer',
 			'importer-id' => 'livejournal',
 		),
 		'movabletype' => array(
-			'name' => __( 'Movable Type and TypePad' ),
-			'description' => __( 'Import posts and comments from a Movable Type or TypePad blog.' ),
+			'name' => __('Movable Type and TypePad'),
+			'description' => __('Import posts and comments from a Movable Type or TypePad blog.'),
 			'plugin-slug' => 'movabletype-importer',
 			'importer-id' => 'mt',
 		),
 		'opml' => array(
-			'name' => __( 'Blogroll' ),
-			'description' => __( 'Import links in OPML format.' ),
+			'name' => __('Blogroll'),
+			'description' => __('Import links in OPML format.'),
 			'plugin-slug' => 'opml-importer',
 			'importer-id' => 'opml',
 		),
 		'rss' => array(
-			'name' => __( 'RSS' ),
-			'description' => __( 'Import posts from an RSS feed.' ),
+			'name' => __('RSS'),
+			'description' => __('Import posts from an RSS feed.'),
 			'plugin-slug' => 'rss-importer',
 			'importer-id' => 'rss',
 		),
 		'tumblr' => array(
-			'name' => __( 'Tumblr' ),
-			'description' => __( 'Import posts & media from Tumblr using their API.' ),
+			'name' => __('Tumblr'),
+			'description' => __('Import posts & media from Tumblr using their API.'),
 			'plugin-slug' => 'tumblr-importer',
 			'importer-id' => 'tumblr',
 		),
 		'wordpress' => array(
 			'name' => 'WordPress',
-			'description' => __( 'Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),
+			'description' => __('Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.'),
 			'plugin-slug' => 'wordpress-importer',
 			'importer-id' => 'wordpress',
 		),

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

Spacing +26 added lines, -26 removed lines

@@ -35,8 +35,8 @@ 
 	 *
 	 * @param array $args Options for the upgrader, see WP_Upgrader_Skin::__construct().
 	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
+	public function __construct($args = array()) {
+		parent::__construct($args);
 
 		$this->errors = new WP_Error();
 	}
@@ -64,15 +64,15 @@ 
 	public function get_error_messages() {
 		$messages = array();
 
-		foreach ( $this->errors->get_error_codes() as $error_code ) {
-			if ( $this->errors->get_error_data( $error_code ) && is_string( $this->errors->get_error_data( $error_code ) ) ) {
-				$messages[] = $this->errors->get_error_message( $error_code ) . ' ' . esc_html( strip_tags( $this->errors->get_error_data( $error_code ) ) );
+		foreach ($this->errors->get_error_codes() as $error_code) {
+			if ($this->errors->get_error_data($error_code) && is_string($this->errors->get_error_data($error_code))) {
+				$messages[] = $this->errors->get_error_message($error_code).' '.esc_html(strip_tags($this->errors->get_error_data($error_code)));
 			} else {
-				$messages[] = $this->errors->get_error_message( $error_code );
+				$messages[] = $this->errors->get_error_message($error_code);
 			}
 		}
 
-		return implode( ', ', $messages );
+		return implode(', ', $messages);
 	}
 
 	/**
@@ -83,32 +83,32 @@ 
 	 *
 	 * @param string|WP_Error $errors Errors.
 	 */
-	public function error( $errors ) {
-		if ( is_string( $errors ) ) {
+	public function error($errors) {
+		if (is_string($errors)) {
 			$string = $errors;
-			if ( ! empty( $this->upgrader->strings[ $string ] ) ) {
-				$string = $this->upgrader->strings[ $string ];
+			if ( ! empty($this->upgrader->strings[$string])) {
+				$string = $this->upgrader->strings[$string];
 			}
 
-			if ( false !== strpos( $string, '%' ) ) {
+			if (false !== strpos($string, '%')) {
 				$args = func_get_args();
-				$args = array_splice( $args, 1 );
-				if ( ! empty( $args ) ) {
-					$string = vsprintf( $string, $args );
+				$args = array_splice($args, 1);
+				if ( ! empty($args)) {
+					$string = vsprintf($string, $args);
 				}
 			}
 
 			// Count existing errors to generate an unique error code.
-			$errors_count = count( $errors->get_error_codes() );
-			$this->errors->add( 'unknown_upgrade_error_' . $errors_count + 1 , $string );
-		} elseif ( is_wp_error( $errors ) ) {
-			foreach ( $errors->get_error_codes() as $error_code ) {
-				$this->errors->add( $error_code, $errors->get_error_message( $error_code ), $errors->get_error_data( $error_code ) );
+			$errors_count = count($errors->get_error_codes());
+			$this->errors->add('unknown_upgrade_error_'.$errors_count + 1, $string);
+		} elseif (is_wp_error($errors)) {
+			foreach ($errors->get_error_codes() as $error_code) {
+				$this->errors->add($error_code, $errors->get_error_message($error_code), $errors->get_error_data($error_code));
 			}
 		}
 
 		$args = func_get_args();
-		call_user_func_array( array( $this, 'parent::error' ), $args );
+		call_user_func_array(array($this, 'parent::error'), $args);
 	}
 
 	/**
@@ -119,14 +119,14 @@ 
 	 *
 	 * @param string|array|WP_Error $data Log entry data.
 	 */
-	public function feedback( $data ) {
-		if ( is_wp_error( $data ) ) {
-			foreach ( $data->get_error_codes() as $error_code ) {
-				$this->errors->add( $error_code, $data->get_error_message( $error_code ), $data->get_error_data( $error_code ) );
+	public function feedback($data) {
+		if (is_wp_error($data)) {
+			foreach ($data->get_error_codes() as $error_code) {
+				$this->errors->add($error_code, $data->get_error_message($error_code), $data->get_error_data($error_code));
 			}
 		}
 
 		$args = func_get_args();
-		call_user_func_array( array( $this, 'parent::feedback' ), $args );
+		call_user_func_array(array($this, 'parent::feedback'), $args);
 	}
 }

src/wp-admin/includes/screen.php

Spacing +44 added lines, -44 removed lines

@@ -16,13 +16,13 @@ 
  * @param string|WP_Screen $screen The screen you want the headers for
  * @return array Containing the headers in the format id => UI String
  */
-function get_column_headers( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+function get_column_headers($screen) {
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
 	static $column_headers = array();
 
-	if ( ! isset( $column_headers[ $screen->id ] ) ) {
+	if ( ! isset($column_headers[$screen->id])) {
 
 		/**
 		 * Filters the column headers for a list table on a specific screen.
@@ -36,10 +36,10 @@ 
 		 *
 		 * @param array $columns An array of column headers. Default empty.
 		 */
-		$column_headers[ $screen->id ] = apply_filters( "manage_{$screen->id}_columns", array() );
+		$column_headers[$screen->id] = apply_filters("manage_{$screen->id}_columns", array());
 	}
 
-	return $column_headers[ $screen->id ];
+	return $column_headers[$screen->id];
 }
 
 /**
@@ -50,16 +50,16 @@ 
  * @param string|WP_Screen $screen The screen you want the hidden columns for
  * @return array
  */
-function get_hidden_columns( $screen ) {
-	if ( is_string( $screen ) ) {
-		$screen = convert_to_screen( $screen );
+function get_hidden_columns($screen) {
+	if (is_string($screen)) {
+		$screen = convert_to_screen($screen);
 	}
 
-	$hidden = get_user_option( 'manage' . $screen->id . 'columnshidden' );
+	$hidden = get_user_option('manage'.$screen->id.'columnshidden');
 
-	$use_defaults = ! is_array( $hidden );
+	$use_defaults = ! is_array($hidden);
 
-	if ( $use_defaults ) {
+	if ($use_defaults) {
 		$hidden = array();
 
 		/**
@@ -70,7 +70,7 @@ 
 		 * @param array     $hidden An array of columns hidden by default.
 		 * @param WP_Screen $screen WP_Screen object of the current screen.
 		 */
-		$hidden = apply_filters( 'default_hidden_columns', $hidden, $screen );
+		$hidden = apply_filters('default_hidden_columns', $hidden, $screen);
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 * @param WP_Screen $screen WP_Screen object of the current screen.
 	 * @param bool      $use_defaults Whether to show the default columns.
 	 */
-	return apply_filters( 'hidden_columns', $hidden, $screen, $use_defaults );
+	return apply_filters('hidden_columns', $hidden, $screen, $use_defaults);
 }
 
 /**
@@ -95,39 +95,39 @@ 
  *
  * @param WP_Screen $screen
  */
-function meta_box_prefs( $screen ) {
+function meta_box_prefs($screen) {
 	global $wp_meta_boxes;
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
-	if ( empty($wp_meta_boxes[$screen->id]) )
+	if (empty($wp_meta_boxes[$screen->id]))
 		return;
 
 	$hidden = get_hidden_meta_boxes($screen);
 
-	foreach ( array_keys( $wp_meta_boxes[ $screen->id ] ) as $context ) {
-		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
-			if ( ! isset( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] ) ) {
+	foreach (array_keys($wp_meta_boxes[$screen->id]) as $context) {
+		foreach (array('high', 'core', 'default', 'low') as $priority) {
+			if ( ! isset($wp_meta_boxes[$screen->id][$context][$priority])) {
 				continue;
 			}
-			foreach ( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] as $box ) {
-				if ( false == $box || ! $box['title'] )
+			foreach ($wp_meta_boxes[$screen->id][$context][$priority] as $box) {
+				if (false == $box || ! $box['title'])
 					continue;
 				// Submit box cannot be hidden
-				if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] )
+				if ('submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'])
 					continue;
 
 				$widget_title = $box['title'];
 
-				if ( is_array( $box['args'] ) && isset( $box['args']['__widget_basename'] ) ) {
+				if (is_array($box['args']) && isset($box['args']['__widget_basename'])) {
 					$widget_title = $box['args']['__widget_basename'];
 				}
 
 				printf(
 					'<label for="%1$s-hide"><input class="hide-postbox-tog" name="%1$s-hide" type="checkbox" id="%1$s-hide" value="%1$s" %2$s />%3$s</label>',
-					esc_attr( $box['id'] ),
-					checked( in_array( $box['id'], $hidden ), false, false ),
+					esc_attr($box['id']),
+					checked(in_array($box['id'], $hidden), false, false),
 					$widget_title
 				);
 			}
@@ -143,22 +143,22 @@ 
  * @param string|WP_Screen $screen Screen identifier
  * @return array Hidden Meta Boxes
  */
-function get_hidden_meta_boxes( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+function get_hidden_meta_boxes($screen) {
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
-	$hidden = get_user_option( "metaboxhidden_{$screen->id}" );
+	$hidden = get_user_option("metaboxhidden_{$screen->id}");
 
-	$use_defaults = ! is_array( $hidden );
+	$use_defaults = ! is_array($hidden);
 
 	// Hide slug boxes by default
-	if ( $use_defaults ) {
+	if ($use_defaults) {
 		$hidden = array();
-		if ( 'post' == $screen->base ) {
-			if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type )
+		if ('post' == $screen->base) {
+			if ('post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type)
 				$hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
 			else
-				$hidden = array( 'slugdiv' );
+				$hidden = array('slugdiv');
 		}
 
 		/**
@@ -169,7 +169,7 @@ 
 		 * @param array     $hidden An array of meta boxes hidden by default.
 		 * @param WP_Screen $screen WP_Screen object of the current screen.
 		 */
-		$hidden = apply_filters( 'default_hidden_meta_boxes', $hidden, $screen );
+		$hidden = apply_filters('default_hidden_meta_boxes', $hidden, $screen);
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 	 * @param bool      $use_defaults Whether to show the default meta boxes.
 	 *                                Default true.
 	 */
-	return apply_filters( 'hidden_meta_boxes', $hidden, $screen, $use_defaults );
+	return apply_filters('hidden_meta_boxes', $hidden, $screen, $use_defaults);
 }
 
 /**
@@ -193,13 +193,13 @@ 
  * @param string $option An option name.
  * @param mixed $args Option-dependent arguments.
  */
-function add_screen_option( $option, $args = array() ) {
+function add_screen_option($option, $args = array()) {
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
+	if ( ! $current_screen)
 		return;
 
-	$current_screen->add_option( $option, $args );
+	$current_screen->add_option($option, $args);
 }
 
 /**
@@ -214,7 +214,7 @@ 
 function get_current_screen() {
 	global $current_screen;
 
-	if ( ! isset( $current_screen ) )
+	if ( ! isset($current_screen))
 		return null;
 
 	return $current_screen;
@@ -228,6 +228,6 @@ 
  * @param mixed $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen,
  *	                       or an existing screen object.
  */
-function set_current_screen( $hook_name = '' ) {
-	WP_Screen::get( $hook_name )->set_current_screen();
+function set_current_screen($hook_name = '') {
+	WP_Screen::get($hook_name)->set_current_screen();
 }

Braces +29 added lines, -20 removed lines

@@ -17,8 +17,9 @@ 
  * @return array Containing the headers in the format id => UI String
  */
 function get_column_headers( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	static $column_headers = array();
 
@@ -98,11 +99,13 @@ 
 function meta_box_prefs( $screen ) {
 	global $wp_meta_boxes;
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
-	if ( empty($wp_meta_boxes[$screen->id]) )
-		return;
+	if ( empty($wp_meta_boxes[$screen->id]) ) {
+			return;
+	}
 
 	$hidden = get_hidden_meta_boxes($screen);
 
@@ -112,11 +115,13 @@ 
 				continue;
 			}
 			foreach ( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] as $box ) {
-				if ( false == $box || ! $box['title'] )
-					continue;
+				if ( false == $box || ! $box['title'] ) {
+									continue;
+				}
 				// Submit box cannot be hidden
-				if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] )
-					continue;
+				if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] ) {
+									continue;
+				}
 
 				$widget_title = $box['title'];
 
@@ -144,8 +149,9 @@ 
  * @return array Hidden Meta Boxes
  */
 function get_hidden_meta_boxes( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	$hidden = get_user_option( "metaboxhidden_{$screen->id}" );
 
@@ -155,10 +161,11 @@ 
 	if ( $use_defaults ) {
 		$hidden = array();
 		if ( 'post' == $screen->base ) {
-			if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type )
-				$hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
-			else
-				$hidden = array( 'slugdiv' );
+			if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type ) {
+							$hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
+			} else {
+							$hidden = array( 'slugdiv' );
+			}
 		}
 
 		/**
@@ -196,8 +203,9 @@ 
 function add_screen_option( $option, $args = array() ) {
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return;
+	if ( ! $current_screen ) {
+			return;
+	}
 
 	$current_screen->add_option( $option, $args );
 }
@@ -214,8 +222,9 @@ 
 function get_current_screen() {
 	global $current_screen;
 
-	if ( ! isset( $current_screen ) )
-		return null;
+	if ( ! isset( $current_screen ) ) {
+			return null;
+	}
 
 	return $current_screen;
 }

src/wp-admin/includes/ms-deprecated.php

Spacing +17 added lines, -17 removed lines

@@ -16,7 +16,7 @@ 
  * @deprecated 3.0.0
  */
 function wpmu_menu() {
-	_deprecated_function(__FUNCTION__, '3.0.0' );
+	_deprecated_function(__FUNCTION__, '3.0.0');
 	// Deprecated. See #11763.
 }
 
@@ -27,10 +27,10 @@ 
  * @see is_upload_space_available()
  */
 function wpmu_checkAvailableSpace() {
-	_deprecated_function(__FUNCTION__, '3.0.0', 'is_upload_space_available()' );
+	_deprecated_function(__FUNCTION__, '3.0.0', 'is_upload_space_available()');
 
-	if ( !is_upload_space_available() )
-		wp_die( __('Sorry, you must delete files before you can upload any more.') );
+	if ( ! is_upload_space_available())
+		wp_die(__('Sorry, you must delete files before you can upload any more.'));
 }
 
 /**
@@ -38,8 +38,8 @@ 
  *
  * @deprecated 3.0.0
  */
-function mu_options( $options ) {
-	_deprecated_function(__FUNCTION__, '3.0.0' );
+function mu_options($options) {
+	_deprecated_function(__FUNCTION__, '3.0.0');
 	return $options;
 }
 
@@ -50,7 +50,7 @@ 
  * @see activate_plugin()
  */
 function activate_sitewide_plugin() {
-	_deprecated_function(__FUNCTION__, '3.0.0', 'activate_plugin()' );
+	_deprecated_function(__FUNCTION__, '3.0.0', 'activate_plugin()');
 	return false;
 }
 
@@ -60,8 +60,8 @@ 
  * @deprecated 3.0.0 Use deactivate_sitewide_plugin()
  * @see deactivate_sitewide_plugin()
  */
-function deactivate_sitewide_plugin( $plugin = false ) {
-	_deprecated_function(__FUNCTION__, '3.0.0', 'deactivate_plugin()' );
+function deactivate_sitewide_plugin($plugin = false) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'deactivate_plugin()');
 }
 
 /**
@@ -70,9 +70,9 @@ 
  * @deprecated 3.0.0 Use is_network_only_plugin()
  * @see is_network_only_plugin()
  */
-function is_wpmu_sitewide_plugin( $file ) {
-	_deprecated_function(__FUNCTION__, '3.0.0', 'is_network_only_plugin()' );
-	return is_network_only_plugin( $file );
+function is_wpmu_sitewide_plugin($file) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'is_network_only_plugin()');
+	return is_network_only_plugin($file);
 }
 
 /**
@@ -82,8 +82,8 @@ 
  * @see WP_Theme::get_allowed_on_network()
  */
 function get_site_allowed_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_network()' );
-	return array_map( 'intval', WP_Theme::get_allowed_on_network() );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_network()');
+	return array_map('intval', WP_Theme::get_allowed_on_network());
 }
 
 /**
@@ -92,9 +92,9 @@ 
  * @deprecated 3.4.0 Use WP_Theme::get_allowed_on_site()
  * @see WP_Theme::get_allowed_on_site()
  */
-function wpmu_get_blog_allowedthemes( $blog_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_site()' );
-	return array_map( 'intval', WP_Theme::get_allowed_on_site( $blog_id ) );
+function wpmu_get_blog_allowedthemes($blog_id = 0) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_site()');
+	return array_map('intval', WP_Theme::get_allowed_on_site($blog_id));
 }
 
 /**

Braces +4 added lines, -3 removed lines

@@ -29,9 +29,10 @@
 function wpmu_checkAvailableSpace() {
 	_deprecated_function(__FUNCTION__, '3.0.0', 'is_upload_space_available()' );
 
-	if ( !is_upload_space_available() )
-		wp_die( __('Sorry, you must delete files before you can upload any more.') );
-}
+	if ( !is_upload_space_available() ) {
+			wp_die( __('Sorry, you must delete files before you can upload any more.') );
+	}
+	}
 
 /**
  * WPMU options.

src/wp-admin/includes/admin-filters.php

Spacing +61 added lines, -61 removed lines

@@ -8,83 +8,83 @@ 
  */
 
 // Bookmark hooks.
-add_action( 'admin_page_access_denied', 'wp_link_manager_disabled_message' );
+add_action('admin_page_access_denied', 'wp_link_manager_disabled_message');
 
 // Dashboard hooks.
-add_action( 'activity_box_end', 'wp_dashboard_quota' );
+add_action('activity_box_end', 'wp_dashboard_quota');
 
 // Media hooks.
-add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
+add_action('attachment_submitbox_misc_actions', 'attachment_submitbox_metadata');
 
-add_action( 'media_upload_image', 'wp_media_upload_handler' );
-add_action( 'media_upload_audio', 'wp_media_upload_handler' );
-add_action( 'media_upload_video', 'wp_media_upload_handler' );
-add_action( 'media_upload_file',  'wp_media_upload_handler' );
+add_action('media_upload_image', 'wp_media_upload_handler');
+add_action('media_upload_audio', 'wp_media_upload_handler');
+add_action('media_upload_video', 'wp_media_upload_handler');
+add_action('media_upload_file', 'wp_media_upload_handler');
 
-add_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' );
+add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
 
-add_action( 'post-html-upload-ui', 'media_upload_html_bypass'  );
+add_action('post-html-upload-ui', 'media_upload_html_bypass');
 
-add_filter( 'async_upload_image', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_audio', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_video', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_file',  'get_media_item', 10, 2 );
+add_filter('async_upload_image', 'get_media_item', 10, 2);
+add_filter('async_upload_audio', 'get_media_item', 10, 2);
+add_filter('async_upload_video', 'get_media_item', 10, 2);
+add_filter('async_upload_file', 'get_media_item', 10, 2);
 
-add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 );
+add_filter('attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2);
 
-add_filter( 'media_upload_gallery', 'media_upload_gallery' );
-add_filter( 'media_upload_library', 'media_upload_library' );
+add_filter('media_upload_gallery', 'media_upload_gallery');
+add_filter('media_upload_library', 'media_upload_library');
 
-add_filter( 'media_upload_tabs', 'update_gallery_tab' );
+add_filter('media_upload_tabs', 'update_gallery_tab');
 
 // Misc hooks.
-add_action( 'admin_head', 'wp_admin_canonical_url'   );
-add_action( 'admin_head', 'wp_color_scheme_settings' );
-add_action( 'admin_head', 'wp_site_icon'             );
-add_action( 'admin_head', '_ipad_meta'               );
+add_action('admin_head', 'wp_admin_canonical_url');
+add_action('admin_head', 'wp_color_scheme_settings');
+add_action('admin_head', 'wp_site_icon');
+add_action('admin_head', '_ipad_meta');
 
 // Prerendering.
-if ( ! is_customize_preview() ) {
-	add_filter( 'admin_print_styles', 'wp_resource_hints', 1 );
+if ( ! is_customize_preview()) {
+	add_filter('admin_print_styles', 'wp_resource_hints', 1);
 }
 
-add_action( 'admin_print_scripts-post.php',     'wp_page_reload_on_back_button_js' );
-add_action( 'admin_print_scripts-post-new.php', 'wp_page_reload_on_back_button_js' );
+add_action('admin_print_scripts-post.php', 'wp_page_reload_on_back_button_js');
+add_action('admin_print_scripts-post-new.php', 'wp_page_reload_on_back_button_js');
 
-add_action( 'update_option_home',          'update_home_siteurl', 10, 2 );
-add_action( 'update_option_siteurl',       'update_home_siteurl', 10, 2 );
-add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 );
+add_action('update_option_home', 'update_home_siteurl', 10, 2);
+add_action('update_option_siteurl', 'update_home_siteurl', 10, 2);
+add_action('update_option_page_on_front', 'update_home_siteurl', 10, 2);
 
-add_filter( 'heartbeat_received', 'wp_check_locked_posts',  10,  3 );
-add_filter( 'heartbeat_received', 'wp_refresh_post_lock',   10,  3 );
-add_filter( 'wp_refresh_nonces', 'wp_refresh_post_nonces', 10,  3 );
-add_filter( 'heartbeat_received', 'heartbeat_autosave',     500, 2 );
+add_filter('heartbeat_received', 'wp_check_locked_posts', 10, 3);
+add_filter('heartbeat_received', 'wp_refresh_post_lock', 10, 3);
+add_filter('wp_refresh_nonces', 'wp_refresh_post_nonces', 10, 3);
+add_filter('heartbeat_received', 'heartbeat_autosave', 500, 2);
 
-add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
+add_filter('heartbeat_settings', 'wp_heartbeat_set_suspension');
 
 // Nav Menu hooks.
-add_action( 'admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items' );
+add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items');
 
 // Plugin hooks.
-add_filter( 'whitelist_options', 'option_update_filter' );
+add_filter('whitelist_options', 'option_update_filter');
 
 // Plugin Install hooks.
-add_action( 'install_plugins_featured',               'install_dashboard' );
-add_action( 'install_plugins_upload',                 'install_plugins_upload' );
-add_action( 'install_plugins_search',                 'display_plugins_table' );
-add_action( 'install_plugins_popular',                'display_plugins_table' );
-add_action( 'install_plugins_recommended',            'display_plugins_table' );
-add_action( 'install_plugins_new',                    'display_plugins_table' );
-add_action( 'install_plugins_beta',                   'display_plugins_table' );
-add_action( 'install_plugins_favorites',              'display_plugins_table' );
-add_action( 'install_plugins_pre_plugin-information', 'install_plugin_information' );
+add_action('install_plugins_featured', 'install_dashboard');
+add_action('install_plugins_upload', 'install_plugins_upload');
+add_action('install_plugins_search', 'display_plugins_table');
+add_action('install_plugins_popular', 'display_plugins_table');
+add_action('install_plugins_recommended', 'display_plugins_table');
+add_action('install_plugins_new', 'display_plugins_table');
+add_action('install_plugins_beta', 'display_plugins_table');
+add_action('install_plugins_favorites', 'display_plugins_table');
+add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
 
 // Template hooks.
-add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts'                ) );
-add_action( 'user_register',         array( 'WP_Internal_Pointers', 'dismiss_pointers_for_new_users' ) );
+add_action('admin_enqueue_scripts', array('WP_Internal_Pointers', 'enqueue_scripts'));
+add_action('user_register', array('WP_Internal_Pointers', 'dismiss_pointers_for_new_users'));
 
 // Theme hooks.
-add_action( 'customize_controls_print_footer_scripts', 'customize_themes_print_templates' );
+add_action('customize_controls_print_footer_scripts', 'customize_themes_print_templates');
 
 // Theme Install hooks.
 // add_action('install_themes_dashboard', 'install_themes_dashboard');
@@ -93,29 +93,29 @@ 
 // add_action('install_themes_featured', 'display_themes');
 // add_action('install_themes_new', 'display_themes');
 // add_action('install_themes_updated', 'display_themes');
-add_action( 'install_themes_pre_theme-information', 'install_theme_information' );
+add_action('install_themes_pre_theme-information', 'install_theme_information');
 
 // User hooks.
-add_action( 'admin_init', 'default_password_nag_handler' );
+add_action('admin_init', 'default_password_nag_handler');
 
-add_action( 'admin_notices', 'default_password_nag' );
+add_action('admin_notices', 'default_password_nag');
 
-add_action( 'profile_update', 'default_password_nag_edit_user', 10, 2 );
+add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
 
 // Update hooks.
-add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called.
-add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called.
+add_action('load-plugins.php', 'wp_plugin_update_rows', 20); // After wp_update_plugins() is called.
+add_action('load-themes.php', 'wp_theme_update_rows', 20); // After wp_update_themes() is called.
 
-add_action( 'admin_notices', 'update_nag',      3  );
-add_action( 'admin_notices', 'maintenance_nag', 10 );
+add_action('admin_notices', 'update_nag', 3);
+add_action('admin_notices', 'maintenance_nag', 10);
 
-add_filter( 'update_footer', 'core_update_footer' );
+add_filter('update_footer', 'core_update_footer');
 
 // Update Core hooks.
-add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
+add_action('_core_updated_successfully', '_redirect_to_about_wordpress');
 
 // Upgrade hooks.
-add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
-add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 );
-add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 );
-add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
+add_action('upgrader_process_complete', array('Language_Pack_Upgrader', 'async_upgrade'), 20);
+add_action('upgrader_process_complete', 'wp_version_check', 10, 0);
+add_action('upgrader_process_complete', 'wp_update_plugins', 10, 0);
+add_action('upgrader_process_complete', 'wp_update_themes', 10, 0);

src/wp-admin/includes/class-wp-filesystem-ftpext.php

Spacing +96 added lines, -96 removed lines

@@ -22,44 +22,44 @@ 
 	 *
 	 * @param array $opt
 	 */
-	public function __construct( $opt = '' ) {
+	public function __construct($opt = '') {
 		$this->method = 'ftpext';
 		$this->errors = new WP_Error();
 
 		// Check if possible to use ftp functions.
-		if ( ! extension_loaded('ftp') ) {
+		if ( ! extension_loaded('ftp')) {
 			$this->errors->add('no_ftp_ext', __('The ftp PHP extension is not available'));
 			return;
 		}
 
 		// This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
 
-		if ( ! defined('FS_TIMEOUT') )
+		if ( ! defined('FS_TIMEOUT'))
 			define('FS_TIMEOUT', 240);
 
-		if ( empty($opt['port']) )
+		if (empty($opt['port']))
 			$this->options['port'] = 21;
 		else
 			$this->options['port'] = $opt['port'];
 
-		if ( empty($opt['hostname']) )
+		if (empty($opt['hostname']))
 			$this->errors->add('empty_hostname', __('FTP hostname is required'));
 		else
 			$this->options['hostname'] = $opt['hostname'];
 
 		// Check if the options provided are OK.
-		if ( empty($opt['username']) )
+		if (empty($opt['username']))
 			$this->errors->add('empty_username', __('FTP username is required'));
 		else
 			$this->options['username'] = $opt['username'];
 
-		if ( empty($opt['password']) )
+		if (empty($opt['password']))
 			$this->errors->add('empty_password', __('FTP password is required'));
 		else
 			$this->options['password'] = $opt['password'];
 
 		$this->options['ssl'] = false;
-		if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] )
+		if (isset($opt['connection_type']) && 'ftps' == $opt['connection_type'])
 			$this->options['ssl'] = true;
 	}
 
@@ -69,25 +69,25 @@ 
 	 * @return bool
 	 */
 	public function connect() {
-		if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
+		if (isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect'))
 			$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
 		else
 			$this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
 
-		if ( ! $this->link ) {
-			$this->errors->add( 'connect',
+		if ( ! $this->link) {
+			$this->errors->add('connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to connect to FTP Server %s' ),
-					$this->options['hostname'] . ':' . $this->options['port']
+				sprintf(__('Failed to connect to FTP Server %s'),
+					$this->options['hostname'].':'.$this->options['port']
 				)
 			);
 			return false;
 		}
 
-		if ( ! @ftp_login( $this->link,$this->options['username'], $this->options['password'] ) ) {
-			$this->errors->add( 'auth',
+		if ( ! @ftp_login($this->link, $this->options['username'], $this->options['password'])) {
+			$this->errors->add('auth',
 				/* translators: %s: username */
-				sprintf( __( 'Username/Password incorrect for %s' ),
+				sprintf(__('Username/Password incorrect for %s'),
 					$this->options['username']
 				)
 			);
@@ -95,8 +95,8 @@ 
 		}
 
 		// Set the Connection to use Passive FTP
-		@ftp_pasv( $this->link, true );
-		if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT )
+		@ftp_pasv($this->link, true);
+		if (@ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT)
 			@ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
 
 		return true;
@@ -112,25 +112,25 @@ 
 	 * @return string|false File contents on success, false if no temp file could be opened,
 	 *                      or if the file couldn't be retrieved.
 	 */
-	public function get_contents( $file ) {
+	public function get_contents($file) {
 		$tempfile = wp_tempnam($file);
 		$temp = fopen($tempfile, 'w+');
 
-		if ( ! $temp ) {
-			unlink( $tempfile );
+		if ( ! $temp) {
+			unlink($tempfile);
 			return false;
 		}
 
-		if ( ! @ftp_fget( $this->link, $temp, $file, FTP_BINARY ) ) {
-			fclose( $temp );
-			unlink( $tempfile );
+		if ( ! @ftp_fget($this->link, $temp, $file, FTP_BINARY)) {
+			fclose($temp);
+			unlink($tempfile);
 			return false;
 		}
 
-		fseek( $temp, 0 ); // Skip back to the start of the file being written to
+		fseek($temp, 0); // Skip back to the start of the file being written to
 		$contents = '';
 
-		while ( ! feof($temp) )
+		while ( ! feof($temp))
 			$contents .= fread($temp, 8192);
 
 		fclose($temp);
@@ -156,31 +156,31 @@ 
 	 * @param bool|int $mode
 	 * @return bool
 	 */
-	public function put_contents($file, $contents, $mode = false ) {
+	public function put_contents($file, $contents, $mode = false) {
 		$tempfile = wp_tempnam($file);
-		$temp = fopen( $tempfile, 'wb+' );
+		$temp = fopen($tempfile, 'wb+');
 
-		if ( ! $temp ) {
-			unlink( $tempfile );
+		if ( ! $temp) {
+			unlink($tempfile);
 			return false;
 		}
 
 		mbstring_binary_safe_encoding();
 
-		$data_length = strlen( $contents );
-		$bytes_written = fwrite( $temp, $contents );
+		$data_length = strlen($contents);
+		$bytes_written = fwrite($temp, $contents);
 
 		reset_mbstring_encoding();
 
-		if ( $data_length !== $bytes_written ) {
-			fclose( $temp );
-			unlink( $tempfile );
+		if ($data_length !== $bytes_written) {
+			fclose($temp);
+			unlink($tempfile);
 			return false;
 		}
 
-		fseek( $temp, 0 ); // Skip back to the start of the file being written to
+		fseek($temp, 0); // Skip back to the start of the file being written to
 
-		$ret = @ftp_fput( $this->link, $file, $temp, FTP_BINARY );
+		$ret = @ftp_fput($this->link, $file, $temp, FTP_BINARY);
 
 		fclose($temp);
 		unlink($tempfile);
@@ -197,7 +197,7 @@ 
 	 */
 	public function cwd() {
 		$cwd = @ftp_pwd($this->link);
-		if ( $cwd )
+		if ($cwd)
 			$cwd = trailingslashit($cwd);
 		return $cwd;
 	}
@@ -221,26 +221,26 @@ 
 	 * @return bool
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
-		if ( ! $mode ) {
-			if ( $this->is_file($file) )
+		if ( ! $mode) {
+			if ($this->is_file($file))
 				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
+			elseif ($this->is_dir($file))
 				$mode = FS_CHMOD_DIR;
 			else
 				return false;
 		}
 
 		// chmod any sub-objects if recursive.
-		if ( $recursive && $this->is_dir($file) ) {
+		if ($recursive && $this->is_dir($file)) {
 			$filelist = $this->dirlist($file);
-			foreach ( (array)$filelist as $filename => $filemeta )
-				$this->chmod($file . '/' . $filename, $mode, $recursive);
+			foreach ((array) $filelist as $filename => $filemeta)
+				$this->chmod($file.'/'.$filename, $mode, $recursive);
 		}
 
 		// chmod the file or directory
-		if ( ! function_exists('ftp_chmod') )
-			return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
-		return (bool)@ftp_chmod($this->link, $mode, $file);
+		if ( ! function_exists('ftp_chmod'))
+			return (bool) @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+		return (bool) @ftp_chmod($this->link, $mode, $file);
 	}
 
 	/**
@@ -285,10 +285,10 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+		if ( ! $overwrite && $this->exists($destination))
 			return false;
 		$content = $this->get_contents($source);
-		if ( false === $content )
+		if (false === $content)
 			return false;
 		return $this->put_contents($destination, $content, $mode);
 	}
@@ -314,17 +314,17 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty($file) )
+		if (empty($file))
 			return false;
-		if ( 'f' == $type || $this->is_file($file) )
+		if ('f' == $type || $this->is_file($file))
 			return @ftp_delete($this->link, $file);
-		if ( !$recursive )
+		if ( ! $recursive)
 			return @ftp_rmdir($this->link, $file);
 
-		$filelist = $this->dirlist( trailingslashit($file) );
-		if ( !empty($filelist) )
-			foreach ( $filelist as $delete_file )
-				$this->delete( trailingslashit($file) . $delete_file['name'], $recursive, $delete_file['type'] );
+		$filelist = $this->dirlist(trailingslashit($file));
+		if ( ! empty($filelist))
+			foreach ($filelist as $delete_file)
+				$this->delete(trailingslashit($file).$delete_file['name'], $recursive, $delete_file['type']);
 		return @ftp_rmdir($this->link, $file);
 	}
 
@@ -337,11 +337,11 @@ 
 	public function exists($file) {
 		$list = @ftp_nlist($this->link, $file);
 
-		if ( empty( $list ) && $this->is_dir( $file ) ) {
+		if (empty($list) && $this->is_dir($file)) {
 			return true; // File is an empty directory.
 		}
 
-		return !empty($list); //empty list = no file, so invert.
+		return ! empty($list); //empty list = no file, so invert.
 	}
 
 	/**
@@ -351,7 +351,7 @@ 
 	 * @return bool
 	 */
 	public function is_file($file) {
-		return $this->exists($file) && !$this->is_dir($file);
+		return $this->exists($file) && ! $this->is_dir($file);
 	}
 
 	/**
@@ -362,8 +362,8 @@ 
 	 */
 	public function is_dir($path) {
 		$cwd = $this->cwd();
-		$result = @ftp_chdir($this->link, trailingslashit($path) );
-		if ( $result && $path == $this->cwd() || $this->cwd() != $cwd ) {
+		$result = @ftp_chdir($this->link, trailingslashit($path));
+		if ($result && $path == $this->cwd() || $this->cwd() != $cwd) {
 			@ftp_chdir($this->link, $cwd);
 			return true;
 		}
@@ -441,10 +441,10 @@ 
 	 */
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		$path = untrailingslashit($path);
-		if ( empty($path) )
+		if (empty($path))
 			return false;
 
-		if ( !@ftp_mkdir($this->link, $path) )
+		if ( ! @ftp_mkdir($this->link, $path))
 			return false;
 		$this->chmod($path, $chmod);
 		return true;
@@ -470,17 +470,17 @@ 
 	 */
 	public function parselisting($line) {
 		static $is_windows = null;
-		if ( is_null($is_windows) )
-			$is_windows = stripos( ftp_systype($this->link), 'win') !== false;
+		if (is_null($is_windows))
+			$is_windows = stripos(ftp_systype($this->link), 'win') !== false;
 
-		if ( $is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer) ) {
+		if ($is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer)) {
 			$b = array();
-			if ( $lucifer[3] < 70 )
-				$lucifer[3] +=2000;
+			if ($lucifer[3] < 70)
+				$lucifer[3] += 2000;
 			else
 				$lucifer[3] += 1900; // 4digit year fix
-			$b['isdir'] = ( $lucifer[7] == '<DIR>');
-			if ( $b['isdir'] )
+			$b['isdir'] = ($lucifer[7] == '<DIR>');
+			if ($b['isdir'])
 				$b['type'] = 'd';
 			else
 				$b['type'] = 'f';
@@ -493,27 +493,27 @@ 
 			$b['time'] = @mktime($lucifer[4] + (strcasecmp($lucifer[6], "PM") == 0 ? 12 : 0), $lucifer[5], 0, $lucifer[1], $lucifer[2], $lucifer[3]);
 			$b['am/pm'] = $lucifer[6];
 			$b['name'] = $lucifer[8];
-		} elseif ( !$is_windows && $lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY)) {
+		} elseif ( ! $is_windows && $lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY)) {
 			//echo $line."\n";
 			$lcount = count($lucifer);
-			if ( $lcount < 8 )
+			if ($lcount < 8)
 				return '';
 			$b = array();
 			$b['isdir'] = $lucifer[0]{0} === 'd';
 			$b['islink'] = $lucifer[0]{0} === 'l';
-			if ( $b['isdir'] )
+			if ($b['isdir'])
 				$b['type'] = 'd';
-			elseif ( $b['islink'] )
+			elseif ($b['islink'])
 				$b['type'] = 'l';
 			else
 				$b['type'] = 'f';
 			$b['perms'] = $lucifer[0];
-			$b['permsn'] = $this->getnumchmodfromh( $b['perms'] );
+			$b['permsn'] = $this->getnumchmodfromh($b['perms']);
 			$b['number'] = $lucifer[1];
 			$b['owner'] = $lucifer[2];
 			$b['group'] = $lucifer[3];
 			$b['size'] = $lucifer[4];
-			if ( $lcount == 8 ) {
+			if ($lcount == 8) {
 				sscanf($lucifer[5], '%d-%d-%d', $b['year'], $b['month'], $b['day']);
 				sscanf($lucifer[6], '%d:%d', $b['hour'], $b['minute']);
 				$b['time'] = @mktime($b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year']);
@@ -521,7 +521,7 @@ 
 			} else {
 				$b['month'] = $lucifer[5];
 				$b['day'] = $lucifer[6];
-				if ( preg_match('/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2) ) {
+				if (preg_match('/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2)) {
 					$b['year'] = date("Y");
 					$b['hour'] = $l2[1];
 					$b['minute'] = $l2[2];
@@ -530,14 +530,14 @@ 
 					$b['hour'] = 0;
 					$b['minute'] = 0;
 				}
-				$b['time'] = strtotime( sprintf('%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute']) );
+				$b['time'] = strtotime(sprintf('%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute']));
 				$b['name'] = $lucifer[8];
 			}
 		}
 
 		// Replace symlinks formatted as "source -> target" with just the source name
-		if ( isset( $b['islink'] ) && $b['islink'] ) {
-			$b['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $b['name'] );
+		if (isset($b['islink']) && $b['islink']) {
+			$b['name'] = preg_replace('/(\s*->\s*.*)$/', '', $b['name']);
 		}
 
 		return $b;
@@ -552,50 +552,50 @@ 
 	 * @return bool|array
 	 */
 	public function dirlist($path = '.', $include_hidden = true, $recursive = false) {
-		if ( $this->is_file($path) ) {
+		if ($this->is_file($path)) {
 			$limit_file = basename($path);
-			$path = dirname($path) . '/';
+			$path = dirname($path).'/';
 		} else {
 			$limit_file = false;
 		}
 
 		$pwd = @ftp_pwd($this->link);
-		if ( ! @ftp_chdir($this->link, $path) ) // Cant change to folder = folder doesn't exist
+		if ( ! @ftp_chdir($this->link, $path)) // Cant change to folder = folder doesn't exist
 			return false;
 		$list = @ftp_rawlist($this->link, '-a', false);
 		@ftp_chdir($this->link, $pwd);
 
-		if ( empty($list) ) // Empty array = non-existent folder (real folder will show . at least)
+		if (empty($list)) // Empty array = non-existent folder (real folder will show . at least)
 			return false;
 
 		$dirlist = array();
-		foreach ( $list as $k => $v ) {
+		foreach ($list as $k => $v) {
 			$entry = $this->parselisting($v);
-			if ( empty($entry) )
+			if (empty($entry))
 				continue;
 
-			if ( '.' == $entry['name'] || '..' == $entry['name'] )
+			if ('.' == $entry['name'] || '..' == $entry['name'])
 				continue;
 
-			if ( ! $include_hidden && '.' == $entry['name'][0] )
+			if ( ! $include_hidden && '.' == $entry['name'][0])
 				continue;
 
-			if ( $limit_file && $entry['name'] != $limit_file)
+			if ($limit_file && $entry['name'] != $limit_file)
 				continue;
 
-			$dirlist[ $entry['name'] ] = $entry;
+			$dirlist[$entry['name']] = $entry;
 		}
 
 		$ret = array();
-		foreach ( (array)$dirlist as $struc ) {
-			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+		foreach ((array) $dirlist as $struc) {
+			if ('d' == $struc['type']) {
+				if ($recursive)
+					$struc['files'] = $this->dirlist($path.'/'.$struc['name'], $include_hidden, $recursive);
 				else
 					$struc['files'] = array();
 			}
 
-			$ret[ $struc['name'] ] = $struc;
+			$ret[$struc['name']] = $struc;
 		}
 		return $ret;
 	}
@@ -604,7 +604,7 @@ 
 	 * @access public
 	 */
 	public function __destruct() {
-		if ( $this->link )
+		if ($this->link)
 			ftp_close($this->link);
 	}
 }

Braces +127 added lines, -90 removed lines

@@ -34,33 +34,39 @@ 
 
 		// This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
 
-		if ( ! defined('FS_TIMEOUT') )
-			define('FS_TIMEOUT', 240);
+		if ( ! defined('FS_TIMEOUT') ) {
+					define('FS_TIMEOUT', 240);
+		}
 
-		if ( empty($opt['port']) )
-			$this->options['port'] = 21;
-		else
-			$this->options['port'] = $opt['port'];
+		if ( empty($opt['port']) ) {
+					$this->options['port'] = 21;
+		} else {
+					$this->options['port'] = $opt['port'];
+		}
 
-		if ( empty($opt['hostname']) )
-			$this->errors->add('empty_hostname', __('FTP hostname is required'));
-		else
-			$this->options['hostname'] = $opt['hostname'];
+		if ( empty($opt['hostname']) ) {
+					$this->errors->add('empty_hostname', __('FTP hostname is required'));
+		} else {
+					$this->options['hostname'] = $opt['hostname'];
+		}
 
 		// Check if the options provided are OK.
-		if ( empty($opt['username']) )
-			$this->errors->add('empty_username', __('FTP username is required'));
-		else
-			$this->options['username'] = $opt['username'];
+		if ( empty($opt['username']) ) {
+					$this->errors->add('empty_username', __('FTP username is required'));
+		} else {
+					$this->options['username'] = $opt['username'];
+		}
 
-		if ( empty($opt['password']) )
-			$this->errors->add('empty_password', __('FTP password is required'));
-		else
-			$this->options['password'] = $opt['password'];
+		if ( empty($opt['password']) ) {
+					$this->errors->add('empty_password', __('FTP password is required'));
+		} else {
+					$this->options['password'] = $opt['password'];
+		}
 
 		$this->options['ssl'] = false;
-		if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] )
-			$this->options['ssl'] = true;
+		if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] ) {
+					$this->options['ssl'] = true;
+		}
 	}
 
 	/**
@@ -69,10 +75,11 @@ 
 	 * @return bool
 	 */
 	public function connect() {
-		if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
-			$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
-		else
-			$this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
+		if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') ) {
+					$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
+		} else {
+					$this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
+		}
 
 		if ( ! $this->link ) {
 			$this->errors->add( 'connect',
@@ -96,8 +103,9 @@ 
 
 		// Set the Connection to use Passive FTP
 		@ftp_pasv( $this->link, true );
-		if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT )
-			@ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
+		if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT ) {
+					@ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
+		}
 
 		return true;
 	}
@@ -130,8 +138,9 @@ 
 		fseek( $temp, 0 ); // Skip back to the start of the file being written to
 		$contents = '';
 
-		while ( ! feof($temp) )
-			$contents .= fread($temp, 8192);
+		while ( ! feof($temp) ) {
+					$contents .= fread($temp, 8192);
+		}
 
 		fclose($temp);
 		unlink($tempfile);
@@ -197,8 +206,9 @@ 
 	 */
 	public function cwd() {
 		$cwd = @ftp_pwd($this->link);
-		if ( $cwd )
-			$cwd = trailingslashit($cwd);
+		if ( $cwd ) {
+					$cwd = trailingslashit($cwd);
+		}
 		return $cwd;
 	}
 
@@ -222,24 +232,27 @@ 
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
 		if ( ! $mode ) {
-			if ( $this->is_file($file) )
-				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
-				$mode = FS_CHMOD_DIR;
-			else
-				return false;
+			if ( $this->is_file($file) ) {
+							$mode = FS_CHMOD_FILE;
+			} elseif ( $this->is_dir($file) ) {
+							$mode = FS_CHMOD_DIR;
+			} else {
+							return false;
+			}
 		}
 
 		// chmod any sub-objects if recursive.
 		if ( $recursive && $this->is_dir($file) ) {
 			$filelist = $this->dirlist($file);
-			foreach ( (array)$filelist as $filename => $filemeta )
-				$this->chmod($file . '/' . $filename, $mode, $recursive);
+			foreach ( (array)$filelist as $filename => $filemeta ) {
+							$this->chmod($file . '/' . $filename, $mode, $recursive);
+			}
 		}
 
 		// chmod the file or directory
-		if ( ! function_exists('ftp_chmod') )
-			return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+		if ( ! function_exists('ftp_chmod') ) {
+					return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+		}
 		return (bool)@ftp_chmod($this->link, $mode, $file);
 	}
 
@@ -285,11 +298,13 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
-			return false;
+		if ( ! $overwrite && $this->exists($destination) ) {
+					return false;
+		}
 		$content = $this->get_contents($source);
-		if ( false === $content )
-			return false;
+		if ( false === $content ) {
+					return false;
+		}
 		return $this->put_contents($destination, $content, $mode);
 	}
 
@@ -314,17 +329,21 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty($file) )
-			return false;
-		if ( 'f' == $type || $this->is_file($file) )
-			return @ftp_delete($this->link, $file);
-		if ( !$recursive )
-			return @ftp_rmdir($this->link, $file);
+		if ( empty($file) ) {
+					return false;
+		}
+		if ( 'f' == $type || $this->is_file($file) ) {
+					return @ftp_delete($this->link, $file);
+		}
+		if ( !$recursive ) {
+					return @ftp_rmdir($this->link, $file);
+		}
 
 		$filelist = $this->dirlist( trailingslashit($file) );
-		if ( !empty($filelist) )
-			foreach ( $filelist as $delete_file )
+		if ( !empty($filelist) ) {
+					foreach ( $filelist as $delete_file )
 				$this->delete( trailingslashit($file) . $delete_file['name'], $recursive, $delete_file['type'] );
+		}
 		return @ftp_rmdir($this->link, $file);
 	}
 
@@ -441,11 +460,13 @@ 
 	 */
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		$path = untrailingslashit($path);
-		if ( empty($path) )
-			return false;
+		if ( empty($path) ) {
+					return false;
+		}
 
-		if ( !@ftp_mkdir($this->link, $path) )
-			return false;
+		if ( !@ftp_mkdir($this->link, $path) ) {
+					return false;
+		}
 		$this->chmod($path, $chmod);
 		return true;
 	}
@@ -470,20 +491,24 @@ 
 	 */
 	public function parselisting($line) {
 		static $is_windows = null;
-		if ( is_null($is_windows) )
-			$is_windows = stripos( ftp_systype($this->link), 'win') !== false;
+		if ( is_null($is_windows) ) {
+					$is_windows = stripos( ftp_systype($this->link), 'win') !== false;
+		}
 
 		if ( $is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer) ) {
 			$b = array();
-			if ( $lucifer[3] < 70 )
-				$lucifer[3] +=2000;
-			else
-				$lucifer[3] += 1900; // 4digit year fix
+			if ( $lucifer[3] < 70 ) {
+							$lucifer[3] +=2000;
+			} else {
+							$lucifer[3] += 1900;
+			}
+			// 4digit year fix
 			$b['isdir'] = ( $lucifer[7] == '<DIR>');
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			else
-				$b['type'] = 'f';
+			if ( $b['isdir'] ) {
+							$b['type'] = 'd';
+			} else {
+							$b['type'] = 'f';
+			}
 			$b['size'] = $lucifer[7];
 			$b['month'] = $lucifer[1];
 			$b['day'] = $lucifer[2];
@@ -496,17 +521,19 @@ 
 		} elseif ( !$is_windows && $lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY)) {
 			//echo $line."\n";
 			$lcount = count($lucifer);
-			if ( $lcount < 8 )
-				return '';
+			if ( $lcount < 8 ) {
+							return '';
+			}
 			$b = array();
 			$b['isdir'] = $lucifer[0]{0} === 'd';
 			$b['islink'] = $lucifer[0]{0} === 'l';
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			elseif ( $b['islink'] )
-				$b['type'] = 'l';
-			else
-				$b['type'] = 'f';
+			if ( $b['isdir'] ) {
+							$b['type'] = 'd';
+			} elseif ( $b['islink'] ) {
+							$b['type'] = 'l';
+			} else {
+							$b['type'] = 'f';
+			}
 			$b['perms'] = $lucifer[0];
 			$b['permsn'] = $this->getnumchmodfromh( $b['perms'] );
 			$b['number'] = $lucifer[1];
@@ -560,28 +587,36 @@ 
 		}
 
 		$pwd = @ftp_pwd($this->link);
-		if ( ! @ftp_chdir($this->link, $path) ) // Cant change to folder = folder doesn't exist
+		if ( ! @ftp_chdir($this->link, $path) ) {
+			// Cant change to folder = folder doesn't exist
 			return false;
+		}
 		$list = @ftp_rawlist($this->link, '-a', false);
 		@ftp_chdir($this->link, $pwd);
 
-		if ( empty($list) ) // Empty array = non-existent folder (real folder will show . at least)
+		if ( empty($list) ) {
+			// Empty array = non-existent folder (real folder will show . at least)
 			return false;
+		}
 
 		$dirlist = array();
 		foreach ( $list as $k => $v ) {
 			$entry = $this->parselisting($v);
-			if ( empty($entry) )
-				continue;
+			if ( empty($entry) ) {
+							continue;
+			}
 
-			if ( '.' == $entry['name'] || '..' == $entry['name'] )
-				continue;
+			if ( '.' == $entry['name'] || '..' == $entry['name'] ) {
+							continue;
+			}
 
-			if ( ! $include_hidden && '.' == $entry['name'][0] )
-				continue;
+			if ( ! $include_hidden && '.' == $entry['name'][0] ) {
+							continue;
+			}
 
-			if ( $limit_file && $entry['name'] != $limit_file)
-				continue;
+			if ( $limit_file && $entry['name'] != $limit_file) {
+							continue;
+			}
 
 			$dirlist[ $entry['name'] ] = $entry;
 		}
@@ -589,10 +624,11 @@ 
 		$ret = array();
 		foreach ( (array)$dirlist as $struc ) {
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
-				else
-					$struc['files'] = array();
+				if ( $recursive ) {
+									$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+				} else {
+									$struc['files'] = array();
+				}
 			}
 
 			$ret[ $struc['name'] ] = $struc;
@@ -604,7 +640,8 @@ 
 	 * @access public
 	 */
 	public function __destruct() {
-		if ( $this->link )
-			ftp_close($this->link);
+		if ( $this->link ) {
+					ftp_close($this->link);
+		}
 	}
 }

Doc Comments +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
 	 *
 	 * @param string $file
 	 * @param string $contents
-	 * @param bool|int $mode
+	 * @param string|boolean $mode
 	 * @return bool
 	 */
 	public function put_contents($file, $contents, $mode = false ) {

src/wp-admin/includes/comment.php

Spacing +44 added lines, -44 removed lines

@@ -24,19 +24,19 @@ 
  *
  * @return mixed Comment post ID on success.
  */
-function comment_exists( $comment_author, $comment_date, $timezone = 'blog' ) {
+function comment_exists($comment_author, $comment_date, $timezone = 'blog') {
 	global $wpdb;
 
 	$date_field = 'comment_date';
-	if ( 'gmt' === $timezone ) {
+	if ('gmt' === $timezone) {
 		$date_field = 'comment_date_gmt';
 	}
 
-	return $wpdb->get_var( $wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
+	return $wpdb->get_var($wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
 			WHERE comment_author = %s AND $date_field = %s",
-			stripslashes( $comment_author ),
-			stripslashes( $comment_date )
-	) );
+			stripslashes($comment_author),
+			stripslashes($comment_date)
+	));
 }
 
 /**
@@ -45,44 +45,44 @@ 
  * @since 2.0.0
  */
 function edit_comment() {
-	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
-		wp_die ( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
+	if ( ! current_user_can('edit_comment', (int) $_POST['comment_ID']))
+		wp_die(__('Sorry, you are not allowed to edit comments on this post.'));
 
-	if ( isset( $_POST['newcomment_author'] ) )
+	if (isset($_POST['newcomment_author']))
 		$_POST['comment_author'] = $_POST['newcomment_author'];
-	if ( isset( $_POST['newcomment_author_email'] ) )
+	if (isset($_POST['newcomment_author_email']))
 		$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
-	if ( isset( $_POST['newcomment_author_url'] ) )
+	if (isset($_POST['newcomment_author_url']))
 		$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-	if ( isset( $_POST['comment_status'] ) )
+	if (isset($_POST['comment_status']))
 		$_POST['comment_approved'] = $_POST['comment_status'];
-	if ( isset( $_POST['content'] ) )
+	if (isset($_POST['content']))
 		$_POST['comment_content'] = $_POST['content'];
-	if ( isset( $_POST['comment_ID'] ) )
+	if (isset($_POST['comment_ID']))
 		$_POST['comment_ID'] = (int) $_POST['comment_ID'];
 
-	foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
-		if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
+	foreach (array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit) {
+		if ( ! empty($_POST['hidden_'.$timeunit]) && $_POST['hidden_'.$timeunit] != $_POST[$timeunit]) {
 			$_POST['edit_date'] = '1';
 			break;
 		}
 	}
 
-	if ( !empty ( $_POST['edit_date'] ) ) {
+	if ( ! empty ($_POST['edit_date'])) {
 		$aa = $_POST['aa'];
 		$mm = $_POST['mm'];
 		$jj = $_POST['jj'];
 		$hh = $_POST['hh'];
 		$mn = $_POST['mn'];
 		$ss = $_POST['ss'];
-		$jj = ($jj > 31 ) ? 31 : $jj;
-		$hh = ($hh > 23 ) ? $hh -24 : $hh;
-		$mn = ($mn > 59 ) ? $mn -60 : $mn;
-		$ss = ($ss > 59 ) ? $ss -60 : $ss;
+		$jj = ($jj > 31) ? 31 : $jj;
+		$hh = ($hh > 23) ? $hh - 24 : $hh;
+		$mn = ($mn > 59) ? $mn - 60 : $mn;
+		$ss = ($ss > 59) ? $ss - 60 : $ss;
 		$_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
 	}
 
-	wp_update_comment( $_POST );
+	wp_update_comment($_POST);
 }
 
 /**
@@ -93,14 +93,14 @@ 
  * @param int $id ID of comment to retrieve.
  * @return WP_Comment|false Comment if found. False on failure.
  */
-function get_comment_to_edit( $id ) {
-	if ( !$comment = get_comment($id) )
+function get_comment_to_edit($id) {
+	if ( ! $comment = get_comment($id))
 		return false;
 
 	$comment->comment_ID = (int) $comment->comment_ID;
 	$comment->comment_post_ID = (int) $comment->comment_post_ID;
 
-	$comment->comment_content = format_to_edit( $comment->comment_content );
+	$comment->comment_content = format_to_edit($comment->comment_content);
 	/**
 	 * Filters the comment content before editing.
 	 *
@@ -108,11 +108,11 @@ 
 	 *
 	 * @param string $comment->comment_content Comment content.
 	 */
-	$comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
+	$comment->comment_content = apply_filters('comment_edit_pre', $comment->comment_content);
 
-	$comment->comment_author = format_to_edit( $comment->comment_author );
-	$comment->comment_author_email = format_to_edit( $comment->comment_author_email );
-	$comment->comment_author_url = format_to_edit( $comment->comment_author_url );
+	$comment->comment_author = format_to_edit($comment->comment_author);
+	$comment->comment_author_email = format_to_edit($comment->comment_author_email);
+	$comment->comment_author_url = format_to_edit($comment->comment_author_url);
 	$comment->comment_author_url = esc_url($comment->comment_author_url);
 
 	return $comment;
@@ -128,23 +128,23 @@ 
  * @param int|array $post_id Either a single Post ID or an array of Post IDs
  * @return int|array Either a single Posts pending comments as an int or an array of ints keyed on the Post IDs
  */
-function get_pending_comments_num( $post_id ) {
+function get_pending_comments_num($post_id) {
 	global $wpdb;
 
 	$single = false;
-	if ( !is_array($post_id) ) {
+	if ( ! is_array($post_id)) {
 		$post_id_array = (array) $post_id;
 		$single = true;
 	} else {
 		$post_id_array = $post_id;
 	}
 	$post_id_array = array_map('intval', $post_id_array);
-	$post_id_in = "'" . implode("', '", $post_id_array) . "'";
+	$post_id_in = "'".implode("', '", $post_id_array)."'";
 
-	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
+	$pending = $wpdb->get_results("SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A);
 
-	if ( $single ) {
-		if ( empty($pending) )
+	if ($single) {
+		if (empty($pending))
 			return 0;
 		else
 			return absint($pending[0]['num_comments']);
@@ -153,11 +153,11 @@ 
 	$pending_keyed = array();
 
 	// Default to zero pending for all posts in request
-	foreach ( $post_id_array as $id )
+	foreach ($post_id_array as $id)
 		$pending_keyed[$id] = 0;
 
-	if ( !empty($pending) )
-		foreach ( $pending as $pend )
+	if ( ! empty($pending))
+		foreach ($pending as $pend)
 			$pending_keyed[$pend['comment_post_ID']] = absint($pend['num_comments']);
 
 	return $pending_keyed;
@@ -171,8 +171,8 @@ 
  * @param string $name User name.
  * @return string Avatar with Admin name.
  */
-function floated_admin_avatar( $name ) {
-	$avatar = get_avatar( get_comment(), 32, 'mystery' );
+function floated_admin_avatar($name) {
+	$avatar = get_avatar(get_comment(), 32, 'mystery');
 	return "$avatar $name";
 }
 
@@ -180,8 +180,8 @@ 
  * @since 2.7.0
  */
 function enqueue_comment_hotkeys_js() {
-	if ( 'true' == get_user_option( 'comment_shortcuts' ) )
-		wp_enqueue_script( 'jquery-table-hotkeys' );
+	if ('true' == get_user_option('comment_shortcuts'))
+		wp_enqueue_script('jquery-table-hotkeys');
 }
 
 /**
@@ -189,8 +189,8 @@ 
  *
  * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
  */
-function comment_footer_die( $msg ) {
+function comment_footer_die($msg) {
 	echo "<div class='wrap'><p>$msg</p></div>";
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	die;
 }
\ No newline at end of file

Braces +40 added lines, -28 removed lines

@@ -45,21 +45,28 @@ 
  * @since 2.0.0
  */
 function edit_comment() {
-	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
-		wp_die ( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
-
-	if ( isset( $_POST['newcomment_author'] ) )
-		$_POST['comment_author'] = $_POST['newcomment_author'];
-	if ( isset( $_POST['newcomment_author_email'] ) )
-		$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
-	if ( isset( $_POST['newcomment_author_url'] ) )
-		$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-	if ( isset( $_POST['comment_status'] ) )
-		$_POST['comment_approved'] = $_POST['comment_status'];
-	if ( isset( $_POST['content'] ) )
-		$_POST['comment_content'] = $_POST['content'];
-	if ( isset( $_POST['comment_ID'] ) )
-		$_POST['comment_ID'] = (int) $_POST['comment_ID'];
+	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) ) {
+			wp_die ( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
+	}
+
+	if ( isset( $_POST['newcomment_author'] ) ) {
+			$_POST['comment_author'] = $_POST['newcomment_author'];
+	}
+	if ( isset( $_POST['newcomment_author_email'] ) ) {
+			$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
+	}
+	if ( isset( $_POST['newcomment_author_url'] ) ) {
+			$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
+	}
+	if ( isset( $_POST['comment_status'] ) ) {
+			$_POST['comment_approved'] = $_POST['comment_status'];
+	}
+	if ( isset( $_POST['content'] ) ) {
+			$_POST['comment_content'] = $_POST['content'];
+	}
+	if ( isset( $_POST['comment_ID'] ) ) {
+			$_POST['comment_ID'] = (int) $_POST['comment_ID'];
+	}
 
 	foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
 		if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
@@ -94,8 +101,9 @@ 
  * @return WP_Comment|false Comment if found. False on failure.
  */
 function get_comment_to_edit( $id ) {
-	if ( !$comment = get_comment($id) )
-		return false;
+	if ( !$comment = get_comment($id) ) {
+			return false;
+	}
 
 	$comment->comment_ID = (int) $comment->comment_ID;
 	$comment->comment_post_ID = (int) $comment->comment_post_ID;
@@ -144,21 +152,24 @@ 
 	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
 
 	if ( $single ) {
-		if ( empty($pending) )
-			return 0;
-		else
-			return absint($pending[0]['num_comments']);
+		if ( empty($pending) ) {
+					return 0;
+		} else {
+					return absint($pending[0]['num_comments']);
+		}
 	}
 
 	$pending_keyed = array();
 
 	// Default to zero pending for all posts in request
-	foreach ( $post_id_array as $id )
-		$pending_keyed[$id] = 0;
+	foreach ( $post_id_array as $id ) {
+			$pending_keyed[$id] = 0;
+	}
 
-	if ( !empty($pending) )
-		foreach ( $pending as $pend )
+	if ( !empty($pending) ) {
+			foreach ( $pending as $pend )
 			$pending_keyed[$pend['comment_post_ID']] = absint($pend['num_comments']);
+	}
 
 	return $pending_keyed;
 }
@@ -180,9 +191,10 @@ 
  * @since 2.7.0
  */
 function enqueue_comment_hotkeys_js() {
-	if ( 'true' == get_user_option( 'comment_shortcuts' ) )
-		wp_enqueue_script( 'jquery-table-hotkeys' );
-}
+	if ( 'true' == get_user_option( 'comment_shortcuts' ) ) {
+			wp_enqueue_script( 'jquery-table-hotkeys' );
+	}
+	}
 
 /**
  * Display error message at bottom of comments.

src/wp-admin/admin-functions.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@
  * @subpackage Administration
  */
 
-_deprecated_file( basename(__FILE__), '2.5.0', 'wp-admin/includes/admin.php' );
+_deprecated_file(basename(__FILE__), '2.5.0', 'wp-admin/includes/admin.php');
 
 /** WordPress Administration API: Includes all Administration functions. */
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once(ABSPATH.'wp-admin/includes/admin.php');