ntwb / wordpress

src/wp-includes/ID3/module.tag.lyrics3.php

Doc Comments +6 added lines

@@ -126,6 +126,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param integer $version
+	 */
 	public function getLyrics3Data($endoffset, $version, $length) {
 		// http://www.volweb.cz/str/tags.htm
 
@@ -287,6 +290,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $char
+	 */
 	public function IntString2Bool($char) {
 		if ($char == '1') {
 			return true;

Spacing +10 added lines, -10 removed lines

@@ -23,15 +23,15 @@ 
 
 		// http://www.volweb.cz/str/tags.htm
 
-		if (!getid3_lib::intValueSupported($info['filesize'])) {
+		if ( ! getid3_lib::intValueSupported($info['filesize'])) {
 			$info['warning'][] = 'Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
 			return false;
 		}
 
-		$this->fseek((0 - 128 - 9 - 6), SEEK_END);          // end - ID3v1 - "LYRICSEND" - [Lyrics3size]
+		$this->fseek((0 - 128 - 9 - 6), SEEK_END); // end - ID3v1 - "LYRICSEND" - [Lyrics3size]
 		$lyrics3_id3v1 = $this->fread(128 + 9 + 6);
-		$lyrics3lsz    = substr($lyrics3_id3v1,  0,   6); // Lyrics3size
-		$lyrics3end    = substr($lyrics3_id3v1,  6,   9); // LYRICSEND or LYRICS200
+		$lyrics3lsz    = substr($lyrics3_id3v1, 0, 6); // Lyrics3size
+		$lyrics3end    = substr($lyrics3_id3v1, 6, 9); // LYRICSEND or LYRICS200
 		$id3v1tag      = substr($lyrics3_id3v1, 15, 128); // ID3v1
 
 		if ($lyrics3end == 'LYRICSEND') {
@@ -100,7 +100,7 @@ 
 			$info['avdataend'] = $lyrics3offset;
 			$this->getLyrics3Data($lyrics3offset, $lyrics3version, $lyrics3size);
 
-			if (!isset($info['ape'])) {
+			if ( ! isset($info['ape'])) {
 				if (isset($info['lyrics3']['tag_offset_start'])) {
 					$GETID3_ERRORARRAY = &$info['warning'];
 					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, true);
@@ -109,10 +109,10 @@ 
 					$getid3_apetag = new getid3_apetag($getid3_temp);
 					$getid3_apetag->overrideendoffset = $info['lyrics3']['tag_offset_start'];
 					$getid3_apetag->Analyze();
-					if (!empty($getid3_temp->info['ape'])) {
+					if ( ! empty($getid3_temp->info['ape'])) {
 						$info['ape'] = $getid3_temp->info['ape'];
 					}
-					if (!empty($getid3_temp->info['replay_gain'])) {
+					if ( ! empty($getid3_temp->info['replay_gain'])) {
 						$info['replay_gain'] = $getid3_temp->info['replay_gain'];
 					}
 					unset($getid3_temp, $getid3_apetag);
@@ -131,7 +131,7 @@ 
 
 		$info = &$this->getid3->info;
 
-		if (!getid3_lib::intValueSupported($endoffset)) {
+		if ( ! getid3_lib::intValueSupported($endoffset)) {
 			$info['warning'][] = 'Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
 			return false;
 		}
@@ -211,8 +211,8 @@ 
 						foreach ($imagestrings as $key => $imagestring) {
 							if (strpos($imagestring, '||') !== false) {
 								$imagearray = explode('||', $imagestring);
-								$ParsedLyrics3['images'][$key]['filename']     =                                (isset($imagearray[0]) ? $imagearray[0] : '');
-								$ParsedLyrics3['images'][$key]['description']  =                                (isset($imagearray[1]) ? $imagearray[1] : '');
+								$ParsedLyrics3['images'][$key]['filename']     = (isset($imagearray[0]) ? $imagearray[0] : '');
+								$ParsedLyrics3['images'][$key]['description']  = (isset($imagearray[1]) ? $imagearray[1] : '');
 								$ParsedLyrics3['images'][$key]['timestamp']    = $this->Lyrics3Timestamp2Seconds(isset($imagearray[2]) ? $imagearray[2] : '');
 							}
 						}

src/wp-includes/load.php

Doc Comments +1 added lines, -1 removed lines

@@ -218,7 +218,7 @@
  * @global float   $timestart Seconds from when timer_start() is called.
  * @global float   $timeend   Seconds from when function is called.
  *
- * @param int|bool $display   Whether to echo or return the results. Accepts 0|false for return,
+ * @param integer $display   Whether to echo or return the results. Accepts 0|false for return,
  *                            1|true for echo. Default 0|false.
  * @param int      $precision The number of digits from the right of the decimal to display.
  *                            Default 3.

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * These functions are needed to load WordPress.
- *
- * @internal This file must be parsable by PHP4.
- *
- * @package WordPress
- */
+	 * These functions are needed to load WordPress.
+	 *
+	 * @internal This file must be parsable by PHP4.
+	 *
+	 * @package WordPress
+	 */
 
 /**
  * Turn register globals off.

Spacing +184 added lines, -184 removed lines

@@ -16,7 +16,7 @@ 
  */
 function wp_get_server_protocol() {
 	$protocol = $_SERVER['SERVER_PROTOCOL'];
-	if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
+	if ( ! in_array($protocol, array('HTTP/1.1', 'HTTP/2', 'HTTP/2.0'))) {
 		$protocol = 'HTTP/1.0';
 	}
 	return $protocol;
@@ -29,19 +29,19 @@ 
  * @access private
  */
 function wp_unregister_GLOBALS() {
-	if ( !ini_get( 'register_globals' ) )
+	if ( ! ini_get('register_globals'))
 		return;
 
-	if ( isset( $_REQUEST['GLOBALS'] ) )
-		die( 'GLOBALS overwrite attempt detected' );
+	if (isset($_REQUEST['GLOBALS']))
+		die('GLOBALS overwrite attempt detected');
 
 	// Variables that shouldn't be unset
-	$no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
+	$no_unset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix');
 
-	$input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset( $_SESSION ) && is_array( $_SESSION ) ? $_SESSION : array() );
-	foreach ( $input as $k => $v )
-		if ( !in_array( $k, $no_unset ) && isset( $GLOBALS[$k] ) ) {
-			unset( $GLOBALS[$k] );
+	$input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
+	foreach ($input as $k => $v)
+		if ( ! in_array($k, $no_unset) && isset($GLOBALS[$k])) {
+			unset($GLOBALS[$k]);
 		}
 }
 
@@ -62,50 +62,50 @@ 
 		'REQUEST_URI' => '',
 	);
 
-	$_SERVER = array_merge( $default_server_values, $_SERVER );
+	$_SERVER = array_merge($default_server_values, $_SERVER);
 
 	// Fix for IIS when running with PHP ISAPI
-	if ( empty( $_SERVER['REQUEST_URI'] ) || ( PHP_SAPI != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
+	if (empty($_SERVER['REQUEST_URI']) || (PHP_SAPI != 'cgi-fcgi' && preg_match('/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE']))) {
 
 		// IIS Mod-Rewrite
-		if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
+		if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
 			$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
 		}
 		// IIS Isapi_Rewrite
-		elseif ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
+		elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
 			$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
 		} else {
 			// Use ORIG_PATH_INFO if there is no PATH_INFO
-			if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) )
+			if ( ! isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO']))
 				$_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
 
 			// Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
-			if ( isset( $_SERVER['PATH_INFO'] ) ) {
-				if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
+			if (isset($_SERVER['PATH_INFO'])) {
+				if ($_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'])
 					$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
 				else
-					$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
+					$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'].$_SERVER['PATH_INFO'];
 			}
 
 			// Append the query string if it exists and isn't null
-			if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
-				$_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
+			if ( ! empty($_SERVER['QUERY_STRING'])) {
+				$_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING'];
 			}
 		}
 	}
 
 	// Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
-	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) )
+	if (isset($_SERVER['SCRIPT_FILENAME']) && (strpos($_SERVER['SCRIPT_FILENAME'], 'php.cgi') == strlen($_SERVER['SCRIPT_FILENAME']) - 7))
 		$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
 
 	// Fix for Dreamhost and other PHP as CGI hosts
-	if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false )
-		unset( $_SERVER['PATH_INFO'] );
+	if (strpos($_SERVER['SCRIPT_NAME'], 'php.cgi') !== false)
+		unset($_SERVER['PATH_INFO']);
 
 	// Fix empty PHP_SELF
 	$PHP_SELF = $_SERVER['PHP_SELF'];
-	if ( empty( $PHP_SELF ) )
-		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
+	if (empty($PHP_SELF))
+		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace('/(\?.*)?$/', '', $_SERVER["REQUEST_URI"]);
 }
 
 /**
@@ -124,22 +124,22 @@ 
 	global $required_php_version, $wp_version;
 	$php_version = phpversion();
 
-	if ( version_compare( $required_php_version, $php_version, '>' ) ) {
+	if (version_compare($required_php_version, $php_version, '>')) {
 		wp_load_translations_early();
 
 		$protocol = wp_get_server_protocol();
-		header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
-		header( 'Content-Type: text/html; charset=utf-8' );
-		die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
+		header(sprintf('%s 500 Internal Server Error', $protocol), true, 500);
+		header('Content-Type: text/html; charset=utf-8');
+		die(sprintf(__('Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.'), $php_version, $wp_version, $required_php_version));
 	}
 
-	if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! extension_loaded( 'mysqlnd' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
+	if ( ! extension_loaded('mysql') && ! extension_loaded('mysqli') && ! extension_loaded('mysqlnd') && ! file_exists(WP_CONTENT_DIR.'/db.php')) {
 		wp_load_translations_early();
 
 		$protocol = wp_get_server_protocol();
-		header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
-		header( 'Content-Type: text/html; charset=utf-8' );
-		die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );
+		header(sprintf('%s 500 Internal Server Error', $protocol), true, 500);
+		header('Content-Type: text/html; charset=utf-8');
+		die(__('Your PHP installation appears to be missing the MySQL extension which is required by WordPress.'));
 	}
 }
 
@@ -151,7 +151,7 @@ 
  * @since 3.0.0
  */
 function wp_favicon_request() {
-	if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) {
+	if ('/favicon.ico' == $_SERVER['REQUEST_URI']) {
 		header('Content-Type: image/vnd.microsoft.icon');
 		exit;
 	}
@@ -174,37 +174,37 @@ 
  * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
  */
 function wp_maintenance() {
-	if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() )
+	if ( ! file_exists(ABSPATH.'.maintenance') || wp_installing())
 		return;
 
 	global $upgrading;
 
-	include( ABSPATH . '.maintenance' );
+	include(ABSPATH.'.maintenance');
 	// If the $upgrading timestamp is older than 10 minutes, don't die.
-	if ( ( time() - $upgrading ) >= 600 )
+	if ((time() - $upgrading) >= 600)
 		return;
 
-	if ( file_exists( WP_CONTENT_DIR . '/maintenance.php' ) ) {
-		require_once( WP_CONTENT_DIR . '/maintenance.php' );
+	if (file_exists(WP_CONTENT_DIR.'/maintenance.php')) {
+		require_once(WP_CONTENT_DIR.'/maintenance.php');
 		die();
 	}
 
 	wp_load_translations_early();
 
 	$protocol = wp_get_server_protocol();
-	header( "$protocol 503 Service Unavailable", true, 503 );
-	header( 'Content-Type: text/html; charset=utf-8' );
-	header( 'Retry-After: 600' );
+	header("$protocol 503 Service Unavailable", true, 503);
+	header('Content-Type: text/html; charset=utf-8');
+	header('Retry-After: 600');
 ?>
 	<!DOCTYPE html>
-	<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+	<html xmlns="http://www.w3.org/1999/xhtml"<?php if (is_rtl()) echo ' dir="rtl"'; ?>>
 	<head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title><?php _e( 'Maintenance' ); ?></title>
+		<title><?php _e('Maintenance'); ?></title>
 
 	</head>
 	<body>
-		<h1><?php _e( 'Briefly unavailable for scheduled maintenance. Check back in a minute.' ); ?></h1>
+		<h1><?php _e('Briefly unavailable for scheduled maintenance. Check back in a minute.'); ?></h1>
 	</body>
 	</html>
 <?php
@@ -224,7 +224,7 @@ 
  */
 function timer_start() {
 	global $timestart;
-	$timestart = microtime( true );
+	$timestart = microtime(true);
 	return true;
 }
 
@@ -243,12 +243,12 @@ 
  * @return string The "second.microsecond" finished time calculation. The number is formatted
  *                for human consumption, both localized and rounded.
  */
-function timer_stop( $display = 0, $precision = 3 ) {
+function timer_stop($display = 0, $precision = 3) {
 	global $timestart, $timeend;
-	$timeend = microtime( true );
+	$timeend = microtime(true);
 	$timetotal = $timeend - $timestart;
-	$r = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );
-	if ( $display )
+	$r = (function_exists('number_format_i18n')) ? number_format_i18n($timetotal, $precision) : number_format($timetotal, $precision);
+	if ($display)
 		echo $r;
 	return $r;
 }
@@ -285,24 +285,24 @@ 
  * @access private
  */
 function wp_debug_mode() {
-	if ( WP_DEBUG ) {
-		error_reporting( E_ALL );
+	if (WP_DEBUG) {
+		error_reporting(E_ALL);
 
-		if ( WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 1 );
-		elseif ( null !== WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 0 );
+		if (WP_DEBUG_DISPLAY)
+			ini_set('display_errors', 1);
+		elseif (null !== WP_DEBUG_DISPLAY)
+			ini_set('display_errors', 0);
 
-		if ( WP_DEBUG_LOG ) {
-			ini_set( 'log_errors', 1 );
-			ini_set( 'error_log', WP_CONTENT_DIR . '/debug.log' );
+		if (WP_DEBUG_LOG) {
+			ini_set('log_errors', 1);
+			ini_set('error_log', WP_CONTENT_DIR.'/debug.log');
 		}
 	} else {
-		error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
+		error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
 	}
 
-	if ( defined( 'XMLRPC_REQUEST' ) || defined( 'REST_REQUEST' ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-		ini_set( 'display_errors', 0 );
+	if (defined('XMLRPC_REQUEST') || defined('REST_REQUEST') || (defined('DOING_AJAX') && DOING_AJAX)) {
+		ini_set('display_errors', 0);
 	}
 }
 
@@ -320,8 +320,8 @@ 
  * @access private
  */
 function wp_set_lang_dir() {
-	if ( !defined( 'WP_LANG_DIR' ) ) {
-		if ( file_exists( WP_CONTENT_DIR . '/languages' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) || !@is_dir(ABSPATH . WPINC . '/languages') ) {
+	if ( ! defined('WP_LANG_DIR')) {
+		if (file_exists(WP_CONTENT_DIR.'/languages') && @is_dir(WP_CONTENT_DIR.'/languages') || ! @is_dir(ABSPATH.WPINC.'/languages')) {
 			/**
 			 * Server path of the language directory.
 			 *
@@ -329,10 +329,10 @@ 
 			 *
 			 * @since 2.1.0
 			 */
-			define( 'WP_LANG_DIR', WP_CONTENT_DIR . '/languages' );
-			if ( !defined( 'LANGDIR' ) ) {
+			define('WP_LANG_DIR', WP_CONTENT_DIR.'/languages');
+			if ( ! defined('LANGDIR')) {
 				// Old static relative path maintained for limited backwards compatibility - won't work in some cases
-				define( 'LANGDIR', 'wp-content/languages' );
+				define('LANGDIR', 'wp-content/languages');
 			}
 		} else {
 			/**
@@ -342,10 +342,10 @@ 
 			 *
 			 * @since 2.1.0
 			 */
-			define( 'WP_LANG_DIR', ABSPATH . WPINC . '/languages' );
-			if ( !defined( 'LANGDIR' ) ) {
+			define('WP_LANG_DIR', ABSPATH.WPINC.'/languages');
+			if ( ! defined('LANGDIR')) {
 				// Old relative path maintained for backwards compatibility
-				define( 'LANGDIR', WPINC . '/languages' );
+				define('LANGDIR', WPINC.'/languages');
 			}
 		}
 	}
@@ -361,14 +361,14 @@ 
 function require_wp_db() {
 	global $wpdb;
 
-	require_once( ABSPATH . WPINC . '/wp-db.php' );
-	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
-		require_once( WP_CONTENT_DIR . '/db.php' );
+	require_once(ABSPATH.WPINC.'/wp-db.php');
+	if (file_exists(WP_CONTENT_DIR.'/db.php'))
+		require_once(WP_CONTENT_DIR.'/db.php');
 
-	if ( isset( $wpdb ) )
+	if (isset($wpdb))
 		return;
 
-	$wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
+	$wpdb = new wpdb(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST);
 }
 
 /**
@@ -385,24 +385,24 @@ 
  */
 function wp_set_wpdb_vars() {
 	global $wpdb, $table_prefix;
-	if ( !empty( $wpdb->error ) )
+	if ( ! empty($wpdb->error))
 		dead_db();
 
-	$wpdb->field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
-		'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'comment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
+	$wpdb->field_types = array('post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
+		'parent' => '%d', 'count' => '%d', 'object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'comment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
 		'user_id' => '%d', 'link_id' => '%d', 'link_owner' => '%d', 'link_rating' => '%d', 'option_id' => '%d', 'blog_id' => '%d', 'meta_id' => '%d', 'post_id' => '%d',
 		'user_status' => '%d', 'umeta_id' => '%d', 'comment_karma' => '%d', 'comment_count' => '%d',
 		// multisite:
 		'active' => '%d', 'cat_id' => '%d', 'deleted' => '%d', 'lang_id' => '%d', 'mature' => '%d', 'public' => '%d', 'site_id' => '%d', 'spam' => '%d',
 	);
 
-	$prefix = $wpdb->set_prefix( $table_prefix );
+	$prefix = $wpdb->set_prefix($table_prefix);
 
-	if ( is_wp_error( $prefix ) ) {
+	if (is_wp_error($prefix)) {
 		wp_load_translations_early();
 		wp_die(
 			/* translators: 1: $table_prefix 2: wp-config.php */
-			sprintf( __( '<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),
+			sprintf(__('<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.'),
 				'<code>$table_prefix</code>',
 				'<code>wp-config.php</code>'
 			)
@@ -421,10 +421,10 @@ 
  * @param bool $using Whether external object cache is being used.
  * @return bool The current 'using' setting.
  */
-function wp_using_ext_object_cache( $using = null ) {
+function wp_using_ext_object_cache($using = null) {
 	global $_wp_using_ext_object_cache;
 	$current_using = $_wp_using_ext_object_cache;
-	if ( null !== $using )
+	if (null !== $using)
 		$_wp_using_ext_object_cache = $using;
 	return $current_using;
 }
@@ -444,40 +444,40 @@ 
 	global $blog_id;
 
 	$first_init = false;
- 	if ( ! function_exists( 'wp_cache_init' ) ) {
-		if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
-			require_once ( WP_CONTENT_DIR . '/object-cache.php' );
-			if ( function_exists( 'wp_cache_init' ) )
-				wp_using_ext_object_cache( true );
+ 	if ( ! function_exists('wp_cache_init')) {
+		if (file_exists(WP_CONTENT_DIR.'/object-cache.php')) {
+			require_once (WP_CONTENT_DIR.'/object-cache.php');
+			if (function_exists('wp_cache_init'))
+				wp_using_ext_object_cache(true);
 		}
 
 		$first_init = true;
-	} elseif ( ! wp_using_ext_object_cache() && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
+	} elseif ( ! wp_using_ext_object_cache() && file_exists(WP_CONTENT_DIR.'/object-cache.php')) {
 		/*
 		 * Sometimes advanced-cache.php can load object-cache.php before
 		 * it is loaded here. This breaks the function_exists check above
 		 * and can result in `$_wp_using_ext_object_cache` being set
 		 * incorrectly. Double check if an external cache exists.
 		 */
-		wp_using_ext_object_cache( true );
+		wp_using_ext_object_cache(true);
 	}
 
-	if ( ! wp_using_ext_object_cache() )
-		require_once ( ABSPATH . WPINC . '/cache.php' );
+	if ( ! wp_using_ext_object_cache())
+		require_once (ABSPATH.WPINC.'/cache.php');
 
 	/*
 	 * If cache supports reset, reset instead of init if already
 	 * initialized. Reset signals to the cache that global IDs
 	 * have changed and it may need to update keys and cleanup caches.
 	 */
-	if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
-		wp_cache_switch_to_blog( $blog_id );
-	elseif ( function_exists( 'wp_cache_init' ) )
+	if ( ! $first_init && function_exists('wp_cache_switch_to_blog'))
+		wp_cache_switch_to_blog($blog_id);
+	elseif (function_exists('wp_cache_init'))
 		wp_cache_init();
 
-	if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-		wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
-		wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
+	if (function_exists('wp_cache_add_global_groups')) {
+		wp_cache_add_global_groups(array('users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites'));
+		wp_cache_add_non_persistent_groups(array('comment', 'counts', 'plugins'));
 	}
 }
 
@@ -490,22 +490,22 @@ 
  * @access private
  */
 function wp_not_installed() {
-	if ( is_multisite() ) {
-		if ( ! is_blog_installed() && ! wp_installing() ) {
+	if (is_multisite()) {
+		if ( ! is_blog_installed() && ! wp_installing()) {
 			nocache_headers();
 
-			wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
+			wp_die(__('The site you have requested is not installed properly. Please contact the system administrator.'));
 		}
-	} elseif ( ! is_blog_installed() && ! wp_installing() ) {
+	} elseif ( ! is_blog_installed() && ! wp_installing()) {
 		nocache_headers();
 
-		require( ABSPATH . WPINC . '/kses.php' );
-		require( ABSPATH . WPINC . '/pluggable.php' );
-		require( ABSPATH . WPINC . '/formatting.php' );
+		require(ABSPATH.WPINC.'/kses.php');
+		require(ABSPATH.WPINC.'/pluggable.php');
+		require(ABSPATH.WPINC.'/formatting.php');
 
-		$link = wp_guess_url() . '/wp-admin/install.php';
+		$link = wp_guess_url().'/wp-admin/install.php';
 
-		wp_redirect( $link );
+		wp_redirect($link);
 		die();
 	}
 }
@@ -524,16 +524,16 @@ 
  */
 function wp_get_mu_plugins() {
 	$mu_plugins = array();
-	if ( !is_dir( WPMU_PLUGIN_DIR ) )
+	if ( ! is_dir(WPMU_PLUGIN_DIR))
 		return $mu_plugins;
-	if ( ! $dh = opendir( WPMU_PLUGIN_DIR ) )
+	if ( ! $dh = opendir(WPMU_PLUGIN_DIR))
 		return $mu_plugins;
-	while ( ( $plugin = readdir( $dh ) ) !== false ) {
-		if ( substr( $plugin, -4 ) == '.php' )
-			$mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
+	while (($plugin = readdir($dh)) !== false) {
+		if (substr($plugin, -4) == '.php')
+			$mu_plugins[] = WPMU_PLUGIN_DIR.'/'.$plugin;
 	}
-	closedir( $dh );
-	sort( $mu_plugins );
+	closedir($dh);
+	sort($mu_plugins);
 
 	return $mu_plugins;
 }
@@ -554,27 +554,27 @@ 
  */
 function wp_get_active_and_valid_plugins() {
 	$plugins = array();
-	$active_plugins = (array) get_option( 'active_plugins', array() );
+	$active_plugins = (array) get_option('active_plugins', array());
 
 	// Check for hacks file if the option is enabled
-	if ( get_option( 'hack_file' ) && file_exists( ABSPATH . 'my-hacks.php' ) ) {
-		_deprecated_file( 'my-hacks.php', '1.5' );
-		array_unshift( $plugins, ABSPATH . 'my-hacks.php' );
+	if (get_option('hack_file') && file_exists(ABSPATH.'my-hacks.php')) {
+		_deprecated_file('my-hacks.php', '1.5');
+		array_unshift($plugins, ABSPATH.'my-hacks.php');
 	}
 
-	if ( empty( $active_plugins ) || wp_installing() )
+	if (empty($active_plugins) || wp_installing())
 		return $plugins;
 
 	$network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
 
-	foreach ( $active_plugins as $plugin ) {
-		if ( ! validate_file( $plugin ) // $plugin must validate as file
-			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
-			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
+	foreach ($active_plugins as $plugin) {
+		if ( ! validate_file($plugin) // $plugin must validate as file
+			&& '.php' == substr($plugin, -4) // $plugin must end with '.php'
+			&& file_exists(WP_PLUGIN_DIR.'/'.$plugin) // $plugin must exist
 			// not already included as a network plugin
-			&& ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins ) )
+			&& ( ! $network_plugins || ! in_array(WP_PLUGIN_DIR.'/'.$plugin, $network_plugins))
 			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		$plugins[] = WP_PLUGIN_DIR.'/'.$plugin;
 	}
 	return $plugins;
 }
@@ -589,10 +589,10 @@ 
  * @access private
  */
 function wp_set_internal_encoding() {
-	if ( function_exists( 'mb_internal_encoding' ) ) {
-		$charset = get_option( 'blog_charset' );
-		if ( ! $charset || ! @mb_internal_encoding( $charset ) )
-			mb_internal_encoding( 'UTF-8' );
+	if (function_exists('mb_internal_encoding')) {
+		$charset = get_option('blog_charset');
+		if ( ! $charset || ! @mb_internal_encoding($charset))
+			mb_internal_encoding('UTF-8');
 	}
 }
 
@@ -607,20 +607,20 @@ 
  */
 function wp_magic_quotes() {
 	// If already slashed, strip.
-	if ( get_magic_quotes_gpc() ) {
-		$_GET    = stripslashes_deep( $_GET    );
-		$_POST   = stripslashes_deep( $_POST   );
-		$_COOKIE = stripslashes_deep( $_COOKIE );
+	if (get_magic_quotes_gpc()) {
+		$_GET    = stripslashes_deep($_GET);
+		$_POST   = stripslashes_deep($_POST);
+		$_COOKIE = stripslashes_deep($_COOKIE);
 	}
 
 	// Escape with wpdb.
-	$_GET    = add_magic_quotes( $_GET    );
-	$_POST   = add_magic_quotes( $_POST   );
-	$_COOKIE = add_magic_quotes( $_COOKIE );
-	$_SERVER = add_magic_quotes( $_SERVER );
+	$_GET    = add_magic_quotes($_GET);
+	$_POST   = add_magic_quotes($_POST);
+	$_COOKIE = add_magic_quotes($_COOKIE);
+	$_SERVER = add_magic_quotes($_SERVER);
 
 	// Force REQUEST to be GET + POST.
-	$_REQUEST = array_merge( $_GET, $_POST );
+	$_REQUEST = array_merge($_GET, $_POST);
 }
 
 /**
@@ -635,7 +635,7 @@ 
 	 *
 	 * @since 1.2.0
 	 */
-	do_action( 'shutdown' );
+	do_action('shutdown');
 
 	wp_cache_close();
 }
@@ -649,9 +649,9 @@ 
  * @param object $object The object to clone.
  * @return object The cloned object.
  */
-function wp_clone( $object ) {
+function wp_clone($object) {
 	// Use parens for clone to accommodate PHP 4. See #17880
-	return clone( $object );
+	return clone($object);
 }
 
 /**
@@ -667,9 +667,9 @@ 
  * @return bool True if inside WordPress administration interface, false otherwise.
  */
 function is_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
+	if (isset($GLOBALS['current_screen']))
 		return $GLOBALS['current_screen']->in_admin();
-	elseif ( defined( 'WP_ADMIN' ) )
+	elseif (defined('WP_ADMIN'))
 		return WP_ADMIN;
 
 	return false;
@@ -690,9 +690,9 @@ 
  * @return bool True if inside WordPress blog administration pages.
  */
 function is_blog_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'site' );
-	elseif ( defined( 'WP_BLOG_ADMIN' ) )
+	if (isset($GLOBALS['current_screen']))
+		return $GLOBALS['current_screen']->in_admin('site');
+	elseif (defined('WP_BLOG_ADMIN'))
 		return WP_BLOG_ADMIN;
 
 	return false;
@@ -713,9 +713,9 @@ 
  * @return bool True if inside WordPress network administration pages.
  */
 function is_network_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'network' );
-	elseif ( defined( 'WP_NETWORK_ADMIN' ) )
+	if (isset($GLOBALS['current_screen']))
+		return $GLOBALS['current_screen']->in_admin('network');
+	elseif (defined('WP_NETWORK_ADMIN'))
 		return WP_NETWORK_ADMIN;
 
 	return false;
@@ -737,9 +737,9 @@ 
  * @return bool True if inside WordPress user administration pages.
  */
 function is_user_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'user' );
-	elseif ( defined( 'WP_USER_ADMIN' ) )
+	if (isset($GLOBALS['current_screen']))
+		return $GLOBALS['current_screen']->in_admin('user');
+	elseif (defined('WP_USER_ADMIN'))
 		return WP_USER_ADMIN;
 
 	return false;
@@ -753,10 +753,10 @@ 
  * @return bool True if Multisite is enabled, false otherwise.
  */
 function is_multisite() {
-	if ( defined( 'MULTISITE' ) )
+	if (defined('MULTISITE'))
 		return MULTISITE;
 
-	if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
+	if (defined('SUBDOMAIN_INSTALL') || defined('VHOST') || defined('SUNRISE'))
 		return true;
 
 	return false;
@@ -798,62 +798,62 @@ 
 	global $text_direction, $wp_locale;
 
 	static $loaded = false;
-	if ( $loaded )
+	if ($loaded)
 		return;
 	$loaded = true;
 
-	if ( function_exists( 'did_action' ) && did_action( 'init' ) )
+	if (function_exists('did_action') && did_action('init'))
 		return;
 
 	// We need $wp_local_package
-	require ABSPATH . WPINC . '/version.php';
+	require ABSPATH.WPINC.'/version.php';
 
 	// Translation and localization
-	require_once ABSPATH . WPINC . '/pomo/mo.php';
-	require_once ABSPATH . WPINC . '/l10n.php';
-	require_once ABSPATH . WPINC . '/locale.php';
+	require_once ABSPATH.WPINC.'/pomo/mo.php';
+	require_once ABSPATH.WPINC.'/l10n.php';
+	require_once ABSPATH.WPINC.'/locale.php';
 
 	// General libraries
-	require_once ABSPATH . WPINC . '/plugin.php';
+	require_once ABSPATH.WPINC.'/plugin.php';
 
 	$locales = $locations = array();
 
-	while ( true ) {
-		if ( defined( 'WPLANG' ) ) {
-			if ( '' == WPLANG )
+	while (true) {
+		if (defined('WPLANG')) {
+			if ('' == WPLANG)
 				break;
 			$locales[] = WPLANG;
 		}
 
-		if ( isset( $wp_local_package ) )
+		if (isset($wp_local_package))
 			$locales[] = $wp_local_package;
 
-		if ( ! $locales )
+		if ( ! $locales)
 			break;
 
-		if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) )
+		if (defined('WP_LANG_DIR') && @is_dir(WP_LANG_DIR))
 			$locations[] = WP_LANG_DIR;
 
-		if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) )
-			$locations[] = WP_CONTENT_DIR . '/languages';
+		if (defined('WP_CONTENT_DIR') && @is_dir(WP_CONTENT_DIR.'/languages'))
+			$locations[] = WP_CONTENT_DIR.'/languages';
 
-		if ( @is_dir( ABSPATH . 'wp-content/languages' ) )
-			$locations[] = ABSPATH . 'wp-content/languages';
+		if (@is_dir(ABSPATH.'wp-content/languages'))
+			$locations[] = ABSPATH.'wp-content/languages';
 
-		if ( @is_dir( ABSPATH . WPINC . '/languages' ) )
-			$locations[] = ABSPATH . WPINC . '/languages';
+		if (@is_dir(ABSPATH.WPINC.'/languages'))
+			$locations[] = ABSPATH.WPINC.'/languages';
 
-		if ( ! $locations )
+		if ( ! $locations)
 			break;
 
-		$locations = array_unique( $locations );
+		$locations = array_unique($locations);
 
-		foreach ( $locales as $locale ) {
-			foreach ( $locations as $location ) {
-				if ( file_exists( $location . '/' . $locale . '.mo' ) ) {
-					load_textdomain( 'default', $location . '/' . $locale . '.mo' );
-					if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) )
-						load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+		foreach ($locales as $locale) {
+			foreach ($locations as $location) {
+				if (file_exists($location.'/'.$locale.'.mo')) {
+					load_textdomain('default', $location.'/'.$locale.'.mo');
+					if (defined('WP_SETUP_CONFIG') && file_exists($location.'/admin-'.$locale.'.mo'))
+						load_textdomain('default', $location.'/admin-'.$locale.'.mo');
 					break 2;
 				}
 			}
@@ -879,15 +879,15 @@ 
  * @return bool True if WP is installing, otherwise false. When a `$is_installing` is passed, the function will
  *              report whether WP was in installing mode prior to the change to `$is_installing`.
  */
-function wp_installing( $is_installing = null ) {
+function wp_installing($is_installing = null) {
 	static $installing = null;
 
 	// Support for the `WP_INSTALLING` constant, defined before WP is loaded.
-	if ( is_null( $installing ) ) {
-		$installing = defined( 'WP_INSTALLING' ) && WP_INSTALLING;
+	if (is_null($installing)) {
+		$installing = defined('WP_INSTALLING') && WP_INSTALLING;
 	}
 
-	if ( ! is_null( $is_installing ) ) {
+	if ( ! is_null($is_installing)) {
 		$old_installing = $installing;
 		$installing = $is_installing;
 		return (bool) $old_installing;

Braces +145 added lines, -100 removed lines

@@ -29,19 +29,22 @@ 
  * @access private
  */
 function wp_unregister_GLOBALS() {
-	if ( !ini_get( 'register_globals' ) )
-		return;
+	if ( !ini_get( 'register_globals' ) ) {
+			return;
+	}
 
-	if ( isset( $_REQUEST['GLOBALS'] ) )
-		die( 'GLOBALS overwrite attempt detected' );
+	if ( isset( $_REQUEST['GLOBALS'] ) ) {
+			die( 'GLOBALS overwrite attempt detected' );
+	}
 
 	// Variables that shouldn't be unset
 	$no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
 
 	$input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset( $_SESSION ) && is_array( $_SESSION ) ? $_SESSION : array() );
-	foreach ( $input as $k => $v )
-		if ( !in_array( $k, $no_unset ) && isset( $GLOBALS[$k] ) ) {
+	foreach ( $input as $k => $v ) {
+			if ( !in_array( $k, $no_unset ) && isset( $GLOBALS[$k] ) ) {
 			unset( $GLOBALS[$k] );
+	}
 		}
 }
 
@@ -76,15 +79,17 @@ 
 			$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
 		} else {
 			// Use ORIG_PATH_INFO if there is no PATH_INFO
-			if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) )
-				$_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
+			if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) ) {
+							$_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
+			}
 
 			// Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
 			if ( isset( $_SERVER['PATH_INFO'] ) ) {
-				if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
-					$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
-				else
-					$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
+				if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] ) {
+									$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
+				} else {
+									$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
+				}
 			}
 
 			// Append the query string if it exists and isn't null
@@ -95,18 +100,21 @@ 
 	}
 
 	// Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
-	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) )
-		$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
+	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) ) {
+			$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
+	}
 
 	// Fix for Dreamhost and other PHP as CGI hosts
-	if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false )
-		unset( $_SERVER['PATH_INFO'] );
+	if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false ) {
+			unset( $_SERVER['PATH_INFO'] );
+	}
 
 	// Fix empty PHP_SELF
 	$PHP_SELF = $_SERVER['PHP_SELF'];
-	if ( empty( $PHP_SELF ) )
-		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
-}
+	if ( empty( $PHP_SELF ) ) {
+			$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
+	}
+	}
 
 /**
  * Check for the required PHP version, and the MySQL extension or
@@ -174,15 +182,17 @@ 
  * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
  */
 function wp_maintenance() {
-	if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() )
-		return;
+	if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() ) {
+			return;
+	}
 
 	global $upgrading;
 
 	include( ABSPATH . '.maintenance' );
 	// If the $upgrading timestamp is older than 10 minutes, don't die.
-	if ( ( time() - $upgrading ) >= 600 )
-		return;
+	if ( ( time() - $upgrading ) >= 600 ) {
+			return;
+	}
 
 	if ( file_exists( WP_CONTENT_DIR . '/maintenance.php' ) ) {
 		require_once( WP_CONTENT_DIR . '/maintenance.php' );
@@ -197,7 +207,10 @@ 
 	header( 'Retry-After: 600' );
 ?>
 	<!DOCTYPE html>
-	<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+	<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) {
+	echo ' dir="rtl"';
+}
+?>>
 	<head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<title><?php _e( 'Maintenance' ); ?></title>
@@ -248,8 +261,9 @@ 
 	$timeend = microtime( true );
 	$timetotal = $timeend - $timestart;
 	$r = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );
-	if ( $display )
-		echo $r;
+	if ( $display ) {
+			echo $r;
+	}
 	return $r;
 }
 
@@ -288,10 +302,11 @@ 
 	if ( WP_DEBUG ) {
 		error_reporting( E_ALL );
 
-		if ( WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 1 );
-		elseif ( null !== WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 0 );
+		if ( WP_DEBUG_DISPLAY ) {
+					ini_set( 'display_errors', 1 );
+		} elseif ( null !== WP_DEBUG_DISPLAY ) {
+					ini_set( 'display_errors', 0 );
+		}
 
 		if ( WP_DEBUG_LOG ) {
 			ini_set( 'log_errors', 1 );
@@ -362,11 +377,13 @@ 
 	global $wpdb;
 
 	require_once( ABSPATH . WPINC . '/wp-db.php' );
-	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
-		require_once( WP_CONTENT_DIR . '/db.php' );
+	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
+			require_once( WP_CONTENT_DIR . '/db.php' );
+	}
 
-	if ( isset( $wpdb ) )
-		return;
+	if ( isset( $wpdb ) ) {
+			return;
+	}
 
 	$wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
 }
@@ -385,8 +402,9 @@ 
  */
 function wp_set_wpdb_vars() {
 	global $wpdb, $table_prefix;
-	if ( !empty( $wpdb->error ) )
-		dead_db();
+	if ( !empty( $wpdb->error ) ) {
+			dead_db();
+	}
 
 	$wpdb->field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
 		'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'comment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
@@ -424,8 +442,9 @@ 
 function wp_using_ext_object_cache( $using = null ) {
 	global $_wp_using_ext_object_cache;
 	$current_using = $_wp_using_ext_object_cache;
-	if ( null !== $using )
-		$_wp_using_ext_object_cache = $using;
+	if ( null !== $using ) {
+			$_wp_using_ext_object_cache = $using;
+	}
 	return $current_using;
 }
 
@@ -447,8 +466,9 @@ 
  	if ( ! function_exists( 'wp_cache_init' ) ) {
 		if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
 			require_once ( WP_CONTENT_DIR . '/object-cache.php' );
-			if ( function_exists( 'wp_cache_init' ) )
-				wp_using_ext_object_cache( true );
+			if ( function_exists( 'wp_cache_init' ) ) {
+							wp_using_ext_object_cache( true );
+			}
 		}
 
 		$first_init = true;
@@ -462,18 +482,20 @@ 
 		wp_using_ext_object_cache( true );
 	}
 
-	if ( ! wp_using_ext_object_cache() )
-		require_once ( ABSPATH . WPINC . '/cache.php' );
+	if ( ! wp_using_ext_object_cache() ) {
+			require_once ( ABSPATH . WPINC . '/cache.php' );
+	}
 
 	/*
 	 * If cache supports reset, reset instead of init if already
 	 * initialized. Reset signals to the cache that global IDs
 	 * have changed and it may need to update keys and cleanup caches.
 	 */
-	if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
-		wp_cache_switch_to_blog( $blog_id );
-	elseif ( function_exists( 'wp_cache_init' ) )
-		wp_cache_init();
+	if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) ) {
+			wp_cache_switch_to_blog( $blog_id );
+	} elseif ( function_exists( 'wp_cache_init' ) ) {
+			wp_cache_init();
+	}
 
 	if ( function_exists( 'wp_cache_add_global_groups' ) ) {
 		wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
@@ -524,13 +546,16 @@ 
  */
 function wp_get_mu_plugins() {
 	$mu_plugins = array();
-	if ( !is_dir( WPMU_PLUGIN_DIR ) )
-		return $mu_plugins;
-	if ( ! $dh = opendir( WPMU_PLUGIN_DIR ) )
-		return $mu_plugins;
+	if ( !is_dir( WPMU_PLUGIN_DIR ) ) {
+			return $mu_plugins;
+	}
+	if ( ! $dh = opendir( WPMU_PLUGIN_DIR ) ) {
+			return $mu_plugins;
+	}
 	while ( ( $plugin = readdir( $dh ) ) !== false ) {
-		if ( substr( $plugin, -4 ) == '.php' )
-			$mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
+		if ( substr( $plugin, -4 ) == '.php' ) {
+					$mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
+		}
 	}
 	closedir( $dh );
 	sort( $mu_plugins );
@@ -562,8 +587,9 @@ 
 		array_unshift( $plugins, ABSPATH . 'my-hacks.php' );
 	}
 
-	if ( empty( $active_plugins ) || wp_installing() )
-		return $plugins;
+	if ( empty( $active_plugins ) || wp_installing() ) {
+			return $plugins;
+	}
 
 	$network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
 
@@ -573,8 +599,9 @@ 
 			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
 			// not already included as a network plugin
 			&& ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins ) )
-			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+			) {
+				$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		}
 	}
 	return $plugins;
 }
@@ -591,8 +618,9 @@ 
 function wp_set_internal_encoding() {
 	if ( function_exists( 'mb_internal_encoding' ) ) {
 		$charset = get_option( 'blog_charset' );
-		if ( ! $charset || ! @mb_internal_encoding( $charset ) )
-			mb_internal_encoding( 'UTF-8' );
+		if ( ! $charset || ! @mb_internal_encoding( $charset ) ) {
+					mb_internal_encoding( 'UTF-8' );
+		}
 	}
 }
 
@@ -667,10 +695,11 @@ 
  * @return bool True if inside WordPress administration interface, false otherwise.
  */
 function is_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin();
-	elseif ( defined( 'WP_ADMIN' ) )
-		return WP_ADMIN;
+	if ( isset( $GLOBALS['current_screen'] ) ) {
+			return $GLOBALS['current_screen']->in_admin();
+	} elseif ( defined( 'WP_ADMIN' ) ) {
+			return WP_ADMIN;
+	}
 
 	return false;
 }
@@ -690,10 +719,11 @@ 
  * @return bool True if inside WordPress blog administration pages.
  */
 function is_blog_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'site' );
-	elseif ( defined( 'WP_BLOG_ADMIN' ) )
-		return WP_BLOG_ADMIN;
+	if ( isset( $GLOBALS['current_screen'] ) ) {
+			return $GLOBALS['current_screen']->in_admin( 'site' );
+	} elseif ( defined( 'WP_BLOG_ADMIN' ) ) {
+			return WP_BLOG_ADMIN;
+	}
 
 	return false;
 }
@@ -713,10 +743,11 @@ 
  * @return bool True if inside WordPress network administration pages.
  */
 function is_network_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'network' );
-	elseif ( defined( 'WP_NETWORK_ADMIN' ) )
-		return WP_NETWORK_ADMIN;
+	if ( isset( $GLOBALS['current_screen'] ) ) {
+			return $GLOBALS['current_screen']->in_admin( 'network' );
+	} elseif ( defined( 'WP_NETWORK_ADMIN' ) ) {
+			return WP_NETWORK_ADMIN;
+	}
 
 	return false;
 }
@@ -737,10 +768,11 @@ 
  * @return bool True if inside WordPress user administration pages.
  */
 function is_user_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'user' );
-	elseif ( defined( 'WP_USER_ADMIN' ) )
-		return WP_USER_ADMIN;
+	if ( isset( $GLOBALS['current_screen'] ) ) {
+			return $GLOBALS['current_screen']->in_admin( 'user' );
+	} elseif ( defined( 'WP_USER_ADMIN' ) ) {
+			return WP_USER_ADMIN;
+	}
 
 	return false;
 }
@@ -753,11 +785,13 @@ 
  * @return bool True if Multisite is enabled, false otherwise.
  */
 function is_multisite() {
-	if ( defined( 'MULTISITE' ) )
-		return MULTISITE;
+	if ( defined( 'MULTISITE' ) ) {
+			return MULTISITE;
+	}
 
-	if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
-		return true;
+	if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -798,12 +832,14 @@ 
 	global $text_direction, $wp_locale;
 
 	static $loaded = false;
-	if ( $loaded )
-		return;
+	if ( $loaded ) {
+			return;
+	}
 	$loaded = true;
 
-	if ( function_exists( 'did_action' ) && did_action( 'init' ) )
-		return;
+	if ( function_exists( 'did_action' ) && did_action( 'init' ) ) {
+			return;
+	}
 
 	// We need $wp_local_package
 	require ABSPATH . WPINC . '/version.php';
@@ -820,31 +856,39 @@ 
 
 	while ( true ) {
 		if ( defined( 'WPLANG' ) ) {
-			if ( '' == WPLANG )
-				break;
+			if ( '' == WPLANG ) {
+							break;
+			}
 			$locales[] = WPLANG;
 		}
 
-		if ( isset( $wp_local_package ) )
-			$locales[] = $wp_local_package;
+		if ( isset( $wp_local_package ) ) {
+					$locales[] = $wp_local_package;
+		}
 
-		if ( ! $locales )
-			break;
+		if ( ! $locales ) {
+					break;
+		}
 
-		if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) )
-			$locations[] = WP_LANG_DIR;
+		if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) ) {
+					$locations[] = WP_LANG_DIR;
+		}
 
-		if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) )
-			$locations[] = WP_CONTENT_DIR . '/languages';
+		if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) ) {
+					$locations[] = WP_CONTENT_DIR . '/languages';
+		}
 
