ntwb / wordpress

src/wp-includes/ms-load.php

Spacing +126 added lines, -126 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;
 }
@@ -76,42 +76,42 @@ 
 	 *
 	 * @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;
 
 	$blog = get_blog_details();
 
-	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;
@@ -129,8 +129,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);
 }
 
 /**
@@ -143,9 +143,9 @@ 
  * @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 ) {
-	$network = get_network( $network );
-	if ( null === $network ) {
+function wp_get_network($network) {
+	$network = get_network($network);
+	if (null === $network) {
 		return false;
 	}
 
@@ -164,8 +164,8 @@ 
  * @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 ) {
-	$path_segments = array_filter( explode( '/', trim( $path, '/' ) ) );
+function get_site_by_path($domain, $path, $segments = null) {
+	$path_segments = array_filter(explode('/', trim($path, '/')));
 
 	/**
 	 * Filters 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,9 +228,9 @@ 
 
 	// 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 );
+	$domains = array($domain);
+	if ('www.' === substr($domain, 0, 4)) {
+		$domains[] = substr($domain, 4);
 	}
 
 	$args = array(
@@ -239,18 +239,18 @@ 
 		'number' => 1,
 	);
 
-	if ( count( $domains ) > 1 ) {
+	if (count($domains) > 1) {
 		$args['orderby']['domain_length'] = 'DESC';
 	}
 
-	if ( count( $paths ) > 1 ) {
+	if (count($paths) > 1) {
 		$args['orderby']['path_length'] = 'DESC';
 	}
 
-	$result = get_sites( $args );
-	$site = array_shift( $result );
+	$result = get_sites($args);
+	$site = array_shift($result);
 
-	if ( $site ) {
+	if ($site) {
 		// @todo get_blog_details()
 		return $site;
 	}
@@ -289,55 +289,55 @@ 
  *                     False if bootstrap could not be properly completed.
  *                     Redirect URL if parts exist, but the request as a whole can not be fulfilled.
  */
