ntwb / wordpress

src/wp-includes/media-template.php

Braces +18 added lines, -8 removed lines

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

Spacing +192 added lines, -192 removed lines

@@ -22,7 +22,7 @@ 
 	width="{{ _.isUndefined( data.model.width ) ? 400 : data.model.width }}"
 	preload="{{ _.isUndefined( data.model.preload ) ? 'none' : data.model.preload }}"
 	<#
-	<?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
+	<?php foreach (array('autoplay', 'loop') as $attr):
 	?>if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
 		#> <?php echo $attr ?><#
 	}
@@ -32,7 +32,7 @@ 
 	<source src="{{ data.model.src }}" type="{{ wp.media.view.settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
 	<# } #>
 
-	<?php foreach ( $audio_types as $type ):
+	<?php foreach ($audio_types as $type):
 	?><# if ( ! _.isEmpty( data.model.<?php echo $type ?> ) ) { #>
 	<source src="{{ data.model.<?php echo $type ?> }}" type="{{ wp.media.view.settings.embedMimes[ '<?php echo $type ?>' ] }}" />
 	<# } #>
@@ -90,9 +90,9 @@ 
 	<# if ( w ) { #>width="{{ w }}"<# } #>
 	<# if ( h ) { #>height="{{ h }}"<# } #>
 	<?php
-	$props = array( 'poster' => '', 'preload' => 'metadata' );
-	foreach ( $props as $key => $value ):
-		if ( empty( $value ) ) {
+	$props = array('poster' => '', 'preload' => 'metadata');
+	foreach ($props as $key => $value):
+		if (empty($value)) {
 		?><#
 		if ( ! _.isUndefined( data.model.<?php echo $key ?> ) && data.model.<?php echo $key ?> ) {
 			#> <?php echo $key ?>="{{ data.model.<?php echo $key ?> }}"<#
@@ -102,7 +102,7 @@ 
 		}
 	endforeach;
 	?><#
-	<?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
+	<?php foreach (array('autoplay', 'loop') as $attr):
 	?> if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
 		#> <?php echo $attr ?><#
 	}
@@ -118,7 +118,7 @@ 
 		<# }
 	} #>
 
-	<?php foreach ( $video_types as $type ):
+	<?php foreach ($video_types as $type):
 	?><# if ( data.model.<?php echo $type ?> ) { #>
 	<source src="{{ data.model.<?php echo $type ?> }}" type="{{ settings.embedMimes[ '<?php echo $type ?>' ] }}" />
 	<# } #>