-		if ( @is_dir( ABSPATH . 'wp-content/languages' ) )
-			$locations[] = ABSPATH . 'wp-content/languages';
+		if ( @is_dir( ABSPATH . 'wp-content/languages' ) ) {
+					$locations[] = ABSPATH . 'wp-content/languages';
+		}
 
-		if ( @is_dir( ABSPATH . WPINC . '/languages' ) )
-			$locations[] = ABSPATH . WPINC . '/languages';
+		if ( @is_dir( ABSPATH . WPINC . '/languages' ) ) {
+					$locations[] = ABSPATH . WPINC . '/languages';
+		}
 
-		if ( ! $locations )
-			break;
+		if ( ! $locations ) {
+					break;
+		}
 
 		$locations = array_unique( $locations );
 
@@ -852,8 +896,9 @@ 
 			foreach ( $locations as $location ) {
 				if ( file_exists( $location . '/' . $locale . '.mo' ) ) {
 					load_textdomain( 'default', $location . '/' . $locale . '.mo' );
-					if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) )
-						load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+					if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) ) {
+											load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+					}
 					break 2;
 				}
 			}

src/wp-includes/ms-blogs.php

Doc Comments +1 added lines, -1 removed lines

@@ -595,7 +595,7 @@
  *
  * @param int  $new_blog   The id of the blog you want to switch to. Default: current blog
  * @param bool $deprecated Deprecated argument
- * @return true Always returns True.
+ * @return boolean Always returns True.
  */
 function switch_to_blog( $new_blog, $deprecated = null ) {
 	global $wpdb;

Indentation +1 added lines, -1 removed lines

@@ -845,7 +845,7 @@
 		 *
 		 * @param int    $blog_id Blog ID.
 		 * @param string $value   The value of blog status.
- 		 */
+		 */
 		do_action( 'update_blog_public', $blog_id, $value ); // Moved here from update_blog_public().
 	}
 

Braces +90 added lines, -62 removed lines