-function ms_load_current_site_and_network( $domain, $path, $subdomain = false ) {
+function ms_load_current_site_and_network($domain, $path, $subdomain = false) {
 	global $wpdb, $current_site, $current_blog;
 
 	// If the network is defined in wp-config.php, we can simply use that.
-	if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
+	if (defined('DOMAIN_CURRENT_SITE') && defined('PATH_CURRENT_SITE')) {
 		$current_site = new stdClass;
-		$current_site->id = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1;
+		$current_site->id = defined('SITE_ID_CURRENT_SITE') ? SITE_ID_CURRENT_SITE : 1;
 		$current_site->domain = DOMAIN_CURRENT_SITE;
 		$current_site->path = PATH_CURRENT_SITE;
-		if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {
+		if (defined('BLOG_ID_CURRENT_SITE')) {
 			$current_site->blog_id = BLOG_ID_CURRENT_SITE;
-		} elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // deprecated.
+		} elseif (defined('BLOGID_CURRENT_SITE')) { // deprecated.
 			$current_site->blog_id = BLOGID_CURRENT_SITE;
 		}
 
-		if ( 0 === strcasecmp( $current_site->domain, $domain ) && 0 === strcasecmp( $current_site->path, $path ) ) {
-			$current_blog = get_site_by_path( $domain, $path );
-		} elseif ( '/' !== $current_site->path && 0 === strcasecmp( $current_site->domain, $domain ) && 0 === stripos( $path, $current_site->path ) ) {
+		if (0 === strcasecmp($current_site->domain, $domain) && 0 === strcasecmp($current_site->path, $path)) {
+			$current_blog = get_site_by_path($domain, $path);
+		} elseif ('/' !== $current_site->path && 0 === strcasecmp($current_site->domain, $domain) && 0 === stripos($path, $current_site->path)) {
 			// If the current network has a path and also matches the domain and path of the request,
 			// we need to look for a site using the first path segment following the network's path.
-			$current_blog = get_site_by_path( $domain, $path, 1 + count( explode( '/', trim( $current_site->path, '/' ) ) ) );
+			$current_blog = get_site_by_path($domain, $path, 1 + count(explode('/', trim($current_site->path, '/'))));
 		} else {
 			// Otherwise, use the first path segment (as usual).
-			$current_blog = get_site_by_path( $domain, $path, 1 );
+			$current_blog = get_site_by_path($domain, $path, 1);
 		}
 
-	} elseif ( ! $subdomain ) {
+	} elseif ( ! $subdomain) {
 		/*
 		 * A "subdomain" install can be re-interpreted to mean "can support any domain".
 		 * If we're not dealing with one of these installs, then the important part is determining
 		 * the network first, because we need the network's path to identify any sites.
 		 */
-		if ( ! $current_site = wp_cache_get( 'current_network', 'site-options' ) ) {
+		if ( ! $current_site = wp_cache_get('current_network', 'site-options')) {
 			// Are there even two networks installed?
-			$one_network = $wpdb->get_row( "SELECT * FROM $wpdb->site LIMIT 2" ); // [sic]
-			if ( 1 === $wpdb->num_rows ) {
-				$current_site = new WP_Network( $one_network );
-				wp_cache_add( 'current_network', $current_site, 'site-options' );
-			} elseif ( 0 === $wpdb->num_rows ) {
+			$one_network = $wpdb->get_row("SELECT * FROM $wpdb->site LIMIT 2"); // [sic]
+			if (1 === $wpdb->num_rows) {
+				$current_site = new WP_Network($one_network);
+				wp_cache_add('current_network', $current_site, 'site-options');
+			} elseif (0 === $wpdb->num_rows) {
 				// A network not found hook should fire here.
 				return false;
 			}
 		}
 
-		if ( empty( $current_site ) ) {
-			$current_site = WP_Network::get_by_path( $domain, $path, 1 );
+		if (empty($current_site)) {
+			$current_site = WP_Network::get_by_path($domain, $path, 1);
 		}
 
-		if ( empty( $current_site ) ) {
+		if (empty($current_site)) {
 			/**
 			 * Fires when a network cannot be found based on the requested domain and path.
 			 *
@@ -349,48 +349,48 @@ 
 			 * @param string $domain       The domain used to search for a network.
 			 * @param string $path         The path used to search for a path.
 			 */
-			do_action( 'ms_network_not_found', $domain, $path );
+			do_action('ms_network_not_found', $domain, $path);
 
 			return false;
-		} elseif ( $path === $current_site->path ) {
-			$current_blog = get_site_by_path( $domain, $path );
+		} elseif ($path === $current_site->path) {
+			$current_blog = get_site_by_path($domain, $path);
 		} else {
 			// Search the network path + one more path segment (on top of the network path).
-			$current_blog = get_site_by_path( $domain, $path, substr_count( $current_site->path, '/' ) );
+			$current_blog = get_site_by_path($domain, $path, substr_count($current_site->path, '/'));
 		}
 	} else {
 		// Find the site by the domain and at most the first path segment.
-		$current_blog = get_site_by_path( $domain, $path, 1 );
-		if ( $current_blog ) {
-			$current_site = WP_Network::get_instance( $current_blog->site_id ? $current_blog->site_id : 1 );
+		$current_blog = get_site_by_path($domain, $path, 1);
+		if ($current_blog) {
+			$current_site = WP_Network::get_instance($current_blog->site_id ? $current_blog->site_id : 1);
 		} else {
 			// If you don't have a site with the same domain/path as a network, you're pretty screwed, but:
-			$current_site = WP_Network::get_by_path( $domain, $path, 1 );
+			$current_site = WP_Network::get_by_path($domain, $path, 1);
 		}
 	}
 
 	// The network declared by the site trumps any constants.
-	if ( $current_blog && $current_blog->site_id != $current_site->id ) {
-		$current_site = WP_Network::get_instance( $current_blog->site_id );
+	if ($current_blog && $current_blog->site_id != $current_site->id) {
+		$current_site = WP_Network::get_instance($current_blog->site_id);
 	}
 
 	// No network has been found, bail.
-	if ( empty( $current_site ) ) {
+	if (empty($current_site)) {
 		/** This action is documented in wp-includes/ms-settings.php */
-		do_action( 'ms_network_not_found', $domain, $path );
+		do_action('ms_network_not_found', $domain, $path);
 
 		return false;
 	}
 
 	// During activation of a new subdomain, the requested site does not yet exist.
-	if ( empty( $current_blog ) && wp_installing() ) {
+	if (empty($current_blog) && wp_installing()) {
 		$current_blog = new stdClass;
 		$current_blog->blog_id = $blog_id = 1;
 		$current_blog->public = 1;
 	}
 
 	// No site has been found, bail.
-	if ( empty( $current_blog ) ) {
+	if (empty($current_blog)) {
 		// We're going to redirect to the network URL, with some possible modifications.
 		$scheme = is_ssl() ? 'https' : 'http';
 		$destination = "$scheme://{$current_site->domain}{$current_site->path}";
@@ -407,19 +407,19 @@ 
 		 * @param string $domain       The domain used to search for a site.
 		 * @param string $path         The path used to search for a site.
 		 */
-		do_action( 'ms_site_not_found', $current_site, $domain, $path );
+		do_action('ms_site_not_found', $current_site, $domain, $path);
 
-		if ( $subdomain && ! defined( 'NOBLOGREDIRECT' ) ) {
+		if ($subdomain && ! defined('NOBLOGREDIRECT')) {
 			// For a "subdomain" install, redirect to the signup form specifically.
-			$destination .= 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
-		} elseif ( $subdomain ) {
+			$destination .= 'wp-signup.php?new='.str_replace('.'.$current_site->domain, '', $domain);
+		} elseif ($subdomain) {
 			// For a "subdomain" install, the NOBLOGREDIRECT constant
 			// can be used to avoid a redirect to the signup form.
 			// Using the ms_site_not_found action is preferred to the constant.
-			if ( '%siteurl%' !== NOBLOGREDIRECT ) {
+			if ('%siteurl%' !== NOBLOGREDIRECT) {
 				$destination = NOBLOGREDIRECT;
 			}
-		} elseif ( 0 === strcasecmp( $current_site->domain, $domain ) ) {
+		} elseif (0 === strcasecmp($current_site->domain, $domain)) {
 			/*
 			 * If the domain we were searching for matches the network's domain,
 			 * it's no use redirecting back to ourselves -- it'll cause a loop.
@@ -432,13 +432,13 @@ 
 	}
 
 	// Figure out the current network's main site.
-	if ( empty( $current_site->blog_id ) ) {
-		if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
+	if (empty($current_site->blog_id)) {
+		if ($current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path) {
 			$current_site->blog_id = $current_blog->blog_id;
-		} elseif ( ! $current_site->blog_id = wp_cache_get( 'network:' . $current_site->id . ':main_site', 'site-options' ) ) {
-			$current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s",
-				$current_site->domain, $current_site->path ) );
-			wp_cache_add( 'network:' . $current_site->id . ':main_site', $current_site->blog_id, 'site-options' );
+		} elseif ( ! $current_site->blog_id = wp_cache_get('network:'.$current_site->id.':main_site', 'site-options')) {
+			$current_site->blog_id = $wpdb->get_var($wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s",
+				$current_site->domain, $current_site->path));
+			wp_cache_add('network:'.$current_site->id.':main_site', $current_site->blog_id, 'site-options');
 		}
 	}
 
@@ -459,50 +459,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));
 }
 
 /**
@@ -518,8 +518,8 @@ 
  * @param object $current_site
  * @return object
  */
-function get_current_site_name( $current_site ) {
-	_deprecated_function( __FUNCTION__, '3.9.0', 'get_current_site()' );
+function get_current_site_name($current_site) {
+	_deprecated_function(__FUNCTION__, '3.9.0', 'get_current_site()');
 	return $current_site;
 }
 
@@ -539,6 +539,6 @@ 
  */
 function wpmu_current_site() {
 	global $current_site;
-	_deprecated_function( __FUNCTION__, '3.9.0' );
+	_deprecated_function(__FUNCTION__, '3.9.0');
 	return $current_site;
 }

src/wp-includes/ms-default-constants.php

Spacing +38 added lines, -38 removed lines

@@ -21,23 +21,23 @@ 
 	global $wpdb;
 
 	// This filter is attached in ms-default-filters.php but that file is not included during SHORTINIT.
-	add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
+	add_filter('default_site_option_ms_files_rewriting', '__return_true');
 
-	if ( ! get_site_option( 'ms_files_rewriting' ) )
+	if ( ! get_site_option('ms_files_rewriting'))
 		return;
 
 	// Base uploads dir relative to ABSPATH
-	if ( !defined( 'UPLOADBLOGSDIR' ) )
-		define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
+	if ( ! defined('UPLOADBLOGSDIR'))
+		define('UPLOADBLOGSDIR', 'wp-content/blogs.dir');
 
 	// Note, the main site in a post-MU network uses wp-content/uploads.
 	// This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
-	if ( ! defined( 'UPLOADS' ) ) {
-		define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
+	if ( ! defined('UPLOADS')) {
+		define('UPLOADS', UPLOADBLOGSDIR."/{$wpdb->blogid}/files/");
 
 		// Uploads dir relative to ABSPATH
-		if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
-			define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+		if ('wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined('BLOGUPLOADDIR'))
+			define('BLOGUPLOADDIR', WP_CONTENT_DIR."/blogs.dir/{$wpdb->blogid}/files/");
 	}
 }
 
@@ -52,34 +52,34 @@ 
 	/**
 	 * @since 1.2.0
 	 */
-	if ( !defined( 'COOKIEPATH' ) )
-		define( 'COOKIEPATH', $current_site->path );
+	if ( ! defined('COOKIEPATH'))
+		define('COOKIEPATH', $current_site->path);
 
 	/**
 	 * @since 1.5.0
 	 */
-	if ( !defined( 'SITECOOKIEPATH' ) )
-		define( 'SITECOOKIEPATH', $current_site->path );
+	if ( ! defined('SITECOOKIEPATH'))
+		define('SITECOOKIEPATH', $current_site->path);
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined( 'ADMIN_COOKIE_PATH' ) ) {
-		if ( ! is_subdomain_install() || trim( parse_url( get_option( 'siteurl' ), PHP_URL_PATH ), '/' ) ) {
-			define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH );
+	if ( ! defined('ADMIN_COOKIE_PATH')) {
+		if ( ! is_subdomain_install() || trim(parse_url(get_option('siteurl'), PHP_URL_PATH), '/')) {
+			define('ADMIN_COOKIE_PATH', SITECOOKIEPATH);
 		} else {
-			define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
+			define('ADMIN_COOKIE_PATH', SITECOOKIEPATH.'wp-admin');
 		}
 	}
 
 	/**
 	 * @since 2.0.0
 	 */
-	if ( !defined('COOKIE_DOMAIN') && is_subdomain_install() ) {
-		if ( !empty( $current_site->cookie_domain ) )
-			define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
+	if ( ! defined('COOKIE_DOMAIN') && is_subdomain_install()) {
+		if ( ! empty($current_site->cookie_domain))
+			define('COOKIE_DOMAIN', '.'.$current_site->cookie_domain);
 		else
-			define('COOKIE_DOMAIN', '.' . $current_site->domain);
+			define('COOKIE_DOMAIN', '.'.$current_site->domain);
 	}
 }
 
@@ -96,15 +96,15 @@ 
 	 * Optional support for X-Sendfile header
 	 * @since 3.0.0
 	 */
-	if ( !defined( 'WPMU_SENDFILE' ) )
-		define( 'WPMU_SENDFILE', false );
+	if ( ! defined('WPMU_SENDFILE'))
+		define('WPMU_SENDFILE', false);
 
 	/**
 	 * Optional support for X-Accel-Redirect header
 	 * @since 3.0.0
 	 */
-	if ( !defined( 'WPMU_ACCEL_REDIRECT' ) )
-		define( 'WPMU_ACCEL_REDIRECT', false );
+	if ( ! defined('WPMU_ACCEL_REDIRECT'))
+		define('WPMU_ACCEL_REDIRECT', false);
 }
 
 /**
@@ -124,41 +124,41 @@ 
 	static $subdomain_error = null;
 	static $subdomain_error_warn = null;
 
-	if ( false === $subdomain_error ) {
+	if (false === $subdomain_error) {
 		return;
 	}
 
-	if ( $subdomain_error ) {
+	if ($subdomain_error) {
 		$vhost_deprecated = sprintf(
 			/* translators: 1: VHOST, 2: SUBDOMAIN_INSTALL, 3: wp-config.php, 4: is_subdomain_install() */
-			__( 'The constant %1$s <strong>is deprecated</strong>. Use the boolean constant %2$s in %3$s to enable a subdomain configuration. Use %4$s to check whether a subdomain configuration is enabled.' ),
+			__('The constant %1$s <strong>is deprecated</strong>. Use the boolean constant %2$s in %3$s to enable a subdomain configuration. Use %4$s to check whether a subdomain configuration is enabled.'),
 			'<code>VHOST</code>',
 			'<code>SUBDOMAIN_INSTALL</code>',
 			'<code>wp-config.php</code>',
 			'<code>is_subdomain_install()</code>'
 		);
-		if ( $subdomain_error_warn ) {
-			trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );
+		if ($subdomain_error_warn) {
+			trigger_error(__('<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.').' '.$vhost_deprecated, E_USER_WARNING);
 		} else {
-	 		_deprecated_argument( 'define()', '3.0.0', $vhost_deprecated );
+	 		_deprecated_argument('define()', '3.0.0', $vhost_deprecated);
 		}
 		return;
 	}
 
-	if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) {
+	if (defined('SUBDOMAIN_INSTALL') && defined('VHOST')) {
 		$subdomain_error = true;
-		if ( SUBDOMAIN_INSTALL !== ( 'yes' == VHOST ) ) {
+		if (SUBDOMAIN_INSTALL !== ('yes' == VHOST)) {
 			$subdomain_error_warn = true;
 		}
-	} elseif ( defined( 'SUBDOMAIN_INSTALL' ) ) {
+	} elseif (defined('SUBDOMAIN_INSTALL')) {
 		$subdomain_error = false;
-		define( 'VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no' );
-	} elseif ( defined( 'VHOST' ) ) {
+		define('VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no');
+	} elseif (defined('VHOST')) {
 		$subdomain_error = true;
-		define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST );
+		define('SUBDOMAIN_INSTALL', 'yes' == VHOST);
 	} else {
 		$subdomain_error = false;
-		define( 'SUBDOMAIN_INSTALL', false );
-		define( 'VHOST', 'no' );
+		define('SUBDOMAIN_INSTALL', false);
+		define('VHOST', 'no');
 	}
 }

src/wp-includes/Requests/Transport/cURL.php

Spacing +12 added lines, -12 removed lines

@@ -227,7 +227,7 @@ 
 			// Read the information as needed
 			while ($done = curl_multi_info_read($multihandle)) {
 				$key = array_search($done['handle'], $subhandles, true);
-				if (!isset($to_process[$key])) {
+				if ( ! isset($to_process[$key])) {
 					$to_process[$key] = $done;
 				}
 			}
@@ -256,7 +256,7 @@ 
 				curl_multi_remove_handle($multihandle, $done['handle']);
 				curl_close($done['handle']);
 
-				if (!is_string($responses[$key])) {
+				if ( ! is_string($responses[$key])) {
 					$options['hooks']->dispatch('multiple.request.complete', array(&$responses[$key], $key));
 				}
 				$completed++;
@@ -310,20 +310,20 @@ 
 		$options['hooks']->dispatch('curl.before_request', array(&$this->handle));
 
 		// Force closing the connection for old versions of cURL (<7.22).
-		if ( ! isset( $headers['Connection'] ) ) {
+		if ( ! isset($headers['Connection'])) {
 			$headers['Connection'] = 'close';
 		}
 
 		$headers = Requests::flatten($headers);
 
-		if (!empty($data)) {
+		if ( ! empty($data)) {
 			$data_format = $options['data_format'];
 
 			if ($data_format === 'query') {
 				$url = self::format_get($url, $data);
 				$data = '';
 			}
-			elseif (!is_string($data)) {
+			elseif ( ! is_string($data)) {
 				$data = http_build_query($data, null, '&');
 			}
 		}
@@ -346,8 +346,8 @@ 
 			case Requests::OPTIONS:
 			default:
 				curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
-				if (!empty($data)) {
-					curl_setopt( $this->handle, CURLOPT_POSTFIELDS, $data );
+				if ( ! empty($data)) {
+					curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
 				}
 		}
 
@@ -495,7 +495,7 @@ 
 	 * @return string URL with data
 	 */
 	protected static function format_get($url, $data) {
-		if (!empty($data)) {
+		if ( ! empty($data)) {
 			$url_parts = parse_url($url);
 			if (empty($url_parts['query'])) {
 				$query = $url_parts['query'] = '';
@@ -504,11 +504,11 @@ 
 				$query = $url_parts['query'];
 			}
 
-			$query .= '&' . http_build_query($data, null, '&');
+			$query .= '&'.http_build_query($data, null, '&');
 			$query = trim($query, '&');
 
 			if (empty($url_parts['query'])) {
-				$url .= '?' . $query;
+				$url .= '?'.$query;
 			}
 			else {
 				$url = str_replace($url_parts['query'], $query, $url);
@@ -524,14 +524,14 @@ 
 	 * @return boolean True if the transport is valid, false otherwise.
 	 */
 	public static function test($capabilities = array()) {
-		if (!function_exists('curl_init') && !function_exists('curl_exec')) {
+		if ( ! function_exists('curl_init') && ! function_exists('curl_exec')) {
 			return false;
 		}
 
 		// If needed, check that our installed curl version supports SSL
 		if (isset($capabilities['ssl']) && $capabilities['ssl']) {
 			$curl_version = curl_version();
-			if (!(CURL_VERSION_SSL & $curl_version['features'])) {
+			if ( ! (CURL_VERSION_SSL & $curl_version['features'])) {
 				return false;
 			}
 		}

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

Indentation +21 added lines, -21 removed lines

@@ -99,27 +99,27 @@
 	 *
 	 *     @type array        $network__in          Array of network IDs to include. Default empty.
 	 *     @type array        $network__not_in      Array of network IDs to exclude. Default empty.
- 	 *     @type bool         $count                Whether to return a network count (true) or array of network objects.
- 	 *                                              Default false.
- 	 *     @type string       $fields               Network fields to return. Accepts 'ids' (returns an array of network IDs)
- 	 *                                              or empty (returns an array of complete network objects). Default empty.
- 	 *     @type int          $number               Maximum number of networks to retrieve. Default null (no limit).
- 	 *     @type int          $offset               Number of networks to offset the query. Used to build LIMIT clause.
- 	 *                                              Default 0.
- 	 *     @type bool         $no_found_rows        Whether to disable the `SQL_CALC_FOUND_ROWS` query. Default true.
- 	 *     @type string|array $orderby              Network status or array of statuses. Accepts 'id', 'domain', 'path',
- 	 *                                              'domain_length', 'path_length' and 'network__in'. Also accepts false,
- 	 *                                              an empty array, or 'none' to disable `ORDER BY` clause. Default 'id'.
- 	 *     @type string       $order                How to order retrieved networks. Accepts 'ASC', 'DESC'. Default 'ASC'.
- 	 *     @type string       $domain               Limit results to those affiliated with a given network ID.
- 	 *                                              Default current network ID.
- 	 *     @type array        $domain__in           Array of domains to include affiliated networks for. Default empty.
- 	 *     @type array        $domain__not_in       Array of domains to exclude affiliated networks for. Default empty.
- 	 *     @type string       $path                 Limit results to those affiliated with a given network ID.
- 	 *                                              Default current network ID.
- 	 *     @type array        $path__in             Array of paths to include affiliated networks for. Default empty.
- 	 *     @type array        $path__not_in         Array of paths to exclude affiliated networks for. Default empty.
- 	 *     @type string       $search               Search term(s) to retrieve matching networks for. Default empty.
+	 *     @type bool         $count                Whether to return a network count (true) or array of network objects.
+	 *                                              Default false.
+	 *     @type string       $fields               Network fields to return. Accepts 'ids' (returns an array of network IDs)
+	 *                                              or empty (returns an array of complete network objects). Default empty.
+	 *     @type int          $number               Maximum number of networks to retrieve. Default null (no limit).
+	 *     @type int          $offset               Number of networks to offset the query. Used to build LIMIT clause.
+	 *                                              Default 0.
+	 *     @type bool         $no_found_rows        Whether to disable the `SQL_CALC_FOUND_ROWS` query. Default true.
+	 *     @type string|array $orderby              Network status or array of statuses. Accepts 'id', 'domain', 'path',
+	 *                                              'domain_length', 'path_length' and 'network__in'. Also accepts false,
+	 *                                              an empty array, or 'none' to disable `ORDER BY` clause. Default 'id'.
+	 *     @type string       $order                How to order retrieved networks. Accepts 'ASC', 'DESC'. Default 'ASC'.
+	 *     @type string       $domain               Limit results to those affiliated with a given network ID.
+	 *                                              Default current network ID.
+	 *     @type array        $domain__in           Array of domains to include affiliated networks for. Default empty.
+	 *     @type array        $domain__not_in       Array of domains to exclude affiliated networks for. Default empty.
+	 *     @type string       $path                 Limit results to those affiliated with a given network ID.
+	 *                                              Default current network ID.
+	 *     @type array        $path__in             Array of paths to include affiliated networks for. Default empty.
+	 *     @type array        $path__not_in         Array of paths to exclude affiliated networks for. Default empty.
+	 *     @type string       $search               Search term(s) to retrieve matching networks for. Default empty.
 	 *     @type bool         $update_network_cache Whether to prime the cache for found networks. Default true.
 	 * }
 	 */

Spacing +104 added lines, -105 removed lines

@@ -123,7 +123,7 @@ 
 	 *     @type bool         $update_network_cache Whether to prime the cache for found networks. Default true.
 	 * }
 	 */
-	public function __construct( $query = '' ) {
+	public function __construct($query = '') {
 		$this->query_var_defaults = array(
 			'network__in'          => '',
 			'network__not_in'      => '',
@@ -144,8 +144,8 @@ 
 			'update_network_cache' => true,
 		);
 
-		if ( ! empty( $query ) ) {
-			$this->query( $query );
+		if ( ! empty($query)) {
+			$this->query($query);
 		}
 	}
 
@@ -158,12 +158,12 @@ 
 	 *
 	 * @param string|array $query WP_Network_Query arguments. See WP_Network_Query::__construct()
 	 */
-	public function parse_query( $query = '' ) {
-		if ( empty( $query ) ) {
+	public function parse_query($query = '') {
+		if (empty($query)) {
 			$query = $this->query_vars;
 		}
 
-		$this->query_vars = wp_parse_args( $query, $this->query_var_defaults );
+		$this->query_vars = wp_parse_args($query, $this->query_var_defaults);
 
 		/**
 		 * Fires after the network query vars have been parsed.
@@ -172,7 +172,7 @@ 
 		 *
 		 * @param WP_Network_Query &$this The WP_Network_Query instance (passed by reference).
 		 */
-		do_action_ref_array( 'parse_network_query', array( &$this ) );
+		do_action_ref_array('parse_network_query', array(&$this));
 	}
 
 	/**
@@ -184,8 +184,8 @@ 
 	 * @param string|array $query Array or URL query string of parameters.
 	 * @return array|int List of networks, or number of networks when 'count' is passed as a query var.
 	 */
-	public function query( $query ) {
-		$this->query_vars = wp_parse_args( $query );
+	public function query($query) {
+		$this->query_vars = wp_parse_args($query);
 		return $this->get_networks();
 	}
 
@@ -207,22 +207,22 @@ 
 		 *
 		 * @param WP_Network_Query &$this Current instance of WP_Network_Query, passed by reference.
 		 */
-		do_action_ref_array( 'pre_get_networks', array( &$this ) );
+		do_action_ref_array('pre_get_networks', array(&$this));
 
 		// $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
-		$key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
-		$last_changed = wp_cache_get( 'last_changed', 'networks' );
-		if ( ! $last_changed ) {
+		$key = md5(serialize(wp_array_slice_assoc($this->query_vars, array_keys($this->query_var_defaults))));
+		$last_changed = wp_cache_get('last_changed', 'networks');
+		if ( ! $last_changed) {
 			$last_changed = microtime();
-			wp_cache_set( 'last_changed', $last_changed, 'networks' );
+			wp_cache_set('last_changed', $last_changed, 'networks');
 		}
 
 		$cache_key = "get_network_ids:$key:$last_changed";
-		$cache_value = wp_cache_get( $cache_key, 'networks' );
+		$cache_value = wp_cache_get($cache_key, 'networks');
 
-		if ( false === $cache_value ) {
+		if (false === $cache_value) {
 			$network_ids = $this->get_network_ids();
-			if ( $network_ids ) {
+			if ($network_ids) {
 				$this->set_found_networks();
 			}
 
@@ -230,37 +230,37 @@ 
 				'network_ids' => $network_ids,
 				'found_networks' => $this->found_networks,
 			);
-			wp_cache_add( $cache_key, $cache_value, 'networks' );
+			wp_cache_add($cache_key, $cache_value, 'networks');
 		} else {
 			$network_ids = $cache_value['network_ids'];
 			$this->found_networks = $cache_value['found_networks'];
 		}
 
-		if ( $this->found_networks && $this->query_vars['number'] ) {
-			$this->max_num_pages = ceil( $this->found_networks / $this->query_vars['number'] );
+		if ($this->found_networks && $this->query_vars['number']) {
+			$this->max_num_pages = ceil($this->found_networks / $this->query_vars['number']);
 		}
 
 		// If querying for a count only, there's nothing more to do.
-		if ( $this->query_vars['count'] ) {
+		if ($this->query_vars['count']) {
 			// $network_ids is actually a count in this case.
-			return intval( $network_ids );
+			return intval($network_ids);
 		}
 
-		$network_ids = array_map( 'intval', $network_ids );
+		$network_ids = array_map('intval', $network_ids);
 
-		if ( 'ids' == $this->query_vars['fields'] ) {
+		if ('ids' == $this->query_vars['fields']) {
 			$this->networks = $network_ids;
 			return $this->networks;
 		}
 
-		if ( $this->query_vars['update_network_cache'] ) {
-			_prime_network_caches( $network_ids );
+		if ($this->query_vars['update_network_cache']) {
+			_prime_network_caches($network_ids);
 		}
 
 		// Fetch full network objects from the primed cache.
 		$_networks = array();
-		foreach ( $network_ids as $network_id ) {
-			if ( $_network = get_network( $network_id ) ) {
+		foreach ($network_ids as $network_id) {
+			if ($_network = get_network($network_id)) {
 				$_networks[] = $_network;
 			}
 		}
@@ -273,10 +273,10 @@ 
 		 * @param array            $results  An array of networks.
 		 * @param WP_Network_Query &$this    Current instance of WP_Network_Query, passed by reference.
 		 */
-		$_networks = apply_filters_ref_array( 'the_networks', array( $_networks, &$this ) );
+		$_networks = apply_filters_ref_array('the_networks', array($_networks, &$this));
 
 		// Convert to WP_Network instances
-		$this->networks = array_map( 'get_network', $_networks );
+		$this->networks = array_map('get_network', $_networks);
 
 		return $this->networks;
 	}
@@ -292,23 +292,22 @@ 
 	protected function get_network_ids() {
 		global $wpdb;
 
-		$order = $this->parse_order( $this->query_vars['order'] );
+		$order = $this->parse_order($this->query_vars['order']);
 
 		// Disable ORDER BY with 'none', an empty array, or boolean false.
-		if ( in_array( $this->query_vars['orderby'], array( 'none', array(), false ), true ) ) {
+		if (in_array($this->query_vars['orderby'], array('none', array(), false), true)) {
 			$orderby = '';
-		} elseif ( ! empty( $this->query_vars['orderby'] ) ) {
-			$ordersby = is_array( $this->query_vars['orderby'] ) ?
-				$this->query_vars['orderby'] :
-				preg_split( '/[,\s]/', $this->query_vars['orderby'] );
+		} elseif ( ! empty($this->query_vars['orderby'])) {
+			$ordersby = is_array($this->query_vars['orderby']) ?
+				$this->query_vars['orderby'] : preg_split('/[,\s]/', $this->query_vars['orderby']);
 
 			$orderby_array = array();
-			foreach ( $ordersby as $_key => $_value ) {
-				if ( ! $_value ) {
+			foreach ($ordersby as $_key => $_value) {
+				if ( ! $_value) {
 					continue;
 				}
 
-				if ( is_int( $_key ) ) {
+				if (is_int($_key)) {
 					$_orderby = $_value;
 					$_order = $order;
 				} else {
@@ -316,93 +315,93 @@ 
 					$_order = $_value;
 				}
 
-				$parsed = $this->parse_orderby( $_orderby );
+				$parsed = $this->parse_orderby($_orderby);
 
-				if ( ! $parsed ) {
+				if ( ! $parsed) {
 					continue;
 				}
 
-				if ( 'network__in' === $_orderby ) {
+				if ('network__in' === $_orderby) {
 					$orderby_array[] = $parsed;
 					continue;
 				}
 
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+				$orderby_array[] = $parsed.' '.$this->parse_order($_order);
 			}
 
-			$orderby = implode( ', ', $orderby_array );
+			$orderby = implode(', ', $orderby_array);
 		} else {
 			$orderby = "$wpdb->site.id $order";
 		}
 
-		$number = absint( $this->query_vars['number'] );
-		$offset = absint( $this->query_vars['offset'] );
+		$number = absint($this->query_vars['number']);
+		$offset = absint($this->query_vars['offset']);
 
-		if ( ! empty( $number ) ) {
-			if ( $offset ) {
-				$limits = 'LIMIT ' . $offset . ',' . $number;
+		if ( ! empty($number)) {
+			if ($offset) {
+				$limits = 'LIMIT '.$offset.','.$number;
 			} else {
-				$limits = 'LIMIT ' . $number;
+				$limits = 'LIMIT '.$number;
 			}
 		}
 
-		if ( $this->query_vars['count'] ) {
+		if ($this->query_vars['count']) {
 			$fields = 'COUNT(*)';
 		} else {
 			$fields = "$wpdb->site.id";
 		}
 
 		// Parse network IDs for an IN clause.
-		if ( ! empty( $this->query_vars['network__in'] ) ) {
-			$this->sql_clauses['where']['network__in'] = "$wpdb->site.id IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['network__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['network__in'])) {
+			$this->sql_clauses['where']['network__in'] = "$wpdb->site.id IN ( ".implode(',', wp_parse_id_list($this->query_vars['network__in'])).' )';
 		}
 
 		// Parse network IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['network__not_in'] ) ) {
-			$this->sql_clauses['where']['network__not_in'] = "$wpdb->site.id NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['network__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['network__not_in'])) {
+			$this->sql_clauses['where']['network__not_in'] = "$wpdb->site.id NOT IN ( ".implode(',', wp_parse_id_list($this->query_vars['network__not_in'])).' )';
 		}
 
-		if ( ! empty( $this->query_vars['domain'] ) ) {
-			$this->sql_clauses['where']['domain'] = $wpdb->prepare( "$wpdb->site.domain = %s", $this->query_vars['domain'] );
+		if ( ! empty($this->query_vars['domain'])) {
+			$this->sql_clauses['where']['domain'] = $wpdb->prepare("$wpdb->site.domain = %s", $this->query_vars['domain']);
 		}
 
 		// Parse network domain for an IN clause.
-		if ( is_array( $this->query_vars['domain__in'] ) ) {
-			$this->sql_clauses['where']['domain__in'] = "$wpdb->site.domain IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['domain__in'] ) ) . "' )";
+		if (is_array($this->query_vars['domain__in'])) {
+			$this->sql_clauses['where']['domain__in'] = "$wpdb->site.domain IN ( '".implode("', '", $wpdb->_escape($this->query_vars['domain__in']))."' )";
 		}
 
 		// Parse network domain for a NOT IN clause.
-		if ( is_array( $this->query_vars['domain__not_in'] ) ) {
-			$this->sql_clauses['where']['domain__not_in'] = "$wpdb->site.domain NOT IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['domain__not_in'] ) ) . "' )";
+		if (is_array($this->query_vars['domain__not_in'])) {
+			$this->sql_clauses['where']['domain__not_in'] = "$wpdb->site.domain NOT IN ( '".implode("', '", $wpdb->_escape($this->query_vars['domain__not_in']))."' )";
 		}
 
-		if ( ! empty( $this->query_vars['path'] ) ) {
-			$this->sql_clauses['where']['path'] = $wpdb->prepare( "$wpdb->site.path = %s", $this->query_vars['path'] );
+		if ( ! empty($this->query_vars['path'])) {
+			$this->sql_clauses['where']['path'] = $wpdb->prepare("$wpdb->site.path = %s", $this->query_vars['path']);
 		}
 
 		// Parse network path for an IN clause.
-		if ( is_array( $this->query_vars['path__in'] ) ) {
-			$this->sql_clauses['where']['path__in'] = "$wpdb->site.path IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['path__in'] ) ) . "' )";
+		if (is_array($this->query_vars['path__in'])) {
+			$this->sql_clauses['where']['path__in'] = "$wpdb->site.path IN ( '".implode("', '", $wpdb->_escape($this->query_vars['path__in']))."' )";
 		}
 
 		// Parse network path for a NOT IN clause.
-		if ( is_array( $this->query_vars['path__not_in'] ) ) {
-			$this->sql_clauses['where']['path__not_in'] = "$wpdb->site.path NOT IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['path__not_in'] ) ) . "' )";
+		if (is_array($this->query_vars['path__not_in'])) {
+			$this->sql_clauses['where']['path__not_in'] = "$wpdb->site.path NOT IN ( '".implode("', '", $wpdb->_escape($this->query_vars['path__not_in']))."' )";
 		}
 
 		// Falsey search strings are ignored.
-		if ( strlen( $this->query_vars['search'] ) ) {
+		if (strlen($this->query_vars['search'])) {
 			$this->sql_clauses['where']['search'] = $this->get_search_sql(
 				$this->query_vars['search'],
-				array( "$wpdb->site.domain", "$wpdb->site.path" )
+				array("$wpdb->site.domain", "$wpdb->site.path")
 			);
 		}
 
 		$join = '';
 
-		$where = implode( ' AND ', $this->sql_clauses['where'] );
+		$where = implode(' AND ', $this->sql_clauses['where']);
 
-		$pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+		$pieces = array('fields', 'join', 'where', 'orderby', 'limits', 'groupby');
 
 		/**
 		 * Filters the network query clauses.
@@ -412,29 +411,29 @@ 
 		 * @param array            $pieces A compacted array of network query clauses.
 		 * @param WP_Network_Query &$this  Current instance of WP_Network_Query, passed by reference.
 		 */
-		$clauses = apply_filters_ref_array( 'networks_clauses', array( compact( $pieces ), &$this ) );
+		$clauses = apply_filters_ref_array('networks_clauses', array(compact($pieces), &$this));
 
-		$fields = isset( $clauses['fields'] ) ? $clauses['fields'] : '';
-		$join = isset( $clauses['join'] ) ? $clauses['join'] : '';
-		$where = isset( $clauses['where'] ) ? $clauses['where'] : '';
-		$orderby = isset( $clauses['orderby'] ) ? $clauses['orderby'] : '';
-		$limits = isset( $clauses['limits'] ) ? $clauses['limits'] : '';
-		$groupby = isset( $clauses['groupby'] ) ? $clauses['groupby'] : '';
+		$fields = isset($clauses['fields']) ? $clauses['fields'] : '';
+		$join = isset($clauses['join']) ? $clauses['join'] : '';
+		$where = isset($clauses['where']) ? $clauses['where'] : '';
+		$orderby = isset($clauses['orderby']) ? $clauses['orderby'] : '';
+		$limits = isset($clauses['limits']) ? $clauses['limits'] : '';
+		$groupby = isset($clauses['groupby']) ? $clauses['groupby'] : '';
 
-		if ( $where ) {
-			$where = 'WHERE ' . $where;
+		if ($where) {
+			$where = 'WHERE '.$where;
 		}
 
-		if ( $groupby ) {
-			$groupby = 'GROUP BY ' . $groupby;
+		if ($groupby) {
+			$groupby = 'GROUP BY '.$groupby;
 		}
 
-		if ( $orderby ) {
+		if ($orderby) {
 			$orderby = "ORDER BY $orderby";
 		}
 
 		$found_rows = '';
-		if ( ! $this->query_vars['no_found_rows'] ) {
+		if ( ! $this->query_vars['no_found_rows']) {
 			$found_rows = 'SQL_CALC_FOUND_ROWS';
 		}
 
@@ -446,13 +445,13 @@ 
 
 		$this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
 
-		if ( $this->query_vars['count'] ) {
-			return intval( $wpdb->get_var( $this->request ) );
+		if ($this->query_vars['count']) {
+			return intval($wpdb->get_var($this->request));
 		}
 
-		$network_ids = $wpdb->get_col( $this->request );
+		$network_ids = $wpdb->get_col($this->request);
 
-		return array_map( 'intval', $network_ids );
+		return array_map('intval', $network_ids);
 	}
 
 	/**
@@ -467,7 +466,7 @@ 
 	private function set_found_networks() {
 		global $wpdb;
 
-		if ( $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
+		if ($this->query_vars['number'] && ! $this->query_vars['no_found_rows']) {
 			/**
 			 * Filters the query used to retrieve found network count.
 			 *
@@ -476,9 +475,9 @@ 
 			 * @param string           $found_networks_query SQL query. Default 'SELECT FOUND_ROWS()'.
 			 * @param WP_Network_Query $network_query        The `WP_Network_Query` instance.
 			 */
-			$found_networks_query = apply_filters( 'found_networks_query', 'SELECT FOUND_ROWS()', $this );
+			$found_networks_query = apply_filters('found_networks_query', 'SELECT FOUND_ROWS()', $this);
 
-			$this->found_networks = (int) $wpdb->get_var( $found_networks_query );
+			$this->found_networks = (int) $wpdb->get_var($found_networks_query);
 		}
 	}
 
@@ -495,17 +494,17 @@ 
 	 *
 	 * @return string Search SQL.
 	 */
-	protected function get_search_sql( $string, $columns ) {
+	protected function get_search_sql($string, $columns) {
 		global $wpdb;
 
-		$like = '%' . $wpdb->esc_like( $string ) . '%';
+		$like = '%'.$wpdb->esc_like($string).'%';
 
 		$searches = array();
-		foreach ( $columns as $column ) {
-			$searches[] = $wpdb->prepare( "$column LIKE %s", $like );
+		foreach ($columns as $column) {
+			$searches[] = $wpdb->prepare("$column LIKE %s", $like);
 		}
 
-		return '(' . implode( ' OR ', $searches ) . ')';
+		return '('.implode(' OR ', $searches).')';
 	}
 
 	/**
@@ -519,7 +518,7 @@ 
 	 * @param string $orderby Alias for the field to order by.
 	 * @return string|false Value to used in the ORDER clause. False otherwise.
 	 */
-	protected function parse_orderby( $orderby ) {
+	protected function parse_orderby($orderby) {
 		global $wpdb;
 
 		$allowed_keys = array(
@@ -529,13 +528,13 @@ 
 		);
 
 		$parsed = false;
-		if ( $orderby == 'network__in' ) {
-			$network__in = implode( ',', array_map( 'absint', $this->query_vars['network__in'] ) );
+		if ($orderby == 'network__in') {
+			$network__in = implode(',', array_map('absint', $this->query_vars['network__in']));
 			$parsed = "FIELD( {$wpdb->site}.id, $network__in )";
-		} elseif ( $orderby == 'domain_length' || $orderby == 'path_length' ) {
-			$field = substr( $orderby, 0, -7 );
+		} elseif ($orderby == 'domain_length' || $orderby == 'path_length') {
+			$field = substr($orderby, 0, -7);
 			$parsed = "CHAR_LENGTH($wpdb->site.$field)";
-		} elseif ( in_array( $orderby, $allowed_keys ) ) {
+		} elseif (in_array($orderby, $allowed_keys)) {
 			$parsed = "$wpdb->site.$orderby";
 		}
 
@@ -551,12 +550,12 @@ 
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
 	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
+	protected function parse_order($order) {
+		if ( ! is_string($order) || empty($order)) {
 			return 'ASC';
 		}
 
-		if ( 'ASC' === strtoupper( $order ) ) {
+		if ('ASC' === strtoupper($order)) {
 			return 'ASC';
 		} else {
 			return 'DESC';

src/wp-includes/rss.php

Spacing +224 added lines, -224 removed lines

@@ -16,7 +16,7 @@ 
 /**
  * Deprecated. Use SimplePie (class-simplepie.php) instead.
  */
-_deprecated_file( basename( __FILE__ ), '3.0.0', WPINC . '/class-simplepie.php' );
+_deprecated_file(basename(__FILE__), '3.0.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. https://secure.php.net/manual/en/ref.xml.php" );
+		if ( ! function_exists('xml_parser_create'))
+			trigger_error("Failed to load PHP's XML Extension. https://secure.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. https://secure.php.net/manual/en/ref.xml.php");
+		if ( ! is_resource($parser))
+			trigger_error("Failed to create an instance of PHP's XML parser. https://secure.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) = explode( ':', $element, 2);
+		$ns = false;
+		if (strpos($element, ':')) {
+			list($ns, $el) = explode(':', $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']);

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

Spacing +34 added lines, -34 removed lines

@@ -122,73 +122,73 @@ 
 	 *                                there's insufficient data to distinguish which term is intended.
 	 *                                False for other failures.
 	 */
-	public static function get_instance( $term_id, $taxonomy = null ) {
+	public static function get_instance($term_id, $taxonomy = null) {
 		global $wpdb;
 
 		$term_id = (int) $term_id;
-		if ( ! $term_id ) {
+		if ( ! $term_id) {
 			return false;
 		}
 
-		$_term = wp_cache_get( $term_id, 'terms' );
+		$_term = wp_cache_get($term_id, 'terms');
 
 		// If there isn't a cached version, hit the database.
-		if ( ! $_term || ( $taxonomy && $taxonomy !== $_term->taxonomy ) ) {
+		if ( ! $_term || ($taxonomy && $taxonomy !== $_term->taxonomy)) {
 			// Grab all matching terms, in case any are shared between taxonomies.
-			$terms = $wpdb->get_results( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id = %d", $term_id ) );
-			if ( ! $terms ) {
+			$terms = $wpdb->get_results($wpdb->prepare("SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id = %d", $term_id));
+			if ( ! $terms) {
 				return false;
 			}
 
 			// If a taxonomy was specified, find a match.
-			if ( $taxonomy ) {
-				foreach ( $terms as $match ) {
-					if ( $taxonomy === $match->taxonomy ) {
+			if ($taxonomy) {
+				foreach ($terms as $match) {
+					if ($taxonomy === $match->taxonomy) {
 						$_term = $match;
 						break;
 					}
 				}
 
 			// If only one match was found, it's the one we want.
-			} elseif ( 1 === count( $terms ) ) {
-				$_term = reset( $terms );
+			} elseif (1 === count($terms)) {
+				$_term = reset($terms);
 
 			// Otherwise, the term must be shared between taxonomies.
 			} else {
 				// If the term is shared only with invalid taxonomies, return the one valid term.
-				foreach ( $terms as $t ) {
-					if ( ! taxonomy_exists( $t->taxonomy ) ) {
+				foreach ($terms as $t) {
+					if ( ! taxonomy_exists($t->taxonomy)) {
 						continue;
 					}
 
 					// Only hit if we've already identified a term in a valid taxonomy.
-					if ( $_term ) {
-						return new WP_Error( 'ambiguous_term_id', __( 'Term ID is shared between multiple taxonomies' ), $term_id );
+					if ($_term) {
+						return new WP_Error('ambiguous_term_id', __('Term ID is shared between multiple taxonomies'), $term_id);
 					}
 
 					$_term = $t;
 				}
 			}
 
-			if ( ! $_term ) {
+			if ( ! $_term) {
 				return false;
 			}
 
 			// Don't return terms from invalid taxonomies.
-			if ( ! taxonomy_exists( $_term->taxonomy ) ) {
-				return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+			if ( ! taxonomy_exists($_term->taxonomy)) {
+				return new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 			}
 
-			$_term = sanitize_term( $_term, $_term->taxonomy, 'raw' );
+			$_term = sanitize_term($_term, $_term->taxonomy, 'raw');
 
 			// Don't cache terms that are shared between taxonomies.
-			if ( 1 === count( $terms ) ) {
-				wp_cache_add( $term_id, $_term, 'terms' );
+			if (1 === count($terms)) {
+				wp_cache_add($term_id, $_term, 'terms');
 			}
 		}
 
-		$term_obj = new WP_Term( $_term );
-		$term_obj->filter( $term_obj->filter );
+		$term_obj = new WP_Term($_term);
+		$term_obj->filter($term_obj->filter);
 
 		return $term_obj;
 	}
@@ -201,8 +201,8 @@ 
 	 *
 	 * @param WP_Term|object $term Term object.
 	 */
-	public function __construct( $term ) {
-		foreach ( get_object_vars( $term ) as $key => $value ) {
+	public function __construct($term) {
+		foreach (get_object_vars($term) as $key => $value) {
 			$this->$key = $value;
 		}
 	}
@@ -215,8 +215,8 @@ 
 	 *
 	 * @param string $filter Filter context. Accepts 'edit', 'db', 'display', 'attribute', 'js', 'raw'.
 	 */
-	public function filter( $filter ) {
-		sanitize_term( $this, $this->taxonomy, $filter );
+	public function filter($filter) {
+		sanitize_term($this, $this->taxonomy, $filter);
 	}
 
 	/**
@@ -228,7 +228,7 @@ 
 	 * @return array Object as array.
 	 */
 	public function to_array() {
-		return get_object_vars( $this );
+		return get_object_vars($this);
 	}
 
 	/**
@@ -240,16 +240,16 @@ 
 	 * @param string $key Property to get.
 	 * @return mixed Property value.
 	 */
-	public function __get( $key ) {
-		switch ( $key ) {
+	public function __get($key) {
+		switch ($key) {
 			case 'data' :
 				$data = new stdClass();
-				$columns = array( 'term_id', 'name', 'slug', 'term_group', 'term_taxonomy_id', 'taxonomy', 'description', 'parent', 'count' );
-				foreach ( $columns as $column ) {
-					$data->{$column} = isset( $this->{$column} ) ? $this->{$column} : null;
+				$columns = array('term_id', 'name', 'slug', 'term_group', 'term_taxonomy_id', 'taxonomy', 'description', 'parent', 'count');
+				foreach ($columns as $column) {
+					$data->{$column} = isset($this->{$column} ) ? $this->{$column} : null;
 				}
 
-				return sanitize_term( $data, $data->taxonomy, 'raw' );
+				return sanitize_term($data, $data->taxonomy, 'raw');
 				break;
 		}
 	}

src/wp-includes/canonical.php

Spacing +238 added lines, -238 removed lines

@@ -38,28 +38,28 @@ 
  * @param bool $do_redirect Optional. Redirect to the new URL.
  * @return string|void The string of the URL, if redirect needed.
  */
-function redirect_canonical( $requested_url = null, $do_redirect = true ) {
+function redirect_canonical($requested_url = null, $do_redirect = true) {
 	global $wp_rewrite, $is_IIS, $wp_query, $wpdb, $wp;
 
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && ! in_array( strtoupper( $_SERVER['REQUEST_METHOD'] ), array( 'GET', 'HEAD' ) ) ) {
+	if (isset($_SERVER['REQUEST_METHOD']) && ! in_array(strtoupper($_SERVER['REQUEST_METHOD']), array('GET', 'HEAD'))) {
 		return;
 	}
 
 	// If we're not in wp-admin and the post has been published and preview nonce
 	// is non-existent or invalid then no need for preview in query
-	if ( is_preview() && get_query_var( 'p' ) && 'publish' == get_post_status( get_query_var( 'p' ) ) ) {
-		if ( ! isset( $_GET['preview_id'] )
-			|| ! isset( $_GET['preview_nonce'] )
-			|| ! wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . (int) $_GET['preview_id'] ) ) {
+	if (is_preview() && get_query_var('p') && 'publish' == get_post_status(get_query_var('p'))) {
+		if ( ! isset($_GET['preview_id'])
+			|| ! isset($_GET['preview_nonce'])
+			|| ! wp_verify_nonce($_GET['preview_nonce'], 'post_preview_'.(int) $_GET['preview_id'])) {
 			$wp_query->is_preview = false;
 		}
 	}
 
-	if ( is_trackback() || is_search() || is_admin() || is_preview() || is_robots() || ( $is_IIS && !iis7_supports_permalinks() ) ) {
+	if (is_trackback() || is_search() || is_admin() || is_preview() || is_robots() || ($is_IIS && ! iis7_supports_permalinks())) {
 		return;
 	}
 
-	if ( ! $requested_url && isset( $_SERVER['HTTP_HOST'] ) ) {
+	if ( ! $requested_url && isset($_SERVER['HTTP_HOST'])) {
 		// build the URL in the address bar
 		$requested_url  = is_ssl() ? 'https://' : 'http://';
 		$requested_url .= $_SERVER['HTTP_HOST'];
@@ -67,7 +67,7 @@ 
 	}
 
 	$original = @parse_url($requested_url);
-	if ( false === $original ) {
+	if (false === $original) {
 		return;
 	}
 
@@ -75,170 +75,170 @@ 
 	$redirect_url = false;
 
 	// Notice fixing
-	if ( !isset($redirect['path']) )
+	if ( ! isset($redirect['path']))
 		$redirect['path'] = '';
-	if ( !isset($redirect['query']) )
+	if ( ! isset($redirect['query']))
 		$redirect['query'] = '';
 
 	// If the original URL ended with non-breaking spaces, they were almost
 	// certainly inserted by accident. Let's remove them, so the reader doesn't
 	// see a 404 error with no obvious cause.
-	$redirect['path'] = preg_replace( '|(%C2%A0)+$|i', '', $redirect['path'] );
+	$redirect['path'] = preg_replace('|(%C2%A0)+$|i', '', $redirect['path']);
 
 	// It's not a preview, so remove it from URL
-	if ( get_query_var( 'preview' ) ) {
-		$redirect['query'] = remove_query_arg( 'preview', $redirect['query'] );
+	if (get_query_var('preview')) {
+		$redirect['query'] = remove_query_arg('preview', $redirect['query']);
 	}
 
-	if ( is_feed() && ( $id = get_query_var( 'p' ) ) ) {
-		if ( $redirect_url = get_post_comments_feed_link( $id, get_query_var( 'feed' ) ) ) {
-			$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type', 'feed'), $redirect_url );
-			$redirect['path'] = parse_url( $redirect_url, PHP_URL_PATH );
+	if (is_feed() && ($id = get_query_var('p'))) {
+		if ($redirect_url = get_post_comments_feed_link($id, get_query_var('feed'))) {
+			$redirect['query'] = _remove_qs_args_if_not_in_url($redirect['query'], array('p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type', 'feed'), $redirect_url);
+			$redirect['path'] = parse_url($redirect_url, PHP_URL_PATH);
 		}
 	}
 
-	if ( is_singular() && 1 > $wp_query->post_count && ($id = get_query_var('p')) ) {
+	if (is_singular() && 1 > $wp_query->post_count && ($id = get_query_var('p'))) {
 
-		$vars = $wpdb->get_results( $wpdb->prepare("SELECT post_type, post_parent FROM $wpdb->posts WHERE ID = %d", $id) );
+		$vars = $wpdb->get_results($wpdb->prepare("SELECT post_type, post_parent FROM $wpdb->posts WHERE ID = %d", $id));
 
-		if ( isset($vars[0]) && $vars = $vars[0] ) {
-			if ( 'revision' == $vars->post_type && $vars->post_parent > 0 )
+		if (isset($vars[0]) && $vars = $vars[0]) {
+			if ('revision' == $vars->post_type && $vars->post_parent > 0)
 				$id = $vars->post_parent;
 
-			if ( $redirect_url = get_permalink($id) )
-				$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
+			if ($redirect_url = get_permalink($id))
+				$redirect['query'] = _remove_qs_args_if_not_in_url($redirect['query'], array('p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type'), $redirect_url);
 		}
 	}
 
 	// These tests give us a WP-generated permalink
-	if ( is_404() ) {
+	if (is_404()) {
 
 		// Redirect ?page_id, ?p=, ?attachment_id= to their respective url's
-		$id = max( get_query_var('p'), get_query_var('page_id'), get_query_var('attachment_id') );
-		if ( $id && $redirect_post = get_post($id) ) {
+		$id = max(get_query_var('p'), get_query_var('page_id'), get_query_var('attachment_id'));
+		if ($id && $redirect_post = get_post($id)) {
 			$post_type_obj = get_post_type_object($redirect_post->post_type);
-			if ( $post_type_obj->public && 'auto-draft' != $redirect_post->post_status ) {
+			if ($post_type_obj->public && 'auto-draft' != $redirect_post->post_status) {
 				$redirect_url = get_permalink($redirect_post);
-				$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
+				$redirect['query'] = _remove_qs_args_if_not_in_url($redirect['query'], array('p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type'), $redirect_url);
 			}
 		}
 
-		if ( get_query_var( 'day' ) && get_query_var( 'monthnum' ) && get_query_var( 'year' ) ) {
-			$year  = get_query_var( 'year' );
-			$month = get_query_var( 'monthnum' );
-			$day   = get_query_var( 'day' );
-			$date  = sprintf( '%04d-%02d-%02d', $year, $month, $day );
-			if ( ! wp_checkdate( $month, $day, $year, $date ) ) {
-				$redirect_url = get_month_link( $year, $month );
-				$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'year', 'monthnum', 'day' ), $redirect_url );
+		if (get_query_var('day') && get_query_var('monthnum') && get_query_var('year')) {
+			$year  = get_query_var('year');
+			$month = get_query_var('monthnum');
+			$day   = get_query_var('day');
+			$date  = sprintf('%04d-%02d-%02d', $year, $month, $day);
+			if ( ! wp_checkdate($month, $day, $year, $date)) {
+				$redirect_url = get_month_link($year, $month);
+				$redirect['query'] = _remove_qs_args_if_not_in_url($redirect['query'], array('year', 'monthnum', 'day'), $redirect_url);
 			}
-		} elseif ( get_query_var( 'monthnum' ) && get_query_var( 'year' ) && 12 < get_query_var( 'monthnum' ) ) {
-			$redirect_url = get_year_link( get_query_var( 'year' ) );
-			$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'year', 'monthnum' ), $redirect_url );
+		} elseif (get_query_var('monthnum') && get_query_var('year') && 12 < get_query_var('monthnum')) {
+			$redirect_url = get_year_link(get_query_var('year'));
+			$redirect['query'] = _remove_qs_args_if_not_in_url($redirect['query'], array('year', 'monthnum'), $redirect_url);
 		}
 
-		if ( ! $redirect_url ) {
-			if ( $redirect_url = redirect_guess_404_permalink() ) {
-				$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'page', 'feed', 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
+		if ( ! $redirect_url) {
+			if ($redirect_url = redirect_guess_404_permalink()) {
+				$redirect['query'] = _remove_qs_args_if_not_in_url($redirect['query'], array('page', 'feed', 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type'), $redirect_url);
 			}
 		}
 
-		if ( get_query_var( 'page' ) && $wp_query->post &&
-			false !== strpos( $wp_query->post->post_content, '<!--nextpage-->' ) ) {
-			$redirect['path'] = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
-			$redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
-			$redirect_url = get_permalink( $wp_query->post->ID );
+		if (get_query_var('page') && $wp_query->post &&
+			false !== strpos($wp_query->post->post_content, '<!--nextpage-->')) {
+			$redirect['path'] = rtrim($redirect['path'], (int) get_query_var('page').'/');
+			$redirect['query'] = remove_query_arg('page', $redirect['query']);
+			$redirect_url = get_permalink($wp_query->post->ID);
 		}
 
-	} elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) {
+	} elseif (is_object($wp_rewrite) && $wp_rewrite->using_permalinks()) {
 		// rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101
-		if ( is_attachment() &&
-			! array_diff( array_keys( $wp->query_vars ), array( 'attachment', 'attachment_id' ) ) &&
-			! $redirect_url ) {
-			if ( ! empty( $_GET['attachment_id'] ) ) {
-				$redirect_url = get_attachment_link( get_query_var( 'attachment_id' ) );
-				if ( $redirect_url ) {
-					$redirect['query'] = remove_query_arg( 'attachment_id', $redirect['query'] );
+		if (is_attachment() &&
+			! array_diff(array_keys($wp->query_vars), array('attachment', 'attachment_id')) &&
+			! $redirect_url) {
+			if ( ! empty($_GET['attachment_id'])) {
+				$redirect_url = get_attachment_link(get_query_var('attachment_id'));
+				if ($redirect_url) {
+					$redirect['query'] = remove_query_arg('attachment_id', $redirect['query']);
 				}
 			} else {
 				$redirect_url = get_attachment_link();
 			}
-		} elseif ( is_single() && !empty($_GET['p']) && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink(get_query_var('p')) )
+		} elseif (is_single() && ! empty($_GET['p']) && ! $redirect_url) {
+			if ($redirect_url = get_permalink(get_query_var('p')))
 				$redirect['query'] = remove_query_arg(array('p', 'post_type'), $redirect['query']);
-		} elseif ( is_single() && !empty($_GET['name'])  && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) )
+		} elseif (is_single() && ! empty($_GET['name']) && ! $redirect_url) {
+			if ($redirect_url = get_permalink($wp_query->get_queried_object_id()))
 				$redirect['query'] = remove_query_arg('name', $redirect['query']);
-		} elseif ( is_page() && !empty($_GET['page_id']) && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink(get_query_var('page_id')) )
+		} elseif (is_page() && ! empty($_GET['page_id']) && ! $redirect_url) {
+			if ($redirect_url = get_permalink(get_query_var('page_id')))
 				$redirect['query'] = remove_query_arg('page_id', $redirect['query']);
-		} elseif ( is_page() && !is_feed() && 'page' == get_option('show_on_front') && get_queried_object_id() == get_option('page_on_front')  && ! $redirect_url ) {
+		} elseif (is_page() && ! is_feed() && 'page' == get_option('show_on_front') && get_queried_object_id() == get_option('page_on_front') && ! $redirect_url) {
 			$redirect_url = home_url('/');
-		} elseif ( is_home() && !empty($_GET['page_id']) && 'page' == get_option('show_on_front') && get_query_var('page_id') == get_option('page_for_posts')  && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink(get_option('page_for_posts')) )
+		} elseif (is_home() && ! empty($_GET['page_id']) && 'page' == get_option('show_on_front') && get_query_var('page_id') == get_option('page_for_posts') && ! $redirect_url) {
+			if ($redirect_url = get_permalink(get_option('page_for_posts')))
 				$redirect['query'] = remove_query_arg('page_id', $redirect['query']);
-		} elseif ( !empty($_GET['m']) && ( is_year() || is_month() || is_day() ) ) {
+		} elseif ( ! empty($_GET['m']) && (is_year() || is_month() || is_day())) {
 			$m = get_query_var('m');
-			switch ( strlen($m) ) {
+			switch (strlen($m)) {
 				case 4: // Yearly
 					$redirect_url = get_year_link($m);
 					break;
 				case 6: // Monthly
-					$redirect_url = get_month_link( substr($m, 0, 4), substr($m, 4, 2) );
+					$redirect_url = get_month_link(substr($m, 0, 4), substr($m, 4, 2));
 					break;
 				case 8: // Daily
 					$redirect_url = get_day_link(substr($m, 0, 4), substr($m, 4, 2), substr($m, 6, 2));
 					break;
 			}
-			if ( $redirect_url )
+			if ($redirect_url)
 				$redirect['query'] = remove_query_arg('m', $redirect['query']);
 		// now moving on to non ?m=X year/month/day links
-		} elseif ( is_day() && get_query_var('year') && get_query_var('monthnum') && !empty($_GET['day']) ) {
-			if ( $redirect_url = get_day_link(get_query_var('year'), get_query_var('monthnum'), get_query_var('day')) )
+		} elseif (is_day() && get_query_var('year') && get_query_var('monthnum') && ! empty($_GET['day'])) {
+			if ($redirect_url = get_day_link(get_query_var('year'), get_query_var('monthnum'), get_query_var('day')))
 				$redirect['query'] = remove_query_arg(array('year', 'monthnum', 'day'), $redirect['query']);
-		} elseif ( is_month() && get_query_var('year') && !empty($_GET['monthnum']) ) {
-			if ( $redirect_url = get_month_link(get_query_var('year'), get_query_var('monthnum')) )
+		} elseif (is_month() && get_query_var('year') && ! empty($_GET['monthnum'])) {
+			if ($redirect_url = get_month_link(get_query_var('year'), get_query_var('monthnum')))
 				$redirect['query'] = remove_query_arg(array('year', 'monthnum'), $redirect['query']);
-		} elseif ( is_year() && !empty($_GET['year']) ) {
-			if ( $redirect_url = get_year_link(get_query_var('year')) )
+		} elseif (is_year() && ! empty($_GET['year'])) {
+			if ($redirect_url = get_year_link(get_query_var('year')))
 				$redirect['query'] = remove_query_arg('year', $redirect['query']);
-		} elseif ( is_author() && !empty($_GET['author']) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
+		} elseif (is_author() && ! empty($_GET['author']) && preg_match('|^[0-9]+$|', $_GET['author'])) {
 			$author = get_userdata(get_query_var('author'));
-			if ( ( false !== $author ) && $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE $wpdb->posts.post_author = %d AND $wpdb->posts.post_status = 'publish' LIMIT 1", $author->ID ) ) ) {
-				if ( $redirect_url = get_author_posts_url($author->ID, $author->user_nicename) )
+			if ((false !== $author) && $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE $wpdb->posts.post_author = %d AND $wpdb->posts.post_status = 'publish' LIMIT 1", $author->ID))) {
+				if ($redirect_url = get_author_posts_url($author->ID, $author->user_nicename))
 					$redirect['query'] = remove_query_arg('author', $redirect['query']);
 			}
-		} elseif ( is_category() || is_tag() || is_tax() ) { // Terms (Tags/categories)
+		} elseif (is_category() || is_tag() || is_tax()) { // Terms (Tags/categories)
 
 			$term_count = 0;
-			foreach ( $wp_query->tax_query->queried_terms as $tax_query )
-				$term_count += count( $tax_query['terms'] );
+			foreach ($wp_query->tax_query->queried_terms as $tax_query)
+				$term_count += count($tax_query['terms']);
 
 			$obj = $wp_query->get_queried_object();
-			if ( $term_count <= 1 && !empty($obj->term_id) && ( $tax_url = get_term_link((int)$obj->term_id, $obj->taxonomy) ) && !is_wp_error($tax_url) ) {
-				if ( !empty($redirect['query']) ) {
+			if ($term_count <= 1 && ! empty($obj->term_id) && ($tax_url = get_term_link((int) $obj->term_id, $obj->taxonomy)) && ! is_wp_error($tax_url)) {
+				if ( ! empty($redirect['query'])) {
 					// Strip taxonomy query vars off the url.
-					$qv_remove = array( 'term', 'taxonomy');
-					if ( is_category() ) {
+					$qv_remove = array('term', 'taxonomy');
+					if (is_category()) {
 						$qv_remove[] = 'category_name';
 						$qv_remove[] = 'cat';
-					} elseif ( is_tag() ) {
+					} elseif (is_tag()) {
 						$qv_remove[] = 'tag';
 						$qv_remove[] = 'tag_id';
 					} else { // Custom taxonomies will have a custom query var, remove those too:
-						$tax_obj = get_taxonomy( $obj->taxonomy );
-						if ( false !== $tax_obj->query_var )
+						$tax_obj = get_taxonomy($obj->taxonomy);
+						if (false !== $tax_obj->query_var)
 							$qv_remove[] = $tax_obj->query_var;
 					}
 
-					$rewrite_vars = array_diff( array_keys($wp_query->query), array_keys($_GET) );
+					$rewrite_vars = array_diff(array_keys($wp_query->query), array_keys($_GET));
 
-					if ( !array_diff($rewrite_vars, array_keys($_GET))  ) { // Check to see if all the Query vars are coming from the rewrite, none are set via $_GET
+					if ( ! array_diff($rewrite_vars, array_keys($_GET))) { // Check to see if all the Query vars are coming from the rewrite, none are set via $_GET
 						$redirect['query'] = remove_query_arg($qv_remove, $redirect['query']); //Remove all of the per-tax qv's
 
 						// Create the destination url for this taxonomy
 						$tax_url = parse_url($tax_url);
-						if ( ! empty($tax_url['query']) ) { // Taxonomy accessible via ?taxonomy=..&term=.. or any custom qv..
+						if ( ! empty($tax_url['query'])) { // Taxonomy accessible via ?taxonomy=..&term=.. or any custom qv..
 							parse_str($tax_url['query'], $query_vars);
 							$redirect['query'] = add_query_arg($query_vars, $redirect['query']);
 						} else { // Taxonomy is accessible via a "pretty-URL"
@@ -246,40 +246,40 @@ 
 						}
 
 					} else { // Some query vars are set via $_GET. Unset those from $_GET that exist via the rewrite
-						foreach ( $qv_remove as $_qv ) {
-							if ( isset($rewrite_vars[$_qv]) )
+						foreach ($qv_remove as $_qv) {
+							if (isset($rewrite_vars[$_qv]))
 								$redirect['query'] = remove_query_arg($_qv, $redirect['query']);
 						}
 					}
 				}
 
 			}
-		} elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false && $cat = get_query_var( 'category_name' ) ) {
-			$category = get_category_by_path( $cat );
-			if ( ( ! $category || is_wp_error( $category ) ) || ! has_term( $category->term_id, 'category', $wp_query->get_queried_object_id() ) ) {
+		} elseif (is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false && $cat = get_query_var('category_name')) {
+			$category = get_category_by_path($cat);
+			if (( ! $category || is_wp_error($category)) || ! has_term($category->term_id, 'category', $wp_query->get_queried_object_id())) {
 				$redirect_url = get_permalink($wp_query->get_queried_object_id());
 			}
 		}
 
 		// Post Paging
-		if ( is_singular() && get_query_var('page') ) {
-			if ( !$redirect_url )
-				$redirect_url = get_permalink( get_queried_object_id() );
-
-			$page = get_query_var( 'page' );
-			if ( $page > 1 ) {
-				if ( is_front_page() ) {
-					$redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( "$wp_rewrite->pagination_base/$page", 'paged' );
+		if (is_singular() && get_query_var('page')) {
+			if ( ! $redirect_url)
+				$redirect_url = get_permalink(get_queried_object_id());
+
+			$page = get_query_var('page');
+			if ($page > 1) {
+				if (is_front_page()) {
+					$redirect_url = trailingslashit($redirect_url).user_trailingslashit("$wp_rewrite->pagination_base/$page", 'paged');
 				} else {
-					$redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( $page, 'single_paged' );
+					$redirect_url = trailingslashit($redirect_url).user_trailingslashit($page, 'single_paged');
 				}
 			}
-			$redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+			$redirect['query'] = remove_query_arg('page', $redirect['query']);
 		}
 
 		// paging and feeds
-		if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {
-			while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( "#/{$wp_rewrite->comments_pagination_base}-[0-9]+(/+)?$#", $redirect['path'] ) ) {
+		if (get_query_var('paged') || is_feed() || get_query_var('cpage')) {
+			while (preg_match("#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path']) || preg_match('#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path']) || preg_match("#/{$wp_rewrite->comments_pagination_base}-[0-9]+(/+)?$#", $redirect['path'])) {
 				// Strip off paging and feed
 				$redirect['path'] = preg_replace("#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing paging
 				$redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path']); // strip off feed endings
@@ -287,16 +287,16 @@ 
 			}
 
 			$addl_path = '';
-			if ( is_feed() && in_array( get_query_var('feed'), $wp_rewrite->feeds ) ) {
-				$addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
-				if ( !is_singular() && get_query_var( 'withcomments' ) )
+			if (is_feed() && in_array(get_query_var('feed'), $wp_rewrite->feeds)) {
+				$addl_path = ! empty($addl_path) ? trailingslashit($addl_path) : '';
+				if ( ! is_singular() && get_query_var('withcomments'))
 					$addl_path .= 'comments/';
-				if ( ( 'rss' == get_default_feed() && 'feed' == get_query_var('feed') ) || 'rss' == get_query_var('feed') )
-					$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == 'rss2' ) ? '' : 'rss2' ), 'feed' );
+				if (('rss' == get_default_feed() && 'feed' == get_query_var('feed')) || 'rss' == get_query_var('feed'))
+					$addl_path .= user_trailingslashit('feed/'.((get_default_feed() == 'rss2') ? '' : 'rss2'), 'feed');
 				else
-					$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
-				$redirect['query'] = remove_query_arg( 'feed', $redirect['query'] );
-			} elseif ( is_feed() && 'old' == get_query_var('feed') ) {
+					$addl_path .= user_trailingslashit('feed/'.((get_default_feed() == get_query_var('feed') || 'feed' == get_query_var('feed')) ? '' : get_query_var('feed')), 'feed');
+				$redirect['query'] = remove_query_arg('feed', $redirect['query']);
+			} elseif (is_feed() && 'old' == get_query_var('feed')) {
 				$old_feed_files = array(
 					'wp-atom.php'         => 'atom',
 					'wp-commentsrss2.php' => 'comments_rss2',
@@ -305,178 +305,178 @@ 
 					'wp-rss.php'          => 'rss2',
 					'wp-rss2.php'         => 'rss2',
 				);
-				if ( isset( $old_feed_files[ basename( $redirect['path'] ) ] ) ) {
-					$redirect_url = get_feed_link( $old_feed_files[ basename( $redirect['path'] ) ] );
-					wp_redirect( $redirect_url, 301 );
+				if (isset($old_feed_files[basename($redirect['path'])])) {
+					$redirect_url = get_feed_link($old_feed_files[basename($redirect['path'])]);
+					wp_redirect($redirect_url, 301);
 					die();
 				}
 			}
 
-			if ( get_query_var('paged') > 0 ) {
+			if (get_query_var('paged') > 0) {
 				$paged = get_query_var('paged');
-				$redirect['query'] = remove_query_arg( 'paged', $redirect['query'] );
-				if ( !is_feed() ) {
-					if ( $paged > 1 && !is_single() ) {
-						$addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit("$wp_rewrite->pagination_base/$paged", 'paged');
-					} elseif ( !is_single() ) {
-						$addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
+				$redirect['query'] = remove_query_arg('paged', $redirect['query']);
+				if ( ! is_feed()) {
+					if ($paged > 1 && ! is_single()) {
+						$addl_path = ( ! empty($addl_path) ? trailingslashit($addl_path) : '').user_trailingslashit("$wp_rewrite->pagination_base/$paged", 'paged');
+					} elseif ( ! is_single()) {
+						$addl_path = ! empty($addl_path) ? trailingslashit($addl_path) : '';
 					}
-				} elseif ( $paged > 1 ) {
-					$redirect['query'] = add_query_arg( 'paged', $paged, $redirect['query'] );
+				} elseif ($paged > 1) {
+					$redirect['query'] = add_query_arg('paged', $paged, $redirect['query']);
 				}
 			}
 
-			if ( get_option( 'page_comments' ) && (
-				( 'newest' == get_option( 'default_comments_page' ) && get_query_var( 'cpage' ) > 0 ) ||
-				( 'newest' != get_option( 'default_comments_page' ) && get_query_var( 'cpage' ) > 1 )
-			) ) {
-				$addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit( $wp_rewrite->comments_pagination_base . '-' . get_query_var('cpage'), 'commentpaged' );
-				$redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] );
+			if (get_option('page_comments') && (
+				('newest' == get_option('default_comments_page') && get_query_var('cpage') > 0) ||
+				('newest' != get_option('default_comments_page') && get_query_var('cpage') > 1)
+			)) {
+				$addl_path = ( ! empty($addl_path) ? trailingslashit($addl_path) : '').user_trailingslashit($wp_rewrite->comments_pagination_base.'-'.get_query_var('cpage'), 'commentpaged');
+				$redirect['query'] = remove_query_arg('cpage', $redirect['query']);
 			}
 
-			$redirect['path'] = user_trailingslashit( preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/?$|', '/', $redirect['path']) ); // strip off trailing /index.php/
-			if ( !empty( $addl_path ) && $wp_rewrite->using_index_permalinks() && strpos($redirect['path'], '/' . $wp_rewrite->index . '/') === false )
-				$redirect['path'] = trailingslashit($redirect['path']) . $wp_rewrite->index . '/';
-			if ( !empty( $addl_path ) )
-				$redirect['path'] = trailingslashit($redirect['path']) . $addl_path;
-			$redirect_url = $redirect['scheme'] . '://' . $redirect['host'] . $redirect['path'];
+			$redirect['path'] = user_trailingslashit(preg_replace('|/'.preg_quote($wp_rewrite->index, '|').'/?$|', '/', $redirect['path'])); // strip off trailing /index.php/
+			if ( ! empty($addl_path) && $wp_rewrite->using_index_permalinks() && strpos($redirect['path'], '/'.$wp_rewrite->index.'/') === false)
+				$redirect['path'] = trailingslashit($redirect['path']).$wp_rewrite->index.'/';
+			if ( ! empty($addl_path))
+				$redirect['path'] = trailingslashit($redirect['path']).$addl_path;
+			$redirect_url = $redirect['scheme'].'://'.$redirect['host'].$redirect['path'];
 		}
 
-		if ( 'wp-register.php' == basename( $redirect['path'] ) ) {
-			if ( is_multisite() ) {
+		if ('wp-register.php' == basename($redirect['path'])) {
+			if (is_multisite()) {
 				/** This filter is documented in wp-login.php */
-				$redirect_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
+				$redirect_url = apply_filters('wp_signup_location', network_site_url('wp-signup.php'));
 			} else {
 				$redirect_url = wp_registration_url();
 			}
 
-			wp_redirect( $redirect_url, 301 );
+			wp_redirect($redirect_url, 301);
 			die();
 		}
 	}
 
 	// tack on any additional query vars
-	$redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );
-	if ( $redirect_url && !empty($redirect['query']) ) {
-		parse_str( $redirect['query'], $_parsed_query );
+	$redirect['query'] = preg_replace('#^\??&*?#', '', $redirect['query']);
+	if ($redirect_url && ! empty($redirect['query'])) {
+		parse_str($redirect['query'], $_parsed_query);
 		$redirect = @parse_url($redirect_url);
 
-		if ( ! empty( $_parsed_query['name'] ) && ! empty( $redirect['query'] ) ) {
-			parse_str( $redirect['query'], $_parsed_redirect_query );
+		if ( ! empty($_parsed_query['name']) && ! empty($redirect['query'])) {
+			parse_str($redirect['query'], $_parsed_redirect_query);
 
-			if ( empty( $_parsed_redirect_query['name'] ) )
-				unset( $_parsed_query['name'] );
+			if (empty($_parsed_redirect_query['name']))
+				unset($_parsed_query['name']);
 		}
 
-		$_parsed_query = rawurlencode_deep( $_parsed_query );
-		$redirect_url = add_query_arg( $_parsed_query, $redirect_url );
+		$_parsed_query = rawurlencode_deep($_parsed_query);
+		$redirect_url = add_query_arg($_parsed_query, $redirect_url);
 	}
 
-	if ( $redirect_url )
+	if ($redirect_url)
 		$redirect = @parse_url($redirect_url);
 
 	// www.example.com vs example.com
 	$user_home = @parse_url(home_url());
-	if ( !empty($user_home['host']) )
+	if ( ! empty($user_home['host']))
 		$redirect['host'] = $user_home['host'];
-	if ( empty($user_home['path']) )
+	if (empty($user_home['path']))
 		$user_home['path'] = '/';
 
 	// Handle ports
-	if ( !empty($user_home['port']) )
+	if ( ! empty($user_home['port']))
 		$redirect['port'] = $user_home['port'];
 	else
 		unset($redirect['port']);
 
 	// trailing /index.php
-	$redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']);
+	$redirect['path'] = preg_replace('|/'.preg_quote($wp_rewrite->index, '|').'/*?$|', '/', $redirect['path']);
 
 	// Remove trailing spaces from the path
-	$redirect['path'] = preg_replace( '#(%20| )+$#', '', $redirect['path'] );
+	$redirect['path'] = preg_replace('#(%20| )+$#', '', $redirect['path']);
 
-	if ( !empty( $redirect['query'] ) ) {
+	if ( ! empty($redirect['query'])) {
 		// Remove trailing spaces from certain terminating query string args
-		$redirect['query'] = preg_replace( '#((p|page_id|cat|tag)=[^&]*?)(%20| )+$#', '$1', $redirect['query'] );
+		$redirect['query'] = preg_replace('#((p|page_id|cat|tag)=[^&]*?)(%20| )+$#', '$1', $redirect['query']);
 
 		// Clean up empty query strings
-		$redirect['query'] = trim(preg_replace( '#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query']), '&');
+		$redirect['query'] = trim(preg_replace('#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query']), '&');
 
 		// Redirect obsolete feeds
-		$redirect['query'] = preg_replace( '#(^|&)feed=rss(&|$)#', '$1feed=rss2$2', $redirect['query'] );
+		$redirect['query'] = preg_replace('#(^|&)feed=rss(&|$)#', '$1feed=rss2$2', $redirect['query']);
 
 		// Remove redundant leading ampersands
-		$redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );
+		$redirect['query'] = preg_replace('#^\??&*?#', '', $redirect['query']);
 	}
 
 	// strip /index.php/ when we're not using PATHINFO permalinks
-	if ( !$wp_rewrite->using_index_permalinks() )
-		$redirect['path'] = str_replace( '/' . $wp_rewrite->index . '/', '/', $redirect['path'] );
+	if ( ! $wp_rewrite->using_index_permalinks())
+		$redirect['path'] = str_replace('/'.$wp_rewrite->index.'/', '/', $redirect['path']);
 
 	// trailing slashes
-	if ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() && !is_404() && (!is_front_page() || ( is_front_page() && (get_query_var('paged') > 1) ) ) ) {
+	if (is_object($wp_rewrite) && $wp_rewrite->using_permalinks() && ! is_404() && ( ! is_front_page() || (is_front_page() && (get_query_var('paged') > 1)))) {
 		$user_ts_type = '';
-		if ( get_query_var('paged') > 0 ) {
+		if (get_query_var('paged') > 0) {
 			$user_ts_type = 'paged';
 		} else {
-			foreach ( array('single', 'category', 'page', 'day', 'month', 'year', 'home') as $type ) {
-				$func = 'is_' . $type;
-				if ( call_user_func($func) ) {
+			foreach (array('single', 'category', 'page', 'day', 'month', 'year', 'home') as $type) {
+				$func = 'is_'.$type;
+				if (call_user_func($func)) {
 					$user_ts_type = $type;
 					break;
 				}
 			}
 		}
 		$redirect['path'] = user_trailingslashit($redirect['path'], $user_ts_type);
-	} elseif ( is_front_page() ) {
+	} elseif (is_front_page()) {
 		$redirect['path'] = trailingslashit($redirect['path']);
 	}
 
 	// Strip multiple slashes out of the URL
-	if ( strpos($redirect['path'], '//') > -1 )
+	if (strpos($redirect['path'], '//') > -1)
 		$redirect['path'] = preg_replace('|/+|', '/', $redirect['path']);
 
 	// Always trailing slash the Front Page URL
-	if ( trailingslashit( $redirect['path'] ) == trailingslashit( $user_home['path'] ) )
+	if (trailingslashit($redirect['path']) == trailingslashit($user_home['path']))
 		$redirect['path'] = trailingslashit($redirect['path']);
 
 	// Ignore differences in host capitalization, as this can lead to infinite redirects
 	// Only redirect no-www <=> yes-www
-	if ( strtolower($original['host']) == strtolower($redirect['host']) ||
-		( strtolower($original['host']) != 'www.' . strtolower($redirect['host']) && 'www.' . strtolower($original['host']) != strtolower($redirect['host']) ) )
+	if (strtolower($original['host']) == strtolower($redirect['host']) ||
+		(strtolower($original['host']) != 'www.'.strtolower($redirect['host']) && 'www.'.strtolower($original['host']) != strtolower($redirect['host'])))
 		$redirect['host'] = $original['host'];
 
-	$compare_original = array( $original['host'], $original['path'] );
+	$compare_original = array($original['host'], $original['path']);
 
-	if ( !empty( $original['port'] ) )
+	if ( ! empty($original['port']))
 		$compare_original[] = $original['port'];
 
-	if ( !empty( $original['query'] ) )
+	if ( ! empty($original['query']))
 		$compare_original[] = $original['query'];
 
-	$compare_redirect = array( $redirect['host'], $redirect['path'] );
+	$compare_redirect = array($redirect['host'], $redirect['path']);
 
-	if ( !empty( $redirect['port'] ) )
+	if ( ! empty($redirect['port']))
 		$compare_redirect[] = $redirect['port'];
 
-	if ( !empty( $redirect['query'] ) )
+	if ( ! empty($redirect['query']))
 		$compare_redirect[] = $redirect['query'];
 
-	if ( $compare_original !== $compare_redirect ) {
-		$redirect_url = $redirect['scheme'] . '://' . $redirect['host'];
-		if ( !empty($redirect['port']) )
-			$redirect_url .= ':' . $redirect['port'];
+	if ($compare_original !== $compare_redirect) {
+		$redirect_url = $redirect['scheme'].'://'.$redirect['host'];
+		if ( ! empty($redirect['port']))
+			$redirect_url .= ':'.$redirect['port'];
 		$redirect_url .= $redirect['path'];
-		if ( !empty($redirect['query']) )
-			$redirect_url .= '?' . $redirect['query'];
+		if ( ! empty($redirect['query']))
+			$redirect_url .= '?'.$redirect['query'];
 	}
 
-	if ( ! $redirect_url || $redirect_url == $requested_url ) {
+	if ( ! $redirect_url || $redirect_url == $requested_url) {
 		return;
 	}
 
 	// Hex encoded octets are case-insensitive.
-	if ( false !== strpos($requested_url, '%') ) {
-		if ( !function_exists('lowercase_octets') ) {
+	if (false !== strpos($requested_url, '%')) {
+		if ( ! function_exists('lowercase_octets')) {
 			/**
 			 * Converts the first hex-encoded octet match to lowercase.
 			 *
@@ -487,7 +487,7 @@ 
 			 * @return string Lowercased version of the first match.
 			 */
 			function lowercase_octets($matches) {
-				return strtolower( $matches[0] );
+				return strtolower($matches[0]);
 			}
 		}
 		$requested_url = preg_replace_callback('|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url);
@@ -503,16 +503,16 @@ 
 	 * @param string $redirect_url  The redirect URL.
 	 * @param string $requested_url The requested URL.
 	 */
-	$redirect_url = apply_filters( 'redirect_canonical', $redirect_url, $requested_url );
+	$redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url);
 
 	// yes, again -- in case the filter aborted the request
-	if ( ! $redirect_url || strip_fragment_from_url( $redirect_url ) == strip_fragment_from_url( $requested_url ) ) {
+	if ( ! $redirect_url || strip_fragment_from_url($redirect_url) == strip_fragment_from_url($requested_url)) {
 		return;
 	}
 
-	if ( $do_redirect ) {
+	if ($do_redirect) {
 		// protect against chained redirects
-		if ( !redirect_canonical($redirect_url, false) ) {
+		if ( ! redirect_canonical($redirect_url, false)) {
 			wp_redirect($redirect_url, 301);
 			exit();
 		} else {
@@ -537,16 +537,16 @@ 
  * @param string $url
  * @return string The altered query string
  */
-function _remove_qs_args_if_not_in_url( $query_string, Array $args_to_check, $url ) {
-	$parsed_url = @parse_url( $url );
-	if ( ! empty( $parsed_url['query'] ) ) {
-		parse_str( $parsed_url['query'], $parsed_query );
-		foreach ( $args_to_check as $qv ) {
-			if ( !isset( $parsed_query[$qv] ) )
-				$query_string = remove_query_arg( $qv, $query_string );
+function _remove_qs_args_if_not_in_url($query_string, Array $args_to_check, $url) {
+	$parsed_url = @parse_url($url);
+	if ( ! empty($parsed_url['query'])) {
+		parse_str($parsed_url['query'], $parsed_query);
+		foreach ($args_to_check as $qv) {
+			if ( ! isset($parsed_query[$qv]))
+				$query_string = remove_query_arg($qv, $query_string);
 		}
 	} else {
-		$query_string = remove_query_arg( $args_to_check, $query_string );
+		$query_string = remove_query_arg($args_to_check, $query_string);
 	}
 	return $query_string;
 }
@@ -559,17 +559,17 @@ 
  * @param string $url The URL to strip.
  * @return string The altered URL.
  */
-function strip_fragment_from_url( $url ) {
-	$parsed_url = @parse_url( $url );
-	if ( ! empty( $parsed_url['host'] ) ) {
+function strip_fragment_from_url($url) {
+	$parsed_url = @parse_url($url);
+	if ( ! empty($parsed_url['host'])) {
 		// This mirrors code in redirect_canonical(). It does not handle every case.
-		$url = $parsed_url['scheme'] . '://' . $parsed_url['host'];
-		if ( ! empty( $parsed_url['port'] ) ) {
-			$url .= ':' . $parsed_url['port'];
+		$url = $parsed_url['scheme'].'://'.$parsed_url['host'];
+		if ( ! empty($parsed_url['port'])) {
+			$url .= ':'.$parsed_url['port'];
 		}
 		$url .= $parsed_url['path'];
-		if ( ! empty( $parsed_url['query'] ) ) {
-			$url .= '?' . $parsed_url['query'];
+		if ( ! empty($parsed_url['query'])) {
+			$url .= '?'.$parsed_url['query'];
 		}
 	}
 
@@ -588,31 +588,31 @@ 
 function redirect_guess_404_permalink() {
 	global $wpdb;
 
-	if ( get_query_var('name') ) {
-		$where = $wpdb->prepare("post_name LIKE %s", $wpdb->esc_like( get_query_var('name') ) . '%');
+	if (get_query_var('name')) {
+		$where = $wpdb->prepare("post_name LIKE %s", $wpdb->esc_like(get_query_var('name')).'%');
 
 		// if any of post_type, year, monthnum, or day are set, use them to refine the query
-		if ( get_query_var('post_type') )
+		if (get_query_var('post_type'))
 			$where .= $wpdb->prepare(" AND post_type = %s", get_query_var('post_type'));
 		else
-			$where .= " AND post_type IN ('" . implode( "', '", get_post_types( array( 'public' => true ) ) ) . "')";
+			$where .= " AND post_type IN ('".implode("', '", get_post_types(array('public' => true)))."')";
 
-		if ( get_query_var('year') )
+		if (get_query_var('year'))
 			$where .= $wpdb->prepare(" AND YEAR(post_date) = %d", get_query_var('year'));
-		if ( get_query_var('monthnum') )
+		if (get_query_var('monthnum'))
 			$where .= $wpdb->prepare(" AND MONTH(post_date) = %d", get_query_var('monthnum'));
-		if ( get_query_var('day') )
+		if (get_query_var('day'))
 			$where .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", get_query_var('day'));
 
 		$post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE $where AND post_status = 'publish'");
-		if ( ! $post_id )
+		if ( ! $post_id)
 			return false;
-		if ( get_query_var( 'feed' ) )
-			return get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) );
-		elseif ( get_query_var( 'page' ) && 1 < get_query_var( 'page' ) )
-			return trailingslashit( get_permalink( $post_id ) ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
+		if (get_query_var('feed'))
+			return get_post_comments_feed_link($post_id, get_query_var('feed'));
+		elseif (get_query_var('page') && 1 < get_query_var('page'))
+			return trailingslashit(get_permalink($post_id)).user_trailingslashit(get_query_var('page'), 'single_paged');
 		else
-			return get_permalink( $post_id );
+			return get_permalink($post_id);
 	}
 
 	return false;
@@ -630,28 +630,28 @@ 
  */
 function wp_redirect_admin_locations() {
 	global $wp_rewrite;
-	if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) )
+	if ( ! (is_404() && $wp_rewrite->using_permalinks()))
 		return;
 
 	$admins = array(
-		home_url( 'wp-admin', 'relative' ),
-		home_url( 'dashboard', 'relative' ),
-		home_url( 'admin', 'relative' ),
-		site_url( 'dashboard', 'relative' ),
-		site_url( 'admin', 'relative' ),
+		home_url('wp-admin', 'relative'),
+		home_url('dashboard', 'relative'),
+		home_url('admin', 'relative'),
+		site_url('dashboard', 'relative'),
+		site_url('admin', 'relative'),
 	);
-	if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $admins ) ) {
-		wp_redirect( admin_url() );
+	if (in_array(untrailingslashit($_SERVER['REQUEST_URI']), $admins)) {
+		wp_redirect(admin_url());
 		exit;
 	}
 
 	$logins = array(
-		home_url( 'wp-login.php', 'relative' ),
-		home_url( 'login', 'relative' ),
-		site_url( 'login', 'relative' ),
+		home_url('wp-login.php', 'relative'),
+		home_url('login', 'relative'),
+		site_url('login', 'relative'),
 	);
-	if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $logins ) ) {
-		wp_redirect( wp_login_url() );
+	if (in_array(untrailingslashit($_SERVER['REQUEST_URI']), $logins)) {
+		wp_redirect(wp_login_url());
 		exit;
 	}
 }

src/wp-includes/customize/class-wp-customize-nav-menu-location-control.php

Spacing +7 added lines, -7 removed lines

@@ -56,28 +56,28 @@
 	 * @access public
 	 */
 	public function render_content() {
-		if ( empty( $this->choices ) ) {
+		if (empty($this->choices)) {
 			return;
 		}
 		?>
 		<label>
-			<?php if ( ! empty( $this->label ) ) : ?>
-			<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+			<?php if ( ! empty($this->label)) : ?>
+			<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 			<?php endif; ?>
 
-			<?php if ( ! empty( $this->description ) ) : ?>
+			<?php if ( ! empty($this->description)) : ?>
 			<span class="description customize-control-description"><?php echo $this->description; ?></span>
 			<?php endif; ?>
 
 			<select <?php $this->link(); ?>>
 				<?php
-				foreach ( $this->choices as $value => $label ) :
-					echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+				foreach ($this->choices as $value => $label) :
+					echo '<option value="'.esc_attr($value).'"'.selected($this->value(), $value, false).'>'.$label.'</option>';
 				endforeach;
 				?>
 			</select>
 		</label>
-		<button type="button" class="button-link edit-menu<?php if ( ! $this->value() ) { echo ' hidden'; } ?>" aria-label="<?php esc_attr_e( 'Edit selected menu' ); ?>"><?php _e( 'Edit Menu' ); ?></button>
+		<button type="button" class="button-link edit-menu<?php if ( ! $this->value()) { echo ' hidden'; } ?>" aria-label="<?php esc_attr_e('Edit selected menu'); ?>"><?php _e('Edit Menu'); ?></button>
 		<?php
 	}
 }

src/wp-includes/customize/class-wp-customize-nav-menu-section.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	 */
 	public function json() {
 		$exported = parent::json();
-		$exported['menu_id'] = intval( preg_replace( '/^nav_menu\[(-?\d+)\]/', '$1', $this->id ) );
+		$exported['menu_id'] = intval(preg_replace('/^nav_menu\[(-?\d+)\]/', '$1', $this->id));
 
 		return $exported;
 	}