ntwb / wordpress

src/wp-includes/ms-settings.php

Spacing +70 added lines, -70 removed lines

@@ -11,117 +11,117 @@ 
  */
 
 /** Include Multisite initialization functions */
-require_once( ABSPATH . WPINC . '/ms-load.php' );
-require_once( ABSPATH . WPINC . '/ms-default-constants.php' );
+require_once(ABSPATH.WPINC.'/ms-load.php');
+require_once(ABSPATH.WPINC.'/ms-default-constants.php');
 
-if ( defined( 'SUNRISE' ) ) {
-	include_once( WP_CONTENT_DIR . '/sunrise.php' );
+if (defined('SUNRISE')) {
+	include_once(WP_CONTENT_DIR.'/sunrise.php');
 }
 
 /** Check for and define SUBDOMAIN_INSTALL and the deprecated VHOST constant. */
 ms_subdomain_constants();
 
-if ( !isset( $current_site ) || !isset( $current_blog ) ) {
+if ( ! isset($current_site) || ! isset($current_blog)) {
 
 	// Given the domain and path, let's try to identify the network and site.
 	// Usually, it's easier to query the site first, which declares its network.
 	// In limited situations, though, we either can or must find the network first.
 
-	$domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) );
-	if ( substr( $domain, -3 ) == ':80' ) {
-		$domain = substr( $domain, 0, -3 );
-		$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 );
-	} elseif ( substr( $domain, -4 ) == ':443' ) {
-		$domain = substr( $domain, 0, -4 );
-		$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
+	$domain = strtolower(stripslashes($_SERVER['HTTP_HOST']));
+	if (substr($domain, -3) == ':80') {
+		$domain = substr($domain, 0, -3);
+		$_SERVER['HTTP_HOST'] = substr($_SERVER['HTTP_HOST'], 0, -3);
+	} elseif (substr($domain, -4) == ':443') {
+		$domain = substr($domain, 0, -4);
+		$_SERVER['HTTP_HOST'] = substr($_SERVER['HTTP_HOST'], 0, -4);
 	}
 
-	$path = stripslashes( $_SERVER['REQUEST_URI'] );
-	if ( is_admin() ) {
-		$path = preg_replace( '#(.*)/wp-admin/.*#', '$1/', $path );
+	$path = stripslashes($_SERVER['REQUEST_URI']);
+	if (is_admin()) {
+		$path = preg_replace('#(.*)/wp-admin/.*#', '$1/', $path);
 	}
-	list( $path ) = explode( '?', $path );
+	list($path) = explode('?', $path);
 
 	// If the network is defined in wp-config.php, we can simply use that.
-	if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
+	if (defined('DOMAIN_CURRENT_SITE') && defined('PATH_CURRENT_SITE')) {
 		$current_site = new stdClass;
-		$current_site->id = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1;
+		$current_site->id = defined('SITE_ID_CURRENT_SITE') ? SITE_ID_CURRENT_SITE : 1;
 		$current_site->domain = DOMAIN_CURRENT_SITE;
 		$current_site->path = PATH_CURRENT_SITE;
-		if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {
+		if (defined('BLOG_ID_CURRENT_SITE')) {
 			$current_site->blog_id = BLOG_ID_CURRENT_SITE;
-		} elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // deprecated.
+		} elseif (defined('BLOGID_CURRENT_SITE')) { // deprecated.
 			$current_site->blog_id = BLOGID_CURRENT_SITE;
 		}
 
-		if ( 0 === strcasecmp( $current_site->domain, $domain ) && 0 === strcasecmp( $current_site->path, $path ) ) {
-			$current_blog = get_site_by_path( $domain, $path );
-		} elseif ( '/' !== $current_site->path && 0 === strcasecmp( $current_site->domain, $domain ) && 0 === stripos( $path, $current_site->path ) ) {
+		if (0 === strcasecmp($current_site->domain, $domain) && 0 === strcasecmp($current_site->path, $path)) {
+			$current_blog = get_site_by_path($domain, $path);
+		} elseif ('/' !== $current_site->path && 0 === strcasecmp($current_site->domain, $domain) && 0 === stripos($path, $current_site->path)) {
 			// If the current network has a path and also matches the domain and path of the request,
 			// we need to look for a site using the first path segment following the network's path.
-			$current_blog = get_site_by_path( $domain, $path, 1 + count( explode( '/', trim( $current_site->path, '/' ) ) ) );
+			$current_blog = get_site_by_path($domain, $path, 1 + count(explode('/', trim($current_site->path, '/'))));
 		} else {
 			// Otherwise, use the first path segment (as usual).
-			$current_blog = get_site_by_path( $domain, $path, 1 );
+			$current_blog = get_site_by_path($domain, $path, 1);
 		}
 
-	} elseif ( ! is_subdomain_install() ) {
+	} elseif ( ! is_subdomain_install()) {
 		/*
 		 * A "subdomain" install can be re-interpreted to mean "can support any domain".
 		 * If we're not dealing with one of these installs, then the important part is determining
 		 * the network first, because we need the network's path to identify any sites.
 		 */
-		if ( ! $current_site = wp_cache_get( 'current_network', 'site-options' ) ) {
+		if ( ! $current_site = wp_cache_get('current_network', 'site-options')) {
 			// Are there even two networks installed?
-			$one_network = $wpdb->get_row( "SELECT * FROM $wpdb->site LIMIT 2" ); // [sic]
-			if ( 1 === $wpdb->num_rows ) {
-				$current_site = wp_get_network( $one_network );
-				wp_cache_add( 'current_network', $current_site, 'site-options' );
-			} elseif ( 0 === $wpdb->num_rows ) {
+			$one_network = $wpdb->get_row("SELECT * FROM $wpdb->site LIMIT 2"); // [sic]
+			if (1 === $wpdb->num_rows) {
+				$current_site = wp_get_network($one_network);
+				wp_cache_add('current_network', $current_site, 'site-options');
+			} elseif (0 === $wpdb->num_rows) {
 				ms_not_installed();
 			}
 		}
-		if ( empty( $current_site ) ) {
-			$current_site = get_network_by_path( $domain, $path, 1 );
+		if (empty($current_site)) {
+			$current_site = get_network_by_path($domain, $path, 1);
 		}
 
-		if ( empty( $current_site ) ) {
+		if (empty($current_site)) {
 			ms_not_installed();
-		} elseif ( $path === $current_site->path ) {
-			$current_blog = get_site_by_path( $domain, $path );
+		} elseif ($path === $current_site->path) {
+			$current_blog = get_site_by_path($domain, $path);
 		} else {
 			// Search the network path + one more path segment (on top of the network path).
-			$current_blog = get_site_by_path( $domain, $path, substr_count( $current_site->path, '/' ) );
+			$current_blog = get_site_by_path($domain, $path, substr_count($current_site->path, '/'));
 		}
 	} else {
 		// Find the site by the domain and at most the first path segment.
-		$current_blog = get_site_by_path( $domain, $path, 1 );
-		if ( $current_blog ) {
-			$current_site = wp_get_network( $current_blog->site_id ? $current_blog->site_id : 1 );
+		$current_blog = get_site_by_path($domain, $path, 1);
+		if ($current_blog) {
+			$current_site = wp_get_network($current_blog->site_id ? $current_blog->site_id : 1);
 		} else {
 			// If you don't have a site with the same domain/path as a network, you're pretty screwed, but:
-			$current_site = get_network_by_path( $domain, $path, 1 );
+			$current_site = get_network_by_path($domain, $path, 1);
 		}
 	}
 
 	// The network declared by the site trumps any constants.
-	if ( $current_blog && $current_blog->site_id != $current_site->id ) {
-		$current_site = wp_get_network( $current_blog->site_id );
+	if ($current_blog && $current_blog->site_id != $current_site->id) {
+		$current_site = wp_get_network($current_blog->site_id);
 	}
 
 	// No network has been found, bail.
-	if ( empty( $current_site ) ) {
+	if (empty($current_site)) {
 		ms_not_installed();
 	}
 
 	// @todo Investigate when exactly this can occur.
-	if ( empty( $current_blog ) && defined( 'WP_INSTALLING' ) ) {
+	if (empty($current_blog) && defined('WP_INSTALLING')) {
 		$current_blog = new stdClass;
 		$current_blog->blog_id = $blog_id = 1;
 	}
 
 	// No site has been found, bail.
-	if ( empty( $current_blog ) ) {
+	if (empty($current_blog)) {
 		// We're going to redirect to the network URL, with some possible modifications.
 		$scheme = is_ssl() ? 'https' : 'http';
 		$destination = "$scheme://{$current_site->domain}{$current_site->path}";
@@ -138,19 +138,19 @@ 
 		 * @param string $domain       The domain used to search for a site.
 		 * @param string $path         The path used to search for a site.
 		 */
-		do_action( 'ms_site_not_found', $current_site, $domain, $path );
+		do_action('ms_site_not_found', $current_site, $domain, $path);
 
-		if ( is_subdomain_install() && ! defined( 'NOBLOGREDIRECT' ) ) {
+		if (is_subdomain_install() && ! defined('NOBLOGREDIRECT')) {
 			// For a "subdomain" install, redirect to the signup form specifically.
-			$destination .= 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
-		} elseif ( is_subdomain_install() ) {
+			$destination .= 'wp-signup.php?new='.str_replace('.'.$current_site->domain, '', $domain);
+		} elseif (is_subdomain_install()) {
 			// For a "subdomain" install, the NOBLOGREDIRECT constant
 			// can be used to avoid a redirect to the signup form.
 			// Using the ms_site_not_found action is preferred to the constant.
-			if ( '%siteurl%' !== NOBLOGREDIRECT ) {
+			if ('%siteurl%' !== NOBLOGREDIRECT) {
 				$destination = NOBLOGREDIRECT;
 			}
-		} elseif ( 0 === strcasecmp( $current_site->domain, $domain ) ) {
+		} elseif (0 === strcasecmp($current_site->domain, $domain)) {
 			/*
 			 * If the domain we were searching for matches the network's domain,
 			 * it's no use redirecting back to ourselves -- it'll cause a loop.
@@ -159,42 +159,42 @@ 
 			ms_not_installed();
 		}
 
-		header( 'Location: ' . $destination );
+		header('Location: '.$destination);
 		exit;
 	}
 
 	// @todo What if the domain of the network doesn't match the current site?
 	$current_site->cookie_domain = $current_site->domain;
-	if ( 'www.' === substr( $current_site->cookie_domain, 0, 4 ) ) {
-		$current_site->cookie_domain = substr( $current_site->cookie_domain, 4 );
+	if ('www.' === substr($current_site->cookie_domain, 0, 4)) {
+		$current_site->cookie_domain = substr($current_site->cookie_domain, 4);
 	}
 
 	// Figure out the current network's main site.
-	if ( ! isset( $current_site->blog_id ) ) {
-		if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
+	if ( ! isset($current_site->blog_id)) {
+		if ($current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path) {
 			$current_site->blog_id = $current_blog->blog_id;
-		} elseif ( ! $current_site->blog_id = wp_cache_get( 'network:' . $current_site->id . ':main_site', 'site-options' ) ) {
-			$current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s",
-				$current_site->domain, $current_site->path ) );
-			wp_cache_add( 'network:' . $current_site->id . ':main_site', $current_site->blog_id, 'site-options' );
+		} elseif ( ! $current_site->blog_id = wp_cache_get('network:'.$current_site->id.':main_site', 'site-options')) {
+			$current_site->blog_id = $wpdb->get_var($wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s",
+				$current_site->domain, $current_site->path));
+			wp_cache_add('network:'.$current_site->id.':main_site', $current_site->blog_id, 'site-options');
 		}
 	}
 
 	$blog_id = $current_blog->blog_id;
 	$public  = $current_blog->public;
 
-	if ( empty( $current_blog->site_id ) ) {
+	if (empty($current_blog->site_id)) {
 		// This dates to [MU134] and shouldn't be relevant anymore,
 		// but it could be possible for arguments passed to insert_blog() etc.
 		$current_blog->site_id = 1;
 	}
 
 	$site_id = $current_blog->site_id;
-	wp_load_core_site_options( $site_id );
+	wp_load_core_site_options($site_id);
 }
 
-$wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php
-$wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
+$wpdb->set_prefix($table_prefix, false); // $table_prefix can be set in sunrise.php
+$wpdb->set_blog_id($current_blog->blog_id, $current_blog->site_id);
 $table_prefix = $wpdb->get_blog_prefix();
 $_wp_switched_stack = array();
 $switched = false;
@@ -202,10 +202,10 @@ 
 // need to init cache again after blog_id is set
 wp_start_object_cache();
 
-if ( ! isset( $current_site->site_name ) ) {
-	$current_site->site_name = get_site_option( 'site_name' );
-	if ( ! $current_site->site_name ) {
-		$current_site->site_name = ucfirst( $current_site->domain );
+if ( ! isset($current_site->site_name)) {
+	$current_site->site_name = get_site_option('site_name');
+	if ( ! $current_site->site_name) {
+		$current_site->site_name = ucfirst($current_site->domain);
 	}
 }
 

src/wp-includes/media-template.php

Spacing +156 added lines, -156 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 ?>' ] }}" />
 	<# } #>
@@ -93,9 +93,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 ?> }}"<#
@@ -105,7 +105,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 ?><#
 	}
@@ -121,7 +121,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 ?>' ] }}" />
 	<# } #>
@@ -142,7 +142,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]>
@@ -166,7 +166,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>
@@ -174,38 +174,38 @@ 
 
 	<script type="text/html" id="tmpl-uploader-window">
 		<div class="uploader-window-content">
-			<h3><?php _e( 'Drop files to upload' ); ?></h3>
+			<h3><?php _e('Drop files to upload'); ?></h3>
 		</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 ) { #>
 			<h3 class="upload-message">{{ data.message }}</h3>
 		<# } #>
-		<?php if ( ! _device_can_upload() ) : ?>
-			<h3 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/' ); ?></h3>
-		<?php elseif ( is_multisite() && ! is_upload_space_available() ) : ?>
-			<h3 class="upload-instructions"><?php _e( 'Upload Limit Exceeded' ); ?></h3>
+		<?php if ( ! _device_can_upload()) : ?>
+			<h3 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/'); ?></h3>
+		<?php elseif (is_multisite() && ! is_upload_space_available()) : ?>
+			<h3 class="upload-instructions"><?php _e('Upload Limit Exceeded'); ?></h3>
 			<?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">
-				<h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h3>
-				<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>
+				<h3 class="upload-instructions drop-instructions"><?php _e('Drop files anywhere to upload'); ?></h3>
+				<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>
@@ -213,55 +213,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">
-		<h3><?php _e( 'Uploading' ); ?></h3>
-		<button type="button" class="button-link upload-dismiss-errors"><span class="screen-reader-text"><?php _e( 'Dismiss Errors' ); ?></span></button>
+		<h3><?php _e('Uploading'); ?></h3>
+		<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">
@@ -281,8 +281,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>
@@ -330,7 +330,7 @@ 
 
 				<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>
 					<# } #>
 				</div>
 			</div>
@@ -341,24 +341,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() }}
 						<# } #>
@@ -378,30 +378,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>
 				<# } #>
@@ -410,12 +410,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 { #>
@@ -427,19 +427,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>
@@ -470,11 +470,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';
@@ -525,23 +525,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; ?>
 				<# } #>
 
@@ -558,18 +558,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>
@@ -595,10 +595,10 @@ 
 		<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>
@@ -690,19 +690,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; ?>
@@ -740,23 +740,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 ) { #>
@@ -765,16 +765,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>
@@ -782,7 +782,7 @@ 
 	</script>
 
 	<script type="text/html" id="tmpl-playlist-settings">
-		<h3><?php _e( 'Playlist Settings' ); ?></h3>
+		<h3><?php _e('Playlist Settings'); ?></h3>
 
 		<# var emptyModel = _.isEmpty( data.model ),
 			isVideo = 'video' === data.controller.get('library').props.get('type'); #>
@@ -792,9 +792,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>
 
@@ -803,7 +803,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>
 		<# } #>
 
@@ -811,13 +811,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;">
@@ -832,7 +832,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" />
@@ -888,8 +888,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>
@@ -897,7 +897,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>
@@ -909,7 +909,7 @@ 
 						<input type="text" data-setting="alt" value="{{ data.model.alt }}" />
 					</label>
 
-					<h3><?php _e( 'Display Settings' ); ?></h3>
+					<h3><?php _e('Display Settings'); ?></h3>
 					<div class="setting align">
 						<span><?php _e('Align'); ?></span>
 						<div class="button-group button-large" data-setting="align">
@@ -939,30 +939,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>
 					<# } #>
 
@@ -991,7 +991,7 @@ 
 						<input type="text" class="link-to-custom" data-setting="linkUrl" />
 					</div>
 					<div class="advanced-section">
-						<h3><button type="button" class="button-link advanced-toggle"><?php _e( 'Advanced Options' ); ?></button></h3>
+						<h3><button type="button" class="button-link advanced-toggle"><?php _e('Advanced Options'); ?></button></h3>
 						<div class="advanced-settings hidden">
 							<div class="advanced-image">
 								<label class="setting title-text">
@@ -1005,7 +1005,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 window/tab' ); ?></label>
+									<label><input type="checkbox" data-setting="linkTargetBlank" value="_blank" <# if ( data.model.linkTargetBlank ) { #>checked="checked"<# } #>><?php _e('Open link in a new window/tab'); ?></label>
 								</div>
 								<label class="setting link-rel">
 									<span><?php _e('Link Rel'); ?></span>
@@ -1048,28 +1048,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>
@@ -1079,22 +1079,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>
@@ -1131,19 +1131,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 ?>
@@ -1151,7 +1151,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>
@@ -1162,32 +1162,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 ) ) {
@@ -1196,11 +1196,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>
@@ -1233,7 +1233,7 @@ 
 			</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>
@@ -1244,20 +1244,20 @@ 
 	</script>
 
 	<script type="text/html" id="tmpl-site-icon-preview">
-		<h2><?php _e( 'Preview' ); ?></h2>
-		<strong><?php _e( 'As a browser icon' ); ?></strong>
+		<h2><?php _e('Preview'); ?></h2>
+		<strong><?php _e('As a browser icon'); ?></strong>
 		<div class="favicon-preview">
 			<img src="images/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"><?php bloginfo( 'name' ); ?></span>
+			<span class="browser-title"><?php bloginfo('name'); ?></span>
 		</div>
 
-		<strong><?php _e( 'As an app icon' ); ?></strong>
+		<strong><?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>
 
@@ -1268,5 +1268,5 @@ 
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( 'print_media_templates' );
+	do_action('print_media_templates');
 }

Braces +18 added lines, -8 removed lines

@@ -142,8 +142,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>
@@ -201,9 +202,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">
-				<h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h3>
+				<h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' );
+}
+?></h3>
 				<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>
@@ -438,8 +442,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>
@@ -540,8 +547,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; ?>
 				<# } #>
 

src/wp-includes/class-oembed.php

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * API for fetching the HTML to embed remote content based on a provided URL.
- * Used internally by the {@link WP_Embed} class, but is designed to be generic.
- *
- * @link https://codex.wordpress.org/oEmbed oEmbed Codex Article
- * @link http://oembed.com/ oEmbed Homepage
- *
- * @package WordPress
- * @subpackage oEmbed
- */
+	 * API for fetching the HTML to embed remote content based on a provided URL.
+	 * Used internally by the {@link WP_Embed} class, but is designed to be generic.
+	 *
+	 * @link https://codex.wordpress.org/oEmbed oEmbed Codex Article
+	 * @link http://oembed.com/ oEmbed Homepage
+	 *
+	 * @package WordPress
+	 * @subpackage oEmbed
+	 */
 
 /**
  * oEmbed class.

Spacing +155 added lines, -155 removed lines

@@ -25,7 +25,7 @@ 
 	 */
 	public static $early_providers = array();
 
-	private $compat_methods = array( '_fetch_with_format', '_parse_json', '_parse_xml', '_parse_body' );
+	private $compat_methods = array('_fetch_with_format', '_parse_json', '_parse_xml', '_parse_body');
 
 	/**
 	 * Constructor
@@ -34,57 +34,57 @@ 
 	 */
 	public function __construct() {
 		$providers = array(
-			'#http://((m|www)\.)?youtube\.com/watch.*#i'          => array( 'http://www.youtube.com/oembed',                      true  ),
-			'#https://((m|www)\.)?youtube\.com/watch.*#i'         => array( 'http://www.youtube.com/oembed?scheme=https',         true  ),
-			'#http://((m|www)\.)?youtube\.com/playlist.*#i'       => array( 'http://www.youtube.com/oembed',                      true  ),
-			'#https://((m|www)\.)?youtube\.com/playlist.*#i'      => array( 'http://www.youtube.com/oembed?scheme=https',         true  ),
-			'#http://youtu\.be/.*#i'                              => array( 'http://www.youtube.com/oembed',                      true  ),
-			'#https://youtu\.be/.*#i'                             => array( 'http://www.youtube.com/oembed?scheme=https',         true  ),
-			'http://blip.tv/*'                                    => array( 'http://blip.tv/oembed/',                             false ),
-			'#https?://(.+\.)?vimeo\.com/.*#i'                    => array( 'http://vimeo.com/api/oembed.{format}',               true  ),
-			'#https?://(www\.)?dailymotion\.com/.*#i'             => array( 'http://www.dailymotion.com/services/oembed',         true  ),
-			'http://dai.ly/*'                                     => array( 'http://www.dailymotion.com/services/oembed',         false ),
-			'#https?://(www\.)?flickr\.com/.*#i'                  => array( 'https://www.flickr.com/services/oembed/',            true  ),
-			'#https?://flic\.kr/.*#i'                             => array( 'https://www.flickr.com/services/oembed/',            true  ),
-			'#https?://(.+\.)?smugmug\.com/.*#i'                  => array( 'http://api.smugmug.com/services/oembed/',            true  ),
-			'#https?://(www\.)?hulu\.com/watch/.*#i'              => array( 'http://www.hulu.com/api/oembed.{format}',            true  ),
-			'http://i*.photobucket.com/albums/*'                  => array( 'http://photobucket.com/oembed',                      false ),
-			'http://gi*.photobucket.com/groups/*'                 => array( 'http://photobucket.com/oembed',                      false ),
-			'#https?://(www\.)?scribd\.com/doc/.*#i'              => array( 'http://www.scribd.com/services/oembed',              true  ),
-			'#https?://wordpress.tv/.*#i'                         => array( 'http://wordpress.tv/oembed/',                        true  ),
-			'#https?://(.+\.)?polldaddy\.com/.*#i'                => array( 'https://polldaddy.com/oembed/',                      true  ),
-			'#https?://poll\.fm/.*#i'                             => array( 'https://polldaddy.com/oembed/',                      true  ),
-			'#https?://(www\.)?funnyordie\.com/videos/.*#i'       => array( 'http://www.funnyordie.com/oembed',                   true  ),
-			'#https?://(www\.)?twitter\.com/.+?/status(es)?/.*#i' => array( 'https://api.twitter.com/1/statuses/oembed.{format}', true  ),
-			'#https?://vine.co/v/.*#i'                            => array( 'https://vine.co/oembed.{format}',                    true  ),
- 			'#https?://(www\.)?soundcloud\.com/.*#i'              => array( 'http://soundcloud.com/oembed',                       true  ),
-			'#https?://(.+?\.)?slideshare\.net/.*#i'              => array( 'https://www.slideshare.net/api/oembed/2',            true  ),
-			'#https?://instagr(\.am|am\.com)/p/.*#i'              => array( 'https://api.instagram.com/oembed',                   true  ),
-			'#https?://(www\.)?rdio\.com/.*#i'                    => array( 'http://www.rdio.com/api/oembed/',                    true  ),
-			'#https?://rd\.io/x/.*#i'                             => array( 'http://www.rdio.com/api/oembed/',                    true  ),
-			'#https?://(open|play)\.spotify\.com/.*#i'            => array( 'https://embed.spotify.com/oembed/',                  true  ),
-			'#https?://(.+\.)?imgur\.com/.*#i'                    => array( 'http://api.imgur.com/oembed',                        true  ),
-			'#https?://(www\.)?meetu(\.ps|p\.com)/.*#i'           => array( 'http://api.meetup.com/oembed',                       true  ),
-			'#https?://(www\.)?issuu\.com/.+/docs/.+#i'           => array( 'http://issuu.com/oembed_wp',                         true  ),
-			'#https?://(www\.)?collegehumor\.com/video/.*#i'      => array( 'http://www.collegehumor.com/oembed.{format}',        true  ),
-			'#https?://(www\.)?mixcloud\.com/.*#i'                => array( 'http://www.mixcloud.com/oembed',                     true  ),
-			'#https?://(www\.|embed\.)?ted\.com/talks/.*#i'       => array( 'http://www.ted.com/talks/oembed.{format}',           true  ),
-			'#https?://(www\.)?(animoto|video214)\.com/play/.*#i' => array( 'http://animoto.com/oembeds/create',                  true  ),
-			'#https?://(.+)\.tumblr\.com/post/.*#i'               => array( 'https://www.tumblr.com/oembed/1.0',                  true  ),
-			'#https?://(www\.)?kickstarter\.com/projects/.*#i'    => array( 'https://www.kickstarter.com/services/oembed',        true  ),
-			'#https?://kck\.st/.*#i'                              => array( 'https://www.kickstarter.com/services/oembed',        true  ),
-			'#https?://cloudup\.com/.*#i'                         => array( 'https://cloudup.com/oembed', true ),
+			'#http://((m|www)\.)?youtube\.com/watch.*#i'          => array('http://www.youtube.com/oembed', true),
+			'#https://((m|www)\.)?youtube\.com/watch.*#i'         => array('http://www.youtube.com/oembed?scheme=https', true),
+			'#http://((m|www)\.)?youtube\.com/playlist.*#i'       => array('http://www.youtube.com/oembed', true),
+			'#https://((m|www)\.)?youtube\.com/playlist.*#i'      => array('http://www.youtube.com/oembed?scheme=https', true),
+			'#http://youtu\.be/.*#i'                              => array('http://www.youtube.com/oembed', true),
+			'#https://youtu\.be/.*#i'                             => array('http://www.youtube.com/oembed?scheme=https', true),
+			'http://blip.tv/*'                                    => array('http://blip.tv/oembed/', false),
+			'#https?://(.+\.)?vimeo\.com/.*#i'                    => array('http://vimeo.com/api/oembed.{format}', true),
+			'#https?://(www\.)?dailymotion\.com/.*#i'             => array('http://www.dailymotion.com/services/oembed', true),
+			'http://dai.ly/*'                                     => array('http://www.dailymotion.com/services/oembed', false),
+			'#https?://(www\.)?flickr\.com/.*#i'                  => array('https://www.flickr.com/services/oembed/', true),
+			'#https?://flic\.kr/.*#i'                             => array('https://www.flickr.com/services/oembed/', true),
+			'#https?://(.+\.)?smugmug\.com/.*#i'                  => array('http://api.smugmug.com/services/oembed/', true),
+			'#https?://(www\.)?hulu\.com/watch/.*#i'              => array('http://www.hulu.com/api/oembed.{format}', true),
+			'http://i*.photobucket.com/albums/*'                  => array('http://photobucket.com/oembed', false),
+			'http://gi*.photobucket.com/groups/*'                 => array('http://photobucket.com/oembed', false),
+			'#https?://(www\.)?scribd\.com/doc/.*#i'              => array('http://www.scribd.com/services/oembed', true),
+			'#https?://wordpress.tv/.*#i'                         => array('http://wordpress.tv/oembed/', true),
+			'#https?://(.+\.)?polldaddy\.com/.*#i'                => array('https://polldaddy.com/oembed/', true),
+			'#https?://poll\.fm/.*#i'                             => array('https://polldaddy.com/oembed/', true),
+			'#https?://(www\.)?funnyordie\.com/videos/.*#i'       => array('http://www.funnyordie.com/oembed', true),
+			'#https?://(www\.)?twitter\.com/.+?/status(es)?/.*#i' => array('https://api.twitter.com/1/statuses/oembed.{format}', true),
+			'#https?://vine.co/v/.*#i'                            => array('https://vine.co/oembed.{format}', true),
+ 			'#https?://(www\.)?soundcloud\.com/.*#i'              => array('http://soundcloud.com/oembed', true),
+			'#https?://(.+?\.)?slideshare\.net/.*#i'              => array('https://www.slideshare.net/api/oembed/2', true),
+			'#https?://instagr(\.am|am\.com)/p/.*#i'              => array('https://api.instagram.com/oembed', true),
+			'#https?://(www\.)?rdio\.com/.*#i'                    => array('http://www.rdio.com/api/oembed/', true),
+			'#https?://rd\.io/x/.*#i'                             => array('http://www.rdio.com/api/oembed/', true),
+			'#https?://(open|play)\.spotify\.com/.*#i'            => array('https://embed.spotify.com/oembed/', true),
+			'#https?://(.+\.)?imgur\.com/.*#i'                    => array('http://api.imgur.com/oembed', true),
+			'#https?://(www\.)?meetu(\.ps|p\.com)/.*#i'           => array('http://api.meetup.com/oembed', true),
+			'#https?://(www\.)?issuu\.com/.+/docs/.+#i'           => array('http://issuu.com/oembed_wp', true),
+			'#https?://(www\.)?collegehumor\.com/video/.*#i'      => array('http://www.collegehumor.com/oembed.{format}', true),
+			'#https?://(www\.)?mixcloud\.com/.*#i'                => array('http://www.mixcloud.com/oembed', true),
+			'#https?://(www\.|embed\.)?ted\.com/talks/.*#i'       => array('http://www.ted.com/talks/oembed.{format}', true),
+			'#https?://(www\.)?(animoto|video214)\.com/play/.*#i' => array('http://animoto.com/oembeds/create', true),
+			'#https?://(.+)\.tumblr\.com/post/.*#i'               => array('https://www.tumblr.com/oembed/1.0', true),
+			'#https?://(www\.)?kickstarter\.com/projects/.*#i'    => array('https://www.kickstarter.com/services/oembed', true),
+			'#https?://kck\.st/.*#i'                              => array('https://www.kickstarter.com/services/oembed', true),
+			'#https?://cloudup\.com/.*#i'                         => array('https://cloudup.com/oembed', true),
 		);
 
-		if ( ! empty( self::$early_providers['add'] ) ) {
-			foreach ( self::$early_providers['add'] as $format => $data ) {
-				$providers[ $format ] = $data;
+		if ( ! empty(self::$early_providers['add'])) {
+			foreach (self::$early_providers['add'] as $format => $data) {
+				$providers[$format] = $data;
 			}
 		}
 
-		if ( ! empty( self::$early_providers['remove'] ) ) {
-			foreach ( self::$early_providers['remove'] as $format ) {
-				unset( $providers[ $format ] );
+		if ( ! empty(self::$early_providers['remove'])) {
+			foreach (self::$early_providers['remove'] as $format) {
+				unset($providers[$format]);
 			}
 		}
 
@@ -167,10 +167,10 @@ 
 		 *
 		 * @param array $providers An array of popular oEmbed providers.
 		 */
-		$this->providers = apply_filters( 'oembed_providers', $providers );
+		$this->providers = apply_filters('oembed_providers', $providers);
 
 		// Fix any embeds that contain new lines in the middle of the HTML which breaks wpautop().
-		add_filter( 'oembed_dataparse', array($this, '_strip_newlines'), 10, 3 );
+		add_filter('oembed_dataparse', array($this, '_strip_newlines'), 10, 3);
 	}
 
 	/**
@@ -183,9 +183,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|bool Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( in_array( $name, $this->compat_methods ) ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if (in_array($name, $this->compat_methods)) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -202,30 +202,30 @@ 
 	 * @param string|array  $args Optional provider arguments.
 	 * @return false|string False on failure, otherwise the oEmbed provider URL.
 	 */
-	public function get_provider( $url, $args = '' ) {
+	public function get_provider($url, $args = '') {
 
 		$provider = false;
 
-		if ( !isset($args['discover']) )
+		if ( ! isset($args['discover']))
 			$args['discover'] = true;
 
-		foreach ( $this->providers as $matchmask => $data ) {
-			list( $providerurl, $regex ) = $data;
+		foreach ($this->providers as $matchmask => $data) {
+			list($providerurl, $regex) = $data;
 
 			// Turn the asterisk-type provider URLs into regex
-			if ( !$regex ) {
-				$matchmask = '#' . str_replace( '___wildcard___', '(.+)', preg_quote( str_replace( '*', '___wildcard___', $matchmask ), '#' ) ) . '#i';
-				$matchmask = preg_replace( '|^#http\\\://|', '#https?\://', $matchmask );
+			if ( ! $regex) {
+				$matchmask = '#'.str_replace('___wildcard___', '(.+)', preg_quote(str_replace('*', '___wildcard___', $matchmask), '#')).'#i';
+				$matchmask = preg_replace('|^#http\\\://|', '#https?\://', $matchmask);
 			}
 
-			if ( preg_match( $matchmask, $url ) ) {
-				$provider = str_replace( '{format}', 'json', $providerurl ); // JSON is easier to deal with than XML
+			if (preg_match($matchmask, $url)) {
+				$provider = str_replace('{format}', 'json', $providerurl); // JSON is easier to deal with than XML
 				break;
 			}
 		}
 
-		if ( !$provider && $args['discover'] )
-			$provider = $this->discover( $url );
+		if ( ! $provider && $args['discover'])
+			$provider = $this->discover($url);
 
 		return $provider;
 	}
@@ -248,12 +248,12 @@ 
 	 * @param bool   $regex    Optional. Whether the $format parameter is in a regex format.
 	 *                         Default false.
 	 */
-	public static function _add_provider_early( $format, $provider, $regex = false ) {
-		if ( empty( self::$early_providers['add'] ) ) {
+	public static function _add_provider_early($format, $provider, $regex = false) {
+		if (empty(self::$early_providers['add'])) {
 			self::$early_providers['add'] = array();
 		}
 
-		self::$early_providers['add'][ $format ] = array( $provider, $regex );
+		self::$early_providers['add'][$format] = array($provider, $regex);
 	}
 
 	/**
@@ -271,8 +271,8 @@ 
 	 * @param string $format The format of URL that this provider can handle. You can use
 	 *                       asterisks as wildcards.
 	 */
-	public static function _remove_provider_early( $format ) {
-		if ( empty( self::$early_providers['remove'] ) ) {
+	public static function _remove_provider_early($format) {
+		if (empty(self::$early_providers['remove'])) {
 			self::$early_providers['remove'] = array();
 		}
 
@@ -289,10 +289,10 @@ 
 	 * @param array $args Optional arguments. Usually passed from a shortcode.
 	 * @return false|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed.
 	 */
-	public function get_html( $url, $args = '' ) {
-		$provider = $this->get_provider( $url, $args );
+	public function get_html($url, $args = '') {
+		$provider = $this->get_provider($url, $args);
 
-		if ( !$provider || false === $data = $this->fetch( $provider, $url, $args ) )
+		if ( ! $provider || false === $data = $this->fetch($provider, $url, $args))
 			return false;
 
 		/**
@@ -304,7 +304,7 @@ 
 		 * @param string $url  URL of the content to be embedded.
 		 * @param array  $args Optional arguments, usually passed from a shortcode.
 		 */
-		return apply_filters( 'oembed_result', $this->data2html( $data, $url ), $url, $args );
+		return apply_filters('oembed_result', $this->data2html($data, $url), $url, $args);
 	}
 
 	/**
@@ -313,7 +313,7 @@ 
 	 * @param string $url The URL that should be inspected for discovery `<link>` tags.
 	 * @return false|string False on failure, otherwise the oEmbed provider URL.
 	 */
-	public function discover( $url ) {
+	public function discover($url) {
 		$providers = array();
 
 		/**
@@ -326,11 +326,11 @@ 
 		 * @param array  $args oEmbed remote get arguments.
 		 * @param string $url  URL to be inspected.
 		 */
-		$args = apply_filters( 'oembed_remote_get_args', array(), $url );
+		$args = apply_filters('oembed_remote_get_args', array(), $url);
 
 		// Fetch URL content
-		$request = wp_safe_remote_get( $url, $args );
-		if ( $html = wp_remote_retrieve_body( $request ) ) {
+		$request = wp_safe_remote_get($url, $args);
+		if ($html = wp_remote_retrieve_body($request)) {
 
 			/**
 			 * Filter the link types that contain oEmbed provider URLs.
@@ -341,33 +341,33 @@ 
 			 *                      'text/xml+oembed', and 'application/xml+oembed' (incorrect,
 			 *                      used by at least Vimeo).
 			 */
-			$linktypes = apply_filters( 'oembed_linktypes', array(
+			$linktypes = apply_filters('oembed_linktypes', array(
 				'application/json+oembed' => 'json',
 				'text/xml+oembed' => 'xml',
 				'application/xml+oembed' => 'xml',
-			) );
+			));
 
 			// Strip <body>
-			$html = substr( $html, 0, stripos( $html, '</head>' ) );
+			$html = substr($html, 0, stripos($html, '</head>'));
 
 			// Do a quick check
 			$tagfound = false;
-			foreach ( $linktypes as $linktype => $format ) {
-				if ( stripos($html, $linktype) ) {
+			foreach ($linktypes as $linktype => $format) {
+				if (stripos($html, $linktype)) {
 					$tagfound = true;
 					break;
 				}
 			}
 
-			if ( $tagfound && preg_match_all( '#<link([^<>]+)/?>#iU', $html, $links ) ) {
-				foreach ( $links[1] as $link ) {
-					$atts = shortcode_parse_atts( $link );
+			if ($tagfound && preg_match_all('#<link([^<>]+)/?>#iU', $html, $links)) {
+				foreach ($links[1] as $link) {
+					$atts = shortcode_parse_atts($link);
 
-					if ( !empty($atts['type']) && !empty($linktypes[$atts['type']]) && !empty($atts['href']) ) {
-						$providers[$linktypes[$atts['type']]] = htmlspecialchars_decode( $atts['href'] );
+					if ( ! empty($atts['type']) && ! empty($linktypes[$atts['type']]) && ! empty($atts['href'])) {
+						$providers[$linktypes[$atts['type']]] = htmlspecialchars_decode($atts['href']);
 
 						// Stop here if it's JSON (that's all we need)
-						if ( 'json' == $linktypes[$atts['type']] )
+						if ('json' == $linktypes[$atts['type']])
 							break;
 					}
 				}
@@ -375,9 +375,9 @@ 
 		}
 
 		// JSON is preferred to XML
-		if ( !empty($providers['json']) )
+		if ( ! empty($providers['json']))
 			return $providers['json'];
-		elseif ( !empty($providers['xml']) )
+		elseif ( ! empty($providers['xml']))
 			return $providers['xml'];
 		else
 			return false;
@@ -391,12 +391,12 @@ 
 	 * @param array $args Optional arguments. Usually passed from a shortcode.
 	 * @return false|object False on failure, otherwise the result in the form of an object.
 	 */
-	public function fetch( $provider, $url, $args = '' ) {
-		$args = wp_parse_args( $args, wp_embed_defaults( $url ) );
+	public function fetch($provider, $url, $args = '') {
+		$args = wp_parse_args($args, wp_embed_defaults($url));
 
-		$provider = add_query_arg( 'maxwidth', (int) $args['width'], $provider );
-		$provider = add_query_arg( 'maxheight', (int) $args['height'], $provider );
-		$provider = add_query_arg( 'url', urlencode($url), $provider );
+		$provider = add_query_arg('maxwidth', (int) $args['width'], $provider);
+		$provider = add_query_arg('maxheight', (int) $args['height'], $provider);
+		$provider = add_query_arg('url', urlencode($url), $provider);
 
 		/**
 		 * Filter the oEmbed URL to be fetched.
@@ -407,13 +407,13 @@ 
 		 * @param string $url      URL of the content to be embedded.
 		 * @param array  $args     Optional arguments, usually passed from a shortcode.
 		 */
-		$provider = apply_filters( 'oembed_fetch_url', $provider, $url, $args );
+		$provider = apply_filters('oembed_fetch_url', $provider, $url, $args);
 
-		foreach( array( 'json', 'xml' ) as $format ) {
-			$result = $this->_fetch_with_format( $provider, $format );
-			if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() )
+		foreach (array('json', 'xml') as $format) {
+			$result = $this->_fetch_with_format($provider, $format);
+			if (is_wp_error($result) && 'not-implemented' == $result->get_error_code())
 				continue;
-			return ( $result && ! is_wp_error( $result ) ) ? $result : false;
+			return ($result && ! is_wp_error($result)) ? $result : false;
 		}
 		return false;
 	}
@@ -427,19 +427,19 @@ 
 	 * @param string $format Format to use
 	 * @return false|object|WP_Error False on failure, otherwise the result in the form of an object.
 	 */
-	private function _fetch_with_format( $provider_url_with_args, $format ) {
-		$provider_url_with_args = add_query_arg( 'format', $format, $provider_url_with_args );
+	private function _fetch_with_format($provider_url_with_args, $format) {
+		$provider_url_with_args = add_query_arg('format', $format, $provider_url_with_args);
 
 		/** This filter is documented in wp-includes/class-oembed.php */
-		$args = apply_filters( 'oembed_remote_get_args', array(), $provider_url_with_args );
+		$args = apply_filters('oembed_remote_get_args', array(), $provider_url_with_args);
 
-		$response = wp_safe_remote_get( $provider_url_with_args, $args );
-		if ( 501 == wp_remote_retrieve_response_code( $response ) )
-			return new WP_Error( 'not-implemented' );
-		if ( ! $body = wp_remote_retrieve_body( $response ) )
+		$response = wp_safe_remote_get($provider_url_with_args, $args);
+		if (501 == wp_remote_retrieve_response_code($response))
+			return new WP_Error('not-implemented');
+		if ( ! $body = wp_remote_retrieve_body($response))
 			return false;
 		$parse_method = "_parse_$format";
-		return $this->$parse_method( $body );
+		return $this->$parse_method($body);
 	}
 
 	/**
@@ -451,9 +451,9 @@ 
 	 * @param string $response_body
 	 * @return object|false
 	 */
-	private function _parse_json( $response_body ) {
-		$data = json_decode( trim( $response_body ) );
-		return ( $data && is_object( $data ) ) ? $data : false;
+	private function _parse_json($response_body) {
+		$data = json_decode(trim($response_body));
+		return ($data && is_object($data)) ? $data : false;
 	}
 
 	/**
@@ -465,17 +465,17 @@ 
 	 * @param string $response_body
 	 * @return object|false
 	 */
-	private function _parse_xml( $response_body ) {
-		if ( ! function_exists( 'libxml_disable_entity_loader' ) )
+	private function _parse_xml($response_body) {
+		if ( ! function_exists('libxml_disable_entity_loader'))
 			return false;
 
-		$loader = libxml_disable_entity_loader( true );
-		$errors = libxml_use_internal_errors( true );
+		$loader = libxml_disable_entity_loader(true);
+		$errors = libxml_use_internal_errors(true);
 
-		$return = $this->_parse_xml_body( $response_body );
+		$return = $this->_parse_xml_body($response_body);
 
-		libxml_use_internal_errors( $errors );
-		libxml_disable_entity_loader( $loader );
+		libxml_use_internal_errors($errors);
+		libxml_disable_entity_loader($loader);
 
 		return $return;
 	}
@@ -489,29 +489,29 @@ 
 	 * @param string $response_body
 	 * @return object|false
 	 */
-	private function _parse_xml_body( $response_body ) {
-		if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument' ) )
+	private function _parse_xml_body($response_body) {
+		if ( ! function_exists('simplexml_import_dom') || ! class_exists('DOMDocument'))
 			return false;
 
 		$dom = new DOMDocument;
-		$success = $dom->loadXML( $response_body );
-		if ( ! $success )
+		$success = $dom->loadXML($response_body);
+		if ( ! $success)
 			return false;
 
-		if ( isset( $dom->doctype ) )
+		if (isset($dom->doctype))
 			return false;
 
-		foreach ( $dom->childNodes as $child ) {
-			if ( XML_DOCUMENT_TYPE_NODE === $child->nodeType )
+		foreach ($dom->childNodes as $child) {
+			if (XML_DOCUMENT_TYPE_NODE === $child->nodeType)
 				return false;
 		}
 
-		$xml = simplexml_import_dom( $dom );
-		if ( ! $xml )
+		$xml = simplexml_import_dom($dom);
+		if ( ! $xml)
 			return false;
 
 		$return = new stdClass;
-		foreach ( $xml as $key => $value ) {
+		foreach ($xml as $key => $value) {
 			$return->$key = (string) $value;
 		}
 
@@ -525,32 +525,32 @@ 
 	 * @param string $url The URL to the content that is desired to be embedded.
 	 * @return false|string False on error, otherwise the HTML needed to embed.
 	 */
-	public function data2html( $data, $url ) {
-		if ( ! is_object( $data ) || empty( $data->type ) )
+	public function data2html($data, $url) {
+		if ( ! is_object($data) || empty($data->type))
 			return false;
 
 		$return = false;
 
-		switch ( $data->type ) {
+		switch ($data->type) {
 			case 'photo':
-				if ( empty( $data->url ) || empty( $data->width ) || empty( $data->height ) )
+				if (empty($data->url) || empty($data->width) || empty($data->height))
 					break;
-				if ( ! is_string( $data->url ) || ! is_numeric( $data->width ) || ! is_numeric( $data->height ) )
+				if ( ! is_string($data->url) || ! is_numeric($data->width) || ! is_numeric($data->height))
 					break;
 
-				$title = ! empty( $data->title ) && is_string( $data->title ) ? $data->title : '';
-				$return = '<a href="' . esc_url( $url ) . '"><img src="' . esc_url( $data->url ) . '" alt="' . esc_attr($title) . '" width="' . esc_attr($data->width) . '" height="' . esc_attr($data->height) . '" /></a>';
+				$title = ! empty($data->title) && is_string($data->title) ? $data->title : '';
+				$return = '<a href="'.esc_url($url).'"><img src="'.esc_url($data->url).'" alt="'.esc_attr($title).'" width="'.esc_attr($data->width).'" height="'.esc_attr($data->height).'" /></a>';
 				break;
 
 			case 'video':
 			case 'rich':
-				if ( ! empty( $data->html ) && is_string( $data->html ) )
+				if ( ! empty($data->html) && is_string($data->html))
 					$return = $data->html;
 				break;
 
 			case 'link':
-				if ( ! empty( $data->title ) && is_string( $data->title ) )
-					$return = '<a href="' . esc_url( $url ) . '">' . esc_html( $data->title ) . '</a>';
+				if ( ! empty($data->title) && is_string($data->title))
+					$return = '<a href="'.esc_url($url).'">'.esc_html($data->title).'</a>';
 				break;
 
 			default:
@@ -568,7 +568,7 @@ 
 		 * @param object $data   A data object result from an oEmbed provider.
 		 * @param string $url    The URL of the content to be embedded.
 		 */
-		return apply_filters( 'oembed_dataparse', $return, $data, $url );
+		return apply_filters('oembed_dataparse', $return, $data, $url);
 	}
 
 	/**
@@ -580,33 +580,33 @@ 
 	 * @param string $url The original URL passed to oEmbed.
 	 * @return string Possibly modified $html
 	 */
-	public function _strip_newlines( $html, $data, $url ) {
-		if ( false === strpos( $html, "\n" ) ) {
+	public function _strip_newlines($html, $data, $url) {
+		if (false === strpos($html, "\n")) {
 			return $html;
 		}
 
 		$count = 1;
 		$found = array();
 		$token = '__PRE__';
-		$search = array( "\t", "\n", "\r", ' ' );
-		$replace = array( '__TAB__', '__NL__', '__CR__', '__SPACE__' );
-		$tokenized = str_replace( $search, $replace, $html );
+		$search = array("\t", "\n", "\r", ' ');
+		$replace = array('__TAB__', '__NL__', '__CR__', '__SPACE__');
+		$tokenized = str_replace($search, $replace, $html);
 
-		preg_match_all( '#(<pre[^>]*>.+?</pre>)#i', $tokenized, $matches, PREG_SET_ORDER );
-		foreach ( $matches as $i => $match ) {
-			$tag_html = str_replace( $replace, $search, $match[0] );
-			$tag_token = $token . $i;
+		preg_match_all('#(<pre[^>]*>.+?</pre>)#i', $tokenized, $matches, PREG_SET_ORDER);
+		foreach ($matches as $i => $match) {
+			$tag_html = str_replace($replace, $search, $match[0]);
+			$tag_token = $token.$i;
 
-			$found[ $tag_token ] = $tag_html;
-			$html = str_replace( $tag_html, $tag_token, $html, $count );
+			$found[$tag_token] = $tag_html;
+			$html = str_replace($tag_html, $tag_token, $html, $count);
 		}
 
-		$replaced = str_replace( $replace, $search, $html );
-		$stripped = str_replace( array( "\r\n", "\n" ), '', $replaced );
-		$pre = array_values( $found );
-		$tokens = array_keys( $found );
+		$replaced = str_replace($replace, $search, $html);
+		$stripped = str_replace(array("\r\n", "\n"), '', $replaced);
+		$pre = array_values($found);
+		$tokens = array_keys($found);
 
-		return str_replace( $tokens, $pre, $stripped );
+		return str_replace($tokens, $pre, $stripped);
 	}
 }
 
@@ -623,7 +623,7 @@ 
 function _wp_oembed_get_object() {
 	static $wp_oembed = null;
 
-	if ( is_null( $wp_oembed ) ) {
+	if (is_null($wp_oembed)) {
 		$wp_oembed = new WP_oEmbed();
 	}
 	return $wp_oembed;

Braces +61 added lines, -42 removed lines

@@ -206,8 +206,9 @@ 
 
 		$provider = false;
 
-		if ( !isset($args['discover']) )
-			$args['discover'] = true;
+		if ( !isset($args['discover']) ) {
+					$args['discover'] = true;
+		}
 
 		foreach ( $this->providers as $matchmask => $data ) {
 			list( $providerurl, $regex ) = $data;
@@ -224,8 +225,9 @@ 
 			}
 		}
 
-		if ( !$provider && $args['discover'] )
-			$provider = $this->discover( $url );
+		if ( !$provider && $args['discover'] ) {
+					$provider = $this->discover( $url );
+		}
 
 		return $provider;
 	}
@@ -292,8 +294,9 @@ 
 	public function get_html( $url, $args = '' ) {
 		$provider = $this->get_provider( $url, $args );
 
-		if ( !$provider || false === $data = $this->fetch( $provider, $url, $args ) )
-			return false;
+		if ( !$provider || false === $data = $this->fetch( $provider, $url, $args ) ) {
+					return false;
+		}
 
 		/**
 		 * Filter the HTML returned by the oEmbed provider.
@@ -367,20 +370,22 @@ 
 						$providers[$linktypes[$atts['type']]] = htmlspecialchars_decode( $atts['href'] );
 
 						// Stop here if it's JSON (that's all we need)
-						if ( 'json' == $linktypes[$atts['type']] )
-							break;
+						if ( 'json' == $linktypes[$atts['type']] ) {
+													break;
+						}
 					}
 				}
 			}
 		}
 
 		// JSON is preferred to XML
-		if ( !empty($providers['json']) )
-			return $providers['json'];
-		elseif ( !empty($providers['xml']) )
-			return $providers['xml'];
-		else
-			return false;
+		if ( !empty($providers['json']) ) {
+					return $providers['json'];
+		} elseif ( !empty($providers['xml']) ) {
+					return $providers['xml'];
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -411,8 +416,9 @@ 
 
 		foreach( array( 'json', 'xml' ) as $format ) {
 			$result = $this->_fetch_with_format( $provider, $format );
-			if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() )
-				continue;
+			if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() ) {
+							continue;
+			}
 			return ( $result && ! is_wp_error( $result ) ) ? $result : false;
 		}
 		return false;
@@ -434,10 +440,12 @@ 
 		$args = apply_filters( 'oembed_remote_get_args', array(), $provider_url_with_args );
 
 		$response = wp_safe_remote_get( $provider_url_with_args, $args );
-		if ( 501 == wp_remote_retrieve_response_code( $response ) )
-			return new WP_Error( 'not-implemented' );
-		if ( ! $body = wp_remote_retrieve_body( $response ) )
-			return false;
+		if ( 501 == wp_remote_retrieve_response_code( $response ) ) {
+					return new WP_Error( 'not-implemented' );
+		}
+		if ( ! $body = wp_remote_retrieve_body( $response ) ) {
+					return false;
+		}
 		$parse_method = "_parse_$format";
 		return $this->$parse_method( $body );
 	}
@@ -466,8 +474,9 @@ 
 	 * @return object|false
 	 */
 	private function _parse_xml( $response_body ) {
-		if ( ! function_exists( 'libxml_disable_entity_loader' ) )
-			return false;
+		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
+					return false;
+		}
 
 		$loader = libxml_disable_entity_loader( true );
 		$errors = libxml_use_internal_errors( true );
@@ -490,25 +499,30 @@ 
 	 * @return object|false
 	 */
 	private function _parse_xml_body( $response_body ) {
-		if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument' ) )
-			return false;
+		if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument' ) ) {
+					return false;
+		}
 
 		$dom = new DOMDocument;
 		$success = $dom->loadXML( $response_body );
-		if ( ! $success )
-			return false;
+		if ( ! $success ) {
+					return false;
+		}
 
-		if ( isset( $dom->doctype ) )
-			return false;
+		if ( isset( $dom->doctype ) ) {
+					return false;
+		}
 
 		foreach ( $dom->childNodes as $child ) {
-			if ( XML_DOCUMENT_TYPE_NODE === $child->nodeType )
-				return false;
+			if ( XML_DOCUMENT_TYPE_NODE === $child->nodeType ) {
+							return false;
+			}
 		}
 
 		$xml = simplexml_import_dom( $dom );
-		if ( ! $xml )
-			return false;
+		if ( ! $xml ) {
+					return false;
+		}
 
 		$return = new stdClass;
 		foreach ( $xml as $key => $value ) {
@@ -526,17 +540,20 @@ 
 	 * @return false|string False on error, otherwise the HTML needed to embed.
 	 */
 	public function data2html( $data, $url ) {
-		if ( ! is_object( $data ) || empty( $data->type ) )
-			return false;
+		if ( ! is_object( $data ) || empty( $data->type ) ) {
+					return false;
+		}
 
 		$return = false;
 
 		switch ( $data->type ) {
 			case 'photo':
-				if ( empty( $data->url ) || empty( $data->width ) || empty( $data->height ) )
-					break;
-				if ( ! is_string( $data->url ) || ! is_numeric( $data->width ) || ! is_numeric( $data->height ) )
-					break;
+				if ( empty( $data->url ) || empty( $data->width ) || empty( $data->height ) ) {
+									break;
+				}
+				if ( ! is_string( $data->url ) || ! is_numeric( $data->width ) || ! is_numeric( $data->height ) ) {
+									break;
+				}
 
 				$title = ! empty( $data->title ) && is_string( $data->title ) ? $data->title : '';
 				$return = '<a href="' . esc_url( $url ) . '"><img src="' . esc_url( $data->url ) . '" alt="' . esc_attr($title) . '" width="' . esc_attr($data->width) . '" height="' . esc_attr($data->height) . '" /></a>';
@@ -544,13 +561,15 @@ 
 
 			case 'video':
 			case 'rich':
-				if ( ! empty( $data->html ) && is_string( $data->html ) )
-					$return = $data->html;
+				if ( ! empty( $data->html ) && is_string( $data->html ) ) {
+									$return = $data->html;
+				}
 				break;
 
 			case 'link':
-				if ( ! empty( $data->title ) && is_string( $data->title ) )
-					$return = '<a href="' . esc_url( $url ) . '">' . esc_html( $data->title ) . '</a>';
+				if ( ! empty( $data->title ) && is_string( $data->title ) ) {
+									$return = '<a href="' . esc_url( $url ) . '">' . esc_html( $data->title ) . '</a>';
+				}
 				break;
 
 			default:

src/wp-includes/ms-files.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Multisite upload handler.
- *
- * @since 3.0.0
- *
- * @package WordPress
- * @subpackage Multisite
- */
+	 * Multisite upload handler.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 */
 
 define( 'SHORTINIT', true );
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );

Spacing +39 added lines, -39 removed lines

@@ -8,75 +8,75 @@
  * @subpackage Multisite
  */
 
-define( 'SHORTINIT', true );
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+define('SHORTINIT', true);
+require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
-if ( !is_multisite() )
-	die( 'Multisite support not enabled' );
+if ( ! is_multisite())
+	die('Multisite support not enabled');
 
 ms_file_constants();
 
-error_reporting( 0 );
+error_reporting(0);
 
-if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) {
-	status_header( 404 );
-	die( '404 — File not found.' );
+if ($current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1') {
+	status_header(404);
+	die('404 — File not found.');
 }
 
-$file = rtrim( BLOGUPLOADDIR, '/' ) . '/' . str_replace( '..', '', $_GET[ 'file' ] );
-if ( !is_file( $file ) ) {
-	status_header( 404 );
-	die( '404 — File not found.' );
+$file = rtrim(BLOGUPLOADDIR, '/').'/'.str_replace('..', '', $_GET['file']);
+if ( ! is_file($file)) {
+	status_header(404);
+	die('404 — File not found.');
 }
 
-$mime = wp_check_filetype( $file );
-if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
-	$mime[ 'type' ] = mime_content_type( $file );
+$mime = wp_check_filetype($file);
+if (false === $mime['type'] && function_exists('mime_content_type'))
+	$mime['type'] = mime_content_type($file);
 
-if ( $mime[ 'type' ] )
-	$mimetype = $mime[ 'type' ];
+if ($mime['type'])
+	$mimetype = $mime['type'];
 else
-	$mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
+	$mimetype = 'image/'.substr($file, strrpos($file, '.') + 1);
 
-header( 'Content-Type: ' . $mimetype ); // always send this
-if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) )
-	header( 'Content-Length: ' . filesize( $file ) );
+header('Content-Type: '.$mimetype); // always send this
+if (false === strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS'))
+	header('Content-Length: '.filesize($file));
 
 // Optional support for X-Sendfile and X-Accel-Redirect
-if ( WPMU_ACCEL_REDIRECT ) {
-	header( 'X-Accel-Redirect: ' . str_replace( WP_CONTENT_DIR, '', $file ) );
+if (WPMU_ACCEL_REDIRECT) {
+	header('X-Accel-Redirect: '.str_replace(WP_CONTENT_DIR, '', $file));
 	exit;
-} elseif ( WPMU_SENDFILE ) {
-	header( 'X-Sendfile: ' . $file );
+} elseif (WPMU_SENDFILE) {
+	header('X-Sendfile: '.$file);
 	exit;
 }
 
-$last_modified = gmdate( 'D, d M Y H:i:s', filemtime( $file ) );
-$etag = '"' . md5( $last_modified ) . '"';
-header( "Last-Modified: $last_modified GMT" );
-header( 'ETag: ' . $etag );
-header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + 100000000 ) . ' GMT' );
+$last_modified = gmdate('D, d M Y H:i:s', filemtime($file));
+$etag = '"'.md5($last_modified).'"';
+header("Last-Modified: $last_modified GMT");
+header('ETag: '.$etag);
+header('Expires: '.gmdate('D, d M Y H:i:s', time() + 100000000).' GMT');
 
 // Support for Conditional GET - use stripslashes to avoid formatting.php dependency
-$client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
+$client_etag = isset($_SERVER['HTTP_IF_NONE_MATCH']) ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) : false;
 
-if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
+if ( ! isset($_SERVER['HTTP_IF_MODIFIED_SINCE']))
 	$_SERVER['HTTP_IF_MODIFIED_SINCE'] = false;
 
-$client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
+$client_last_modified = trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
 // If string is empty, return 0. If not, attempt to parse into a timestamp
-$client_modified_timestamp = $client_last_modified ? strtotime( $client_last_modified ) : 0;
+$client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0;
 
 // Make a timestamp for our most recent modification...
 $modified_timestamp = strtotime($last_modified);
 
-if ( ( $client_last_modified && $client_etag )
-	? ( ( $client_modified_timestamp >= $modified_timestamp) && ( $client_etag == $etag ) )
-	: ( ( $client_modified_timestamp >= $modified_timestamp) || ( $client_etag == $etag ) )
+if (($client_last_modified && $client_etag)
+	? (($client_modified_timestamp >= $modified_timestamp) && ($client_etag == $etag))
+	: (($client_modified_timestamp >= $modified_timestamp) || ($client_etag == $etag))
 	) {
-	status_header( 304 );
+	status_header(304);
 	exit;
 }
 
 // If we made it this far, just serve the file
-readfile( $file );
+readfile($file);

Braces +11 added lines, -6 removed lines

@@ -11,8 +11,9 @@ 
 define( 'SHORTINIT', true );
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 
-if ( !is_multisite() )
+if ( !is_multisite() ) {
 	die( 'Multisite support not enabled' );
+}
 
 ms_file_constants();
 
@@ -30,17 +31,20 @@ 
 }
 
 $mime = wp_check_filetype( $file );
-if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
+if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) ) {
 	$mime[ 'type' ] = mime_content_type( $file );
+}
 
-if ( $mime[ 'type' ] )
+if ( $mime[ 'type' ] ) {
 	$mimetype = $mime[ 'type' ];
-else
+} else {
 	$mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
+}
 
 header( 'Content-Type: ' . $mimetype ); // always send this
-if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) )
+if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) ) {
 	header( 'Content-Length: ' . filesize( $file ) );
+}
 
 // Optional support for X-Sendfile and X-Accel-Redirect
 if ( WPMU_ACCEL_REDIRECT ) {
@@ -60,8 +64,9 @@ 
 // Support for Conditional GET - use stripslashes to avoid formatting.php dependency
 $client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
 
-if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
+if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
 	$_SERVER['HTTP_IF_MODIFIED_SINCE'] = false;
+}
 
 $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
 // If string is empty, return 0. If not, attempt to parse into a timestamp

src/wp-includes/pomo/entry.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Contains Translation_Entry class
- *
- * @version $Id: entry.php 718 2012-10-31 00:32:02Z nbachiyski $
- * @package pomo
- * @subpackage entry
- */
+	 * Contains Translation_Entry class
+	 *
+	 * @version $Id: entry.php 718 2012-10-31 00:32:02Z nbachiyski $
+	 * @package pomo
+	 * @subpackage entry
+	 */
 
 if ( !class_exists( 'Translation_Entry' ) ):
 /**

Spacing +12 added lines, -12 removed lines

@@ -7,7 +7,7 @@ 
  * @subpackage entry
  */
 
-if ( !class_exists( 'Translation_Entry' ) ):
+if ( ! class_exists('Translation_Entry')):
 /**
  * Translation_Entry class encapsulates a translatable string
  */
@@ -40,9 +40,9 @@ 
 	 * 	- references (array) -- places in the code this strings is used, in relative_to_root_path/file.php:linenum form
 	 * 	- flags (array) -- flags like php-format
 	 */
-	function __construct( $args = array() ) {
+	function __construct($args = array()) {
 		// if no singular -- empty object
-		if (!isset($args['singular'])) {
+		if ( ! isset($args['singular'])) {
 			return;
 		}
 		// get member variable values from args hash
@@ -50,16 +50,16 @@ 
 			$this->$varname = $value;
 		}
 		if (isset($args['plural'])) $this->is_plural = true;
-		if (!is_array($this->translations)) $this->translations = array();
-		if (!is_array($this->references)) $this->references = array();
-		if (!is_array($this->flags)) $this->flags = array();
+		if ( ! is_array($this->translations)) $this->translations = array();
+		if ( ! is_array($this->references)) $this->references = array();
+		if ( ! is_array($this->flags)) $this->flags = array();
 	}
 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Translation_Entry( $args = array() ) {
-		self::__construct( $args );
+	public function Translation_Entry($args = array()) {
+		self::__construct($args);
 	}
 
 	/**
@@ -70,16 +70,16 @@ 
 	function key() {
 		if (is_null($this->singular)) return false;
 		// prepend context and EOT, like in MO files
-		return is_null($this->context)? $this->singular : $this->context.chr(4).$this->singular;
+		return is_null($this->context) ? $this->singular : $this->context.chr(4).$this->singular;
 	}
 
 	/**
 	 * @param object $other
 	 */
 	function merge_with(&$other) {
-		$this->flags = array_unique( array_merge( $this->flags, $other->flags ) );
-		$this->references = array_unique( array_merge( $this->references, $other->references ) );
-		if ( $this->extracted_comments != $other->extracted_comments ) {
+		$this->flags = array_unique(array_merge($this->flags, $other->flags));
+		$this->references = array_unique(array_merge($this->references, $other->references));
+		if ($this->extracted_comments != $other->extracted_comments) {
 			$this->extracted_comments .= $other->extracted_comments;
 		}
 

Braces +15 added lines, -5 removed lines

@@ -49,10 +49,18 @@ 
 		foreach ($args as $varname => $value) {
 			$this->$varname = $value;
 		}
-		if (isset($args['plural'])) $this->is_plural = true;
-		if (!is_array($this->translations)) $this->translations = array();
-		if (!is_array($this->references)) $this->references = array();
-		if (!is_array($this->flags)) $this->flags = array();
+		if (isset($args['plural'])) {
+			$this->is_plural = true;
+		}
+		if (!is_array($this->translations)) {
+			$this->translations = array();
+		}
+		if (!is_array($this->references)) {
+			$this->references = array();
+		}
+		if (!is_array($this->flags)) {
+			$this->flags = array();
+		}
 	}
 
 	/**
@@ -68,7 +76,9 @@ 
 	 * @return string|bool the key or false if the entry is empty
 	 */
 	function key() {
-		if (is_null($this->singular)) return false;
+		if (is_null($this->singular)) {
+			return false;
+		}
 		// prepend context and EOT, like in MO files
 		return is_null($this->context)? $this->singular : $this->context.chr(4).$this->singular;
 	}

src/wp-includes/Text/Diff/Engine/shell.php

Indentation +142 added lines, -142 removed lines

@@ -16,147 +16,147 @@
  */
 class Text_Diff_Engine_shell {
 
-    /**
-     * Path to the diff executable
-     *
-     * @var string
-     */
-    var $_diffCommand = 'diff';
-
-    /**
-     * Returns the array of differences.
-     *
-     * @param array $from_lines lines of text from old file
-     * @param array $to_lines   lines of text from new file
-     *
-     * @return array all changes made (array with Text_Diff_Op_* objects)
-     */
-    function diff($from_lines, $to_lines)
-    {
-        array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
-        array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
-
-        $temp_dir = Text_Diff::_getTempDir();
-
-        // Execute gnu diff or similar to get a standard diff file.
-        $from_file = tempnam($temp_dir, 'Text_Diff');
-        $to_file = tempnam($temp_dir, 'Text_Diff');
-        $fp = fopen($from_file, 'w');
-        fwrite($fp, implode("\n", $from_lines));
-        fclose($fp);
-        $fp = fopen($to_file, 'w');
-        fwrite($fp, implode("\n", $to_lines));
-        fclose($fp);
-        $diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
-        unlink($from_file);
-        unlink($to_file);
-
-        if (is_null($diff)) {
-            // No changes were made
-            return array(new Text_Diff_Op_copy($from_lines));
-        }
-
-        $from_line_no = 1;
-        $to_line_no = 1;
-        $edits = array();
-
-        // Get changed lines by parsing something like:
-        // 0a1,2
-        // 1,2c4,6
-        // 1,5d6
-        preg_match_all('#^(\d+)(?:,(\d+))?([adc])(\d+)(?:,(\d+))?$#m', $diff,
-            $matches, PREG_SET_ORDER);
-
-        foreach ($matches as $match) {
-            if (!isset($match[5])) {
-                // This paren is not set every time (see regex).
-                $match[5] = false;
-            }
-
-            if ($match[3] == 'a') {
-                $from_line_no--;
-            }
-
-            if ($match[3] == 'd') {
-                $to_line_no--;
-            }
-
-            if ($from_line_no < $match[1] || $to_line_no < $match[4]) {
-                // copied lines
-                assert('$match[1] - $from_line_no == $match[4] - $to_line_no');
-                array_push($edits,
-                    new Text_Diff_Op_copy(
-                        $this->_getLines($from_lines, $from_line_no, $match[1] - 1),
-                        $this->_getLines($to_lines, $to_line_no, $match[4] - 1)));
-            }
-
-            switch ($match[3]) {
-            case 'd':
-                // deleted lines
-                array_push($edits,
-                    new Text_Diff_Op_delete(
-                        $this->_getLines($from_lines, $from_line_no, $match[2])));
-                $to_line_no++;
-                break;
-
-            case 'c':
-                // changed lines
-                array_push($edits,
-                    new Text_Diff_Op_change(
-                        $this->_getLines($from_lines, $from_line_no, $match[2]),
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                break;
-
-            case 'a':
-                // added lines
-                array_push($edits,
-                    new Text_Diff_Op_add(
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                $from_line_no++;
-                break;
-            }
-        }
-
-        if (!empty($from_lines)) {
-            // Some lines might still be pending. Add them as copied
-            array_push($edits,
-                new Text_Diff_Op_copy(
-                    $this->_getLines($from_lines, $from_line_no,
-                                     $from_line_no + count($from_lines) - 1),
-                    $this->_getLines($to_lines, $to_line_no,
-                                     $to_line_no + count($to_lines) - 1)));
-        }
-
-        return $edits;
-    }
-
-    /**
-     * Get lines from either the old or new text
-     *
-     * @access private
-     *
-     * @param array &$text_lines Either $from_lines or $to_lines
-     * @param int   &$line_no    Current line number
-     * @param int   $end         Optional end line, when we want to chop more
-     *                           than one line.
-     *
-     * @return array The chopped lines
-     */
-    function _getLines(&$text_lines, &$line_no, $end = false)
-    {
-        if (!empty($end)) {
-            $lines = array();
-            // We can shift even more
-            while ($line_no <= $end) {
-                array_push($lines, array_shift($text_lines));
-                $line_no++;
-            }
-        } else {
-            $lines = array(array_shift($text_lines));
-            $line_no++;
-        }
-
-        return $lines;
-    }
+	/**
+	 * Path to the diff executable
+	 *
+	 * @var string
+	 */
+	var $_diffCommand = 'diff';
+
+	/**
+	 * Returns the array of differences.
+	 *
+	 * @param array $from_lines lines of text from old file
+	 * @param array $to_lines   lines of text from new file
+	 *
+	 * @return array all changes made (array with Text_Diff_Op_* objects)
+	 */
+	function diff($from_lines, $to_lines)
+	{
+		array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+		array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+
+		$temp_dir = Text_Diff::_getTempDir();
+
+		// Execute gnu diff or similar to get a standard diff file.
+		$from_file = tempnam($temp_dir, 'Text_Diff');
+		$to_file = tempnam($temp_dir, 'Text_Diff');
+		$fp = fopen($from_file, 'w');
+		fwrite($fp, implode("\n", $from_lines));
+		fclose($fp);
+		$fp = fopen($to_file, 'w');
+		fwrite($fp, implode("\n", $to_lines));
+		fclose($fp);
+		$diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
+		unlink($from_file);
+		unlink($to_file);
+
+		if (is_null($diff)) {
+			// No changes were made
+			return array(new Text_Diff_Op_copy($from_lines));
+		}
+
+		$from_line_no = 1;
+		$to_line_no = 1;
+		$edits = array();
+
+		// Get changed lines by parsing something like:
+		// 0a1,2
+		// 1,2c4,6
+		// 1,5d6
+		preg_match_all('#^(\d+)(?:,(\d+))?([adc])(\d+)(?:,(\d+))?$#m', $diff,
+			$matches, PREG_SET_ORDER);
+
+		foreach ($matches as $match) {
+			if (!isset($match[5])) {
+				// This paren is not set every time (see regex).
+				$match[5] = false;
+			}
+
+			if ($match[3] == 'a') {
+				$from_line_no--;
+			}
+
+			if ($match[3] == 'd') {
+				$to_line_no--;
+			}
+
+			if ($from_line_no < $match[1] || $to_line_no < $match[4]) {
+				// copied lines
+				assert('$match[1] - $from_line_no == $match[4] - $to_line_no');
+				array_push($edits,
+					new Text_Diff_Op_copy(
+						$this->_getLines($from_lines, $from_line_no, $match[1] - 1),
+						$this->_getLines($to_lines, $to_line_no, $match[4] - 1)));
+			}
+
+			switch ($match[3]) {
+			case 'd':
+				// deleted lines
+				array_push($edits,
+					new Text_Diff_Op_delete(
+						$this->_getLines($from_lines, $from_line_no, $match[2])));
+				$to_line_no++;
+				break;
+
+			case 'c':
+				// changed lines
+				array_push($edits,
+					new Text_Diff_Op_change(
+						$this->_getLines($from_lines, $from_line_no, $match[2]),
+						$this->_getLines($to_lines, $to_line_no, $match[5])));
+				break;
+
+			case 'a':
+				// added lines
+				array_push($edits,
+					new Text_Diff_Op_add(
+						$this->_getLines($to_lines, $to_line_no, $match[5])));
+				$from_line_no++;
+				break;
+			}
+		}
+
+		if (!empty($from_lines)) {
+			// Some lines might still be pending. Add them as copied
+			array_push($edits,
+				new Text_Diff_Op_copy(
+					$this->_getLines($from_lines, $from_line_no,
+									 $from_line_no + count($from_lines) - 1),
+					$this->_getLines($to_lines, $to_line_no,
+									 $to_line_no + count($to_lines) - 1)));
+		}
+
+		return $edits;
+	}
+
+	/**
+	 * Get lines from either the old or new text
+	 *
+	 * @access private
+	 *
+	 * @param array &$text_lines Either $from_lines or $to_lines
+	 * @param int   &$line_no    Current line number
+	 * @param int   $end         Optional end line, when we want to chop more
+	 *                           than one line.
+	 *
+	 * @return array The chopped lines
+	 */
+	function _getLines(&$text_lines, &$line_no, $end = false)
+	{
+		if (!empty($end)) {
+			$lines = array();
+			// We can shift even more
+			while ($line_no <= $end) {
+				array_push($lines, array_shift($text_lines));
+				$line_no++;
+			}
+		} else {
+			$lines = array(array_shift($text_lines));
+			$line_no++;
+		}
+
+		return $lines;
+	}
 
 }

Switch Indentation +23 added lines, -23 removed lines

@@ -91,29 +91,29 @@
             }
 
             switch ($match[3]) {
-            case 'd':
-                // deleted lines
-                array_push($edits,
-                    new Text_Diff_Op_delete(
-                        $this->_getLines($from_lines, $from_line_no, $match[2])));
-                $to_line_no++;
-                break;
-
-            case 'c':
-                // changed lines
-                array_push($edits,
-                    new Text_Diff_Op_change(
-                        $this->_getLines($from_lines, $from_line_no, $match[2]),
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                break;
-
-            case 'a':
-                // added lines
-                array_push($edits,
-                    new Text_Diff_Op_add(
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                $from_line_no++;
-                break;
+            	case 'd':
+                	// deleted lines
+                	array_push($edits,
+                    	new Text_Diff_Op_delete(
+                        	$this->_getLines($from_lines, $from_line_no, $match[2])));
+                	$to_line_no++;
+                	break;
+
+            	case 'c':
+                	// changed lines
+                	array_push($edits,
+                    	new Text_Diff_Op_change(
+                        	$this->_getLines($from_lines, $from_line_no, $match[2]),
+                        	$this->_getLines($to_lines, $to_line_no, $match[5])));
+                	break;
+
+            	case 'a':
+                	// added lines
+                	array_push($edits,
+                    	new Text_Diff_Op_add(
+                        	$this->_getLines($to_lines, $to_line_no, $match[5])));
+                	$from_line_no++;
+                	break;
             }
         }
 

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
         $fp = fopen($to_file, 'w');
         fwrite($fp, implode("\n", $to_lines));
         fclose($fp);
-        $diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
+        $diff = shell_exec($this->_diffCommand.' '.$from_file.' '.$to_file);
         unlink($from_file);
         unlink($to_file);
 
@@ -68,7 +68,7 @@ 
             $matches, PREG_SET_ORDER);
 
         foreach ($matches as $match) {
-            if (!isset($match[5])) {
+            if ( ! isset($match[5])) {
                 // This paren is not set every time (see regex).
                 $match[5] = false;
             }
@@ -117,7 +117,7 @@ 
             }
         }
 
-        if (!empty($from_lines)) {
+        if ( ! empty($from_lines)) {
             // Some lines might still be pending. Add them as copied
             array_push($edits,
                 new Text_Diff_Op_copy(
@@ -144,7 +144,7 @@ 
      */
     function _getLines(&$text_lines, &$line_no, $end = false)
     {
-        if (!empty($end)) {
+        if ( ! empty($end)) {
             $lines = array();
             // We can shift even more
             while ($line_no <= $end) {

src/wp-includes/Text/Diff/Engine/xdiff.php

Indentation +32 added lines, -32 removed lines

@@ -15,22 +15,22 @@ 
  */
 class Text_Diff_Engine_xdiff {
 
-    /**
-     */
-    function diff($from_lines, $to_lines)
-    {
-        array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
-        array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+	/**
+	 */
+	function diff($from_lines, $to_lines)
+	{
+		array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+		array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
 
-        /* Convert the two input arrays into strings for xdiff processing. */
-        $from_string = implode("\n", $from_lines);
-        $to_string = implode("\n", $to_lines);
+		/* Convert the two input arrays into strings for xdiff processing. */
+		$from_string = implode("\n", $from_lines);
+		$to_string = implode("\n", $to_lines);
 
-        /* Diff the two strings and convert the result to an array. */
-        $diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
-        $diff = explode("\n", $diff);
+		/* Diff the two strings and convert the result to an array. */
+		$diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
+		$diff = explode("\n", $diff);
 
-        /* Walk through the diff one line at a time.  We build the $edits
+		/* Walk through the diff one line at a time.  We build the $edits
          * array of diff operations by reading the first character of the
          * xdiff output (which is in the "unified diff" format).
          *
@@ -38,27 +38,27 @@ 
          * lines using this approach, so we can't add Text_Diff_Op_changed
          * instances to the $edits array.  The result is still perfectly
          * valid, albeit a little less descriptive and efficient. */
-        $edits = array();
-        foreach ($diff as $line) {
-            if (!strlen($line)) {
-                continue;
-            }
-            switch ($line[0]) {
-            case ' ':
-                $edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
-                break;
+		$edits = array();
+		foreach ($diff as $line) {
+			if (!strlen($line)) {
+				continue;
+			}
+			switch ($line[0]) {
+			case ' ':
+				$edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
+				break;
 
-            case '+':
-                $edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
-                break;
+			case '+':
+				$edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
+				break;
 
-            case '-':
-                $edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
-                break;
-            }
-        }
+			case '-':
+				$edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
+				break;
+			}
+		}
 
-        return $edits;
-    }
+		return $edits;
+	}
 
 }

Switch Indentation +9 added lines, -9 removed lines

@@ -44,17 +44,17 @@
                 continue;
             }
             switch ($line[0]) {
-            case ' ':
-                $edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
-                break;
+            	case ' ':
+                	$edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
+                	break;
 
-            case '+':
-                $edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
-                break;
+            	case '+':
+                	$edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
+                	break;
 
-            case '-':
-                $edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
-                break;
+            	case '-':
+                	$edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
+                	break;
             }
         }
 

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
          * valid, albeit a little less descriptive and efficient. */
         $edits = array();
         foreach ($diff as $line) {
-            if (!strlen($line)) {
+            if ( ! strlen($line)) {
                 continue;
             }
             switch ($line[0]) {

src/wp-includes/Text/Diff.php

Indentation +356 added lines, -356 removed lines

@@ -17,43 +17,43 @@ 
  */
 class Text_Diff {
 
-    /**
-     * Array of changes.
-     *
-     * @var array
-     */
-    var $_edits;
-
-    /**
-     * Computes diffs between sequences of strings.
-     *
-     * @param string $engine     Name of the diffing engine to use.  'auto'
-     *                           will automatically select the best.
-     * @param array $params      Parameters to pass to the diffing engine.
-     *                           Normally an array of two arrays, each
-     *                           containing the lines from a file.
-     */
-    function __construct( $engine, $params )
-    {
-        // Backward compatibility workaround.
-        if (!is_string($engine)) {
-            $params = array($engine, $params);
-            $engine = 'auto';
-        }
-
-        if ($engine == 'auto') {
-            $engine = extension_loaded('xdiff') ? 'xdiff' : 'native';
-        } else {
-            $engine = basename($engine);
-        }
-
-        // WP #7391
-        require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
-        $class = 'Text_Diff_Engine_' . $engine;
-        $diff_engine = new $class();
-
-        $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
-    }
+	/**
+	 * Array of changes.
+	 *
+	 * @var array
+	 */
+	var $_edits;
+
+	/**
+	 * Computes diffs between sequences of strings.
+	 *
+	 * @param string $engine     Name of the diffing engine to use.  'auto'
+	 *                           will automatically select the best.
+	 * @param array $params      Parameters to pass to the diffing engine.
+	 *                           Normally an array of two arrays, each
+	 *                           containing the lines from a file.
+	 */
+	function __construct( $engine, $params )
+	{
+		// Backward compatibility workaround.
+		if (!is_string($engine)) {
+			$params = array($engine, $params);
+			$engine = 'auto';
+		}
+
+		if ($engine == 'auto') {
+			$engine = extension_loaded('xdiff') ? 'xdiff' : 'native';
+		} else {
+			$engine = basename($engine);
+		}
+
+		// WP #7391
+		require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
+		$class = 'Text_Diff_Engine_' . $engine;
+		$diff_engine = new $class();
+
+		$this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -62,230 +62,230 @@ 
 		self::__construct( $engine, $params );
 	}
 
-    /**
-     * Returns the array of differences.
-     */
-    function getDiff()
-    {
-        return $this->_edits;
-    }
-
-    /**
-     * returns the number of new (added) lines in a given diff.
-     *
-     * @since Text_Diff 1.1.0
-     *
-     * @return integer The number of new lines
-     */
-    function countAddedLines()
-    {
-        $count = 0;
-        foreach ($this->_edits as $edit) {
-            if (is_a($edit, 'Text_Diff_Op_add') ||
-                is_a($edit, 'Text_Diff_Op_change')) {
-                $count += $edit->nfinal();
-            }
-        }
-        return $count;
-    }
-
-    /**
-     * Returns the number of deleted (removed) lines in a given diff.
-     *
-     * @since Text_Diff 1.1.0
-     *
-     * @return integer The number of deleted lines
-     */
-    function countDeletedLines()
-    {
-        $count = 0;
-        foreach ($this->_edits as $edit) {
-            if (is_a($edit, 'Text_Diff_Op_delete') ||
-                is_a($edit, 'Text_Diff_Op_change')) {
-                $count += $edit->norig();
-            }
-        }
-        return $count;
-    }
-
-    /**
-     * Computes a reversed diff.
-     *
-     * Example:
-     * <code>
-     * $diff = new Text_Diff($lines1, $lines2);
-     * $rev = $diff->reverse();
-     * </code>
-     *
-     * @return Text_Diff  A Diff object representing the inverse of the
-     *                    original diff.  Note that we purposely don't return a
-     *                    reference here, since this essentially is a clone()
-     *                    method.
-     */
-    function reverse()
-    {
-        if (version_compare(zend_version(), '2', '>')) {
-            $rev = clone($this);
-        } else {
-            $rev = $this;
-        }
-        $rev->_edits = array();
-        foreach ($this->_edits as $edit) {
-            $rev->_edits[] = $edit->reverse();
-        }
-        return $rev;
-    }
-
-    /**
-     * Checks for an empty diff.
-     *
-     * @return boolean  True if two sequences were identical.
-     */
-    function isEmpty()
-    {
-        foreach ($this->_edits as $edit) {
-            if (!is_a($edit, 'Text_Diff_Op_copy')) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Computes the length of the Longest Common Subsequence (LCS).
-     *
-     * This is mostly for diagnostic purposes.
-     *
-     * @return integer  The length of the LCS.
-     */
-    function lcs()
-    {
-        $lcs = 0;
-        foreach ($this->_edits as $edit) {
-            if (is_a($edit, 'Text_Diff_Op_copy')) {
-                $lcs += count($edit->orig);
-            }
-        }
-        return $lcs;
-    }
-
-    /**
-     * Gets the original set of lines.
-     *
-     * This reconstructs the $from_lines parameter passed to the constructor.
-     *
-     * @return array  The original sequence of strings.
-     */
-    function getOriginal()
-    {
-        $lines = array();
-        foreach ($this->_edits as $edit) {
-            if ($edit->orig) {
-                array_splice($lines, count($lines), 0, $edit->orig);
-            }
-        }
-        return $lines;
-    }
-
-    /**
-     * Gets the final set of lines.
-     *
-     * This reconstructs the $to_lines parameter passed to the constructor.
-     *
-     * @return array  The sequence of strings.
-     */
-    function getFinal()
-    {
-        $lines = array();
-        foreach ($this->_edits as $edit) {
-            if ($edit->final) {
-                array_splice($lines, count($lines), 0, $edit->final);
-            }
-        }
-        return $lines;
-    }
-
-    /**
-     * Removes trailing newlines from a line of text. This is meant to be used
-     * with array_walk().
-     *
-     * @param string $line  The line to trim.
-     * @param integer $key  The index of the line in the array. Not used.
-     */
-    static function trimNewlines(&$line, $key)
-    {
-        $line = str_replace(array("\n", "\r"), '', $line);
-    }
-
-    /**
-     * Determines the location of the system temporary directory.
-     *
-     * @static
-     *
-     * @access protected
-     *
-     * @return string  A directory name which can be used for temp files.
-     *                 Returns false if one could not be found.
-     */
-    function _getTempDir()
-    {
-        $tmp_locations = array('/tmp', '/var/tmp', 'c:\WUTemp', 'c:\temp',
-                               'c:\windows\temp', 'c:\winnt\temp');
-
-        /* Try PHP's upload_tmp_dir directive. */
-        $tmp = ini_get('upload_tmp_dir');
-
-        /* Otherwise, try to determine the TMPDIR environment variable. */
-        if (!strlen($tmp)) {
-            $tmp = getenv('TMPDIR');
-        }
-
-        /* If we still cannot determine a value, then cycle through a list of
+	/**
+	 * Returns the array of differences.
+	 */
+	function getDiff()
+	{
+		return $this->_edits;
+	}
+
+	/**
+	 * returns the number of new (added) lines in a given diff.
+	 *
+	 * @since Text_Diff 1.1.0
+	 *
+	 * @return integer The number of new lines
+	 */
+	function countAddedLines()
+	{
+		$count = 0;
+		foreach ($this->_edits as $edit) {
+			if (is_a($edit, 'Text_Diff_Op_add') ||
+				is_a($edit, 'Text_Diff_Op_change')) {
+				$count += $edit->nfinal();
+			}
+		}
+		return $count;
+	}
+
+	/**
+	 * Returns the number of deleted (removed) lines in a given diff.
+	 *
+	 * @since Text_Diff 1.1.0
+	 *
+	 * @return integer The number of deleted lines
+	 */
+	function countDeletedLines()
+	{
+		$count = 0;
+		foreach ($this->_edits as $edit) {
+			if (is_a($edit, 'Text_Diff_Op_delete') ||
+				is_a($edit, 'Text_Diff_Op_change')) {
+				$count += $edit->norig();
+			}
+		}
+		return $count;
+	}
+
+	/**
+	 * Computes a reversed diff.
+	 *
+	 * Example:
+	 * <code>
+	 * $diff = new Text_Diff($lines1, $lines2);
+	 * $rev = $diff->reverse();
+	 * </code>
+	 *
+	 * @return Text_Diff  A Diff object representing the inverse of the
+	 *                    original diff.  Note that we purposely don't return a
+	 *                    reference here, since this essentially is a clone()
+	 *                    method.
+	 */
+	function reverse()
+	{
+		if (version_compare(zend_version(), '2', '>')) {
+			$rev = clone($this);
+		} else {
+			$rev = $this;
+		}
+		$rev->_edits = array();
+		foreach ($this->_edits as $edit) {
+			$rev->_edits[] = $edit->reverse();
+		}
+		return $rev;
+	}
+
+	/**
+	 * Checks for an empty diff.
+	 *
+	 * @return boolean  True if two sequences were identical.
+	 */
+	function isEmpty()
+	{
+		foreach ($this->_edits as $edit) {
+			if (!is_a($edit, 'Text_Diff_Op_copy')) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Computes the length of the Longest Common Subsequence (LCS).
+	 *
+	 * This is mostly for diagnostic purposes.
+	 *
+	 * @return integer  The length of the LCS.
+	 */
+	function lcs()
+	{
+		$lcs = 0;
+		foreach ($this->_edits as $edit) {
+			if (is_a($edit, 'Text_Diff_Op_copy')) {
+				$lcs += count($edit->orig);
+			}
+		}
+		return $lcs;
+	}
+
+	/**
+	 * Gets the original set of lines.
+	 *
+	 * This reconstructs the $from_lines parameter passed to the constructor.
+	 *
+	 * @return array  The original sequence of strings.
+	 */
+	function getOriginal()
+	{
+		$lines = array();
+		foreach ($this->_edits as $edit) {
+			if ($edit->orig) {
+				array_splice($lines, count($lines), 0, $edit->orig);
+			}
+		}
+		return $lines;
+	}
+
+	/**
+	 * Gets the final set of lines.
+	 *
+	 * This reconstructs the $to_lines parameter passed to the constructor.
+	 *
+	 * @return array  The sequence of strings.
+	 */
+	function getFinal()
+	{
+		$lines = array();
+		foreach ($this->_edits as $edit) {
+			if ($edit->final) {
+				array_splice($lines, count($lines), 0, $edit->final);
+			}
+		}
+		return $lines;
+	}
+
+	/**
+	 * Removes trailing newlines from a line of text. This is meant to be used
+	 * with array_walk().
+	 *
+	 * @param string $line  The line to trim.
+	 * @param integer $key  The index of the line in the array. Not used.
+	 */
+	static function trimNewlines(&$line, $key)
+	{
+		$line = str_replace(array("\n", "\r"), '', $line);
+	}
+
+	/**
+	 * Determines the location of the system temporary directory.
+	 *
+	 * @static
+	 *
+	 * @access protected
+	 *
+	 * @return string  A directory name which can be used for temp files.
+	 *                 Returns false if one could not be found.
+	 */
+	function _getTempDir()
+	{
+		$tmp_locations = array('/tmp', '/var/tmp', 'c:\WUTemp', 'c:\temp',
+							   'c:\windows\temp', 'c:\winnt\temp');
+
+		/* Try PHP's upload_tmp_dir directive. */
+		$tmp = ini_get('upload_tmp_dir');
+
+		/* Otherwise, try to determine the TMPDIR environment variable. */
+		if (!strlen($tmp)) {
+			$tmp = getenv('TMPDIR');
+		}
+
+		/* If we still cannot determine a value, then cycle through a list of
          * preset possibilities. */
-        while (!strlen($tmp) && count($tmp_locations)) {
-            $tmp_check = array_shift($tmp_locations);
-            if (@is_dir($tmp_check)) {
-                $tmp = $tmp_check;
-            }
-        }
-
-        /* If it is still empty, we have failed, so return false; otherwise
+		while (!strlen($tmp) && count($tmp_locations)) {
+			$tmp_check = array_shift($tmp_locations);
+			if (@is_dir($tmp_check)) {
+				$tmp = $tmp_check;
+			}
+		}
+
+		/* If it is still empty, we have failed, so return false; otherwise
          * return the directory determined. */
-        return strlen($tmp) ? $tmp : false;
-    }
-
-    /**
-     * Checks a diff for validity.
-     *
-     * This is here only for debugging purposes.
-     */
-    function _check($from_lines, $to_lines)
-    {
-        if (serialize($from_lines) != serialize($this->getOriginal())) {
-            trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
-        }
-        if (serialize($to_lines) != serialize($this->getFinal())) {
-            trigger_error("Reconstructed final doesn't match", E_USER_ERROR);
-        }
-
-        $rev = $this->reverse();
-        if (serialize($to_lines) != serialize($rev->getOriginal())) {
-            trigger_error("Reversed original doesn't match", E_USER_ERROR);
-        }
-        if (serialize($from_lines) != serialize($rev->getFinal())) {
-            trigger_error("Reversed final doesn't match", E_USER_ERROR);
-        }
-
-        $prevtype = null;
-        foreach ($this->_edits as $edit) {
-            if ($prevtype == get_class($edit)) {
-                trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
-            }
-            $prevtype = get_class($edit);
-        }
-
-        return true;
-    }
+		return strlen($tmp) ? $tmp : false;
+	}
+
+	/**
+	 * Checks a diff for validity.
+	 *
+	 * This is here only for debugging purposes.
+	 */
+	function _check($from_lines, $to_lines)
+	{
+		if (serialize($from_lines) != serialize($this->getOriginal())) {
+			trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
+		}
+		if (serialize($to_lines) != serialize($this->getFinal())) {
+			trigger_error("Reconstructed final doesn't match", E_USER_ERROR);
+		}
+
+		$rev = $this->reverse();
+		if (serialize($to_lines) != serialize($rev->getOriginal())) {
+			trigger_error("Reversed original doesn't match", E_USER_ERROR);
+		}
+		if (serialize($from_lines) != serialize($rev->getFinal())) {
+			trigger_error("Reversed final doesn't match", E_USER_ERROR);
+		}
+
+		$prevtype = null;
+		foreach ($this->_edits as $edit) {
+			if ($prevtype == get_class($edit)) {
+				trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
+			}
+			$prevtype = get_class($edit);
+		}
+
+		return true;
+	}
 
 }
 
@@ -295,53 +295,53 @@ 
  */
 class Text_MappedDiff extends Text_Diff {
 
-    /**
-     * Computes a diff between sequences of strings.
-     *
-     * This can be used to compute things like case-insensitve diffs, or diffs
-     * which ignore changes in white-space.
-     *
-     * @param array $from_lines         An array of strings.
-     * @param array $to_lines           An array of strings.
-     * @param array $mapped_from_lines  This array should have the same size
-     *                                  number of elements as $from_lines.  The
-     *                                  elements in $mapped_from_lines and
-     *                                  $mapped_to_lines are what is actually
-     *                                  compared when computing the diff.
-     * @param array $mapped_to_lines    This array should have the same number
-     *                                  of elements as $to_lines.
-     */
-    function __construct($from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines)
-    {
-        assert(count($from_lines) == count($mapped_from_lines));
-        assert(count($to_lines) == count($mapped_to_lines));
-
-        parent::Text_Diff($mapped_from_lines, $mapped_to_lines);
-
-        $xi = $yi = 0;
-        for ($i = 0; $i < count($this->_edits); $i++) {
-            $orig = &$this->_edits[$i]->orig;
-            if (is_array($orig)) {
-                $orig = array_slice($from_lines, $xi, count($orig));
-                $xi += count($orig);
-            }
-
-            $final = &$this->_edits[$i]->final;
-            if (is_array($final)) {
-                $final = array_slice($to_lines, $yi, count($final));
-                $yi += count($final);
-            }
-        }
-    }
+	/**
+	 * Computes a diff between sequences of strings.
+	 *
+	 * This can be used to compute things like case-insensitve diffs, or diffs
+	 * which ignore changes in white-space.
+	 *
+	 * @param array $from_lines         An array of strings.
+	 * @param array $to_lines           An array of strings.
+	 * @param array $mapped_from_lines  This array should have the same size
+	 *                                  number of elements as $from_lines.  The
+	 *                                  elements in $mapped_from_lines and
+	 *                                  $mapped_to_lines are what is actually
+	 *                                  compared when computing the diff.
+	 * @param array $mapped_to_lines    This array should have the same number
+	 *                                  of elements as $to_lines.
+	 */
+	function __construct($from_lines, $to_lines,
+							 $mapped_from_lines, $mapped_to_lines)
+	{
+		assert(count($from_lines) == count($mapped_from_lines));
+		assert(count($to_lines) == count($mapped_to_lines));
+
+		parent::Text_Diff($mapped_from_lines, $mapped_to_lines);
+
+		$xi = $yi = 0;
+		for ($i = 0; $i < count($this->_edits); $i++) {
+			$orig = &$this->_edits[$i]->orig;
+			if (is_array($orig)) {
+				$orig = array_slice($from_lines, $xi, count($orig));
+				$xi += count($orig);
+			}
+
+			$final = &$this->_edits[$i]->final;
+			if (is_array($final)) {
+				$final = array_slice($to_lines, $yi, count($final));
+				$yi += count($final);
+			}
+		}
+	}
 
 	/**
 	 * PHP4 constructor.
 	 */
 	public function Text_MappedDiff( $from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines ) {
+							 $mapped_from_lines, $mapped_to_lines ) {
 		self::__construct( $from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines );
+							 $mapped_from_lines, $mapped_to_lines );
 	}
 
 }
@@ -354,23 +354,23 @@ 
  */
 class Text_Diff_Op {
 
-    var $orig;
-    var $final;
+	var $orig;
+	var $final;
 
-    function &reverse()
-    {
-        trigger_error('Abstract method', E_USER_ERROR);
-    }
+	function &reverse()
+	{
+		trigger_error('Abstract method', E_USER_ERROR);
+	}
 
-    function norig()
-    {
-        return $this->orig ? count($this->orig) : 0;
-    }
+	function norig()
+	{
+		return $this->orig ? count($this->orig) : 0;
+	}
 
-    function nfinal()
-    {
-        return $this->final ? count($this->final) : 0;
-    }
+	function nfinal()
+	{
+		return $this->final ? count($this->final) : 0;
+	}
 
 }
 
@@ -385,14 +385,14 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $orig, $final = false )
-    {
-        if (!is_array($final)) {
-            $final = $orig;
-        }
-        $this->orig = $orig;
-        $this->final = $final;
-    }
+	function __construct( $orig, $final = false )
+	{
+		if (!is_array($final)) {
+			$final = $orig;
+		}
+		$this->orig = $orig;
+		$this->final = $final;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -401,11 +401,11 @@ 
 		self::__construct( $orig, $final );
 	}
 
-    function &reverse()
-    {
-        $reverse = new Text_Diff_Op_copy($this->final, $this->orig);
-        return $reverse;
-    }
+	function &reverse()
+	{
+		$reverse = new Text_Diff_Op_copy($this->final, $this->orig);
+		return $reverse;
+	}
 
 }
 
@@ -421,10 +421,10 @@ 
 	 * PHP5 constructor.
 	 */
 	function __construct( $lines )
-    {
-        $this->orig = $lines;
-        $this->final = false;
-    }
+	{
+		$this->orig = $lines;
+		$this->final = false;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -433,11 +433,11 @@ 
 		self::__construct( $lines );
 	}
 
-    function &reverse()
-    {
-        $reverse = new Text_Diff_Op_add($this->orig);
-        return $reverse;
-    }
+	function &reverse()
+	{
+		$reverse = new Text_Diff_Op_add($this->orig);
+		return $reverse;
+	}
 
 }
 
@@ -452,11 +452,11 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $lines )
-    {
-        $this->final = $lines;
-        $this->orig = false;
-    }
+	function __construct( $lines )
+	{
+		$this->final = $lines;
+		$this->orig = false;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -465,11 +465,11 @@ 
 		self::__construct( $lines );
 	}
 
-    function &reverse()
-    {
-        $reverse = new Text_Diff_Op_delete($this->final);
-        return $reverse;
-    }
+	function &reverse()
+	{
+		$reverse = new Text_Diff_Op_delete($this->final);
+		return $reverse;
+	}
 
 }
 
@@ -484,11 +484,11 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $orig, $final )
-    {
-        $this->orig = $orig;
-        $this->final = $final;
-    }
+	function __construct( $orig, $final )
+	{
+		$this->orig = $orig;
+		$this->final = $final;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -497,10 +497,10 @@ 
 		self::__construct( $orig, $final );
 	}
 
-    function &reverse()
-    {
-        $reverse = new Text_Diff_Op_change($this->final, $this->orig);
-        return $reverse;
-    }
+	function &reverse()
+	{
+		$reverse = new Text_Diff_Op_change($this->final, $this->orig);
+		return $reverse;
+	}
 
 }

Spacing +26 added lines, -26 removed lines

@@ -33,10 +33,10 @@ 
      *                           Normally an array of two arrays, each
      *                           containing the lines from a file.
      */
-    function __construct( $engine, $params )
+    function __construct($engine, $params)
     {
         // Backward compatibility workaround.
-        if (!is_string($engine)) {
+        if ( ! is_string($engine)) {
             $params = array($engine, $params);
             $engine = 'auto';
         }
@@ -48,8 +48,8 @@ 
         }
 
         // WP #7391
-        require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
-        $class = 'Text_Diff_Engine_' . $engine;
+        require_once dirname(__FILE__).'/Diff/Engine/'.$engine.'.php';
+        $class = 'Text_Diff_Engine_'.$engine;
         $diff_engine = new $class();
 
         $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
@@ -58,8 +58,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff( $engine, $params ) {
-		self::__construct( $engine, $params );
+	public function Text_Diff($engine, $params) {
+		self::__construct($engine, $params);
 	}
 
     /**
@@ -144,7 +144,7 @@ 
     function isEmpty()
     {
         foreach ($this->_edits as $edit) {
-            if (!is_a($edit, 'Text_Diff_Op_copy')) {
+            if ( ! is_a($edit, 'Text_Diff_Op_copy')) {
                 return false;
             }
         }
@@ -236,13 +236,13 @@ 
         $tmp = ini_get('upload_tmp_dir');
 
         /* Otherwise, try to determine the TMPDIR environment variable. */
-        if (!strlen($tmp)) {
+        if ( ! strlen($tmp)) {
             $tmp = getenv('TMPDIR');
         }
 
         /* If we still cannot determine a value, then cycle through a list of
          * preset possibilities. */
-        while (!strlen($tmp) && count($tmp_locations)) {
+        while ( ! strlen($tmp) && count($tmp_locations)) {
             $tmp_check = array_shift($tmp_locations);
             if (@is_dir($tmp_check)) {
                 $tmp = $tmp_check;
@@ -338,10 +338,10 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_MappedDiff( $from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines ) {
-		self::__construct( $from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines );
+	public function Text_MappedDiff($from_lines, $to_lines,
+                             $mapped_from_lines, $mapped_to_lines) {
+		self::__construct($from_lines, $to_lines,
+                             $mapped_from_lines, $mapped_to_lines);
 	}
 
 }
@@ -385,9 +385,9 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $orig, $final = false )
+    function __construct($orig, $final = false)
     {
-        if (!is_array($final)) {
+        if ( ! is_array($final)) {
             $final = $orig;
         }
         $this->orig = $orig;
@@ -397,8 +397,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Op_copy( $orig, $final = false ) {
-		self::__construct( $orig, $final );
+	public function Text_Diff_Op_copy($orig, $final = false) {
+		self::__construct($orig, $final);
 	}
 
     function &reverse()
@@ -420,7 +420,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $lines )
+	function __construct($lines)
     {
         $this->orig = $lines;
         $this->final = false;
@@ -429,8 +429,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Op_delete( $lines ) {
-		self::__construct( $lines );
+	public function Text_Diff_Op_delete($lines) {
+		self::__construct($lines);
 	}
 
     function &reverse()
@@ -452,7 +452,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $lines )
+    function __construct($lines)
     {
         $this->final = $lines;
         $this->orig = false;
@@ -461,8 +461,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Op_add( $lines ) {
-		self::__construct( $lines );
+	public function Text_Diff_Op_add($lines) {
+		self::__construct($lines);
 	}
 
     function &reverse()
@@ -484,7 +484,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $orig, $final )
+    function __construct($orig, $final)
     {
         $this->orig = $orig;
         $this->final = $final;
@@ -493,8 +493,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Op_change( $orig, $final ) {
-		self::__construct( $orig, $final );
+	public function Text_Diff_Op_change($orig, $final) {
+		self::__construct($orig, $final);
 	}
 
     function &reverse()

src/wp-includes/feed-atom.php

Spacing +13 added lines, -13 removed lines

@@ -5,18 +5,18 @@ 
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('atom') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: '.feed_content_type('atom').'; charset='.get_option('blog_charset'), true);
 $more = 1;
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
 
 /** This action is documented in wp-includes/feed-rss2.php */
-do_action( 'rss_tag_pre', 'atom' );
+do_action('rss_tag_pre', 'atom');
 ?>
 <feed
   xmlns="http://www.w3.org/2005/Atom"
   xmlns:thr="http://purl.org/syndication/thread/1.0"
-  xml:lang="<?php bloginfo_rss( 'language' ); ?>"
+  xml:lang="<?php bloginfo_rss('language'); ?>"
   xml:base="<?php bloginfo_rss('url') ?>/wp-atom.php"
   <?php
   /**
@@ -24,7 +24,7 @@ 
    *
    * @since 2.0.0
    */
-  do_action( 'atom_ns' );
+  do_action('atom_ns');
   ?>
  >
 	<title type="text"><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
@@ -42,14 +42,14 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'atom_head' );
+	do_action('atom_head');
 
-	while ( have_posts() ) : the_post();
+	while (have_posts()) : the_post();
 	?>
 	<entry>
 		<author>
 			<name><?php the_author() ?></name>
-			<?php $author_url = get_the_author_meta('url'); if ( !empty($author_url) ) : ?>
+			<?php $author_url = get_the_author_meta('url'); if ( ! empty($author_url)) : ?>
 			<uri><?php the_author_meta('url')?></uri>
 			<?php endif;
 
@@ -58,17 +58,17 @@ 
 			 *
 			 * @since 3.2.0
 			 */
-			do_action( 'atom_author' );
+			do_action('atom_author');
 		?>
 		</author>
 		<title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss() ?>]]></title>
 		<link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php the_permalink_rss() ?>" />
-		<id><?php the_guid() ; ?></id>
+		<id><?php the_guid(); ?></id>
 		<updated><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></updated>
 		<published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published>
 		<?php the_category_rss('atom') ?>
 		<summary type="<?php html_type_rss(); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
-<?php if ( !get_option('rss_use_excerpt') ) : ?>
+<?php if ( ! get_option('rss_use_excerpt')) : ?>
 		<content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss() ?>"><![CDATA[<?php the_content_feed('atom') ?>]]></content>
 <?php endif; ?>
 	<?php atom_enclosure();
@@ -77,11 +77,11 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'atom_entry' );
+	do_action('atom_entry');
 		?>
 		<link rel="replies" type="<?php bloginfo_rss('html_type'); ?>" href="<?php the_permalink_rss() ?>#comments" thr:count="<?php echo get_comments_number()?>"/>
-		<link rel="replies" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link(0, 'atom') ); ?>" thr:count="<?php echo get_comments_number()?>"/>
+		<link rel="replies" type="application/atom+xml" href="<?php echo esc_url(get_post_comments_feed_link(0, 'atom')); ?>" thr:count="<?php echo get_comments_number()?>"/>
 		<thr:total><?php echo get_comments_number()?></thr:total>
 	</entry>
-	<?php endwhile ; ?>
+	<?php endwhile; ?>
 </feed>