@@ -52,11 +52,13 @@ 
  */
 function get_blogaddress_by_name( $blogname ) {
 	if ( is_subdomain_install() ) {
-		if ( $blogname == 'main' )
-			$blogname = 'www';
+		if ( $blogname == 'main' ) {
+					$blogname = 'www';
+		}
 		$url = rtrim( network_home_url(), '/' );
-		if ( !empty( $blogname ) )
-			$url = preg_replace( '|^([^\.]+://)|', "\${1}" . $blogname . '.', $url );
+		if ( !empty( $blogname ) ) {
+					$url = preg_replace( '|^([^\.]+://)|', "\${1}" . $blogname . '.', $url );
+		}
 	} else {
 		$url = network_home_url( $blogname );
 	}
@@ -80,8 +82,9 @@ 
 	$slug = trim( $slug, '/' );
 
 	$blog_id = wp_cache_get( 'get_id_from_blogname_' . $slug, 'blog-details' );
-	if ( $blog_id )
-		return $blog_id;
+	if ( $blog_id ) {
+			return $blog_id;
+	}
 
 	if ( is_subdomain_install() ) {
 		$domain = $slug . '.' . $current_site->domain;
@@ -118,8 +121,9 @@ 
 		} elseif ( isset($fields['domain']) && isset($fields['path']) ) {
 			$key = md5( $fields['domain'] . $fields['path'] );
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
-				return $blog;
+			if ( false !== $blog ) {
+							return $blog;
+			}
 			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
 				$nowww = substr( $fields['domain'], 4 );
 				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path'] ) );
@@ -135,8 +139,9 @@ 
 		} elseif ( isset($fields['domain']) && is_subdomain_install() ) {
 			$key = md5( $fields['domain'] );
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
-				return $blog;
+			if ( false !== $blog ) {
+							return $blog;
+			}
 			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
 				$nowww = substr( $fields['domain'], 4 );
 				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'] ) );
@@ -153,12 +158,13 @@ 
 			return false;
 		}
 	} else {
-		if ( ! $fields )
-			$blog_id = get_current_blog_id();
-		elseif ( ! is_numeric( $fields ) )
-			$blog_id = get_id_from_blogname( $fields );
-		else
-			$blog_id = $fields;
+		if ( ! $fields ) {
+					$blog_id = get_current_blog_id();
+		} elseif ( ! is_numeric( $fields ) ) {
+					$blog_id = get_id_from_blogname( $fields );
+		} else {
+					$blog_id = $fields;
+		}
 	}
 
 	$blog_id = (int) $blog_id;
@@ -289,15 +295,18 @@ 
 function update_blog_details( $blog_id, $details = array() ) {
 	global $wpdb;
 
-	if ( empty($details) )
-		return false;
+	if ( empty($details) ) {
+			return false;
+	}
 
-	if ( is_object($details) )
-		$details = get_object_vars($details);
+	if ( is_object($details) ) {
+			$details = get_object_vars($details);
+	}
 
 	$current_details = get_blog_details($blog_id, false);
-	if ( empty($current_details) )
-		return false;
+	if ( empty($current_details) ) {
+			return false;
+	}
 
 	$current_details = get_object_vars($current_details);
 
@@ -316,8 +325,9 @@ 
 
 	$result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
 
-	if ( false === $result )
-		return false;
+	if ( false === $result ) {
+			return false;
+	}
 
 	// If spam status changed, issue actions.
 	if ( $details['spam'] != $current_details['spam'] ) {
@@ -462,11 +472,13 @@ 
 function get_blog_option( $id, $option, $default = false ) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
-		$id = get_current_blog_id();
+	if ( empty( $id ) ) {
+			$id = get_current_blog_id();
+	}
 
-	if ( get_current_blog_id() == $id )
-		return get_option( $option, $default );
+	if ( get_current_blog_id() == $id ) {
+			return get_option( $option, $default );
+	}
 
 	switch_to_blog( $id );
 	$value = get_option( $option, $default );
@@ -507,11 +519,13 @@ 
 function add_blog_option( $id, $option, $value ) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
-		$id = get_current_blog_id();
+	if ( empty( $id ) ) {
+			$id = get_current_blog_id();
+	}
 
-	if ( get_current_blog_id() == $id )
-		return add_option( $option, $value );
+	if ( get_current_blog_id() == $id ) {
+			return add_option( $option, $value );
+	}
 
 	switch_to_blog( $id );
 	$return = add_option( $option, $value );
@@ -532,11 +546,13 @@ 
 function delete_blog_option( $id, $option ) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
-		$id = get_current_blog_id();
+	if ( empty( $id ) ) {
+			$id = get_current_blog_id();
+	}
 
-	if ( get_current_blog_id() == $id )
-		return delete_option( $option );
+	if ( get_current_blog_id() == $id ) {
+			return delete_option( $option );
+	}
 
 	switch_to_blog( $id );
 	$return = delete_option( $option );
@@ -558,11 +574,13 @@ 
 function update_blog_option( $id, $option, $value, $deprecated = null ) {
 	$id = (int) $id;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if ( null !== $deprecated  ) {
+			_deprecated_argument( __FUNCTION__, '3.1' );
+	}
 
-	if ( get_current_blog_id() == $id )
-		return update_option( $option, $value );
+	if ( get_current_blog_id() == $id ) {
+			return update_option( $option, $value );
+	}
 
 	switch_to_blog( $id );
 	$return = update_option( $option, $value );
@@ -600,8 +618,9 @@ 
 function switch_to_blog( $new_blog, $deprecated = null ) {
 	global $wpdb;
 
-	if ( empty( $new_blog ) )
-		$new_blog = $GLOBALS['blog_id'];
+	if ( empty( $new_blog ) ) {
+			$new_blog = $GLOBALS['blog_id'];
+	}
 
 	$GLOBALS['_wp_switched_stack'][] = $GLOBALS['blog_id'];
 
@@ -634,10 +653,11 @@ 
 	} else {
 		global $wp_object_cache;
 
-		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
-			$global_groups = $wp_object_cache->global_groups;
-		else
-			$global_groups = false;
+		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
+					$global_groups = $wp_object_cache->global_groups;
+		} else {
+					$global_groups = false;
+		}
 
 		wp_cache_init();
 
@@ -682,8 +702,9 @@ 
 function restore_current_blog() {
 	global $wpdb;
 
-	if ( empty( $GLOBALS['_wp_switched_stack'] ) )
-		return false;
+	if ( empty( $GLOBALS['_wp_switched_stack'] ) ) {
+			return false;
+	}
 
 	$blog = array_pop( $GLOBALS['_wp_switched_stack'] );
 
@@ -705,10 +726,11 @@ 
 	} else {
 		global $wp_object_cache;
 
-		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
-			$global_groups = $wp_object_cache->global_groups;
-		else
-			$global_groups = false;
+		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
+					$global_groups = $wp_object_cache->global_groups;
+		} else {
+					$global_groups = false;
+		}
 
 		wp_cache_init();
 
@@ -792,16 +814,19 @@ 
 function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
 	global $wpdb;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if ( null !== $deprecated  ) {
+			_deprecated_argument( __FUNCTION__, '3.1' );
+	}
 
-	if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
-		return $value;
+	if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) ) {
+			return $value;
+	}
 
 	$result = $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
 
-	if ( false === $result )
-		return false;
+	if ( false === $result ) {
+			return false;
+	}
 
 	refresh_blog_details( $blog_id );
 
@@ -867,8 +892,9 @@ 
 	global $wpdb;
 
 	$details = get_blog_details( $id, false );
-	if ( $details )
-		return $details->$pref;
+	if ( $details ) {
+			return $details->$pref;
+	}
 
 	return $wpdb->get_var( $wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id) );
 }
@@ -888,8 +914,10 @@ 
 function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) {
 	global $wpdb;
 
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, 'MU' ); // never used
+	if ( ! empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, 'MU' );
+	}
+	// never used
 
 	return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
 }

Spacing +237 added lines, -237 removed lines

@@ -18,7 +18,7 @@ 
 function wpmu_update_blogs_date() {
 	global $wpdb;
 
-	update_blog_details( $wpdb->blogid, array('last_updated' => current_time('mysql', true)) );
+	update_blog_details($wpdb->blogid, array('last_updated' => current_time('mysql', true)));
 	/**
 	 * Fires after the blog details are updated.
 	 *
@@ -26,7 +26,7 @@ 
 	 *
 	 * @param int $blog_id Site ID.
 	 */
-	do_action( 'wpmu_blog_updated', $wpdb->blogid );
+	do_action('wpmu_blog_updated', $wpdb->blogid);
 }
 
 /**
@@ -37,17 +37,17 @@ 
  * @param int $blog_id Blog ID
  * @return string Full URL of the blog if found. Empty string if not.
  */
