ntwb / wordpress

src/wp-includes/template-loader.php

Braces +7 added lines, -3 removed lines

@@ -3,13 +3,14 @@ 
  * Loads the correct template based on the visitor's url
  * @package WordPress
  */
-if ( defined('WP_USE_THEMES') && WP_USE_THEMES )
+if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) {
 	/**
 	 * Fires before determining which template to load.
 	 *
 	 * @since 1.5.0
 	 */
 	do_action( 'template_redirect' );
+}
 
 /**
  * Filter whether to allow 'HEAD' requests to generate content.
@@ -21,8 +22,9 @@ 
  *
  * @param bool $exit Whether to exit without generating any content for 'HEAD' requests. Default true.
  */
-if ( 'HEAD' === $_SERVER['REQUEST_METHOD'] && apply_filters( 'exit_on_http_head', true ) )
+if ( 'HEAD' === $_SERVER['REQUEST_METHOD'] && apply_filters( 'exit_on_http_head', true ) ) {
 	exit();
+}
 
 // Process feeds and trackbacks even if not using themes.
 if ( is_robots() ) :
@@ -61,8 +63,10 @@ 
 	elseif ( is_date()           && $template = get_date_template()           ) :
 	elseif ( is_archive()        && $template = get_archive_template()        ) :
 	elseif ( is_paged()          && $template = get_paged_template()          ) :
-	else :
+	else {
+		:
 		$template = get_index_template();
+	}
 	endif;
 	/**
 	 * Filter the path of the current template before including it.

Spacing +30 added lines, -30 removed lines

@@ -3,13 +3,13 @@ 
  * Loads the correct template based on the visitor's url
  * @package WordPress
  */
-if ( defined('WP_USE_THEMES') && WP_USE_THEMES )
+if (defined('WP_USE_THEMES') && WP_USE_THEMES)
 	/**
 	 * Fires before determining which template to load.
 	 *
 	 * @since 1.5.0
 	 */
-	do_action( 'template_redirect' );
+	do_action('template_redirect');
 
 /**
  * Filters whether to allow 'HEAD' requests to generate content.
@@ -21,45 +21,45 @@ 
  *
  * @param bool $exit Whether to exit without generating any content for 'HEAD' requests. Default true.
  */
-if ( 'HEAD' === $_SERVER['REQUEST_METHOD'] && apply_filters( 'exit_on_http_head', true ) )
+if ('HEAD' === $_SERVER['REQUEST_METHOD'] && apply_filters('exit_on_http_head', true))
 	exit();
 
 // Process feeds and trackbacks even if not using themes.
-if ( is_robots() ) :
+if (is_robots()) :
 	/**
 	 * Fired when the template loader determines a robots.txt request.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'do_robots' );
+	do_action('do_robots');
 	return;
-elseif ( is_feed() ) :
+elseif (is_feed()) :
 	do_feed();
 	return;
-elseif ( is_trackback() ) :
-	include( ABSPATH . 'wp-trackback.php' );
+elseif (is_trackback()) :
+	include(ABSPATH.'wp-trackback.php');
 	return;
 endif;
 
-if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) :
+if (defined('WP_USE_THEMES') && WP_USE_THEMES) :
 	$template = false;
-	if     ( is_embed()          && $template = get_embed_template()          ) :
-	elseif ( is_404()            && $template = get_404_template()            ) :
-	elseif ( is_search()         && $template = get_search_template()         ) :
-	elseif ( is_front_page()     && $template = get_front_page_template()     ) :
-	elseif ( is_home()           && $template = get_home_template()           ) :
-	elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) :
-	elseif ( is_tax()            && $template = get_taxonomy_template()       ) :
-	elseif ( is_attachment()     && $template = get_attachment_template()     ) :
+	if (is_embed() && $template = get_embed_template()) :
+	elseif (is_404() && $template = get_404_template()) :
+	elseif (is_search() && $template = get_search_template()) :
+	elseif (is_front_page() && $template = get_front_page_template()) :
+	elseif (is_home() && $template = get_home_template()) :
+	elseif (is_post_type_archive() && $template = get_post_type_archive_template()) :
+	elseif (is_tax() && $template = get_taxonomy_template()) :
+	elseif (is_attachment() && $template = get_attachment_template()) :
 		remove_filter('the_content', 'prepend_attachment');
-	elseif ( is_single()         && $template = get_single_template()         ) :
-	elseif ( is_page()           && $template = get_page_template()           ) :
-	elseif ( is_singular()       && $template = get_singular_template()       ) :
-	elseif ( is_category()       && $template = get_category_template()       ) :
-	elseif ( is_tag()            && $template = get_tag_template()            ) :
-	elseif ( is_author()         && $template = get_author_template()         ) :
-	elseif ( is_date()           && $template = get_date_template()           ) :
-	elseif ( is_archive()        && $template = get_archive_template()        ) :
+	elseif (is_single() && $template = get_single_template()) :
+	elseif (is_page() && $template = get_page_template()) :
+	elseif (is_singular() && $template = get_singular_template()) :
+	elseif (is_category() && $template = get_category_template()) :
+	elseif (is_tag() && $template = get_tag_template()) :
+	elseif (is_author() && $template = get_author_template()) :
+	elseif (is_date() && $template = get_date_template()) :
+	elseif (is_archive() && $template = get_archive_template()) :
 	else :
 		$template = get_index_template();
 	endif;
@@ -70,12 +70,12 @@ 
 	 *
 	 * @param string $template The path of the template to include.
 	 */