@@ -139,7 +139,7 @@ 
 function wp_print_media_templates() {
 	global $is_IE;
 	$class = 'media-modal wp-core-ui';
-	if ( $is_IE && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false )
+	if ($is_IE && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false)
 		$class .= ' ie7';
 	?>
 	<!--[if lte IE 8]>
@@ -163,7 +163,7 @@ 
 
 	<script type="text/html" id="tmpl-media-modal">
 		<div class="<?php echo $class; ?>">
-			<button type="button" class="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="media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e('Close media panel'); ?></span></span></button>
 			<div class="media-modal-content"></div>
 		</div>
 		<div class="media-modal-backdrop"></div>
@@ -171,38 +171,38 @@ 
 
 	<script type="text/html" id="tmpl-uploader-window">
 		<div class="uploader-window-content">
-			<h1><?php _e( 'Drop files to upload' ); ?></h1>
+			<h1><?php _e('Drop files to upload'); ?></h1>
 		</div>
 	</script>
 
 	<script type="text/html" id="tmpl-uploader-editor">
 		<div class="uploader-editor-content">
-			<div class="uploader-editor-title"><?php _e( 'Drop files to upload' ); ?></div>
+			<div class="uploader-editor-title"><?php _e('Drop files to upload'); ?></div>
 		</div>
 	</script>
 
 	<script type="text/html" id="tmpl-uploader-inline">
 		<# var messageClass = data.message ? 'has-upload-message' : 'no-upload-message'; #>
 		<# if ( data.canClose ) { #>
-		<button class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close uploader' ); ?></span></button>
+		<button class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Close uploader'); ?></span></button>
 		<# } #>
 		<div class="uploader-inline-content {{ messageClass }}">
 		<# if ( data.message ) { #>
 			<h2 class="upload-message">{{ data.message }}</h2>
 		<# } #>
-		<?php if ( ! _device_can_upload() ) : ?>
-			<h2 class="upload-instructions"><?php printf( __( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ), 'https://apps.wordpress.org/' ); ?></h2>
-		<?php elseif ( is_multisite() && ! is_upload_space_available() ) : ?>
-			<h2 class="upload-instructions"><?php _e( 'Upload Limit Exceeded' ); ?></h2>
+		<?php if ( ! _device_can_upload()) : ?>
+			<h2 class="upload-instructions"><?php printf(__('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'https://apps.wordpress.org/'); ?></h2>
+		<?php elseif (is_multisite() && ! is_upload_space_available()) : ?>
+			<h2 class="upload-instructions"><?php _e('Upload Limit Exceeded'); ?></h2>
 			<?php
 			/** This action is documented in wp-admin/includes/media.php */
-			do_action( 'upload_ui_over_quota' ); ?>
+			do_action('upload_ui_over_quota'); ?>
 
 		<?php else : ?>
 			<div class="upload-ui">
-				<h2 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h2>
-				<p class="upload-instructions drop-instructions"><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
-				<button type="button" class="browser button button-hero"><?php _e( 'Select Files' ); ?></button>
+				<h2 class="upload-instructions drop-instructions"><?php _e('Drop files anywhere to upload'); ?></h2>
+				<p class="upload-instructions drop-instructions"><?php _ex('or', 'Uploader: Drop files here - or - Select Files'); ?></p>
+				<button type="button" class="browser button button-hero"><?php _e('Select Files'); ?></button>
 			</div>
 
 			<div class="upload-inline-status"></div>
@@ -210,58 +210,58 @@ 
 			<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
 							/* translators: 1: suggested width number, 2: suggested height number. */
-							printf( __( 'Suggested image dimensions: %1$s by %2$s pixels.' ), '{{data.suggestedWidth}}', '{{data.suggestedHeight}}' );
+							printf(__('Suggested image dimensions: %1$s by %2$s pixels.'), '{{data.suggestedWidth}}', '{{data.suggestedHeight}}');
 						?>
 					</p>
 				<# } #>
 
 				<?php
 				/** This action is documented in wp-admin/includes/media.php */
-				do_action( 'post-upload-ui' ); ?>
+				do_action('post-upload-ui'); ?>
 			</div>
 		<?php endif; ?>
 		</div>
 	</script>
 
 	<script type="text/html" id="tmpl-media-library-view-switcher">
-		<a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?>" class="view-list">
-			<span class="screen-reader-text"><?php _e( 'List View' ); ?></span>
+		<a href="<?php echo esc_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>" class="view-list">
+			<span class="screen-reader-text"><?php _e('List View'); ?></span>
 		</a>
-		<a href="<?php echo esc_url( add_query_arg( 'mode', 'grid', $_SERVER['REQUEST_URI'] ) ) ?>" class="view-grid current">
-			<span class="screen-reader-text"><?php _e( 'Grid View' ); ?></span>
+		<a href="<?php echo esc_url(add_query_arg('mode', 'grid', $_SERVER['REQUEST_URI'])) ?>" class="view-grid current">
+			<span class="screen-reader-text"><?php _e('Grid View'); ?></span>
 		</a>
 	</script>
 
 	<script type="text/html" id="tmpl-uploader-status">
-		<h2><?php _e( 'Uploading' ); ?></h2>
-		<button type="button" class="button-link upload-dismiss-errors"><span class="screen-reader-text"><?php _e( 'Dismiss Errors' ); ?></span></button>
+		<h2><?php _e('Uploading'); ?></h2>
+		<button type="button" class="button-link upload-dismiss-errors"><span class="screen-reader-text"><?php _e('Dismiss Errors'); ?></span></button>
 
 		<div class="media-progress-bar"><div></div></div>
 		<div class="upload-details">
@@ -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>
@@ -327,9 +327,9 @@ 
 
 				<div class="attachment-actions">
 					<# if ( 'image' === data.type && ! data.uploading && data.sizes && data.can.save ) { #>
-					<button type="button" class="button edit-attachment"><?php _e( 'Edit Image' ); ?></button>
+					<button type="button" class="button edit-attachment"><?php _e('Edit Image'); ?></button>
 					<# } else if ( 'pdf' === data.subtype && data.sizes ) { #>
-					<?php _e( 'Document Preview' ); ?>
+					<?php _e('Document Preview'); ?>
 					<# } #>
 				</div>
 			</div>
@@ -340,24 +340,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() }}
 						<# } #>
@@ -377,30 +377,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>
 				<# } #>
@@ -409,12 +409,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 { #>
@@ -426,19 +426,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>
@@ -471,11 +471,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="check" tabindex="-1"><span class="media-modal-icon"></span><span class="screen-reader-text"><?php _e( 'Deselect' ); ?></span></button>
+			<button type="button" class="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';
@@ -498,7 +498,7 @@ 
 
 	<script type="text/html" id="tmpl-attachment-details">
 		<h2>
-			<?php _e( 'Attachment Details' ); ?>
+			<?php _e('Attachment Details'); ?>
 			<span class="settings-save-status">
 				<span class="spinner"></span>
 				<span class="saved"><?php esc_html_e('Saved.'); ?></span>
@@ -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,17 +595,17 @@ 
 		<div class="selection-info">
 			<span class="count"></span>
 			<# if ( data.editable ) { #>
-				<button type="button" class="button-link edit-selection"><?php _e( 'Edit Selection' ); ?></button>
+				<button type="button" class="button-link edit-selection"><?php _e('Edit Selection'); ?></button>
 			<# } #>
 			<# if ( data.clearable ) { #>
-				<button type="button" class="button-link clear-selection"><?php _e( 'Clear' ); ?></button>
+				<button type="button" class="button-link clear-selection"><?php _e('Clear'); ?></button>
 			<# } #>
 		</div>
 		<div class="selection-view"></div>
 	</script>
 
 	<script type="text/html" id="tmpl-attachment-display-settings">
-		<h2><?php _e( 'Attachment Display Settings' ); ?></h2>
+		<h2><?php _e('Attachment Display Settings'); ?></h2>
 
 		<# if ( 'image' === data.type ) { #>
 			<label class="setting align">
@@ -617,16 +617,16 @@ 
 					<# } #>>
 
 					<option value="left">
-						<?php esc_html_e( 'Left' ); ?>
+						<?php esc_html_e('Left'); ?>
 					</option>
 					<option value="center">
-						<?php esc_html_e( 'Center' ); ?>
+						<?php esc_html_e('Center'); ?>
 					</option>
 					<option value="right">
-						<?php esc_html_e( 'Right' ); ?>
+						<?php esc_html_e('Right'); ?>
 					</option>
 					<option value="none" selected>
-						<?php esc_html_e( 'None' ); ?>
+						<?php esc_html_e('None'); ?>
 					</option>
 				</select>
 			</label>
@@ -648,31 +648,31 @@ 
 
 				<# if ( data.model.canEmbed ) { #>
 					<option value="embed" selected>
-						<?php esc_html_e( 'Embed Media Player' ); ?>
+						<?php esc_html_e('Embed Media Player'); ?>
 					</option>
 					<option value="file">
 				<# } else { #>
 					<option value="none" selected>
-						<?php esc_html_e( 'None' ); ?>
+						<?php esc_html_e('None'); ?>
 					</option>
 					<option value="file">
 				<# } #>
 					<# if ( data.model.canEmbed ) { #>
-						<?php esc_html_e( 'Link to Media File' ); ?>
+						<?php esc_html_e('Link to Media File'); ?>
 					<# } else { #>
-						<?php esc_html_e( 'Media File' ); ?>
+						<?php esc_html_e('Media File'); ?>
 					<# } #>
 					</option>
 					<option value="post">
 					<# if ( data.model.canEmbed ) { #>
-						<?php esc_html_e( 'Link to Attachment Page' ); ?>
+						<?php esc_html_e('Link to Attachment Page'); ?>
 					<# } else { #>
-						<?php esc_html_e( 'Attachment Page' ); ?>
+						<?php esc_html_e('Attachment Page'); ?>
 					<# } #>
 					</option>
 				<# if ( 'image' === data.type ) { #>
 					<option value="custom">
-						<?php esc_html_e( 'Custom URL' ); ?>
+						<?php esc_html_e('Custom URL'); ?>
 					</option>
 				<# } #>
 				</select>
@@ -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; ?>
@@ -712,7 +712,7 @@ 
 	</script>
 
 	<script type="text/html" id="tmpl-gallery-settings">
-		<h2><?php _e( 'Gallery Settings' ); ?></h2>
+		<h2><?php _e('Gallery Settings'); ?></h2>
 
 		<label class="setting">
 			<span><?php _e('Link To'); ?></span>
@@ -725,13 +725,13 @@ 
 				<option value="post" <# if ( ! wp.media.galleryDefaults.link || 'post' == wp.media.galleryDefaults.link ) {
 					#>selected="selected"<# }
 				#>>
-					<?php esc_html_e( 'Attachment Page' ); ?>
+					<?php esc_html_e('Attachment Page'); ?>
 				</option>
 				<option value="file" <# if ( 'file' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
-					<?php esc_html_e( 'Media File' ); ?>
+					<?php esc_html_e('Media File'); ?>
 				</option>
 				<option value="none" <# if ( 'none' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
-					<?php esc_html_e( 'None' ); ?>
+					<?php esc_html_e('None'); ?>
 				</option>
 			</select>
 		</label>
@@ -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">
-		<h2><?php _e( 'Playlist Settings' ); ?></h2>
+		<h2><?php _e('Playlist Settings'); ?></h2>
 
 		<# var emptyModel = _.isEmpty( data.model ),
 			isVideo = 'video' === data.controller.get('library').props.get('type'); #>
@@ -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" />
@@ -848,16 +848,16 @@ 
 			<span><?php _e('Align'); ?></span>
 			<div class="button-group button-large" data-setting="align">
 				<button class="button" value="left">
-					<?php esc_html_e( 'Left' ); ?>
+					<?php esc_html_e('Left'); ?>
 				</button>
 				<button class="button" value="center">
-					<?php esc_html_e( 'Center' ); ?>
+					<?php esc_html_e('Center'); ?>
 				</button>
 				<button class="button" value="right">
-					<?php esc_html_e( 'Right' ); ?>
+					<?php esc_html_e('Right'); ?>
 				</button>
 				<button class="button active" value="none">
-					<?php esc_html_e( 'None' ); ?>
+					<?php esc_html_e('None'); ?>
 				</button>
 			</div>
 		</div>
@@ -866,13 +866,13 @@ 
 			<span><?php _e('Link To'); ?></span>
 			<div class="button-group button-large" data-setting="link">
 				<button class="button" value="file">
-					<?php esc_html_e( 'Image URL' ); ?>
+					<?php esc_html_e('Image URL'); ?>
 				</button>
 				<button class="button" value="custom">
-					<?php esc_html_e( 'Custom URL' ); ?>
+					<?php esc_html_e('Custom URL'); ?>
 				</button>
 				<button class="button active" value="none">
-					<?php esc_html_e( 'None' ); ?>
+					<?php esc_html_e('None'); ?>
 				</button>
 			</div>
 			<input type="text" class="link-to-custom" data-setting="linkUrl" />
@@ -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,21 +909,21 @@ 
 						<input type="text" data-setting="alt" value="{{ data.model.alt }}" />
 					</label>
 
-					<h2><?php _e( 'Display Settings' ); ?></h2>
+					<h2><?php _e('Display Settings'); ?></h2>
 					<div class="setting align">
 						<span><?php _e('Align'); ?></span>
 						<div class="button-group button-large" data-setting="align">
 							<button class="button" value="left">
-								<?php esc_html_e( 'Left' ); ?>
+								<?php esc_html_e('Left'); ?>
 							</button>
 							<button class="button" value="center">
-								<?php esc_html_e( 'Center' ); ?>
+								<?php esc_html_e('Center'); ?>
 							</button>
 							<button class="button" value="right">
-								<?php esc_html_e( 'Right' ); ?>
+								<?php esc_html_e('Right'); ?>
 							</button>
 							<button class="button active" value="none">
-								<?php esc_html_e( 'None' ); ?>
+								<?php esc_html_e('None'); ?>
 							</button>
 						</div>
 					</div>
@@ -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>
 					<# } #>
 
@@ -971,27 +971,27 @@ 
 						<select data-setting="link">
 						<# if ( data.attachment ) { #>
 							<option value="file">
-								<?php esc_html_e( 'Media File' ); ?>
+								<?php esc_html_e('Media File'); ?>
 							</option>
 							<option value="post">
-								<?php esc_html_e( 'Attachment Page' ); ?>
+								<?php esc_html_e('Attachment Page'); ?>
 							</option>
 						<# } else { #>
 							<option value="file">
-								<?php esc_html_e( 'Image URL' ); ?>
+								<?php esc_html_e('Image URL'); ?>
 							</option>
 						<# } #>
 							<option value="custom">
-								<?php esc_html_e( 'Custom URL' ); ?>
+								<?php esc_html_e('Custom URL'); ?>
 							</option>
 							<option value="none">
-								<?php esc_html_e( 'None' ); ?>
+								<?php esc_html_e('None'); ?>
 							</option>
 						</select>
 						<input type="text" class="link-to-custom" data-setting="linkUrl" />
 					</div>
 					<div class="advanced-section">
-						<h2><button type="button" class="button-link advanced-toggle"><?php _e( 'Advanced Options' ); ?></button></h2>
+						<h2><button type="button" class="button-link advanced-toggle"><?php _e('Advanced Options'); ?></button></h2>
 						<div class="advanced-settings hidden">
 							<div class="advanced-image">
 								<label class="setting title-text">
@@ -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 tab' ); ?></label>
+									<label><input type="checkbox" data-setting="linkTargetBlank" value="_blank" <# if ( data.model.linkTargetBlank ) { #>checked="checked"<# } #>><?php _e('Open link in a new tab'); ?></label>
 								</div>
 								<label class="setting link-rel">
 									<span><?php _e('Link Rel'); ?></span>
@@ -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 autoplay">
 					<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 autoplay">
 					<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,31 +1233,31 @@ 
 			</div>
 		<# } else { #>
 			<div class="wpview-error">
-				<div class="dashicons dashicons-format-gallery"></div><p><?php _e( 'No items found.' ); ?></p>
+				<div class="dashicons dashicons-format-gallery"></div><p><?php _e('No items found.'); ?></p>
 			</div>
 		<# } #>
 	</script>
 
 	<script type="text/html" id="tmpl-crop-content">
-		<img class="crop-image" src="{{ data.url }}" alt="<?php esc_attr_e( 'Image crop area preview. Requires mouse interaction.' ); ?>">
+		<img class="crop-image" src="{{ data.url }}" alt="<?php esc_attr_e('Image crop area preview. Requires mouse interaction.'); ?>">
 		<div class="upload-errors"></div>
 	</script>
 
 	<script type="text/html" id="tmpl-site-icon-preview">
-		<h2><?php _e( 'Preview' ); ?></h2>
-		<strong aria-hidden="true"><?php _e( 'As a browser icon' ); ?></strong>
+		<h2><?php _e('Preview'); ?></h2>
+		<strong aria-hidden="true"><?php _e('As a browser icon'); ?></strong>
 		<div class="favicon-preview">
-			<img src="<?php echo esc_url( admin_url( 'images/' . ( is_rtl() ? 'browser-rtl.png' : 'browser.png' ) ) ); ?>" class="browser-preview" width="182" height="" alt="" />
+			<img src="<?php echo esc_url(admin_url('images/'.(is_rtl() ? 'browser-rtl.png' : 'browser.png'))); ?>" class="browser-preview" width="182" height="" alt="" />
 
 			<div class="favicon">
-				<img id="preview-favicon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
+				<img id="preview-favicon" src="{{ data.url }}" alt="<?php esc_attr_e('Preview as a browser icon'); ?>"/>
 			</div>
-			<span class="browser-title" aria-hidden="true"><?php bloginfo( 'name' ); ?></span>
+			<span class="browser-title" aria-hidden="true"><?php bloginfo('name'); ?></span>
 		</div>
 
-		<strong aria-hidden="true"><?php _e( 'As an app icon' ); ?></strong>
+		<strong aria-hidden="true"><?php _e('As an app icon'); ?></strong>
 		<div class="app-icon-preview">
-			<img id="preview-app-icon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as an app icon' ); ?>"/>
+			<img id="preview-app-icon" src="{{ data.url }}" alt="<?php esc_attr_e('Preview as an app icon'); ?>"/>
 		</div>
 	</script>
 
@@ -1268,5 +1268,5 @@ 
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( 'print_media_templates' );
+	do_action('print_media_templates');
 }

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

Braces +5 added lines, -4 removed lines

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

Spacing +9 added lines, -9 removed lines

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

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

Braces +97 added lines, -66 removed lines

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

Spacing +130 added lines, -130 removed lines

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

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

Braces +15 added lines, -10 removed lines

@@ -361,8 +361,9 @@ 
 	 * @uses WP_Customize_Control::render()
 	 */
 	final public function maybe_render() {
-		if ( ! $this->check_capabilities() )
-			return;
+		if ( ! $this->check_capabilities() ) {
+					return;
+		}
 
 		/**
 		 * Fires just before the current Customizer control is rendered.
@@ -411,8 +412,9 @@ 
 	 * @return string Data link parameter, if $setting_key is a valid setting, empty string otherwise.
 	 */
 	public function get_link( $setting_key = 'default' ) {
-		if ( ! isset( $this->settings[ $setting_key ] ) )
-			return '';
+		if ( ! isset( $this->settings[ $setting_key ] ) ) {
+					return '';
+		}
 
 		return 'data-customize-setting-link="' . esc_attr( $this->settings[ $setting_key ]->id ) . '"';
 	}
@@ -467,8 +469,9 @@ 
 				<?php
 				break;
 			case 'radio':
-				if ( empty( $this->choices ) )
-					return;
+				if ( empty( $this->choices ) ) {
+									return;
+				}
 
 				$name = '_customize-radio-' . $this->id;
 
@@ -489,8 +492,9 @@ 
 				endforeach;
 				break;
 			case 'select':
-				if ( empty( $this->choices ) )
-					return;
+				if ( empty( $this->choices ) ) {
+									return;
+				}
 
 				?>
 				<label>
@@ -503,8 +507,9 @@ 
 
 					<select <?php $this->link(); ?>>
 						<?php
-						foreach ( $this->choices as $value => $label )
-							echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+						foreach ( $this->choices as $value => $label ) {
+													echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+						}
 						?>
 					</select>
 				</label>

Doc Comments +1 added lines, -1 removed lines

@@ -293,7 +293,7 @@
 	 *
 	 * @since 4.0.0
 	 *
-	 * @return true Always true.
+	 * @return boolean Always true.
 	 */
 	public function active_callback() {
 		return true;

Spacing +107 added lines, -107 removed lines

@@ -221,34 +221,34 @@ 
 	 *                                                 'date' are supported implicitly. Default 'text'.
 	 * }
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		$keys = array_keys( get_object_vars( $this ) );
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+	public function __construct($manager, $id, $args = array()) {
+		$keys = array_keys(get_object_vars($this));
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
 		$this->manager = $manager;
 		$this->id = $id;
-		if ( empty( $this->active_callback ) ) {
-			$this->active_callback = array( $this, 'active_callback' );
+		if (empty($this->active_callback)) {
+			$this->active_callback = array($this, 'active_callback');
 		}
 		self::$instance_count += 1;
 		$this->instance_number = self::$instance_count;
 
 		// Process settings.
-		if ( ! isset( $this->settings ) ) {
+		if ( ! isset($this->settings)) {
 			$this->settings = $id;
 		}
 
 		$settings = array();
-		if ( is_array( $this->settings ) ) {
-			foreach ( $this->settings as $key => $setting ) {
-				$settings[ $key ] = $this->manager->get_setting( $setting );
+		if (is_array($this->settings)) {
+			foreach ($this->settings as $key => $setting) {
+				$settings[$key] = $this->manager->get_setting($setting);
 			}
-		} else if ( is_string( $this->settings ) ) {
-			$this->setting = $this->manager->get_setting( $this->settings );
+		} else if (is_string($this->settings)) {
+			$this->setting = $this->manager->get_setting($this->settings);
 			$settings['default'] = $this->setting;
 		}
 		$this->settings = $settings;
@@ -270,7 +270,7 @@ 
 	 */
 	final public function active() {
 		$control = $this;
-		$active = call_user_func( $this->active_callback, $this );
+		$active = call_user_func($this->active_callback, $this);
 
 		/**
 		 * Filters response of WP_Customize_Control::active().
@@ -280,7 +280,7 @@ 
 		 * @param bool                 $active  Whether the Customizer control is active.
 		 * @param WP_Customize_Control $control WP_Customize_Control instance.
 		 */
-		$active = apply_filters( 'customize_control_active', $active, $control );
+		$active = apply_filters('customize_control_active', $active, $control);
 
 		return $active;
 	}
@@ -308,9 +308,9 @@ 
 	 * @param string $setting_key
 	 * @return mixed The requested setting's value, if the setting exists.
 	 */
-	final public function value( $setting_key = 'default' ) {
-		if ( isset( $this->settings[ $setting_key ] ) ) {
-			return $this->settings[ $setting_key ]->value();
+	final public function value($setting_key = 'default') {
+		if (isset($this->settings[$setting_key])) {
+			return $this->settings[$setting_key]->value();
 		}
 	}
 
@@ -321,8 +321,8 @@ 
 	 */
 	public function to_json() {
 		$this->json['settings'] = array();
-		foreach ( $this->settings as $key => $setting ) {
-			$this->json['settings'][ $key ] = $setting->id;
+		foreach ($this->settings as $key => $setting) {
+			$this->json['settings'][$key] = $setting->id;
 		}
 
 		$this->json['type'] = $this->type;
@@ -334,7 +334,7 @@ 
 		$this->json['description'] = $this->description;
 		$this->json['instanceNumber'] = $this->instance_number;
 
-		if ( 'dropdown-pages' === $this->type ) {
+		if ('dropdown-pages' === $this->type) {
 			$this->json['allow_addition'] = $this->allow_addition;
 		}
 	}
@@ -364,18 +364,18 @@ 
 	 * @return bool False if theme doesn't support the control or user doesn't have the required permissions, otherwise true.
 	 */
 	final public function check_capabilities() {
-		if ( ! empty( $this->capability ) && ! current_user_can( $this->capability ) ) {
+		if ( ! empty($this->capability) && ! current_user_can($this->capability)) {
 			return false;
 		}
 
-		foreach ( $this->settings as $setting ) {
-			if ( ! $setting || ! $setting->check_capabilities() ) {
+		foreach ($this->settings as $setting) {
+			if ( ! $setting || ! $setting->check_capabilities()) {
 				return false;
 			}
 		}
 
-		$section = $this->manager->get_section( $this->section );
-		if ( isset( $section ) && ! $section->check_capabilities() ) {
+		$section = $this->manager->get_section($this->section);
+		if (isset($section) && ! $section->check_capabilities()) {
 			return false;
 		}
 
@@ -392,7 +392,7 @@ 
 	final public function get_content() {
 		ob_start();
 		$this->maybe_render();
-		return trim( ob_get_clean() );
+		return trim(ob_get_clean());
 	}
 
 	/**
@@ -402,7 +402,7 @@ 
 	 * @uses WP_Customize_Control::render()
 	 */
 	final public function maybe_render() {
-		if ( ! $this->check_capabilities() )
+		if ( ! $this->check_capabilities())
 			return;
 
 		/**
@@ -412,7 +412,7 @@ 
 		 *
 		 * @param WP_Customize_Control $this WP_Customize_Control instance.
 		 */
-		do_action( 'customize_render_control', $this );
+		do_action('customize_render_control', $this);
 
 		/**
 		 * Fires just before a specific Customizer control is rendered.
@@ -424,7 +424,7 @@ 
 		 *
 		 * @param WP_Customize_Control $this WP_Customize_Control instance.
 		 */
-		do_action( "customize_render_control_{$this->id}", $this );
+		do_action("customize_render_control_{$this->id}", $this);
 
 		$this->render();
 	}
@@ -435,10 +435,10 @@ 
 	 * @since 3.4.0
 	 */
 	protected function render() {
-		$id    = 'customize-control-' . str_replace( array( '[', ']' ), array( '-', '' ), $this->id );
-		$class = 'customize-control customize-control-' . $this->type;
+		$id    = 'customize-control-'.str_replace(array('[', ']'), array('-', ''), $this->id);
+		$class = 'customize-control customize-control-'.$this->type;
 
-		?><li id="<?php echo esc_attr( $id ); ?>" class="<?php echo esc_attr( $class ); ?>">
+		?><li id="<?php echo esc_attr($id); ?>" class="<?php echo esc_attr($class); ?>">
 			<?php $this->render_content(); ?>
 		</li><?php
 	}
@@ -451,11 +451,11 @@ 
 	 * @param string $setting_key
 	 * @return string Data link parameter, if $setting_key is a valid setting, empty string otherwise.
 	 */
-	public function get_link( $setting_key = 'default' ) {
-		if ( ! isset( $this->settings[ $setting_key ] ) )
+	public function get_link($setting_key = 'default') {
+		if ( ! isset($this->settings[$setting_key]))
 			return '';
 
-		return 'data-customize-setting-link="' . esc_attr( $this->settings[ $setting_key ]->id ) . '"';
+		return 'data-customize-setting-link="'.esc_attr($this->settings[$setting_key]->id).'"';
 	}
 
 	/**
@@ -466,8 +466,8 @@ 
 	 *
 	 * @param string $setting_key
 	 */
-	public function link( $setting_key = 'default' ) {
-		echo $this->get_link( $setting_key );
+	public function link($setting_key = 'default') {
+		echo $this->get_link($setting_key);
 	}
 
 	/**
@@ -476,8 +476,8 @@ 
 	 * @since 4.0.0
 	 */
 	public function input_attrs() {
-		foreach ( $this->input_attrs as $attr => $value ) {
-			echo $attr . '="' . esc_attr( $value ) . '" ';
+		foreach ($this->input_attrs as $attr => $value) {
+			echo $attr.'="'.esc_attr($value).'" ';
 		}
 	}
 
@@ -494,57 +494,57 @@ 
 	 * @since 3.4.0
 	 */
 	protected function render_content() {
-		switch( $this->type ) {
+		switch ($this->type) {
 			case 'checkbox':
 				?>
 				<label>
-					<input type="checkbox" value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->link(); checked( $this->value() ); ?> />
-					<?php echo esc_html( $this->label ); ?>
-					<?php if ( ! empty( $this->description ) ) : ?>
+					<input type="checkbox" value="<?php echo esc_attr($this->value()); ?>" <?php $this->link(); checked($this->value()); ?> />
+					<?php echo esc_html($this->label); ?>
+					<?php if ( ! empty($this->description)) : ?>
 						<span class="description customize-control-description"><?php echo $this->description; ?></span>
 					<?php endif; ?>
 				</label>
 				<?php
 				break;
 			case 'radio':
-				if ( empty( $this->choices ) )
+				if (empty($this->choices))
 					return;
 
-				$name = '_customize-radio-' . $this->id;
+				$name = '_customize-radio-'.$this->id;
 
-				if ( ! empty( $this->label ) ) : ?>
-					<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+				if ( ! empty($this->label)) : ?>
+					<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 				<?php endif;
-				if ( ! empty( $this->description ) ) : ?>
-					<span class="description customize-control-description"><?php echo $this->description ; ?></span>
+				if ( ! empty($this->description)) : ?>
+					<span class="description customize-control-description"><?php echo $this->description; ?></span>
 				<?php endif;
 
-				foreach ( $this->choices as $value => $label ) :
+				foreach ($this->choices as $value => $label) :
 					?>
 					<label>
-						<input type="radio" value="<?php echo esc_attr( $value ); ?>" name="<?php echo esc_attr( $name ); ?>" <?php $this->link(); checked( $this->value(), $value ); ?> />
-						<?php echo esc_html( $label ); ?><br/>
+						<input type="radio" value="<?php echo esc_attr($value); ?>" name="<?php echo esc_attr($name); ?>" <?php $this->link(); checked($this->value(), $value); ?> />
+						<?php echo esc_html($label); ?><br/>
 					</label>
 					<?php
 				endforeach;
 				break;
 			case 'select':
-				if ( empty( $this->choices ) )
+				if (empty($this->choices))
 					return;
 
 				?>
 				<label>
-					<?php if ( ! empty( $this->label ) ) : ?>
-						<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+					<?php if ( ! empty($this->label)) : ?>
+						<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 					<?php endif;
-					if ( ! empty( $this->description ) ) : ?>
+					if ( ! empty($this->description)) : ?>
 						<span class="description customize-control-description"><?php echo $this->description; ?></span>
 					<?php endif; ?>
 
 					<select <?php $this->link(); ?>>
 						<?php
-						foreach ( $this->choices as $value => $label )
-							echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+						foreach ($this->choices as $value => $label)
+							echo '<option value="'.esc_attr($value).'"'.selected($this->value(), $value, false).'>'.$label.'</option>';
 						?>
 					</select>
 				</label>
@@ -553,29 +553,29 @@ 
 			case 'textarea':
 				?>
 				<label>
-					<?php if ( ! empty( $this->label ) ) : ?>
-						<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+					<?php if ( ! empty($this->label)) : ?>
+						<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 					<?php endif;
-					if ( ! empty( $this->description ) ) : ?>
+					if ( ! empty($this->description)) : ?>
 						<span class="description customize-control-description"><?php echo $this->description; ?></span>
 					<?php endif; ?>
-					<textarea rows="5" <?php $this->input_attrs(); ?> <?php $this->link(); ?>><?php echo esc_textarea( $this->value() ); ?></textarea>
+					<textarea rows="5" <?php $this->input_attrs(); ?> <?php $this->link(); ?>><?php echo esc_textarea($this->value()); ?></textarea>
 				</label>
 				<?php
 				break;
 			case 'dropdown-pages':
 				?>
 				<label>
-				<?php if ( ! empty( $this->label ) ) : ?>
-					<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+				<?php if ( ! empty($this->label)) : ?>
+					<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 				<?php endif;
-				if ( ! empty( $this->description ) ) : ?>
+				if ( ! empty($this->description)) : ?>
 					<span class="description customize-control-description"><?php echo $this->description; ?></span>
 				<?php endif; ?>
 
 				<?php
-				$dropdown_name = '_customize-dropdown-pages-' . $this->id;
-				$show_option_none = __( '&mdash; Select &mdash;' );
+				$dropdown_name = '_customize-dropdown-pages-'.$this->id;
+				$show_option_none = __('&mdash; Select &mdash;');
 				$option_none_value = '0';
 				$dropdown = wp_dropdown_pages(
 					array(
@@ -586,56 +586,56 @@ 
 						'selected'          => $this->value(),
 					)
 				);
-				if ( empty( $dropdown ) ) {
-					$dropdown = sprintf( '<select id="%1$s" name="%1$s">', esc_attr( $dropdown_name ) );
-					$dropdown .= sprintf( '<option value="%1$s">%2$s</option>', esc_attr( $option_none_value ), esc_html( $show_option_none ) );
+				if (empty($dropdown)) {
+					$dropdown = sprintf('<select id="%1$s" name="%1$s">', esc_attr($dropdown_name));
+					$dropdown .= sprintf('<option value="%1$s">%2$s</option>', esc_attr($option_none_value), esc_html($show_option_none));
 					$dropdown .= '</select>';
 				}
 
 				// Hackily add in the data link parameter.
-				$dropdown = str_replace( '<select', '<select ' . $this->get_link(), $dropdown );
+				$dropdown = str_replace('<select', '<select '.$this->get_link(), $dropdown);
 
 				// Even more hacikly add auto-draft page stubs.
 				// @todo Eventually this should be removed in favor of the pages being injected into the underlying get_pages() call. See <https://github.com/xwp/wp-customize-posts/pull/250>.
-				$nav_menus_created_posts_setting = $this->manager->get_setting( 'nav_menus_created_posts' );
-				if ( $nav_menus_created_posts_setting && current_user_can( 'publish_pages' ) ) {
+				$nav_menus_created_posts_setting = $this->manager->get_setting('nav_menus_created_posts');
+				if ($nav_menus_created_posts_setting && current_user_can('publish_pages')) {
 					$auto_draft_page_options = '';
-					foreach ( $nav_menus_created_posts_setting->value() as $auto_draft_page_id ) {
-						$post = get_post( $auto_draft_page_id );
-						if ( $post && 'page' === $post->post_type ) {
-							$auto_draft_page_options .= sprintf( '<option value="%1$s">%2$s</option>', esc_attr( $post->ID ), esc_html( $post->post_title ) );
+					foreach ($nav_menus_created_posts_setting->value() as $auto_draft_page_id) {
+						$post = get_post($auto_draft_page_id);
+						if ($post && 'page' === $post->post_type) {
+							$auto_draft_page_options .= sprintf('<option value="%1$s">%2$s</option>', esc_attr($post->ID), esc_html($post->post_title));
 						}
 					}
-					if ( $auto_draft_page_options ) {
-						$dropdown = str_replace( '</select>', $auto_draft_page_options . '</select>', $dropdown );
+					if ($auto_draft_page_options) {
+						$dropdown = str_replace('</select>', $auto_draft_page_options.'</select>', $dropdown);
 					}
 				}
 
 				echo $dropdown;
 				?>
 				</label>
-				<?php if ( $this->allow_addition && current_user_can( 'publish_pages' ) && current_user_can( 'edit_theme_options' ) ) : // Currently tied to menus functionality. ?>
+				<?php if ($this->allow_addition && current_user_can('publish_pages') && current_user_can('edit_theme_options')) : // Currently tied to menus functionality. ?>
 					<button type="button" class="button-link add-new-toggle"><?php
 						/* translators: %s: add new page label */
-						printf( __( '+ %s' ), get_post_type_object( 'page' )->labels->add_new_item );
+						printf(__('+ %s'), get_post_type_object('page')->labels->add_new_item);
 					?></button>
 					<div class="new-content-item">
-						<label for="create-input-<?php echo $this->id; ?>"><span class="screen-reader-text"><?php _e( 'New page title' ); ?></span></label>
-						<input type="text" id="create-input-<?php echo $this->id; ?>" class="create-item-input" placeholder="<?php esc_attr_e( 'New page title&hellip;' ); ?>">
-						<button type="button" class="button add-content"><?php _e( 'Add' ); ?></button>
+						<label for="create-input-<?php echo $this->id; ?>"><span class="screen-reader-text"><?php _e('New page title'); ?></span></label>
+						<input type="text" id="create-input-<?php echo $this->id; ?>" class="create-item-input" placeholder="<?php esc_attr_e('New page title&hellip;'); ?>">
+						<button type="button" class="button add-content"><?php _e('Add'); ?></button>
 					</div>
 				<?php endif;
 				break;
 			default:
 				?>
 				<label>
-					<?php if ( ! empty( $this->label ) ) : ?>
-						<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+					<?php if ( ! empty($this->label)) : ?>
+						<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 					<?php endif;
-					if ( ! empty( $this->description ) ) : ?>
+					if ( ! empty($this->description)) : ?>
 						<span class="description customize-control-description"><?php echo $this->description; ?></span>
 					<?php endif; ?>
-					<input type="<?php echo esc_attr( $this->type ); ?>" <?php $this->input_attrs(); ?> value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->link(); ?> />
+					<input type="<?php echo esc_attr($this->type); ?>" <?php $this->input_attrs(); ?> value="<?php echo esc_attr($this->value()); ?>" <?php $this->link(); ?> />
 				</label>
 				<?php
 				break;
@@ -678,89 +678,89 @@ 
 /**
  * WP_Customize_Color_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-color-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-color-control.php');
 
 /**
  * WP_Customize_Media_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-media-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-media-control.php');
 
 /**
  * WP_Customize_Upload_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-upload-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-upload-control.php');
 
 /**
  * WP_Customize_Image_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-image-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-image-control.php');
 
 /**
  * WP_Customize_Background_Image_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-control.php');
 
 /**
  * WP_Customize_Background_Position_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-position-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-position-control.php');
 
 /**
  * WP_Customize_Cropped_Image_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-cropped-image-control.php');
 
 /**
  * WP_Customize_Site_Icon_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-site-icon-control.php');
 
 /**
  * WP_Customize_Header_Image_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-control.php');
 
 /**
  * WP_Customize_Theme_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-theme-control.php');
 
 /**
  * WP_Widget_Area_Customize_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-widget-area-customize-control.php');
 
 /**
  * WP_Widget_Form_Customize_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-widget-form-customize-control.php');
 
 /**
  * WP_Customize_Nav_Menu_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-control.php');
 
 /**
  * WP_Customize_Nav_Menu_Item_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-control.php');
 
 /**
  * WP_Customize_Nav_Menu_Location_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-location-control.php');
 
 /**
  * WP_Customize_Nav_Menu_Name_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-name-control.php');
 
 /**
  * WP_Customize_Nav_Menu_Auto_Add_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-auto-add-control.php');
 
 /**
  * WP_Customize_New_Menu_Control class.
  */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-new-menu-control.php');

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

Braces +9 added lines, -6 removed lines

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

Spacing +112 added lines, -112 removed lines

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

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

Indentation +7 added lines, -7 removed lines

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

Braces +65 added lines, -46 removed lines

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

Spacing +77 added lines, -77 removed lines

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

src/wp-includes/script-loader.php

Braces +44 added lines, -30 removed lines

@@ -683,11 +683,13 @@ 
 function wp_default_styles( &$styles ) {
 	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
 
-	if ( ! defined( 'SCRIPT_DEBUG' ) )
-		define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
+	if ( ! defined( 'SCRIPT_DEBUG' ) ) {
+			define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
+	}
 
-	if ( ! $guessurl = site_url() )
-		$guessurl = wp_guess_url();
+	if ( ! $guessurl = site_url() ) {
+			$guessurl = wp_guess_url();
+	}
 
 	$styles->base_url = $guessurl;
 	$styles->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
@@ -812,14 +814,17 @@ 
  * @return array Reordered array, if needed.
  */
 function wp_prototype_before_jquery( $js_array ) {
-	if ( false === $prototype = array_search( 'prototype', $js_array, true ) )
-		return $js_array;
+	if ( false === $prototype = array_search( 'prototype', $js_array, true ) ) {
+			return $js_array;
+	}
 
-	if ( false === $jquery = array_search( 'jquery', $js_array, true ) )
-		return $js_array;
+	if ( false === $jquery = array_search( 'jquery', $js_array, true ) ) {
+			return $js_array;
+	}
 
-	if ( $prototype < $jquery )
-		return $js_array;
+	if ( $prototype < $jquery ) {
+			return $js_array;
+	}
 
 	unset($js_array[$prototype]);
 
@@ -867,14 +872,16 @@ 
 function wp_style_loader_src( $src, $handle ) {
 	global $_wp_admin_css_colors;
 
-	if ( wp_installing() )
-		return preg_replace( '#^wp-admin/#', './', $src );
+	if ( wp_installing() ) {
+			return preg_replace( '#^wp-admin/#', './', $src );
+	}
 
 	if ( 'colors' == $handle ) {
 		$color = get_user_option('admin_color');
 
-		if ( empty($color) || !isset($_wp_admin_css_colors[$color]) )
-			$color = 'fresh';
+		if ( empty($color) || !isset($_wp_admin_css_colors[$color]) ) {
+					$color = 'fresh';
+		}
 
 		$color = $_wp_admin_css_colors[$color];
 		$url = $color->url;
@@ -985,8 +992,9 @@ 
 	global $wp_scripts, $compress_scripts;
 
 	$zip = $compress_scripts ? 1 : 0;
-	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
-		$zip = 'gzip';
+	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP ) {
+			$zip = 'gzip';
+	}
 
 	if ( $concat = trim( $wp_scripts->concat, ', ' ) ) {
 
@@ -1009,9 +1017,10 @@ 
 		echo "<script type='text/javascript' src='" . esc_attr($src) . "'></script>\n";
 	}
 
-	if ( !empty($wp_scripts->print_html) )
-		echo $wp_scripts->print_html;
-}
+	if ( !empty($wp_scripts->print_html) ) {
+			echo $wp_scripts->print_html;
+	}
+	}
 
 /**
  * Prints the script queue in the HTML head on the front end.
@@ -1163,8 +1172,9 @@ 
 	$wp_styles = wp_styles();
 
 	$zip = $compress_css ? 1 : 0;
-	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
-		$zip = 'gzip';
+	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP ) {
+			$zip = 'gzip';
+	}
 
 	if ( $concat = trim( $wp_styles->concat, ', ' ) ) {
 		$dir = $wp_styles->text_direction;
@@ -1183,9 +1193,10 @@ 
 		}
 	}
 
-	if ( !empty($wp_styles->print_html) )
-		echo $wp_styles->print_html;
-}
+	if ( !empty($wp_styles->print_html) ) {
+			echo $wp_styles->print_html;
+	}
+	}
 
 /**
  * Determine the concatenation and compression settings for scripts and styles.
@@ -1203,19 +1214,22 @@ 
 
 	if ( ! isset($concatenate_scripts) ) {
 		$concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true;
-		if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) )
-			$concatenate_scripts = false;
+		if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ) {
+					$concatenate_scripts = false;
+		}
 	}
 
 	if ( ! isset($compress_scripts) ) {
 		$compress_scripts = defined('COMPRESS_SCRIPTS') ? COMPRESS_SCRIPTS : true;
-		if ( $compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
-			$compress_scripts = false;
+		if ( $compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output ) ) {
+					$compress_scripts = false;
+		}
 	}
 
 	if ( ! isset($compress_css) ) {
 		$compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
-		if ( $compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
-			$compress_css = false;
+		if ( $compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output ) ) {
+					$compress_css = false;
+		}
 	}
 }

Spacing +636 added lines, -636 removed lines

@@ -17,22 +17,22 @@ 
  */
 
 /** WordPress Dependency Class */
-require( ABSPATH . WPINC . '/class-wp-dependency.php' );
+require(ABSPATH.WPINC.'/class-wp-dependency.php');
 
 /** WordPress Dependencies Class */
-require( ABSPATH . WPINC . '/class.wp-dependencies.php' );
+require(ABSPATH.WPINC.'/class.wp-dependencies.php');
 
 /** WordPress Scripts Class */
-require( ABSPATH . WPINC . '/class.wp-scripts.php' );
+require(ABSPATH.WPINC.'/class.wp-scripts.php');
 
 /** WordPress Scripts Functions */
-require( ABSPATH . WPINC . '/functions.wp-scripts.php' );
+require(ABSPATH.WPINC.'/functions.wp-scripts.php');
 
 /** WordPress Styles Class */
-require( ABSPATH . WPINC . '/class.wp-styles.php' );
+require(ABSPATH.WPINC.'/class.wp-styles.php');
 
 /** WordPress Styles Functions */
-require( ABSPATH . WPINC . '/functions.wp-styles.php' );
+require(ABSPATH.WPINC.'/functions.wp-styles.php');
 
 /**
  * Register all WordPress scripts.
@@ -45,103 +45,103 @@ 
  *
  * @param WP_Scripts $scripts WP_Scripts object.
  */
-function wp_default_scripts( &$scripts ) {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+function wp_default_scripts(&$scripts) {
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 
-	$develop_src = false !== strpos( $wp_version, '-src' );
+	$develop_src = false !== strpos($wp_version, '-src');
 
-	if ( ! defined( 'SCRIPT_DEBUG' ) ) {
-		define( 'SCRIPT_DEBUG', $develop_src );
+	if ( ! defined('SCRIPT_DEBUG')) {
+		define('SCRIPT_DEBUG', $develop_src);
 	}
 
-	if ( ! $guessurl = site_url() ) {
+	if ( ! $guessurl = site_url()) {
 		$guessed_url = true;
 		$guessurl = wp_guess_url();
 	}
 
 	$scripts->base_url = $guessurl;
-	$scripts->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
-	$scripts->default_version = get_bloginfo( 'version' );
+	$scripts->content_url = defined('WP_CONTENT_URL') ? WP_CONTENT_URL : '';
+	$scripts->default_version = get_bloginfo('version');
 	$scripts->default_dirs = array('/wp-admin/js/', '/wp-includes/js/');
 
 	$suffix = SCRIPT_DEBUG ? '' : '.min';
 	$dev_suffix = $develop_src ? '' : '.min';
 
-	$scripts->add( 'utils', "/wp-includes/js/utils$suffix.js" );
-	did_action( 'init' ) && $scripts->localize( 'utils', 'userSettings', array(
+	$scripts->add('utils', "/wp-includes/js/utils$suffix.js");
+	did_action('init') && $scripts->localize('utils', 'userSettings', array(
 		'url' => (string) SITECOOKIEPATH,
 		'uid' => (string) get_current_user_id(),
 		'time' => (string) time(),
-		'secure' => (string) ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) ),
-	) );
-
-	$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'common', 'commonL10n', array(
-		'warnDelete'   => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
-		'dismiss'      => __( 'Dismiss this notice.' ),
-		'collapseMenu' => __( 'Collapse Main menu' ),
-		'expandMenu'   => __( 'Expand Main menu' ),
-	) );
-
-	$scripts->add( 'wp-a11y', "/wp-includes/js/wp-a11y$suffix.js", array( 'jquery' ), false, 1 );
-
-	$scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", array(), '1.6.1', 1 );
-
-	$scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'quicktags', 'quicktagsL10n', array(
-		'closeAllOpenTags'      => __( 'Close all open tags' ),
-		'closeTags'             => __( 'close tags' ),
-		'enterURL'              => __( 'Enter the URL' ),
-		'enterImageURL'         => __( 'Enter the URL of the image' ),
-		'enterImageDescription' => __( 'Enter a description of the image' ),
-		'textdirection'         => __( 'text direction' ),
-		'toggleTextdirection'   => __( 'Toggle Editor Text Direction' ),
-		'dfw'                   => __( 'Distraction-free writing mode' ),
-		'strong'          => __( 'Bold' ),
-		'strongClose'     => __( 'Close bold tag' ),
-		'em'              => __( 'Italic' ),
-		'emClose'         => __( 'Close italic tag' ),
-		'link'            => __( 'Insert link' ),
-		'blockquote'      => __( 'Blockquote' ),
-		'blockquoteClose' => __( 'Close blockquote tag' ),
-		'del'             => __( 'Deleted text (strikethrough)' ),
-		'delClose'        => __( 'Close deleted text tag' ),
-		'ins'             => __( 'Inserted text' ),
-		'insClose'        => __( 'Close inserted text tag' ),
-		'image'           => __( 'Insert image' ),
-		'ul'              => __( 'Bulleted list' ),
-		'ulClose'         => __( 'Close bulleted list tag' ),
-		'ol'              => __( 'Numbered list' ),
-		'olClose'         => __( 'Close numbered list tag' ),
-		'li'              => __( 'List item' ),
-		'liClose'         => __( 'Close list item tag' ),
-		'code'            => __( 'Code' ),
-		'codeClose'       => __( 'Close code tag' ),
-		'more'            => __( 'Insert Read More tag' ),
-	) );
-
-	$scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' );
-
-	$scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), false, 1 );
+		'secure' => (string) ('https' === parse_url(site_url(), PHP_URL_SCHEME)),
+	));
+
+	$scripts->add('common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1);
+	did_action('init') && $scripts->localize('common', 'commonL10n', array(
+		'warnDelete'   => __("You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete."),
+		'dismiss'      => __('Dismiss this notice.'),
+		'collapseMenu' => __('Collapse Main menu'),
+		'expandMenu'   => __('Expand Main menu'),
+	));
+
+	$scripts->add('wp-a11y', "/wp-includes/js/wp-a11y$suffix.js", array('jquery'), false, 1);
+
+	$scripts->add('sack', "/wp-includes/js/tw-sack$suffix.js", array(), '1.6.1', 1);
+
+	$scripts->add('quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1);
+	did_action('init') && $scripts->localize('quicktags', 'quicktagsL10n', array(
+		'closeAllOpenTags'      => __('Close all open tags'),
+		'closeTags'             => __('close tags'),
+		'enterURL'              => __('Enter the URL'),
+		'enterImageURL'         => __('Enter the URL of the image'),
+		'enterImageDescription' => __('Enter a description of the image'),
+		'textdirection'         => __('text direction'),
+		'toggleTextdirection'   => __('Toggle Editor Text Direction'),
+		'dfw'                   => __('Distraction-free writing mode'),
+		'strong'          => __('Bold'),
+		'strongClose'     => __('Close bold tag'),
+		'em'              => __('Italic'),
+		'emClose'         => __('Close italic tag'),
+		'link'            => __('Insert link'),
+		'blockquote'      => __('Blockquote'),
+		'blockquoteClose' => __('Close blockquote tag'),
+		'del'             => __('Deleted text (strikethrough)'),
+		'delClose'        => __('Close deleted text tag'),
+		'ins'             => __('Inserted text'),
+		'insClose'        => __('Close inserted text tag'),
+		'image'           => __('Insert image'),
+		'ul'              => __('Bulleted list'),
+		'ulClose'         => __('Close bulleted list tag'),
+		'ol'              => __('Numbered list'),
+		'olClose'         => __('Close numbered list tag'),
+		'li'              => __('List item'),
+		'liClose'         => __('Close list item tag'),
+		'code'            => __('Code'),
+		'codeClose'       => __('Close code tag'),
+		'more'            => __('Insert Read More tag'),
+	));
+
+	$scripts->add('colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m');
+
+	$scripts->add('editor', "/wp-admin/js/editor$suffix.js", array('utils', 'jquery'), false, 1);
 
 	// Back-compat for old DFW. To-do: remove at the end of 2016.
-	$scripts->add( 'wp-fullscreen-stub', "/wp-admin/js/wp-fullscreen-stub$suffix.js", array(), false, 1 );
+	$scripts->add('wp-fullscreen-stub', "/wp-admin/js/wp-fullscreen-stub$suffix.js", array(), false, 1);
 
-	$scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-ajax-response', 'wpAjax', array(
+	$scripts->add('wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), false, 1);
+	did_action('init') && $scripts->localize('wp-ajax-response', 'wpAjax', array(
 		'noPerm' => __('Sorry, you are not allowed to do that.'),
 		'broken' => __('An unidentified error has occurred.')
-	) );
+	));
 
-	$scripts->add( 'wp-pointer', "/wp-includes/js/wp-pointer$suffix.js", array( 'jquery-ui-widget', 'jquery-ui-position' ), '20111129a', 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-pointer', 'wpPointerL10n', array(
+	$scripts->add('wp-pointer', "/wp-includes/js/wp-pointer$suffix.js", array('jquery-ui-widget', 'jquery-ui-position'), '20111129a', 1);
+	did_action('init') && $scripts->localize('wp-pointer', 'wpPointerL10n', array(
 		'dismiss' => __('Dismiss'),
-	) );
+	));
 
-	$scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('heartbeat'), false, 1 );
+	$scripts->add('autosave', "/wp-includes/js/autosave$suffix.js", array('heartbeat'), false, 1);
 
-	$scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array('jquery'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'heartbeat', 'heartbeatSettings',
+	$scripts->add('heartbeat', "/wp-includes/js/heartbeat$suffix.js", array('jquery'), false, 1);
+	did_action('init') && $scripts->localize('heartbeat', 'heartbeatSettings',
 		/**
 		 * Filters the Heartbeat settings.
 		 *
@@ -149,11 +149,11 @@ 
 		 *
 		 * @param array $settings Heartbeat settings array.
 		 */
-		apply_filters( 'heartbeat_settings', array() )
+		apply_filters('heartbeat_settings', array())
 	);
 
-	$scripts->add( 'wp-auth-check', "/wp-includes/js/wp-auth-check$suffix.js", array('heartbeat'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-auth-check', 'authcheckL10n', array(
+	$scripts->add('wp-auth-check', "/wp-includes/js/wp-auth-check$suffix.js", array('heartbeat'), false, 1);
+	did_action('init') && $scripts->localize('wp-auth-check', 'authcheckL10n', array(
 		'beforeunload' => __('Your session has expired. You can log in again from this page or go to the login page.'),
 
 		/**
@@ -164,104 +164,104 @@ 
 		 * @param int $interval The interval in which to check a user's authentication.
 		 *                      Default 3 minutes in seconds, or 180.
 		 */
-		'interval' => apply_filters( 'wp_auth_check_interval', 3 * MINUTE_IN_SECONDS ),
-	) );
+		'interval' => apply_filters('wp_auth_check_interval', 3 * MINUTE_IN_SECONDS),
+	));
 
-	$scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array( 'wp-ajax-response', 'jquery-color' ), false, 1 );
+	$scripts->add('wp-lists', "/wp-includes/js/wp-lists$suffix.js", array('wp-ajax-response', 'jquery-color'), false, 1);
 
 	// WordPress no longer uses or bundles Prototype or script.aculo.us. These are now pulled from an external source.
-	$scripts->add( 'prototype', 'https://ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1');
-	$scripts->add( 'scriptaculous-root', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js', array('prototype'), '1.9.0');
-	$scripts->add( 'scriptaculous-builder', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/builder.js', array('scriptaculous-root'), '1.9.0');
-	$scripts->add( 'scriptaculous-dragdrop', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.9.0');
-	$scripts->add( 'scriptaculous-effects', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/effects.js', array('scriptaculous-root'), '1.9.0');
-	$scripts->add( 'scriptaculous-slider', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/slider.js', array('scriptaculous-effects'), '1.9.0');
-	$scripts->add( 'scriptaculous-sound', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/sound.js', array( 'scriptaculous-root' ), '1.9.0' );
-	$scripts->add( 'scriptaculous-controls', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array('scriptaculous-root'), '1.9.0');
-	$scripts->add( 'scriptaculous', false, array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls') );
+	$scripts->add('prototype', 'https://ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1');
+	$scripts->add('scriptaculous-root', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js', array('prototype'), '1.9.0');
+	$scripts->add('scriptaculous-builder', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/builder.js', array('scriptaculous-root'), '1.9.0');
+	$scripts->add('scriptaculous-dragdrop', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.9.0');
+	$scripts->add('scriptaculous-effects', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/effects.js', array('scriptaculous-root'), '1.9.0');
+	$scripts->add('scriptaculous-slider', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/slider.js', array('scriptaculous-effects'), '1.9.0');
+	$scripts->add('scriptaculous-sound', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/sound.js', array('scriptaculous-root'), '1.9.0');
+	$scripts->add('scriptaculous-controls', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array('scriptaculous-root'), '1.9.0');
+	$scripts->add('scriptaculous', false, array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls'));
 
 	// not used in core, replaced by Jcrop.js
-	$scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop') );
+	$scripts->add('cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'));
 
 	// jQuery
-	$scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.12.4' );
-	$scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.4' );
-	$scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.4.1' );
+	$scripts->add('jquery', false, array('jquery-core', 'jquery-migrate'), '1.12.4');
+	$scripts->add('jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.4');
+	$scripts->add('jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.4.1');
 
 	// full jQuery UI
-	$scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$dev_suffix.js", array('jquery'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$dev_suffix.js", array('jquery'), '1.11.4', 1 );
-
-	$scripts->add( 'jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-scale'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-size'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-
-	$scripts->add( 'jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-autocomplete', "/wp-includes/js/jquery/ui/autocomplete$dev_suffix.js", array( 'jquery-ui-menu', 'wp-a11y' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-button', "/wp-includes/js/jquery/ui/button$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$dev_suffix.js", array('jquery-ui-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$dev_suffix.js", array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$dev_suffix.js", array('jquery-ui-draggable'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-menu', "/wp-includes/js/jquery/ui/menu$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-mouse', "/wp-includes/js/jquery/ui/mouse$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-position', "/wp-includes/js/jquery/ui/position$dev_suffix.js", array('jquery'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$dev_suffix.js", array('jquery-ui-menu'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-spinner', "/wp-includes/js/jquery/ui/spinner$dev_suffix.js", array( 'jquery-ui-button' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-widget', "/wp-includes/js/jquery/ui/widget$dev_suffix.js", array('jquery'), '1.11.4', 1 );
+	$scripts->add('jquery-ui-core', "/wp-includes/js/jquery/ui/core$dev_suffix.js", array('jquery'), '1.11.4', 1);
+	$scripts->add('jquery-effects-core', "/wp-includes/js/jquery/ui/effect$dev_suffix.js", array('jquery'), '1.11.4', 1);
+
+	$scripts->add('jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-scale'), '1.11.4', 1);
+	$scripts->add('jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-size'), '1.11.4', 1);
+	$scripts->add('jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+
+	$scripts->add('jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1);
+	$scripts->add('jquery-ui-autocomplete', "/wp-includes/js/jquery/ui/autocomplete$dev_suffix.js", array('jquery-ui-menu', 'wp-a11y'), '1.11.4', 1);
+	$scripts->add('jquery-ui-button', "/wp-includes/js/jquery/ui/button$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1);
+	$scripts->add('jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$dev_suffix.js", array('jquery-ui-core'), '1.11.4', 1);
+	$scripts->add('jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$dev_suffix.js", array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.11.4', 1);
+	$scripts->add('jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1);
+	$scripts->add('jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$dev_suffix.js", array('jquery-ui-draggable'), '1.11.4', 1);
+	$scripts->add('jquery-ui-menu', "/wp-includes/js/jquery/ui/menu$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position'), '1.11.4', 1);
+	$scripts->add('jquery-ui-mouse', "/wp-includes/js/jquery/ui/mouse$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1);
+	$scripts->add('jquery-ui-position', "/wp-includes/js/jquery/ui/position$dev_suffix.js", array('jquery'), '1.11.4', 1);
+	$scripts->add('jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1);
+	$scripts->add('jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1);
+	$scripts->add('jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1);
+	$scripts->add('jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$dev_suffix.js", array('jquery-ui-menu'), '1.11.4', 1);
+	$scripts->add('jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1);
+	$scripts->add('jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1);
+	$scripts->add('jquery-ui-spinner', "/wp-includes/js/jquery/ui/spinner$dev_suffix.js", array('jquery-ui-button'), '1.11.4', 1);
+	$scripts->add('jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1);
+	$scripts->add('jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position'), '1.11.4', 1);
+	$scripts->add('jquery-ui-widget', "/wp-includes/js/jquery/ui/widget$dev_suffix.js", array('jquery'), '1.11.4', 1);
 
 	// Strings for 'jquery-ui-autocomplete' live region messages
-	did_action( 'init' ) && $scripts->localize( 'jquery-ui-autocomplete', 'uiAutocompleteL10n', array(
-		'noResults' => __( 'No results found.' ),
+	did_action('init') && $scripts->localize('jquery-ui-autocomplete', 'uiAutocompleteL10n', array(
+		'noResults' => __('No results found.'),
 		/* translators: Number of results found when using jQuery UI Autocomplete */
-		'oneResult' => __( '1 result found. Use up and down arrow keys to navigate.' ),
+		'oneResult' => __('1 result found. Use up and down arrow keys to navigate.'),
 		/* translators: %d: Number of results found when using jQuery UI Autocomplete */
-		'manyResults' => __( '%d results found. Use up and down arrow keys to navigate.' ),
-		'itemSelected' => __( 'Item selected.' ),
-	) );
+		'manyResults' => __('%d results found. Use up and down arrow keys to navigate.'),
+		'itemSelected' => __('Item selected.'),
+	));
 
 	// deprecated, not used in core, most functionality is included in jQuery 1.3
-	$scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '3.37.0', 1 );
+	$scripts->add('jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '3.37.0', 1);
 
 	// jQuery plugins
-	$scripts->add( 'jquery-color', "/wp-includes/js/jquery/jquery.color.min.js", array('jquery'), '2.1.1', 1 );
-	$scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m', 1 );
-	$scripts->add( 'jquery-query', "/wp-includes/js/jquery/jquery.query.js", array('jquery'), '2.1.7', 1 );
-	$scripts->add( 'jquery-serialize-object', "/wp-includes/js/jquery/jquery.serialize-object.js", array('jquery'), '0.2', 1 );
-	$scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m', 1 );
-	$scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), false, 1 );
-	$scripts->add( 'jquery-touch-punch', "/wp-includes/js/jquery/jquery.ui.touch-punch.js", array('jquery-ui-widget', 'jquery-ui-mouse'), '0.2.2', 1 );
+	$scripts->add('jquery-color', "/wp-includes/js/jquery/jquery.color.min.js", array('jquery'), '2.1.1', 1);
+	$scripts->add('schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m', 1);
+	$scripts->add('jquery-query', "/wp-includes/js/jquery/jquery.query.js", array('jquery'), '2.1.7', 1);
+	$scripts->add('jquery-serialize-object', "/wp-includes/js/jquery/jquery.serialize-object.js", array('jquery'), '0.2', 1);
+	$scripts->add('jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m', 1);
+	$scripts->add('jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), false, 1);
+	$scripts->add('jquery-touch-punch', "/wp-includes/js/jquery/jquery.ui.touch-punch.js", array('jquery-ui-widget', 'jquery-ui-mouse'), '0.2.2', 1);
 
 	// Not used any more, registered for backwards compatibility.
-	$scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20110113', 1 );
+	$scripts->add('suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20110113', 1);
 
 	// Masonry v2 depended on jQuery. v3 does not. The older jquery-masonry handle is a shiv.
 	// It sets jQuery as a dependency, as the theme may have been implicitly loading it this way.
-	$scripts->add( 'imagesloaded', "/wp-includes/js/imagesloaded.min.js", array(), '3.2.0', 1 );
-	$scripts->add( 'masonry', "/wp-includes/js/masonry.min.js", array( 'imagesloaded' ), '3.3.2', 1 );
-	$scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array( 'jquery', 'masonry' ), '3.1.2b', 1 );
+	$scripts->add('imagesloaded', "/wp-includes/js/imagesloaded.min.js", array(), '3.2.0', 1);
+	$scripts->add('masonry', "/wp-includes/js/masonry.min.js", array('imagesloaded'), '3.3.2', 1);
+	$scripts->add('jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array('jquery', 'masonry'), '3.1.2b', 1);
 
-	$scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1 );
-	did_action( 'init' ) && $scripts->localize( 'thickbox', 'thickboxL10n', array(
+	$scripts->add('thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1);
+	did_action('init') && $scripts->localize('thickbox', 'thickboxL10n', array(
 		'next' => __('Next >'),
 		'prev' => __('< Prev'),
 		'image' => __('Image'),
@@ -269,11 +269,11 @@ 
 		'close' => __('Close'),
 		'noiframes' => __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'),
 		'loadingAnimation' => includes_url('js/thickbox/loadingAnimation.gif'),
-	) );
+	));
 
-	$scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.js", array('jquery'), '0.9.12');
+	$scripts->add('jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.js", array('jquery'), '0.9.12');
 
-	$scripts->add( 'swfobject', "/wp-includes/js/swfobject.js", array(), '2.2-20120417');
+	$scripts->add('swfobject', "/wp-includes/js/swfobject.js", array(), '2.2-20120417');
 
 	// error message for both plupload and swfupload
 	$uploader_l10n = array(
@@ -302,82 +302,82 @@ 
 		'error_uploading' => __('“%s” has failed to upload.')
 	);
 
-	$scripts->add( 'plupload', '/wp-includes/js/plupload/plupload.full.min.js', array(), '2.1.8' );
+	$scripts->add('plupload', '/wp-includes/js/plupload/plupload.full.min.js', array(), '2.1.8');
 	// Back compat handles:
-	foreach ( array( 'all', 'html5', 'flash', 'silverlight', 'html4' ) as $handle ) {
-		$scripts->add( "plupload-$handle", false, array( 'plupload' ), '2.1.1' );
+	foreach (array('all', 'html5', 'flash', 'silverlight', 'html4') as $handle) {
+		$scripts->add("plupload-$handle", false, array('plupload'), '2.1.1');
 	}
 
-	$scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array( 'plupload', 'jquery' ) );
-	did_action( 'init' ) && $scripts->localize( 'plupload-handlers', 'pluploadL10n', $uploader_l10n );
+	$scripts->add('plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload', 'jquery'));
+	did_action('init') && $scripts->localize('plupload-handlers', 'pluploadL10n', $uploader_l10n);
 
-	$scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n );
+	$scripts->add('wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array('plupload', 'jquery', 'json2', 'media-models'), false, 1);
+	did_action('init') && $scripts->localize('wp-plupload', 'pluploadL10n', $uploader_l10n);
 
 	// keep 'swfupload' for back-compat.
-	$scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113');
-	$scripts->add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201a');
-	$scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201');
-	$scripts->add( 'swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201');
-	$scripts->add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
-	$scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524');
-	did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n );
+	$scripts->add('swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113');
+	$scripts->add('swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201a');
+	$scripts->add('swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201');
+	$scripts->add('swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201');
+	$scripts->add('swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
+	$scripts->add('swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524');
+	did_action('init') && $scripts->localize('swfupload-handlers', 'swfuploadL10n', $uploader_l10n);
 
-	$scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 );
+	$scripts->add('comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1);
 
-	$scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2015-05-03' );
-	did_action( 'init' ) && $scripts->add_data( 'json2', 'conditional', 'lt IE 8' );
+	$scripts->add('json2', "/wp-includes/js/json2$suffix.js", array(), '2015-05-03');
+	did_action('init') && $scripts->add_data('json2', 'conditional', 'lt IE 8');
 
-	$scripts->add( 'underscore', "/wp-includes/js/underscore$dev_suffix.js", array(), '1.8.3', 1 );
-	$scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore','jquery' ), '1.2.3', 1 );
+	$scripts->add('underscore', "/wp-includes/js/underscore$dev_suffix.js", array(), '1.8.3', 1);
+	$scripts->add('backbone', "/wp-includes/js/backbone$dev_suffix.js", array('underscore', 'jquery'), '1.2.3', 1);
 
-	$scripts->add( 'wp-util', "/wp-includes/js/wp-util$suffix.js", array('underscore', 'jquery'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-util', '_wpUtilSettings', array(
+	$scripts->add('wp-util', "/wp-includes/js/wp-util$suffix.js", array('underscore', 'jquery'), false, 1);
+	did_action('init') && $scripts->localize('wp-util', '_wpUtilSettings', array(
 		'ajax' => array(
-			'url' => admin_url( 'admin-ajax.php', 'relative' ),
+			'url' => admin_url('admin-ajax.php', 'relative'),
 		),
-	) );
+	));
 
-	$scripts->add( 'wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array('backbone', 'wp-util'), false, 1 );
+	$scripts->add('wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array('backbone', 'wp-util'), false, 1);
 
-	$scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'wp-backbone', 'jquery-ui-slider', 'hoverIntent' ), false, 1 );
+	$scripts->add('revisions', "/wp-admin/js/revisions$suffix.js", array('wp-backbone', 'jquery-ui-slider', 'hoverIntent'), false, 1);
 
-	$scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), false, 1 );
+	$scripts->add('imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), false, 1);
 
-	$scripts->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelement-and-player.min.js", array('jquery'), '2.22.0', 1 );
-	did_action( 'init' ) && $scripts->localize( 'mediaelement', 'mejsL10n', array(
-		'language' => get_bloginfo( 'language' ),
+	$scripts->add('mediaelement', "/wp-includes/js/mediaelement/mediaelement-and-player.min.js", array('jquery'), '2.22.0', 1);
+	did_action('init') && $scripts->localize('mediaelement', 'mejsL10n', array(
+		'language' => get_bloginfo('language'),
 		'strings'  => array(
-			'Close'                   => __( 'Close' ),
-			'Fullscreen'              => __( 'Fullscreen' ),
-			'Turn off Fullscreen'     => __( 'Turn off Fullscreen' ),
-			'Go Fullscreen'           => __( 'Go Fullscreen' ),
-			'Download File'           => __( 'Download File' ),
-			'Download Video'          => __( 'Download Video' ),
-			'Play'                    => __( 'Play' ),
-			'Pause'                   => __( 'Pause' ),
-			'Captions/Subtitles'      => __( 'Captions/Subtitles' ),
-			'None'                    => _x( 'None', 'no captions/subtitles' ),
-			'Time Slider'             => __( 'Time Slider' ),
+			'Close'                   => __('Close'),
+			'Fullscreen'              => __('Fullscreen'),
+			'Turn off Fullscreen'     => __('Turn off Fullscreen'),
+			'Go Fullscreen'           => __('Go Fullscreen'),
+			'Download File'           => __('Download File'),
+			'Download Video'          => __('Download Video'),
+			'Play'                    => __('Play'),
+			'Pause'                   => __('Pause'),
+			'Captions/Subtitles'      => __('Captions/Subtitles'),
+			'None'                    => _x('None', 'no captions/subtitles'),
+			'Time Slider'             => __('Time Slider'),
 			/* translators: %1: number of seconds (30 by default) */
-			'Skip back %1 seconds'    => __( 'Skip back %1 seconds' ),
-			'Video Player'            => __( 'Video Player' ),
-			'Audio Player'            => __( 'Audio Player' ),
-			'Volume Slider'           => __( 'Volume Slider' ),
-			'Mute Toggle'             => __( 'Mute Toggle' ),
-			'Unmute'                  => __( 'Unmute' ),
-			'Mute'                    => __( 'Mute' ),
-			'Use Up/Down Arrow keys to increase or decrease volume.' => __( 'Use Up/Down Arrow keys to increase or decrease volume.' ),
-			'Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.' => __( 'Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.' ),
+			'Skip back %1 seconds'    => __('Skip back %1 seconds'),
+			'Video Player'            => __('Video Player'),
+			'Audio Player'            => __('Audio Player'),
+			'Volume Slider'           => __('Volume Slider'),
+			'Mute Toggle'             => __('Mute Toggle'),
+			'Unmute'                  => __('Unmute'),
+			'Mute'                    => __('Mute'),
+			'Use Up/Down Arrow keys to increase or decrease volume.' => __('Use Up/Down Arrow keys to increase or decrease volume.'),
+			'Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.' => __('Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.'),
 		),
-	) );
+	));
 
 
-	$scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array('mediaelement'), false, 1 );
+	$scripts->add('wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array('mediaelement'), false, 1);
 	$mejs_settings = array(
-		'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
+		'pluginPath' => includes_url('js/mediaelement/', 'relative'),
 	);
-	did_action( 'init' ) && $scripts->localize( 'mediaelement', '_wpmejsSettings',
+	did_action('init') && $scripts->localize('mediaelement', '_wpmejsSettings',
 		/**
 		 * Filters the MediaElement configuration settings.
 		 *
@@ -385,172 +385,172 @@ 
 		 *
 		 * @param array $mejs_settings MediaElement settings array.
 		 */
-		apply_filters( 'mejs_settings', $mejs_settings )
+		apply_filters('mejs_settings', $mejs_settings)
 	);
 
-	$scripts->add( 'froogaloop',  "/wp-includes/js/mediaelement/froogaloop.min.js", array(), '2.0' );
-	$scripts->add( 'wp-playlist', "/wp-includes/js/mediaelement/wp-playlist$suffix.js", array( 'wp-util', 'backbone', 'mediaelement' ), false, 1 );
-
-	$scripts->add( 'zxcvbn-async', "/wp-includes/js/zxcvbn-async$suffix.js", array(), '1.0' );
-	did_action( 'init' ) && $scripts->localize( 'zxcvbn-async', '_zxcvbnSettings', array(
-		'src' => empty( $guessed_url ) ? includes_url( '/js/zxcvbn.min.js' ) : $scripts->base_url . '/wp-includes/js/zxcvbn.min.js',
-	) );
-
-	$scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array( 'jquery', 'zxcvbn-async' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
-		'unknown'  => _x( 'Password strength unknown', 'password strength' ),
-		'short'    => _x( 'Very weak', 'password strength' ),
-		'bad'      => _x( 'Weak', 'password strength' ),
-		'good'     => _x( 'Medium', 'password strength' ),
-		'strong'   => _x( 'Strong', 'password strength' ),
-		'mismatch' => _x( 'Mismatch', 'password mismatch' ),
-	) );
-
-	$scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'user-profile', 'userProfileL10n', array(
-		'warn'     => __( 'Your new password has not been saved.' ),
-		'warnWeak' => __( 'Confirm use of weak password' ),
-		'show'     => __( 'Show' ),
-		'hide'     => __( 'Hide' ),
-		'cancel'   => __( 'Cancel' ),
-		'ariaShow' => esc_attr__( 'Show password' ),
-		'ariaHide' => esc_attr__( 'Hide password' ),
-	) );
-
-	$scripts->add( 'language-chooser', "/wp-admin/js/language-chooser$suffix.js", array( 'jquery' ), false, 1 );
-
-	$scripts->add( 'user-suggest', "/wp-admin/js/user-suggest$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
-
-	$scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 );
-
-	$scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wplink', 'wpLinkL10n', array(
+	$scripts->add('froogaloop', "/wp-includes/js/mediaelement/froogaloop.min.js", array(), '2.0');
+	$scripts->add('wp-playlist', "/wp-includes/js/mediaelement/wp-playlist$suffix.js", array('wp-util', 'backbone', 'mediaelement'), false, 1);
+
+	$scripts->add('zxcvbn-async', "/wp-includes/js/zxcvbn-async$suffix.js", array(), '1.0');
+	did_action('init') && $scripts->localize('zxcvbn-async', '_zxcvbnSettings', array(
+		'src' => empty($guessed_url) ? includes_url('/js/zxcvbn.min.js') : $scripts->base_url.'/wp-includes/js/zxcvbn.min.js',
+	));
+
+	$scripts->add('password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery', 'zxcvbn-async'), false, 1);
+	did_action('init') && $scripts->localize('password-strength-meter', 'pwsL10n', array(
+		'unknown'  => _x('Password strength unknown', 'password strength'),
+		'short'    => _x('Very weak', 'password strength'),
+		'bad'      => _x('Weak', 'password strength'),
+		'good'     => _x('Medium', 'password strength'),
+		'strong'   => _x('Strong', 'password strength'),
+		'mismatch' => _x('Mismatch', 'password mismatch'),
+	));
+
+	$scripts->add('user-profile', "/wp-admin/js/user-profile$suffix.js", array('jquery', 'password-strength-meter', 'wp-util'), false, 1);
+	did_action('init') && $scripts->localize('user-profile', 'userProfileL10n', array(
+		'warn'     => __('Your new password has not been saved.'),
+		'warnWeak' => __('Confirm use of weak password'),
+		'show'     => __('Show'),
+		'hide'     => __('Hide'),
+		'cancel'   => __('Cancel'),
+		'ariaShow' => esc_attr__('Show password'),
+		'ariaHide' => esc_attr__('Hide password'),
+	));
+
+	$scripts->add('language-chooser', "/wp-admin/js/language-chooser$suffix.js", array('jquery'), false, 1);
+
+	$scripts->add('user-suggest', "/wp-admin/js/user-suggest$suffix.js", array('jquery-ui-autocomplete'), false, 1);
+
+	$scripts->add('admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1);
+
+	$scripts->add('wplink', "/wp-includes/js/wplink$suffix.js", array('jquery', 'wp-a11y'), false, 1);
+	did_action('init') && $scripts->localize('wplink', 'wpLinkL10n', array(
 		'title' => __('Insert/edit link'),
 		'update' => __('Update'),
 		'save' => __('Add Link'),
 		'noTitle' => __('(no title)'),
 		'noMatchesFound' => __('No results found.'),
-		'linkSelected' => __( 'Link selected.' ),
-		'linkInserted' => __( 'Link inserted.' ),
-	) );
+		'linkSelected' => __('Link selected.'),
+		'linkInserted' => __('Link inserted.'),
+	));
 
-	$scripts->add( 'wpdialogs', "/wp-includes/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), false, 1 );
+	$scripts->add('wpdialogs', "/wp-includes/js/wpdialog$suffix.js", array('jquery-ui-dialog'), false, 1);
 
-	$scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array(), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'word-count', 'wordCountL10n', array(
+	$scripts->add('word-count', "/wp-admin/js/word-count$suffix.js", array(), false, 1);
+	did_action('init') && $scripts->localize('word-count', 'wordCountL10n', array(
 		/*
 		 * translators: If your word count is based on single characters (e.g. East Asian characters),
 		 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
 		 * Do not translate into your own language.
 		 */
-		'type' => _x( 'words', 'Word count type. Do not translate!' ),
-		'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array()
-	) );
-
-	$scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 );
-
-	$scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '1.8.1', 1 );
-
-	$scripts->add( 'customize-base',     "/wp-includes/js/customize-base$suffix.js",     array( 'jquery', 'json2', 'underscore' ), false, 1 );
-	$scripts->add( 'customize-loader',   "/wp-includes/js/customize-loader$suffix.js",   array( 'customize-base' ), false, 1 );
-	$scripts->add( 'customize-preview',  "/wp-includes/js/customize-preview$suffix.js",  array( 'wp-a11y', 'customize-base' ), false, 1 );
-	$scripts->add( 'customize-models',   "/wp-includes/js/customize-models.js", array( 'underscore', 'backbone' ), false, 1 );
-	$scripts->add( 'customize-views',    "/wp-includes/js/customize-views.js",  array( 'jquery', 'underscore', 'imgareaselect', 'customize-models', 'media-editor', 'media-views' ), false, 1 );
-	$scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base', 'wp-a11y', 'wp-util' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'customize-controls', '_wpCustomizeControlsL10n', array(
-		'activate'           => __( 'Save & Activate' ),
-		'save'               => __( 'Save & Publish' ),
-		'saveAlert'          => __( 'The changes you made will be lost if you navigate away from this page.' ),
-		'saved'              => __( 'Saved' ),
-		'cancel'             => __( 'Cancel' ),
-		'close'              => __( 'Close' ),
-		'cheatin'            => __( 'Cheatin’ uh?' ),
-		'notAllowed'         => __( 'Sorry, you are not allowed to customize this site.' ),
-		'previewIframeTitle' => __( 'Site Preview' ),
-		'loginIframeTitle'   => __( 'Session expired' ),
-		'collapseSidebar'    => _x( 'Hide Controls', 'label for hide controls button without length constraints' ),
-		'expandSidebar'      => _x( 'Show Controls', 'label for hide controls button without length constraints' ),
-		'untitledBlogName'   => __( '(Untitled)' ),
+		'type' => _x('words', 'Word count type. Do not translate!'),
+		'shortcodes' => ! empty($GLOBALS['shortcode_tags']) ? array_keys($GLOBALS['shortcode_tags']) : array()
+	));
+
+	$scripts->add('media-upload', "/wp-admin/js/media-upload$suffix.js", array('thickbox', 'shortcode'), false, 1);
+
+	$scripts->add('hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '1.8.1', 1);
+
+	$scripts->add('customize-base', "/wp-includes/js/customize-base$suffix.js", array('jquery', 'json2', 'underscore'), false, 1);
+	$scripts->add('customize-loader', "/wp-includes/js/customize-loader$suffix.js", array('customize-base'), false, 1);
+	$scripts->add('customize-preview', "/wp-includes/js/customize-preview$suffix.js", array('wp-a11y', 'customize-base'), false, 1);
+	$scripts->add('customize-models', "/wp-includes/js/customize-models.js", array('underscore', 'backbone'), false, 1);
+	$scripts->add('customize-views', "/wp-includes/js/customize-views.js", array('jquery', 'underscore', 'imgareaselect', 'customize-models', 'media-editor', 'media-views'), false, 1);
+	$scripts->add('customize-controls', "/wp-admin/js/customize-controls$suffix.js", array('customize-base', 'wp-a11y', 'wp-util'), false, 1);
+	did_action('init') && $scripts->localize('customize-controls', '_wpCustomizeControlsL10n', array(
+		'activate'           => __('Save & Activate'),
+		'save'               => __('Save & Publish'),
+		'saveAlert'          => __('The changes you made will be lost if you navigate away from this page.'),
+		'saved'              => __('Saved'),
+		'cancel'             => __('Cancel'),
+		'close'              => __('Close'),
+		'cheatin'            => __('Cheatin’ uh?'),
+		'notAllowed'         => __('Sorry, you are not allowed to customize this site.'),
+		'previewIframeTitle' => __('Site Preview'),
+		'loginIframeTitle'   => __('Session expired'),
+		'collapseSidebar'    => _x('Hide Controls', 'label for hide controls button without length constraints'),
+		'expandSidebar'      => _x('Show Controls', 'label for hide controls button without length constraints'),
+		'untitledBlogName'   => __('(Untitled)'),
 		// Used for overriding the file types allowed in plupload.
-		'allowedFiles'       => __( 'Allowed Files' ),
-	) );
-	$scripts->add( 'customize-selective-refresh', "/wp-includes/js/customize-selective-refresh$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 );
+		'allowedFiles'       => __('Allowed Files'),
+	));
+	$scripts->add('customize-selective-refresh', "/wp-includes/js/customize-selective-refresh$suffix.js", array('jquery', 'wp-util', 'customize-preview'), false, 1);
 
-	$scripts->add( 'customize-widgets', "/wp-admin/js/customize-widgets$suffix.js", array( 'jquery', 'jquery-ui-sortable', 'jquery-ui-droppable', 'wp-backbone', 'customize-controls' ), false, 1 );
-	$scripts->add( 'customize-preview-widgets', "/wp-includes/js/customize-preview-widgets$suffix.js", array( 'jquery', 'wp-util', 'customize-preview', 'customize-selective-refresh' ), false, 1 );
+	$scripts->add('customize-widgets', "/wp-admin/js/customize-widgets$suffix.js", array('jquery', 'jquery-ui-sortable', 'jquery-ui-droppable', 'wp-backbone', 'customize-controls'), false, 1);
+	$scripts->add('customize-preview-widgets', "/wp-includes/js/customize-preview-widgets$suffix.js", array('jquery', 'wp-util', 'customize-preview', 'customize-selective-refresh'), false, 1);
 
-	$scripts->add( 'customize-nav-menus', "/wp-admin/js/customize-nav-menus$suffix.js", array( 'jquery', 'wp-backbone', 'customize-controls', 'accordion', 'nav-menu' ), false, 1 );
-	$scripts->add( 'customize-preview-nav-menus', "/wp-includes/js/customize-preview-nav-menus$suffix.js", array( 'jquery', 'wp-util', 'customize-preview', 'customize-selective-refresh' ), false, 1 );
+	$scripts->add('customize-nav-menus', "/wp-admin/js/customize-nav-menus$suffix.js", array('jquery', 'wp-backbone', 'customize-controls', 'accordion', 'nav-menu'), false, 1);
+	$scripts->add('customize-preview-nav-menus', "/wp-includes/js/customize-preview-nav-menus$suffix.js", array('jquery', 'wp-util', 'customize-preview', 'customize-selective-refresh'), false, 1);
 
-	$scripts->add( 'wp-custom-header', "/wp-includes/js/wp-custom-header$suffix.js", array( 'wp-a11y' ), false, 1 );
+	$scripts->add('wp-custom-header', "/wp-includes/js/wp-custom-header$suffix.js", array('wp-a11y'), false, 1);
 
-	$scripts->add( 'accordion', "/wp-admin/js/accordion$suffix.js", array( 'jquery' ), false, 1 );
+	$scripts->add('accordion', "/wp-admin/js/accordion$suffix.js", array('jquery'), false, 1);
 
-	$scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
-	$scripts->add( 'media-models', "/wp-includes/js/media-models$suffix.js", array( 'wp-backbone' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'media-models', '_wpMediaModelsL10n', array(
+	$scripts->add('shortcode', "/wp-includes/js/shortcode$suffix.js", array('underscore'), false, 1);
+	$scripts->add('media-models', "/wp-includes/js/media-models$suffix.js", array('wp-backbone'), false, 1);
+	did_action('init') && $scripts->localize('media-models', '_wpMediaModelsL10n', array(
 		'settings' => array(
-			'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
-			'post' => array( 'id' => 0 ),
+			'ajaxurl' => admin_url('admin-ajax.php', 'relative'),
+			'post' => array('id' => 0),
 		),
-	) );
+	));
 
-	$scripts->add( 'wp-embed', "/wp-includes/js/wp-embed$suffix.js" );
+	$scripts->add('wp-embed', "/wp-includes/js/wp-embed$suffix.js");
 
 	// To enqueue media-views or media-editor, call wp_enqueue_media().
 	// Both rely on numerous settings, styles, and templates to operate correctly.
-	$scripts->add( 'media-views',  "/wp-includes/js/media-views$suffix.js",  array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement' ), false, 1 );
-	$scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
-	$scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor' ), false, 1 );
-	$scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'jquery', 'media-views', 'media-audiovideo' ), false, 1 );
-
-	$scripts->add( 'wp-api', "/wp-includes/js/wp-api$suffix.js", array( 'jquery', 'backbone', 'underscore' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-api', 'wpApiSettings', array(
-		'root'          => esc_url_raw( get_rest_url() ),
-		'nonce'         => ( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'wp_rest' ),
+	$scripts->add('media-views', "/wp-includes/js/media-views$suffix.js", array('utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement'), false, 1);
+	$scripts->add('media-editor', "/wp-includes/js/media-editor$suffix.js", array('shortcode', 'media-views'), false, 1);
+	$scripts->add('media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array('media-editor'), false, 1);
+	$scripts->add('mce-view', "/wp-includes/js/mce-view$suffix.js", array('shortcode', 'jquery', 'media-views', 'media-audiovideo'), false, 1);
+
+	$scripts->add('wp-api', "/wp-includes/js/wp-api$suffix.js", array('jquery', 'backbone', 'underscore'), false, 1);
+	did_action('init') && $scripts->localize('wp-api', 'wpApiSettings', array(
+		'root'          => esc_url_raw(get_rest_url()),
+		'nonce'         => (wp_installing() && ! is_multisite()) ? '' : wp_create_nonce('wp_rest'),
 		'versionString' => 'wp/v2/',
-	) );
+	));
 
-	if ( is_admin() ) {
-		$scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'admin-tags', 'tagsl10n', array(
+	if (is_admin()) {
+		$scripts->add('admin-tags', "/wp-admin/js/tags$suffix.js", array('jquery', 'wp-ajax-response'), false, 1);
+		did_action('init') && $scripts->localize('admin-tags', 'tagsl10n', array(
 			'noPerm' => __('Sorry, you are not allowed to do that.'),
 			'broken' => __('An unidentified error has occurred.')
 		));
 
-		$scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'quicktags', 'jquery-query'), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
+		$scripts->add('admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'quicktags', 'jquery-query'), false, 1);
+		did_action('init') && $scripts->localize('admin-comments', 'adminCommentsL10n', array(
 			'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
 			'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),
-			'replyApprove' => __( 'Approve and Reply' ),
-			'reply' => __( 'Reply' ),
-			'warnQuickEdit' => __( "Are you sure you want to edit this comment?\nThe changes you made will be lost." ),
-			'warnCommentChanges' => __( "Are you sure you want to do this?\nThe comment changes you made will be lost." ),
-			'docTitleComments' => __( 'Comments' ),
+			'replyApprove' => __('Approve and Reply'),
+			'reply' => __('Reply'),
+			'warnQuickEdit' => __("Are you sure you want to edit this comment?\nThe changes you made will be lost."),
+			'warnCommentChanges' => __("Are you sure you want to do this?\nThe comment changes you made will be lost."),
+			'docTitleComments' => __('Comments'),
 			/* translators: %s: comments count */
-			'docTitleCommentsCount' => __( 'Comments (%s)' ),
-		) );
+			'docTitleCommentsCount' => __('Comments (%s)'),
+		));
 
-		$scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), false, 1 );
+		$scripts->add('xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), false, 1);
 
-		$scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'postbox', 'postBoxL10n', array(
-			'postBoxEmptyString' => __( 'Drag boxes here' ),
-		) );
+		$scripts->add('postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), false, 1);
+		did_action('init') && $scripts->localize('postbox', 'postBoxL10n', array(
+			'postBoxEmptyString' => __('Drag boxes here'),
+		));
 
-		$scripts->add( 'tags-box', "/wp-admin/js/tags-box$suffix.js", array( 'jquery', 'tags-suggest' ), false, 1 );
+		$scripts->add('tags-box', "/wp-admin/js/tags-box$suffix.js", array('jquery', 'tags-suggest'), false, 1);
 
-		$scripts->add( 'tags-suggest', "/wp-admin/js/tags-suggest$suffix.js", array( 'jquery-ui-autocomplete', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'tags-suggest', 'tagsSuggestL10n', array(
-			'tagDelimiter' => _x( ',', 'tag delimiter' ),
-			'removeTerm'   => __( 'Remove term:' ),
-			'termSelected' => __( 'Term selected.' ),
-			'termAdded'    => __( 'Term added.' ),
-			'termRemoved'  => __( 'Term removed.' ),
-		) );
+		$scripts->add('tags-suggest', "/wp-admin/js/tags-suggest$suffix.js", array('jquery-ui-autocomplete', 'wp-a11y'), false, 1);
+		did_action('init') && $scripts->localize('tags-suggest', 'tagsSuggestL10n', array(
+			'tagDelimiter' => _x(',', 'tag delimiter'),
+			'removeTerm'   => __('Remove term:'),
+			'termSelected' => __('Term selected.'),
+			'termAdded'    => __('Term added.'),
+			'termRemoved'  => __('Term removed.'),
+		));
 
-		$scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box', 'underscore', 'word-count', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'post', 'postL10n', array(
+		$scripts->add('post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox', 'tags-box', 'underscore', 'word-count', 'wp-a11y'), false, 1);
+		did_action('init') && $scripts->localize('post', 'postL10n', array(
 			'ok' => __('OK'),
 			'cancel' => __('Cancel'),
 			'publishOn' => __('Publish on:'),
@@ -573,202 +573,202 @@ 
 			'published' => __('Published'),
 			'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
 			'savingText' => __('Saving Draft…'),
-			'permalinkSaved' => __( 'Permalink saved' ),
-		) );
-
-		$scripts->add( 'press-this', "/wp-admin/js/press-this$suffix.js", array( 'jquery', 'tags-box' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'press-this', 'pressThisL10n', array(
-			'newPost' => __( 'Title' ),
-			'serverError' => __( 'Connection lost or the server is busy. Please try again later.' ),
-			'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
+			'permalinkSaved' => __('Permalink saved'),
+		));
+
+		$scripts->add('press-this', "/wp-admin/js/press-this$suffix.js", array('jquery', 'tags-box'), false, 1);
+		did_action('init') && $scripts->localize('press-this', 'pressThisL10n', array(
+			'newPost' => __('Title'),
+			'serverError' => __('Connection lost or the server is busy. Please try again later.'),
+			'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
 			/* translators: %d: nth embed found in a post */
-			'suggestedEmbedAlt' => __( 'Suggested embed #%d' ),
+			'suggestedEmbedAlt' => __('Suggested embed #%d'),
 			/* translators: %d: nth image found in a post */
-			'suggestedImgAlt' => __( 'Suggested image #%d' ),
-		) );
+			'suggestedImgAlt' => __('Suggested image #%d'),
+		));
 
-		$scripts->add( 'editor-expand', "/wp-admin/js/editor-expand$suffix.js", array( 'jquery', 'underscore' ), false, 1 );
+		$scripts->add('editor-expand', "/wp-admin/js/editor-expand$suffix.js", array('jquery', 'underscore'), false, 1);
 
-		$scripts->add( 'link', "/wp-admin/js/link$suffix.js", array( 'wp-lists', 'postbox' ), false, 1 );
+		$scripts->add('link', "/wp-admin/js/link$suffix.js", array('wp-lists', 'postbox'), false, 1);
 
-		$scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array( 'jquery', 'postbox' ) );
-		$scripts->add_data( 'comment', 'group', 1 );
-		did_action( 'init' ) && $scripts->localize( 'comment', 'commentL10n', array(
-			'submittedOn' => __( 'Submitted on:' ),
+		$scripts->add('comment', "/wp-admin/js/comment$suffix.js", array('jquery', 'postbox'));
+		$scripts->add_data('comment', 'group', 1);
+		did_action('init') && $scripts->localize('comment', 'commentL10n', array(
+			'submittedOn' => __('Submitted on:'),
 			/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
-			'dateFormat' => __( '%1$s %2$s, %3$s @ %4$s:%5$s' )
-		) );
-
-		$scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ) );
-
-		$scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), false, 1 );
-		$scripts->add( 'media-widgets', "/wp-admin/js/widgets/media-widgets$suffix.js", array( 'jquery', 'media-models', 'media-views' ) );
-		$scripts->add_inline_script( 'media-widgets', 'wp.mediaWidgets.init();', 'after' );
-
-		$scripts->add( 'media-audio-widget', "/wp-admin/js/widgets/media-audio-widget$suffix.js", array( 'media-widgets', 'media-audiovideo' ) );
-		$scripts->add( 'media-image-widget', "/wp-admin/js/widgets/media-image-widget$suffix.js", array( 'media-widgets' ) );
-		$scripts->add( 'media-video-widget', "/wp-admin/js/widgets/media-video-widget$suffix.js", array( 'media-widgets', 'media-audiovideo' ) );
-		$scripts->add( 'text-widgets', "/wp-admin/js/widgets/text-widgets$suffix.js", array( 'jquery', 'backbone', 'editor', 'wp-util' ) );
-		$scripts->add_inline_script( 'text-widgets', 'wp.textWidgets.init();', 'after' );
-
-		$scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone', 'wp-a11y' ), false, 1 );
-
-		$scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'tags-suggest', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
-			'error'      => __( 'Error while saving the changes.' ),
-			'ntdeltitle' => __( 'Remove From Bulk Edit' ),
-			'notitle'    => __( '(no title)' ),
-			'comma'      => trim( _x( ',', 'tag delimiter' ) ),
-			'saved'      => __( 'Changes saved.' ),
-		) );
-
-		$scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
-			'error' => __( 'Error while saving the changes.' ),
-			'saved' => __( 'Changes saved.' ),
-		) );
-
-		$scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'jquery-ui-core', 'thickbox' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'plugin-install', 'plugininstallL10n', array(
-			'plugin_information' => __( 'Plugin:' ),
-			'plugin_modal_label' => __( 'Plugin details' ),
+			'dateFormat' => __('%1$s %2$s, %3$s @ %4$s:%5$s')
+		));
+
+		$scripts->add('admin-gallery', "/wp-admin/js/gallery$suffix.js", array('jquery-ui-sortable'));
+
+		$scripts->add('admin-widgets', "/wp-admin/js/widgets$suffix.js", array('jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable'), false, 1);
+		$scripts->add('media-widgets', "/wp-admin/js/widgets/media-widgets$suffix.js", array('jquery', 'media-models', 'media-views'));
+		$scripts->add_inline_script('media-widgets', 'wp.mediaWidgets.init();', 'after');
+
+		$scripts->add('media-audio-widget', "/wp-admin/js/widgets/media-audio-widget$suffix.js", array('media-widgets', 'media-audiovideo'));
+		$scripts->add('media-image-widget', "/wp-admin/js/widgets/media-image-widget$suffix.js", array('media-widgets'));
+		$scripts->add('media-video-widget', "/wp-admin/js/widgets/media-video-widget$suffix.js", array('media-widgets', 'media-audiovideo'));
+		$scripts->add('text-widgets', "/wp-admin/js/widgets/text-widgets$suffix.js", array('jquery', 'backbone', 'editor', 'wp-util'));
+		$scripts->add_inline_script('text-widgets', 'wp.textWidgets.init();', 'after');
+
+		$scripts->add('theme', "/wp-admin/js/theme$suffix.js", array('wp-backbone', 'wp-a11y'), false, 1);
+
+		$scripts->add('inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array('jquery', 'tags-suggest', 'wp-a11y'), false, 1);
+		did_action('init') && $scripts->localize('inline-edit-post', 'inlineEditL10n', array(
+			'error'      => __('Error while saving the changes.'),
+			'ntdeltitle' => __('Remove From Bulk Edit'),
+			'notitle'    => __('(no title)'),
+			'comma'      => trim(_x(',', 'tag delimiter')),
+			'saved'      => __('Changes saved.'),
+		));
+
+		$scripts->add('inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array('jquery', 'wp-a11y'), false, 1);
+		did_action('init') && $scripts->localize('inline-edit-tax', 'inlineEditL10n', array(
+			'error' => __('Error while saving the changes.'),
+			'saved' => __('Changes saved.'),
+		));
+
+		$scripts->add('plugin-install', "/wp-admin/js/plugin-install$suffix.js", array('jquery', 'jquery-ui-core', 'thickbox'), false, 1);
+		did_action('init') && $scripts->localize('plugin-install', 'plugininstallL10n', array(
+			'plugin_information' => __('Plugin:'),
+			'plugin_modal_label' => __('Plugin details'),
 			'ays' => __('Are you sure you want to install this plugin?')
-		) );
+		));
 
-		$scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'updates', '_wpUpdatesSettings', array(
-			'ajax_nonce' => wp_create_nonce( 'updates' ),
+		$scripts->add('updates', "/wp-admin/js/updates$suffix.js", array('jquery', 'wp-util', 'wp-a11y'), false, 1);
+		did_action('init') && $scripts->localize('updates', '_wpUpdatesSettings', array(
+			'ajax_nonce' => wp_create_nonce('updates'),
 			'l10n'       => array(
 				/* translators: %s: Search string */
-				'searchResults'              => __( 'Search results for “%s”' ),
-				'searchResultsLabel'         => __( 'Search Results' ),
-				'noPlugins'                  => __( 'You do not appear to have any plugins available at this time.' ),
-				'noItemsSelected'            => __( 'Please select at least one item to perform this action on.' ),
-				'updating'                   => __( 'Updating...' ), // No ellipsis.
-				'pluginUpdated'              => _x( 'Updated!', 'plugin' ),
-				'themeUpdated'               => _x( 'Updated!', 'theme' ),
-				'update'                     => __( 'Update' ),
-				'updateNow'                  => __( 'Update Now' ),
+				'searchResults'              => __('Search results for “%s”'),
+				'searchResultsLabel'         => __('Search Results'),
+				'noPlugins'                  => __('You do not appear to have any plugins available at this time.'),
+				'noItemsSelected'            => __('Please select at least one item to perform this action on.'),
+				'updating'                   => __('Updating...'), // No ellipsis.
+				'pluginUpdated'              => _x('Updated!', 'plugin'),
+				'themeUpdated'               => _x('Updated!', 'theme'),
+				'update'                     => __('Update'),
+				'updateNow'                  => __('Update Now'),
 				/* translators: %s: Plugin name and version */
-				'pluginUpdateNowLabel'       => _x( 'Update %s now', 'plugin' ),
-				'updateFailedShort'          => __( 'Update Failed!' ),
+				'pluginUpdateNowLabel'       => _x('Update %s now', 'plugin'),
+				'updateFailedShort'          => __('Update Failed!'),
 				/* translators: %s: Error string for a failed update */
-				'updateFailed'               => __( 'Update Failed: %s' ),
+				'updateFailed'               => __('Update Failed: %s'),
 				/* translators: %s: Plugin name and version */
-				'pluginUpdatingLabel'        => _x( 'Updating %s...', 'plugin' ), // No ellipsis.
+				'pluginUpdatingLabel'        => _x('Updating %s...', 'plugin'), // No ellipsis.
 				/* translators: %s: Plugin name and version */
-				'pluginUpdatedLabel'         => _x( '%s updated!', 'plugin' ),
+				'pluginUpdatedLabel'         => _x('%s updated!', 'plugin'),
 				/* translators: %s: Plugin name and version */
-				'pluginUpdateFailedLabel'    => _x( '%s update failed', 'plugin' ),
+				'pluginUpdateFailedLabel'    => _x('%s update failed', 'plugin'),
 				/* translators: Accessibility text */
-				'updatingMsg'                => __( 'Updating... please wait.' ), // No ellipsis.
+				'updatingMsg'                => __('Updating... please wait.'), // No ellipsis.
 				/* translators: Accessibility text */
-				'updatedMsg'                 => __( 'Update completed successfully.' ),
+				'updatedMsg'                 => __('Update completed successfully.'),
 				/* translators: Accessibility text */
-				'updateCancel'               => __( 'Update canceled.' ),
-				'beforeunload'               => __( 'Updates may not complete if you navigate away from this page.' ),
-				'installNow'                 => __( 'Install Now' ),
+				'updateCancel'               => __('Update canceled.'),
+				'beforeunload'               => __('Updates may not complete if you navigate away from this page.'),
+				'installNow'                 => __('Install Now'),
 				/* translators: %s: Plugin name */
-				'pluginInstallNowLabel'      => _x( 'Install %s now', 'plugin' ),
-				'installing'                 => __( 'Installing...' ),
-				'pluginInstalled'            => _x( 'Installed!', 'plugin' ),
-				'themeInstalled'             => _x( 'Installed!', 'theme' ),
-				'installFailedShort'         => __( 'Install Failed!' ),
+				'pluginInstallNowLabel'      => _x('Install %s now', 'plugin'),
+				'installing'                 => __('Installing...'),
+				'pluginInstalled'            => _x('Installed!', 'plugin'),
+				'themeInstalled'             => _x('Installed!', 'theme'),
+				'installFailedShort'         => __('Install Failed!'),
 				/* translators: %s: Error string for a failed installation */
-				'installFailed'              => __( 'Installation failed: %s' ),
+				'installFailed'              => __('Installation failed: %s'),
 				/* translators: %s: Plugin name and version */
-				'pluginInstallingLabel'      => _x( 'Installing %s...', 'plugin' ), // no ellipsis
+				'pluginInstallingLabel'      => _x('Installing %s...', 'plugin'), // no ellipsis
 				/* translators: %s: Theme name and version */
-				'themeInstallingLabel'       => _x( 'Installing %s...', 'theme' ), // no ellipsis
+				'themeInstallingLabel'       => _x('Installing %s...', 'theme'), // no ellipsis
 				/* translators: %s: Plugin name and version */
-				'pluginInstalledLabel'       => _x( '%s installed!', 'plugin' ),
+				'pluginInstalledLabel'       => _x('%s installed!', 'plugin'),
 				/* translators: %s: Theme name and version */
-				'themeInstalledLabel'        => _x( '%s installed!', 'theme' ),
+				'themeInstalledLabel'        => _x('%s installed!', 'theme'),
 				/* translators: %s: Plugin name and version */
-				'pluginInstallFailedLabel'   => _x( '%s installation failed', 'plugin' ),
+				'pluginInstallFailedLabel'   => _x('%s installation failed', 'plugin'),
 				/* translators: %s: Theme name and version */
-				'themeInstallFailedLabel'    => _x( '%s installation failed', 'theme' ),
-				'installingMsg'              => __( 'Installing... please wait.' ),
-				'installedMsg'               => __( 'Installation completed successfully.' ),
+				'themeInstallFailedLabel'    => _x('%s installation failed', 'theme'),
+				'installingMsg'              => __('Installing... please wait.'),
+				'installedMsg'               => __('Installation completed successfully.'),
 				/* translators: %s: Activation URL */
-				'importerInstalledMsg'       => __( 'Importer installed successfully. <a href="%s">Run importer</a>' ),
+				'importerInstalledMsg'       => __('Importer installed successfully. <a href="%s">Run importer</a>'),
 				/* translators: %s: Theme name */
-				'aysDelete'                  => __( 'Are you sure you want to delete %s?' ),
+				'aysDelete'                  => __('Are you sure you want to delete %s?'),
 				/* translators: %s: Plugin name */
-				'aysDeleteUninstall'         => __( 'Are you sure you want to delete %s and its data?' ),
-				'aysBulkDelete'              => __( 'Are you sure you want to delete the selected plugins and their data?' ),
-				'aysBulkDeleteThemes'        => __( 'Caution: These themes may be active on other sites in the network. Are you sure you want to proceed?' ),
-				'deleting'                   => __( 'Deleting...' ),
+				'aysDeleteUninstall'         => __('Are you sure you want to delete %s and its data?'),
+				'aysBulkDelete'              => __('Are you sure you want to delete the selected plugins and their data?'),
+				'aysBulkDeleteThemes'        => __('Caution: These themes may be active on other sites in the network. Are you sure you want to proceed?'),
+				'deleting'                   => __('Deleting...'),
 				/* translators: %s: Error string for a failed deletion */
-				'deleteFailed'               => __( 'Deletion failed: %s' ),
-				'pluginDeleted'              => _x( 'Deleted!', 'plugin' ),
-				'themeDeleted'               => _x( 'Deleted!', 'theme' ),
-				'livePreview'                => __( 'Live Preview' ),
-				'activatePlugin'             => is_network_admin() ? __( 'Network Activate' ) : __( 'Activate' ),
-				'activateTheme'              => is_network_admin() ? __( 'Network Enable' ) : __( 'Activate' ),
+				'deleteFailed'               => __('Deletion failed: %s'),
+				'pluginDeleted'              => _x('Deleted!', 'plugin'),
+				'themeDeleted'               => _x('Deleted!', 'theme'),
+				'livePreview'                => __('Live Preview'),
+				'activatePlugin'             => is_network_admin() ? __('Network Activate') : __('Activate'),
+				'activateTheme'              => is_network_admin() ? __('Network Enable') : __('Activate'),
 				/* translators: %s: Plugin name */
-				'activatePluginLabel'        => is_network_admin() ? _x( 'Network Activate %s', 'plugin' ) : _x( 'Activate %s', 'plugin' ),
+				'activatePluginLabel'        => is_network_admin() ? _x('Network Activate %s', 'plugin') : _x('Activate %s', 'plugin'),
 				/* translators: %s: Theme name */
-				'activateThemeLabel'         => is_network_admin() ? _x( 'Network Activate %s', 'theme' ) : _x( 'Activate %s', 'theme' ),
-				'activateImporter'           => __( 'Run Importer' ),
+				'activateThemeLabel'         => is_network_admin() ? _x('Network Activate %s', 'theme') : _x('Activate %s', 'theme'),
+				'activateImporter'           => __('Run Importer'),
 				/* translators: %s: Importer name */
-				'activateImporterLabel'      => __( 'Run %s' ),
-				'unknownError'               => __( 'An unknown error occurred' ),
-				'connectionError'            => __( 'Connection lost or the server is busy. Please try again later.' ),
-				'nonceError'                 => __( 'An error has occurred. Please reload the page and try again.' ),
-				'pluginsFound'               => __( 'Number of plugins found: %d' ),
-				'noPluginsFound'             => __( 'No plugins found. Try a different search.' ),
+				'activateImporterLabel'      => __('Run %s'),
+				'unknownError'               => __('An unknown error occurred'),
+				'connectionError'            => __('Connection lost or the server is busy. Please try again later.'),
+				'nonceError'                 => __('An error has occurred. Please reload the page and try again.'),
+				'pluginsFound'               => __('Number of plugins found: %d'),
+				'noPluginsFound'             => __('No plugins found. Try a different search.'),
 			),
-		) );
+		));
 
-		$scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
+		$scripts->add('farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2');
 
-		$scripts->add( 'iris', '/wp-admin/js/iris.min.js', array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), '1.0.7', 1 );
-		$scripts->add( 'wp-color-picker', "/wp-admin/js/color-picker$suffix.js", array( 'iris' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'wp-color-picker', 'wpColorPickerL10n', array(
-			'clear' => __( 'Clear' ),
-			'defaultString' => __( 'Default' ),
-			'pick' => __( 'Select Color' ),
-			'current' => __( 'Current Color' ),
-		) );
+		$scripts->add('iris', '/wp-admin/js/iris.min.js', array('jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch'), '1.0.7', 1);
+		$scripts->add('wp-color-picker', "/wp-admin/js/color-picker$suffix.js", array('iris'), false, 1);
+		did_action('init') && $scripts->localize('wp-color-picker', 'wpColorPickerL10n', array(
+			'clear' => __('Clear'),
+			'defaultString' => __('Default'),
+			'pick' => __('Select Color'),
+			'current' => __('Current Color'),
+		));
 
-		$scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox', 'wp-util', 'wp-a11y' ), false, 1 );
+		$scripts->add('dashboard', "/wp-admin/js/dashboard$suffix.js", array('jquery', 'admin-comments', 'postbox', 'wp-util', 'wp-a11y'), false, 1);
 
-		$scripts->add( 'list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js" );
+		$scripts->add('list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js");
 
-		$scripts->add( 'media-grid', "/wp-includes/js/media-grid$suffix.js", array( 'media-editor' ), false, 1 );
-		$scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'media', 'attachMediaBoxL10n', array(
-			'error' => __( 'An error has occurred. Please reload the page and try again.' ),
+		$scripts->add('media-grid', "/wp-includes/js/media-grid$suffix.js", array('media-editor'), false, 1);
+		$scripts->add('media', "/wp-admin/js/media$suffix.js", array('jquery'), false, 1);
+		did_action('init') && $scripts->localize('media', 'attachMediaBoxL10n', array(
+			'error' => __('An error has occurred. Please reload the page and try again.'),
 		));
 
-		$scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'image-edit', 'imageEditL10n', array(
-			'error' => __( 'Could not load the preview image. Please reload the page and try again.' )
+		$scripts->add('image-edit', "/wp-admin/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), false, 1);
+		did_action('init') && $scripts->localize('image-edit', 'imageEditL10n', array(
+			'error' => __('Could not load the preview image. Please reload the page and try again.')
 		));
 
-		$scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'set-post-thumbnail', 'setPostThumbnailL10n', array(
-			'setThumbnail' => __( 'Use as featured image' ),
-			'saving' => __( 'Saving...' ), // no ellipsis
-			'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),
-			'done' => __( 'Done' )
-		) );
+		$scripts->add('set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array('jquery'), false, 1);
+		did_action('init') && $scripts->localize('set-post-thumbnail', 'setPostThumbnailL10n', array(
+			'setThumbnail' => __('Use as featured image'),
+			'saving' => __('Saving...'), // no ellipsis
+			'error' => __('Could not set that as the thumbnail image. Try a different attachment.'),
+			'done' => __('Done')
+		));
 
 		// Navigation Menus
-		$scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2' ) );
-		did_action( 'init' ) && $scripts->localize( 'nav-menu', 'navMenuL10n', array(
-			'noResultsFound' => __( 'No results found.' ),
-			'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
-			'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
-			'untitled' => _x( '(no label)', 'missing menu item navigation label' )
-		) );
-
-		$scripts->add( 'custom-header', "/wp-admin/js/custom-header.js", array( 'jquery-masonry' ), false, 1 );
-		$scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array( 'wp-color-picker', 'media-views' ), false, 1 );
-		$scripts->add( 'media-gallery', "/wp-admin/js/media-gallery$suffix.js", array('jquery'), false, 1 );
-
-		$scripts->add( 'svg-painter', '/wp-admin/js/svg-painter.js', array( 'jquery' ), false, 1 );
+		$scripts->add('nav-menu', "/wp-admin/js/nav-menu$suffix.js", array('jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2'));
+		did_action('init') && $scripts->localize('nav-menu', 'navMenuL10n', array(
+			'noResultsFound' => __('No results found.'),
+			'warnDeleteMenu' => __("You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete."),
+			'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
+			'untitled' => _x('(no label)', 'missing menu item navigation label')
+		));
+
+		$scripts->add('custom-header', "/wp-admin/js/custom-header.js", array('jquery-masonry'), false, 1);
+		$scripts->add('custom-background', "/wp-admin/js/custom-background$suffix.js", array('wp-color-picker', 'media-views'), false, 1);
+		$scripts->add('media-gallery', "/wp-admin/js/media-gallery$suffix.js", array('jquery'), false, 1);
+
+		$scripts->add('svg-painter', '/wp-admin/js/svg-painter.js', array('jquery'), false, 1);
 	}
 }
 
@@ -787,19 +787,19 @@ 
  *
  * @param WP_Styles $styles
  */
-function wp_default_styles( &$styles ) {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+function wp_default_styles(&$styles) {
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 
-	if ( ! defined( 'SCRIPT_DEBUG' ) )
-		define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
+	if ( ! defined('SCRIPT_DEBUG'))
+		define('SCRIPT_DEBUG', false !== strpos($wp_version, '-src'));
 
-	if ( ! $guessurl = site_url() )
+	if ( ! $guessurl = site_url())
 		$guessurl = wp_guess_url();
 
 	$styles->base_url = $guessurl;
-	$styles->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
-	$styles->default_version = get_bloginfo( 'version' );
-	$styles->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr';
+	$styles->content_url = defined('WP_CONTENT_URL') ? WP_CONTENT_URL : '';
+	$styles->default_version = get_bloginfo('version');
+	$styles->text_direction = function_exists('is_rtl') && is_rtl() ? 'rtl' : 'ltr';
 	$styles->default_dirs = array('/wp-admin/', '/wp-includes/css/');
 
 	// Open Sans is no longer used by core, but may be relied upon by themes and plugins.
@@ -808,19 +808,19 @@ 
 	/* translators: If there are characters in your language that are not supported
 	 * by Open Sans, translate this to 'off'. Do not translate into your own language.
 	 */
-	if ( 'off' !== _x( 'on', 'Open Sans font: on or off' ) ) {
+	if ('off' !== _x('on', 'Open Sans font: on or off')) {
 		$subsets = 'latin,latin-ext';
 
 		/* translators: To add an additional Open Sans character subset specific to your language,
 		 * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
 		 */
-		$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)' );
+		$subset = _x('no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)');
 
-		if ( 'cyrillic' == $subset ) {
+		if ('cyrillic' == $subset) {
 			$subsets .= ',cyrillic,cyrillic-ext';
-		} elseif ( 'greek' == $subset ) {
+		} elseif ('greek' == $subset) {
 			$subsets .= ',greek,greek-ext';
-		} elseif ( 'vietnamese' == $subset ) {
+		} elseif ('vietnamese' == $subset) {
 			$subsets .= ',vietnamese';
 		}
 
@@ -829,66 +829,66 @@ 
 	}
 
 	// Register a stylesheet for the selected admin color scheme.
-	$styles->add( 'colors', true, array( 'wp-admin', 'buttons' ) );
+	$styles->add('colors', true, array('wp-admin', 'buttons'));
 
 	$suffix = SCRIPT_DEBUG ? '' : '.min';
 
 	// Admin CSS
-	$styles->add( 'common',              "/wp-admin/css/common$suffix.css" );
-	$styles->add( 'forms',               "/wp-admin/css/forms$suffix.css" );
-	$styles->add( 'admin-menu',          "/wp-admin/css/admin-menu$suffix.css" );
-	$styles->add( 'dashboard',           "/wp-admin/css/dashboard$suffix.css" );
-	$styles->add( 'list-tables',         "/wp-admin/css/list-tables$suffix.css" );
-	$styles->add( 'edit',                "/wp-admin/css/edit$suffix.css" );
-	$styles->add( 'revisions',           "/wp-admin/css/revisions$suffix.css" );
-	$styles->add( 'media',               "/wp-admin/css/media$suffix.css" );
-	$styles->add( 'themes',              "/wp-admin/css/themes$suffix.css" );
-	$styles->add( 'about',               "/wp-admin/css/about$suffix.css" );
-	$styles->add( 'nav-menus',           "/wp-admin/css/nav-menus$suffix.css" );
-	$styles->add( 'widgets',             "/wp-admin/css/widgets$suffix.css" );
-	$styles->add( 'site-icon',           "/wp-admin/css/site-icon$suffix.css" );
-	$styles->add( 'l10n',                "/wp-admin/css/l10n$suffix.css" );
-
-	$styles->add( 'wp-admin', false, array( 'dashicons', 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n' ) );
-
-	$styles->add( 'login',               "/wp-admin/css/login$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) );
-	$styles->add( 'install',             "/wp-admin/css/install$suffix.css", array( 'buttons' ) );
-	$styles->add( 'wp-color-picker',     "/wp-admin/css/color-picker$suffix.css" );
-	$styles->add( 'customize-controls',  "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) );
-	$styles->add( 'customize-widgets',   "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) );
-	$styles->add( 'customize-nav-menus', "/wp-admin/css/customize-nav-menus$suffix.css", array( 'wp-admin', 'colors' ) );
-	$styles->add( 'press-this',          "/wp-admin/css/press-this$suffix.css", array( 'buttons' ) );
-
-	$styles->add( 'ie', "/wp-admin/css/ie$suffix.css" );
-	$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
+	$styles->add('common', "/wp-admin/css/common$suffix.css");
+	$styles->add('forms', "/wp-admin/css/forms$suffix.css");
+	$styles->add('admin-menu', "/wp-admin/css/admin-menu$suffix.css");
+	$styles->add('dashboard', "/wp-admin/css/dashboard$suffix.css");
+	$styles->add('list-tables', "/wp-admin/css/list-tables$suffix.css");
+	$styles->add('edit', "/wp-admin/css/edit$suffix.css");
+	$styles->add('revisions', "/wp-admin/css/revisions$suffix.css");
+	$styles->add('media', "/wp-admin/css/media$suffix.css");
+	$styles->add('themes', "/wp-admin/css/themes$suffix.css");
+	$styles->add('about', "/wp-admin/css/about$suffix.css");
+	$styles->add('nav-menus', "/wp-admin/css/nav-menus$suffix.css");
+	$styles->add('widgets', "/wp-admin/css/widgets$suffix.css");
+	$styles->add('site-icon', "/wp-admin/css/site-icon$suffix.css");
+	$styles->add('l10n', "/wp-admin/css/l10n$suffix.css");
+
+	$styles->add('wp-admin', false, array('dashicons', 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n'));
+
+	$styles->add('login', "/wp-admin/css/login$suffix.css", array('dashicons', 'buttons', 'forms', 'l10n'));
+	$styles->add('install', "/wp-admin/css/install$suffix.css", array('buttons'));
+	$styles->add('wp-color-picker', "/wp-admin/css/color-picker$suffix.css");
+	$styles->add('customize-controls', "/wp-admin/css/customize-controls$suffix.css", array('wp-admin', 'colors', 'ie', 'imgareaselect'));
+	$styles->add('customize-widgets', "/wp-admin/css/customize-widgets$suffix.css", array('wp-admin', 'colors'));
+	$styles->add('customize-nav-menus', "/wp-admin/css/customize-nav-menus$suffix.css", array('wp-admin', 'colors'));
+	$styles->add('press-this', "/wp-admin/css/press-this$suffix.css", array('buttons'));
+
+	$styles->add('ie', "/wp-admin/css/ie$suffix.css");
+	$styles->add_data('ie', 'conditional', 'lte IE 7');
 
 	// Common dependencies
-	$styles->add( 'buttons',   "/wp-includes/css/buttons$suffix.css" );
-	$styles->add( 'dashicons', "/wp-includes/css/dashicons$suffix.css" );
+	$styles->add('buttons', "/wp-includes/css/buttons$suffix.css");
+	$styles->add('dashicons', "/wp-includes/css/dashicons$suffix.css");
 
 	// Includes CSS
-	$styles->add( 'admin-bar',            "/wp-includes/css/admin-bar$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'wp-auth-check',        "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'editor-buttons',       "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'media-views',          "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons', 'wp-mediaelement' ) );
-	$styles->add( 'wp-pointer',           "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'customize-preview',    "/wp-includes/css/customize-preview$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'wp-embed-template-ie', "/wp-includes/css/wp-embed-template-ie$suffix.css" );
-	$styles->add_data( 'wp-embed-template-ie', 'conditional', 'lte IE 8' );
+	$styles->add('admin-bar', "/wp-includes/css/admin-bar$suffix.css", array('dashicons'));
+	$styles->add('wp-auth-check', "/wp-includes/css/wp-auth-check$suffix.css", array('dashicons'));
+	$styles->add('editor-buttons', "/wp-includes/css/editor$suffix.css", array('dashicons'));
+	$styles->add('media-views', "/wp-includes/css/media-views$suffix.css", array('buttons', 'dashicons', 'wp-mediaelement'));
+	$styles->add('wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array('dashicons'));
+	$styles->add('customize-preview', "/wp-includes/css/customize-preview$suffix.css", array('dashicons'));
+	$styles->add('wp-embed-template-ie', "/wp-includes/css/wp-embed-template-ie$suffix.css");
+	$styles->add_data('wp-embed-template-ie', 'conditional', 'lte IE 8');
 
 	// External libraries and friends
-	$styles->add( 'imgareaselect',       '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
-	$styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'mediaelement',        "/wp-includes/js/mediaelement/mediaelementplayer.min.css", array(), '2.22.0' );
-	$styles->add( 'wp-mediaelement',     "/wp-includes/js/mediaelement/wp-mediaelement$suffix.css", array( 'mediaelement' ) );
-	$styles->add( 'thickbox',            '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ) );
+	$styles->add('imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8');
+	$styles->add('wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array('dashicons'));
+	$styles->add('mediaelement', "/wp-includes/js/mediaelement/mediaelementplayer.min.css", array(), '2.22.0');
+	$styles->add('wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.css", array('mediaelement'));
+	$styles->add('thickbox', '/wp-includes/js/thickbox/thickbox.css', array('dashicons'));
 
 	// Deprecated CSS
-	$styles->add( 'deprecated-media', "/wp-admin/css/deprecated-media$suffix.css" );
-	$styles->add( 'farbtastic',       "/wp-admin/css/farbtastic$suffix.css", array(), '1.3u1' );
-	$styles->add( 'jcrop',            "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12' );
-	$styles->add( 'colors-fresh', false, array( 'wp-admin', 'buttons' ) ); // Old handle.
-	$styles->add( 'open-sans', $open_sans_font_url ); // No longer used in core as of 4.6
+	$styles->add('deprecated-media', "/wp-admin/css/deprecated-media$suffix.css");
+	$styles->add('farbtastic', "/wp-admin/css/farbtastic$suffix.css", array(), '1.3u1');
+	$styles->add('jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12');
+	$styles->add('colors-fresh', false, array('wp-admin', 'buttons')); // Old handle.
+	$styles->add('open-sans', $open_sans_font_url); // No longer used in core as of 4.6
 
 	// RTL CSS
 	$rtl_styles = array(
@@ -903,10 +903,10 @@ 
 		'deprecated-media', 'farbtastic',
 	);
 
-	foreach ( $rtl_styles as $rtl_style ) {
-		$styles->add_data( $rtl_style, 'rtl', 'replace' );
-		if ( $suffix ) {
-			$styles->add_data( $rtl_style, 'suffix', $suffix );
+	foreach ($rtl_styles as $rtl_style) {
+		$styles->add_data($rtl_style, 'rtl', 'replace');
+		if ($suffix) {
+			$styles->add_data($rtl_style, 'suffix', $suffix);
 		}
 	}
 }
@@ -919,19 +919,19 @@ 
  * @param array $js_array JavaScript scripts array
  * @return array Reordered array, if needed.
  */
-function wp_prototype_before_jquery( $js_array ) {
-	if ( false === $prototype = array_search( 'prototype', $js_array, true ) )
+function wp_prototype_before_jquery($js_array) {
+	if (false === $prototype = array_search('prototype', $js_array, true))
 		return $js_array;
 
-	if ( false === $jquery = array_search( 'jquery', $js_array, true ) )
+	if (false === $jquery = array_search('jquery', $js_array, true))
 		return $js_array;
 
-	if ( $prototype < $jquery )
+	if ($prototype < $jquery)
 		return $js_array;
 
 	unset($js_array[$prototype]);
 
-	array_splice( $js_array, $jquery, 0, 'prototype' );
+	array_splice($js_array, $jquery, 0, 'prototype');
 
 	return $js_array;
 }
@@ -945,10 +945,10 @@ 
  */
 function wp_just_in_time_script_localization() {
 
-	wp_localize_script( 'autosave', 'autosaveL10n', array(
+	wp_localize_script('autosave', 'autosaveL10n', array(
 		'autosaveInterval' => AUTOSAVE_INTERVAL,
 		'blog_id' => get_current_blog_id(),
-	) );
+	));
 }
 
 /**
@@ -963,7 +963,7 @@ 
 function wp_localize_jquery_ui_datepicker() {
 	global $wp_locale;
 
-	if ( ! wp_script_is( 'jquery-ui-datepicker', 'enqueued' ) ) {
+	if ( ! wp_script_is('jquery-ui-datepicker', 'enqueued')) {
 		return;
 	}
 
@@ -979,25 +979,25 @@ 
 			'MM', 'M', 'm', 'mm',
 			'yy', 'y'
 		),
-		get_option( 'date_format' )
+		get_option('date_format')
 	);
 
-	$datepicker_defaults = wp_json_encode( array(
-		'closeText'       => __( 'Close' ),
-		'currentText'     => __( 'Today' ),
-		'monthNames'      => array_values( $wp_locale->month ),
-		'monthNamesShort' => array_values( $wp_locale->month_abbrev ),
-		'nextText'        => __( 'Next' ),
-		'prevText'        => __( 'Previous' ),
-		'dayNames'        => array_values( $wp_locale->weekday ),
-		'dayNamesShort'   => array_values( $wp_locale->weekday_abbrev ),
-		'dayNamesMin'     => array_values( $wp_locale->weekday_initial ),
+	$datepicker_defaults = wp_json_encode(array(
+		'closeText'       => __('Close'),
+		'currentText'     => __('Today'),
+		'monthNames'      => array_values($wp_locale->month),
+		'monthNamesShort' => array_values($wp_locale->month_abbrev),
+		'nextText'        => __('Next'),
+		'prevText'        => __('Previous'),
+		'dayNames'        => array_values($wp_locale->weekday),
+		'dayNamesShort'   => array_values($wp_locale->weekday_abbrev),
+		'dayNamesMin'     => array_values($wp_locale->weekday_initial),
 		'dateFormat'      => $datepicker_date_format,
-		'firstDay'        => absint( get_option( 'start_of_week' ) ),
+		'firstDay'        => absint(get_option('start_of_week')),
 		'isRTL'           => $wp_locale->is_rtl(),
-	) );
+	));
 
-	wp_add_inline_script( 'jquery-ui-datepicker', "jQuery(document).ready(function(jQuery){jQuery.datepicker.setDefaults({$datepicker_defaults});});" );
+	wp_add_inline_script('jquery-ui-datepicker', "jQuery(document).ready(function(jQuery){jQuery.datepicker.setDefaults({$datepicker_defaults});});");
 }
 
 /**
@@ -1006,15 +1006,15 @@ 
  * @since 4.8.0
  */
 function wp_localize_community_events() {
-	if ( ! wp_script_is( 'dashboard' ) ) {
+	if ( ! wp_script_is('dashboard')) {
 		return;
 	}
 
-	require_once( ABSPATH . 'wp-admin/includes/class-wp-community-events.php' );
+	require_once(ABSPATH.'wp-admin/includes/class-wp-community-events.php');
 
 	$user_id            = get_current_user_id();
-	$saved_location     = get_user_option( 'community-events-location', $user_id );
-	$saved_ip_address   = isset( $saved_location['ip'] ) ? $saved_location['ip'] : false;
+	$saved_location     = get_user_option('community-events-location', $user_id);
+	$saved_ip_address   = isset($saved_location['ip']) ? $saved_location['ip'] : false;
 	$current_ip_address = WP_Community_Events::get_unsafe_client_ip();
 
 	/*
@@ -1024,21 +1024,21 @@ 
 	 * shown events in the city where they were when they first loaded the
 	 * Dashboard, which could have been months or years ago.
 	 */
-	if ( $saved_ip_address && $current_ip_address && $current_ip_address !== $saved_ip_address ) {
+	if ($saved_ip_address && $current_ip_address && $current_ip_address !== $saved_ip_address) {
 		$saved_location['ip'] = $current_ip_address;
-		update_user_option( $user_id, 'community-events-location', $saved_location, true );
+		update_user_option($user_id, 'community-events-location', $saved_location, true);
 	}
 
-	$events_client = new WP_Community_Events( $user_id, $saved_location );
+	$events_client = new WP_Community_Events($user_id, $saved_location);
 
-	wp_localize_script( 'dashboard', 'communityEventsData', array(
-		'nonce' => wp_create_nonce( 'community_events' ),
+	wp_localize_script('dashboard', 'communityEventsData', array(
+		'nonce' => wp_create_nonce('community_events'),
 		'cache' => $events_client->get_cached_events(),
 
 		'l10n' => array(
-			'enter_closest_city' => __( 'Enter your closest city to find nearby events.' ),
-			'error_occurred_please_try_again' => __( 'An error occurred. Please try again.' ),
-			'attend_event_near_generic' => __( 'Attend an upcoming event near you.' ),
+			'enter_closest_city' => __('Enter your closest city to find nearby events.'),
+			'error_occurred_please_try_again' => __('An error occurred. Please try again.'),
+			'attend_event_near_generic' => __('Attend an upcoming event near you.'),
 
 			/*
 			 * These specific examples were chosen to highlight the fact that a
@@ -1055,13 +1055,13 @@ 
 			 * or country. Use the endonym (native locale name) instead of the
 			 * English name if possible.
 			 */
-			'could_not_locate_city' => __( 'We couldn&#8217;t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ),
+			'could_not_locate_city' => __('We couldn&#8217;t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.'),
 
 			// This one is only used with wp.a11y.speak(), so it can/should be more brief.
 			/* translators: %s is the name of a city. */
-			'city_updated' => __( 'City updated. Listing events near %s.' ),
+			'city_updated' => __('City updated. Listing events near %s.'),
 		)
-	) );
+	));
 }
 
 /**
@@ -1084,29 +1084,29 @@ 
  * @param string $handle Either 'colors' or 'colors-rtl'.
  * @return string|false URL path to CSS stylesheet for Administration Screens.
  */
-function wp_style_loader_src( $src, $handle ) {
+function wp_style_loader_src($src, $handle) {
 	global $_wp_admin_css_colors;
 
-	if ( wp_installing() )
-		return preg_replace( '#^wp-admin/#', './', $src );
+	if (wp_installing())
+		return preg_replace('#^wp-admin/#', './', $src);
 
-	if ( 'colors' == $handle ) {
+	if ('colors' == $handle) {
 		$color = get_user_option('admin_color');
 
-		if ( empty($color) || !isset($_wp_admin_css_colors[$color]) )
+		if (empty($color) || ! isset($_wp_admin_css_colors[$color]))
 			$color = 'fresh';
 
 		$color = $_wp_admin_css_colors[$color];
 		$url = $color->url;
 
-		if ( ! $url ) {
+		if ( ! $url) {
 			return false;
 		}
 
-		$parsed = parse_url( $src );
-		if ( isset($parsed['query']) && $parsed['query'] ) {
-			wp_parse_str( $parsed['query'], $qv );
-			$url = add_query_arg( $qv, $url );
+		$parsed = parse_url($src);
+		if (isset($parsed['query']) && $parsed['query']) {
+			wp_parse_str($parsed['query'], $qv);
+			$url = add_query_arg($qv, $url);
 		}
 
 		return $url;
@@ -1132,9 +1132,9 @@ 
 function print_head_scripts() {
 	global $concatenate_scripts;
 
-	if ( ! did_action('wp_print_scripts') ) {
+	if ( ! did_action('wp_print_scripts')) {
 		/** This action is documented in wp-includes/functions.wp-scripts.php */
-		do_action( 'wp_print_scripts' );
+		do_action('wp_print_scripts');
 	}
 
 	$wp_scripts = wp_scripts();
@@ -1150,7 +1150,7 @@ 
 	 *
 	 * @param bool $print Whether to print the head scripts. Default true.
 	 */
-	if ( apply_filters( 'print_head_scripts', true ) ) {
+	if (apply_filters('print_head_scripts', true)) {
 		_print_scripts();
 	}
 
@@ -1171,7 +1171,7 @@ 
 function print_footer_scripts() {
 	global $wp_scripts, $concatenate_scripts;
 
-	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
+	if ( ! ($wp_scripts instanceof WP_Scripts)) {
 		return array(); // No need to run if not instantiated.
 	}
 	script_concat_settings();
@@ -1185,7 +1185,7 @@ 
 	 *
 	 * @param bool $print Whether to print the footer scripts. Default true.
 	 */
-	if ( apply_filters( 'print_footer_scripts', true ) ) {
+	if (apply_filters('print_footer_scripts', true)) {
 		_print_scripts();
 	}
 
@@ -1205,12 +1205,12 @@ 
 	global $wp_scripts, $compress_scripts;
 
 	$zip = $compress_scripts ? 1 : 0;
-	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
+	if ($zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP)
 		$zip = 'gzip';
 
-	if ( $concat = trim( $wp_scripts->concat, ', ' ) ) {
+	if ($concat = trim($wp_scripts->concat, ', ')) {
 
-		if ( !empty($wp_scripts->print_code) ) {
+		if ( ! empty($wp_scripts->print_code)) {
 			echo "\n<script type='text/javascript'>\n";
 			echo "/* <![CDATA[ */\n"; // not needed in HTML 5
 			echo $wp_scripts->print_code;
@@ -1218,14 +1218,14 @@ 
 			echo "</script>\n";
 		}
 
-		$concat = str_split( $concat, 128 );
-		$concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat );
+		$concat = str_split($concat, 128);
+		$concat = 'load%5B%5D='.implode('&load%5B%5D=', $concat);
 
-		$src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&" . $concat . '&ver=' . $wp_scripts->default_version;
-		echo "<script type='text/javascript' src='" . esc_attr($src) . "'></script>\n";
+		$src = $wp_scripts->base_url."/wp-admin/load-scripts.php?c={$zip}&".$concat.'&ver='.$wp_scripts->default_version;
+		echo "<script type='text/javascript' src='".esc_attr($src)."'></script>\n";
 	}
 
-	if ( !empty($wp_scripts->print_html) )
+	if ( ! empty($wp_scripts->print_html))
 		echo $wp_scripts->print_html;
 }
 
@@ -1242,14 +1242,14 @@ 
  * @return array
  */
 function wp_print_head_scripts() {
-	if ( ! did_action('wp_print_scripts') ) {
+	if ( ! did_action('wp_print_scripts')) {
 		/** This action is documented in wp-includes/functions.wp-scripts.php */
-		do_action( 'wp_print_scripts' );
+		do_action('wp_print_scripts');
 	}
 
 	global $wp_scripts;
 
-	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
+	if ( ! ($wp_scripts instanceof WP_Scripts)) {
 		return array(); // no need to run if nothing is queued
 	}
 	return print_head_scripts();
@@ -1276,7 +1276,7 @@ 
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'wp_print_footer_scripts' );
+	do_action('wp_print_footer_scripts');
 }
 
 /**
@@ -1293,7 +1293,7 @@ 
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'wp_enqueue_scripts' );
+	do_action('wp_enqueue_scripts');
 }
 
 /**
@@ -1321,7 +1321,7 @@ 
 	 *
 	 * @param bool $print Whether to print the admin styles. Default true.
 	 */
-	if ( apply_filters( 'print_admin_styles', true ) ) {
+	if (apply_filters('print_admin_styles', true)) {
 		_print_styles();
 	}
 
@@ -1342,7 +1342,7 @@ 
 function print_late_styles() {
 	global $wp_styles, $concatenate_scripts;
 
-	if ( ! ( $wp_styles instanceof WP_Styles ) ) {
+	if ( ! ($wp_styles instanceof WP_Styles)) {
 		return;
 	}
 
@@ -1357,7 +1357,7 @@ 
 	 *
 	 * @param bool $print Whether to print the 'late' styles. Default true.
 	 */
-	if ( apply_filters( 'print_late_styles', true ) ) {
+	if (apply_filters('print_late_styles', true)) {
 		_print_styles();
 	}
 
@@ -1379,27 +1379,27 @@ 
 	$wp_styles = wp_styles();
 
 	$zip = $compress_css ? 1 : 0;
-	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
+	if ($zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP)
 		$zip = 'gzip';
 
-	if ( $concat = trim( $wp_styles->concat, ', ' ) ) {
+	if ($concat = trim($wp_styles->concat, ', ')) {
 		$dir = $wp_styles->text_direction;
 		$ver = $wp_styles->default_version;
 
-		$concat = str_split( $concat, 128 );
-		$concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat );
+		$concat = str_split($concat, 128);
+		$concat = 'load%5B%5D='.implode('&load%5B%5D=', $concat);
 
-		$href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&" . $concat . '&ver=' . $ver;
-		echo "<link rel='stylesheet' href='" . esc_attr($href) . "' type='text/css' media='all' />\n";
+		$href = $wp_styles->base_url."/wp-admin/load-styles.php?c={$zip}&dir={$dir}&".$concat.'&ver='.$ver;
+		echo "<link rel='stylesheet' href='".esc_attr($href)."' type='text/css' media='all' />\n";
 
-		if ( !empty($wp_styles->print_code) ) {
+		if ( ! empty($wp_styles->print_code)) {
 			echo "<style type='text/css'>\n";
 			echo $wp_styles->print_code;
 			echo "\n</style>\n";
 		}
 	}
 
-	if ( !empty($wp_styles->print_html) )
+	if ( ! empty($wp_styles->print_html))
 		echo $wp_styles->print_html;
 }
 
@@ -1415,23 +1415,23 @@ 
 function script_concat_settings() {
 	global $concatenate_scripts, $compress_scripts, $compress_css;
 
-	$compressed_output = ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') );
+	$compressed_output = (ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler'));
 
-	if ( ! isset($concatenate_scripts) ) {
+	if ( ! isset($concatenate_scripts)) {
 		$concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true;
-		if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) )
+		if (( ! is_admin() && ! did_action('login_init')) || (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG))
 			$concatenate_scripts = false;
 	}
 
-	if ( ! isset($compress_scripts) ) {
+	if ( ! isset($compress_scripts)) {
 		$compress_scripts = defined('COMPRESS_SCRIPTS') ? COMPRESS_SCRIPTS : true;
-		if ( $compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
+		if ($compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output))
 			$compress_scripts = false;
 	}
 
-	if ( ! isset($compress_css) ) {
+	if ( ! isset($compress_css)) {
 		$compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
-		if ( $compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
+		if ($compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output))
 			$compress_css = false;
 	}
 }

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

Spacing +36 added lines, -36 removed lines

@@ -30,8 +30,8 @@ 
 	 * @param string $supports Optional, not used. When implemented it will choose the right compression based on what the server supports.
 	 * @return string|false False on failure.
 	 */
-	public static function compress( $raw, $level = 9, $supports = null ) {
-		return gzdeflate( $raw, $level );
+	public static function compress($raw, $level = 9, $supports = null) {
+		return gzdeflate($raw, $level);
 	}
 
 	/**
@@ -50,24 +50,24 @@ 
 	 * @param int $length The optional length of the compressed data.
 	 * @return string|bool False on failure.
 	 */
-	public static function decompress( $compressed, $length = null ) {
+	public static function decompress($compressed, $length = null) {
 
-		if ( empty($compressed) )
+		if (empty($compressed))
 			return $compressed;
 
-		if ( false !== ( $decompressed = @gzinflate( $compressed ) ) )
+		if (false !== ($decompressed = @gzinflate($compressed)))
 			return $decompressed;
 
-		if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) )
+		if (false !== ($decompressed = self::compatible_gzinflate($compressed)))
 			return $decompressed;
 
-		if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) )
+		if (false !== ($decompressed = @gzuncompress($compressed)))
 			return $decompressed;
 
-		if ( function_exists('gzdecode') ) {
-			$decompressed = @gzdecode( $compressed );
+		if (function_exists('gzdecode')) {
+			$decompressed = @gzdecode($compressed);
 
-			if ( false !== $decompressed )
+			if (false !== $decompressed)
 				return $decompressed;
 		}
 
@@ -99,29 +99,29 @@ 
 	public static function compatible_gzinflate($gzData) {
 
 		// Compressed data might contain a full header, if so strip it for gzinflate().
-		if ( substr($gzData, 0, 3) == "\x1f\x8b\x08" ) {
+		if (substr($gzData, 0, 3) == "\x1f\x8b\x08") {
 			$i = 10;
-			$flg = ord( substr($gzData, 3, 1) );
-			if ( $flg > 0 ) {
-				if ( $flg & 4 ) {
-					list($xlen) = unpack('v', substr($gzData, $i, 2) );
+			$flg = ord(substr($gzData, 3, 1));
+			if ($flg > 0) {
+				if ($flg & 4) {
+					list($xlen) = unpack('v', substr($gzData, $i, 2));
 					$i = $i + 2 + $xlen;
 				}
-				if ( $flg & 8 )
+				if ($flg & 8)
 					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 16 )
+				if ($flg & 16)
 					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 2 )
+				if ($flg & 2)
 					$i = $i + 2;
 			}
-			$decompressed = @gzinflate( substr($gzData, $i, -8) );
-			if ( false !== $decompressed )
+			$decompressed = @gzinflate(substr($gzData, $i, -8));
+			if (false !== $decompressed)
 				return $decompressed;
 		}
 
 		// Compressed data from java.util.zip.Deflater amongst others.
-		$decompressed = @gzinflate( substr($gzData, 2) );
-		if ( false !== $decompressed )
+		$decompressed = @gzinflate(substr($gzData, 2));
+		if (false !== $decompressed)
 			return $decompressed;
 
 		return false;
@@ -138,25 +138,25 @@ 
 	 * @param array  $args
 	 * @return string Types of encoding to accept.
 	 */
-	public static function accept_encoding( $url, $args ) {
+	public static function accept_encoding($url, $args) {
 		$type = array();
 		$compression_enabled = self::is_available();
 
-		if ( ! $args['decompress'] ) // Decompression specifically disabled.
+		if ( ! $args['decompress']) // Decompression specifically disabled.
 			$compression_enabled = false;
-		elseif ( $args['stream'] ) // Disable when streaming to file.
+		elseif ($args['stream']) // Disable when streaming to file.
 			$compression_enabled = false;
-		elseif ( isset( $args['limit_response_size'] ) ) // If only partial content is being requested, we won't be able to decompress it.
+		elseif (isset($args['limit_response_size'])) // If only partial content is being requested, we won't be able to decompress it.
 			$compression_enabled = false;
 
-		if ( $compression_enabled ) {
-			if ( function_exists( 'gzinflate' ) )
+		if ($compression_enabled) {
+			if (function_exists('gzinflate'))
 				$type[] = 'deflate;q=1.0';
 
-			if ( function_exists( 'gzuncompress' ) )
+			if (function_exists('gzuncompress'))
 				$type[] = 'compress;q=0.5';
 
-			if ( function_exists( 'gzdecode' ) )
+			if (function_exists('gzdecode'))
 				$type[] = 'gzip;q=0.5';
 		}
 
@@ -170,7 +170,7 @@ 
 		 * @param string $url  URL of the HTTP request.
 		 * @param array  $args HTTP request arguments.
 		 */
-		$type = apply_filters( 'wp_http_accept_encoding', $type, $url, $args );
+		$type = apply_filters('wp_http_accept_encoding', $type, $url, $args);
 
 		return implode(', ', $type);
 	}
@@ -199,11 +199,11 @@ 
 	 * @return bool
 	 */
 	public static function should_decode($headers) {
-		if ( is_array( $headers ) ) {
-			if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
+		if (is_array($headers)) {
+			if (array_key_exists('content-encoding', $headers) && ! empty($headers['content-encoding']))
 				return true;
-		} elseif ( is_string( $headers ) ) {
-			return ( stripos($headers, 'content-encoding:') !== false );
+		} elseif (is_string($headers)) {
+			return (stripos($headers, 'content-encoding:') !== false);
 		}
 
 		return false;
@@ -223,6 +223,6 @@ 
 	 * @return bool
 	 */
 	public static function is_available() {
-		return ( function_exists('gzuncompress') || function_exists('gzdeflate') || function_exists('gzinflate') );
+		return (function_exists('gzuncompress') || function_exists('gzdeflate') || function_exists('gzinflate'));
 	}
 }

Braces +49 added lines, -31 removed lines

@@ -52,23 +52,28 @@ 
 	 */
 	public static function decompress( $compressed, $length = null ) {
 
-		if ( empty($compressed) )
-			return $compressed;
+		if ( empty($compressed) ) {
+					return $compressed;
+		}
 
-		if ( false !== ( $decompressed = @gzinflate( $compressed ) ) )
-			return $decompressed;
+		if ( false !== ( $decompressed = @gzinflate( $compressed ) ) ) {
+					return $decompressed;
+		}
 
-		if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) )
-			return $decompressed;
+		if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) ) {
+					return $decompressed;
+		}
 
-		if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) )
-			return $decompressed;
+		if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) ) {
+					return $decompressed;
+		}
 
 		if ( function_exists('gzdecode') ) {
 			$decompressed = @gzdecode( $compressed );
 
-			if ( false !== $decompressed )
-				return $decompressed;
+			if ( false !== $decompressed ) {
+							return $decompressed;
+			}
 		}
 
 		return $compressed;
@@ -107,22 +112,27 @@ 
 					list($xlen) = unpack('v', substr($gzData, $i, 2) );
 					$i = $i + 2 + $xlen;
 				}
-				if ( $flg & 8 )
-					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 16 )
-					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 2 )
-					$i = $i + 2;
+				if ( $flg & 8 ) {
+									$i = strpos($gzData, "\0", $i) + 1;
+				}
+				if ( $flg & 16 ) {
+									$i = strpos($gzData, "\0", $i) + 1;
+				}
+				if ( $flg & 2 ) {
+									$i = $i + 2;
+				}
 			}
 			$decompressed = @gzinflate( substr($gzData, $i, -8) );
-			if ( false !== $decompressed )
-				return $decompressed;
+			if ( false !== $decompressed ) {
+							return $decompressed;
+			}
 		}
 
 		// Compressed data from java.util.zip.Deflater amongst others.
 		$decompressed = @gzinflate( substr($gzData, 2) );
-		if ( false !== $decompressed )
-			return $decompressed;
+		if ( false !== $decompressed ) {
+					return $decompressed;
+		}
 
 		return false;
 	}
@@ -142,22 +152,29 @@ 
 		$type = array();
 		$compression_enabled = self::is_available();
 
-		if ( ! $args['decompress'] ) // Decompression specifically disabled.
+		if ( ! $args['decompress'] ) {
+			// Decompression specifically disabled.
 			$compression_enabled = false;
-		elseif ( $args['stream'] ) // Disable when streaming to file.
+		} elseif ( $args['stream'] ) {
+			// Disable when streaming to file.
 			$compression_enabled = false;
-		elseif ( isset( $args['limit_response_size'] ) ) // If only partial content is being requested, we won't be able to decompress it.
+		} elseif ( isset( $args['limit_response_size'] ) ) {
+			// If only partial content is being requested, we won't be able to decompress it.
 			$compression_enabled = false;
+		}
 
 		if ( $compression_enabled ) {
-			if ( function_exists( 'gzinflate' ) )
-				$type[] = 'deflate;q=1.0';
+			if ( function_exists( 'gzinflate' ) ) {
+							$type[] = 'deflate;q=1.0';
+			}
 
-			if ( function_exists( 'gzuncompress' ) )
-				$type[] = 'compress;q=0.5';
+			if ( function_exists( 'gzuncompress' ) ) {
+							$type[] = 'compress;q=0.5';
+			}
 
-			if ( function_exists( 'gzdecode' ) )
-				$type[] = 'gzip;q=0.5';
+			if ( function_exists( 'gzdecode' ) ) {
+							$type[] = 'gzip;q=0.5';
+			}
 		}
 
 		/**
@@ -200,8 +217,9 @@ 
 	 */
 	public static function should_decode($headers) {
 		if ( is_array( $headers ) ) {
-			if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
-				return true;
+			if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) ) {
+							return true;
+			}
 		} elseif ( is_string( $headers ) ) {
 			return ( stripos($headers, 'content-encoding:') !== false );
 		}

src/wp-includes/pomo/entry.php

Spacing +14 added lines, -14 removed lines

@@ -7,7 +7,7 @@ 
  * @subpackage entry
  */
 
-if ( ! class_exists( 'Translation_Entry', false ) ):
+if ( ! class_exists('Translation_Entry', false)):
 /**
  * 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']) && $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);
 	}
 
 	/**
@@ -68,12 +68,12 @@ 
 	 * @return string|bool the key or false if the entry is empty
 	 */
 	function key() {
-		if ( null === $this->singular || '' === $this->singular ) return false;
+		if (null === $this->singular || '' === $this->singular) return false;
 
 		// Prepend context and EOT, like in MO files
-		$key = !$this->context? $this->singular : $this->context.chr(4).$this->singular;
+		$key = ! $this->context ? $this->singular : $this->context.chr(4).$this->singular;
 		// Standardize on \n line endings
-		$key = str_replace( array( "\r\n", "\r" ), "\n", $key );
+		$key = str_replace(array("\r\n", "\r"), "\n", $key);
 
 		return $key;
 	}
@@ -82,9 +82,9 @@ 
 	 * @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']) && $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']) && $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 ( null === $this->singular || '' === $this->singular ) return false;
+		if ( null === $this->singular || '' === $this->singular ) {
+			return false;
+		}
 
 		// Prepend context and EOT, like in MO files
 		$key = !$this->context? $this->singular : $this->context.chr(4).$this->singular;