-function get_blogaddress_by_id( $blog_id ) {
-	$bloginfo = get_blog_details( (int) $blog_id );
+function get_blogaddress_by_id($blog_id) {
+	$bloginfo = get_blog_details((int) $blog_id);
 
-	if ( empty( $bloginfo ) ) {
+	if (empty($bloginfo)) {
 		return '';
 	}
 
-	$scheme = parse_url( $bloginfo->home, PHP_URL_SCHEME );
-	$scheme = empty( $scheme ) ? 'http' : $scheme;
+	$scheme = parse_url($bloginfo->home, PHP_URL_SCHEME);
+	$scheme = empty($scheme) ? 'http' : $scheme;
 
-	return esc_url( $scheme . '://' . $bloginfo->domain . $bloginfo->path );
+	return esc_url($scheme.'://'.$bloginfo->domain.$bloginfo->path);
 }
 
 /**
@@ -58,17 +58,17 @@ 
  * @param string $blogname The (subdomain or directory) name
  * @return string
  */
-function get_blogaddress_by_name( $blogname ) {
-	if ( is_subdomain_install() ) {
-		if ( $blogname == 'main' )
+function get_blogaddress_by_name($blogname) {
+	if (is_subdomain_install()) {
+		if ($blogname == 'main')
 			$blogname = 'www';
-		$url = rtrim( network_home_url(), '/' );
-		if ( !empty( $blogname ) )
-			$url = preg_replace( '|^([^\.]+://)|', "\${1}" . $blogname . '.', $url );
+		$url = rtrim(network_home_url(), '/');
+		if ( ! empty($blogname))
+			$url = preg_replace('|^([^\.]+://)|', "\${1}".$blogname.'.', $url);
 	} else {
-		$url = network_home_url( $blogname );
+		$url = network_home_url($blogname);
 	}
-	return esc_url( $url . '/' );
+	return esc_url($url.'/');
 }
 
 /**
@@ -81,26 +81,26 @@ 
  * @param string $slug
  * @return int A blog id
  */
-function get_id_from_blogname( $slug ) {
+function get_id_from_blogname($slug) {
 	global $wpdb;
 
 	$current_site = get_current_site();
-	$slug = trim( $slug, '/' );
+	$slug = trim($slug, '/');
 
-	$blog_id = wp_cache_get( 'get_id_from_blogname_' . $slug, 'blog-details' );
-	if ( $blog_id )
+	$blog_id = wp_cache_get('get_id_from_blogname_'.$slug, 'blog-details');
+	if ($blog_id)
 		return $blog_id;
 
-	if ( is_subdomain_install() ) {
-		$domain = $slug . '.' . $current_site->domain;
+	if (is_subdomain_install()) {
+		$domain = $slug.'.'.$current_site->domain;
 		$path = $current_site->path;
 	} else {
 		$domain = $current_site->domain;
-		$path = $current_site->path . $slug . '/';
+		$path = $current_site->path.$slug.'/';
 	}
 
-	$blog_id = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
-	wp_cache_set( 'get_id_from_blogname_' . $slug, $blog_id, 'blog-details' );
+	$blog_id = $wpdb->get_var($wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path));
+	wp_cache_set('get_id_from_blogname_'.$slug, $blog_id, 'blog-details');
 	return $blog_id;
 }
 
@@ -117,42 +117,42 @@ 
  *                                  Default is true.
  * @return WP_Site|false Blog details on success. False on failure.
  */
-function get_blog_details( $fields = null, $get_all = true ) {
+function get_blog_details($fields = null, $get_all = true) {
 	global $wpdb;
 
-	if ( is_array($fields ) ) {
-		if ( isset($fields['blog_id']) ) {
+	if (is_array($fields)) {
+		if (isset($fields['blog_id'])) {
 			$blog_id = $fields['blog_id'];
-		} elseif ( isset($fields['domain']) && isset($fields['path']) ) {
-			$key = md5( $fields['domain'] . $fields['path'] );
+		} elseif (isset($fields['domain']) && isset($fields['path'])) {
+			$key = md5($fields['domain'].$fields['path']);
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
+			if (false !== $blog)
 				return $blog;
-			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
-				$nowww = substr( $fields['domain'], 4 );
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path'] ) );
+			if (substr($fields['domain'], 0, 4) == 'www.') {
+				$nowww = substr($fields['domain'], 4);
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path']));
 			} else {
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path'] ) );
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path']));
 			}
-			if ( $blog ) {
-				wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+			if ($blog) {
+				wp_cache_set($blog->blog_id.'short', $blog, 'blog-details');
 				$blog_id = $blog->blog_id;
 			} else {
 				return false;
 			}
-		} elseif ( isset($fields['domain']) && is_subdomain_install() ) {
-			$key = md5( $fields['domain'] );
+		} elseif (isset($fields['domain']) && is_subdomain_install()) {
+			$key = md5($fields['domain']);
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
+			if (false !== $blog)
 				return $blog;
-			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
-				$nowww = substr( $fields['domain'], 4 );
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'] ) );
+			if (substr($fields['domain'], 0, 4) == 'www.') {
+				$nowww = substr($fields['domain'], 4);
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain']));
 			} else {
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain'] ) );
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain']));
 			}
-			if ( $blog ) {
-				wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+			if ($blog) {
+				wp_cache_set($blog->blog_id.'short', $blog, 'blog-details');
 				$blog_id = $blog->blog_id;
 			} else {
 				return false;
@@ -161,10 +161,10 @@ 
 			return false;
 		}
 	} else {
-		if ( ! $fields )
+		if ( ! $fields)
 			$blog_id = get_current_blog_id();
-		elseif ( ! is_numeric( $fields ) )
-			$blog_id = get_id_from_blogname( $fields );
+		elseif ( ! is_numeric($fields))
+			$blog_id = get_id_from_blogname($fields);
 		else
 			$blog_id = $fields;
 	}
@@ -172,15 +172,15 @@ 
 	$blog_id = (int) $blog_id;
 
 	$all = $get_all == true ? '' : 'short';
-	$details = wp_cache_get( $blog_id . $all, 'blog-details' );
+	$details = wp_cache_get($blog_id.$all, 'blog-details');
 
-	if ( $details ) {
-		if ( ! is_object( $details ) ) {
-			if ( $details == -1 ) {
+	if ($details) {
+		if ( ! is_object($details)) {
+			if ($details == -1) {
 				return false;
 			} else {
 				// Clear old pre-serialized objects. Cache clients do better with that.
-				wp_cache_delete( $blog_id . $all, 'blog-details' );
+				wp_cache_delete($blog_id.$all, 'blog-details');
 				unset($details);
 			}
 		} else {
@@ -189,18 +189,18 @@ 
 	}
 
 	// Try the other cache.
-	if ( $get_all ) {
-		$details = wp_cache_get( $blog_id . 'short', 'blog-details' );
+	if ($get_all) {
+		$details = wp_cache_get($blog_id.'short', 'blog-details');
 	} else {
-		$details = wp_cache_get( $blog_id, 'blog-details' );
+		$details = wp_cache_get($blog_id, 'blog-details');
 		// If short was requested and full cache is set, we can return.
-		if ( $details ) {
-			if ( ! is_object( $details ) ) {
-				if ( $details == -1 ) {
+		if ($details) {
+			if ( ! is_object($details)) {
+				if ($details == -1) {
 					return false;
 				} else {
 					// Clear old pre-serialized objects. Cache clients do better with that.
-					wp_cache_delete( $blog_id, 'blog-details' );
+					wp_cache_delete($blog_id, 'blog-details');
 					unset($details);
 				}
 			} else {
@@ -209,29 +209,29 @@ 
 		}
 	}
 
-	if ( empty($details) ) {
-		$details = WP_Site::get_instance( $blog_id );
-		if ( ! $details ) {
+	if (empty($details)) {
+		$details = WP_Site::get_instance($blog_id);
+		if ( ! $details) {
 			// Set the full cache.
-			wp_cache_set( $blog_id, -1, 'blog-details' );
+			wp_cache_set($blog_id, -1, 'blog-details');
 			return false;
 		}
 	}
 
-	if ( ! $details instanceof WP_Site ) {
-		$details = new WP_Site( $details );
+	if ( ! $details instanceof WP_Site) {
+		$details = new WP_Site($details);
 	}
 
-	if ( ! $get_all ) {
-		wp_cache_set( $blog_id . $all, $details, 'blog-details' );
+	if ( ! $get_all) {
+		wp_cache_set($blog_id.$all, $details, 'blog-details');
 		return $details;
 	}
 
-	switch_to_blog( $blog_id );
-	$details->blogname   = get_option( 'blogname' );
-	$details->siteurl    = get_option( 'siteurl' );
-	$details->post_count = get_option( 'post_count' );
-	$details->home       = get_option( 'home' );
+	switch_to_blog($blog_id);
+	$details->blogname   = get_option('blogname');
+	$details->siteurl    = get_option('siteurl');
+	$details->post_count = get_option('post_count');
+	$details->home       = get_option('home');
 	restore_current_blog();
 
 	/**
@@ -241,12 +241,12 @@ 
 	 *
 	 * @param object $details The blog details.
 	 */
-	$details = apply_filters( 'blog_details', $details );
+	$details = apply_filters('blog_details', $details);
 
-	wp_cache_set( $blog_id . $all, $details, 'blog-details' );
+	wp_cache_set($blog_id.$all, $details, 'blog-details');
 
-	$key = md5( $details->domain . $details->path );
-	wp_cache_set( $key, $details, 'blog-lookup' );
+	$key = md5($details->domain.$details->path);
+	wp_cache_set($key, $details, 'blog-lookup');
 
 	return $details;
 }
@@ -258,14 +258,14 @@ 
  *
  * @param int $blog_id Optional. Blog ID. Defaults to current blog.
  */
-function refresh_blog_details( $blog_id = 0 ) {
+function refresh_blog_details($blog_id = 0) {
 	$blog_id = (int) $blog_id;
-	if ( ! $blog_id ) {
+	if ( ! $blog_id) {
 		$blog_id = get_current_blog_id();
 	}
 
-	$details = get_blog_details( $blog_id, false );
-	if ( ! $details ) {
+	$details = get_blog_details($blog_id, false);
+	if ( ! $details) {
 		// Make sure clean_blog_cache() gets the blog ID
 		// when the blog has been previously cached as
 		// non-existent.
@@ -276,7 +276,7 @@ 
 		);
 	}
 
-	clean_blog_cache( $details );
+	clean_blog_cache($details);
 
 	/**
 	 * Fires after the blog details cache is cleared.
@@ -285,7 +285,7 @@ 
 	 *
 	 * @param int $blog_id Blog ID.
 	 */
-	do_action( 'refresh_blog_details', $blog_id );
+	do_action('refresh_blog_details', $blog_id);
 }
 
 /**
@@ -299,17 +299,17 @@ 
  * @param array $details Array of details keyed by blogs table field names.
  * @return bool True if update succeeds, false otherwise.
  */
-function update_blog_details( $blog_id, $details = array() ) {
+function update_blog_details($blog_id, $details = array()) {
 	global $wpdb;
 
-	if ( empty($details) )
+	if (empty($details))
 		return false;
 
-	if ( is_object($details) )
+	if (is_object($details))
 		$details = get_object_vars($details);
 
 	$current_details = get_blog_details($blog_id, false);
-	if ( empty($current_details) )
+	if (empty($current_details))
 		return false;
 
 	$current_details = get_object_vars($current_details);
@@ -318,23 +318,23 @@ 
 	$details['last_updated'] = current_time('mysql', true);
 
 	$update_details = array();
-	$fields = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
-	foreach ( array_intersect( array_keys( $details ), $fields ) as $field ) {
-		if ( 'path' === $field ) {
-			$details[ $field ] = trailingslashit( '/' . trim( $details[ $field ], '/' ) );
+	$fields = array('site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
+	foreach (array_intersect(array_keys($details), $fields) as $field) {
+		if ('path' === $field) {
+			$details[$field] = trailingslashit('/'.trim($details[$field], '/'));
 		}
 
-		$update_details[ $field ] = $details[ $field ];
+		$update_details[$field] = $details[$field];
 	}
 
-	$result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
+	$result = $wpdb->update($wpdb->blogs, $update_details, array('blog_id' => $blog_id));
 
-	if ( false === $result )
+	if (false === $result)
 		return false;
 
 	// If spam status changed, issue actions.
-	if ( $details['spam'] != $current_details['spam'] ) {
-		if ( $details['spam'] == 1 ) {
+	if ($details['spam'] != $current_details['spam']) {
+		if ($details['spam'] == 1) {
 			/**
 			 * Fires when the blog status is changed to 'spam'.
 			 *
@@ -342,7 +342,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_spam_blog', $blog_id );
+			do_action('make_spam_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the blog status is changed to 'ham'.
@@ -351,13 +351,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_ham_blog', $blog_id );
+			do_action('make_ham_blog', $blog_id);
 		}
 	}
 
 	// If mature status changed, issue actions.
-	if ( $details['mature'] != $current_details['mature'] ) {
-		if ( $details['mature'] == 1 ) {
+	if ($details['mature'] != $current_details['mature']) {
+		if ($details['mature'] == 1) {
 			/**
 			 * Fires when the blog status is changed to 'mature'.
 			 *
@@ -365,7 +365,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'mature_blog', $blog_id );
+			do_action('mature_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the blog status is changed to 'unmature'.
@@ -374,13 +374,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'unmature_blog', $blog_id );
+			do_action('unmature_blog', $blog_id);
 		}
 	}
 
 	// If archived status changed, issue actions.
-	if ( $details['archived'] != $current_details['archived'] ) {
-		if ( $details['archived'] == 1 ) {
+	if ($details['archived'] != $current_details['archived']) {
+		if ($details['archived'] == 1) {
 			/**
 			 * Fires when the blog status is changed to 'archived'.
 			 *
@@ -388,7 +388,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'archive_blog', $blog_id );
+			do_action('archive_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the blog status is changed to 'unarchived'.
@@ -397,13 +397,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'unarchive_blog', $blog_id );
+			do_action('unarchive_blog', $blog_id);
 		}
 	}
 
 	// If deleted status changed, issue actions.
-	if ( $details['deleted'] != $current_details['deleted'] ) {
-		if ( $details['deleted'] == 1 ) {
+	if ($details['deleted'] != $current_details['deleted']) {
+		if ($details['deleted'] == 1) {
 			/**
 			 * Fires when the blog status is changed to 'deleted'.
 			 *
@@ -411,7 +411,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_delete_blog', $blog_id );
+			do_action('make_delete_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the blog status is changed to 'undeleted'.
@@ -420,13 +420,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_undelete_blog', $blog_id );
+			do_action('make_undelete_blog', $blog_id);
 		}
 	}
 
-	if ( isset( $details['public'] ) ) {
-		switch_to_blog( $blog_id );
-		update_option( 'blog_public', $details['public'] );
+	if (isset($details['public'])) {
+		switch_to_blog($blog_id);
+		update_option('blog_public', $details['public']);
 		restore_current_blog();
 	}
 
@@ -442,18 +442,18 @@ 
  *
  * @param WP_Site $blog The blog details as returned from get_blog_details()
  */
-function clean_blog_cache( $blog ) {
+function clean_blog_cache($blog) {
 	$blog_id = $blog->blog_id;
-	$domain_path_key = md5( $blog->domain . $blog->path );
-
-	wp_cache_delete( $blog_id, 'sites' );
-	wp_cache_delete( $blog_id , 'blog-details' );
-	wp_cache_delete( $blog_id . 'short' , 'blog-details' );
-	wp_cache_delete(  $domain_path_key, 'blog-lookup' );
-	wp_cache_delete( 'current_blog_' . $blog->domain, 'site-options' );
-	wp_cache_delete( 'current_blog_' . $blog->domain . $blog->path, 'site-options' );
-	wp_cache_delete( 'get_id_from_blogname_' . trim( $blog->path, '/' ), 'blog-details' );
-	wp_cache_delete( $domain_path_key, 'blog-id-cache' );
+	$domain_path_key = md5($blog->domain.$blog->path);
+
+	wp_cache_delete($blog_id, 'sites');
+	wp_cache_delete($blog_id, 'blog-details');
+	wp_cache_delete($blog_id.'short', 'blog-details');
+	wp_cache_delete($domain_path_key, 'blog-lookup');
+	wp_cache_delete('current_blog_'.$blog->domain, 'site-options');
+	wp_cache_delete('current_blog_'.$blog->domain.$blog->path, 'site-options');
+	wp_cache_delete('get_id_from_blogname_'.trim($blog->path, '/'), 'blog-details');
+	wp_cache_delete($domain_path_key, 'blog-id-cache');
 }
 
 /**
@@ -473,17 +473,17 @@ 
  * @param mixed  $default Optional. Default value to return if the option does not exist.
  * @return mixed Value set for the option.
  */
-function get_blog_option( $id, $option, $default = false ) {
+function get_blog_option($id, $option, $default = false) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if (empty($id))
 		$id = get_current_blog_id();
 
-	if ( get_current_blog_id() == $id )
-		return get_option( $option, $default );
+	if (get_current_blog_id() == $id)
+		return get_option($option, $default);
 
-	switch_to_blog( $id );
-	$value = get_option( $option, $default );
+	switch_to_blog($id);
+	$value = get_option($option, $default);
 	restore_current_blog();
 
 	/**
@@ -496,7 +496,7 @@ 
 	 * @param string  $value The option value.
 	 * @param int     $id    Blog ID.
 	 */
-	return apply_filters( "blog_option_{$option}", $value, $id );
+	return apply_filters("blog_option_{$option}", $value, $id);
 }
 
 /**
@@ -518,17 +518,17 @@ 
  * @param mixed  $value  Optional. Option value, can be anything. Expected to not be SQL-escaped.
  * @return bool False if option was not added and true if option was added.
  */
-function add_blog_option( $id, $option, $value ) {
+function add_blog_option($id, $option, $value) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if (empty($id))
 		$id = get_current_blog_id();
 
-	if ( get_current_blog_id() == $id )
-		return add_option( $option, $value );
+	if (get_current_blog_id() == $id)
+		return add_option($option, $value);
 
-	switch_to_blog( $id );
-	$return = add_option( $option, $value );
+	switch_to_blog($id);
+	$return = add_option($option, $value);
 	restore_current_blog();
 
 	return $return;
@@ -543,17 +543,17 @@ 
  * @param string $option Name of option to remove. Expected to not be SQL-escaped.
  * @return bool True, if option is successfully deleted. False on failure.
  */
-function delete_blog_option( $id, $option ) {
+function delete_blog_option($id, $option) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if (empty($id))
 		$id = get_current_blog_id();
 
-	if ( get_current_blog_id() == $id )
-		return delete_option( $option );
+	if (get_current_blog_id() == $id)
+		return delete_option($option);
 
-	switch_to_blog( $id );
-	$return = delete_option( $option );
+	switch_to_blog($id);
+	$return = delete_option($option);
 	restore_current_blog();
 
 	return $return;
@@ -570,20 +570,20 @@ 
  * @param mixed  $deprecated Not used.
  * @return bool True on success, false on failure.
  */
-function update_blog_option( $id, $option, $value, $deprecated = null ) {
+function update_blog_option($id, $option, $value, $deprecated = null) {
 	$id = (int) $id;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if (null !== $deprecated)
+		_deprecated_argument(__FUNCTION__, '3.1');
 
-	if ( get_current_blog_id() == $id )
-		return update_option( $option, $value );
+	if (get_current_blog_id() == $id)
+		return update_option($option, $value);
 
-	switch_to_blog( $id );
-	$return = update_option( $option, $value );
+	switch_to_blog($id);
+	$return = update_option($option, $value);
 	restore_current_blog();
 
-	refresh_blog_details( $id );
+	refresh_blog_details($id);
 
 	return $return;
 }
@@ -612,10 +612,10 @@ 
  * @param bool $deprecated Deprecated argument
  * @return true Always returns True.
  */
-function switch_to_blog( $new_blog, $deprecated = null ) {
+function switch_to_blog($new_blog, $deprecated = null) {
 	global $wpdb;
 
-	if ( empty( $new_blog ) )
+	if (empty($new_blog))
 		$new_blog = $GLOBALS['blog_id'];
 
 	$GLOBALS['_wp_switched_stack'][] = $GLOBALS['blog_id'];
@@ -625,7 +625,7 @@ 
 	 * set the right vars, do the associated actions, but skip
 	 * the extra unnecessary work
 	 */
-	if ( $new_blog == $GLOBALS['blog_id'] ) {
+	if ($new_blog == $GLOBALS['blog_id']) {
 		/**
 		 * Fires when the blog is switched.
 		 *
@@ -634,46 +634,46 @@ 
 		 * @param int $new_blog New blog ID.
 		 * @param int $new_blog Blog ID.
 		 */
-		do_action( 'switch_blog', $new_blog, $new_blog );
+		do_action('switch_blog', $new_blog, $new_blog);
 		$GLOBALS['switched'] = true;
 		return true;
 	}
 
-	$wpdb->set_blog_id( $new_blog );
+	$wpdb->set_blog_id($new_blog);
 	$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
 	$prev_blog_id = $GLOBALS['blog_id'];
 	$GLOBALS['blog_id'] = $new_blog;
 
-	if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
-		wp_cache_switch_to_blog( $new_blog );
+	if (function_exists('wp_cache_switch_to_blog')) {
+		wp_cache_switch_to_blog($new_blog);
 	} else {
 		global $wp_object_cache;
 
-		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+		if (is_object($wp_object_cache) && isset($wp_object_cache->global_groups))
 			$global_groups = $wp_object_cache->global_groups;
 		else
 			$global_groups = false;
 
 		wp_cache_init();
 
-		if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-			if ( is_array( $global_groups ) ) {
-				wp_cache_add_global_groups( $global_groups );
+		if (function_exists('wp_cache_add_global_groups')) {
+			if (is_array($global_groups)) {
+				wp_cache_add_global_groups($global_groups);
 			} else {
-				wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
+				wp_cache_add_global_groups(array('users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites'));
 			}
-			wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
+			wp_cache_add_non_persistent_groups(array('comment', 'counts', 'plugins'));
 		}
 	}
 
-	if ( did_action( 'init' ) ) {
+	if (did_action('init')) {
 		wp_roles()->reinit();
 		$current_user = wp_get_current_user();
-		$current_user->for_blog( $new_blog );
+		$current_user->for_blog($new_blog);
 	}
 
 	/** This filter is documented in wp-includes/ms-blogs.php */
-	do_action( 'switch_blog', $new_blog, $prev_blog_id );
+	do_action('switch_blog', $new_blog, $prev_blog_id);
 	$GLOBALS['switched'] = true;
 
 	return true;
@@ -697,57 +697,57 @@ 
 function restore_current_blog() {
 	global $wpdb;
 
-	if ( empty( $GLOBALS['_wp_switched_stack'] ) )
+	if (empty($GLOBALS['_wp_switched_stack']))
 		return false;
 
-	$blog = array_pop( $GLOBALS['_wp_switched_stack'] );
+	$blog = array_pop($GLOBALS['_wp_switched_stack']);
 
-	if ( $GLOBALS['blog_id'] == $blog ) {
+	if ($GLOBALS['blog_id'] == $blog) {
 		/** This filter is documented in wp-includes/ms-blogs.php */
-		do_action( 'switch_blog', $blog, $blog );
+		do_action('switch_blog', $blog, $blog);
 		// If we still have items in the switched stack, consider ourselves still 'switched'
-		$GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
+		$GLOBALS['switched'] = ! empty($GLOBALS['_wp_switched_stack']);
 		return true;
 	}
 
-	$wpdb->set_blog_id( $blog );
+	$wpdb->set_blog_id($blog);
 	$prev_blog_id = $GLOBALS['blog_id'];
 	$GLOBALS['blog_id'] = $blog;
 	$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
 
-	if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
-		wp_cache_switch_to_blog( $blog );
+	if (function_exists('wp_cache_switch_to_blog')) {
+		wp_cache_switch_to_blog($blog);
 	} else {
 		global $wp_object_cache;
 
-		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+		if (is_object($wp_object_cache) && isset($wp_object_cache->global_groups))
 			$global_groups = $wp_object_cache->global_groups;
 		else
 			$global_groups = false;
 
 		wp_cache_init();
 
-		if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-			if ( is_array( $global_groups ) ) {
-				wp_cache_add_global_groups( $global_groups );
+		if (function_exists('wp_cache_add_global_groups')) {
+			if (is_array($global_groups)) {
+				wp_cache_add_global_groups($global_groups);
 			} else {
-				wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
+				wp_cache_add_global_groups(array('users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites'));
 			}
-			wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
+			wp_cache_add_non_persistent_groups(array('comment', 'counts', 'plugins'));
 		}
 	}
 
-	if ( did_action( 'init' ) ) {
+	if (did_action('init')) {
 		wp_roles()->reinit();
 		$current_user = wp_get_current_user();
-		$current_user->for_blog( $blog );
+		$current_user->for_blog($blog);
 	}
 
 	/** This filter is documented in wp-includes/ms-blogs.php */
-	do_action( 'switch_blog', $blog, $prev_blog_id );
+	do_action('switch_blog', $blog, $prev_blog_id);
 
 	// If we still have items in the switched stack, consider ourselves still 'switched'
-	$GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
+	$GLOBALS['switched'] = ! empty($GLOBALS['_wp_switched_stack']);
 
 	return true;
 }
@@ -762,7 +762,7 @@ 
  * @return bool True if switched, false otherwise.
  */
 function ms_is_switched() {
-	return ! empty( $GLOBALS['_wp_switched_stack'] );
+	return ! empty($GLOBALS['_wp_switched_stack']);
 }
 
 /**
@@ -773,7 +773,7 @@ 
  * @param int $id The blog id
  * @return string Whether the blog is archived or not
  */
-function is_archived( $id ) {
+function is_archived($id) {
 	return get_blog_status($id, 'archived');
 }
 
@@ -786,7 +786,7 @@ 
  * @param string $archived The new status
  * @return string $archived
  */
-function update_archived( $id, $archived ) {
+function update_archived($id, $archived) {
 	update_blog_status($id, 'archived', $archived);
 	return $archived;
 }
@@ -804,55 +804,55 @@ 
  * @param null   $deprecated
  * @return string|false $value
  */
-function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
+function update_blog_status($blog_id, $pref, $value, $deprecated = null) {
 	global $wpdb;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if (null !== $deprecated)
+		_deprecated_argument(__FUNCTION__, '3.1');
 
-	if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
+	if ( ! in_array($pref, array('site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id')))
 		return $value;
 
-	$result = $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
+	$result = $wpdb->update($wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id));
 
-	if ( false === $result )
+	if (false === $result)
 		return false;
 
-	refresh_blog_details( $blog_id );
+	refresh_blog_details($blog_id);
 
-	if ( 'spam' == $pref ) {
-		if ( $value == 1 ) {
+	if ('spam' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_spam_blog', $blog_id );
+			do_action('make_spam_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_ham_blog', $blog_id );
+			do_action('make_ham_blog', $blog_id);
 		}
-	} elseif ( 'mature' == $pref ) {
-		if ( $value == 1 ) {
+	} elseif ('mature' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'mature_blog', $blog_id );
+			do_action('mature_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'unmature_blog', $blog_id );
+			do_action('unmature_blog', $blog_id);
 		}
-	} elseif ( 'archived' == $pref ) {
-		if ( $value == 1 ) {
+	} elseif ('archived' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'archive_blog', $blog_id );
+			do_action('archive_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'unarchive_blog', $blog_id );
+			do_action('unarchive_blog', $blog_id);
 		}
-	} elseif ( 'deleted' == $pref ) {
-		if ( $value == 1 ) {
+	} elseif ('deleted' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_delete_blog', $blog_id );
+			do_action('make_delete_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_undelete_blog', $blog_id );
+			do_action('make_undelete_blog', $blog_id);
 		}
-	} elseif ( 'public' == $pref ) {
+	} elseif ('public' == $pref) {
 		/**
 		 * Fires after the current blog's 'public' setting is updated.
 		 *
@@ -861,7 +861,7 @@ 
 		 * @param int    $blog_id Blog ID.
 		 * @param string $value   The value of blog status.
  		 */
-		do_action( 'update_blog_public', $blog_id, $value ); // Moved here from update_blog_public().
+		do_action('update_blog_public', $blog_id, $value); // Moved here from update_blog_public().
 	}
 
 	return $value;
@@ -878,14 +878,14 @@ 
  * @param string $pref A field name
  * @return bool|string|null $value
  */
-function get_blog_status( $id, $pref ) {
+function get_blog_status($id, $pref) {
 	global $wpdb;
 
-	$details = get_blog_details( $id, false );
-	if ( $details )
+	$details = get_blog_details($id, false);
+	if ($details)
 		return $details->$pref;
 
-	return $wpdb->get_var( $wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id) );
+	return $wpdb->get_var($wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id));
 }
 
 /**
@@ -900,13 +900,13 @@ 
  * @param int   $quantity   The maximum number of blogs to retrieve. Default is 40.
  * @return array The list of blogs
  */
-function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) {
+function get_last_updated($deprecated = '', $start = 0, $quantity = 40) {
 	global $wpdb;
 
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, 'MU' ); // never used
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, 'MU'); // never used
 
-	return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
+	return $wpdb->get_results($wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity), ARRAY_A);
 }
 
 /**
@@ -918,13 +918,13 @@ 
  * @param string $old_status The old post status
  * @param object $post       Post object
  */
-function _update_blog_date_on_post_publish( $new_status, $old_status, $post ) {
-	$post_type_obj = get_post_type_object( $post->post_type );
-	if ( ! $post_type_obj || ! $post_type_obj->public ) {
+function _update_blog_date_on_post_publish($new_status, $old_status, $post) {
+	$post_type_obj = get_post_type_object($post->post_type);
+	if ( ! $post_type_obj || ! $post_type_obj->public) {
 		return;
 	}
 
-	if ( 'publish' != $new_status && 'publish' != $old_status ) {
+	if ('publish' != $new_status && 'publish' != $old_status) {
 		return;
 	}
 
@@ -940,15 +940,15 @@ 
  *
  * @param int $post_id Post ID
  */
-function _update_blog_date_on_post_delete( $post_id ) {
-	$post = get_post( $post_id );
+function _update_blog_date_on_post_delete($post_id) {
+	$post = get_post($post_id);
 
-	$post_type_obj = get_post_type_object( $post->post_type );
-	if ( ! $post_type_obj || ! $post_type_obj->public ) {
+	$post_type_obj = get_post_type_object($post->post_type);
+	if ( ! $post_type_obj || ! $post_type_obj->public) {
 		return;
 	}
 
-	if ( 'publish' != $post->post_status ) {
+	if ('publish' != $post->post_status) {
 		return;
 	}
 
@@ -962,10 +962,10 @@ 
  *
  * @param int $post_id Post ID.
  */
-function _update_posts_count_on_delete( $post_id ) {
-	$post = get_post( $post_id );
+function _update_posts_count_on_delete($post_id) {
+	$post = get_post($post_id);
 
-	if ( ! $post || 'publish' !== $post->post_status ) {
+	if ( ! $post || 'publish' !== $post->post_status) {
 		return;
 	}
 
@@ -980,12 +980,12 @@ 
  * @param string $new_status The status the post is changing to.
  * @param string $old_status The status the post is changing from.
  */
-function _update_posts_count_on_transition_post_status( $new_status, $old_status ) {
-	if ( $new_status === $old_status ) {
+function _update_posts_count_on_transition_post_status($new_status, $old_status) {
+	if ($new_status === $old_status) {
 		return;
 	}
 
-	if ( 'publish' !== $new_status && 'publish' !== $old_status ) {
+	if ('publish' !== $new_status && 'publish' !== $old_status) {
 		return;
 	}
 

src/wp-includes/ms-load.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
  *
  * @since 3.0.0
  *
- * @return true|string Returns true on success, or drop-in file to include.
+ * @return boolean|string Returns true on success, or drop-in file to include.
  */
 function ms_site_check() {
 	$blog = get_blog_details();

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * These functions are needed to load Multisite.
- *
- * @since 3.0.0
- *
- * @package WordPress
- * @subpackage Multisite
- */
+	 * These functions are needed to load Multisite.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 */
 
 /**
  * Whether a subdomain configuration is enabled.
@@ -76,7 +76,7 @@ 
 	 * @since 3.0.0
 	 *
 	 * @param bool null Whether to skip the blog status check. Default null.
-	*/
+	 */
 	$check = apply_filters( 'ms_site_check', null );
 	if ( null !== $check )
 		return true;

Spacing +89 added lines, -89 removed lines

@@ -16,10 +16,10 @@ 
  * @return bool True if subdomain configuration is enabled, false otherwise.
  */
 function is_subdomain_install() {
-	if ( defined('SUBDOMAIN_INSTALL') )
+	if (defined('SUBDOMAIN_INSTALL'))
 		return SUBDOMAIN_INSTALL;
 
-	return ( defined( 'VHOST' ) && VHOST == 'yes' );
+	return (defined('VHOST') && VHOST == 'yes');
 }
 
 /**
@@ -34,20 +34,20 @@ 
  * @return array Files to include.
  */
 function wp_get_active_network_plugins() {
-	$active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-	if ( empty( $active_plugins ) )
+	$active_plugins = (array) get_site_option('active_sitewide_plugins', array());
+	if (empty($active_plugins))
 		return array();
 
 	$plugins = array();
-	$active_plugins = array_keys( $active_plugins );
-	sort( $active_plugins );
+	$active_plugins = array_keys($active_plugins);
+	sort($active_plugins);
 
-	foreach ( $active_plugins as $plugin ) {
-		if ( ! validate_file( $plugin ) // $plugin must validate as file
-			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
-			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
+	foreach ($active_plugins as $plugin) {
+		if ( ! validate_file($plugin) // $plugin must validate as file
+			&& '.php' == substr($plugin, -4) // $plugin must end with '.php'
+			&& file_exists(WP_PLUGIN_DIR.'/'.$plugin) // $plugin must exist
 			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		$plugins[] = WP_PLUGIN_DIR.'/'.$plugin;
 	}
 	return $plugins;
 }
@@ -77,40 +77,40 @@ 
 	 *
 	 * @param bool null Whether to skip the blog status check. Default null.
 	*/
-	$check = apply_filters( 'ms_site_check', null );
-	if ( null !== $check )
+	$check = apply_filters('ms_site_check', null);
+	if (null !== $check)
 		return true;
 
 	// Allow super admins to see blocked sites
-	if ( is_super_admin() )
+	if (is_super_admin())
 		return true;
 
-	if ( '1' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) )
-			return WP_CONTENT_DIR . '/blog-deleted.php';
+	if ('1' == $blog->deleted) {
+		if (file_exists(WP_CONTENT_DIR.'/blog-deleted.php'))
+			return WP_CONTENT_DIR.'/blog-deleted.php';
 		else
-			wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) );
+			wp_die(__('This site is no longer available.'), '', array('response' => 410));
 	}
 
-	if ( '2' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
-			return WP_CONTENT_DIR . '/blog-inactive.php';
+	if ('2' == $blog->deleted) {
+		if (file_exists(WP_CONTENT_DIR.'/blog-inactive.php')) {
+			return WP_CONTENT_DIR.'/blog-inactive.php';
 		} else {
-			$admin_email = str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) );
+			$admin_email = str_replace('@', ' AT ', get_site_option('admin_email', 'support@'.get_current_site()->domain));
 			wp_die(
 				/* translators: %s: admin email link */
-				sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact %s.' ),
-					sprintf( '<a href="mailto:%s">%s</a>', $admin_email )
+				sprintf(__('This site has not been activated yet. If you are having problems activating your site, please contact %s.'),
+					sprintf('<a href="mailto:%s">%s</a>', $admin_email)
 				)
 			);
 		}
 	}
 
-	if ( $blog->archived == '1' || $blog->spam == '1' ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
-			return WP_CONTENT_DIR . '/blog-suspended.php';
+	if ($blog->archived == '1' || $blog->spam == '1') {
+		if (file_exists(WP_CONTENT_DIR.'/blog-suspended.php'))
+			return WP_CONTENT_DIR.'/blog-suspended.php';
 		else
-			wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+			wp_die(__('This site has been archived or suspended.'), '', array('response' => 410));
 	}
 
 	return true;
@@ -127,8 +127,8 @@ 
  * @param int|null $segments Path segments to use. Defaults to null, or the full path.
  * @return WP_Network|false Network object if successful. False when no network is found.
  */
-function get_network_by_path( $domain, $path, $segments = null ) {
-	return WP_Network::get_by_path( $domain, $path, $segments );
+function get_network_by_path($domain, $path, $segments = null) {
+	return WP_Network::get_by_path($domain, $path, $segments);
 }
 
 /**
@@ -140,11 +140,11 @@ 
  * @param object|int $network The network's database row or ID.
  * @return WP_Network|false Object containing network information if found, false if not.
  */
-function wp_get_network( $network ) {
-	if ( ! is_object( $network ) ) {
-		$network = WP_Network::get_instance( $network );
+function wp_get_network($network) {
+	if ( ! is_object($network)) {
+		$network = WP_Network::get_instance($network);
 	} else {
-		$network = new WP_Network( $network );
+		$network = new WP_Network($network);
 	}
 
 	return $network;
@@ -162,10 +162,10 @@ 
  * @param int|null $segments Path segments to use. Defaults to null, or the full path.
  * @return object|false Site object if successful. False when no site is found.
  */
-function get_site_by_path( $domain, $path, $segments = null ) {
+function get_site_by_path($domain, $path, $segments = null) {
 	global $wpdb;
 
-	$path_segments = array_filter( explode( '/', trim( $path, '/' ) ) );
+	$path_segments = array_filter(explode('/', trim($path, '/')));
 
 	/**
 	 * Filter the number of path segments to consider when searching for a site.
@@ -178,17 +178,17 @@ 
 	 * @param string   $domain   The requested domain.
 	 * @param string   $path     The requested path, in full.
 	 */
-	$segments = apply_filters( 'site_by_path_segments_count', $segments, $domain, $path );
+	$segments = apply_filters('site_by_path_segments_count', $segments, $domain, $path);
 
-	if ( null !== $segments && count( $path_segments ) > $segments ) {
-		$path_segments = array_slice( $path_segments, 0, $segments );
+	if (null !== $segments && count($path_segments) > $segments) {
+		$path_segments = array_slice($path_segments, 0, $segments);
 	}
 
 	$paths = array();
 
-	while ( count( $path_segments ) ) {
-		$paths[] = '/' . implode( '/', $path_segments ) . '/';
-		array_pop( $path_segments );
+	while (count($path_segments)) {
+		$paths[] = '/'.implode('/', $path_segments).'/';
+		array_pop($path_segments);
 	}
 
 	$paths[] = '/';
@@ -212,8 +212,8 @@ 
 	 *                                   Default null, meaning the entire path was to be consulted.
 	 * @param array            $paths    The paths to search for, based on $path and $segments.
 	 */
-	$pre = apply_filters( 'pre_get_site_by_path', null, $domain, $path, $segments, $paths );
-	if ( null !== $pre ) {
+	$pre = apply_filters('pre_get_site_by_path', null, $domain, $path, $segments, $paths);
+	if (null !== $pre) {
 		return $pre;
 	}
 
@@ -228,31 +228,31 @@ 
 
 	// Either www or non-www is supported, not both. If a www domain is requested,
 	// query for both to provide the proper redirect.
-	$domains = array( $domain );
-	if ( 'www.' === substr( $domain, 0, 4 ) ) {
-		$domains[] = substr( $domain, 4 );
-		$search_domains = "'" . implode( "', '", $wpdb->_escape( $domains ) ) . "'";
+	$domains = array($domain);
+	if ('www.' === substr($domain, 0, 4)) {
+		$domains[] = substr($domain, 4);
+		$search_domains = "'".implode("', '", $wpdb->_escape($domains))."'";
 	}
 
-	if ( count( $paths ) > 1 ) {
-		$search_paths = "'" . implode( "', '", $wpdb->_escape( $paths ) ) . "'";
+	if (count($paths) > 1) {
+		$search_paths = "'".implode("', '", $wpdb->_escape($paths))."'";
 	}
 
-	if ( count( $domains ) > 1 && count( $paths ) > 1 ) {
-		$site = $wpdb->get_row( "SELECT * FROM $wpdb->blogs WHERE domain IN ($search_domains) AND path IN ($search_paths) ORDER BY CHAR_LENGTH(domain) DESC, CHAR_LENGTH(path) DESC LIMIT 1" );
-	} elseif ( count( $domains ) > 1 ) {
-		$sql = $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE path = %s", $paths[0] );
+	if (count($domains) > 1 && count($paths) > 1) {
+		$site = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain IN ($search_domains) AND path IN ($search_paths) ORDER BY CHAR_LENGTH(domain) DESC, CHAR_LENGTH(path) DESC LIMIT 1");
+	} elseif (count($domains) > 1) {
+		$sql = $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE path = %s", $paths[0]);
 		$sql .= " AND domain IN ($search_domains) ORDER BY CHAR_LENGTH(domain) DESC LIMIT 1";
-		$site = $wpdb->get_row( $sql );
-	} elseif ( count( $paths ) > 1 ) {
-		$sql = $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $domains[0] );
+		$site = $wpdb->get_row($sql);
+	} elseif (count($paths) > 1) {
+		$sql = $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s", $domains[0]);
 		$sql .= " AND path IN ($search_paths) ORDER BY CHAR_LENGTH(path) DESC LIMIT 1";
-		$site = $wpdb->get_row( $sql );
+		$site = $wpdb->get_row($sql);
 	} else {
-		$site = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $domains[0], $paths[0] ) );
+		$site = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $domains[0], $paths[0]));
 	}
 
-	if ( $site ) {
+	if ($site) {
 		// @todo get_blog_details()
 		return $site;
 	}
@@ -274,50 +274,50 @@ 
  * @param string $domain The requested domain for the error to reference.
  * @param string $path   The requested path for the error to reference.
  */
-function ms_not_installed( $domain, $path ) {
+function ms_not_installed($domain, $path) {
 	global $wpdb;
 
-	if ( ! is_admin() ) {
+	if ( ! is_admin()) {
 		dead_db();
 	}
 
 	wp_load_translations_early();
 
-	$title = __( 'Error establishing a database connection' );
+	$title = __('Error establishing a database connection');
 
-	$msg  = '<h1>' . $title . '</h1>';
-	$msg .= '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '';
-	$msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
-	$query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) );
-	if ( ! $wpdb->get_var( $query ) ) {
-		$msg .= '<p>' . sprintf(
+	$msg  = '<h1>'.$title.'</h1>';
+	$msg .= '<p>'.__('If your site does not display, please contact the owner of this network.').'';
+	$msg .= ' '.__('If you are the owner of this network please check that MySQL is running properly and all tables are error free.').'</p>';
+	$query = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($wpdb->site));
+	if ( ! $wpdb->get_var($query)) {
+		$msg .= '<p>'.sprintf(
 			/* translators: %s: table name */
-			__( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.' ),
-			'<code>' . $wpdb->site . '</code>'
-		) . '</p>';
+			__('<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.'),
+			'<code>'.$wpdb->site.'</code>'
+		).'</p>';
 	} else {
-		$msg .= '<p>' . sprintf(
+		$msg .= '<p>'.sprintf(
 			/* translators: 1: site url, 2: table name, 3: database name */
-			__( '<strong>Could not find site %1$s.</strong> Searched for table %2$s in database %3$s. Is that right?' ),
-			'<code>' . rtrim( $domain . $path, '/' ) . '</code>',
-			'<code>' . $wpdb->blogs . '</code>',
-			'<code>' . DB_NAME . '</code>'
-		) . '</p>';
+			__('<strong>Could not find site %1$s.</strong> Searched for table %2$s in database %3$s. Is that right?'),
+			'<code>'.rtrim($domain.$path, '/').'</code>',
+			'<code>'.$wpdb->blogs.'</code>',
+			'<code>'.DB_NAME.'</code>'
+		).'</p>';
 	}
-	$msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> ';
+	$msg .= '<p><strong>'.__('What do I do now?').'</strong> ';
 	/* translators: %s: Codex URL */
-	$msg .= sprintf( __( 'Read the <a href="%s" target="_blank">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' ),
-		__( 'https://codex.wordpress.org/Debugging_a_WordPress_Network' )
+	$msg .= sprintf(__('Read the <a href="%s" target="_blank">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.'),
+		__('https://codex.wordpress.org/Debugging_a_WordPress_Network')
 	);
-	$msg .= ' ' . __( 'If you&#8217;re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
-	foreach ( $wpdb->tables('global') as $t => $table ) {
-		if ( 'sitecategories' == $t )
+	$msg .= ' '.__('If you&#8217;re still stuck with this message, then check that your database contains the following tables:').'</p><ul>';
+	foreach ($wpdb->tables('global') as $t => $table) {
+		if ('sitecategories' == $t)
 			continue;
-		$msg .= '<li>' . $table . '</li>';
+		$msg .= '<li>'.$table.'</li>';
 	}
 	$msg .= '</ul>';
 
-	wp_die( $msg, $title, array( 'response' => 500 ) );
+	wp_die($msg, $title, array('response' => 500));
 }
 
 /**
@@ -333,8 +333,8 @@ 
  * @param object $current_site
  * @return object
  */
-function get_current_site_name( $current_site ) {
-	_deprecated_function( __FUNCTION__, '3.9', 'get_current_site()' );
+function get_current_site_name($current_site) {
+	_deprecated_function(__FUNCTION__, '3.9', 'get_current_site()');
 	return $current_site;
 }
 
@@ -354,6 +354,6 @@ 
  */
 function wpmu_current_site() {
 	global $current_site;
-	_deprecated_function( __FUNCTION__, '3.9' );
+	_deprecated_function(__FUNCTION__, '3.9');
 	return $current_site;
 }

Braces +28 added lines, -20 removed lines

@@ -16,8 +16,9 @@ 
  * @return bool True if subdomain configuration is enabled, false otherwise.
  */
 function is_subdomain_install() {
-	if ( defined('SUBDOMAIN_INSTALL') )
-		return SUBDOMAIN_INSTALL;
+	if ( defined('SUBDOMAIN_INSTALL') ) {
+			return SUBDOMAIN_INSTALL;
+	}
 
 	return ( defined( 'VHOST' ) && VHOST == 'yes' );
 }
@@ -35,8 +36,9 @@ 
  */
 function wp_get_active_network_plugins() {
 	$active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-	if ( empty( $active_plugins ) )
-		return array();
+	if ( empty( $active_plugins ) ) {
+			return array();
+	}
 
 	$plugins = array();
 	$active_plugins = array_keys( $active_plugins );
@@ -46,8 +48,9 @@ 
 		if ( ! validate_file( $plugin ) // $plugin must validate as file
 			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
 			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
-			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+			) {
+				$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		}
 	}
 	return $plugins;
 }
@@ -78,18 +81,21 @@ 
 	 * @param bool null Whether to skip the blog status check. Default null.
 	*/
 	$check = apply_filters( 'ms_site_check', null );
-	if ( null !== $check )
-		return true;
+	if ( null !== $check ) {
+			return true;
+	}
 
 	// Allow super admins to see blocked sites
-	if ( is_super_admin() )
-		return true;
+	if ( is_super_admin() ) {
+			return true;
+	}
 
 	if ( '1' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) )
-			return WP_CONTENT_DIR . '/blog-deleted.php';
-		else
-			wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) );
+		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) {
+					return WP_CONTENT_DIR . '/blog-deleted.php';
+		} else {
+					wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) );
+		}
 	}
 
 	if ( '2' == $blog->deleted ) {
@@ -107,10 +113,11 @@ 
 	}
 
 	if ( $blog->archived == '1' || $blog->spam == '1' ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
-			return WP_CONTENT_DIR . '/blog-suspended.php';
-		else
-			wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
+					return WP_CONTENT_DIR . '/blog-suspended.php';
+		} else {
+					wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+		}
 	}
 
 	return true;
@@ -311,8 +318,9 @@ 
 	);
 	$msg .= ' ' . __( 'If you&#8217;re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
 	foreach ( $wpdb->tables('global') as $t => $table ) {
-		if ( 'sitecategories' == $t )
-			continue;
+		if ( 'sitecategories' == $t ) {
+					continue;
+		}
 		$msg .= '<li>' . $table . '</li>';
 	}
 	$msg .= '</ul>';

src/wp-includes/pomo/mo.php

Doc Comments +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
 	/**
 	 * @param resource $fh
-	 * @return true
+	 * @return boolean
 	 */
 	function export_to_file_handle($fh) {
 		$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );

Spacing +40 added lines, -40 removed lines

@@ -7,10 +7,10 @@ 
  * @subpackage mo
  */
 
-require_once dirname(__FILE__) . '/translations.php';
-require_once dirname(__FILE__) . '/streams.php';
+require_once dirname(__FILE__).'/translations.php';
+require_once dirname(__FILE__).'/streams.php';
 
-if ( ! class_exists( 'MO', false ) ):
+if ( ! class_exists('MO', false)):
 class MO extends Gettext_Translations {
 
 	var $_nplurals = 2;
@@ -22,7 +22,7 @@ 
 	 */
 	function import_from_file($filename) {
 		$reader = new POMO_FileReader($filename);
-		if (!$reader->is_resource())
+		if ( ! $reader->is_resource())
 			return false;
 		return $this->import_from_reader($reader);
 	}
@@ -33,8 +33,8 @@ 
 	 */
 	function export_to_file($filename) {
 		$fh = fopen($filename, 'wb');
-		if ( !$fh ) return false;
-		$res = $this->export_to_file_handle( $fh );
+		if ( ! $fh) return false;
+		$res = $this->export_to_file_handle($fh);
 		fclose($fh);
 		return $res;
 	}
@@ -44,22 +44,22 @@ 
 	 */
 	function export() {
 		$tmp_fh = fopen("php://temp", 'r+');
-		if ( !$tmp_fh ) return false;
-		$this->export_to_file_handle( $tmp_fh );
-		rewind( $tmp_fh );
-		return stream_get_contents( $tmp_fh );
+		if ( ! $tmp_fh) return false;
+		$this->export_to_file_handle($tmp_fh);
+		rewind($tmp_fh);
+		return stream_get_contents($tmp_fh);
 	}
 
 	/**
 	 * @param Translation_Entry $entry
 	 * @return bool
 	 */
-	function is_entry_good_for_export( $entry ) {
-		if ( empty( $entry->translations ) ) {
+	function is_entry_good_for_export($entry) {
+		if (empty($entry->translations)) {
 			return false;
 		}
 
-		if ( !array_filter( $entry->translations ) ) {
+		if ( ! array_filter($entry->translations)) {
 			return false;
 		}
 
@@ -71,7 +71,7 @@ 
 	 * @return true
 	 */
 	function export_to_file_handle($fh) {
-		$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );
+		$entries = array_filter($this->entries, array($this, 'is_entry_good_for_export'));
 		ksort($entries);
 		$magic = 0x950412de;
 		$revision = 0;
@@ -92,8 +92,8 @@ 
 
 		$reader = new POMO_Reader();
 
-		foreach($entries as $entry) {
-			$originals_table .= $this->export_original($entry) . chr(0);
+		foreach ($entries as $entry) {
+			$originals_table .= $this->export_original($entry).chr(0);
 			$length = $reader->strlen($this->export_original($entry));
 			fwrite($fh, pack('VV', $length, $current_addr));
 			$current_addr += $length + 1; // account for the NULL byte after
@@ -102,10 +102,10 @@ 
 		$exported_headers = $this->export_headers();
 		fwrite($fh, pack('VV', $reader->strlen($exported_headers), $current_addr));
 		$current_addr += strlen($exported_headers) + 1;
-		$translations_table = $exported_headers . chr(0);
+		$translations_table = $exported_headers.chr(0);
 
-		foreach($entries as $entry) {
-			$translations_table .= $this->export_translations($entry) . chr(0);
+		foreach ($entries as $entry) {
+			$translations_table .= $this->export_translations($entry).chr(0);
 			$length = $reader->strlen($this->export_translations($entry));
 			fwrite($fh, pack('VV', $length, $current_addr));
 			$current_addr += $length + 1;
@@ -124,7 +124,7 @@ 
 		//TODO: warnings for control characters
 		$exported = $entry->singular;
 		if ($entry->is_plural) $exported .= chr(0).$entry->plural;
-		if ($entry->context) $exported = $entry->context . chr(4) . $exported;
+		if ($entry->context) $exported = $entry->context.chr(4).$exported;
 		return $exported;
 	}
 
@@ -142,8 +142,8 @@ 
 	 */
 	function export_headers() {
 		$exported = '';
-		foreach($this->headers as $header => $value) {
-			$exported.= "$header: $value\n";
+		foreach ($this->headers as $header => $value) {
+			$exported .= "$header: $value\n";
 		}
 		return $exported;
 	}
@@ -156,10 +156,10 @@ 
 		// The magic is 0x950412de
 
 		// bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
-		$magic_little = (int) - 1794895138;
+		$magic_little = (int) -1794895138;
 		$magic_little_64 = (int) 2500072158;
 		// 0xde120495
-		$magic_big = ((int) - 569244523) & 0xFFFFFFFF;
+		$magic_big = ((int) -569244523) & 0xFFFFFFFF;
 		if ($magic_little == $magic || $magic_little_64 == $magic) {
 			return 'little';
 		} else if ($magic_big == $magic) {
@@ -179,7 +179,7 @@ 
 		}
 		$reader->setEndian($endian_string);
 
-		$endian = ('big' == $endian_string)? 'N' : 'V';
+		$endian = ('big' == $endian_string) ? 'N' : 'V';
 
 		$header = $reader->read(24);
 		if ($reader->strlen($header) != 24)
@@ -187,42 +187,42 @@ 
 
 		// parse header
 		$header = unpack("{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header);
-		if (!is_array($header))
+		if ( ! is_array($header))
 			return false;
 
 		// support revision 0 of MO format specs, only
-		if ( $header['revision'] != 0 ) {
+		if ($header['revision'] != 0) {
 			return false;
 		}
 
 		// seek to data blocks
-		$reader->seekto( $header['originals_lenghts_addr'] );
+		$reader->seekto($header['originals_lenghts_addr']);
 
 		// read originals' indices
 		$originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
-		if ( $originals_lengths_length != $header['total'] * 8 ) {
+		if ($originals_lengths_length != $header['total'] * 8) {
 			return false;
 		}
 
 		$originals = $reader->read($originals_lengths_length);
-		if ( $reader->strlen( $originals ) != $originals_lengths_length ) {
+		if ($reader->strlen($originals) != $originals_lengths_length) {
 			return false;
 		}
 
 		// read translations' indices
 		$translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
-		if ( $translations_lenghts_length != $header['total'] * 8 ) {
+		if ($translations_lenghts_length != $header['total'] * 8) {
 			return false;
 		}
 
 		$translations = $reader->read($translations_lenghts_length);
-		if ( $reader->strlen( $translations ) != $translations_lenghts_length ) {
+		if ($reader->strlen($translations) != $translations_lenghts_length) {
 			return false;
 		}
 
 		// transform raw data into set of indices
-		$originals    = $reader->str_split( $originals, 8 );
-		$translations = $reader->str_split( $translations, 8 );
+		$originals    = $reader->str_split($originals, 8);
+		$translations = $reader->str_split($translations, 8);
 
 		// skip hash table
 		$strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;
@@ -232,17 +232,17 @@ 
 		$strings = $reader->read_all();
 		$reader->close();
 
-		for ( $i = 0; $i < $header['total']; $i++ ) {
-			$o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
-			$t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );
-			if ( !$o || !$t ) return false;
+		for ($i = 0; $i < $header['total']; $i++) {
+			$o = unpack("{$endian}length/{$endian}pos", $originals[$i]);
+			$t = unpack("{$endian}length/{$endian}pos", $translations[$i]);
+			if ( ! $o || ! $t) return false;
 
 			// adjust offset due to reading strings to separate space before
 			$o['pos'] -= $strings_addr;
 			$t['pos'] -= $strings_addr;
 
-			$original    = $reader->substr( $strings, $o['pos'], $o['length'] );
-			$translation = $reader->substr( $strings, $t['pos'], $t['length'] );
+			$original    = $reader->substr($strings, $o['pos'], $o['length']);
+			$translation = $reader->substr($strings, $t['pos'], $t['length']);
 
 			if ('' === $original) {
 				$this->set_headers($this->make_headers($translation));

Braces +24 added lines, -11 removed lines

@@ -22,8 +22,9 @@ 
 	 */
 	function import_from_file($filename) {
 		$reader = new POMO_FileReader($filename);
-		if (!$reader->is_resource())
-			return false;
+		if (!$reader->is_resource()) {
+					return false;
+		}
 		return $this->import_from_reader($reader);
 	}
 
@@ -33,7 +34,9 @@ 
 	 */
 	function export_to_file($filename) {
 		$fh = fopen($filename, 'wb');
-		if ( !$fh ) return false;
+		if ( !$fh ) {
+			return false;
+		}
 		$res = $this->export_to_file_handle( $fh );
 		fclose($fh);
 		return $res;
@@ -44,7 +47,9 @@ 
 	 */
 	function export() {
 		$tmp_fh = fopen("php://temp", 'r+');
-		if ( !$tmp_fh ) return false;
+		if ( !$tmp_fh ) {
+			return false;
+		}
 		$this->export_to_file_handle( $tmp_fh );
 		rewind( $tmp_fh );
 		return stream_get_contents( $tmp_fh );
@@ -123,8 +128,12 @@ 
 	function export_original($entry) {
 		//TODO: warnings for control characters
 		$exported = $entry->singular;
-		if ($entry->is_plural) $exported .= chr(0).$entry->plural;
-		if ($entry->context) $exported = $entry->context . chr(4) . $exported;
+		if ($entry->is_plural) {
+			$exported .= chr(0).$entry->plural;
+		}
+		if ($entry->context) {
+			$exported = $entry->context . chr(4) . $exported;
+		}
 		return $exported;
 	}
 
@@ -182,13 +191,15 @@ 
 		$endian = ('big' == $endian_string)? 'N' : 'V';
 
 		$header = $reader->read(24);
-		if ($reader->strlen($header) != 24)
-			return false;
+		if ($reader->strlen($header) != 24) {
+					return false;
+		}
 
 		// parse header
 		$header = unpack("{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header);
-		if (!is_array($header))
-			return false;
+		if (!is_array($header)) {
+					return false;
+		}
 
 		// support revision 0 of MO format specs, only
 		if ( $header['revision'] != 0 ) {
@@ -235,7 +246,9 @@ 
 		for ( $i = 0; $i < $header['total']; $i++ ) {
 			$o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
 			$t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );
-			if ( !$o || !$t ) return false;
+			if ( !$o || !$t ) {
+				return false;
+			}
 
 			// adjust offset due to reading strings to separate space before
 			$o['pos'] -= $strings_addr;

src/wp-includes/pomo/streams.php

Doc Comments +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 	/**
 	 * Sets the endianness of the file.
 	 *
-	 * @param $endian string 'big' or 'little'
+	 * @param string $endian string 'big' or 'little'
 	 */
 	function setEndian($endian) {
 		$this->endian = $endian;
@@ -41,7 +41,7 @@ 
 	/**
 	 * Reads a 32bit Integer from the Stream
 	 *
-	 * @return mixed The integer, corresponding to the next 32 bits from
+	 * @return integer The integer, corresponding to the next 32 bits from
 	 * 	the stream of false if there are not enough bytes or on error
 	 */
 	function readint32() {
@@ -119,14 +119,14 @@ 
 	}
 
 	/**
-	 * @return true
+	 * @return boolean
 	 */
 	function is_resource() {
 		return true;
 	}
 
 	/**
-	 * @return true
+	 * @return boolean
 	 */
 	function close() {
 		return true;

Braces +21 added lines, -12 removed lines

@@ -46,8 +46,9 @@ 
 	 */
 	function readint32() {
 		$bytes = $this->read(4);
-		if (4 != $this->strlen($bytes))
-			return false;
+		if (4 != $this->strlen($bytes)) {
+					return false;
+		}
 		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
 		$int = unpack($endian_letter, $bytes);
 		return reset( $int );
@@ -62,8 +63,9 @@ 
 	 */
 	function readint32array($count) {
 		$bytes = $this->read(4 * $count);
-		if (4*$count != $this->strlen($bytes))
-			return false;
+		if (4*$count != $this->strlen($bytes)) {
+					return false;
+		}
 		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
 		return unpack($endian_letter.$count, $bytes);
 	}
@@ -103,8 +105,9 @@ 
 		if (!function_exists('str_split')) {
 			$length = $this->strlen($string);
 			$out = array();
-			for ($i = 0; $i < $length; $i += $chunk_size)
-				$out[] = $this->substr($string, $i, $chunk_size);
+			for ($i = 0; $i < $length; $i += $chunk_size) {
+							$out[] = $this->substr($string, $i, $chunk_size);
+			}
 			return $out;
 		} else {
 			return str_split( $string, $chunk_size );
@@ -197,8 +200,9 @@ 
 	 */
 	function read_all() {
 		$all = '';
-		while ( !$this->feof() )
-			$all .= $this->read(4096);
+		while ( !$this->feof() ) {
+					$all .= $this->read(4096);
+		}
 		return $all;
 	}
 }
@@ -236,7 +240,9 @@ 
 	function read($bytes) {
 		$data = $this->substr($this->_str, $this->_pos, $bytes);
 		$this->_pos += $bytes;
-		if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
+		if ($this->strlen($this->_str) < $this->_pos) {
+			$this->_pos = $this->strlen($this->_str);
+		}
 		return $data;
 	}
 
@@ -246,7 +252,9 @@ 
 	 */
 	function seekto($pos) {
 		$this->_pos = $pos;
-		if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
+		if ($this->strlen($this->_str) < $this->_pos) {
+			$this->_pos = $this->strlen($this->_str);
+		}
 		return $this->_pos;
 	}
 
@@ -278,8 +286,9 @@ 
 	function __construct( $filename ) {
 		parent::POMO_StringReader();
 		$this->_str = file_get_contents($filename);
-		if (false === $this->_str)
-			return false;
+		if (false === $this->_str) {
+					return false;
+		}
 		$this->_pos = 0;
 	}
 

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Classes, which help reading streams of data from files.
- * Based on the classes from Danilo Segan <danilo@kvota.net>
- *
- * @version $Id: streams.php 1157 2015-11-20 04:30:11Z dd32 $
- * @package pomo
- * @subpackage streams
- */
+	 * Classes, which help reading streams of data from files.
+	 * Based on the classes from Danilo Segan <danilo@kvota.net>
+	 *
+	 * @version $Id: streams.php 1157 2015-11-20 04:30:11Z dd32 $
+	 * @package pomo
+	 * @subpackage streams
+	 */
 
 if ( ! class_exists( 'POMO_Reader', false ) ):
 class POMO_Reader {

Spacing +24 added lines, -24 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage streams
  */
 
-if ( ! class_exists( 'POMO_Reader', false ) ):
+if ( ! class_exists('POMO_Reader', false)):
 class POMO_Reader {
 
 	var $endian = 'little';
@@ -48,9 +48,9 @@ 
 		$bytes = $this->read(4);
 		if (4 != $this->strlen($bytes))
 			return false;
-		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
+		$endian_letter = ('big' == $this->endian) ? 'N' : 'V';
 		$int = unpack($endian_letter, $bytes);
-		return reset( $int );
+		return reset($int);
 	}
 
 	/**
@@ -62,9 +62,9 @@ 
 	 */
 	function readint32array($count) {
 		$bytes = $this->read(4 * $count);
-		if (4*$count != $this->strlen($bytes))
+		if (4 * $count != $this->strlen($bytes))
 			return false;
-		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
+		$endian_letter = ('big' == $this->endian) ? 'N' : 'V';
 		return unpack($endian_letter.$count, $bytes);
 	}
 
@@ -100,14 +100,14 @@ 
 	 * @return array
 	 */
 	function str_split($string, $chunk_size) {
-		if (!function_exists('str_split')) {
+		if ( ! function_exists('str_split')) {
 			$length = $this->strlen($string);
 			$out = array();
 			for ($i = 0; $i < $length; $i += $chunk_size)
 				$out[] = $this->substr($string, $i, $chunk_size);
 			return $out;
 		} else {
-			return str_split( $string, $chunk_size );
+			return str_split($string, $chunk_size);
 		}
 	}
 
@@ -134,13 +134,13 @@ 
 }
 endif;
 
-if ( ! class_exists( 'POMO_FileReader', false ) ):
+if ( ! class_exists('POMO_FileReader', false)):
 class POMO_FileReader extends POMO_Reader {
 
 	/**
 	 * @param string $filename
 	 */
-	function __construct( $filename ) {
+	function __construct($filename) {
 		parent::POMO_Reader();
 		$this->_f = fopen($filename, 'rb');
 	}
@@ -148,8 +148,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_FileReader( $filename ) {
-		self::__construct( $filename );
+	public function POMO_FileReader($filename) {
+		self::__construct($filename);
 	}
 
 	/**
@@ -197,14 +197,14 @@ 
 	 */
 	function read_all() {
 		$all = '';
-		while ( !$this->feof() )
+		while ( ! $this->feof())
 			$all .= $this->read(4096);
 		return $all;
 	}
 }
 endif;
 
-if ( ! class_exists( 'POMO_StringReader', false ) ):
+if ( ! class_exists('POMO_StringReader', false)):
 /**
  * Provides file-like methods for manipulating a string instead
  * of a physical file.
@@ -216,7 +216,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $str = '' ) {
+	function __construct($str = '') {
 		parent::POMO_Reader();
 		$this->_str = $str;
 		$this->_pos = 0;
@@ -225,8 +225,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_StringReader( $str = '' ) {
-		self::__construct( $str );
+	public function POMO_StringReader($str = '') {
+		self::__construct($str);
 	}
 
 	/**
@@ -267,7 +267,7 @@ 
 }
 endif;
 
-if ( ! class_exists( 'POMO_CachedFileReader', false ) ):
+if ( ! class_exists('POMO_CachedFileReader', false)):
 /**
  * Reads the contents of the file in the beginning.
  */
@@ -275,7 +275,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $filename ) {
+	function __construct($filename) {
 		parent::POMO_StringReader();
 		$this->_str = file_get_contents($filename);
 		if (false === $this->_str)
@@ -286,13 +286,13 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_CachedFileReader( $filename ) {
-		self::__construct( $filename );
+	public function POMO_CachedFileReader($filename) {
+		self::__construct($filename);
 	}
 }
 endif;
 
-if ( ! class_exists( 'POMO_CachedIntFileReader', false ) ):
+if ( ! class_exists('POMO_CachedIntFileReader', false)):
 /**
  * Reads the contents of the file in the beginning.
  */
@@ -300,15 +300,15 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	public function __construct( $filename ) {
+	public function __construct($filename) {
 		parent::POMO_CachedFileReader($filename);
 	}
 
 	/**
 	 * PHP4 constructor.
 	 */
-	function POMO_CachedIntFileReader( $filename ) {
-		self::__construct( $filename );
+	function POMO_CachedIntFileReader($filename) {
+		self::__construct($filename);
 	}
 }
 endif;

src/wp-includes/pomo/translations.php

Doc Comments +4 added lines, -2 removed lines

@@ -18,6 +18,7 @@ 
 	 * Add entry to the PO structure
 	 *
 	 * @param array|Translation_Entry &$entry
+	 * @param Translation_Entry $entry
 	 * @return bool true on success, false if the entry doesn't have a key
 	 */
 	function add_entry($entry) {
@@ -72,6 +73,7 @@ 
 
 	/**
 	 * @param string $header
+	 * @return string
 	 */
 	function get_header($header) {
 		return isset($this->headers[$header])? $this->headers[$header] : false;
@@ -150,7 +152,7 @@ 
 	}
 
 	/**
-	 * @param object $other
+	 * @param Translations $other
 	 */
 	function merge_originals_with(&$other) {
 		foreach( $other->entries as $entry ) {
@@ -326,7 +328,7 @@ 
 	/**
 	 *
 	 * @param int $count
-	 * @return bool
+	 * @return integer
 	 */
 	function select_plural_form($count) {
 		return 1 == $count? 0 : 1;

Braces +24 added lines, -15 removed lines

@@ -25,7 +25,9 @@ 
 			$entry = new Translation_Entry($entry);
 		}
 		$key = $entry->key();
-		if (false === $key) return false;
+		if (false === $key) {
+			return false;
+		}
 		$this->entries[$key] = &$entry;
 		return true;
 	}
@@ -39,11 +41,14 @@ 
 			$entry = new Translation_Entry($entry);
 		}
 		$key = $entry->key();
-		if (false === $key) return false;
-		if (isset($this->entries[$key]))
-			$this->entries[$key]->merge_with($entry);
-		else
-			$this->entries[$key] = &$entry;
+		if (false === $key) {
+			return false;
+		}
+		if (isset($this->entries[$key])) {
+					$this->entries[$key]->merge_with($entry);
+		} else {
+					$this->entries[$key] = &$entry;
+		}
 		return true;
 	}
 
@@ -131,10 +136,11 @@ 
 		$total_plural_forms = $this->get_plural_forms_count();
 		if ($translated && 0 <= $index && $index < $total_plural_forms &&
 				is_array($translated->translations) &&
-				isset($translated->translations[$index]))
-			return $translated->translations[$index];
-		else
-			return 1 == $count? $singular : $plural;
+				isset($translated->translations[$index])) {
+					return $translated->translations[$index];
+		} else {
+					return 1 == $count? $singular : $plural;
+		}
 	}
 
 	/**
@@ -154,10 +160,11 @@ 
 	 */
 	function merge_originals_with(&$other) {
 		foreach( $other->entries as $entry ) {
-			if ( !isset( $this->entries[$entry->key()] ) )
-				$this->entries[$entry->key()] = $entry;
-			else
-				$this->entries[$entry->key()]->merge_with($entry);
+			if ( !isset( $this->entries[$entry->key()] ) ) {
+							$this->entries[$entry->key()] = $entry;
+			} else {
+							$this->entries[$entry->key()]->merge_with($entry);
+			}
 		}
 	}
 }
@@ -251,7 +258,9 @@ 
 		$lines = explode("\n", $translation);
 		foreach($lines as $line) {
 			$parts = explode(':', $line, 2);
-			if (!isset($parts[1])) continue;
+			if (!isset($parts[1])) {
+				continue;
+			}
 			$headers[trim($parts[0])] = trim($parts[1]);
 		}
 		return $headers;

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Class for a set of entries for translation and their associated headers
- *
- * @version $Id: translations.php 1157 2015-11-20 04:30:11Z dd32 $
- * @package pomo
- * @subpackage translations
- */
+	 * Class for a set of entries for translation and their associated headers
+	 *
+	 * @version $Id: translations.php 1157 2015-11-20 04:30:11Z dd32 $
+	 * @package pomo
+	 * @subpackage translations
+	 */
 
 require_once dirname(__FILE__) . '/entry.php';
 

Spacing +24 added lines, -24 removed lines

@@ -7,9 +7,9 @@ 
  * @subpackage translations
  */
 
-require_once dirname(__FILE__) . '/entry.php';
+require_once dirname(__FILE__).'/entry.php';
 
-if ( ! class_exists( 'Translations', false ) ):
+if ( ! class_exists('Translations', false)):
 class Translations {
 	var $entries = array();
 	var $headers = array();
@@ -65,7 +65,7 @@ 
 	 * @param array $headers
 	 */
 	function set_headers($headers) {
-		foreach($headers as $header => $value) {
+		foreach ($headers as $header => $value) {
 			$this->set_header($header, $value);
 		}
 	}
@@ -74,7 +74,7 @@ 
 	 * @param string $header
 	 */
 	function get_header($header) {
-		return isset($this->headers[$header])? $this->headers[$header] : false;
+		return isset($this->headers[$header]) ? $this->headers[$header] : false;
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	function translate_entry(&$entry) {
 		$key = $entry->key();
-		return isset($this->entries[$key])? $this->entries[$key] : false;
+		return isset($this->entries[$key]) ? $this->entries[$key] : false;
 	}
 
 	/**
@@ -90,10 +90,10 @@ 
 	 * @param string $context
 	 * @return string
 	 */
-	function translate($singular, $context=null) {
+	function translate($singular, $context = null) {
 		$entry = new Translation_Entry(array('singular' => $singular, 'context' => $context));
 		$translated = $this->translate_entry($entry);
-		return ($translated && !empty($translated->translations))? $translated->translations[0] : $singular;
+		return ($translated && ! empty($translated->translations)) ? $translated->translations[0] : $singular;
 	}
 
 	/**
@@ -108,7 +108,7 @@ 
 	 * @param integer $count number of items
 	 */
 	function select_plural_form($count) {
-		return 1 == $count? 0 : 1;
+		return 1 == $count ? 0 : 1;
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 				isset($translated->translations[$index]))
 			return $translated->translations[$index];
 		else
-			return 1 == $count? $singular : $plural;
+			return 1 == $count ? $singular : $plural;
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 * @return void
 	 **/
 	function merge_with(&$other) {
-		foreach( $other->entries as $entry ) {
+		foreach ($other->entries as $entry) {
 			$this->entries[$entry->key()] = $entry;
 		}
 	}
@@ -153,8 +153,8 @@ 
 	 * @param object $other
 	 */
 	function merge_originals_with(&$other) {
-		foreach( $other->entries as $entry ) {
-			if ( !isset( $this->entries[$entry->key()] ) )
+		foreach ($other->entries as $entry) {
+			if ( ! isset($this->entries[$entry->key()]))
 				$this->entries[$entry->key()] = $entry;
 			else
 				$this->entries[$entry->key()]->merge_with($entry);
@@ -172,8 +172,8 @@ 
 	 * @param int $count
 	 */
 	function gettext_select_plural_form($count) {
-		if (!isset($this->_gettext_select_plural_form) || is_null($this->_gettext_select_plural_form)) {
-			list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+		if ( ! isset($this->_gettext_select_plural_form) || is_null($this->_gettext_select_plural_form)) {
+			list($nplurals, $expression) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
 			$this->_nplurals = $nplurals;
 			$this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
 		}
@@ -186,7 +186,7 @@ 
 	 */
 	function nplurals_and_expression_from_header($header) {
 		if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
-			$nplurals = (int)$matches[1];
+			$nplurals = (int) $matches[1];
 			$expression = trim($this->parenthesize_plural_exression($matches[2]));
 			return array($nplurals, $expression);
 		} else {
@@ -230,8 +230,8 @@ 
 					$res .= ') : (';
 					break;
 				case ';':
-					$res .= str_repeat(')', $depth) . ';';
-					$depth= 0;
+					$res .= str_repeat(')', $depth).';';
+					$depth = 0;
 					break;
 				default:
 					$res .= $char;
@@ -249,9 +249,9 @@ 
 		// sometimes \ns are used instead of real new lines
 		$translation = str_replace('\n', "\n", $translation);
 		$lines = explode("\n", $translation);
-		foreach($lines as $line) {
+		foreach ($lines as $line) {
 			$parts = explode(':', $line, 2);
-			if (!isset($parts[1])) continue;
+			if ( ! isset($parts[1])) continue;
 			$headers[trim($parts[0])] = trim($parts[1]);
 		}
 		return $headers;
@@ -264,7 +264,7 @@ 
 	function set_header($header, $value) {
 		parent::set_header($header, $value);
 		if ('Plural-Forms' == $header) {
-			list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+			list($nplurals, $expression) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
 			$this->_nplurals = $nplurals;
 			$this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
 		}
@@ -272,7 +272,7 @@ 
 }
 endif;
 
-if ( ! class_exists( 'NOOP_Translations', false ) ):
+if ( ! class_exists('NOOP_Translations', false)):
 /**
  * Provides the same interface as Translations, but doesn't do anything
  */
@@ -319,7 +319,7 @@ 
 	 * @param string $singular
 	 * @param string $context
 	 */
-	function translate($singular, $context=null) {
+	function translate($singular, $context = null) {
 		return $singular;
 	}
 
@@ -329,7 +329,7 @@ 
 	 * @return bool
 	 */
 	function select_plural_form($count) {
-		return 1 == $count? 0 : 1;
+		return 1 == $count ? 0 : 1;
 	}
 
 	/**
@@ -346,7 +346,7 @@ 
 	 * @param string $context
 	 */
 	function translate_plural($singular, $plural, $count, $context = null) {
-			return 1 == $count? $singular : $plural;
+			return 1 == $count ? $singular : $plural;
 	}
 
 	/**

src/wp-includes/post-formats.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
  * @since 3.1.0
  *
  * @param string $format The post format slug.
- * @return string|WP_Error|false The post format term link.
+ * @return string The post format term link.
  */
 function get_post_format_link( $format ) {
 	$term = get_term_by('slug', 'post-format-' . $format, 'post_format' );

Braces +35 added lines, -25 removed lines

@@ -15,16 +15,19 @@ 
  * @return string|false The format if successful. False otherwise.
  */
 function get_post_format( $post = null ) {
-	if ( ! $post = get_post( $post ) )
-		return false;
+	if ( ! $post = get_post( $post ) ) {
+			return false;
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'post-formats' ) )
-		return false;
+	if ( ! post_type_supports( $post->post_type, 'post-formats' ) ) {
+			return false;
+	}
 
 	$_format = get_the_terms( $post->ID, 'post_format' );
 
-	if ( empty( $_format ) )
-		return false;
+	if ( empty( $_format ) ) {
+			return false;
+	}
 
 	$format = reset( $_format );
 
@@ -64,15 +67,17 @@ 
 function set_post_format( $post, $format ) {
 	$post = get_post( $post );
 
-	if ( empty( $post ) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+	if ( empty( $post ) ) {
+			return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+	}
 
 	if ( ! empty( $format ) ) {
 		$format = sanitize_key( $format );
-		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) )
-			$format = '';
-		else
-			$format = 'post-format-' . $format;
+		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) ) {
+					$format = '';
+		} else {
+					$format = 'post-format-' . $format;
+		}
 	}
 
 	return wp_set_post_terms( $post->ID, $format, 'post_format' );
@@ -123,11 +128,12 @@ 
  */
 function get_post_format_string( $slug ) {
 	$strings = get_post_format_strings();
-	if ( !$slug )
-		return $strings['standard'];
-	else
-		return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
-}
+	if ( !$slug ) {
+			return $strings['standard'];
+	} else {
+			return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
+	}
+	}
 
 /**
  * Returns a link to a post format index.
@@ -139,8 +145,9 @@ 
  */
 function get_post_format_link( $format ) {
 	$term = get_term_by('slug', 'post-format-' . $format, 'post_format' );
-	if ( ! $term || is_wp_error( $term ) )
-		return false;
+	if ( ! $term || is_wp_error( $term ) ) {
+			return false;
+	}
 	return get_term_link( $term );
 }
 
@@ -154,14 +161,17 @@ 
  * @return array
  */
 function _post_format_request( $qvs ) {
-	if ( ! isset( $qvs['post_format'] ) )
-		return $qvs;
+	if ( ! isset( $qvs['post_format'] ) ) {
+			return $qvs;
+	}
 	$slugs = get_post_format_slugs();
-	if ( isset( $slugs[ $qvs['post_format'] ] ) )
-		$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
+	if ( isset( $slugs[ $qvs['post_format'] ] ) ) {
+			$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
+	}
 	$tax = get_taxonomy( 'post_format' );
-	if ( ! is_admin() )
-		$qvs['post_type'] = $tax->object_type;
+	if ( ! is_admin() ) {
+			$qvs['post_type'] = $tax->object_type;
+	}
 	return $qvs;
 }
 

Spacing +67 added lines, -67 removed lines

@@ -14,21 +14,21 @@ 
  * @param int|object|null $post Post ID or post object. Optional, default is the current post from the loop.
  * @return string|false The format if successful. False otherwise.
  */
-function get_post_format( $post = null ) {
-	if ( ! $post = get_post( $post ) )
+function get_post_format($post = null) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	if ( ! post_type_supports( $post->post_type, 'post-formats' ) )
+	if ( ! post_type_supports($post->post_type, 'post-formats'))
 		return false;
 
-	$_format = get_the_terms( $post->ID, 'post_format' );
+	$_format = get_the_terms($post->ID, 'post_format');
 
-	if ( empty( $_format ) )
+	if (empty($_format))
 		return false;
 
-	$format = reset( $_format );
+	$format = reset($_format);
 
-	return str_replace('post-format-', '', $format->slug );
+	return str_replace('post-format-', '', $format->slug);
 }
 
 /**
@@ -40,16 +40,16 @@ 
  * @param object|int|null $post   Optional. The post to check. If not supplied, defaults to the current post if used in the loop.
  * @return bool True if the post has any of the given formats (or any format, if no format specified), false otherwise.
  */
-function has_post_format( $format = array(), $post = null ) {
+function has_post_format($format = array(), $post = null) {
 	$prefixed = array();
 
-	if ( $format ) {
-		foreach ( (array) $format as $single ) {
-			$prefixed[] = 'post-format-' . sanitize_key( $single );
+	if ($format) {
+		foreach ((array) $format as $single) {
+			$prefixed[] = 'post-format-'.sanitize_key($single);
 		}
 	}
 
-	return has_term( $prefixed, 'post_format', $post );
+	return has_term($prefixed, 'post_format', $post);
 }
 
 /**
@@ -61,21 +61,21 @@ 
  * @param string     $format A format to assign. Use an empty string or array to remove all formats from the post.
  * @return array|WP_Error|false WP_Error on error. Array of affected term IDs on success.
  */
-function set_post_format( $post, $format ) {
-	$post = get_post( $post );
+function set_post_format($post, $format) {
+	$post = get_post($post);
 
-	if ( empty( $post ) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+	if (empty($post))
+		return new WP_Error('invalid_post', __('Invalid post.'));
 
-	if ( ! empty( $format ) ) {
-		$format = sanitize_key( $format );
-		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) )
+	if ( ! empty($format)) {
+		$format = sanitize_key($format);
+		if ('standard' === $format || ! in_array($format, get_post_format_slugs()))
 			$format = '';
 		else
-			$format = 'post-format-' . $format;
+			$format = 'post-format-'.$format;
 	}
 
-	return wp_set_post_terms( $post->ID, $format, 'post_format' );
+	return wp_set_post_terms($post->ID, $format, 'post_format');
 }
 
 /**
@@ -87,16 +87,16 @@ 
  */
 function get_post_format_strings() {
 	$strings = array(
-		'standard' => _x( 'Standard', 'Post format' ), // Special case. any value that evals to false will be considered standard
-		'aside'    => _x( 'Aside',    'Post format' ),
-		'chat'     => _x( 'Chat',     'Post format' ),
-		'gallery'  => _x( 'Gallery',  'Post format' ),
-		'link'     => _x( 'Link',     'Post format' ),
-		'image'    => _x( 'Image',    'Post format' ),
-		'quote'    => _x( 'Quote',    'Post format' ),
-		'status'   => _x( 'Status',   'Post format' ),
-		'video'    => _x( 'Video',    'Post format' ),
-		'audio'    => _x( 'Audio',    'Post format' ),
+		'standard' => _x('Standard', 'Post format'), // Special case. any value that evals to false will be considered standard
+		'aside'    => _x('Aside', 'Post format'),
+		'chat'     => _x('Chat', 'Post format'),
+		'gallery'  => _x('Gallery', 'Post format'),
+		'link'     => _x('Link', 'Post format'),
+		'image'    => _x('Image', 'Post format'),
+		'quote'    => _x('Quote', 'Post format'),
+		'status'   => _x('Status', 'Post format'),
+		'video'    => _x('Video', 'Post format'),
+		'audio'    => _x('Audio', 'Post format'),
 	);
 	return $strings;
 }
@@ -109,8 +109,8 @@ 
  * @return array The array of post format slugs.
  */
 function get_post_format_slugs() {
-	$slugs = array_keys( get_post_format_strings() );
-	return array_combine( $slugs, $slugs );
+	$slugs = array_keys(get_post_format_strings());
+	return array_combine($slugs, $slugs);
 }
 
 /**
@@ -121,12 +121,12 @@ 
  * @param string $slug A post format slug.
  * @return string The translated post format name.
  */
-function get_post_format_string( $slug ) {
+function get_post_format_string($slug) {
 	$strings = get_post_format_strings();
-	if ( !$slug )
+	if ( ! $slug)
 		return $strings['standard'];
 	else
-		return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
+		return (isset($strings[$slug])) ? $strings[$slug] : '';
 }
 
 /**
@@ -137,11 +137,11 @@ 
  * @param string $format The post format slug.
  * @return string|WP_Error|false The post format term link.
  */
-function get_post_format_link( $format ) {
-	$term = get_term_by('slug', 'post-format-' . $format, 'post_format' );
-	if ( ! $term || is_wp_error( $term ) )
+function get_post_format_link($format) {
+	$term = get_term_by('slug', 'post-format-'.$format, 'post_format');
+	if ( ! $term || is_wp_error($term))
 		return false;
-	return get_term_link( $term );
+	return get_term_link($term);
 }
 
 /**
@@ -153,14 +153,14 @@ 
  * @param array $qvs
  * @return array
  */
-function _post_format_request( $qvs ) {
-	if ( ! isset( $qvs['post_format'] ) )
+function _post_format_request($qvs) {
+	if ( ! isset($qvs['post_format']))
 		return $qvs;
 	$slugs = get_post_format_slugs();
-	if ( isset( $slugs[ $qvs['post_format'] ] ) )
-		$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
-	$tax = get_taxonomy( 'post_format' );
-	if ( ! is_admin() )
+	if (isset($slugs[$qvs['post_format']]))
+		$qvs['post_format'] = 'post-format-'.$slugs[$qvs['post_format']];
+	$tax = get_taxonomy('post_format');
+	if ( ! is_admin())
 		$qvs['post_type'] = $tax->object_type;
 	return $qvs;
 }
@@ -178,16 +178,16 @@ 
  * @param string $taxonomy
  * @return string
  */
-function _post_format_link( $link, $term, $taxonomy ) {
+function _post_format_link($link, $term, $taxonomy) {
 	global $wp_rewrite;
-	if ( 'post_format' != $taxonomy ) {
+	if ('post_format' != $taxonomy) {
 		return $link;
 	}
-	if ( $wp_rewrite->get_extra_permastruct( $taxonomy ) ) {
-		return str_replace( "/{$term->slug}", '/' . str_replace( 'post-format-', '', $term->slug ), $link );
+	if ($wp_rewrite->get_extra_permastruct($taxonomy)) {
+		return str_replace("/{$term->slug}", '/'.str_replace('post-format-', '', $term->slug), $link);
 	} else {
-		$link = remove_query_arg( 'post_format', $link );
-		return add_query_arg( 'post_format', str_replace( 'post-format-', '', $term->slug ), $link );
+		$link = remove_query_arg('post_format', $link);
+		return add_query_arg('post_format', str_replace('post-format-', '', $term->slug), $link);
 	}
 }
 
@@ -200,9 +200,9 @@ 
  * @param object $term
  * @return object
  */
-function _post_format_get_term( $term ) {
-	if ( isset( $term->slug ) ) {
-		$term->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+function _post_format_get_term($term) {
+	if (isset($term->slug)) {
+		$term->name = get_post_format_string(str_replace('post-format-', '', $term->slug));
 	}
 	return $term;
 }
@@ -218,16 +218,16 @@ 
  * @param array        $args
  * @return array
  */
-function _post_format_get_terms( $terms, $taxonomies, $args ) {
-	if ( in_array( 'post_format', (array) $taxonomies ) ) {
-		if ( isset( $args['fields'] ) && 'names' == $args['fields'] ) {
-			foreach ( $terms as $order => $name ) {
-				$terms[$order] = get_post_format_string( str_replace( 'post-format-', '', $name ) );
+function _post_format_get_terms($terms, $taxonomies, $args) {
+	if (in_array('post_format', (array) $taxonomies)) {
+		if (isset($args['fields']) && 'names' == $args['fields']) {
+			foreach ($terms as $order => $name) {
+				$terms[$order] = get_post_format_string(str_replace('post-format-', '', $name));
 			}
 		} else {
-			foreach ( (array) $terms as $order => $term ) {
-				if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
-					$terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+			foreach ((array) $terms as $order => $term) {
+				if (isset($term->taxonomy) && 'post_format' == $term->taxonomy) {
+					$terms[$order]->name = get_post_format_string(str_replace('post-format-', '', $term->slug));
 				}
 			}
 		}
@@ -244,10 +244,10 @@ 
  * @param array $terms
  * @return array
  */
-function _post_format_wp_get_object_terms( $terms ) {
-	foreach ( (array) $terms as $order => $term ) {
-		if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
-			$terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+function _post_format_wp_get_object_terms($terms) {
+	foreach ((array) $terms as $order => $term) {
+		if (isset($term->taxonomy) && 'post_format' == $term->taxonomy) {
+			$terms[$order]->name = get_post_format_string(str_replace('post-format-', '', $term->slug));
 		}
 	}
 	return $terms;

src/wp-includes/rss.php

Doc Comments +13 added lines, -4 removed lines

@@ -409,7 +409,7 @@ 
  * @subpackage MagpieRSS
  *
  * @param string $url URL to retrieve feed
- * @return bool|MagpieRSS false on failure or MagpieRSS object on success.
+ * @return integer|null false on failure or MagpieRSS object on success.
  */
 function fetch_rss ($url) {
 	// initialize constants
@@ -547,7 +547,7 @@ 
  *
  * @param string $url URL to retrieve
  * @param array $headers Optional. Headers to send to the URL.
- * @return Snoopy style response
+ * @return stdClass style response
  */
 function _fetch_remote_file($url, $headers = "" ) {
 	$resp = wp_safe_remote_request( $url, array( 'headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT ) );
@@ -589,7 +589,7 @@ 
  * @package External
  * @subpackage MagpieRSS
  *
- * @param array $resp
+ * @param stdClass $resp
  * @return MagpieRSS|bool
  */
 function _response_to_rss ($resp) {
@@ -746,6 +746,9 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		true on success
 \*=======================================================================*/
+	/**
+	 * @param string $url
+	 */
 	function set ($url, $rss) {
 		$cache_option = 'rss_' . $this->file_name( $url );
 
@@ -760,6 +763,9 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		cached object on HIT, false on MISS
 \*=======================================================================*/
+	/**
+	 * @param string $url
+	 */
 	function get ($url) {
 		$this->ERROR = "";
 		$cache_option = 'rss_' . $this->file_name( $url );
@@ -781,6 +787,9 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		cached object on HIT, false on MISS
 \*=======================================================================*/
+	/**
+	 * @param string $url
+	 */
 	function check_cache ( $url ) {
 		$this->ERROR = "";
 		$cache_option = 'rss_' . $this->file_name( $url );
@@ -936,7 +945,7 @@ 
  *
  * @param string $url URL of feed to display. Will not auto sense feed URL.
  * @param int $num_items Optional. Number of items to display, default is all.
- * @return bool False on failure.
+ * @return null|false False on failure.
  */
 function get_rss ($url, $num_items = 5) { // Like get posts, but for RSS
 	$rss = fetch_rss($url);

Braces +56 added lines, -85 removed lines

@@ -62,13 +62,15 @@ 
 
 		# if PHP xml isn't compiled in, die
 		#
-		if ( !function_exists('xml_parser_create') )
-			trigger_error( "Failed to load PHP's XML Extension. http://www.php.net/manual/en/ref.xml.php" );
+		if ( !function_exists('xml_parser_create') ) {
+					trigger_error( "Failed to load PHP's XML Extension. http://www.php.net/manual/en/ref.xml.php" );
+		}
 
 		$parser = @xml_parser_create();
 
-		if ( !is_resource($parser) )
-			trigger_error( "Failed to create an instance of PHP's XML parser. http://www.php.net/manual/en/ref.xml.php");
+		if ( !is_resource($parser) ) {
+					trigger_error( "Failed to create an instance of PHP's XML parser. http://www.php.net/manual/en/ref.xml.php");
+		}
 
 		$this->parser = $parser;
 
@@ -127,12 +129,10 @@ 
 			if ( $el == 'rdf' ) {
 				$this->feed_type = RSS;
 				$this->feed_version = '1.0';
-			}
-			elseif ( $el == 'rss' ) {
+			} elseif ( $el == 'rss' ) {
 				$this->feed_type = RSS;
 				$this->feed_version = $attrs['version'];
-			}
-			elseif ( $el == 'feed' ) {
+			} elseif ( $el == 'feed' ) {
 				$this->feed_type = ATOM;
 				$this->feed_version = $attrs['version'];
 				$this->inchannel = true;
@@ -143,8 +143,7 @@ 
 		if ( $el == 'channel' )
 		{
 			$this->inchannel = true;
-		}
-		elseif ($el == 'item' or $el == 'entry' )
+		} elseif ($el == 'item' or $el == 'entry' )
 		{
 			$this->initem = true;
 			if ( isset($attrs['rdf:about']) ) {
@@ -160,9 +159,7 @@ 
 			$el == 'textinput' )
 		{
 			$this->intextinput = true;
-		}
-
-		elseif (
+		} elseif (
 			$this->feed_type == RSS and
 			$this->current_namespace == '' and
 			$el == 'image' )
@@ -205,8 +202,7 @@ 
 			if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
 			{
 				$link_el = 'link';
-			}
-			else {
+			} else {
 				$link_el = 'link_' . $attrs['rel'];
 			}
 
@@ -223,8 +219,7 @@ 
 		if ($this->feed_type == ATOM and $this->incontent)
 		{
 			$this->append_content( $text );
-		}
-		else {
+		} else {
 			$current_el = join('_', array_reverse($this->stack));
 			$this->append($current_el, $text);
 		}
@@ -238,37 +233,30 @@ 
 			$this->items[] = $this->current_item;
 			$this->current_item = array();
 			$this->initem = false;
-		}
-		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
+		} elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
 		{
 			$this->intextinput = false;
-		}
-		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
+		} elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
 		{
 			$this->inimage = false;
-		}
-		elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		} elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
 		{
 			$this->incontent = false;
-		}
-		elseif ($el == 'channel' or $el == 'feed' )
+		} elseif ($el == 'channel' or $el == 'feed' )
 		{
 			$this->inchannel = false;
-		}
-		elseif ($this->feed_type == ATOM and $this->incontent  ) {
+		} elseif ($this->feed_type == ATOM and $this->incontent  ) {
 			// balance tags properly
 			// note: This may not actually be necessary
 			if ( $this->stack[0] == $el )
 			{
 				$this->append_content("</$el>");
-			}
-			else {
+			} else {
 				$this->append_content("<$el />");
 			}
 
 			array_shift( $this->stack );
-		}
-		else {
+		} else {
 			array_shift( $this->stack );
 		}
 
@@ -285,8 +273,7 @@ 
 	function append_content($text) {
 		if ( $this->initem ) {
 			$this->concat( $this->current_item[ $this->incontent ], $text );
-		}
-		elseif ( $this->inchannel ) {
+		} elseif ( $this->inchannel ) {
 			$this->concat( $this->channel[ $this->incontent ], $text );
 		}
 	}
@@ -301,34 +288,27 @@ 
 			if ( $this->initem ) {
 				$this->concat(
 					$this->current_item[ $this->current_namespace ][ $el ], $text);
-			}
-			elseif ($this->inchannel) {
+			} elseif ($this->inchannel) {
 				$this->concat(
 					$this->channel[ $this->current_namespace][ $el ], $text );
-			}
-			elseif ($this->intextinput) {
+			} elseif ($this->intextinput) {
 				$this->concat(
 					$this->textinput[ $this->current_namespace][ $el ], $text );
-			}
-			elseif ($this->inimage) {
+			} elseif ($this->inimage) {
 				$this->concat(
 					$this->image[ $this->current_namespace ][ $el ], $text );
 			}
-		}
-		else {
+		} else {
 			if ( $this->initem ) {
 				$this->concat(
 					$this->current_item[ $el ], $text);
-			}
-			elseif ($this->intextinput) {
+			} elseif ($this->intextinput) {
 				$this->concat(
 					$this->textinput[ $el ], $text );
-			}
-			elseif ($this->inimage) {
+			} elseif ($this->inimage) {
 				$this->concat(
 					$this->image[ $el ], $text );
-			}
-			elseif ($this->inchannel) {
+			} elseif ($this->inchannel) {
 				$this->concat(
 					$this->channel[ $el ], $text );
 			}
@@ -342,22 +322,25 @@ 
 			$this->channel['descripton'] = $this->channel['tagline'];
 			for ( $i = 0; $i < count($this->items); $i++) {
 				$item = $this->items[$i];
-				if ( isset($item['summary']) )
-					$item['description'] = $item['summary'];
-				if ( isset($item['atom_content']))
-					$item['content']['encoded'] = $item['atom_content'];
+				if ( isset($item['summary']) ) {
+									$item['description'] = $item['summary'];
+				}
+				if ( isset($item['atom_content'])) {
+									$item['content']['encoded'] = $item['atom_content'];
+				}
 
 				$this->items[$i] = $item;
 			}
-		}
-		elseif ( $this->is_rss() ) {
+		} elseif ( $this->is_rss() ) {
 			$this->channel['tagline'] = $this->channel['description'];
 			for ( $i = 0; $i < count($this->items); $i++) {
 				$item = $this->items[$i];
-				if ( isset($item['description']))
-					$item['summary'] = $item['description'];
-				if ( isset($item['content']['encoded'] ) )
-					$item['atom_content'] = $item['content']['encoded'];
+				if ( isset($item['description'])) {
+									$item['summary'] = $item['description'];
+				}
+				if ( isset($item['content']['encoded'] ) ) {
+									$item['atom_content'] = $item['content']['encoded'];
+				}
 
 				$this->items[$i] = $item;
 			}
@@ -367,8 +350,7 @@ 
 	function is_rss () {
 		if ( $this->feed_type == RSS ) {
 			return $this->feed_version;
-		}
-		else {
+		} else {
 			return false;
 		}
 	}
@@ -376,8 +358,7 @@ 
 	function is_atom() {
 		if ( $this->feed_type == ATOM ) {
 			return $this->feed_version;
-		}
-		else {
+		} else {
 			return false;
 		}
 	}
@@ -426,8 +407,7 @@ 
 		$resp = _fetch_remote_file( $url );
 		if ( is_success( $resp->status ) ) {
 			return _response_to_rss( $resp );
-		}
-		else {
+		} else {
 			// error("Failed to fetch $url and cache is off");
 			return false;
 		}
@@ -490,8 +470,7 @@ 
 				// reset cache on 304 (at minutillo insistent prodding)
 				$cache->set($url, $rss);
 				return $rss;
-			}
-			elseif ( is_success( $resp->status ) ) {
+			} elseif ( is_success( $resp->status ) ) {
 				$rss = _response_to_rss( $resp );
 				if ( $rss ) {
 					if (MAGPIE_DEBUG > 1) {
@@ -501,21 +480,18 @@ 
 					$cache->set( $url, $rss );
 					return $rss;
 				}
-			}
-			else {
+			} else {
 				$errormsg = "Failed to fetch $url. ";
 				if ( $resp->error ) {
 					# compensate for Snoopy's annoying habbit to tacking
 					# on '\n'
 					$http_error = substr($resp->error, 0, -2);
 					$errormsg .= "(HTTP Error: $http_error)";
-				}
-				else {
+				} else {
 					$errormsg .=  "(HTTP Response: " . $resp->response_code .')';
 				}
 			}
-		}
-		else {
+		} else {
 			$errormsg = "Unable to retrieve RSS file for unknown reasons.";
 		}
 
@@ -568,8 +544,9 @@ 
 		if ( !is_array($value) ) {
 			$return_headers[] = "$key: $value";
 		} else {
-			foreach ( $value as $v )
-				$return_headers[] = "$key: $v";
+			foreach ( $value as $v ) {
+							$return_headers[] = "$key: $v";
+			}
 		}
 	}
 
@@ -603,8 +580,7 @@ 
 			// 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
 			if (strpos($h, ": ")) {
 				list($field, $val) = explode(": ", $h, 2);
-			}
-			else {
+			} else {
 				$field = $h;
 				$val = "";
 			}
@@ -642,8 +618,7 @@ 
 function init () {
 	if ( defined('MAGPIE_INITALIZED') ) {
 		return;
-	}
-	else {
+	} else {
 		define('MAGPIE_INITALIZED', 1);
 	}
 
@@ -672,8 +647,7 @@ 
 
 		if ( MAGPIE_CACHE_ON ) {
 			$ua = $ua . ')';
-		}
-		else {
+		} else {
 			$ua = $ua . '; No cache)';
 		}
 
@@ -830,8 +804,7 @@ 
 		$this->ERROR = $errormsg;
 		if ( MAGPIE_DEBUG ) {
 			trigger_error( $errormsg, $lvl);
-		}
-		else {
+		} else {
 			error_log( $errormsg, 0);
 		}
 	}
@@ -858,8 +831,7 @@ 
 		$offset = 0;
 		if ( $match[11] == 'Z' ) {
 			# zulu time, aka GMT
-		}
-		else {
+		} else {
 			list( $tz_mod, $tz_hour, $tz_min ) =
 				array( $match[8], $match[9], $match[10]);
 
@@ -879,8 +851,7 @@ 
 		}
 		$epoch = $epoch + $offset;
 		return $epoch;
-	}
-	else {
+	} else {
 		return -1;
 	}
 }

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
 /**
- * MagpieRSS: a simple RSS integration tool
- *
- * A compiled file for RSS syndication
- *
- * @author Kellan Elliott-McCrea <kellan@protest.net>
- * @version 0.51
- * @license GPL
- *
- * @package External
- * @subpackage MagpieRSS
- * @deprecated 3.0.0 Use SimplePie instead.
- */
+	 * MagpieRSS: a simple RSS integration tool
+	 *
+	 * A compiled file for RSS syndication
+	 *
+	 * @author Kellan Elliott-McCrea <kellan@protest.net>
+	 * @version 0.51
+	 * @license GPL
+	 *
+	 * @package External
+	 * @subpackage MagpieRSS
+	 * @deprecated 3.0.0 Use SimplePie instead.
+	 */
 
 /**
  * Deprecated. Use SimplePie (class-simplepie.php) instead.

Spacing +224 added lines, -224 removed lines

@@ -16,7 +16,7 @@ 
 /**
  * Deprecated. Use SimplePie (class-simplepie.php) instead.
  */
-_deprecated_file( basename( __FILE__ ), '3.0', WPINC . '/class-simplepie.php' );
+_deprecated_file(basename(__FILE__), '3.0', WPINC.'/class-simplepie.php');
 
 /**
  * Fires before MagpieRSS is loaded, to optionally replace it.
@@ -24,32 +24,32 @@ 
  * @since 2.3.0
  * @deprecated 3.0.0
  */
-do_action( 'load_feed_engine' );
+do_action('load_feed_engine');
 
 /** RSS feed constant. */
 define('RSS', 'RSS');
 define('ATOM', 'Atom');
-define('MAGPIE_USER_AGENT', 'WordPress/' . $GLOBALS['wp_version']);
+define('MAGPIE_USER_AGENT', 'WordPress/'.$GLOBALS['wp_version']);
 
 class MagpieRSS {
 	var $parser;
-	var $current_item	= array();	// item currently being parsed
-	var $items			= array();	// collection of parsed items
-	var $channel		= array();	// hash of channel fields
-	var $textinput		= array();
+	var $current_item = array(); // item currently being parsed
+	var $items			= array(); // collection of parsed items
+	var $channel = array(); // hash of channel fields
+	var $textinput = array();
 	var $image			= array();
 	var $feed_type;
 	var $feed_version;
 
 	// parser variables
-	var $stack				= array(); // parser stack
+	var $stack = array(); // parser stack
 	var $inchannel			= false;
-	var $initem 			= false;
+	var $initem = false;
 	var $incontent			= false; // if in Atom <content mode="xml"> field
-	var $intextinput		= false;
-	var $inimage 			= false;
-	var $current_field		= '';
-	var $current_namespace	= false;
+	var $intextinput = false;
+	var $inimage = false;
+	var $current_field = '';
+	var $current_namespace = false;
 
 	//var $ERROR = "";
 
@@ -58,44 +58,44 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $source ) {
+	function __construct($source) {
 
 		# if PHP xml isn't compiled in, die
 		#
-		if ( !function_exists('xml_parser_create') )
-			trigger_error( "Failed to load PHP's XML Extension. http://www.php.net/manual/en/ref.xml.php" );
+		if ( ! function_exists('xml_parser_create'))
+			trigger_error("Failed to load PHP's XML Extension. http://www.php.net/manual/en/ref.xml.php");
 
 		$parser = @xml_parser_create();
 
-		if ( !is_resource($parser) )
-			trigger_error( "Failed to create an instance of PHP's XML parser. http://www.php.net/manual/en/ref.xml.php");
+		if ( ! is_resource($parser))
+			trigger_error("Failed to create an instance of PHP's XML parser. http://www.php.net/manual/en/ref.xml.php");
 
 		$this->parser = $parser;
 
 		# pass in parser, and a reference to this object
 		# set up handlers
 		#
-		xml_set_object( $this->parser, $this );
+		xml_set_object($this->parser, $this);
 		xml_set_element_handler($this->parser,
-				'feed_start_element', 'feed_end_element' );
+				'feed_start_element', 'feed_end_element');
 
-		xml_set_character_data_handler( $this->parser, 'feed_cdata' );
+		xml_set_character_data_handler($this->parser, 'feed_cdata');
 
-		$status = xml_parse( $this->parser, $source );
+		$status = xml_parse($this->parser, $source);
 
-		if (! $status ) {
-			$errorcode = xml_get_error_code( $this->parser );
-			if ( $errorcode != XML_ERROR_NONE ) {
-				$xml_error = xml_error_string( $errorcode );
+		if ( ! $status) {
+			$errorcode = xml_get_error_code($this->parser);
+			if ($errorcode != XML_ERROR_NONE) {
+				$xml_error = xml_error_string($errorcode);
 				$error_line = xml_get_current_line_number($this->parser);
 				$error_col = xml_get_current_column_number($this->parser);
 				$errormsg = "$xml_error at line $error_line, column $error_col";
 
-				$this->error( $errormsg );
+				$this->error($errormsg);
 			}
 		}
 
-		xml_parser_free( $this->parser );
+		xml_parser_free($this->parser);
 
 		$this->normalize();
 	}
@@ -103,8 +103,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function MagpieRSS( $source ) {
-		self::__construct( $source );
+	public function MagpieRSS($source) {
+		self::__construct($source);
 	}
 
 	function feed_start_element($p, $element, &$attrs) {
@@ -112,27 +112,27 @@ 
 		$attrs = array_change_key_case($attrs, CASE_LOWER);
 
 		// check for a namespace, and split if found
-		$ns	= false;
-		if ( strpos( $element, ':' ) ) {
-			list($ns, $el) = split( ':', $element, 2);
+		$ns = false;
+		if (strpos($element, ':')) {
+			list($ns, $el) = split(':', $element, 2);
 		}
-		if ( $ns and $ns != 'rdf' ) {
+		if ($ns and $ns != 'rdf') {
 			$this->current_namespace = $ns;
 		}
 
 		# if feed type isn't set, then this is first element of feed
 		# identify feed from root element
 		#
-		if (!isset($this->feed_type) ) {
-			if ( $el == 'rdf' ) {
+		if ( ! isset($this->feed_type)) {
+			if ($el == 'rdf') {
 				$this->feed_type = RSS;
 				$this->feed_version = '1.0';
 			}
-			elseif ( $el == 'rss' ) {
+			elseif ($el == 'rss') {
 				$this->feed_type = RSS;
 				$this->feed_version = $attrs['version'];
 			}
-			elseif ( $el == 'feed' ) {
+			elseif ($el == 'feed') {
 				$this->feed_type = ATOM;
 				$this->feed_version = $attrs['version'];
 				$this->inchannel = true;
@@ -140,14 +140,14 @@ 
 			return;
 		}
 
-		if ( $el == 'channel' )
+		if ($el == 'channel')
 		{
 			$this->inchannel = true;
 		}
-		elseif ($el == 'item' or $el == 'entry' )
+		elseif ($el == 'item' or $el == 'entry')
 		{
 			$this->initem = true;
-			if ( isset($attrs['rdf:about']) ) {
+			if (isset($attrs['rdf:about'])) {
 				$this->current_item['about'] = $attrs['rdf:about'];
 			}
 		}
@@ -171,10 +171,10 @@ 
 		}
 
 		# handle atom content constructs
-		elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
 		{
 			// avoid clashing w/ RSS mod_content
-			if ($el == 'content' ) {
+			if ($el == 'content') {
 				$el = 'atom_content';
 			}
 
@@ -183,31 +183,31 @@ 
 		}
 
 		// if inside an Atom content construct (e.g. content or summary) field treat tags as text
-		elseif ($this->feed_type == ATOM and $this->incontent )
+		elseif ($this->feed_type == ATOM and $this->incontent)
 		{
 			// if tags are inlined, then flatten
 			$attrs_str = join(' ',
 					array_map(array('MagpieRSS', 'map_attrs'),
 					array_keys($attrs),
-					array_values($attrs) ) );
+					array_values($attrs)));
 
-			$this->append_content( "<$element $attrs_str>"  );
+			$this->append_content("<$element $attrs_str>");
 
-			array_unshift( $this->stack, $el );
+			array_unshift($this->stack, $el);
 		}
 
 		// Atom support many links per containging element.
 		// Magpie treats link elements of type rel='alternate'
 		// as being equivalent to RSS's simple link element.
 		//
-		elseif ($this->feed_type == ATOM and $el == 'link' )
+		elseif ($this->feed_type == ATOM and $el == 'link')
 		{
-			if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
+			if (isset($attrs['rel']) and $attrs['rel'] == 'alternate')
 			{
 				$link_el = 'link';
 			}
 			else {
-				$link_el = 'link_' . $attrs['rel'];
+				$link_el = 'link_'.$attrs['rel'];
 			}
 
 			$this->append($link_el, $attrs['href']);
@@ -218,11 +218,11 @@ 
 		}
 	}
 
-	function feed_cdata ($p, $text) {
+	function feed_cdata($p, $text) {
 
 		if ($this->feed_type == ATOM and $this->incontent)
 		{
-			$this->append_content( $text );
+			$this->append_content($text);
 		}
 		else {
 			$current_el = join('_', array_reverse($this->stack));
@@ -230,35 +230,35 @@ 
 		}
 	}
 
-	function feed_end_element ($p, $el) {
+	function feed_end_element($p, $el) {
 		$el = strtolower($el);
 
-		if ( $el == 'item' or $el == 'entry' )
+		if ($el == 'item' or $el == 'entry')
 		{
 			$this->items[] = $this->current_item;
 			$this->current_item = array();
 			$this->initem = false;
 		}
-		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
+		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput')
 		{
 			$this->intextinput = false;
 		}
-		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
+		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image')
 		{
 			$this->inimage = false;
 		}
-		elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
 		{
 			$this->incontent = false;
 		}
-		elseif ($el == 'channel' or $el == 'feed' )
+		elseif ($el == 'channel' or $el == 'feed')
 		{
 			$this->inchannel = false;
 		}
-		elseif ($this->feed_type == ATOM and $this->incontent  ) {
+		elseif ($this->feed_type == ATOM and $this->incontent) {
 			// balance tags properly
 			// note: This may not actually be necessary
-			if ( $this->stack[0] == $el )
+			if ($this->stack[0] == $el)
 			{
 				$this->append_content("</$el>");
 			}
@@ -266,97 +266,97 @@ 
 				$this->append_content("<$el />");
 			}
 
-			array_shift( $this->stack );
+			array_shift($this->stack);
 		}
 		else {
-			array_shift( $this->stack );
+			array_shift($this->stack);
 		}
 
 		$this->current_namespace = false;
 	}
 
-	function concat (&$str1, $str2="") {
-		if (!isset($str1) ) {
-			$str1="";
+	function concat(&$str1, $str2 = "") {
+		if ( ! isset($str1)) {
+			$str1 = "";
 		}
 		$str1 .= $str2;
 	}
 
 	function append_content($text) {
-		if ( $this->initem ) {
-			$this->concat( $this->current_item[ $this->incontent ], $text );
+		if ($this->initem) {
+			$this->concat($this->current_item[$this->incontent], $text);
 		}
-		elseif ( $this->inchannel ) {
-			$this->concat( $this->channel[ $this->incontent ], $text );
+		elseif ($this->inchannel) {
+			$this->concat($this->channel[$this->incontent], $text);
 		}
 	}
 
 	// smart append - field and namespace aware
 	function append($el, $text) {
-		if (!$el) {
+		if ( ! $el) {
 			return;
 		}
-		if ( $this->current_namespace )
+		if ($this->current_namespace)
 		{
-			if ( $this->initem ) {
+			if ($this->initem) {
 				$this->concat(
-					$this->current_item[ $this->current_namespace ][ $el ], $text);
+					$this->current_item[$this->current_namespace][$el], $text);
 			}
 			elseif ($this->inchannel) {
 				$this->concat(
-					$this->channel[ $this->current_namespace][ $el ], $text );
+					$this->channel[$this->current_namespace][$el], $text );
 			}
 			elseif ($this->intextinput) {
 				$this->concat(
-					$this->textinput[ $this->current_namespace][ $el ], $text );
+					$this->textinput[$this->current_namespace][$el], $text );
 			}
 			elseif ($this->inimage) {
 				$this->concat(
-					$this->image[ $this->current_namespace ][ $el ], $text );
+					$this->image[$this->current_namespace][$el], $text );
 			}
 		}
 		else {
-			if ( $this->initem ) {
+			if ($this->initem) {
 				$this->concat(
-					$this->current_item[ $el ], $text);
+					$this->current_item[$el], $text);
 			}
 			elseif ($this->intextinput) {
 				$this->concat(
-					$this->textinput[ $el ], $text );
+					$this->textinput[$el], $text );
 			}
 			elseif ($this->inimage) {
 				$this->concat(
-					$this->image[ $el ], $text );
+					$this->image[$el], $text );
 			}
 			elseif ($this->inchannel) {
 				$this->concat(
-					$this->channel[ $el ], $text );
+					$this->channel[$el], $text );
 			}
 
 		}
 	}
 
-	function normalize () {
+	function normalize() {
 		// if atom populate rss fields
-		if ( $this->is_atom() ) {
+		if ($this->is_atom()) {
 			$this->channel['descripton'] = $this->channel['tagline'];
-			for ( $i = 0; $i < count($this->items); $i++) {
+			for ($i = 0; $i < count($this->items); $i++) {
 				$item = $this->items[$i];
-				if ( isset($item['summary']) )
+				if (isset($item['summary']))
 					$item['description'] = $item['summary'];
-				if ( isset($item['atom_content']))
+				if (isset($item['atom_content']))
 					$item['content']['encoded'] = $item['atom_content'];
 
 				$this->items[$i] = $item;
 			}
 		}
-		elseif ( $this->is_rss() ) {
+		elseif ($this->is_rss()) {
 			$this->channel['tagline'] = $this->channel['description'];
-			for ( $i = 0; $i < count($this->items); $i++) {
+			for ($i = 0; $i < count($this->items); $i++) {
 				$item = $this->items[$i];
-				if ( isset($item['description']))
+				if (isset($item['description']))
 					$item['summary'] = $item['description'];
-				if ( isset($item['content']['encoded'] ) )
+				if (isset($item['content']['encoded']))
 					$item['atom_content'] = $item['content']['encoded'];
 
 				$this->items[$i] = $item;
@@ -364,8 +364,8 @@ 
 		}
 	}
 
-	function is_rss () {
-		if ( $this->feed_type == RSS ) {
+	function is_rss() {
+		if ($this->feed_type == RSS) {
 			return $this->feed_version;
 		}
 		else {
@@ -374,7 +374,7 @@ 
 	}
 
 	function is_atom() {
-		if ( $this->feed_type == ATOM ) {
+		if ($this->feed_type == ATOM) {
 			return $this->feed_version;
 		}
 		else {
@@ -386,21 +386,21 @@ 
 		return "$k=\"$v\"";
 	}
 
-	function error( $errormsg, $lvl = E_USER_WARNING ) {
+	function error($errormsg, $lvl = E_USER_WARNING) {
 		// append PHP's error message if track_errors enabled
-		if ( isset($php_errormsg) ) {
+		if (isset($php_errormsg)) {
 			$errormsg .= " ($php_errormsg)";
 		}
-		if ( MAGPIE_DEBUG ) {
-			trigger_error( $errormsg, $lvl);
+		if (MAGPIE_DEBUG) {
+			trigger_error($errormsg, $lvl);
 		} else {
-			error_log( $errormsg, 0);
+			error_log($errormsg, 0);
 		}
 	}
 
 }
 
-if ( !function_exists('fetch_rss') ) :
+if ( ! function_exists('fetch_rss')) :
 /**
  * Build Magpie object based on RSS from URL.
  *
@@ -411,21 +411,21 @@ 
  * @param string $url URL to retrieve feed
  * @return bool|MagpieRSS false on failure or MagpieRSS object on success.
  */
-function fetch_rss ($url) {
+function fetch_rss($url) {
 	// initialize constants
 	init();
 
-	if ( !isset($url) ) {
+	if ( ! isset($url)) {
 		// error("fetch_rss called without a url");
 		return false;
 	}
 
 	// if cache is disabled
-	if ( !MAGPIE_CACHE_ON ) {
+	if ( ! MAGPIE_CACHE_ON) {
 		// fetch file, and parse it
-		$resp = _fetch_remote_file( $url );
-		if ( is_success( $resp->status ) ) {
-			return _response_to_rss( $resp );
+		$resp = _fetch_remote_file($url);
+		if (is_success($resp->status)) {
+			return _response_to_rss($resp);
 		}
 		else {
 			// error("Failed to fetch $url and cache is off");
@@ -440,28 +440,28 @@ 
 		// 3. if cached obj fails freshness check, fetch remote
 		// 4. if remote fails, return stale object, or error
 
-		$cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
+		$cache = new RSSCache(MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE);
 
 		if (MAGPIE_DEBUG and $cache->ERROR) {
 			debug($cache->ERROR, E_USER_WARNING);
 		}
 
-		$cache_status 	 = 0;		// response of check_cache
+		$cache_status = 0; // response of check_cache
 		$request_headers = array(); // HTTP headers to send with fetch
-		$rss 			 = 0;		// parsed RSS object
-		$errormsg		 = 0;		// errors, if any
+		$rss = 0; // parsed RSS object
+		$errormsg = 0; // errors, if any
 
-		if (!$cache->ERROR) {
+		if ( ! $cache->ERROR) {
 			// return cache HIT, MISS, or STALE
-			$cache_status = $cache->check_cache( $url );
+			$cache_status = $cache->check_cache($url);
 		}
 
 		// if object cached, and cache is fresh, return cached obj
-		if ( $cache_status == 'HIT' ) {
-			$rss = $cache->get( $url );
-			if ( isset($rss) and $rss ) {
+		if ($cache_status == 'HIT') {
+			$rss = $cache->get($url);
+			if (isset($rss) and $rss) {
 				$rss->from_cache = 1;
-				if ( MAGPIE_DEBUG > 1) {
+				if (MAGPIE_DEBUG > 1) {
 				debug("MagpieRSS: Cache HIT", E_USER_NOTICE);
 			}
 				return $rss;
@@ -471,47 +471,47 @@ 
 		// else attempt a conditional get
 
 		// set up headers
-		if ( $cache_status == 'STALE' ) {
-			$rss = $cache->get( $url );
-			if ( isset($rss->etag) and $rss->last_modified ) {
+		if ($cache_status == 'STALE') {
+			$rss = $cache->get($url);
+			if (isset($rss->etag) and $rss->last_modified) {
 				$request_headers['If-None-Match'] = $rss->etag;
 				$request_headers['If-Last-Modified'] = $rss->last_modified;
 			}
 		}
 
-		$resp = _fetch_remote_file( $url, $request_headers );
+		$resp = _fetch_remote_file($url, $request_headers);
 
 		if (isset($resp) and $resp) {
-			if ($resp->status == '304' ) {
+			if ($resp->status == '304') {
 				// we have the most current copy
-				if ( MAGPIE_DEBUG > 1) {
+				if (MAGPIE_DEBUG > 1) {
 					debug("Got 304 for $url");
 				}
 				// reset cache on 304 (at minutillo insistent prodding)
 				$cache->set($url, $rss);
 				return $rss;
 			}
-			elseif ( is_success( $resp->status ) ) {
-				$rss = _response_to_rss( $resp );
-				if ( $rss ) {
+			elseif (is_success($resp->status)) {
+				$rss = _response_to_rss($resp);
+				if ($rss) {
 					if (MAGPIE_DEBUG > 1) {
 						debug("Fetch successful");
 					}
 					// add object to cache
-					$cache->set( $url, $rss );
+					$cache->set($url, $rss);
 					return $rss;
 				}
 			}
 			else {
 				$errormsg = "Failed to fetch $url. ";
-				if ( $resp->error ) {
+				if ($resp->error) {
 					# compensate for Snoopy's annoying habbit to tacking
 					# on '\n'
 					$http_error = substr($resp->error, 0, -2);
 					$errormsg .= "(HTTP Error: $http_error)";
 				}
 				else {
-					$errormsg .=  "(HTTP Response: " . $resp->response_code .')';
+					$errormsg .= "(HTTP Response: ".$resp->response_code.')';
 				}
 			}
 		}
@@ -523,7 +523,7 @@ 
 
 		// attempt to return cached object
 		if ($rss) {
-			if ( MAGPIE_DEBUG ) {
+			if (MAGPIE_DEBUG) {
 				debug("Returning STALE object for $url");
 			}
 			return $rss;
@@ -549,35 +549,35 @@ 
  * @param array $headers Optional. Headers to send to the URL.
  * @return Snoopy style response
  */
-function _fetch_remote_file($url, $headers = "" ) {
-	$resp = wp_safe_remote_request( $url, array( 'headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT ) );
-	if ( is_wp_error($resp) ) {
+function _fetch_remote_file($url, $headers = "") {
+	$resp = wp_safe_remote_request($url, array('headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT));
+	if (is_wp_error($resp)) {
 		$error = array_shift($resp->errors);
 
 		$resp = new stdClass;
 		$resp->status = 500;
 		$resp->response_code = 500;
-		$resp->error = $error[0] . "\n"; //\n = Snoopy compatibility
+		$resp->error = $error[0]."\n"; //\n = Snoopy compatibility
 		return $resp;
 	}
 
 	// Snoopy returns headers unprocessed.
 	// Also note, WP_HTTP lowercases all keys, Snoopy did not.
 	$return_headers = array();
-	foreach ( wp_remote_retrieve_headers( $resp ) as $key => $value ) {
-		if ( !is_array($value) ) {
+	foreach (wp_remote_retrieve_headers($resp) as $key => $value) {
+		if ( ! is_array($value)) {
 			$return_headers[] = "$key: $value";
 		} else {
-			foreach ( $value as $v )
+			foreach ($value as $v)
 				$return_headers[] = "$key: $v";
 		}
 	}
 
 	$response = new stdClass;
-	$response->status = wp_remote_retrieve_response_code( $resp );
-	$response->response_code = wp_remote_retrieve_response_code( $resp );
+	$response->status = wp_remote_retrieve_response_code($resp);
+	$response->response_code = wp_remote_retrieve_response_code($resp);
 	$response->headers = $return_headers;
-	$response->results = wp_remote_retrieve_body( $resp );
+	$response->results = wp_remote_retrieve_body($resp);
 
 	return $response;
 }
@@ -592,14 +592,14 @@ 
  * @param array $resp
  * @return MagpieRSS|bool
  */
-function _response_to_rss ($resp) {
-	$rss = new MagpieRSS( $resp->results );
+function _response_to_rss($resp) {
+	$rss = new MagpieRSS($resp->results);
 
 	// if RSS parsed successfully
-	if ( $rss && (!isset($rss->ERROR) || !$rss->ERROR) ) {
+	if ($rss && ( ! isset($rss->ERROR) || ! $rss->ERROR)) {
 
 		// find Etag, and Last-Modified
-		foreach ( (array) $resp->headers as $h) {
+		foreach ((array) $resp->headers as $h) {
 			// 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
 			if (strpos($h, ": ")) {
 				list($field, $val) = explode(": ", $h, 2);
@@ -609,11 +609,11 @@ 
 				$val = "";
 			}
 
-			if ( $field == 'etag' ) {
+			if ($field == 'etag') {
 				$rss->etag = $val;
 			}
 
-			if ( $field == 'last-modified' ) {
+			if ($field == 'last-modified') {
 				$rss->last_modified = $val;
 			}
 		}
@@ -624,7 +624,7 @@ 
 		$errormsg = "Failed to parse RSS file.";
 
 		if ($rss) {
-			$errormsg .= " (" . $rss->ERROR . ")";
+			$errormsg .= " (".$rss->ERROR.")";
 		}
 		// error($errormsg);
 
@@ -639,95 +639,95 @@ 
  * @package External
  * @subpackage MagpieRSS
  */
-function init () {
-	if ( defined('MAGPIE_INITALIZED') ) {
+function init() {
+	if (defined('MAGPIE_INITALIZED')) {
 		return;
 	}
 	else {
 		define('MAGPIE_INITALIZED', 1);
 	}
 
-	if ( !defined('MAGPIE_CACHE_ON') ) {
+	if ( ! defined('MAGPIE_CACHE_ON')) {
 		define('MAGPIE_CACHE_ON', 1);
 	}
 
-	if ( !defined('MAGPIE_CACHE_DIR') ) {
+	if ( ! defined('MAGPIE_CACHE_DIR')) {
 		define('MAGPIE_CACHE_DIR', './cache');
 	}
 
-	if ( !defined('MAGPIE_CACHE_AGE') ) {
-		define('MAGPIE_CACHE_AGE', 60*60); // one hour
+	if ( ! defined('MAGPIE_CACHE_AGE')) {
+		define('MAGPIE_CACHE_AGE', 60 * 60); // one hour
 	}
 
-	if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) {
+	if ( ! defined('MAGPIE_CACHE_FRESH_ONLY')) {
 		define('MAGPIE_CACHE_FRESH_ONLY', 0);
 	}
 
-		if ( !defined('MAGPIE_DEBUG') ) {
+		if ( ! defined('MAGPIE_DEBUG')) {
 		define('MAGPIE_DEBUG', 0);
 	}
 
-	if ( !defined('MAGPIE_USER_AGENT') ) {
-		$ua = 'WordPress/' . $GLOBALS['wp_version'];
+	if ( ! defined('MAGPIE_USER_AGENT')) {
+		$ua = 'WordPress/'.$GLOBALS['wp_version'];
 
-		if ( MAGPIE_CACHE_ON ) {
-			$ua = $ua . ')';
+		if (MAGPIE_CACHE_ON) {
+			$ua = $ua.')';
 		}
 		else {
-			$ua = $ua . '; No cache)';
+			$ua = $ua.'; No cache)';
 		}
 
 		define('MAGPIE_USER_AGENT', $ua);
 	}
 
-	if ( !defined('MAGPIE_FETCH_TIME_OUT') ) {
-		define('MAGPIE_FETCH_TIME_OUT', 2);	// 2 second timeout
+	if ( ! defined('MAGPIE_FETCH_TIME_OUT')) {
+		define('MAGPIE_FETCH_TIME_OUT', 2); // 2 second timeout
 	}
 
 	// use gzip encoding to fetch rss files if supported?
-	if ( !defined('MAGPIE_USE_GZIP') ) {
+	if ( ! defined('MAGPIE_USE_GZIP')) {
 		define('MAGPIE_USE_GZIP', true);
 	}
 }
 
-function is_info ($sc) {
+function is_info($sc) {
 	return $sc >= 100 && $sc < 200;
 }
 
-function is_success ($sc) {
+function is_success($sc) {
 	return $sc >= 200 && $sc < 300;
 }
 
-function is_redirect ($sc) {
+function is_redirect($sc) {
 	return $sc >= 300 && $sc < 400;
 }
 
-function is_error ($sc) {
+function is_error($sc) {
 	return $sc >= 400 && $sc < 600;
 }
 
-function is_client_error ($sc) {
+function is_client_error($sc) {
 	return $sc >= 400 && $sc < 500;
 }
 
-function is_server_error ($sc) {
+function is_server_error($sc) {
 	return $sc >= 500 && $sc < 600;
 }
 
 class RSSCache {
-	var $BASE_CACHE;	// where the cache files are stored
-	var $MAX_AGE	= 43200;  		// when are files stale, default twelve hours
-	var $ERROR 		= '';			// accumulate error messages
+	var $BASE_CACHE; // where the cache files are stored
+	var $MAX_AGE	= 43200; // when are files stale, default twelve hours
+	var $ERROR 		= ''; // accumulate error messages
 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $base = '', $age = '' ) {
-		$this->BASE_CACHE = WP_CONTENT_DIR . '/cache';
-		if ( $base ) {
+	function __construct($base = '', $age = '') {
+		$this->BASE_CACHE = WP_CONTENT_DIR.'/cache';
+		if ($base) {
 			$this->BASE_CACHE = $base;
 		}
-		if ( $age ) {
+		if ($age) {
 			$this->MAX_AGE = $age;
 		}
 
@@ -736,8 +736,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function RSSCache( $base = '', $age = '' ) {
-		self::__construct( $base, $age );
+	public function RSSCache($base = '', $age = '') {
+		self::__construct($base, $age);
 	}
 
 /*=======================================================================*\
@@ -746,8 +746,8 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		true on success
 \*=======================================================================*/
-	function set ($url, $rss) {
-		$cache_option = 'rss_' . $this->file_name( $url );
+	function set($url, $rss) {
+		$cache_option = 'rss_'.$this->file_name($url);
 
 		set_transient($cache_option, $rss, $this->MAX_AGE);
 
@@ -760,11 +760,11 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		cached object on HIT, false on MISS
 \*=======================================================================*/
-	function get ($url) {
+	function get($url) {
 		$this->ERROR = "";
-		$cache_option = 'rss_' . $this->file_name( $url );
+		$cache_option = 'rss_'.$this->file_name($url);
 
-		if ( ! $rss = get_transient( $cache_option ) ) {
+		if ( ! $rss = get_transient($cache_option)) {
 			$this->debug(
 				"Cache doesn't contain: $url (cache option: $cache_option)"
 			);
@@ -781,11 +781,11 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		cached object on HIT, false on MISS
 \*=======================================================================*/
-	function check_cache ( $url ) {
+	function check_cache($url) {
 		$this->ERROR = "";
-		$cache_option = 'rss_' . $this->file_name( $url );
+		$cache_option = 'rss_'.$this->file_name($url);
 
-		if ( get_transient($cache_option) ) {
+		if (get_transient($cache_option)) {
 			// object exists and is current
 				return 'HIT';
 		} else {
@@ -797,15 +797,15 @@ 
 /*=======================================================================*\
 	Function:	serialize
 \*=======================================================================*/
-	function serialize ( $rss ) {
-		return serialize( $rss );
+	function serialize($rss) {
+		return serialize($rss);
 	}
 
 /*=======================================================================*\
 	Function:	unserialize
 \*=======================================================================*/
-	function unserialize ( $data ) {
-		return unserialize( $data );
+	function unserialize($data) {
+		return unserialize($data);
 	}
 
 /*=======================================================================*\
@@ -814,64 +814,64 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		a file name
 \*=======================================================================*/
-	function file_name ($url) {
-		return md5( $url );
+	function file_name($url) {
+		return md5($url);
 	}
 
 /*=======================================================================*\
 	Function:	error
 	Purpose:	register error
 \*=======================================================================*/
-	function error ($errormsg, $lvl=E_USER_WARNING) {
+	function error($errormsg, $lvl = E_USER_WARNING) {
 		// append PHP's error message if track_errors enabled
-		if ( isset($php_errormsg) ) {
+		if (isset($php_errormsg)) {
 			$errormsg .= " ($php_errormsg)";
 		}
 		$this->ERROR = $errormsg;
-		if ( MAGPIE_DEBUG ) {
-			trigger_error( $errormsg, $lvl);
+		if (MAGPIE_DEBUG) {
+			trigger_error($errormsg, $lvl);
 		}
 		else {
-			error_log( $errormsg, 0);
+			error_log($errormsg, 0);
 		}
 	}
-			function debug ($debugmsg, $lvl=E_USER_NOTICE) {
-		if ( MAGPIE_DEBUG ) {
+			function debug($debugmsg, $lvl = E_USER_NOTICE) {
+		if (MAGPIE_DEBUG) {
 			$this->error("MagpieRSS [debug] $debugmsg", $lvl);
 		}
 	}
 }
 
-if ( !function_exists('parse_w3cdtf') ) :
-function parse_w3cdtf ( $date_str ) {
+if ( ! function_exists('parse_w3cdtf')) :
+function parse_w3cdtf($date_str) {
 
 	# regex to match wc3dtf
 	$pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
 
-	if ( preg_match( $pat, $date_str, $match ) ) {
-		list( $year, $month, $day, $hours, $minutes, $seconds) =
-			array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[7]);
+	if (preg_match($pat, $date_str, $match)) {
+		list($year, $month, $day, $hours, $minutes, $seconds) =
+			array($match[1], $match[2], $match[3], $match[4], $match[5], $match[7]);
 
 		# calc epoch for current date assuming GMT
-		$epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year);
+		$epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year);
 
 		$offset = 0;
-		if ( $match[11] == 'Z' ) {
+		if ($match[11] == 'Z') {
 			# zulu time, aka GMT
 		}
 		else {
-			list( $tz_mod, $tz_hour, $tz_min ) =
-				array( $match[8], $match[9], $match[10]);
+			list($tz_mod, $tz_hour, $tz_min) =
+				array($match[8], $match[9], $match[10]);
 
 			# zero out the variables
-			if ( ! $tz_hour ) { $tz_hour = 0; }
-			if ( ! $tz_min ) { $tz_min = 0; }
+			if ( ! $tz_hour) { $tz_hour = 0; }
+			if ( ! $tz_min) { $tz_min = 0; }
 
-			$offset_secs = (($tz_hour*60)+$tz_min)*60;
+			$offset_secs = (($tz_hour * 60) + $tz_min) * 60;
 
 			# is timezone ahead of GMT?  then subtract offset
 			#
-			if ( $tz_mod == '+' ) {
+			if ($tz_mod == '+') {
 				$offset_secs = $offset_secs * -1;
 			}
 
@@ -886,7 +886,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_rss') ) :
+if ( ! function_exists('wp_rss')) :
 /**
  * Display all RSS items in a HTML ordered list.
  *
@@ -897,31 +897,31 @@ 
  * @param string $url URL of feed to display. Will not auto sense feed URL.
  * @param int $num_items Optional. Number of items to display, default is all.
  */
-function wp_rss( $url, $num_items = -1 ) {
-	if ( $rss = fetch_rss( $url ) ) {
+function wp_rss($url, $num_items = -1) {
+	if ($rss = fetch_rss($url)) {
 		echo '<ul>';
 
-		if ( $num_items !== -1 ) {
-			$rss->items = array_slice( $rss->items, 0, $num_items );
+		if ($num_items !== -1) {
+			$rss->items = array_slice($rss->items, 0, $num_items);
 		}
 
-		foreach ( (array) $rss->items as $item ) {
+		foreach ((array) $rss->items as $item) {
 			printf(
 				'<li><a href="%1$s" title="%2$s">%3$s</a></li>',
-				esc_url( $item['link'] ),
-				esc_attr( strip_tags( $item['description'] ) ),
-				esc_html( $item['title'] )
+				esc_url($item['link']),
+				esc_attr(strip_tags($item['description'])),
+				esc_html($item['title'])
 			);
 		}
 
 		echo '</ul>';
 	} else {
-		_e( 'An error has occurred, which probably means the feed is down. Try again later.' );
+		_e('An error has occurred, which probably means the feed is down. Try again later.');
 	}
 }
 endif;
 
-if ( !function_exists('get_rss') ) :
+if ( ! function_exists('get_rss')) :
 /**
  * Display RSS items in HTML list items.
  *
@@ -938,11 +938,11 @@ 
  * @param int $num_items Optional. Number of items to display, default is all.
  * @return bool False on failure.
  */
-function get_rss ($url, $num_items = 5) { // Like get posts, but for RSS
+function get_rss($url, $num_items = 5) { // Like get posts, but for RSS
 	$rss = fetch_rss($url);
-	if ( $rss ) {
+	if ($rss) {
 		$rss->items = array_slice($rss->items, 0, $num_items);
-		foreach ( (array) $rss->items as $item ) {
+		foreach ((array) $rss->items as $item) {
 			echo "<li>\n";
 			echo "<a href='$item[link]' title='$item[description]'>";
 			echo esc_html($item['title']);