-	if ( $template = apply_filters( 'template_include', $template ) ) {
-		include( $template );
-	} elseif ( current_user_can( 'switch_themes' ) ) {
+	if ($template = apply_filters('template_include', $template)) {
+		include($template);
+	} elseif (current_user_can('switch_themes')) {
 		$theme = wp_get_theme();
-		if ( $theme->errors() ) {
-			wp_die( $theme->errors() );
+		if ($theme->errors()) {
+			wp_die($theme->errors());
 		}
 	}
 	return;

src/wp-includes/media-template.php

Braces +18 added lines, -8 removed lines

@@ -139,8 +139,9 @@ 
 function wp_print_media_templates() {
 	global $is_IE;
 	$class = 'media-modal wp-core-ui';
-	if ( $is_IE && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false )
-		$class .= ' ie7';
+	if ( $is_IE && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false ) {
+			$class .= ' ie7';
+	}
 	?>
 	<!--[if lte IE 8]>
 	<style>
@@ -198,9 +199,12 @@ 
 			/** This action is documented in wp-admin/includes/media.php */
 			do_action( 'upload_ui_over_quota' ); ?>
 
-		<?php else : ?>
+		<?php else {
+	: ?>
 			<div class="upload-ui">
-				<h2 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h2>
+				<h2 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' );
+}
+?></h2>
 				<p class="upload-instructions drop-instructions"><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
 				<button type="button" class="browser button button-hero"><?php _e( 'Select Files' ); ?></button>
 			</div>
@@ -432,8 +436,11 @@ 
 						<# } else { #>
 							<button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
 						<# } #>
-					<?php else: ?>
-						<button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
+					<?php else {
+	: ?>
+						<button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' );
+}
+?></button>
 					<?php endif; ?>
 				<# } #>
 			</div>
@@ -533,8 +540,11 @@ 
 					<# } else { #>
 						<button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
 					<# } #>
-					<?php else: ?>
-						<button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
+					<?php else {
+	: ?>
+						<button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' );
+}
+?></button>
 					<?php endif; ?>
 				<# } #>
 

Spacing +192 added lines, -192 removed lines

@@ -22,7 +22,7 @@ 
 	width="{{ _.isUndefined( data.model.width ) ? 400 : data.model.width }}"
 	preload="{{ _.isUndefined( data.model.preload ) ? 'none' : data.model.preload }}"
 	<#
-	<?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
+	<?php foreach (array('autoplay', 'loop') as $attr):
 	?>if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
 		#> <?php echo $attr ?><#
 	}
@@ -32,7 +32,7 @@ 
 	<source src="{{ data.model.src }}" type="{{ wp.media.view.settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
 	<# } #>
 
-	<?php foreach ( $audio_types as $type ):
+	<?php foreach ($audio_types as $type):
 	?><# if ( ! _.isEmpty( data.model.<?php echo $type ?> ) ) { #>
 	<source src="{{ data.model.<?php echo $type ?> }}" type="{{ wp.media.view.settings.embedMimes[ '<?php echo $type ?>' ] }}" />
 	<# } #>
@@ -90,9 +90,9 @@ 
 	<# if ( w ) { #>width="{{ w }}"<# } #>
 	<# if ( h ) { #>height="{{ h }}"<# } #>
 	<?php
-	$props = array( 'poster' => '', 'preload' => 'metadata' );
-	foreach ( $props as $key => $value ):
-		if ( empty( $value ) ) {
+	$props = array('poster' => '', 'preload' => 'metadata');
+	foreach ($props as $key => $value):
+		if (empty($value)) {
 		?><#
 		if ( ! _.isUndefined( data.model.<?php echo $key ?> ) && data.model.<?php echo $key ?> ) {
 			#> <?php echo $key ?>="{{ data.model.<?php echo $key ?> }}"<#
@@ -102,7 +102,7 @@ 
 		}
 	endforeach;
 	?><#
-	<?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
+	<?php foreach (array('autoplay', 'loop') as $attr):
 	?> if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
 		#> <?php echo $attr ?><#
 	}
@@ -118,7 +118,7 @@ 
 		<# }
 	} #>
 
-	<?php foreach ( $video_types as $type ):
+	<?php foreach ($video_types as $type):
 	?><# if ( data.model.<?php echo $type ?> ) { #>
 	<source src="{{ data.model.<?php echo $type ?> }}" type="{{ settings.embedMimes[ '<?php echo $type ?>' ] }}" />
 	<# } #>
@@ -139,7 +139,7 @@ 
 function wp_print_media_templates() {
 	global $is_IE;
 	$class = 'media-modal wp-core-ui';
-	if ( $is_IE && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false )
+	if ($is_IE && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false)
 		$class .= ' ie7';
 	?>
 	<!--[if lte IE 8]>
@@ -163,7 +163,7 @@ 
 
 	<script type="text/html" id="tmpl-media-modal">
 		<div class="<?php echo $class; ?>">
-			<button type="button" class="button-link media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e( 'Close media panel' ); ?></span></span></button>
+			<button type="button" class="button-link media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e('Close media panel'); ?></span></span></button>
 			<div class="media-modal-content"></div>
 		</div>
 		<div class="media-modal-backdrop"></div>
@@ -171,38 +171,38 @@ 
 
 	<script type="text/html" id="tmpl-uploader-window">
 		<div class="uploader-window-content">
-			<h1><?php _e( 'Drop files to upload' ); ?></h1>
+			<h1><?php _e('Drop files to upload'); ?></h1>
 		</div>
 	</script>
 
 	<script type="text/html" id="tmpl-uploader-editor">
 		<div class="uploader-editor-content">
-			<div class="uploader-editor-title"><?php _e( 'Drop files to upload' ); ?></div>
+			<div class="uploader-editor-title"><?php _e('Drop files to upload'); ?></div>
 		</div>
 	</script>
 
 	<script type="text/html" id="tmpl-uploader-inline">
 		<# var messageClass = data.message ? 'has-upload-message' : 'no-upload-message'; #>
 		<# if ( data.canClose ) { #>
-		<button class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close uploader' ); ?></span></button>
+		<button class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Close uploader'); ?></span></button>
 		<# } #>
 		<div class="uploader-inline-content {{ messageClass }}">
 		<# if ( data.message ) { #>
 			<h2 class="upload-message">{{ data.message }}</h2>
 		<# } #>
-		<?php if ( ! _device_can_upload() ) : ?>
-			<h2 class="upload-instructions"><?php printf( __( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ), 'https://apps.wordpress.org/' ); ?></h2>
-		<?php elseif ( is_multisite() && ! is_upload_space_available() ) : ?>
-			<h2 class="upload-instructions"><?php _e( 'Upload Limit Exceeded' ); ?></h2>
+		<?php if ( ! _device_can_upload()) : ?>
+			<h2 class="upload-instructions"><?php printf(__('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'https://apps.wordpress.org/'); ?></h2>
+		<?php elseif (is_multisite() && ! is_upload_space_available()) : ?>
+			<h2 class="upload-instructions"><?php _e('Upload Limit Exceeded'); ?></h2>
 			<?php
 			/** This action is documented in wp-admin/includes/media.php */
-			do_action( 'upload_ui_over_quota' ); ?>
+			do_action('upload_ui_over_quota'); ?>
 
 		<?php else : ?>
 			<div class="upload-ui">
-				<h2 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h2>
-				<p class="upload-instructions drop-instructions"><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
-				<button type="button" class="browser button button-hero"><?php _e( 'Select Files' ); ?></button>
+				<h2 class="upload-instructions drop-instructions"><?php _e('Drop files anywhere to upload'); ?></h2>
+				<p class="upload-instructions drop-instructions"><?php _ex('or', 'Uploader: Drop files here - or - Select Files'); ?></p>
+				<button type="button" class="browser button button-hero"><?php _e('Select Files'); ?></button>
 			</div>
 
 			<div class="upload-inline-status"></div>
@@ -210,55 +210,55 @@ 
 			<div class="post-upload-ui">
 				<?php
 				/** This action is documented in wp-admin/includes/media.php */
-				do_action( 'pre-upload-ui' );
+				do_action('pre-upload-ui');
 				/** This action is documented in wp-admin/includes/media.php */
-				do_action( 'pre-plupload-upload-ui' );
+				do_action('pre-plupload-upload-ui');
 
-				if ( 10 === remove_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' ) ) {
+				if (10 === remove_action('post-plupload-upload-ui', 'media_upload_flash_bypass')) {
 					/** This action is documented in wp-admin/includes/media.php */
-					do_action( 'post-plupload-upload-ui' );
-					add_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' );
+					do_action('post-plupload-upload-ui');
+					add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
 				} else {
 					/** This action is documented in wp-admin/includes/media.php */
-					do_action( 'post-plupload-upload-ui' );
+					do_action('post-plupload-upload-ui');
 				}
 
 				$max_upload_size = wp_max_upload_size();
-				if ( ! $max_upload_size ) {
+				if ( ! $max_upload_size) {
 					$max_upload_size = 0;
 				}
 				?>
 
 				<p class="max-upload-size"><?php
-					printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) );
+					printf(__('Maximum upload file size: %s.'), esc_html(size_format($max_upload_size)));
 				?></p>
 
 				<# if ( data.suggestedWidth && data.suggestedHeight ) { #>
 					<p class="suggested-dimensions">
-						<?php _e( 'Suggested image dimensions:' ); ?> {{data.suggestedWidth}} &times; {{data.suggestedHeight}}
+						<?php _e('Suggested image dimensions:'); ?> {{data.suggestedWidth}} &times; {{data.suggestedHeight}}
 					</p>
 				<# } #>
 
 				<?php
 				/** This action is documented in wp-admin/includes/media.php */
-				do_action( 'post-upload-ui' ); ?>
+				do_action('post-upload-ui'); ?>
 			</div>
 		<?php endif; ?>
 		</div>
 	</script>
 
 	<script type="text/html" id="tmpl-media-library-view-switcher">
-		<a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?>" class="view-list">
-			<span class="screen-reader-text"><?php _e( 'List View' ); ?></span>
+		<a href="<?php echo esc_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>" class="view-list">
+			<span class="screen-reader-text"><?php _e('List View'); ?></span>
 		</a>
-		<a href="<?php echo esc_url( add_query_arg( 'mode', 'grid', $_SERVER['REQUEST_URI'] ) ) ?>" class="view-grid current">
-			<span class="screen-reader-text"><?php _e( 'Grid View' ); ?></span>
+		<a href="<?php echo esc_url(add_query_arg('mode', 'grid', $_SERVER['REQUEST_URI'])) ?>" class="view-grid current">
+			<span class="screen-reader-text"><?php _e('Grid View'); ?></span>
 		</a>
 	</script>
 
 	<script type="text/html" id="tmpl-uploader-status">
-		<h2><?php _e( 'Uploading' ); ?></h2>
-		<button type="button" class="button-link upload-dismiss-errors"><span class="screen-reader-text"><?php _e( 'Dismiss Errors' ); ?></span></button>
+		<h2><?php _e('Uploading'); ?></h2>
+		<button type="button" class="button-link upload-dismiss-errors"><span class="screen-reader-text"><?php _e('Dismiss Errors'); ?></span></button>
 
 		<div class="media-progress-bar"><div></div></div>
 		<div class="upload-details">
@@ -278,8 +278,8 @@ 
 
 	<script type="text/html" id="tmpl-edit-attachment-frame">
 		<div class="edit-media-header">
-			<button class="left dashicons <# if ( ! data.hasPrevious ) { #> disabled <# } #>"><span class="screen-reader-text"><?php _e( 'Edit previous media item' ); ?></span></button>
-			<button class="right dashicons <# if ( ! data.hasNext ) { #> disabled <# } #>"><span class="screen-reader-text"><?php _e( 'Edit next media item' ); ?></span></button>
+			<button class="left dashicons <# if ( ! data.hasPrevious ) { #> disabled <# } #>"><span class="screen-reader-text"><?php _e('Edit previous media item'); ?></span></button>
+			<button class="right dashicons <# if ( ! data.hasNext ) { #> disabled <# } #>"><span class="screen-reader-text"><?php _e('Edit next media item'); ?></span></button>
 		</div>
 		<div class="media-frame-title"></div>
 		<div class="media-frame-content"></div>
@@ -324,9 +324,9 @@ 
 
 				<div class="attachment-actions">
 					<# if ( 'image' === data.type && ! data.uploading && data.sizes && data.can.save ) { #>
-					<button type="button" class="button edit-attachment"><?php _e( 'Edit Image' ); ?></button>
+					<button type="button" class="button edit-attachment"><?php _e('Edit Image'); ?></button>
 					<# } else if ( 'pdf' === data.subtype && data.sizes ) { #>
-					<?php _e( 'Document Preview' ); ?>
+					<?php _e('Document Preview'); ?>
 					<# } #>
 				</div>
 			</div>
@@ -337,24 +337,24 @@ 
 				<span class="saved"><?php esc_html_e('Saved.'); ?></span>
 			</span>
 			<div class="details">
-				<div class="filename"><strong><?php _e( 'File name:' ); ?></strong> {{ data.filename }}</div>
-				<div class="filename"><strong><?php _e( 'File type:' ); ?></strong> {{ data.mime }}</div>
-				<div class="uploaded"><strong><?php _e( 'Uploaded on:' ); ?></strong> {{ data.dateFormatted }}</div>
+				<div class="filename"><strong><?php _e('File name:'); ?></strong> {{ data.filename }}</div>
+				<div class="filename"><strong><?php _e('File type:'); ?></strong> {{ data.mime }}</div>
+				<div class="uploaded"><strong><?php _e('Uploaded on:'); ?></strong> {{ data.dateFormatted }}</div>
 
-				<div class="file-size"><strong><?php _e( 'File size:' ); ?></strong> {{ data.filesizeHumanReadable }}</div>
+				<div class="file-size"><strong><?php _e('File size:'); ?></strong> {{ data.filesizeHumanReadable }}</div>
 				<# if ( 'image' === data.type && ! data.uploading ) { #>
 					<# if ( data.width && data.height ) { #>
-						<div class="dimensions"><strong><?php _e( 'Dimensions:' ); ?></strong> {{ data.width }} &times; {{ data.height }}</div>
+						<div class="dimensions"><strong><?php _e('Dimensions:'); ?></strong> {{ data.width }} &times; {{ data.height }}</div>
 					<# } #>
 				<# } #>
 
 				<# if ( data.fileLength ) { #>
-					<div class="file-length"><strong><?php _e( 'Length:' ); ?></strong> {{ data.fileLength }}</div>
+					<div class="file-length"><strong><?php _e('Length:'); ?></strong> {{ data.fileLength }}</div>
 				<# } #>
 
 				<# if ( 'audio' === data.type && data.meta.bitrate ) { #>
 					<div class="bitrate">
-						<strong><?php _e( 'Bitrate:' ); ?></strong> {{ Math.round( data.meta.bitrate / 1000 ) }}kb/s
+						<strong><?php _e('Bitrate:'); ?></strong> {{ Math.round( data.meta.bitrate / 1000 ) }}kb/s
 						<# if ( data.meta.bitrate_mode ) { #>
 						{{ ' ' + data.meta.bitrate_mode.toUpperCase() }}
 						<# } #>
@@ -374,30 +374,30 @@ 
 					<input type="text" value="{{ data.url }}" readonly />
 				</label>
 				<# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #>
-				<?php if ( post_type_supports( 'attachment', 'title' ) ) : ?>
+				<?php if (post_type_supports('attachment', 'title')) : ?>
 				<label class="setting" data-setting="title">
 					<span class="name"><?php _e('Title'); ?></span>
 					<input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
 				</label>
 				<?php endif; ?>
 				<# if ( 'audio' === data.type ) { #>
-				<?php foreach ( array(
-					'artist' => __( 'Artist' ),
-					'album' => __( 'Album' ),
-				) as $key => $label ) : ?>
-				<label class="setting" data-setting="<?php echo esc_attr( $key ) ?>">
+				<?php foreach (array(
+					'artist' => __('Artist'),
+					'album' => __('Album'),
+				) as $key => $label) : ?>
+				<label class="setting" data-setting="<?php echo esc_attr($key) ?>">
 					<span class="name"><?php echo $label ?></span>
 					<input type="text" value="{{ data.<?php echo $key ?> || data.meta.<?php echo $key ?> || '' }}" />
 				</label>
 				<?php endforeach; ?>
 				<# } #>
 				<label class="setting" data-setting="caption">
-					<span class="name"><?php _e( 'Caption' ); ?></span>
+					<span class="name"><?php _e('Caption'); ?></span>
 					<textarea {{ maybeReadOnly }}>{{ data.caption }}</textarea>
 				</label>
 				<# if ( 'image' === data.type ) { #>
 					<label class="setting" data-setting="alt">
-						<span class="name"><?php _e( 'Alt Text' ); ?></span>
+						<span class="name"><?php _e('Alt Text'); ?></span>
 						<input type="text" value="{{ data.alt }}" {{ maybeReadOnly }} />
 					</label>
 				<# } #>
@@ -406,12 +406,12 @@ 
 					<textarea {{ maybeReadOnly }}>{{ data.description }}</textarea>
 				</label>
 				<label class="setting">
-					<span class="name"><?php _e( 'Uploaded By' ); ?></span>
+					<span class="name"><?php _e('Uploaded By'); ?></span>
 					<span class="value">{{ data.authorName }}</span>
 				</label>
 				<# if ( data.uploadedToTitle ) { #>
 					<label class="setting">
-						<span class="name"><?php _e( 'Uploaded To' ); ?></span>
+						<span class="name"><?php _e('Uploaded To'); ?></span>
 						<# if ( data.uploadedToLink ) { #>
 							<span class="value"><a href="{{ data.uploadedToLink }}">{{ data.uploadedToTitle }}</a></span>
 						<# } else { #>
@@ -423,19 +423,19 @@ 
 			</div>
 
 			<div class="actions">
-				<a class="view-attachment" href="{{ data.link }}"><?php _e( 'View attachment page' ); ?></a>
+				<a class="view-attachment" href="{{ data.link }}"><?php _e('View attachment page'); ?></a>
 				<# if ( data.can.save ) { #> |
-					<a href="post.php?post={{ data.id }}&action=edit"><?php _e( 'Edit more details' ); ?></a>
+					<a href="post.php?post={{ data.id }}&action=edit"><?php _e('Edit more details'); ?></a>
 				<# } #>
 				<# if ( ! data.uploading && data.can.remove ) { #> |
-					<?php if ( MEDIA_TRASH ): ?>
+					<?php if (MEDIA_TRASH): ?>
 						<# if ( 'trash' === data.status ) { #>
-							<button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button>
+							<button type="button" class="button-link untrash-attachment"><?php _e('Untrash'); ?></button>
 						<# } else { #>
-							<button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
+							<button type="button" class="button-link trash-attachment"><?php _ex('Trash', 'verb'); ?></button>
 						<# } #>
 					<?php else: ?>
-						<button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
+						<button type="button" class="button-link delete-attachment"><?php _e('Delete Permanently'); ?></button>
 					<?php endif; ?>
 				<# } #>
 			</div>
@@ -468,11 +468,11 @@ 
 				<# } #>
 			</div>
 			<# if ( data.buttons.close ) { #>
-				<button type="button" class="button-link attachment-close media-modal-icon"><span class="screen-reader-text"><?php _e( 'Remove' ); ?></span></button>
+				<button type="button" class="button-link attachment-close media-modal-icon"><span class="screen-reader-text"><?php _e('Remove'); ?></span></button>
 			<# } #>
 		</div>
 		<# if ( data.buttons.check ) { #>
-			<button type="button" class="button-link check" tabindex="-1"><span class="media-modal-icon"></span><span class="screen-reader-text"><?php _e( 'Deselect' ); ?></span></button>
+			<button type="button" class="button-link check" tabindex="-1"><span class="media-modal-icon"></span><span class="screen-reader-text"><?php _e('Deselect'); ?></span></button>
 		<# } #>
 		<#
 		var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly';
@@ -495,7 +495,7 @@ 
 
 	<script type="text/html" id="tmpl-attachment-details">
 		<h2>
-			<?php _e( 'Attachment Details' ); ?>
+			<?php _e('Attachment Details'); ?>
 			<span class="settings-save-status">
 				<span class="spinner"></span>
 				<span class="saved"><?php esc_html_e('Saved.'); ?></span>
@@ -522,23 +522,23 @@ 
 					<# } #>
 
 					<# if ( data.can.save && data.sizes ) { #>
-						<a class="edit-attachment" href="{{ data.editLink }}&amp;image-editor" target="_blank"><?php _e( 'Edit Image' ); ?></a>
+						<a class="edit-attachment" href="{{ data.editLink }}&amp;image-editor" target="_blank"><?php _e('Edit Image'); ?></a>
 					<# } #>
 				<# } #>
 
 				<# if ( data.fileLength ) { #>
-					<div class="file-length"><?php _e( 'Length:' ); ?> {{ data.fileLength }}</div>
+					<div class="file-length"><?php _e('Length:'); ?> {{ data.fileLength }}</div>
 				<# } #>
 
 				<# if ( ! data.uploading && data.can.remove ) { #>
-					<?php if ( MEDIA_TRASH ): ?>
+					<?php if (MEDIA_TRASH): ?>
 					<# if ( 'trash' === data.status ) { #>
-						<button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button>
+						<button type="button" class="button-link untrash-attachment"><?php _e('Untrash'); ?></button>
 					<# } else { #>
-						<button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
+						<button type="button" class="button-link trash-attachment"><?php _ex('Trash', 'verb'); ?></button>
 					<# } #>
 					<?php else: ?>
-						<button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
+						<button type="button" class="button-link delete-attachment"><?php _e('Delete Permanently'); ?></button>
 					<?php endif; ?>
 				<# } #>
 
@@ -555,18 +555,18 @@ 
 			<input type="text" value="{{ data.url }}" readonly />
 		</label>
 		<# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #>
-		<?php if ( post_type_supports( 'attachment', 'title' ) ) : ?>
+		<?php if (post_type_supports('attachment', 'title')) : ?>
 		<label class="setting" data-setting="title">
 			<span class="name"><?php _e('Title'); ?></span>
 			<input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
 		</label>
 		<?php endif; ?>
 		<# if ( 'audio' === data.type ) { #>
-		<?php foreach ( array(
-			'artist' => __( 'Artist' ),
-			'album' => __( 'Album' ),
-		) as $key => $label ) : ?>
-		<label class="setting" data-setting="<?php echo esc_attr( $key ) ?>">
+		<?php foreach (array(
+			'artist' => __('Artist'),
+			'album' => __('Album'),
+		) as $key => $label) : ?>
+		<label class="setting" data-setting="<?php echo esc_attr($key) ?>">
 			<span class="name"><?php echo $label ?></span>
 			<input type="text" value="{{ data.<?php echo $key ?> || data.meta.<?php echo $key ?> || '' }}" />
 		</label>
@@ -592,17 +592,17 @@ 
 		<div class="selection-info">
 			<span class="count"></span>
 			<# if ( data.editable ) { #>
-				<button type="button" class="button-link edit-selection"><?php _e( 'Edit Selection' ); ?></button>
+				<button type="button" class="button-link edit-selection"><?php _e('Edit Selection'); ?></button>
 			<# } #>
 			<# if ( data.clearable ) { #>
-				<button type="button" class="button-link clear-selection"><?php _e( 'Clear' ); ?></button>
+				<button type="button" class="button-link clear-selection"><?php _e('Clear'); ?></button>
 			<# } #>
 		</div>
 		<div class="selection-view"></div>
 	</script>
 
 	<script type="text/html" id="tmpl-attachment-display-settings">
-		<h2><?php _e( 'Attachment Display Settings' ); ?></h2>
+		<h2><?php _e('Attachment Display Settings'); ?></h2>
 
 		<# if ( 'image' === data.type ) { #>
 			<label class="setting">
@@ -614,16 +614,16 @@ 
 					<# } #>>
 
 					<option value="left">
-						<?php esc_html_e( 'Left' ); ?>
+						<?php esc_html_e('Left'); ?>
 					</option>
 					<option value="center">
-						<?php esc_html_e( 'Center' ); ?>
+						<?php esc_html_e('Center'); ?>
 					</option>
 					<option value="right">
-						<?php esc_html_e( 'Right' ); ?>
+						<?php esc_html_e('Right'); ?>
 					</option>
 					<option value="none" selected>
-						<?php esc_html_e( 'None' ); ?>
+						<?php esc_html_e('None'); ?>
 					</option>
 				</select>
 			</label>
@@ -645,31 +645,31 @@ 
 
 				<# if ( data.model.canEmbed ) { #>
 					<option value="embed" selected>
-						<?php esc_html_e( 'Embed Media Player' ); ?>
+						<?php esc_html_e('Embed Media Player'); ?>
 					</option>
 					<option value="file">
 				<# } else { #>
 					<option value="none" selected>
-						<?php esc_html_e( 'None' ); ?>
+						<?php esc_html_e('None'); ?>
 					</option>
 					<option value="file">
 				<# } #>
 					<# if ( data.model.canEmbed ) { #>
-						<?php esc_html_e( 'Link to Media File' ); ?>
+						<?php esc_html_e('Link to Media File'); ?>
 					<# } else { #>
-						<?php esc_html_e( 'Media File' ); ?>
+						<?php esc_html_e('Media File'); ?>
 					<# } #>
 					</option>
 					<option value="post">
 					<# if ( data.model.canEmbed ) { #>
-						<?php esc_html_e( 'Link to Attachment Page' ); ?>
+						<?php esc_html_e('Link to Attachment Page'); ?>
 					<# } else { #>
-						<?php esc_html_e( 'Attachment Page' ); ?>
+						<?php esc_html_e('Attachment Page'); ?>
 					<# } #>
 					</option>
 				<# if ( 'image' === data.type ) { #>
 					<option value="custom">
-						<?php esc_html_e( 'Custom URL' ); ?>
+						<?php esc_html_e('Custom URL'); ?>
 					</option>
 				<# } #>
 				</select>
@@ -687,19 +687,19 @@ 
 					<# } #>>
 					<?php
 					/** This filter is documented in wp-admin/includes/media.php */
-					$sizes = apply_filters( 'image_size_names_choose', array(
+					$sizes = apply_filters('image_size_names_choose', array(
 						'thumbnail' => __('Thumbnail'),
 						'medium'    => __('Medium'),
 						'large'     => __('Large'),
 						'full'      => __('Full Size'),
-					) );
+					));
 
-					foreach ( $sizes as $value => $name ) : ?>
+					foreach ($sizes as $value => $name) : ?>
 						<#
-						var size = data.sizes['<?php echo esc_js( $value ); ?>'];
+						var size = data.sizes['<?php echo esc_js($value); ?>'];
 						if ( size ) { #>
-							<option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, 'full' ); ?>>
-								<?php echo esc_html( $name ); ?> &ndash; {{ size.width }} &times; {{ size.height }}
+							<option value="<?php echo esc_attr($value); ?>" <?php selected($value, 'full'); ?>>
+								<?php echo esc_html($name); ?> &ndash; {{ size.width }} &times; {{ size.height }}
 							</option>
 						<# } #>
 					<?php endforeach; ?>
@@ -709,7 +709,7 @@ 
 	</script>
 
 	<script type="text/html" id="tmpl-gallery-settings">
-		<h2><?php _e( 'Gallery Settings' ); ?></h2>
+		<h2><?php _e('Gallery Settings'); ?></h2>
 
 		<label class="setting">
 			<span><?php _e('Link To'); ?></span>
@@ -722,13 +722,13 @@ 
 				<option value="post" <# if ( ! wp.media.galleryDefaults.link || 'post' == wp.media.galleryDefaults.link ) {
 					#>selected="selected"<# }
 				#>>
-					<?php esc_html_e( 'Attachment Page' ); ?>
+					<?php esc_html_e('Attachment Page'); ?>
 				</option>
 				<option value="file" <# if ( 'file' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
-					<?php esc_html_e( 'Media File' ); ?>
+					<?php esc_html_e('Media File'); ?>
 				</option>
 				<option value="none" <# if ( 'none' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
-					<?php esc_html_e( 'None' ); ?>
+					<?php esc_html_e('None'); ?>
 				</option>
 			</select>
 		</label>
@@ -737,23 +737,23 @@ 
 			<span><?php _e('Columns'); ?></span>
 			<select class="columns" name="columns"
 				data-setting="columns">
-				<?php for ( $i = 1; $i <= 9; $i++ ) : ?>
-					<option value="<?php echo esc_attr( $i ); ?>" <#
+				<?php for ($i = 1; $i <= 9; $i++) : ?>
+					<option value="<?php echo esc_attr($i); ?>" <#
 						if ( <?php echo $i ?> == wp.media.galleryDefaults.columns ) { #>selected="selected"<# }
 					#>>
-						<?php echo esc_html( $i ); ?>
+						<?php echo esc_html($i); ?>
 					</option>
 				<?php endfor; ?>
 			</select>
 		</label>
 
 		<label class="setting">
-			<span><?php _e( 'Random Order' ); ?></span>
+			<span><?php _e('Random Order'); ?></span>
 			<input type="checkbox" data-setting="_orderbyRandom" />
 		</label>
 
 		<label class="setting size">
-			<span><?php _e( 'Size' ); ?></span>
+			<span><?php _e('Size'); ?></span>
 			<select class="size" name="size"
 				data-setting="size"
 				<# if ( data.userSettings ) { #>
@@ -762,16 +762,16 @@ 
 				>
 				<?php
 				/** This filter is documented in wp-admin/includes/media.php */
-				$size_names = apply_filters( 'image_size_names_choose', array(
-					'thumbnail' => __( 'Thumbnail' ),
-					'medium'    => __( 'Medium' ),
-					'large'     => __( 'Large' ),
-					'full'      => __( 'Full Size' ),
-				) );
-
-				foreach ( $size_names as $size => $label ) : ?>
-					<option value="<?php echo esc_attr( $size ); ?>">
-						<?php echo esc_html( $label ); ?>
+				$size_names = apply_filters('image_size_names_choose', array(
+					'thumbnail' => __('Thumbnail'),
+					'medium'    => __('Medium'),
+					'large'     => __('Large'),
+					'full'      => __('Full Size'),
+				));
+
+				foreach ($size_names as $size => $label) : ?>
+					<option value="<?php echo esc_attr($size); ?>">
+						<?php echo esc_html($label); ?>
 					</option>
 				<?php endforeach; ?>
 			</select>
@@ -779,7 +779,7 @@ 
 	</script>
 
 	<script type="text/html" id="tmpl-playlist-settings">
-		<h2><?php _e( 'Playlist Settings' ); ?></h2>
+		<h2><?php _e('Playlist Settings'); ?></h2>
 
 		<# var emptyModel = _.isEmpty( data.model ),
 			isVideo = 'video' === data.controller.get('library').props.get('type'); #>
@@ -789,9 +789,9 @@ 
 				checked="checked"
 			<# } #> />
 			<# if ( isVideo ) { #>
-			<span><?php _e( 'Show Video List' ); ?></span>
+			<span><?php _e('Show Video List'); ?></span>
 			<# } else { #>
-			<span><?php _e( 'Show Tracklist' ); ?></span>
+			<span><?php _e('Show Tracklist'); ?></span>
 			<# } #>
 		</label>
 
@@ -800,7 +800,7 @@ 
 			<input type="checkbox" data-setting="artists" <# if ( emptyModel ) { #>
 				checked="checked"
 			<# } #> />
-			<span><?php _e( 'Show Artist Name in Tracklist' ); ?></span>
+			<span><?php _e('Show Artist Name in Tracklist'); ?></span>
 		</label>
 		<# } #>
 
@@ -808,13 +808,13 @@ 
 			<input type="checkbox" data-setting="images" <# if ( emptyModel ) { #>
 				checked="checked"
 			<# } #> />
-			<span><?php _e( 'Show Images' ); ?></span>
+			<span><?php _e('Show Images'); ?></span>
 		</label>
 	</script>
 
 	<script type="text/html" id="tmpl-embed-link-settings">
 		<label class="setting link-text">
-			<span><?php _e( 'Link Text' ); ?></span>
+			<span><?php _e('Link Text'); ?></span>
 			<input type="text" class="alignment" data-setting="linkText" />
 		</label>
 		<div class="embed-container" style="display: none;">
@@ -829,7 +829,7 @@ 
 
 		<?php
 		/** This filter is documented in wp-admin/includes/media.php */
-		if ( ! apply_filters( 'disable_captions', '' ) ) : ?>
+		if ( ! apply_filters('disable_captions', '')) : ?>
 			<label class="setting caption">
 				<span><?php _e('Caption'); ?></span>
 				<textarea data-setting="caption" />
@@ -845,16 +845,16 @@ 
 			<span><?php _e('Align'); ?></span>
 			<div class="button-group button-large" data-setting="align">
 				<button class="button" value="left">
-					<?php esc_html_e( 'Left' ); ?>
+					<?php esc_html_e('Left'); ?>
 				</button>
 				<button class="button" value="center">
-					<?php esc_html_e( 'Center' ); ?>
+					<?php esc_html_e('Center'); ?>
 				</button>
 				<button class="button" value="right">
-					<?php esc_html_e( 'Right' ); ?>
+					<?php esc_html_e('Right'); ?>
 				</button>
 				<button class="button active" value="none">
-					<?php esc_html_e( 'None' ); ?>
+					<?php esc_html_e('None'); ?>
 				</button>
 			</div>
 		</div>
@@ -863,13 +863,13 @@ 
 			<span><?php _e('Link To'); ?></span>
 			<div class="button-group button-large" data-setting="link">
 				<button class="button" value="file">
-					<?php esc_html_e( 'Image URL' ); ?>
+					<?php esc_html_e('Image URL'); ?>
 				</button>
 				<button class="button" value="custom">
-					<?php esc_html_e( 'Custom URL' ); ?>
+					<?php esc_html_e('Custom URL'); ?>
 				</button>
 				<button class="button active" value="none">
-					<?php esc_html_e( 'None' ); ?>
+					<?php esc_html_e('None'); ?>
 				</button>
 			</div>
 			<input type="text" class="link-to-custom" data-setting="linkUrl" />
@@ -885,8 +885,8 @@ 
 
 						<# if ( data.attachment && window.imageEdit ) { #>
 							<div class="actions">
-								<input type="button" class="edit-attachment button" value="<?php esc_attr_e( 'Edit Original' ); ?>" />
-								<input type="button" class="replace-attachment button" value="<?php esc_attr_e( 'Replace' ); ?>" />
+								<input type="button" class="edit-attachment button" value="<?php esc_attr_e('Edit Original'); ?>" />
+								<input type="button" class="replace-attachment button" value="<?php esc_attr_e('Replace'); ?>" />
 							</div>
 						<# } #>
 					</div>
@@ -894,7 +894,7 @@ 
 				<div class="column-settings">
 					<?php
 					/** This filter is documented in wp-admin/includes/media.php */
-					if ( ! apply_filters( 'disable_captions', '' ) ) : ?>
+					if ( ! apply_filters('disable_captions', '')) : ?>
 						<label class="setting caption">
 							<span><?php _e('Caption'); ?></span>
 							<textarea data-setting="caption">{{ data.model.caption }}</textarea>
@@ -906,21 +906,21 @@ 
 						<input type="text" data-setting="alt" value="{{ data.model.alt }}" />
 					</label>
 
-					<h2><?php _e( 'Display Settings' ); ?></h2>
+					<h2><?php _e('Display Settings'); ?></h2>
 					<div class="setting align">
 						<span><?php _e('Align'); ?></span>
 						<div class="button-group button-large" data-setting="align">
 							<button class="button" value="left">
-								<?php esc_html_e( 'Left' ); ?>
+								<?php esc_html_e('Left'); ?>
 							</button>
 							<button class="button" value="center">
-								<?php esc_html_e( 'Center' ); ?>
+								<?php esc_html_e('Center'); ?>
 							</button>
 							<button class="button" value="right">
-								<?php esc_html_e( 'Right' ); ?>
+								<?php esc_html_e('Right'); ?>
 							</button>
 							<button class="button active" value="none">
-								<?php esc_html_e( 'None' ); ?>
+								<?php esc_html_e('None'); ?>
 							</button>
 						</div>
 					</div>
@@ -936,30 +936,30 @@ 
 									<# } #>>
 									<?php
 									/** This filter is documented in wp-admin/includes/media.php */
-									$sizes = apply_filters( 'image_size_names_choose', array(
+									$sizes = apply_filters('image_size_names_choose', array(
 										'thumbnail' => __('Thumbnail'),
 										'medium'    => __('Medium'),
 										'large'     => __('Large'),
 										'full'      => __('Full Size'),
-									) );
+									));
 
-									foreach ( $sizes as $value => $name ) : ?>
+									foreach ($sizes as $value => $name) : ?>
 										<#
-										var size = data.sizes['<?php echo esc_js( $value ); ?>'];
+										var size = data.sizes['<?php echo esc_js($value); ?>'];
 										if ( size ) { #>
-											<option value="<?php echo esc_attr( $value ); ?>">
-												<?php echo esc_html( $name ); ?> &ndash; {{ size.width }} &times; {{ size.height }}
+											<option value="<?php echo esc_attr($value); ?>">
+												<?php echo esc_html($name); ?> &ndash; {{ size.width }} &times; {{ size.height }}
 											</option>
 										<# } #>
 									<?php endforeach; ?>
-									<option value="<?php echo esc_attr( 'custom' ); ?>">
-										<?php _e( 'Custom Size' ); ?>
+									<option value="<?php echo esc_attr('custom'); ?>">
+										<?php _e('Custom Size'); ?>
 									</option>
 								</select>
 							</label>
 						<# } #>
 							<div class="custom-size<# if ( data.model.size !== 'custom' ) { #> hidden<# } #>">
-								<label><span><?php _e( 'Width' ); ?> <small>(px)</small></span> <input data-setting="customWidth" type="number" step="1" value="{{ data.model.customWidth }}" /></label><span class="sep">&times;</span><label><span><?php _e( 'Height' ); ?> <small>(px)</small></span><input data-setting="customHeight" type="number" step="1" value="{{ data.model.customHeight }}" /></label>
+								<label><span><?php _e('Width'); ?> <small>(px)</small></span> <input data-setting="customWidth" type="number" step="1" value="{{ data.model.customWidth }}" /></label><span class="sep">&times;</span><label><span><?php _e('Height'); ?> <small>(px)</small></span><input data-setting="customHeight" type="number" step="1" value="{{ data.model.customHeight }}" /></label>
 							</div>
 					<# } #>
 
@@ -968,27 +968,27 @@ 
 						<select data-setting="link">
 						<# if ( data.attachment ) { #>
 							<option value="file">
-								<?php esc_html_e( 'Media File' ); ?>
+								<?php esc_html_e('Media File'); ?>
 							</option>
 							<option value="post">
-								<?php esc_html_e( 'Attachment Page' ); ?>
+								<?php esc_html_e('Attachment Page'); ?>
 							</option>
 						<# } else { #>
 							<option value="file">
-								<?php esc_html_e( 'Image URL' ); ?>
+								<?php esc_html_e('Image URL'); ?>
 							</option>
 						<# } #>
 							<option value="custom">
-								<?php esc_html_e( 'Custom URL' ); ?>
+								<?php esc_html_e('Custom URL'); ?>
 							</option>
 							<option value="none">
-								<?php esc_html_e( 'None' ); ?>
+								<?php esc_html_e('None'); ?>
 							</option>
 						</select>
 						<input type="text" class="link-to-custom" data-setting="linkUrl" />
 					</div>
 					<div class="advanced-section">
-						<h2><button type="button" class="button-link advanced-toggle"><?php _e( 'Advanced Options' ); ?></button></h2>
+						<h2><button type="button" class="button-link advanced-toggle"><?php _e('Advanced Options'); ?></button></h2>
 						<div class="advanced-settings hidden">
 							<div class="advanced-image">
 								<label class="setting title-text">
@@ -1002,7 +1002,7 @@ 
 							</div>
 							<div class="advanced-link">
 								<div class="setting link-target">
-									<label><input type="checkbox" data-setting="linkTargetBlank" value="_blank" <# if ( data.model.linkTargetBlank ) { #>checked="checked"<# } #>><?php _e( 'Open link in a new tab' ); ?></label>
+									<label><input type="checkbox" data-setting="linkTargetBlank" value="_blank" <# if ( data.model.linkTargetBlank ) { #>checked="checked"<# } #>><?php _e('Open link in a new tab'); ?></label>
 								</div>
 								<label class="setting link-rel">
 									<span><?php _e('Link Rel'); ?></span>
@@ -1045,28 +1045,28 @@ 
 				<label class="setting">
 					<span>SRC</span>
 					<input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
-					<button type="button" class="button-link remove-setting"><?php _e( 'Remove audio source' ); ?></button>
+					<button type="button" class="button-link remove-setting"><?php _e('Remove audio source'); ?></button>
 				</label>
 				<# } #>
 				<?php
 
-				foreach ( $audio_types as $type ):
+				foreach ($audio_types as $type):
 				?><# if ( ! _.isEmpty( data.model.<?php echo $type ?> ) ) {
 					if ( ! _.isUndefined( html5types.<?php echo $type ?> ) ) {
 						delete html5types.<?php echo $type ?>;
 					}
 				#>
 				<label class="setting">
-					<span><?php echo strtoupper( $type ) ?></span>
+					<span><?php echo strtoupper($type) ?></span>
 					<input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
-					<button type="button" class="button-link remove-setting"><?php _e( 'Remove audio source' ); ?></button>
+					<button type="button" class="button-link remove-setting"><?php _e('Remove audio source'); ?></button>
 				</label>
 				<# } #>
 				<?php endforeach ?>
 
 				<# if ( ! _.isEmpty( html5types ) ) { #>
 				<div class="setting">
-					<span><?php _e( 'Add alternate sources for maximum HTML5 playback:' ) ?></span>
+					<span><?php _e('Add alternate sources for maximum HTML5 playback:') ?></span>
 					<div class="button-large">
 					<# _.each( html5types, function (mime, type) { #>
 					<button class="button add-media-source" data-mime="{{ mime }}">{{ type }}</button>
@@ -1076,22 +1076,22 @@ 
 				<# } #>
 
 				<div class="setting preload">
-					<span><?php _e( 'Preload' ); ?></span>
+					<span><?php _e('Preload'); ?></span>
 					<div class="button-group button-large" data-setting="preload">
-						<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button>
-						<button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button>
-						<button class="button active" value="none"><?php _e( 'None' ); ?></button>
+						<button class="button" value="auto"><?php _ex('Auto', 'auto preload'); ?></button>
+						<button class="button" value="metadata"><?php _e('Metadata'); ?></button>
+						<button class="button active" value="none"><?php _e('None'); ?></button>
 					</div>
 				</div>
 
 				<label class="setting checkbox-setting">
 					<input type="checkbox" data-setting="autoplay" />
-					<span><?php _e( 'Autoplay' ); ?></span>
+					<span><?php _e('Autoplay'); ?></span>
 				</label>
 
 				<label class="setting checkbox-setting">
 					<input type="checkbox" data-setting="loop" />
-					<span><?php _e( 'Loop' ); ?></span>
+					<span><?php _e('Loop'); ?></span>
 				</label>
 			</div>
 		</div>
@@ -1128,19 +1128,19 @@ 
 				<label class="setting">
 					<span>SRC</span>
 					<input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
-					<button type="button" class="button-link remove-setting"><?php _e( 'Remove video source' ); ?></button>
+					<button type="button" class="button-link remove-setting"><?php _e('Remove video source'); ?></button>
 				</label>
 				<# } #>
-				<?php foreach ( $video_types as $type ):
+				<?php foreach ($video_types as $type):
 				?><# if ( ! _.isEmpty( data.model.<?php echo $type ?> ) ) {
 					if ( ! _.isUndefined( html5types.<?php echo $type ?> ) ) {
 						delete html5types.<?php echo $type ?>;
 					}
 				#>
 				<label class="setting">
-					<span><?php echo strtoupper( $type ) ?></span>
+					<span><?php echo strtoupper($type) ?></span>
 					<input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
-					<button type="button" class="button-link remove-setting"><?php _e( 'Remove video source' ); ?></button>
+					<button type="button" class="button-link remove-setting"><?php _e('Remove video source'); ?></button>
 				</label>
 				<# } #>
 				<?php endforeach ?>
@@ -1148,7 +1148,7 @@ 
 
 				<# if ( ! _.isEmpty( html5types ) ) { #>
 				<div class="setting">
-					<span><?php _e( 'Add alternate sources for maximum HTML5 playback:' ); ?></span>
+					<span><?php _e('Add alternate sources for maximum HTML5 playback:'); ?></span>
 					<div class="button-large">
 					<# _.each( html5types, function (mime, type) { #>
 					<button class="button add-media-source" data-mime="{{ mime }}">{{ type }}</button>
@@ -1159,32 +1159,32 @@ 
 
 				<# if ( ! _.isEmpty( data.model.poster ) ) { #>
 				<label class="setting">
-					<span><?php _e( 'Poster Image' ); ?></span>
+					<span><?php _e('Poster Image'); ?></span>
 					<input type="text" disabled="disabled" data-setting="poster" value="{{ data.model.poster }}" />
-					<button type="button" class="button-link remove-setting"><?php _e( 'Remove poster image' ); ?></button>
+					<button type="button" class="button-link remove-setting"><?php _e('Remove poster image'); ?></button>
 				</label>
 				<# } #>
 				<div class="setting preload">
-					<span><?php _e( 'Preload' ); ?></span>
+					<span><?php _e('Preload'); ?></span>
 					<div class="button-group button-large" data-setting="preload">
-						<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button>
-						<button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button>
-						<button class="button active" value="none"><?php _e( 'None' ); ?></button>
+						<button class="button" value="auto"><?php _ex('Auto', 'auto preload'); ?></button>
+						<button class="button" value="metadata"><?php _e('Metadata'); ?></button>
+						<button class="button active" value="none"><?php _e('None'); ?></button>
 					</div>
 				</div>
 
 				<label class="setting checkbox-setting">
 					<input type="checkbox" data-setting="autoplay" />
-					<span><?php _e( 'Autoplay' ); ?></span>
+					<span><?php _e('Autoplay'); ?></span>
 				</label>
 
 				<label class="setting checkbox-setting">
 					<input type="checkbox" data-setting="loop" />
-					<span><?php _e( 'Loop' ); ?></span>
+					<span><?php _e('Loop'); ?></span>
 				</label>
 
 				<label class="setting" data-setting="content">
-					<span><?php _e( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ); ?></span>
+					<span><?php _e('Tracks (subtitles, captions, descriptions, chapters, or metadata)'); ?></span>
 					<#
 					var content = '';
 					if ( ! _.isEmpty( data.model.content ) ) {
@@ -1193,11 +1193,11 @@ 
 							content += track.outerHTML; #>
 						<p>
 							<input class="content-track" type="text" value="{{ track.outerHTML }}" />
-							<button type="button" class="button-link remove-setting remove-track"><?php _ex( 'Remove video track', 'media' ); ?></button>
+							<button type="button" class="button-link remove-setting remove-track"><?php _ex('Remove video track', 'media'); ?></button>
 						</p>
 						<# } ); #>
 					<# } else { #>
-					<em><?php _e( 'There are no associated subtitles.' ); ?></em>
+					<em><?php _e('There are no associated subtitles.'); ?></em>
 					<# } #>
 					<textarea class="hidden content-setting">{{ content }}</textarea>
 				</label>
@@ -1230,31 +1230,31 @@ 
 			</div>
 		<# } else { #>
 			<div class="wpview-error">
-				<div class="dashicons dashicons-format-gallery"></div><p><?php _e( 'No items found.' ); ?></p>
+				<div class="dashicons dashicons-format-gallery"></div><p><?php _e('No items found.'); ?></p>
 			</div>
 		<# } #>
 	</script>
 
 	<script type="text/html" id="tmpl-crop-content">
-		<img class="crop-image" src="{{ data.url }}" alt="<?php esc_attr_e( 'Image crop area preview. Requires mouse interaction.' ); ?>">
+		<img class="crop-image" src="{{ data.url }}" alt="<?php esc_attr_e('Image crop area preview. Requires mouse interaction.'); ?>">
 		<div class="upload-errors"></div>
 	</script>
 
 	<script type="text/html" id="tmpl-site-icon-preview">
-		<h2><?php _e( 'Preview' ); ?></h2>
-		<strong aria-hidden="true"><?php _e( 'As a browser icon' ); ?></strong>
+		<h2><?php _e('Preview'); ?></h2>
+		<strong aria-hidden="true"><?php _e('As a browser icon'); ?></strong>
 		<div class="favicon-preview">
-			<img src="<?php echo esc_url( admin_url( 'images/' . ( is_rtl() ? 'browser-rtl.png' : 'browser.png' ) ) ); ?>" class="browser-preview" width="182" height="" alt="" />
+			<img src="<?php echo esc_url(admin_url('images/'.(is_rtl() ? 'browser-rtl.png' : 'browser.png'))); ?>" class="browser-preview" width="182" height="" alt="" />
 
 			<div class="favicon">
-				<img id="preview-favicon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
+				<img id="preview-favicon" src="{{ data.url }}" alt="<?php esc_attr_e('Preview as a browser icon'); ?>"/>
 			</div>
-			<span class="browser-title" aria-hidden="true"><?php bloginfo( 'name' ); ?></span>
+			<span class="browser-title" aria-hidden="true"><?php bloginfo('name'); ?></span>
 		</div>
 
-		<strong aria-hidden="true"><?php _e( 'As an app icon' ); ?></strong>
+		<strong aria-hidden="true"><?php _e('As an app icon'); ?></strong>
 		<div class="app-icon-preview">
-			<img id="preview-app-icon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as an app icon' ); ?>"/>
+			<img id="preview-app-icon" src="{{ data.url }}" alt="<?php esc_attr_e('Preview as an app icon'); ?>"/>
 		</div>
 	</script>
 
@@ -1265,5 +1265,5 @@ 
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( 'print_media_templates' );
+	do_action('print_media_templates');
 }

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

Spacing +9 added lines, -9 removed lines

@@ -43,7 +43,7 @@ 
 	 * @param string $role Role name.
 	 * @param array $capabilities List of capabilities.
 	 */
-	public function __construct( $role, $capabilities ) {
+	public function __construct($role, $capabilities) {
 		$this->name = $role;
 		$this->capabilities = $capabilities;
 	}
@@ -57,9 +57,9 @@ 
 	 * @param string $cap Capability name.
 	 * @param bool $grant Whether role has capability privilege.
 	 */
-	public function add_cap( $cap, $grant = true ) {
+	public function add_cap($cap, $grant = true) {
 		$this->capabilities[$cap] = $grant;
-		wp_roles()->add_cap( $this->name, $cap, $grant );
+		wp_roles()->add_cap($this->name, $cap, $grant);
 	}
 
 	/**
@@ -75,9 +75,9 @@ 
 	 *
 	 * @param string $cap Capability name.
 	 */
-	public function remove_cap( $cap ) {
-		unset( $this->capabilities[$cap] );
-		wp_roles()->remove_cap( $this->name, $cap );
+	public function remove_cap($cap) {
+		unset($this->capabilities[$cap]);
+		wp_roles()->remove_cap($this->name, $cap);
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 * @param string $cap Capability name.
 	 * @return bool True if the role has the given capability. False otherwise.
 	 */
-	public function has_cap( $cap ) {
+	public function has_cap($cap) {
 		/**
 		 * Filter which capabilities a role has.
 		 *
@@ -104,9 +104,9 @@ 
 		 * @param string $cap          Capability name.
 		 * @param string $name         Role name.
 		 */
-		$capabilities = apply_filters( 'role_has_cap', $this->capabilities, $cap, $this->name );
+		$capabilities = apply_filters('role_has_cap', $this->capabilities, $cap, $this->name);
 
-		if ( !empty( $capabilities[$cap] ) )
+		if ( ! empty($capabilities[$cap]))
 			return $capabilities[$cap];
 		else
 			return false;

Braces +5 added lines, -4 removed lines

@@ -106,10 +106,11 @@
 		 */
 		$capabilities = apply_filters( 'role_has_cap', $this->capabilities, $cap, $this->name );
 
-		if ( !empty( $capabilities[$cap] ) )
-			return $capabilities[$cap];
-		else
-			return false;
+		if ( !empty( $capabilities[$cap] ) ) {
+					return $capabilities[$cap];
+		} else {
+					return false;
+		}
 	}
 
 }

src/wp-includes/class-wp-http-streams.php

Spacing +130 added lines, -130 removed lines

@@ -35,26 +35,26 @@ 
 			'headers' => array(), 'body' => null, 'cookies' => array()
 		);
 
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 
-		if ( isset( $r['headers']['User-Agent'] ) ) {
+		if (isset($r['headers']['User-Agent'])) {
 			$r['user-agent'] = $r['headers']['User-Agent'];
-			unset( $r['headers']['User-Agent'] );
-		} elseif ( isset( $r['headers']['user-agent'] ) ) {
+			unset($r['headers']['User-Agent']);
+		} elseif (isset($r['headers']['user-agent'])) {
 			$r['user-agent'] = $r['headers']['user-agent'];
-			unset( $r['headers']['user-agent'] );
+			unset($r['headers']['user-agent']);
 		}
 
 		// Construct Cookie: header if any cookies are set.
-		WP_Http::buildCookieHeader( $r );
+		WP_Http::buildCookieHeader($r);
 
 		$arrURL = parse_url($url);
 
 		$connect_host = $arrURL['host'];
 
-		$secure_transport = ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' );
-		if ( ! isset( $arrURL['port'] ) ) {
-			if ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' ) {
+		$secure_transport = ($arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https');
+		if ( ! isset($arrURL['port'])) {
+			if ($arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https') {
 				$arrURL['port'] = 443;
 				$secure_transport = true;
 			} else {
@@ -63,16 +63,16 @@ 
 		}
 
 		// Always pass a Path, defaulting to the root in cases such as http://example.com
-		if ( ! isset( $arrURL['path'] ) ) {
+		if ( ! isset($arrURL['path'])) {
 			$arrURL['path'] = '/';
 		}
 
-		if ( isset( $r['headers']['Host'] ) || isset( $r['headers']['host'] ) ) {
-			if ( isset( $r['headers']['Host'] ) )
+		if (isset($r['headers']['Host']) || isset($r['headers']['host'])) {
+			if (isset($r['headers']['Host']))
 				$arrURL['host'] = $r['headers']['Host'];
 			else
 				$arrURL['host'] = $r['headers']['host'];
-			unset( $r['headers']['Host'], $r['headers']['host'] );
+			unset($r['headers']['Host'], $r['headers']['host']);
 		}
 
 		/*
@@ -80,14 +80,14 @@ 
 		 * to ::1, which fails when the server is not set up for it. For compatibility, always
 		 * connect to the IPv4 address.
 		 */
-		if ( 'localhost' == strtolower( $connect_host ) )
+		if ('localhost' == strtolower($connect_host))
 			$connect_host = '127.0.0.1';
 
-		$connect_host = $secure_transport ? 'ssl://' . $connect_host : 'tcp://' . $connect_host;
+		$connect_host = $secure_transport ? 'ssl://'.$connect_host : 'tcp://'.$connect_host;
 
-		$is_local = isset( $r['local'] ) && $r['local'];
-		$ssl_verify = isset( $r['sslverify'] ) && $r['sslverify'];
-		if ( $is_local ) {
+		$is_local = isset($r['local']) && $r['local'];
+		$ssl_verify = isset($r['sslverify']) && $r['sslverify'];
+		if ($is_local) {
 			/**
 			 * Filter whether SSL should be verified for local requests.
 			 *
@@ -95,8 +95,8 @@ 
 			 *
 			 * @param bool $ssl_verify Whether to verify the SSL connection. Default true.
 			 */
-			$ssl_verify = apply_filters( 'https_local_ssl_verify', $ssl_verify );
-		} elseif ( ! $is_local ) {
+			$ssl_verify = apply_filters('https_local_ssl_verify', $ssl_verify);
+		} elseif ( ! $is_local) {
 			/**
 			 * Filter whether SSL should be verified for non-local requests.
 			 *
@@ -104,12 +104,12 @@ 
 			 *
 			 * @param bool $ssl_verify Whether to verify the SSL connection. Default true.
 			 */
-			$ssl_verify = apply_filters( 'https_ssl_verify', $ssl_verify );
+			$ssl_verify = apply_filters('https_ssl_verify', $ssl_verify);
 		}
 
 		$proxy = new WP_HTTP_Proxy();
 
-		$context = stream_context_create( array(
+		$context = stream_context_create(array(
 			'ssl' => array(
 				'verify_peer' => $ssl_verify,
 				//'CN_match' => $arrURL['host'], // This is handled by self::verify_ssl_certificate()
@@ -118,11 +118,11 @@ 
 				'cafile' => $r['sslcertificates'],
 				'allow_self_signed' => ! $ssl_verify,
 			)
-		) );
+		));
 
-		$timeout = (int) floor( $r['timeout'] );
+		$timeout = (int) floor($r['timeout']);
 		$utimeout = $timeout == $r['timeout'] ? 0 : 1000000 * $r['timeout'] % 1000000;
-		$connect_timeout = max( $timeout, 1 );
+		$connect_timeout = max($timeout, 1);
 
 		// Store error number.
 		$connection_error = null;
@@ -130,159 +130,159 @@ 
 		// Store error string.
 		$connection_error_str = null;
 
-		if ( !WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			// In the event that the SSL connection fails, silence the many PHP Warnings.
-			if ( $secure_transport )
+			if ($secure_transport)
 				$error_reporting = error_reporting(0);
 
-			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-				$handle = @stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			if ($proxy->is_enabled() && $proxy->send_through_proxy($url))
+				$handle = @stream_socket_client('tcp://'.$proxy->host().':'.$proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context);
 			else
-				$handle = @stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+				$handle = @stream_socket_client($connect_host.':'.$arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context);
 
-			if ( $secure_transport )
-				error_reporting( $error_reporting );
+			if ($secure_transport)
+				error_reporting($error_reporting);
 
 		} else {
-			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-				$handle = stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			if ($proxy->is_enabled() && $proxy->send_through_proxy($url))
+				$handle = stream_socket_client('tcp://'.$proxy->host().':'.$proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context);
 			else
-				$handle = stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+				$handle = stream_socket_client($connect_host.':'.$arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context);
 		}
 
-		if ( false === $handle ) {
+		if (false === $handle) {
 			// SSL connection failed due to expired/invalid cert, or, OpenSSL configuration is broken.
-			if ( $secure_transport && 0 === $connection_error && '' === $connection_error_str )
-				return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+			if ($secure_transport && 0 === $connection_error && '' === $connection_error_str)
+				return new WP_Error('http_request_failed', __('The SSL certificate for the host could not be verified.'));
 
-			return new WP_Error('http_request_failed', $connection_error . ': ' . $connection_error_str );
+			return new WP_Error('http_request_failed', $connection_error.': '.$connection_error_str);
 		}
 
 		// Verify that the SSL certificate is valid for this request.
-		if ( $secure_transport && $ssl_verify && ! $proxy->is_enabled() ) {
-			if ( ! self::verify_ssl_certificate( $handle, $arrURL['host'] ) )
-				return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+		if ($secure_transport && $ssl_verify && ! $proxy->is_enabled()) {
+			if ( ! self::verify_ssl_certificate($handle, $arrURL['host']))
+				return new WP_Error('http_request_failed', __('The SSL certificate for the host could not be verified.'));
 		}
 
-		stream_set_timeout( $handle, $timeout, $utimeout );
+		stream_set_timeout($handle, $timeout, $utimeout);
 
-		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) //Some proxies require full URL in this field.
+		if ($proxy->is_enabled() && $proxy->send_through_proxy($url)) //Some proxies require full URL in this field.
 			$requestPath = $url;
 		else
-			$requestPath = $arrURL['path'] . ( isset($arrURL['query']) ? '?' . $arrURL['query'] : '' );
+			$requestPath = $arrURL['path'].(isset($arrURL['query']) ? '?'.$arrURL['query'] : '');
 
-		$strHeaders = strtoupper($r['method']) . ' ' . $requestPath . ' HTTP/' . $r['httpversion'] . "\r\n";
+		$strHeaders = strtoupper($r['method']).' '.$requestPath.' HTTP/'.$r['httpversion']."\r\n";
 
 		$include_port_in_host_header = (
-			( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) ||
-			( 'http'  == $arrURL['scheme'] && 80  != $arrURL['port'] ) ||
-			( 'https' == $arrURL['scheme'] && 443 != $arrURL['port'] )
+			($proxy->is_enabled() && $proxy->send_through_proxy($url)) ||
+			('http' == $arrURL['scheme'] && 80 != $arrURL['port']) ||
+			('https' == $arrURL['scheme'] && 443 != $arrURL['port'])
 		);
 
-		if ( $include_port_in_host_header ) {
-			$strHeaders .= 'Host: ' . $arrURL['host'] . ':' . $arrURL['port'] . "\r\n";
+		if ($include_port_in_host_header) {
+			$strHeaders .= 'Host: '.$arrURL['host'].':'.$arrURL['port']."\r\n";
 		} else {
-			$strHeaders .= 'Host: ' . $arrURL['host'] . "\r\n";
+			$strHeaders .= 'Host: '.$arrURL['host']."\r\n";
 		}
 
-		if ( isset($r['user-agent']) )
-			$strHeaders .= 'User-agent: ' . $r['user-agent'] . "\r\n";
+		if (isset($r['user-agent']))
+			$strHeaders .= 'User-agent: '.$r['user-agent']."\r\n";
 
-		if ( is_array($r['headers']) ) {
-			foreach ( (array) $r['headers'] as $header => $headerValue )
-				$strHeaders .= $header . ': ' . $headerValue . "\r\n";
+		if (is_array($r['headers'])) {
+			foreach ((array) $r['headers'] as $header => $headerValue)
+				$strHeaders .= $header.': '.$headerValue."\r\n";
 		} else {
 			$strHeaders .= $r['headers'];
 		}
 
-		if ( $proxy->use_authentication() )
-			$strHeaders .= $proxy->authentication_header() . "\r\n";
+		if ($proxy->use_authentication())
+			$strHeaders .= $proxy->authentication_header()."\r\n";
 
 		$strHeaders .= "\r\n";
 
-		if ( ! is_null($r['body']) )
+		if ( ! is_null($r['body']))
 			$strHeaders .= $r['body'];
 
 		fwrite($handle, $strHeaders);
 
-		if ( ! $r['blocking'] ) {
-			stream_set_blocking( $handle, 0 );
-			fclose( $handle );
-			return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
+		if ( ! $r['blocking']) {
+			stream_set_blocking($handle, 0);
+			fclose($handle);
+			return array('headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array());
 		}
 
 		$strResponse = '';
 		$bodyStarted = false;
 		$keep_reading = true;
 		$block_size = 4096;
-		if ( isset( $r['limit_response_size'] ) )
-			$block_size = min( $block_size, $r['limit_response_size'] );
+		if (isset($r['limit_response_size']))
+			$block_size = min($block_size, $r['limit_response_size']);
 
 		// If streaming to a file setup the file handle.
-		if ( $r['stream'] ) {
-			if ( ! WP_DEBUG )
-				$stream_handle = @fopen( $r['filename'], 'w+' );
+		if ($r['stream']) {
+			if ( ! WP_DEBUG)
+				$stream_handle = @fopen($r['filename'], 'w+');
 			else
-				$stream_handle = fopen( $r['filename'], 'w+' );
-			if ( ! $stream_handle )
-				return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+				$stream_handle = fopen($r['filename'], 'w+');
+			if ( ! $stream_handle)
+				return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $r['filename']));
 
 			$bytes_written = 0;
-			while ( ! feof($handle) && $keep_reading ) {
-				$block = fread( $handle, $block_size );
-				if ( ! $bodyStarted ) {
+			while ( ! feof($handle) && $keep_reading) {
+				$block = fread($handle, $block_size);
+				if ( ! $bodyStarted) {
 					$strResponse .= $block;
-					if ( strpos( $strResponse, "\r\n\r\n" ) ) {
-						$process = WP_Http::processResponse( $strResponse );
+					if (strpos($strResponse, "\r\n\r\n")) {
+						$process = WP_Http::processResponse($strResponse);
 						$bodyStarted = true;
 						$block = $process['body'];
-						unset( $strResponse );
+						unset($strResponse);
 						$process['body'] = '';
 					}
 				}
 
-				$this_block_size = strlen( $block );
+				$this_block_size = strlen($block);
 
-				if ( isset( $r['limit_response_size'] ) && ( $bytes_written + $this_block_size ) > $r['limit_response_size'] ) {
-					$this_block_size = ( $r['limit_response_size'] - $bytes_written );
-					$block = substr( $block, 0, $this_block_size );
+				if (isset($r['limit_response_size']) && ($bytes_written + $this_block_size) > $r['limit_response_size']) {
+					$this_block_size = ($r['limit_response_size'] - $bytes_written);
+					$block = substr($block, 0, $this_block_size);
 				}
 
-				$bytes_written_to_file = fwrite( $stream_handle, $block );
+				$bytes_written_to_file = fwrite($stream_handle, $block);
 
-				if ( $bytes_written_to_file != $this_block_size ) {
-					fclose( $handle );
-					fclose( $stream_handle );
-					return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) );
+				if ($bytes_written_to_file != $this_block_size) {
+					fclose($handle);
+					fclose($stream_handle);
+					return new WP_Error('http_request_failed', __('Failed to write request to temporary file.'));
 				}
 
 				$bytes_written += $bytes_written_to_file;
 
-				$keep_reading = !isset( $r['limit_response_size'] ) || $bytes_written < $r['limit_response_size'];
+				$keep_reading = ! isset($r['limit_response_size']) || $bytes_written < $r['limit_response_size'];
 			}
 
-			fclose( $stream_handle );
+			fclose($stream_handle);
 
 		} else {
 			$header_length = 0;
-			while ( ! feof( $handle ) && $keep_reading ) {
-				$block = fread( $handle, $block_size );
+			while ( ! feof($handle) && $keep_reading) {
+				$block = fread($handle, $block_size);
 				$strResponse .= $block;
-				if ( ! $bodyStarted && strpos( $strResponse, "\r\n\r\n" ) ) {
-					$header_length = strpos( $strResponse, "\r\n\r\n" ) + 4;
+				if ( ! $bodyStarted && strpos($strResponse, "\r\n\r\n")) {
+					$header_length = strpos($strResponse, "\r\n\r\n") + 4;
 					$bodyStarted = true;
 				}
-				$keep_reading = ( ! $bodyStarted || !isset( $r['limit_response_size'] ) || strlen( $strResponse ) < ( $header_length + $r['limit_response_size'] ) );
+				$keep_reading = ( ! $bodyStarted || ! isset($r['limit_response_size']) || strlen($strResponse) < ($header_length + $r['limit_response_size']));
 			}
 
-			$process = WP_Http::processResponse( $strResponse );
-			unset( $strResponse );
+			$process = WP_Http::processResponse($strResponse);
+			unset($strResponse);
 
 		}
 
-		fclose( $handle );
+		fclose($handle);
 
-		$arrHeaders = WP_Http::processHeaders( $process['headers'], $url );
+		$arrHeaders = WP_Http::processHeaders($process['headers'], $url);
 
 		$response = array(
 			'headers' => $arrHeaders['headers'],
@@ -294,18 +294,18 @@ 
 		);
 
 		// Handle redirects.
-		if ( false !== ( $redirect_response = WP_Http::handle_redirects( $url, $r, $response ) ) )
+		if (false !== ($redirect_response = WP_Http::handle_redirects($url, $r, $response)))
 			return $redirect_response;
 
 		// If the body was chunk encoded, then decode it.
-		if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] )
+		if ( ! empty($process['body']) && isset($arrHeaders['headers']['transfer-encoding']) && 'chunked' == $arrHeaders['headers']['transfer-encoding'])
 			$process['body'] = WP_Http::chunkTransferDecode($process['body']);
 
-		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($arrHeaders['headers']) )
-			$process['body'] = WP_Http_Encoding::decompress( $process['body'] );
+		if (true === $r['decompress'] && true === WP_Http_Encoding::should_decode($arrHeaders['headers']))
+			$process['body'] = WP_Http_Encoding::decompress($process['body']);
 
-		if ( isset( $r['limit_response_size'] ) && strlen( $process['body'] ) > $r['limit_response_size'] )
-			$process['body'] = substr( $process['body'], 0, $r['limit_response_size'] );
+		if (isset($r['limit_response_size']) && strlen($process['body']) > $r['limit_response_size'])
+			$process['body'] = substr($process['body'], 0, $r['limit_response_size']);
 
 		$response['body'] = $process['body'];
 
@@ -329,51 +329,51 @@ 
 	 * @param string $host The hostname being requested
 	 * @return bool If the cerficiate presented in $stream is valid for $host
 	 */
-	public static function verify_ssl_certificate( $stream, $host ) {
-		$context_options = stream_context_get_options( $stream );
+	public static function verify_ssl_certificate($stream, $host) {
+		$context_options = stream_context_get_options($stream);
 
-		if ( empty( $context_options['ssl']['peer_certificate'] ) )
+		if (empty($context_options['ssl']['peer_certificate']))
 			return false;
 
-		$cert = openssl_x509_parse( $context_options['ssl']['peer_certificate'] );
-		if ( ! $cert )
+		$cert = openssl_x509_parse($context_options['ssl']['peer_certificate']);
+		if ( ! $cert)
 			return false;
 
 		/*
 		 * If the request is being made to an IP address, we'll validate against IP fields
 		 * in the cert (if they exist)
 		 */
-		$host_type = ( WP_Http::is_ip_address( $host ) ? 'ip' : 'dns' );
+		$host_type = (WP_Http::is_ip_address($host) ? 'ip' : 'dns');
 
 		$certificate_hostnames = array();
-		if ( ! empty( $cert['extensions']['subjectAltName'] ) ) {
-			$match_against = preg_split( '/,\s*/', $cert['extensions']['subjectAltName'] );
-			foreach ( $match_against as $match ) {
-				list( $match_type, $match_host ) = explode( ':', $match );
-				if ( $host_type == strtolower( trim( $match_type ) ) ) // IP: or DNS:
-					$certificate_hostnames[] = strtolower( trim( $match_host ) );
+		if ( ! empty($cert['extensions']['subjectAltName'])) {
+			$match_against = preg_split('/,\s*/', $cert['extensions']['subjectAltName']);
+			foreach ($match_against as $match) {
+				list($match_type, $match_host) = explode(':', $match);
+				if ($host_type == strtolower(trim($match_type))) // IP: or DNS:
+					$certificate_hostnames[] = strtolower(trim($match_host));
 			}
-		} elseif ( !empty( $cert['subject']['CN'] ) ) {
+		} elseif ( ! empty($cert['subject']['CN'])) {
 			// Only use the CN when the certificate includes no subjectAltName extension.
-			$certificate_hostnames[] = strtolower( $cert['subject']['CN'] );
+			$certificate_hostnames[] = strtolower($cert['subject']['CN']);
 		}
 
 		// Exact hostname/IP matches.
-		if ( in_array( strtolower( $host ), $certificate_hostnames ) )
+		if (in_array(strtolower($host), $certificate_hostnames))
 			return true;
 
 		// IP's can't be wildcards, Stop processing.
-		if ( 'ip' == $host_type )
+		if ('ip' == $host_type)
 			return false;
 
 		// Test to see if the domain is at least 2 deep for wildcard support.
-		if ( substr_count( $host, '.' ) < 2 )
+		if (substr_count($host, '.') < 2)
 			return false;
 
 		// Wildcard subdomains certs (*.example.com) are valid for a.example.com but not a.b.example.com.
-		$wildcard_host = preg_replace( '/^[^.]+\./', '*.', $host );
+		$wildcard_host = preg_replace('/^[^.]+\./', '*.', $host);
 
-		return in_array( strtolower( $wildcard_host ), $certificate_hostnames );
+		return in_array(strtolower($wildcard_host), $certificate_hostnames);
 	}
 
 	/**
@@ -387,16 +387,16 @@ 
 	 * @param array $args Optional. Array of request arguments. Default empty array.
 	 * @return bool False means this class can not be used, true means it can.
 	 */
-	public static function test( $args = array() ) {
-		if ( ! function_exists( 'stream_socket_client' ) )
+	public static function test($args = array()) {
+		if ( ! function_exists('stream_socket_client'))
 			return false;
 
-		$is_ssl = isset( $args['ssl'] ) && $args['ssl'];
+		$is_ssl = isset($args['ssl']) && $args['ssl'];
 
-		if ( $is_ssl ) {
-			if ( ! extension_loaded( 'openssl' ) )
+		if ($is_ssl) {
+			if ( ! extension_loaded('openssl'))
 				return false;
-			if ( ! function_exists( 'openssl_x509_parse' ) )
+			if ( ! function_exists('openssl_x509_parse'))
 				return false;
 		}
 
@@ -408,7 +408,7 @@ 
 		 * @param bool  $use_class Whether the class can be used. Default true.
 		 * @param array $args      Request arguments.
 		 */
-		return apply_filters( 'use_streams_transport', true, $args );
+		return apply_filters('use_streams_transport', true, $args);
 	}
 }
 

Braces +97 added lines, -66 removed lines

@@ -68,10 +68,11 @@ 
 		}
 
 		if ( isset( $r['headers']['Host'] ) || isset( $r['headers']['host'] ) ) {
-			if ( isset( $r['headers']['Host'] ) )
-				$arrURL['host'] = $r['headers']['Host'];
-			else
-				$arrURL['host'] = $r['headers']['host'];
+			if ( isset( $r['headers']['Host'] ) ) {
+							$arrURL['host'] = $r['headers']['Host'];
+			} else {
+							$arrURL['host'] = $r['headers']['host'];
+			}
 			unset( $r['headers']['Host'], $r['headers']['host'] );
 		}
 
@@ -80,8 +81,9 @@ 
 		 * to ::1, which fails when the server is not set up for it. For compatibility, always
 		 * connect to the IPv4 address.
 		 */
-		if ( 'localhost' == strtolower( $connect_host ) )
-			$connect_host = '127.0.0.1';
+		if ( 'localhost' == strtolower( $connect_host ) ) {
+					$connect_host = '127.0.0.1';
+		}
 
 		$connect_host = $secure_transport ? 'ssl://' . $connect_host : 'tcp://' . $connect_host;
 
@@ -132,44 +134,52 @@ 
 
 		if ( !WP_DEBUG ) {
 			// In the event that the SSL connection fails, silence the many PHP Warnings.
-			if ( $secure_transport )
-				$error_reporting = error_reporting(0);
+			if ( $secure_transport ) {
+							$error_reporting = error_reporting(0);
+			}
 
-			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-				$handle = @stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
-			else
-				$handle = @stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
+							$handle = @stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			} else {
+							$handle = @stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			}
 
-			if ( $secure_transport )
-				error_reporting( $error_reporting );
+			if ( $secure_transport ) {
+							error_reporting( $error_reporting );
+			}
 
 		} else {
-			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-				$handle = stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
-			else
-				$handle = stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
+							$handle = stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			} else {
+							$handle = stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			}
 		}
 
 		if ( false === $handle ) {
 			// SSL connection failed due to expired/invalid cert, or, OpenSSL configuration is broken.
-			if ( $secure_transport && 0 === $connection_error && '' === $connection_error_str )
-				return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+			if ( $secure_transport && 0 === $connection_error && '' === $connection_error_str ) {
+							return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+			}
 
 			return new WP_Error('http_request_failed', $connection_error . ': ' . $connection_error_str );
 		}
 
 		// Verify that the SSL certificate is valid for this request.
 		if ( $secure_transport && $ssl_verify && ! $proxy->is_enabled() ) {
-			if ( ! self::verify_ssl_certificate( $handle, $arrURL['host'] ) )
-				return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+			if ( ! self::verify_ssl_certificate( $handle, $arrURL['host'] ) ) {
+							return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+			}
 		}
 
 		stream_set_timeout( $handle, $timeout, $utimeout );
 
-		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) //Some proxies require full URL in this field.
+		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
+			//Some proxies require full URL in this field.
 			$requestPath = $url;
-		else
-			$requestPath = $arrURL['path'] . ( isset($arrURL['query']) ? '?' . $arrURL['query'] : '' );
+		} else {
+					$requestPath = $arrURL['path'] . ( isset($arrURL['query']) ? '?' . $arrURL['query'] : '' );
+		}
 
 		$strHeaders = strtoupper($r['method']) . ' ' . $requestPath . ' HTTP/' . $r['httpversion'] . "\r\n";
 
@@ -185,23 +195,27 @@ 
 			$strHeaders .= 'Host: ' . $arrURL['host'] . "\r\n";
 		}
 
-		if ( isset($r['user-agent']) )
-			$strHeaders .= 'User-agent: ' . $r['user-agent'] . "\r\n";
+		if ( isset($r['user-agent']) ) {
+					$strHeaders .= 'User-agent: ' . $r['user-agent'] . "\r\n";
+		}
 
 		if ( is_array($r['headers']) ) {
-			foreach ( (array) $r['headers'] as $header => $headerValue )
-				$strHeaders .= $header . ': ' . $headerValue . "\r\n";
+			foreach ( (array) $r['headers'] as $header => $headerValue ) {
+							$strHeaders .= $header . ': ' . $headerValue . "\r\n";
+			}
 		} else {
 			$strHeaders .= $r['headers'];
 		}
 
-		if ( $proxy->use_authentication() )
-			$strHeaders .= $proxy->authentication_header() . "\r\n";
+		if ( $proxy->use_authentication() ) {
+					$strHeaders .= $proxy->authentication_header() . "\r\n";
+		}
 
 		$strHeaders .= "\r\n";
 
-		if ( ! is_null($r['body']) )
-			$strHeaders .= $r['body'];
+		if ( ! is_null($r['body']) ) {
+					$strHeaders .= $r['body'];
+		}
 
 		fwrite($handle, $strHeaders);
 
@@ -215,17 +229,20 @@ 
 		$bodyStarted = false;
 		$keep_reading = true;
 		$block_size = 4096;
-		if ( isset( $r['limit_response_size'] ) )
-			$block_size = min( $block_size, $r['limit_response_size'] );
+		if ( isset( $r['limit_response_size'] ) ) {
+					$block_size = min( $block_size, $r['limit_response_size'] );
+		}
 
 		// If streaming to a file setup the file handle.
 		if ( $r['stream'] ) {
-			if ( ! WP_DEBUG )
-				$stream_handle = @fopen( $r['filename'], 'w+' );
-			else
-				$stream_handle = fopen( $r['filename'], 'w+' );
-			if ( ! $stream_handle )
-				return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+			if ( ! WP_DEBUG ) {
+							$stream_handle = @fopen( $r['filename'], 'w+' );
+			} else {
+							$stream_handle = fopen( $r['filename'], 'w+' );
+			}
+			if ( ! $stream_handle ) {
+							return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+			}
 
 			$bytes_written = 0;
 			while ( ! feof($handle) && $keep_reading ) {
@@ -294,18 +311,22 @@ 
 		);
 
 		// Handle redirects.
-		if ( false !== ( $redirect_response = WP_Http::handle_redirects( $url, $r, $response ) ) )
-			return $redirect_response;
+		if ( false !== ( $redirect_response = WP_Http::handle_redirects( $url, $r, $response ) ) ) {
+					return $redirect_response;
+		}
 
 		// If the body was chunk encoded, then decode it.
-		if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] )
-			$process['body'] = WP_Http::chunkTransferDecode($process['body']);
+		if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] ) {
+					$process['body'] = WP_Http::chunkTransferDecode($process['body']);
+		}
 
-		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($arrHeaders['headers']) )
-			$process['body'] = WP_Http_Encoding::decompress( $process['body'] );
+		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($arrHeaders['headers']) ) {
+					$process['body'] = WP_Http_Encoding::decompress( $process['body'] );
+		}
 
-		if ( isset( $r['limit_response_size'] ) && strlen( $process['body'] ) > $r['limit_response_size'] )
-			$process['body'] = substr( $process['body'], 0, $r['limit_response_size'] );
+		if ( isset( $r['limit_response_size'] ) && strlen( $process['body'] ) > $r['limit_response_size'] ) {
+					$process['body'] = substr( $process['body'], 0, $r['limit_response_size'] );
+		}
 
 		$response['body'] = $process['body'];
 
@@ -332,12 +353,14 @@ 
 	public static function verify_ssl_certificate( $stream, $host ) {
 		$context_options = stream_context_get_options( $stream );
 
-		if ( empty( $context_options['ssl']['peer_certificate'] ) )
-			return false;
+		if ( empty( $context_options['ssl']['peer_certificate'] ) ) {
+					return false;
+		}
 
 		$cert = openssl_x509_parse( $context_options['ssl']['peer_certificate'] );
-		if ( ! $cert )
-			return false;
+		if ( ! $cert ) {
+					return false;
+		}
 
 		/*
 		 * If the request is being made to an IP address, we'll validate against IP fields
@@ -350,8 +373,10 @@ 
 			$match_against = preg_split( '/,\s*/', $cert['extensions']['subjectAltName'] );
 			foreach ( $match_against as $match ) {
 				list( $match_type, $match_host ) = explode( ':', $match );
-				if ( $host_type == strtolower( trim( $match_type ) ) ) // IP: or DNS:
+				if ( $host_type == strtolower( trim( $match_type ) ) ) {
+					// IP: or DNS:
 					$certificate_hostnames[] = strtolower( trim( $match_host ) );
+				}
 			}
 		} elseif ( !empty( $cert['subject']['CN'] ) ) {
 			// Only use the CN when the certificate includes no subjectAltName extension.
@@ -359,16 +384,19 @@ 
 		}
 
 		// Exact hostname/IP matches.
-		if ( in_array( strtolower( $host ), $certificate_hostnames ) )
-			return true;
+		if ( in_array( strtolower( $host ), $certificate_hostnames ) ) {
+					return true;
+		}
 
 		// IP's can't be wildcards, Stop processing.
-		if ( 'ip' == $host_type )
-			return false;
+		if ( 'ip' == $host_type ) {
+					return false;
+		}
 
 		// Test to see if the domain is at least 2 deep for wildcard support.
-		if ( substr_count( $host, '.' ) < 2 )
-			return false;
+		if ( substr_count( $host, '.' ) < 2 ) {
+					return false;
+		}
 
 		// Wildcard subdomains certs (*.example.com) are valid for a.example.com but not a.b.example.com.
 		$wildcard_host = preg_replace( '/^[^.]+\./', '*.', $host );
@@ -388,16 +416,19 @@ 
 	 * @return bool False means this class can not be used, true means it can.
 	 */
 	public static function test( $args = array() ) {
-		if ( ! function_exists( 'stream_socket_client' ) )
-			return false;
+		if ( ! function_exists( 'stream_socket_client' ) ) {
+					return false;
+		}
 
 		$is_ssl = isset( $args['ssl'] ) && $args['ssl'];
 
 		if ( $is_ssl ) {
-			if ( ! extension_loaded( 'openssl' ) )
-				return false;
-			if ( ! function_exists( 'openssl_x509_parse' ) )
-				return false;
+			if ( ! extension_loaded( 'openssl' ) ) {
+							return false;
+			}
+			if ( ! function_exists( 'openssl_x509_parse' ) ) {
+							return false;
+			}
 		}
 
 		/**

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

Spacing +24 added lines, -24 removed lines

@@ -147,18 +147,18 @@ 
 	 * @param string               $id      An specific ID for the panel.
 	 * @param array                $args    Panel arguments.
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		$keys = array_keys( get_object_vars( $this ) );
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+	public function __construct($manager, $id, $args = array()) {
+		$keys = array_keys(get_object_vars($this));
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
 		$this->manager = $manager;
 		$this->id = $id;
-		if ( empty( $this->active_callback ) ) {
-			$this->active_callback = array( $this, 'active_callback' );
+		if (empty($this->active_callback)) {
+			$this->active_callback = array($this, 'active_callback');
 		}
 		self::$instance_count += 1;
 		$this->instance_number = self::$instance_count;
@@ -176,7 +176,7 @@ 
 	 */
 	final public function active() {
 		$panel = $this;
-		$active = call_user_func( $this->active_callback, $this );
+		$active = call_user_func($this->active_callback, $this);
 
 		/**
 		 * Filter response of WP_Customize_Panel::active().
@@ -186,7 +186,7 @@ 
 		 * @param bool               $active  Whether the Customizer panel is active.
 		 * @param WP_Customize_Panel $panel   {@see WP_Customize_Panel} instance.
 		 */
-		$active = apply_filters( 'customize_panel_active', $active, $panel );
+		$active = apply_filters('customize_panel_active', $active, $panel);
 
 		return $active;
 	}
@@ -214,8 +214,8 @@ 
 	 * @return array The array to be exported to the client as JSON.
 	 */
 	public function json() {
-		$array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'type' ) );
-		$array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$array = wp_array_slice_assoc((array) $this, array('id', 'description', 'priority', 'type'));
+		$array['title'] = html_entity_decode($this->title, ENT_QUOTES, get_bloginfo('charset'));
 		$array['content'] = $this->get_content();
 		$array['active'] = $this->active();
 		$array['instanceNumber'] = $this->instance_number;
@@ -231,11 +231,11 @@ 
 	 * @return bool False if theme doesn't support the panel or the user doesn't have the capability.
 	 */
 	final public function check_capabilities() {
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
+		if ($this->capability && ! call_user_func_array('current_user_can', (array) $this->capability)) {
 			return false;
 		}
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
+		if ($this->theme_supports && ! call_user_func_array('current_theme_supports', (array) $this->theme_supports)) {
 			return false;
 		}
 
@@ -252,7 +252,7 @@ 
 	final public function get_content() {
 		ob_start();
 		$this->maybe_render();
-		return trim( ob_get_clean() );
+		return trim(ob_get_clean());
 	}
 
 	/**
@@ -261,7 +261,7 @@ 
 	 * @since 4.0.0
 	 */
 	final public function maybe_render() {
-		if ( ! $this->check_capabilities() ) {
+		if ( ! $this->check_capabilities()) {
 			return;
 		}
 
@@ -272,7 +272,7 @@ 
 		 *
 		 * @param WP_Customize_Panel $this WP_Customize_Panel instance.
 		 */
-		do_action( 'customize_render_panel', $this );
+		do_action('customize_render_panel', $this);
 
 		/**
 		 * Fires before rendering a specific Customizer panel.
@@ -282,7 +282,7 @@ 
 		 *
 		 * @since 4.0.0
 		 */
-		do_action( "customize_render_panel_{$this->id}" );
+		do_action("customize_render_panel_{$this->id}");
 
 		$this->render();
 	}
@@ -319,10 +319,10 @@ 
 	 */
 	public function print_template() {
 		?>
-		<script type="text/html" id="tmpl-customize-panel-<?php echo esc_attr( $this->type ); ?>-content">
+		<script type="text/html" id="tmpl-customize-panel-<?php echo esc_attr($this->type); ?>-content">
 			<?php $this->content_template(); ?>
 		</script>
-		<script type="text/html" id="tmpl-customize-panel-<?php echo esc_attr( $this->type ); ?>">
+		<script type="text/html" id="tmpl-customize-panel-<?php echo esc_attr($this->type); ?>">
 			<?php $this->render_template(); ?>
 		</script>
         <?php
@@ -344,7 +344,7 @@ 
 		<li id="accordion-panel-{{ data.id }}" class="accordion-section control-section control-panel control-panel-{{ data.type }}">
 			<h3 class="accordion-section-title" tabindex="0">
 				{{ data.title }}
-				<span class="screen-reader-text"><?php _e( 'Press return or enter to open this panel' ); ?></span>
+				<span class="screen-reader-text"><?php _e('Press return or enter to open this panel'); ?></span>
 			</h3>
 			<ul class="accordion-sub-container control-panel-content"></ul>
 		</li>
@@ -365,14 +365,14 @@ 
 	protected function content_template() {
 		?>
 		<li class="panel-meta customize-info accordion-section <# if ( ! data.description ) { #> cannot-expand<# } #>">
-			<button class="customize-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></button>
+			<button class="customize-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e('Back'); ?></span></button>
 			<div class="accordion-section-title">
 				<span class="preview-notice"><?php
 					/* translators: %s: the site/panel title in the Customizer */
-					echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title">{{ data.title }}</strong>' );
+					echo sprintf(__('You are customizing %s'), '<strong class="panel-title">{{ data.title }}</strong>');
 				?></span>
 				<# if ( data.description ) { #>
-					<button class="customize-help-toggle dashicons dashicons-editor-help" tabindex="0" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
+					<button class="customize-help-toggle dashicons dashicons-editor-help" tabindex="0" aria-expanded="false"><span class="screen-reader-text"><?php _e('Help'); ?></span></button>
 				<# } #>
 			</div>
 			<# if ( data.description ) { #>
@@ -386,4 +386,4 @@ 
 }
 
 /** WP_Customize_Nav_Menus_Panel class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menus-panel.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menus-panel.php');

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

Braces +9 added lines, -6 removed lines

@@ -578,8 +578,9 @@ 
 		if ( is_taxonomy_hierarchical( $query['taxonomy'] ) && $query['include_children'] ) {
 			$this->transform_query( $query, 'term_id' );
 
-			if ( is_wp_error( $query ) )
-				return;
+			if ( is_wp_error( $query ) ) {
+							return;
+			}
 
 			$children = array();
 			foreach ( $query['terms'] as $term ) {
@@ -606,11 +607,13 @@ 
 	public function transform_query( &$query, $resulting_field ) {
 		global $wpdb;
 
-		if ( empty( $query['terms'] ) )
-			return;
+		if ( empty( $query['terms'] ) ) {
+					return;
+		}
 
-		if ( $query['field'] == $resulting_field )
-			return;
+		if ( $query['field'] == $resulting_field ) {
+					return;
+		}
 
 		$resulting_field = sanitize_key( $resulting_field );
 

Spacing +112 added lines, -112 removed lines

@@ -50,7 +50,7 @@ 
 	 * @access private
 	 * @var string
 	 */
-	private static $no_results = array( 'join' => array( '' ), 'where' => array( '0 = 1' ) );
+	private static $no_results = array('join' => array(''), 'where' => array('0 = 1'));
 
 	/**
 	 * A flat list of table aliases used in the JOIN clauses.
@@ -118,14 +118,14 @@ 
 	 *     }
 	 * }
 	 */
-	public function __construct( $tax_query ) {
-		if ( isset( $tax_query['relation'] ) ) {
-			$this->relation = $this->sanitize_relation( $tax_query['relation'] );
+	public function __construct($tax_query) {
+		if (isset($tax_query['relation'])) {
+			$this->relation = $this->sanitize_relation($tax_query['relation']);
 		} else {
 			$this->relation = 'AND';
 		}
 
-		$this->queries = $this->sanitize_query( $tax_query );
+		$this->queries = $this->sanitize_query($tax_query);
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 	 * @param array $queries Array of queries clauses.
 	 * @return array Sanitized array of query clauses.
 	 */
-	public function sanitize_query( $queries ) {
+	public function sanitize_query($queries) {
 		$cleaned_query = array();
 
 		$defaults = array(
@@ -151,14 +151,14 @@ 
 			'include_children' => true,
 		);
 
-		foreach ( $queries as $key => $query ) {
-			if ( 'relation' === $key ) {
-				$cleaned_query['relation'] = $this->sanitize_relation( $query );
+		foreach ($queries as $key => $query) {
+			if ('relation' === $key) {
+				$cleaned_query['relation'] = $this->sanitize_relation($query);
 
 			// First-order clause.
-			} elseif ( self::is_first_order_clause( $query ) ) {
+			} elseif (self::is_first_order_clause($query)) {
 
-				$cleaned_clause = array_merge( $defaults, $query );
+				$cleaned_clause = array_merge($defaults, $query);
 				$cleaned_clause['terms'] = (array) $cleaned_clause['terms'];
 				$cleaned_query[] = $cleaned_clause;
 
@@ -166,32 +166,32 @@ 
 				 * Keep a copy of the clause in the flate
 				 * $queried_terms array, for use in WP_Query.
 				 */
-				if ( ! empty( $cleaned_clause['taxonomy'] ) && 'NOT IN' !== $cleaned_clause['operator'] ) {
+				if ( ! empty($cleaned_clause['taxonomy']) && 'NOT IN' !== $cleaned_clause['operator']) {
 					$taxonomy = $cleaned_clause['taxonomy'];
-					if ( ! isset( $this->queried_terms[ $taxonomy ] ) ) {
-						$this->queried_terms[ $taxonomy ] = array();
+					if ( ! isset($this->queried_terms[$taxonomy])) {
+						$this->queried_terms[$taxonomy] = array();
 					}
 
 					/*
 					 * Backward compatibility: Only store the first
 					 * 'terms' and 'field' found for a given taxonomy.
 					 */
-					if ( ! empty( $cleaned_clause['terms'] ) && ! isset( $this->queried_terms[ $taxonomy ]['terms'] ) ) {
-						$this->queried_terms[ $taxonomy ]['terms'] = $cleaned_clause['terms'];
+					if ( ! empty($cleaned_clause['terms']) && ! isset($this->queried_terms[$taxonomy]['terms'])) {
+						$this->queried_terms[$taxonomy]['terms'] = $cleaned_clause['terms'];
 					}
 
-					if ( ! empty( $cleaned_clause['field'] ) && ! isset( $this->queried_terms[ $taxonomy ]['field'] ) ) {
-						$this->queried_terms[ $taxonomy ]['field'] = $cleaned_clause['field'];
+					if ( ! empty($cleaned_clause['field']) && ! isset($this->queried_terms[$taxonomy]['field'])) {
+						$this->queried_terms[$taxonomy]['field'] = $cleaned_clause['field'];
 					}
 				}
 
 			// Otherwise, it's a nested query, so we recurse.
-			} elseif ( is_array( $query ) ) {
-				$cleaned_subquery = $this->sanitize_query( $query );
+			} elseif (is_array($query)) {
+				$cleaned_subquery = $this->sanitize_query($query);
 
-				if ( ! empty( $cleaned_subquery ) ) {
+				if ( ! empty($cleaned_subquery)) {
 					// All queries with children must have a relation.
-					if ( ! isset( $cleaned_subquery['relation'] ) ) {
+					if ( ! isset($cleaned_subquery['relation'])) {
 						$cleaned_subquery['relation'] = 'AND';
 					}
 
@@ -212,8 +212,8 @@ 
 	 * @param string $relation Raw relation key from the query argument.
 	 * @return string Sanitized relation ('AND' or 'OR').
 	 */
-	public function sanitize_relation( $relation ) {
-		if ( 'OR' === strtoupper( $relation ) ) {
+	public function sanitize_relation($relation) {
+		if ('OR' === strtoupper($relation)) {
 			return 'OR';
 		} else {
 			return 'AND';
@@ -237,8 +237,8 @@ 
 	 * @param array $query Tax query arguments.
 	 * @return bool Whether the query clause is a first-order clause.
 	 */
-	protected static function is_first_order_clause( $query ) {
-		return is_array( $query ) && ( empty( $query ) || array_key_exists( 'terms', $query ) || array_key_exists( 'taxonomy', $query ) || array_key_exists( 'include_children', $query ) || array_key_exists( 'field', $query ) || array_key_exists( 'operator', $query ) );
+	protected static function is_first_order_clause($query) {
+		return is_array($query) && (empty($query) || array_key_exists('terms', $query) || array_key_exists('taxonomy', $query) || array_key_exists('include_children', $query) || array_key_exists('field', $query) || array_key_exists('operator', $query));
 	}
 
 	/**
@@ -258,7 +258,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	public function get_sql( $primary_table, $primary_id_column ) {
+	public function get_sql($primary_table, $primary_id_column) {
 		$this->primary_table = $primary_table;
 		$this->primary_id_column = $primary_id_column;
 
@@ -287,10 +287,10 @@ 
 		 * To keep $this->queries unaltered, pass a copy.
 		 */
 		$queries = $this->queries;
-		$sql = $this->get_sql_for_query( $queries );
+		$sql = $this->get_sql_for_query($queries);
 
-		if ( ! empty( $sql['where'] ) ) {
-			$sql['where'] = ' AND ' . $sql['where'];
+		if ( ! empty($sql['where'])) {
+			$sql['where'] = ' AND '.$sql['where'];
 		}
 
 		return $sql;
@@ -315,7 +315,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_query( &$query, $depth = 0 ) {
+	protected function get_sql_for_query(&$query, $depth = 0) {
 		$sql_chunks = array(
 			'join'  => array(),
 			'where' => array(),
@@ -327,32 +327,32 @@ 
 		);
 
 		$indent = '';
-		for ( $i = 0; $i < $depth; $i++ ) {
+		for ($i = 0; $i < $depth; $i++) {
 			$indent .= "  ";
 		}
 
-		foreach ( $query as $key => &$clause ) {
-			if ( 'relation' === $key ) {
+		foreach ($query as $key => &$clause) {
+			if ('relation' === $key) {
 				$relation = $query['relation'];
-			} elseif ( is_array( $clause ) ) {
+			} elseif (is_array($clause)) {
 
 				// This is a first-order clause.
-				if ( $this->is_first_order_clause( $clause ) ) {
-					$clause_sql = $this->get_sql_for_clause( $clause, $query );
+				if ($this->is_first_order_clause($clause)) {
+					$clause_sql = $this->get_sql_for_clause($clause, $query);
 
-					$where_count = count( $clause_sql['where'] );
-					if ( ! $where_count ) {
+					$where_count = count($clause_sql['where']);
+					if ( ! $where_count) {
 						$sql_chunks['where'][] = '';
-					} elseif ( 1 === $where_count ) {
+					} elseif (1 === $where_count) {
 						$sql_chunks['where'][] = $clause_sql['where'][0];
 					} else {
-						$sql_chunks['where'][] = '( ' . implode( ' AND ', $clause_sql['where'] ) . ' )';
+						$sql_chunks['where'][] = '( '.implode(' AND ', $clause_sql['where']).' )';
 					}
 
-					$sql_chunks['join'] = array_merge( $sql_chunks['join'], $clause_sql['join'] );
+					$sql_chunks['join'] = array_merge($sql_chunks['join'], $clause_sql['join']);
 				// This is a subquery, so we recurse.
 				} else {
-					$clause_sql = $this->get_sql_for_query( $clause, $depth + 1 );
+					$clause_sql = $this->get_sql_for_query($clause, $depth + 1);
 
 					$sql_chunks['where'][] = $clause_sql['where'];
 					$sql_chunks['join'][]  = $clause_sql['join'];
@@ -361,21 +361,21 @@ 
 		}
 
 		// Filter to remove empties.
-		$sql_chunks['join']  = array_filter( $sql_chunks['join'] );
-		$sql_chunks['where'] = array_filter( $sql_chunks['where'] );
+		$sql_chunks['join']  = array_filter($sql_chunks['join']);
+		$sql_chunks['where'] = array_filter($sql_chunks['where']);
 
-		if ( empty( $relation ) ) {
+		if (empty($relation)) {
 			$relation = 'AND';
 		}
 
 		// Filter duplicate JOIN clauses and combine into a single string.
-		if ( ! empty( $sql_chunks['join'] ) ) {
-			$sql['join'] = implode( ' ', array_unique( $sql_chunks['join'] ) );
+		if ( ! empty($sql_chunks['join'])) {
+			$sql['join'] = implode(' ', array_unique($sql_chunks['join']));
 		}
 
 		// Generate a single WHERE clause with proper brackets and indentation.
-		if ( ! empty( $sql_chunks['where'] ) ) {
-			$sql['where'] = '( ' . "\n  " . $indent . implode( ' ' . "\n  " . $indent . $relation . ' ' . "\n  " . $indent, $sql_chunks['where'] ) . "\n" . $indent . ')';
+		if ( ! empty($sql_chunks['where'])) {
+			$sql['where'] = '( '."\n  ".$indent.implode(' '."\n  ".$indent.$relation.' '."\n  ".$indent, $sql_chunks['where'])."\n".$indent.')';
 		}
 
 		return $sql;
@@ -398,7 +398,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	public function get_sql_for_clause( &$clause, $parent_query ) {
+	public function get_sql_for_clause(&$clause, $parent_query) {
 		global $wpdb;
 
 		$sql = array(
@@ -408,31 +408,31 @@ 
 
 		$join = $where = '';
 
-		$this->clean_query( $clause );
+		$this->clean_query($clause);
 
-		if ( is_wp_error( $clause ) ) {
+		if (is_wp_error($clause)) {
 			return self::$no_results;
 		}
 
 		$terms = $clause['terms'];
-		$operator = strtoupper( $clause['operator'] );
+		$operator = strtoupper($clause['operator']);
 
-		if ( 'IN' == $operator ) {
+		if ('IN' == $operator) {
 
-			if ( empty( $terms ) ) {
+			if (empty($terms)) {
 				return self::$no_results;
 			}
 
-			$terms = implode( ',', $terms );
+			$terms = implode(',', $terms);
 
 			/*
 			 * Before creating another table join, see if this clause has a
 			 * sibling with an existing join that can be shared.
 			 */
-			$alias = $this->find_compatible_table_alias( $clause, $parent_query );
-			if ( false === $alias ) {
-				$i = count( $this->table_aliases );
-				$alias = $i ? 'tt' . $i : $wpdb->term_relationships;
+			$alias = $this->find_compatible_table_alias($clause, $parent_query);
+			if (false === $alias) {
+				$i = count($this->table_aliases);
+				$alias = $i ? 'tt'.$i : $wpdb->term_relationships;
 
 				// Store the alias as part of a flat array to build future iterators.
 				$this->table_aliases[] = $alias;
@@ -448,13 +448,13 @@ 
 
 			$where = "$alias.term_taxonomy_id $operator ($terms)";
 
-		} elseif ( 'NOT IN' == $operator ) {
+		} elseif ('NOT IN' == $operator) {
 
-			if ( empty( $terms ) ) {
+			if (empty($terms)) {
 				return $sql;
 			}
 
-			$terms = implode( ',', $terms );
+			$terms = implode(',', $terms);
 
 			$where = "$this->primary_table.$this->primary_id_column NOT IN (
 				SELECT object_id
@@ -462,15 +462,15 @@ 
 				WHERE term_taxonomy_id IN ($terms)
 			)";
 
-		} elseif ( 'AND' == $operator ) {
+		} elseif ('AND' == $operator) {
 
-			if ( empty( $terms ) ) {
+			if (empty($terms)) {
 				return $sql;
 			}
 
-			$num_terms = count( $terms );
+			$num_terms = count($terms);
 
-			$terms = implode( ',', $terms );
+			$terms = implode(',', $terms);
 
 			$where = "(
 				SELECT COUNT(1)
@@ -479,16 +479,16 @@ 
 				AND object_id = $this->primary_table.$this->primary_id_column
 			) = $num_terms";
 
-		} elseif ( 'NOT EXISTS' === $operator || 'EXISTS' === $operator ) {
+		} elseif ('NOT EXISTS' === $operator || 'EXISTS' === $operator) {
 
-			$where = $wpdb->prepare( "$operator (
+			$where = $wpdb->prepare("$operator (
 				SELECT 1
 				FROM $wpdb->term_relationships
 				INNER JOIN $wpdb->term_taxonomy
 				ON $wpdb->term_taxonomy.term_taxonomy_id = $wpdb->term_relationships.term_taxonomy_id
 				WHERE $wpdb->term_taxonomy.taxonomy = %s
 				AND $wpdb->term_relationships.object_id = $this->primary_table.$this->primary_id_column
-			)", $clause['taxonomy'] );
+			)", $clause['taxonomy']);
 
 		}
 
@@ -517,32 +517,32 @@ 
 	 * @param array       $parent_query Parent query of $clause.
 	 * @return string|false Table alias if found, otherwise false.
 	 */
-	protected function find_compatible_table_alias( $clause, $parent_query ) {
+	protected function find_compatible_table_alias($clause, $parent_query) {
 		$alias = false;
 
 		// Sanity check. Only IN queries use the JOIN syntax .
-		if ( ! isset( $clause['operator'] ) || 'IN' !== $clause['operator'] ) {
+		if ( ! isset($clause['operator']) || 'IN' !== $clause['operator']) {
 			return $alias;
 		}
 
 		// Since we're only checking IN queries, we're only concerned with OR relations.
-		if ( ! isset( $parent_query['relation'] ) || 'OR' !== $parent_query['relation'] ) {
+		if ( ! isset($parent_query['relation']) || 'OR' !== $parent_query['relation']) {
 			return $alias;
 		}
 
-		$compatible_operators = array( 'IN' );
+		$compatible_operators = array('IN');
 
-		foreach ( $parent_query as $sibling ) {
-			if ( ! is_array( $sibling ) || ! $this->is_first_order_clause( $sibling ) ) {
+		foreach ($parent_query as $sibling) {
+			if ( ! is_array($sibling) || ! $this->is_first_order_clause($sibling)) {
 				continue;
 			}
 
-			if ( empty( $sibling['alias'] ) || empty( $sibling['operator'] ) ) {
+			if (empty($sibling['alias']) || empty($sibling['operator'])) {
 				continue;
 			}
 
 			// The sibling must both have compatible operator to share its alias.
-			if ( in_array( strtoupper( $sibling['operator'] ), $compatible_operators ) ) {
+			if (in_array(strtoupper($sibling['operator']), $compatible_operators)) {
 				$alias = $sibling['alias'];
 				break;
 			}
@@ -559,37 +559,37 @@ 
 	 *
 	 * @param array $query The single query. Passed by reference.
 	 */
-	private function clean_query( &$query ) {
-		if ( empty( $query['taxonomy'] ) ) {
-			if ( 'term_taxonomy_id' !== $query['field'] ) {
-				$query = new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+	private function clean_query(&$query) {
+		if (empty($query['taxonomy'])) {
+			if ('term_taxonomy_id' !== $query['field']) {
+				$query = new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 				return;
 			}
 
 			// so long as there are shared terms, include_children requires that a taxonomy is set
 			$query['include_children'] = false;
-		} elseif ( ! taxonomy_exists( $query['taxonomy'] ) ) {
-			$query = new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+		} elseif ( ! taxonomy_exists($query['taxonomy'])) {
+			$query = new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 			return;
 		}
 
-		$query['terms'] = array_unique( (array) $query['terms'] );
+		$query['terms'] = array_unique((array) $query['terms']);
 
-		if ( is_taxonomy_hierarchical( $query['taxonomy'] ) && $query['include_children'] ) {
-			$this->transform_query( $query, 'term_id' );
+		if (is_taxonomy_hierarchical($query['taxonomy']) && $query['include_children']) {
+			$this->transform_query($query, 'term_id');
 
-			if ( is_wp_error( $query ) )
+			if (is_wp_error($query))
 				return;
 
 			$children = array();
-			foreach ( $query['terms'] as $term ) {
-				$children = array_merge( $children, get_term_children( $term, $query['taxonomy'] ) );
+			foreach ($query['terms'] as $term) {
+				$children = array_merge($children, get_term_children($term, $query['taxonomy']));
 				$children[] = $term;
 			}
 			$query['terms'] = $children;
 		}
 
-		$this->transform_query( $query, 'term_taxonomy_id' );
+		$this->transform_query($query, 'term_taxonomy_id');
 	}
 
 	/**
@@ -603,64 +603,64 @@ 
 	 * @param string $resulting_field The resulting field. Accepts 'slug', 'name', 'term_taxonomy_id',
 	 *                                or 'term_id'. Default 'term_id'.
 	 */
-	public function transform_query( &$query, $resulting_field ) {
+	public function transform_query(&$query, $resulting_field) {
 		global $wpdb;
 
-		if ( empty( $query['terms'] ) )
+		if (empty($query['terms']))
 			return;
 
-		if ( $query['field'] == $resulting_field )
+		if ($query['field'] == $resulting_field)
 			return;
 
-		$resulting_field = sanitize_key( $resulting_field );
+		$resulting_field = sanitize_key($resulting_field);
 
-		switch ( $query['field'] ) {
+		switch ($query['field']) {
 			case 'slug':
 			case 'name':
-				foreach ( $query['terms'] as &$term ) {
+				foreach ($query['terms'] as &$term) {
 					/*
 					 * 0 is the $term_id parameter. We don't have a term ID yet, but it doesn't
 					 * matter because `sanitize_term_field()` ignores the $term_id param when the
 					 * context is 'db'.
 					 */
-					$clean_term = sanitize_term_field( $query['field'], $term, 0, $query['taxonomy'], 'db' );
+					$clean_term = sanitize_term_field($query['field'], $term, 0, $query['taxonomy'], 'db');
 
 					// Match sanitization in wp_insert_term().
-					$clean_term = wp_unslash( $clean_term );
+					$clean_term = wp_unslash($clean_term);
 
-					$term = "'" . esc_sql( $clean_term ) . "'";
+					$term = "'".esc_sql($clean_term)."'";
 				}
 
-				$terms = implode( ",", $query['terms'] );
+				$terms = implode(",", $query['terms']);
 
-				$terms = $wpdb->get_col( "
+				$terms = $wpdb->get_col("
 					SELECT $wpdb->term_taxonomy.$resulting_field
 					FROM $wpdb->term_taxonomy
 					INNER JOIN $wpdb->terms USING (term_id)
 					WHERE taxonomy = '{$query['taxonomy']}'
 					AND $wpdb->terms.{$query['field']} IN ($terms)
-				" );
+				");
 				break;
 			case 'term_taxonomy_id':
-				$terms = implode( ',', array_map( 'intval', $query['terms'] ) );
-				$terms = $wpdb->get_col( "
+				$terms = implode(',', array_map('intval', $query['terms']));
+				$terms = $wpdb->get_col("
 					SELECT $resulting_field
 					FROM $wpdb->term_taxonomy
 					WHERE term_taxonomy_id IN ($terms)
-				" );
+				");
 				break;
 			default:
-				$terms = implode( ',', array_map( 'intval', $query['terms'] ) );
-				$terms = $wpdb->get_col( "
+				$terms = implode(',', array_map('intval', $query['terms']));
+				$terms = $wpdb->get_col("
 					SELECT $resulting_field
 					FROM $wpdb->term_taxonomy
 					WHERE taxonomy = '{$query['taxonomy']}'
 					AND term_id IN ($terms)
-				" );
+				");
 		}
 
-		if ( 'AND' == $query['operator'] && count( $terms ) < count( $query['terms'] ) ) {
-			$query = new WP_Error( 'inexistent_terms', __( 'Inexistent terms.' ) );
+		if ('AND' == $query['operator'] && count($terms) < count($query['terms'])) {
+			$query = new WP_Error('inexistent_terms', __('Inexistent terms.'));
 			return;
 		}
 

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

Indentation +7 added lines, -7 removed lines

@@ -258,16 +258,16 @@
 	}
 
 	/**
- 	 * paged_walk() - produce a page of nested elements
- 	 *
- 	 * Given an array of hierarchical elements, the maximum depth, a specific page number,
- 	 * and number of elements per page, this function first determines all top level root elements
- 	 * belonging to that page, then lists them and all of their children in hierarchical order.
- 	 *
+	 * paged_walk() - produce a page of nested elements
+	 *
+	 * Given an array of hierarchical elements, the maximum depth, a specific page number,
+	 * and number of elements per page, this function first determines all top level root elements
+	 * belonging to that page, then lists them and all of their children in hierarchical order.
+	 *
 	 * $max_depth = 0 means display all levels.
 	 * $max_depth > 0 specifies the number of display levels.
 	 *
- 	 * @since 2.7.0
+	 * @since 2.7.0
 	 *
 	 * @param array $elements
 	 * @param int   $max_depth The maximum hierarchical depth.

Spacing +77 added lines, -77 removed lines

@@ -60,7 +60,7 @@ 
 	 * @param int    $depth  Depth of the item.
 	 * @param array  $args   An array of additional arguments.
 	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {}
+	public function start_lvl(&$output, $depth = 0, $args = array()) {}
 
 	/**
 	 * Ends the list of after the elements are added.
@@ -75,7 +75,7 @@ 
 	 * @param int    $depth  Depth of the item.
 	 * @param array  $args   An array of additional arguments.
 	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {}
+	public function end_lvl(&$output, $depth = 0, $args = array()) {}
 
 	/**
 	 * Start the element output.
@@ -92,7 +92,7 @@ 
 	 * @param array  $args              An array of additional arguments.
 	 * @param int    $current_object_id ID of the current item.
 	 */
-	public function start_el( &$output, $object, $depth = 0, $args = array(), $current_object_id = 0 ) {}
+	public function start_el(&$output, $object, $depth = 0, $args = array(), $current_object_id = 0) {}
 
 	/**
 	 * Ends the element output, if needed.
@@ -107,7 +107,7 @@ 
 	 * @param int    $depth  Depth of the item.
 	 * @param array  $args   An array of additional arguments.
 	 */
-	public function end_el( &$output, $object, $depth = 0, $args = array() ) {}
+	public function end_el(&$output, $object, $depth = 0, $args = array()) {}
 
 	/**
 	 * Traverse elements to create list from elements.
@@ -128,8 +128,8 @@ 
 	 * @param array  $args              An array of arguments.
 	 * @param string $output            Passed by reference. Used to append additional content.
 	 */
-	public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
-		if ( ! $element ) {
+	public function display_element($element, &$children_elements, $max_depth, $depth, $args, &$output) {
+		if ( ! $element) {
 			return;
 		}
 
@@ -137,38 +137,38 @@ 
 		$id       = $element->$id_field;
 
 		//display this element
-		$this->has_children = ! empty( $children_elements[ $id ] );
-		if ( isset( $args[0] ) && is_array( $args[0] ) ) {
+		$this->has_children = ! empty($children_elements[$id]);
+		if (isset($args[0]) && is_array($args[0])) {
 			$args[0]['has_children'] = $this->has_children; // Backwards compatibility.
 		}
 
-		$cb_args = array_merge( array(&$output, $element, $depth), $args);
+		$cb_args = array_merge(array(&$output, $element, $depth), $args);
 		call_user_func_array(array($this, 'start_el'), $cb_args);
 
 		// descend only when the depth is right and there are childrens for this element
-		if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$id]) ) {
+		if (($max_depth == 0 || $max_depth > $depth + 1) && isset($children_elements[$id])) {
 
-			foreach ( $children_elements[ $id ] as $child ){
+			foreach ($children_elements[$id] as $child) {
 
-				if ( !isset($newlevel) ) {
+				if ( ! isset($newlevel)) {
 					$newlevel = true;
 					//start the child delimiter
-					$cb_args = array_merge( array(&$output, $depth), $args);
+					$cb_args = array_merge(array(&$output, $depth), $args);
 					call_user_func_array(array($this, 'start_lvl'), $cb_args);
 				}
-				$this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output );
+				$this->display_element($child, $children_elements, $max_depth, $depth + 1, $args, $output);
 			}
-			unset( $children_elements[ $id ] );
+			unset($children_elements[$id]);
 		}
 
-		if ( isset($newlevel) && $newlevel ){
+		if (isset($newlevel) && $newlevel) {
 			//end the child delimiter
-			$cb_args = array_merge( array(&$output, $depth), $args);
+			$cb_args = array_merge(array(&$output, $depth), $args);
 			call_user_func_array(array($this, 'end_lvl'), $cb_args);
 		}
 
 		//end this element
-		$cb_args = array_merge( array(&$output, $element, $depth), $args);
+		$cb_args = array_merge(array(&$output, $element, $depth), $args);
 		call_user_func_array(array($this, 'end_el'), $cb_args);
 	}
 
@@ -187,12 +187,12 @@ 
 	 * @param int   $max_depth The maximum hierarchical depth.
 	 * @return string The hierarchical item output.
 	 */
-	public function walk( $elements, $max_depth ) {
+	public function walk($elements, $max_depth) {
 		$args = array_slice(func_get_args(), 2);
 		$output = '';
 
 		//invalid parameter or nothing to walk
-		if ( $max_depth < -1 || empty( $elements ) ) {
+		if ($max_depth < -1 || empty($elements)) {
 			return $output;
 		}
 
@@ -201,8 +201,8 @@ 
 		// flat display
 		if ( -1 == $max_depth ) {
 			$empty_array = array();
-			foreach ( $elements as $e )
-				$this->display_element( $e, $empty_array, 1, 0, $args, $output );
+			foreach ($elements as $e)
+				$this->display_element($e, $empty_array, 1, 0, $args, $output);
 			return $output;
 		}
 
@@ -214,44 +214,44 @@ 
 		 */
 		$top_level_elements = array();
 		$children_elements  = array();
-		foreach ( $elements as $e) {
-			if ( empty( $e->$parent_field ) )
+		foreach ($elements as $e) {
+			if (empty($e->$parent_field))
 				$top_level_elements[] = $e;
 			else
-				$children_elements[ $e->$parent_field ][] = $e;
+				$children_elements[$e->$parent_field][] = $e;
 		}
 
 		/*
 		 * When none of the elements is top level.
 		 * Assume the first one must be root of the sub elements.
 		 */
-		if ( empty($top_level_elements) ) {
+		if (empty($top_level_elements)) {
 
-			$first = array_slice( $elements, 0, 1 );
+			$first = array_slice($elements, 0, 1);
 			$root = $first[0];
 
 			$top_level_elements = array();
 			$children_elements  = array();
-			foreach ( $elements as $e) {
-				if ( $root->$parent_field == $e->$parent_field )
+			foreach ($elements as $e) {
+				if ($root->$parent_field == $e->$parent_field)
 					$top_level_elements[] = $e;
 				else
-					$children_elements[ $e->$parent_field ][] = $e;
+					$children_elements[$e->$parent_field][] = $e;
 			}
 		}
 
-		foreach ( $top_level_elements as $e )
-			$this->display_element( $e, $children_elements, $max_depth, 0, $args, $output );
+		foreach ($top_level_elements as $e)
+			$this->display_element($e, $children_elements, $max_depth, 0, $args, $output);
 
 		/*
 		 * If we are displaying all levels, and remaining children_elements is not empty,
 		 * then we got orphans, which should be displayed regardless.
 		 */
-		if ( ( $max_depth == 0 ) && count( $children_elements ) > 0 ) {
+		if (($max_depth == 0) && count($children_elements) > 0) {
 			$empty_array = array();
-			foreach ( $children_elements as $orphans )
-				foreach ( $orphans as $op )
-					$this->display_element( $op, $empty_array, 1, 0, $args, $output );
+			foreach ($children_elements as $orphans)
+				foreach ($orphans as $op)
+					$this->display_element($op, $empty_array, 1, 0, $args, $output);
 		 }
 
 		 return $output;
@@ -275,20 +275,20 @@ 
 	 * @param int   $per_page
 	 * @return string XHTML of the specified page of elements
 	 */
-	public function paged_walk( $elements, $max_depth, $page_num, $per_page ) {
-		if ( empty( $elements ) || $max_depth < -1 ) {
+	public function paged_walk($elements, $max_depth, $page_num, $per_page) {
+		if (empty($elements) || $max_depth < -1) {
 			return '';
 		}
 
-		$args = array_slice( func_get_args(), 4 );
+		$args = array_slice(func_get_args(), 4);
 		$output = '';
 
 		$parent_field = $this->db_fields['parent'];
 
 		$count = -1;
 		if ( -1 == $max_depth )
-			$total_top = count( $elements );
-		if ( $page_num < 1 || $per_page < 0  ) {
+			$total_top = count($elements);
+		if ($page_num < 1 || $per_page < 0) {
 			// No paging
 			$paging = false;
 			$start = 0;
@@ -297,7 +297,7 @@ 
 			$this->max_pages = 1;
 		} else {
 			$paging = true;
-			$start = ( (int)$page_num - 1 ) * (int)$per_page;
+			$start = ((int) $page_num - 1) * (int) $per_page;
 			$end   = $start + $per_page;
 			if ( -1 == $max_depth )
 				$this->max_pages = ceil($total_top / $per_page);
@@ -305,21 +305,21 @@ 
 
 		// flat display
 		if ( -1 == $max_depth ) {
-			if ( !empty($args[0]['reverse_top_level']) ) {
-				$elements = array_reverse( $elements );
+			if ( ! empty($args[0]['reverse_top_level'])) {
+				$elements = array_reverse($elements);
 				$oldstart = $start;
 				$start = $total_top - $end;
 				$end = $total_top - $oldstart;
 			}
 
 			$empty_array = array();
-			foreach ( $elements as $e ) {
+			foreach ($elements as $e) {
 				$count++;
-				if ( $count < $start )
+				if ($count < $start)
 					continue;
-				if ( $count >= $end )
+				if ($count >= $end)
 					break;
-				$this->display_element( $e, $empty_array, 1, 0, $args, $output );
+				$this->display_element($e, $empty_array, 1, 0, $args, $output);
 			}
 			return $output;
 		}
@@ -331,51 +331,51 @@ 
 		 */
 		$top_level_elements = array();
 		$children_elements  = array();
-		foreach ( $elements as $e) {
-			if ( 0 == $e->$parent_field )
+		foreach ($elements as $e) {
+			if (0 == $e->$parent_field)
 				$top_level_elements[] = $e;
 			else
-				$children_elements[ $e->$parent_field ][] = $e;
+				$children_elements[$e->$parent_field][] = $e;
 		}
 
-		$total_top = count( $top_level_elements );
-		if ( $paging )
+		$total_top = count($top_level_elements);
+		if ($paging)
 			$this->max_pages = ceil($total_top / $per_page);
 		else
 			$end = $total_top;
 
-		if ( !empty($args[0]['reverse_top_level']) ) {
-			$top_level_elements = array_reverse( $top_level_elements );
+		if ( ! empty($args[0]['reverse_top_level'])) {
+			$top_level_elements = array_reverse($top_level_elements);
 			$oldstart = $start;
 			$start = $total_top - $end;
 			$end = $total_top - $oldstart;
 		}
-		if ( !empty($args[0]['reverse_children']) ) {
-			foreach ( $children_elements as $parent => $children )
-				$children_elements[$parent] = array_reverse( $children );
+		if ( ! empty($args[0]['reverse_children'])) {
+			foreach ($children_elements as $parent => $children)
+				$children_elements[$parent] = array_reverse($children);
 		}
 
-		foreach ( $top_level_elements as $e ) {
+		foreach ($top_level_elements as $e) {
 			$count++;
 
 			// For the last page, need to unset earlier children in order to keep track of orphans.
-			if ( $end >= $total_top && $count < $start )
-					$this->unset_children( $e, $children_elements );
+			if ($end >= $total_top && $count < $start)
+					$this->unset_children($e, $children_elements);
 
-			if ( $count < $start )
+			if ($count < $start)
 				continue;
 
-			if ( $count >= $end )
+			if ($count >= $end)
 				break;
 
-			$this->display_element( $e, $children_elements, $max_depth, 0, $args, $output );
+			$this->display_element($e, $children_elements, $max_depth, 0, $args, $output);
 		}
 
-		if ( $end >= $total_top && count( $children_elements ) > 0 ) {
+		if ($end >= $total_top && count($children_elements) > 0) {
 			$empty_array = array();
-			foreach ( $children_elements as $orphans )
-				foreach ( $orphans as $op )
-					$this->display_element( $op, $empty_array, 1, 0, $args, $output );
+			foreach ($children_elements as $orphans)
+				foreach ($orphans as $op)
+					$this->display_element($op, $empty_array, 1, 0, $args, $output);
 		}
 
 		return $output;
@@ -390,12 +390,12 @@ 
 	 * @param array $elements Elements to list.
 	 * @return int Number of root elements.
 	 */
-	public function get_number_of_root_elements( $elements ){
+	public function get_number_of_root_elements($elements) {
 		$num = 0;
 		$parent_field = $this->db_fields['parent'];
 
-		foreach ( $elements as $e) {
-			if ( 0 == $e->$parent_field )
+		foreach ($elements as $e) {
+			if (0 == $e->$parent_field)
 				$num++;
 		}
 		return $num;
@@ -407,19 +407,19 @@ 
 	 * @param object $e
 	 * @param array $children_elements
 	 */
-	public function unset_children( $e, &$children_elements ){
-		if ( ! $e || ! $children_elements ) {
+	public function unset_children($e, &$children_elements) {
+		if ( ! $e || ! $children_elements) {
 			return;
 		}
 
 		$id_field = $this->db_fields['id'];
 		$id = $e->$id_field;
 
-		if ( !empty($children_elements[$id]) && is_array($children_elements[$id]) )
-			foreach ( (array) $children_elements[$id] as $child )
-				$this->unset_children( $child, $children_elements );
+		if ( ! empty($children_elements[$id]) && is_array($children_elements[$id]))
+			foreach ((array) $children_elements[$id] as $child)
+				$this->unset_children($child, $children_elements);
 
-		unset( $children_elements[ $id ] );
+		unset($children_elements[$id]);
 	}
 
 } // Walker

Braces +65 added lines, -46 removed lines

@@ -201,8 +201,9 @@ 
 		// flat display
 		if ( -1 == $max_depth ) {
 			$empty_array = array();
-			foreach ( $elements as $e )
-				$this->display_element( $e, $empty_array, 1, 0, $args, $output );
+			foreach ( $elements as $e ) {
+							$this->display_element( $e, $empty_array, 1, 0, $args, $output );
+			}
 			return $output;
 		}
 
@@ -215,10 +216,11 @@ 
 		$top_level_elements = array();
 		$children_elements  = array();
 		foreach ( $elements as $e) {
-			if ( empty( $e->$parent_field ) )
-				$top_level_elements[] = $e;
-			else
-				$children_elements[ $e->$parent_field ][] = $e;
+			if ( empty( $e->$parent_field ) ) {
+							$top_level_elements[] = $e;
+			} else {
+							$children_elements[ $e->$parent_field ][] = $e;
+			}
 		}
 
 		/*
@@ -233,15 +235,17 @@ 
 			$top_level_elements = array();
 			$children_elements  = array();
 			foreach ( $elements as $e) {
-				if ( $root->$parent_field == $e->$parent_field )
-					$top_level_elements[] = $e;
-				else
-					$children_elements[ $e->$parent_field ][] = $e;
+				if ( $root->$parent_field == $e->$parent_field ) {
+									$top_level_elements[] = $e;
+				} else {
+									$children_elements[ $e->$parent_field ][] = $e;
+				}
 			}
 		}
 
-		foreach ( $top_level_elements as $e )
-			$this->display_element( $e, $children_elements, $max_depth, 0, $args, $output );
+		foreach ( $top_level_elements as $e ) {
+					$this->display_element( $e, $children_elements, $max_depth, 0, $args, $output );
+		}
 
 		/*
 		 * If we are displaying all levels, and remaining children_elements is not empty,
@@ -249,9 +253,10 @@ 
 		 */
 		if ( ( $max_depth == 0 ) && count( $children_elements ) > 0 ) {
 			$empty_array = array();
-			foreach ( $children_elements as $orphans )
-				foreach ( $orphans as $op )
+			foreach ( $children_elements as $orphans ) {
+							foreach ( $orphans as $op )
 					$this->display_element( $op, $empty_array, 1, 0, $args, $output );
+			}
 		 }
 
 		 return $output;
@@ -286,21 +291,24 @@ 
 		$parent_field = $this->db_fields['parent'];
 
 		$count = -1;
-		if ( -1 == $max_depth )
-			$total_top = count( $elements );
+		if ( -1 == $max_depth ) {
+					$total_top = count( $elements );
+		}
 		if ( $page_num < 1 || $per_page < 0  ) {
 			// No paging
 			$paging = false;
 			$start = 0;
-			if ( -1 == $max_depth )
-				$end = $total_top;
+			if ( -1 == $max_depth ) {
+							$end = $total_top;
+			}
 			$this->max_pages = 1;
 		} else {
 			$paging = true;
 			$start = ( (int)$page_num - 1 ) * (int)$per_page;
 			$end   = $start + $per_page;
-			if ( -1 == $max_depth )
-				$this->max_pages = ceil($total_top / $per_page);
+			if ( -1 == $max_depth ) {
+							$this->max_pages = ceil($total_top / $per_page);
+			}
 		}
 
 		// flat display
@@ -315,10 +323,12 @@ 
 			$empty_array = array();
 			foreach ( $elements as $e ) {
 				$count++;
-				if ( $count < $start )
-					continue;
-				if ( $count >= $end )
-					break;
+				if ( $count < $start ) {
+									continue;
+				}
+				if ( $count >= $end ) {
+									break;
+				}
 				$this->display_element( $e, $empty_array, 1, 0, $args, $output );
 			}
 			return $output;
@@ -332,17 +342,19 @@ 
 		$top_level_elements = array();
 		$children_elements  = array();
 		foreach ( $elements as $e) {
-			if ( 0 == $e->$parent_field )
-				$top_level_elements[] = $e;
-			else
-				$children_elements[ $e->$parent_field ][] = $e;
+			if ( 0 == $e->$parent_field ) {
+							$top_level_elements[] = $e;
+			} else {
+							$children_elements[ $e->$parent_field ][] = $e;
+			}
 		}
 
 		$total_top = count( $top_level_elements );
-		if ( $paging )
-			$this->max_pages = ceil($total_top / $per_page);
-		else
-			$end = $total_top;
+		if ( $paging ) {
+					$this->max_pages = ceil($total_top / $per_page);
+		} else {
+					$end = $total_top;
+		}
 
 		if ( !empty($args[0]['reverse_top_level']) ) {
 			$top_level_elements = array_reverse( $top_level_elements );
@@ -351,31 +363,36 @@ 
 			$end = $total_top - $oldstart;
 		}
 		if ( !empty($args[0]['reverse_children']) ) {
-			foreach ( $children_elements as $parent => $children )
-				$children_elements[$parent] = array_reverse( $children );
+			foreach ( $children_elements as $parent => $children ) {
+							$children_elements[$parent] = array_reverse( $children );
+			}
 		}
 
 		foreach ( $top_level_elements as $e ) {
 			$count++;
 
 			// For the last page, need to unset earlier children in order to keep track of orphans.
-			if ( $end >= $total_top && $count < $start )
-					$this->unset_children( $e, $children_elements );
+			if ( $end >= $total_top && $count < $start ) {
+								$this->unset_children( $e, $children_elements );
+			}
 
-			if ( $count < $start )
-				continue;
+			if ( $count < $start ) {
+							continue;
+			}
 
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
 			$this->display_element( $e, $children_elements, $max_depth, 0, $args, $output );
 		}
 
 		if ( $end >= $total_top && count( $children_elements ) > 0 ) {
 			$empty_array = array();
-			foreach ( $children_elements as $orphans )
-				foreach ( $orphans as $op )
+			foreach ( $children_elements as $orphans ) {
+							foreach ( $orphans as $op )
 					$this->display_element( $op, $empty_array, 1, 0, $args, $output );
+			}
 		}
 
 		return $output;
@@ -395,8 +412,9 @@ 
 		$parent_field = $this->db_fields['parent'];
 
 		foreach ( $elements as $e) {
-			if ( 0 == $e->$parent_field )
-				$num++;
+			if ( 0 == $e->$parent_field ) {
+							$num++;
+			}
 		}
 		return $num;
 	}
@@ -415,9 +433,10 @@ 
 		$id_field = $this->db_fields['id'];
 		$id = $e->$id_field;
 
-		if ( !empty($children_elements[$id]) && is_array($children_elements[$id]) )
-			foreach ( (array) $children_elements[$id] as $child )
+		if ( !empty($children_elements[$id]) && is_array($children_elements[$id]) ) {
+					foreach ( (array) $children_elements[$id] as $child )
 				$this->unset_children( $child, $children_elements );
+		}
 
 		unset( $children_elements[ $id ] );
 	}

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

Spacing +27 added lines, -27 removed lines

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

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

Braces +110 added lines, -78 removed lines

@@ -462,8 +462,9 @@ 
 		$posts = get_page_hierarchy( $pages );
 
 		// If we have no pages get out quick.
-		if ( !$posts )
-			return array( array(), array() );
+		if ( !$posts ) {
+					return array( array(), array() );
+		}
 
 		// Now reverse it, because we need parents after children for rewrite rules to work properly.
 		$posts = array_reverse($posts, true);
@@ -524,8 +525,9 @@ 
 	 * @return string|false False on no permalink structure. Date permalink structure.
 	 */
 	public function get_date_permastruct() {
-		if ( isset($this->date_structure) )
-			return $this->date_structure;
+		if ( isset($this->date_structure) ) {
+					return $this->date_structure;
+		}
 
 		if ( empty($this->permalink_structure) ) {
 			$this->date_structure = '';
@@ -545,8 +547,9 @@ 
 			}
 		}
 
-		if ( empty($date_endian) )
-			$date_endian = '%year%/%monthnum%/%day%';
+		if ( empty($date_endian) ) {
+					$date_endian = '%year%/%monthnum%/%day%';
+		}
 
 		/*
 		 * Do not allow the date tags and %post_id% to overlap in the permalink
@@ -582,8 +585,9 @@ 
 	public function get_year_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
-			return false;
+		if ( empty($structure) ) {
+					return false;
+		}
 
 		$structure = str_replace('%monthnum%', '', $structure);
 		$structure = str_replace('%day%', '', $structure);
@@ -606,8 +610,9 @@ 
 	public function get_month_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
-			return false;
+		if ( empty($structure) ) {
+					return false;
+		}
 
 		$structure = str_replace('%day%', '', $structure);
 		$structure = preg_replace('#/+#', '/', $structure);
@@ -673,11 +678,13 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_extra_permastruct($name) {
-		if ( empty($this->permalink_structure) )
-			return false;
+		if ( empty($this->permalink_structure) ) {
+					return false;
+		}
 
-		if ( isset($this->extra_permastructs[$name]) )
-			return $this->extra_permastructs[$name]['struct'];
+		if ( isset($this->extra_permastructs[$name]) ) {
+					return $this->extra_permastructs[$name]['struct'];
+		}
 
 		return false;
 	}
@@ -695,8 +702,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_author_permastruct() {
-		if ( isset($this->author_structure) )
-			return $this->author_structure;
+		if ( isset($this->author_structure) ) {
+					return $this->author_structure;
+		}
 
 		if ( empty($this->permalink_structure) ) {
 			$this->author_structure = '';
@@ -721,8 +729,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_search_permastruct() {
-		if ( isset($this->search_structure) )
-			return $this->search_structure;
+		if ( isset($this->search_structure) ) {
+					return $this->search_structure;
+		}
 
 		if ( empty($this->permalink_structure) ) {
 			$this->search_structure = '';
@@ -747,8 +756,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_page_permastruct() {
-		if ( isset($this->page_structure) )
-			return $this->page_structure;
+		if ( isset($this->page_structure) ) {
+					return $this->page_structure;
+		}
 
 		if (empty($this->permalink_structure)) {
 			$this->page_structure = '';
@@ -773,8 +783,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_feed_permastruct() {
-		if ( isset($this->feed_structure) )
-			return $this->feed_structure;
+		if ( isset($this->feed_structure) ) {
+					return $this->feed_structure;
+		}
 
 		if ( empty($this->permalink_structure) ) {
 			$this->feed_structure = '';
@@ -799,8 +810,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_comment_feed_permastruct() {
-		if ( isset($this->comment_feed_structure) )
-			return $this->comment_feed_structure;
+		if ( isset($this->comment_feed_structure) ) {
+					return $this->comment_feed_structure;
+		}
 
 		if (empty($this->permalink_structure)) {
 			$this->comment_feed_structure = '';
@@ -894,8 +906,9 @@ 
 	public function generate_rewrite_rules($permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true) {
 		// Build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
 		$feedregex2 = '';
-		foreach ( (array) $this->feeds as $feed_name)
-			$feedregex2 .= $feed_name . '|';
+		foreach ( (array) $this->feeds as $feed_name) {
+					$feedregex2 .= $feed_name . '|';
+		}
 		$feedregex2 = '(' . trim($feedregex2, '|') . ')/?$';
 
 		/*
@@ -942,10 +955,11 @@ 
 		 */
 		$queries = array();
 		for ( $i = 0; $i < $num_tokens; ++$i ) {
-			if ( 0 < $i )
-				$queries[$i] = $queries[$i - 1] . '&';
-			else
-				$queries[$i] = '';
+			if ( 0 < $i ) {
+							$queries[$i] = $queries[$i - 1] . '&';
+			} else {
+							$queries[$i] = '';
+			}
 
 			$query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]) . $this->preg_index($i+1);
 			$queries[$i] .= $query_token;
@@ -953,8 +967,9 @@ 
 
 		// Get the structure, minus any cruft (stuff that isn't tags) at the front.
 		$structure = $permalink_structure;
-		if ( $front != '/' )
-			$structure = str_replace($front, '', $structure);
+		if ( $front != '/' ) {
+					$structure = str_replace($front, '', $structure);
+		}
 
 		/*
 		 * Create a list of dirs to walk over, making rewrite rules for each level
@@ -1056,8 +1071,9 @@ 
 			if ( $endpoints ) {
 				foreach ( (array) $ep_query_append as $regex => $ep) {
 					// Add the endpoints on if the mask fits.
-					if ( $ep[0] & $ep_mask || $ep[0] & $ep_mask_specific )
-						$rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
+					if ( $ep[0] & $ep_mask || $ep[0] & $ep_mask_specific ) {
+											$rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
+					}
 				}
 			}
 
@@ -1078,8 +1094,9 @@ 
 						|| (strpos($struct, '%year%') !== false && strpos($struct, '%monthnum%') !== false && strpos($struct, '%day%') !== false && strpos($struct, '%hour%') !== false && strpos($struct, '%minute%') !== false && strpos($struct, '%second%') !== false)
 						) {
 					$post = true;
-					if ( strpos($struct, '%pagename%') !== false )
-						$page = true;
+					if ( strpos($struct, '%pagename%') !== false ) {
+											$page = true;
+					}
 				}
 
 				if ( ! $post ) {
@@ -1270,8 +1287,9 @@ 
 	public function rewrite_rules() {
 		$rewrite = array();
 
-		if ( empty($this->permalink_structure) )
-			return $rewrite;
+		if ( empty($this->permalink_structure) ) {
+					return $rewrite;
+		}
 
 		// robots.txt -only if installed at the root
 		$home_path = parse_url( home_url() );
@@ -1394,10 +1412,11 @@ 
 		// Extra permastructs.
 		foreach ( $this->extra_permastructs as $permastructname => $struct ) {
 			if ( is_array( $struct ) ) {
-				if ( count( $struct ) == 2 )
-					$rules = $this->generate_rewrite_rules( $struct[0], $struct[1] );
-				else
-					$rules = $this->generate_rewrite_rules( $struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] );
+				if ( count( $struct ) == 2 ) {
+									$rules = $this->generate_rewrite_rules( $struct[0], $struct[1] );
+				} else {
+									$rules = $this->generate_rewrite_rules( $struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] );
+				}
 			} else {
 				$rules = $this->generate_rewrite_rules( $struct );
 			}
@@ -1431,10 +1450,11 @@ 
 		}
 
 		// Put them together.
-		if ( $this->use_verbose_page_rules )
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
-		else
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+		if ( $this->use_verbose_page_rules ) {
+					$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
+		} else {
+					$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+		}
 
 		/**
 		 * Fires after the rewrite rules are generated.
@@ -1496,18 +1516,21 @@ 
 	 * @return string
 	 */
 	public function mod_rewrite_rules() {
-		if ( ! $this->using_permalinks() )
-			return '';
+		if ( ! $this->using_permalinks() ) {
+					return '';
+		}
 
 		$site_root = parse_url( site_url() );
-		if ( isset( $site_root['path'] ) )
-			$site_root = trailingslashit($site_root['path']);
+		if ( isset( $site_root['path'] ) ) {
+					$site_root = trailingslashit($site_root['path']);
+		}
 
 		$home_root = parse_url(home_url());
-		if ( isset( $home_root['path'] ) )
-			$home_root = trailingslashit($home_root['path']);
-		else
-			$home_root = '/';
+		if ( isset( $home_root['path'] ) ) {
+					$home_root = trailingslashit($home_root['path']);
+		} else {
+					$home_root = '/';
+		}
 
 		$rules = "<IfModule mod_rewrite.c>\n";
 		$rules .= "RewriteEngine On\n";
@@ -1536,10 +1559,11 @@ 
 				// Apache 1.3 does not support the reluctant (non-greedy) modifier.
 				$match = str_replace('.+?', '.+', $match);
 
-				if ( strpos($query, $this->index) !== false )
-					$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
-				else
-					$rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
+				if ( strpos($query, $this->index) !== false ) {
+									$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
+				} else {
+									$rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
+				}
 			}
 		} else {
 			$rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n" .
@@ -1583,8 +1607,9 @@ 
 	 * @return string IIS7 URL rewrite rule sets.
 	 */
 	public function iis7_url_rewrite_rules( $add_parent_tags = false ) {
-		if ( ! $this->using_permalinks() )
-			return '';
+		if ( ! $this->using_permalinks() ) {
+					return '';
+		}
 		$rules = '';
 		if ( $add_parent_tags ) {
 			$rules .= '<configuration>
@@ -1744,10 +1769,12 @@ 
 	 */
 	public function add_permastruct( $name, $struct, $args = array() ) {
 		// Backwards compatibility for the old parameters: $with_front and $ep_mask.
-		if ( ! is_array( $args ) )
-			$args = array( 'with_front' => $args );
-		if ( func_num_args() == 4 )
-			$args['ep_mask'] = func_get_arg( 3 );
+		if ( ! is_array( $args ) ) {
+					$args = array( 'with_front' => $args );
+		}
+		if ( func_num_args() == 4 ) {
+					$args['ep_mask'] = func_get_arg( 3 );
+		}
 
 		$defaults = array(
 			'with_front' => true,
@@ -1761,10 +1788,11 @@ 
 		$args = array_intersect_key( $args, $defaults );
 		$args = wp_parse_args( $args, $defaults );
 
-		if ( $args['with_front'] )
-			$struct = $this->front . $struct;
-		else
-			$struct = $this->root . $struct;
+		if ( $args['with_front'] ) {
+					$struct = $this->front . $struct;
+		} else {
+					$struct = $this->root . $struct;
+		}
 		$args['struct'] = $struct;
 
 		$this->extra_permastructs[ $name ] = $args;
@@ -1825,10 +1853,12 @@ 
 		if ( ! $hard || ! apply_filters( 'flush_rewrite_rules_hard', true ) ) {
 			return;
 		}
-		if ( function_exists( 'save_mod_rewrite_rules' ) )
-			save_mod_rewrite_rules();
-		if ( function_exists( 'iis7_save_url_rewrite_rules' ) )
-			iis7_save_url_rewrite_rules();
+		if ( function_exists( 'save_mod_rewrite_rules' ) ) {
+					save_mod_rewrite_rules();
+		}
+		if ( function_exists( 'iis7_save_url_rewrite_rules' ) ) {
+					iis7_save_url_rewrite_rules();
+		}
 	}
 
 	/**
@@ -1847,8 +1877,9 @@ 
 		$this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
 		$this->root = '';
 
-		if ( $this->using_index_permalinks() )
-			$this->root = $this->index . '/';
+		if ( $this->using_index_permalinks() ) {
+					$this->root = $this->index . '/';
+		}
 
 		unset($this->author_structure);
 		unset($this->date_structure);
@@ -1859,10 +1890,11 @@ 
 		$this->use_trailing_slashes = ( '/' == substr($this->permalink_structure, -1, 1) );
 
 		// Enable generic rules for pages if permalink structure doesn't begin with a wildcard.
-		if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) )
-			 $this->use_verbose_page_rules = true;
-		else
-			$this->use_verbose_page_rules = false;
+		if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) ) {
+					 $this->use_verbose_page_rules = true;
+		} else {
+					$this->use_verbose_page_rules = false;
+		}
 	}
 
 	/**

Spacing +252 added lines, -252 removed lines

@@ -364,7 +364,7 @@ 
 	 * @since 1.5.0
 	 * @var array
 	 */
-	public $feeds = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
+	public $feeds = array('feed', 'rdf', 'rss', 'rss2', 'atom');
 
 	/**
 	 * Determines whether permalinks are being used.
@@ -391,12 +391,12 @@ 
 	 * @return bool Whether permalink links are enabled and index.php is in the URL.
 	 */
 	public function using_index_permalinks() {
-		if ( empty( $this->permalink_structure ) ) {
+		if (empty($this->permalink_structure)) {
 			return false;
 		}
 
 		// If the index is not in the permalink, we're using mod_rewrite.
-		return preg_match( '#^/*' . $this->index . '#', $this->permalink_structure );
+		return preg_match('#^/*'.$this->index.'#', $this->permalink_structure);
 	}
 
 	/**
@@ -433,8 +433,8 @@ 
 		$match_prefix = '$';
 		$match_suffix = '';
 
-		if ( ! empty($this->matches) ) {
-			$match_prefix = '$' . $this->matches . '[';
+		if ( ! empty($this->matches)) {
+			$match_prefix = '$'.$this->matches.'[';
 			$match_suffix = ']';
 		}
 
@@ -459,11 +459,11 @@ 
 
 		// Get pages in order of hierarchy, i.e. children after parents.
 		$pages = $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page' AND post_status != 'auto-draft'");
-		$posts = get_page_hierarchy( $pages );
+		$posts = get_page_hierarchy($pages);
 
 		// If we have no pages get out quick.
-		if ( !$posts )
-			return array( array(), array() );
+		if ( ! $posts)
+			return array(array(), array());
 
 		// Now reverse it, because we need parents after children for rewrite rules to work properly.
 		$posts = array_reverse($posts, true);
@@ -471,12 +471,12 @@ 
 		$page_uris = array();
 		$page_attachment_uris = array();
 
-		foreach ( $posts as $id => $post ) {
+		foreach ($posts as $id => $post) {
 			// URL => page name
 			$uri = get_page_uri($id);
-			$attachments = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $id ));
-			if ( !empty($attachments) ) {
-				foreach ( $attachments as $attachment ) {
+			$attachments = $wpdb->get_results($wpdb->prepare("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $id));
+			if ( ! empty($attachments)) {
+				foreach ($attachments as $attachment) {
 					$attach_uri = get_page_uri($attachment->ID);
 					$page_attachment_uris[$attach_uri] = $attachment->ID;
 				}
@@ -485,7 +485,7 @@ 
 			$page_uris[$uri] = $id;
 		}
 
-		return array( $page_uris, $page_attachment_uris );
+		return array($page_uris, $page_attachment_uris);
 	}
 
 	/**
@@ -498,9 +498,9 @@ 
 	 */
 	public function page_rewrite_rules() {
 		// The extra .? at the beginning prevents clashes with other regular expressions in the rules array.
-		$this->add_rewrite_tag( '%pagename%', '(.?.+?)', 'pagename=' );
+		$this->add_rewrite_tag('%pagename%', '(.?.+?)', 'pagename=');
 
-		return $this->generate_rewrite_rules( $this->get_page_permastruct(), EP_PAGES, true, true, false, false );
+		return $this->generate_rewrite_rules($this->get_page_permastruct(), EP_PAGES, true, true, false, false);
 	}
 
 	/**
@@ -524,10 +524,10 @@ 
 	 * @return string|false False on no permalink structure. Date permalink structure.
 	 */
 	public function get_date_permastruct() {
-		if ( isset($this->date_structure) )
+		if (isset($this->date_structure))
 			return $this->date_structure;
 
-		if ( empty($this->permalink_structure) ) {
+		if (empty($this->permalink_structure)) {
 			$this->date_structure = '';
 			return false;
 		}
@@ -538,14 +538,14 @@ 
 		$this->date_structure = '';
 		$date_endian = '';
 
-		foreach ( $endians as $endian ) {
-			if ( false !== strpos($this->permalink_structure, $endian) ) {
-				$date_endian= $endian;
+		foreach ($endians as $endian) {
+			if (false !== strpos($this->permalink_structure, $endian)) {
+				$date_endian = $endian;
 				break;
 			}
 		}
 
-		if ( empty($date_endian) )
+		if (empty($date_endian))
 			$date_endian = '%year%/%monthnum%/%day%';
 
 		/*
@@ -555,15 +555,15 @@ 
 		$front = $this->front;
 		preg_match_all('/%.+?%/', $this->permalink_structure, $tokens);
 		$tok_index = 1;
-		foreach ( (array) $tokens[0] as $token) {
-			if ( '%post_id%' == $token && ($tok_index <= 3) ) {
-				$front = $front . 'date/';
+		foreach ((array) $tokens[0] as $token) {
+			if ('%post_id%' == $token && ($tok_index <= 3)) {
+				$front = $front.'date/';
 				break;
 			}
 			$tok_index++;
 		}
 
-		$this->date_structure = $front . $date_endian;
+		$this->date_structure = $front.$date_endian;
 
 		return $this->date_structure;
 	}
@@ -582,7 +582,7 @@ 
 	public function get_year_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
+		if (empty($structure))
 			return false;
 
 		$structure = str_replace('%monthnum%', '', $structure);
@@ -606,7 +606,7 @@ 
 	public function get_month_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
+		if (empty($structure))
 			return false;
 
 		$structure = str_replace('%day%', '', $structure);
@@ -673,10 +673,10 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_extra_permastruct($name) {
-		if ( empty($this->permalink_structure) )
+		if (empty($this->permalink_structure))
 			return false;
 
-		if ( isset($this->extra_permastructs[$name]) )
+		if (isset($this->extra_permastructs[$name]))
 			return $this->extra_permastructs[$name]['struct'];
 
 		return false;
@@ -695,15 +695,15 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_author_permastruct() {
-		if ( isset($this->author_structure) )
+		if (isset($this->author_structure))
 			return $this->author_structure;
 
-		if ( empty($this->permalink_structure) ) {
+		if (empty($this->permalink_structure)) {
 			$this->author_structure = '';
 			return false;
 		}
 
-		$this->author_structure = $this->front . $this->author_base . '/%author%';
+		$this->author_structure = $this->front.$this->author_base.'/%author%';
 
 		return $this->author_structure;
 	}
@@ -721,15 +721,15 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_search_permastruct() {
-		if ( isset($this->search_structure) )
+		if (isset($this->search_structure))
 			return $this->search_structure;
 
-		if ( empty($this->permalink_structure) ) {
+		if (empty($this->permalink_structure)) {
 			$this->search_structure = '';
 			return false;
 		}
 
-		$this->search_structure = $this->root . $this->search_base . '/%search%';
+		$this->search_structure = $this->root.$this->search_base.'/%search%';
 
 		return $this->search_structure;
 	}
@@ -747,7 +747,7 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_page_permastruct() {
-		if ( isset($this->page_structure) )
+		if (isset($this->page_structure))
 			return $this->page_structure;
 
 		if (empty($this->permalink_structure)) {
@@ -755,7 +755,7 @@ 
 			return false;
 		}
 
-		$this->page_structure = $this->root . '%pagename%';
+		$this->page_structure = $this->root.'%pagename%';
 
 		return $this->page_structure;
 	}
@@ -773,15 +773,15 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_feed_permastruct() {
-		if ( isset($this->feed_structure) )
+		if (isset($this->feed_structure))
 			return $this->feed_structure;
 
-		if ( empty($this->permalink_structure) ) {
+		if (empty($this->permalink_structure)) {
 			$this->feed_structure = '';
 			return false;
 		}
 
-		$this->feed_structure = $this->root . $this->feed_base . '/%feed%';
+		$this->feed_structure = $this->root.$this->feed_base.'/%feed%';
 
 		return $this->feed_structure;
 	}
@@ -799,7 +799,7 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_comment_feed_permastruct() {
-		if ( isset($this->comment_feed_structure) )
+		if (isset($this->comment_feed_structure))
 			return $this->comment_feed_structure;
 
 		if (empty($this->permalink_structure)) {
@@ -807,7 +807,7 @@ 
 			return false;
 		}
 
-		$this->comment_feed_structure = $this->root . $this->comments_base . '/' . $this->feed_base . '/%feed%';
+		$this->comment_feed_structure = $this->root.$this->comments_base.'/'.$this->feed_base.'/%feed%';
 
 		return $this->comment_feed_structure;
 	}
@@ -829,11 +829,11 @@ 
 	 * @param string $regex Regular expression to substitute the tag for in rewrite rules.
 	 * @param string $query String to append to the rewritten query. Must end in '='.
 	 */
-	public function add_rewrite_tag( $tag, $regex, $query ) {
-		$position = array_search( $tag, $this->rewritecode );
-		if ( false !== $position && null !== $position ) {
-			$this->rewritereplace[ $position ] = $regex;
-			$this->queryreplace[ $position ] = $query;
+	public function add_rewrite_tag($tag, $regex, $query) {
+		$position = array_search($tag, $this->rewritecode);
+		if (false !== $position && null !== $position) {
+			$this->rewritereplace[$position] = $regex;
+			$this->queryreplace[$position] = $query;
 		} else {
 			$this->rewritecode[] = $tag;
 			$this->rewritereplace[] = $regex;
@@ -854,12 +854,12 @@ 
 	 *
 	 * @param string $tag Name of the rewrite tag to remove.
 	 */
-	public function remove_rewrite_tag( $tag ) {
-		$position = array_search( $tag, $this->rewritecode );
-		if ( false !== $position && null !== $position ) {
-			unset( $this->rewritecode[ $position ] );
-			unset( $this->rewritereplace[ $position ] );
-			unset( $this->queryreplace[ $position ] );
+	public function remove_rewrite_tag($tag) {
+		$position = array_search($tag, $this->rewritecode);
+		if (false !== $position && null !== $position) {
+			unset($this->rewritecode[$position]);
+			unset($this->rewritereplace[$position]);
+			unset($this->queryreplace[$position]);
 		}
 	}
 
@@ -894,32 +894,32 @@ 
 	public function generate_rewrite_rules($permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true) {
 		// Build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
 		$feedregex2 = '';
-		foreach ( (array) $this->feeds as $feed_name)
-			$feedregex2 .= $feed_name . '|';
-		$feedregex2 = '(' . trim($feedregex2, '|') . ')/?$';
+		foreach ((array) $this->feeds as $feed_name)
+			$feedregex2 .= $feed_name.'|';
+		$feedregex2 = '('.trim($feedregex2, '|').')/?$';
 
 		/*
 		 * $feedregex is identical but with /feed/ added on as well, so URLs like <permalink>/feed/atom
 		 * and <permalink>/atom are both possible
 		 */
-		$feedregex = $this->feed_base . '/' . $feedregex2;
+		$feedregex = $this->feed_base.'/'.$feedregex2;
 
 		// Build a regex to match the trackback and page/xx parts of URLs.
 		$trackbackregex = 'trackback/?$';
-		$pageregex = $this->pagination_base . '/?([0-9]{1,})/?$';
-		$commentregex = $this->comments_pagination_base . '-([0-9]{1,})/?$';
+		$pageregex = $this->pagination_base.'/?([0-9]{1,})/?$';
+		$commentregex = $this->comments_pagination_base.'-([0-9]{1,})/?$';
 		$embedregex = 'embed/?$';
 
 		// Build up an array of endpoint regexes to append => queries to append.
-		if ( $endpoints ) {
-			$ep_query_append = array ();
-			foreach ( (array) $this->endpoints as $endpoint) {
+		if ($endpoints) {
+			$ep_query_append = array();
+			foreach ((array) $this->endpoints as $endpoint) {
 				// Match everything after the endpoint name, but allow for nothing to appear there.
-				$epmatch = $endpoint[1] . '(/(.*))?/?$';
+				$epmatch = $endpoint[1].'(/(.*))?/?$';
 
 				// This will be appended on to the rest of the query for each dir.
-				$epquery = '&' . $endpoint[2] . '=';
-				$ep_query_append[$epmatch] = array ( $endpoint[0], $epquery );
+				$epquery = '&'.$endpoint[2].'=';
+				$ep_query_append[$epmatch] = array($endpoint[0], $epquery);
 			}
 		}
 
@@ -941,19 +941,19 @@ 
 		 * like tagname=$matches[i] where i is the current $i.
 		 */
 		$queries = array();
-		for ( $i = 0; $i < $num_tokens; ++$i ) {
-			if ( 0 < $i )
-				$queries[$i] = $queries[$i - 1] . '&';
+		for ($i = 0; $i < $num_tokens; ++$i) {
+			if (0 < $i)
+				$queries[$i] = $queries[$i - 1].'&';
 			else
 				$queries[$i] = '';
 
-			$query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]) . $this->preg_index($i+1);
+			$query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]).$this->preg_index($i + 1);
 			$queries[$i] .= $query_token;
 		}
 
 		// Get the structure, minus any cruft (stuff that isn't tags) at the front.
 		$structure = $permalink_structure;
-		if ( $front != '/' )
+		if ($front != '/')
 			$structure = str_replace($front, '', $structure);
 
 		/*
@@ -962,7 +962,7 @@ 
 		 * rewrite rules for /%year%/, /%year%/%monthnum%/ and /%year%/%monthnum%/%postname%
 		 */
 		$structure = trim($structure, '/');
-		$dirs = $walk_dirs ? explode('/', $structure) : array( $structure );
+		$dirs = $walk_dirs ? explode('/', $structure) : array($structure);
 		$num_dirs = count($dirs);
 
 		// Strip slashes from the front of $front.
@@ -971,9 +971,9 @@ 
 		// The main workhorse loop.
 		$post_rewrite = array();
 		$struct = $front;
-		for ( $j = 0; $j < $num_dirs; ++$j ) {
+		for ($j = 0; $j < $num_dirs; ++$j) {
 			// Get the struct for this dir, and trim slashes off the front.
-			$struct .= $dirs[$j] . '/'; // Accumulate. see comment near explode('/', $structure) above.
+			$struct .= $dirs[$j].'/'; // Accumulate. see comment near explode('/', $structure) above.
 			$struct = ltrim($struct, '/');
 
 			// Replace tags with regexes.
@@ -983,10 +983,10 @@ 
 			$num_toks = preg_match_all('/%.+?%/', $struct, $toks);
 
 			// Get the 'tagname=$matches[i]'.
-			$query = ( ! empty( $num_toks ) && isset( $queries[$num_toks - 1] ) ) ? $queries[$num_toks - 1] : '';
+			$query = ( ! empty($num_toks) && isset($queries[$num_toks - 1])) ? $queries[$num_toks - 1] : '';
 
 			// Set up $ep_mask_specific which is used to match more specific URL types.
-			switch ( $dirs[$j] ) {
+			switch ($dirs[$j]) {
 				case '%year%':
 					$ep_mask_specific = EP_YEAR;
 					break;
@@ -1001,33 +1001,33 @@ 
 			}
 
 			// Create query for /page/xx.
-			$pagematch = $match . $pageregex;
-			$pagequery = $index . '?' . $query . '&paged=' . $this->preg_index($num_toks + 1);
+			$pagematch = $match.$pageregex;
+			$pagequery = $index.'?'.$query.'&paged='.$this->preg_index($num_toks + 1);
 
 			// Create query for /comment-page-xx.
-			$commentmatch = $match . $commentregex;
-			$commentquery = $index . '?' . $query . '&cpage=' . $this->preg_index($num_toks + 1);
+			$commentmatch = $match.$commentregex;
+			$commentquery = $index.'?'.$query.'&cpage='.$this->preg_index($num_toks + 1);
 
-			if ( get_option('page_on_front') ) {
+			if (get_option('page_on_front')) {
 				// Create query for Root /comment-page-xx.
-				$rootcommentmatch = $match . $commentregex;
-				$rootcommentquery = $index . '?' . $query . '&page_id=' . get_option('page_on_front') . '&cpage=' . $this->preg_index($num_toks + 1);
+				$rootcommentmatch = $match.$commentregex;
+				$rootcommentquery = $index.'?'.$query.'&page_id='.get_option('page_on_front').'&cpage='.$this->preg_index($num_toks + 1);
 			}
 
 			// Create query for /feed/(feed|atom|rss|rss2|rdf).
-			$feedmatch = $match . $feedregex;
-			$feedquery = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+			$feedmatch = $match.$feedregex;
+			$feedquery = $feedindex.'?'.$query.'&feed='.$this->preg_index($num_toks + 1);
 
 			// Create query for /(feed|atom|rss|rss2|rdf) (see comment near creation of $feedregex).
-			$feedmatch2 = $match . $feedregex2;
-			$feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+			$feedmatch2 = $match.$feedregex2;
+			$feedquery2 = $feedindex.'?'.$query.'&feed='.$this->preg_index($num_toks + 1);
 
 			// Create query and regex for embeds.
-			$embedmatch = $match . $embedregex;
-			$embedquery = $embedindex . '?' . $query . '&embed=true';
+			$embedmatch = $match.$embedregex;
+			$embedquery = $embedindex.'?'.$query.'&embed=true';
 
 			// If asked to, turn the feed queries into comment feed ones.
-			if ( $forcomments ) {
+			if ($forcomments) {
 				$feedquery .= '&withcomments=1';
 				$feedquery2 .= '&withcomments=1';
 			}
@@ -1036,33 +1036,33 @@ 
 			$rewrite = array();
 
 			// ...adding on /feed/ regexes => queries
-			if ( $feed ) {
-				$rewrite = array( $feedmatch => $feedquery, $feedmatch2 => $feedquery2, $embedmatch => $embedquery );
+			if ($feed) {
+				$rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2, $embedmatch => $embedquery);
 			}
 
 			//...and /page/xx ones
-			if ( $paged ) {
-				$rewrite = array_merge( $rewrite, array( $pagematch => $pagequery ) );
+			if ($paged) {
+				$rewrite = array_merge($rewrite, array($pagematch => $pagequery));
 			}
 
 			// Only on pages with comments add ../comment-page-xx/.
-			if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask ) {
+			if (EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask) {
 				$rewrite = array_merge($rewrite, array($commentmatch => $commentquery));
-			} elseif ( EP_ROOT & $ep_mask && get_option('page_on_front') ) {
+			} elseif (EP_ROOT & $ep_mask && get_option('page_on_front')) {
 				$rewrite = array_merge($rewrite, array($rootcommentmatch => $rootcommentquery));
 			}
 
 			// Do endpoints.
-			if ( $endpoints ) {
-				foreach ( (array) $ep_query_append as $regex => $ep) {
+			if ($endpoints) {
+				foreach ((array) $ep_query_append as $regex => $ep) {
 					// Add the endpoints on if the mask fits.
-					if ( $ep[0] & $ep_mask || $ep[0] & $ep_mask_specific )
-						$rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
+					if ($ep[0] & $ep_mask || $ep[0] & $ep_mask_specific)
+						$rewrite[$match.$regex] = $index.'?'.$query.$ep[1].$this->preg_index($num_toks + 2);
 				}
 			}
 
 			// If we've got some tags in this dir.
-			if ( $num_toks ) {
+			if ($num_toks) {
 				$post = false;
 				$page = false;
 
@@ -1072,97 +1072,97 @@ 
 				 * 2) post ID, 3) page name, 4) timestamp (year, month, day, hour, second and
 				 * minute all present). Set these flags now as we need them for the endpoints.
 				 */
-				if ( strpos($struct, '%postname%') !== false
+				if (strpos($struct, '%postname%') !== false
 						|| strpos($struct, '%post_id%') !== false
 						|| strpos($struct, '%pagename%') !== false
 						|| (strpos($struct, '%year%') !== false && strpos($struct, '%monthnum%') !== false && strpos($struct, '%day%') !== false && strpos($struct, '%hour%') !== false && strpos($struct, '%minute%') !== false && strpos($struct, '%second%') !== false)
 						) {
 					$post = true;
-					if ( strpos($struct, '%pagename%') !== false )
+					if (strpos($struct, '%pagename%') !== false)
 						$page = true;
 				}
 
-				if ( ! $post ) {
+				if ( ! $post) {
 					// For custom post types, we need to add on endpoints as well.
-					foreach ( get_post_types( array('_builtin' => false ) ) as $ptype ) {
-						if ( strpos($struct, "%$ptype%") !== false ) {
+					foreach (get_post_types(array('_builtin' => false)) as $ptype) {
+						if (strpos($struct, "%$ptype%") !== false) {
 							$post = true;
 
 							// This is for page style attachment URLs.
-							$page = is_post_type_hierarchical( $ptype );
+							$page = is_post_type_hierarchical($ptype);
 							break;
 						}
 					}
 				}
 
 				// If creating rules for a permalink, do all the endpoints like attachments etc.
-				if ( $post ) {
+				if ($post) {
 					// Create query and regex for trackback.
-					$trackbackmatch = $match . $trackbackregex;
-					$trackbackquery = $trackbackindex . '?' . $query . '&tb=1';
+					$trackbackmatch = $match.$trackbackregex;
+					$trackbackquery = $trackbackindex.'?'.$query.'&tb=1';
 
 					// Create query and regex for embeds.
-					$embedmatch = $match . $embedregex;
-					$embedquery = $embedindex . '?' . $query . '&embed=true';
+					$embedmatch = $match.$embedregex;
+					$embedquery = $embedindex.'?'.$query.'&embed=true';
 
 					// Trim slashes from the end of the regex for this dir.
 					$match = rtrim($match, '/');
 
 					// Get rid of brackets.
-					$submatchbase = str_replace( array('(', ')'), '', $match);
+					$submatchbase = str_replace(array('(', ')'), '', $match);
 
 					// Add a rule for at attachments, which take the form of <permalink>/some-text.
-					$sub1 = $submatchbase . '/([^/]+)/';
+					$sub1 = $submatchbase.'/([^/]+)/';
 
 					// Add trackback regex <permalink>/trackback/...
-					$sub1tb = $sub1 . $trackbackregex;
+					$sub1tb = $sub1.$trackbackregex;
 
 					// And <permalink>/feed/(atom|...)
-					$sub1feed = $sub1 . $feedregex;
+					$sub1feed = $sub1.$feedregex;
 
 					// And <permalink>/(feed|atom...)
-					$sub1feed2 = $sub1 . $feedregex2;
+					$sub1feed2 = $sub1.$feedregex2;
 
 					// And <permalink>/comment-page-xx
-					$sub1comment = $sub1 . $commentregex;
+					$sub1comment = $sub1.$commentregex;
 
 					// And <permalink>/embed/...
-					$sub1embed = $sub1 . $embedregex;
+					$sub1embed = $sub1.$embedregex;
 
 					/*
 					 * Add another rule to match attachments in the explicit form:
 					 * <permalink>/attachment/some-text
 					 */
-					$sub2 = $submatchbase . '/attachment/([^/]+)/';
+					$sub2 = $submatchbase.'/attachment/([^/]+)/';
 
 					// And add trackbacks <permalink>/attachment/trackback.
-					$sub2tb = $sub2 . $trackbackregex;
+					$sub2tb = $sub2.$trackbackregex;
 
 					// Feeds, <permalink>/attachment/feed/(atom|...)
-					$sub2feed = $sub2 . $feedregex;
+					$sub2feed = $sub2.$feedregex;
 
 					// And feeds again on to this <permalink>/attachment/(feed|atom...)
-					$sub2feed2 = $sub2 . $feedregex2;
+					$sub2feed2 = $sub2.$feedregex2;
 
 					// And <permalink>/comment-page-xx
-					$sub2comment = $sub2 . $commentregex;
+					$sub2comment = $sub2.$commentregex;
 
 					// And <permalink>/embed/...
-					$sub2embed = $sub2 . $embedregex;
+					$sub2embed = $sub2.$embedregex;
 
 					// Create queries for these extra tag-ons we've just dealt with.
-					$subquery = $index . '?attachment=' . $this->preg_index(1);
-					$subtbquery = $subquery . '&tb=1';
-					$subfeedquery = $subquery . '&feed=' . $this->preg_index(2);
-					$subcommentquery = $subquery . '&cpage=' . $this->preg_index(2);
-					$subembedquery = $subquery . '&embed=true';
+					$subquery = $index.'?attachment='.$this->preg_index(1);
+					$subtbquery = $subquery.'&tb=1';
+					$subfeedquery = $subquery.'&feed='.$this->preg_index(2);
+					$subcommentquery = $subquery.'&cpage='.$this->preg_index(2);
+					$subembedquery = $subquery.'&embed=true';
 
 					// Do endpoints for attachments.
-					if ( !empty($endpoints) ) {
-						foreach ( (array) $ep_query_append as $regex => $ep ) {
-							if ( $ep[0] & EP_ATTACHMENT ) {
-								$rewrite[$sub1 . $regex] = $subquery . $ep[1] . $this->preg_index(3);
-								$rewrite[$sub2 . $regex] = $subquery . $ep[1] . $this->preg_index(3);
+					if ( ! empty($endpoints)) {
+						foreach ((array) $ep_query_append as $regex => $ep) {
+							if ($ep[0] & EP_ATTACHMENT) {
+								$rewrite[$sub1.$regex] = $subquery.$ep[1].$this->preg_index(3);
+								$rewrite[$sub2.$regex] = $subquery.$ep[1].$this->preg_index(3);
 							}
 						}
 					}
@@ -1180,14 +1180,14 @@ 
 					 * Previously: '(/[0-9]+)?/?$', which produced '/2' for page.
 					 * When cast to int, returned 0.
 					 */
-					$match = $match . '(?:/([0-9]+))?/?$';
-					$query = $index . '?' . $query . '&page=' . $this->preg_index($num_toks + 1);
+					$match = $match.'(?:/([0-9]+))?/?$';
+					$query = $index.'?'.$query.'&page='.$this->preg_index($num_toks + 1);
 
 				// Not matching a permalink so this is a lot simpler.
 				} else {
 					// Close the match and finalise the query.
 					$match .= '?$';
-					$query = $index . '?' . $query;
+					$query = $index.'?'.$query;
 				}
 
 				/*
@@ -1198,27 +1198,27 @@ 
 				$rewrite = array_merge($rewrite, array($match => $query));
 
 				// If we're matching a permalink, add those extras (attachments etc) on.
-				if ( $post ) {
+				if ($post) {
 					// Add trackback.
 					$rewrite = array_merge(array($trackbackmatch => $trackbackquery), $rewrite);
 
 					// Add embed.
-					$rewrite = array_merge( array( $embedmatch => $embedquery ), $rewrite );
+					$rewrite = array_merge(array($embedmatch => $embedquery), $rewrite);
 
 					// Add regexes/queries for attachments, attachment trackbacks and so on.
-					if ( ! $page ) {
+					if ( ! $page) {
 						// Require <permalink>/attachment/stuff form for pages because of confusion with subpages.
-						$rewrite = array_merge( $rewrite, array(
+						$rewrite = array_merge($rewrite, array(
 							$sub1        => $subquery,
 							$sub1tb      => $subtbquery,
 							$sub1feed    => $subfeedquery,
 							$sub1feed2   => $subfeedquery,
 							$sub1comment => $subcommentquery,
 							$sub1embed   => $subembedquery
-						) );
+						));
 					}
 
-					$rewrite = array_merge( array( $sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery, $sub2comment => $subcommentquery, $sub2embed => $subembedquery ), $rewrite );
+					$rewrite = array_merge(array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery, $sub2comment => $subcommentquery, $sub2embed => $subembedquery), $rewrite);
 				}
 			}
 			// Add the rules for this dir to the accumulating $post_rewrite.
@@ -1270,31 +1270,31 @@ 
 	public function rewrite_rules() {
 		$rewrite = array();
 
-		if ( empty($this->permalink_structure) )
+		if (empty($this->permalink_structure))
 			return $rewrite;
 
 		// robots.txt -only if installed at the root
-		$home_path = parse_url( home_url() );
-		$robots_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'robots\.txt$' => $this->index . '?robots=1' ) : array();
+		$home_path = parse_url(home_url());
+		$robots_rewrite = (empty($home_path['path']) || '/' == $home_path['path']) ? array('robots\.txt$' => $this->index.'?robots=1') : array();
 
 		// Old feed and service files.
 		$deprecated_files = array(
-			'.*wp-(atom|rdf|rss|rss2|feed|commentsrss2)\.php$' => $this->index . '?feed=old',
-			'.*wp-app\.php(/.*)?$' => $this->index . '?error=403',
+			'.*wp-(atom|rdf|rss|rss2|feed|commentsrss2)\.php$' => $this->index.'?feed=old',
+			'.*wp-app\.php(/.*)?$' => $this->index.'?error=403',
 		);
 
 		// Registration rules.
 		$registration_pages = array();
-		if ( is_multisite() && is_main_site() ) {
-			$registration_pages['.*wp-signup.php$'] = $this->index . '?signup=true';
-			$registration_pages['.*wp-activate.php$'] = $this->index . '?activate=true';
+		if (is_multisite() && is_main_site()) {
+			$registration_pages['.*wp-signup.php$'] = $this->index.'?signup=true';
+			$registration_pages['.*wp-activate.php$'] = $this->index.'?activate=true';
 		}
 
 		// Deprecated.
-		$registration_pages['.*wp-register.php$'] = $this->index . '?register=true';
+		$registration_pages['.*wp-register.php$'] = $this->index.'?register=true';
 
 		// Post rewrite rules.
-		$post_rewrite = $this->generate_rewrite_rules( $this->permalink_structure, EP_PERMALINK );
+		$post_rewrite = $this->generate_rewrite_rules($this->permalink_structure, EP_PERMALINK);
 
 		/**
 		 * Filters rewrite rules used for "post" archives.
@@ -1303,7 +1303,7 @@ 
 		 *
 		 * @param array $post_rewrite The rewrite rules for posts.
 		 */
-		$post_rewrite = apply_filters( 'post_rewrite_rules', $post_rewrite );
+		$post_rewrite = apply_filters('post_rewrite_rules', $post_rewrite);
 
 		// Date rewrite rules.
 		$date_rewrite = $this->generate_rewrite_rules($this->get_date_permastruct(), EP_DATE);
@@ -1317,10 +1317,10 @@ 
 		 *
 		 * @param array $date_rewrite The rewrite rules for date archives.
 		 */
-		$date_rewrite = apply_filters( 'date_rewrite_rules', $date_rewrite );
+		$date_rewrite = apply_filters('date_rewrite_rules', $date_rewrite);
 
 		// Root-level rewrite rules.
-		$root_rewrite = $this->generate_rewrite_rules($this->root . '/', EP_ROOT);
+		$root_rewrite = $this->generate_rewrite_rules($this->root.'/', EP_ROOT);
 
 		/**
 		 * Filters rewrite rules used for root-level archives.
@@ -1332,10 +1332,10 @@ 
 		 *
 		 * @param array $root_rewrite The root-level rewrite rules.
 		 */
-		$root_rewrite = apply_filters( 'root_rewrite_rules', $root_rewrite );
+		$root_rewrite = apply_filters('root_rewrite_rules', $root_rewrite);
 
 		// Comments rewrite rules.
-		$comments_rewrite = $this->generate_rewrite_rules($this->root . $this->comments_base, EP_COMMENTS, false, true, true, false);
+		$comments_rewrite = $this->generate_rewrite_rules($this->root.$this->comments_base, EP_COMMENTS, false, true, true, false);
 
 		/**
 		 * Filters rewrite rules used for comment feed archives.
@@ -1346,7 +1346,7 @@ 
 		 *
 		 * @param array $comments_rewrite The rewrite rules for the site-wide comments feeds.
 		 */
-		$comments_rewrite = apply_filters( 'comments_rewrite_rules', $comments_rewrite );
+		$comments_rewrite = apply_filters('comments_rewrite_rules', $comments_rewrite);
 
 		// Search rewrite rules.
 		$search_structure = $this->get_search_permastruct();
@@ -1362,7 +1362,7 @@ 
 		 *
 		 * @param array $search_rewrite The rewrite rules for search queries.
 		 */
-		$search_rewrite = apply_filters( 'search_rewrite_rules', $search_rewrite );
+		$search_rewrite = apply_filters('search_rewrite_rules', $search_rewrite);
 
 		// Author rewrite rules.
 		$author_rewrite = $this->generate_rewrite_rules($this->get_author_permastruct(), EP_AUTHORS);
@@ -1377,7 +1377,7 @@ 
 		 *
 		 * @param array $author_rewrite The rewrite rules for author archives.
 		 */
-		$author_rewrite = apply_filters( 'author_rewrite_rules', $author_rewrite );
+		$author_rewrite = apply_filters('author_rewrite_rules', $author_rewrite);
 
 		// Pages rewrite rules.
 		$page_rewrite = $this->page_rewrite_rules();
@@ -1389,17 +1389,17 @@ 
 		 *
 		 * @param array $page_rewrite The rewrite rules for the "page" post type.
 		 */
-		$page_rewrite = apply_filters( 'page_rewrite_rules', $page_rewrite );
+		$page_rewrite = apply_filters('page_rewrite_rules', $page_rewrite);
 
 		// Extra permastructs.
-		foreach ( $this->extra_permastructs as $permastructname => $struct ) {
-			if ( is_array( $struct ) ) {
-				if ( count( $struct ) == 2 )
-					$rules = $this->generate_rewrite_rules( $struct[0], $struct[1] );
+		foreach ($this->extra_permastructs as $permastructname => $struct) {
+			if (is_array($struct)) {
+				if (count($struct) == 2)
+					$rules = $this->generate_rewrite_rules($struct[0], $struct[1]);
 				else
-					$rules = $this->generate_rewrite_rules( $struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] );
+					$rules = $this->generate_rewrite_rules($struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints']);
 			} else {
-				$rules = $this->generate_rewrite_rules( $struct );
+				$rules = $this->generate_rewrite_rules($struct);
 			}
 
 			/**
@@ -1413,8 +1413,8 @@ 
 			 *
 			 * @param array $rules The rewrite rules generated for the current permastruct.
 			 */
-			$rules = apply_filters( "{$permastructname}_rewrite_rules", $rules );
-			if ( 'post_tag' == $permastructname ) {
+			$rules = apply_filters("{$permastructname}_rewrite_rules", $rules);
+			if ('post_tag' == $permastructname) {
 
 				/**
 				 * Filters rewrite rules used specifically for Tags.
@@ -1424,17 +1424,17 @@ 
 				 *
 				 * @param array $rules The rewrite rules generated for tags.
 				 */
-				$rules = apply_filters( 'tag_rewrite_rules', $rules );
+				$rules = apply_filters('tag_rewrite_rules', $rules);
 			}
 
 			$this->extra_rules_top = array_merge($this->extra_rules_top, $rules);
 		}
 
 		// Put them together.
-		if ( $this->use_verbose_page_rules )
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
+		if ($this->use_verbose_page_rules)
+			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
 		else
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
 
 		/**
 		 * Fires after the rewrite rules are generated.
@@ -1443,7 +1443,7 @@ 
 		 *
 		 * @param WP_Rewrite $this Current WP_Rewrite instance, passed by reference.
 		 */
-		do_action_ref_array( 'generate_rewrite_rules', array( &$this ) );
+		do_action_ref_array('generate_rewrite_rules', array(&$this));
 
 		/**
 		 * Filters the full set of generated rewrite rules.
@@ -1452,7 +1452,7 @@ 
 		 *
 		 * @param array $this->rules The compiled array of rewrite rules.
 		 */
-		$this->rules = apply_filters( 'rewrite_rules_array', $this->rules );
+		$this->rules = apply_filters('rewrite_rules_array', $this->rules);
 
 		return $this->rules;
 	}
@@ -1472,11 +1472,11 @@ 
 	 */
 	public function wp_rewrite_rules() {
 		$this->rules = get_option('rewrite_rules');
-		if ( empty($this->rules) ) {
+		if (empty($this->rules)) {
 			$this->matches = 'matches';
 			$this->rewrite_rules();
-			if ( ! did_action( 'wp_loaded' ) ) {
-				add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
+			if ( ! did_action('wp_loaded')) {
+				add_action('wp_loaded', array($this, 'flush_rules'));
 				return $this->rules;
 			}
 			update_option('rewrite_rules', $this->rules);
@@ -1500,15 +1500,15 @@ 
 	 * @return string
 	 */
 	public function mod_rewrite_rules() {
-		if ( ! $this->using_permalinks() )
+		if ( ! $this->using_permalinks())
 			return '';
 
-		$site_root = parse_url( site_url() );
-		if ( isset( $site_root['path'] ) )
+		$site_root = parse_url(site_url());
+		if (isset($site_root['path']))
 			$site_root = trailingslashit($site_root['path']);
 
 		$home_root = parse_url(home_url());
-		if ( isset( $home_root['path'] ) )
+		if (isset($home_root['path']))
 			$home_root = trailingslashit($home_root['path']);
 		else
 			$home_root = '/';
@@ -1521,33 +1521,33 @@ 
 		$rules .= "RewriteRule ^index\.php$ - [L]\n";
 
 		// Add in the rules that don't redirect to WP's index.php (and thus shouldn't be handled by WP at all).
-		foreach ( (array) $this->non_wp_rules as $match => $query) {
+		foreach ((array) $this->non_wp_rules as $match => $query) {
 			// Apache 1.3 does not support the reluctant (non-greedy) modifier.
 			$match = str_replace('.+?', '.+', $match);
 
-			$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
+			$rules .= 'RewriteRule ^'.$match.' '.$home_root.$query." [QSA,L]\n";
 		}
 
-		if ( $this->use_verbose_rules ) {
+		if ($this->use_verbose_rules) {
 			$this->matches = '';
 			$rewrite = $this->rewrite_rules();
 			$num_rules = count($rewrite);
-			$rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n" .
-				"RewriteCond %{REQUEST_FILENAME} -d\n" .
+			$rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n".
+				"RewriteCond %{REQUEST_FILENAME} -d\n".
 				"RewriteRule ^.*$ - [S=$num_rules]\n";
 
-			foreach ( (array) $rewrite as $match => $query) {
+			foreach ((array) $rewrite as $match => $query) {
 				// Apache 1.3 does not support the reluctant (non-greedy) modifier.
 				$match = str_replace('.+?', '.+', $match);
 
-				if ( strpos($query, $this->index) !== false )
-					$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
+				if (strpos($query, $this->index) !== false)
+					$rules .= 'RewriteRule ^'.$match.' '.$home_root.$query." [QSA,L]\n";
 				else
-					$rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
+					$rules .= 'RewriteRule ^'.$match.' '.$site_root.$query." [QSA,L]\n";
 			}
 		} else {
-			$rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n" .
-				"RewriteCond %{REQUEST_FILENAME} !-d\n" .
+			$rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n".
+				"RewriteCond %{REQUEST_FILENAME} !-d\n".
 				"RewriteRule . {$home_root}{$this->index} [L]\n";
 		}
 
@@ -1560,7 +1560,7 @@ 
 		 *
 		 * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess.
 		 */
-		$rules = apply_filters( 'mod_rewrite_rules', $rules );
+		$rules = apply_filters('mod_rewrite_rules', $rules);
 
 		/**
 		 * Filters the list of rewrite rules formatted for output to an .htaccess file.
@@ -1570,7 +1570,7 @@ 
 		 *
 		 * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess.
 		 */
-		return apply_filters( 'rewrite_rules', $rules );
+		return apply_filters('rewrite_rules', $rules);
 	}
 
 	/**
@@ -1586,11 +1586,11 @@ 
 	 *                              Default false.
 	 * @return string IIS7 URL rewrite rule sets.
 	 */
-	public function iis7_url_rewrite_rules( $add_parent_tags = false ) {
-		if ( ! $this->using_permalinks() )
+	public function iis7_url_rewrite_rules($add_parent_tags = false) {
+		if ( ! $this->using_permalinks())
 			return '';
 		$rules = '';
-		if ( $add_parent_tags ) {
+		if ($add_parent_tags) {
 			$rules .= '<configuration>
 	<system.webServer>
 		<rewrite>
@@ -1598,7 +1598,7 @@ 
 		}
 
 		$rules .= '
-			<rule name="WordPress: ' . esc_attr( home_url() ) . '" patternSyntax="Wildcard">
+			<rule name="WordPress: ' . esc_attr(home_url()).'" patternSyntax="Wildcard">
 				<match url="*" />
 					<conditions>
 						<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
@@ -1607,7 +1607,7 @@ 
 				<action type="Rewrite" url="index.php" />
 			</rule>';
 
-		if ( $add_parent_tags ) {
+		if ($add_parent_tags) {
 			$rules .= '
 			</rules>
 		</rewrite>
@@ -1622,7 +1622,7 @@ 
 		 *
 		 * @param string $rules Rewrite rules formatted for IIS web.config.
 		 */
-		return apply_filters( 'iis7_url_rewrite_rules', $rules );
+		return apply_filters('iis7_url_rewrite_rules', $rules);
 	}
 
 	/**
@@ -1640,25 +1640,25 @@ 
 	 * @param string       $after Optional. Priority of the new rule. Accepts 'top'
 	 *                            or 'bottom'. Default 'bottom'.
 	 */
-	public function add_rule( $regex, $query, $after = 'bottom' ) {
-		if ( is_array( $query ) ) {
+	public function add_rule($regex, $query, $after = 'bottom') {
+		if (is_array($query)) {
 			$external = false;
-			$query = add_query_arg( $query, 'index.php' );
+			$query = add_query_arg($query, 'index.php');
 		} else {
-			$index = false === strpos( $query, '?' ) ? strlen( $query ) : strpos( $query, '?' );
-			$front = substr( $query, 0, $index );
+			$index = false === strpos($query, '?') ? strlen($query) : strpos($query, '?');
+			$front = substr($query, 0, $index);
 
 			$external = $front != $this->index;
 		}
 
 		// "external" = it doesn't correspond to index.php.
-		if ( $external ) {
-			$this->add_external_rule( $regex, $query );
+		if ($external) {
+			$this->add_external_rule($regex, $query);
 		} else {
-			if ( 'bottom' == $after ) {
-				$this->extra_rules = array_merge( $this->extra_rules, array( $regex => $query ) );
+			if ('bottom' == $after) {
+				$this->extra_rules = array_merge($this->extra_rules, array($regex => $query));
 			} else {
-				$this->extra_rules_top = array_merge( $this->extra_rules_top, array( $regex => $query ) );
+				$this->extra_rules_top = array_merge($this->extra_rules_top, array($regex => $query));
 			}
 		}
 	}
@@ -1672,8 +1672,8 @@ 
 	 * @param string $regex Regular expression to match request against.
 	 * @param string $query The corresponding query vars for this rewrite rule.
 	 */
-	public function add_external_rule( $regex, $query ) {
-		$this->non_wp_rules[ $regex ] = $query;
+	public function add_external_rule($regex, $query) {
+		$this->non_wp_rules[$regex] = $query;
 	}
 
 	/**
@@ -1693,17 +1693,17 @@ 
 	 *                               skip registering a query_var for this endpoint. Defaults to the
 	 *                               value of `$name`.
 	 */
-	public function add_endpoint( $name, $places, $query_var = true ) {
+	public function add_endpoint($name, $places, $query_var = true) {
 		global $wp;
 
 		// For backward compatibility, if null has explicitly been passed as `$query_var`, assume `true`.
-		if ( true === $query_var || null === func_get_arg( 2 ) ) {
+		if (true === $query_var || null === func_get_arg(2)) {
 			$query_var = $name;
 		}
-		$this->endpoints[] = array( $places, $name, $query_var );
+		$this->endpoints[] = array($places, $name, $query_var);
 
-		if ( $query_var ) {
-			$wp->add_query_var( $query_var );
+		if ($query_var) {
+			$wp->add_query_var($query_var);
 		}
 	}
 
@@ -1746,12 +1746,12 @@ 
 	 *     @type bool $endpoints   Whether endpoints should be applied to the generated rules. Default true.
 	 * }
 	 */
-	public function add_permastruct( $name, $struct, $args = array() ) {
+	public function add_permastruct($name, $struct, $args = array()) {
 		// Back-compat for the old parameters: $with_front and $ep_mask.
-		if ( ! is_array( $args ) )
-			$args = array( 'with_front' => $args );
-		if ( func_num_args() == 4 )
-			$args['ep_mask'] = func_get_arg( 3 );
+		if ( ! is_array($args))
+			$args = array('with_front' => $args);
+		if (func_num_args() == 4)
+			$args['ep_mask'] = func_get_arg(3);
 
 		$defaults = array(
 			'with_front' => true,
@@ -1762,16 +1762,16 @@ 
 			'walk_dirs' => true,
 			'endpoints' => true,
 		);
-		$args = array_intersect_key( $args, $defaults );
-		$args = wp_parse_args( $args, $defaults );
+		$args = array_intersect_key($args, $defaults);
+		$args = wp_parse_args($args, $defaults);
 
-		if ( $args['with_front'] )
-			$struct = $this->front . $struct;
+		if ($args['with_front'])
+			$struct = $this->front.$struct;
 		else
-			$struct = $this->root . $struct;
+			$struct = $this->root.$struct;
 		$args['struct'] = $struct;
 
-		$this->extra_permastructs[ $name ] = $args;
+		$this->extra_permastructs[$name] = $args;
 	}
 
 	/**
@@ -1782,8 +1782,8 @@ 
 	 *
 	 * @param string $name Name for permalink structure.
 	 */
-	public function remove_permastruct( $name ) {
-		unset( $this->extra_permastructs[ $name ] );
+	public function remove_permastruct($name) {
+		unset($this->extra_permastructs[$name]);
 	}
 
 	/**
@@ -1799,22 +1799,22 @@ 
 	 *
 	 * @param bool $hard Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
 	 */
-	public function flush_rules( $hard = true ) {
+	public function flush_rules($hard = true) {
 		static $do_hard_later = null;
 
 		// Prevent this action from running before everyone has registered their rewrites.
-		if ( ! did_action( 'wp_loaded' ) ) {
-			add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
-			$do_hard_later = ( isset( $do_hard_later ) ) ? $do_hard_later || $hard : $hard;
+		if ( ! did_action('wp_loaded')) {
+			add_action('wp_loaded', array($this, 'flush_rules'));
+			$do_hard_later = (isset($do_hard_later)) ? $do_hard_later || $hard : $hard;
 			return;
 		}
 
-		if ( isset( $do_hard_later ) ) {
+		if (isset($do_hard_later)) {
 			$hard = $do_hard_later;
-			unset( $do_hard_later );
+			unset($do_hard_later);
 		}
 
-		update_option( 'rewrite_rules', '' );
+		update_option('rewrite_rules', '');
 		$this->wp_rewrite_rules();
 
 		/**
@@ -1826,12 +1826,12 @@ 
 		 *
 		 * @param bool $hard Whether to flush rewrite rules "hard". Default true.
 		 */
-		if ( ! $hard || ! apply_filters( 'flush_rewrite_rules_hard', true ) ) {
+		if ( ! $hard || ! apply_filters('flush_rewrite_rules_hard', true)) {
 			return;
 		}
-		if ( function_exists( 'save_mod_rewrite_rules' ) )
+		if (function_exists('save_mod_rewrite_rules'))
 			save_mod_rewrite_rules();
-		if ( function_exists( 'iis7_save_url_rewrite_rules' ) )
+		if (function_exists('iis7_save_url_rewrite_rules'))
 			iis7_save_url_rewrite_rules();
 	}
 
@@ -1851,8 +1851,8 @@ 
 		$this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
 		$this->root = '';
 
-		if ( $this->using_index_permalinks() )
-			$this->root = $this->index . '/';
+		if ($this->using_index_permalinks())
+			$this->root = $this->index.'/';
 
 		unset($this->author_structure);
 		unset($this->date_structure);
@@ -1860,10 +1860,10 @@ 
 		unset($this->search_structure);
 		unset($this->feed_structure);
 		unset($this->comment_feed_structure);
-		$this->use_trailing_slashes = ( '/' == substr($this->permalink_structure, -1, 1) );
+		$this->use_trailing_slashes = ('/' == substr($this->permalink_structure, -1, 1));
 
 		// Enable generic rules for pages if permalink structure doesn't begin with a wildcard.
-		if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) )
+		if (preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure))
 			 $this->use_verbose_page_rules = true;
 		else
 			$this->use_verbose_page_rules = false;
@@ -1885,7 +1885,7 @@ 
 	 * @param string $permalink_structure Permalink structure.
 	 */
 	public function set_permalink_structure($permalink_structure) {
-		if ( $permalink_structure != $this->permalink_structure ) {
+		if ($permalink_structure != $this->permalink_structure) {
 			$old_permalink_structure = $this->permalink_structure;
 			update_option('permalink_structure', $permalink_structure);
 
@@ -1899,7 +1899,7 @@ 
 			 * @param string $old_permalink_structure The previous permalink structure.
 			 * @param string $permalink_structure     The new permalink structure.
 			 */
-			do_action( 'permalink_structure_changed', $old_permalink_structure, $permalink_structure );
+			do_action('permalink_structure_changed', $old_permalink_structure, $permalink_structure);
 		}
 	}
 
@@ -1916,7 +1916,7 @@ 
 	 * @param string $category_base Category permalink structure base.
 	 */
 	public function set_category_base($category_base) {
-		if ( $category_base != get_option('category_base') ) {
+		if ($category_base != get_option('category_base')) {
 			update_option('category_base', $category_base);
 			$this->init();
 		}
@@ -1934,9 +1934,9 @@ 
 	 *
 	 * @param string $tag_base Tag permalink structure base.
 	 */
-	public function set_tag_base( $tag_base ) {
-		if ( $tag_base != get_option( 'tag_base') ) {
-			update_option( 'tag_base', $tag_base );
+	public function set_tag_base($tag_base) {
+		if ($tag_base != get_option('tag_base')) {
+			update_option('tag_base', $tag_base);
 			$this->init();
 		}
 	}