ntwb / wordpress

src/wp-admin/user/freedoms.php

Spacing +2 added lines, -2 removed lines

@@ -8,6 +8,6 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-require( ABSPATH . 'wp-admin/freedoms.php' );
+require(ABSPATH.'wp-admin/freedoms.php');

src/wp-admin/user/about.php

Spacing +2 added lines, -2 removed lines

@@ -8,6 +8,6 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-require( ABSPATH . 'wp-admin/about.php' );
+require(ABSPATH.'wp-admin/about.php');

src/wp-admin/includes/image.php

Switch Indentation +6 added lines, -6 removed lines

@@ -156,12 +156,12 @@
 		} else {
 			$ext = '.jpg';
 			switch ( $metadata['image']['mime'] ) {
-			case 'image/gif':
-				$ext = '.gif';
-				break;
-			case 'image/png':
-				$ext = '.png';
-				break;
+				case 'image/gif':
+					$ext = '.gif';
+					break;
+				case 'image/png':
+					$ext = '.png';
+					break;
 			}
 			$basename = str_replace( '.', '-', basename( $file ) ) . '-image' . $ext;
 			$uploaded = wp_upload_bits( $basename, '', $metadata['image']['data'] );

Braces +44 added lines, -26 removed lines

@@ -37,15 +37,18 @@ 
 	}
 
 	$editor = wp_get_image_editor( $src );
-	if ( is_wp_error( $editor ) )
-		return $editor;
+	if ( is_wp_error( $editor ) ) {
+			return $editor;
+	}
 
 	$src = $editor->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs );
-	if ( is_wp_error( $src ) )
-		return $src;
+	if ( is_wp_error( $src ) ) {
+			return $src;
+	}
 
-	if ( ! $dst_file )
-		$dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
+	if ( ! $dst_file ) {
+			$dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
+	}
 
 	/*
 	 * The directory containing the original file may no longer exist when
@@ -56,8 +59,9 @@ 
 	$dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
 
 	$result = $editor->save( $dst_file );
-	if ( is_wp_error( $result ) )
-		return $result;
+	if ( is_wp_error( $result ) ) {
+			return $result;
+	}
 
 	return $dst_file;
 }
@@ -131,16 +135,18 @@ 
 		if ( $sizes ) {
 			$editor = wp_get_image_editor( $file );
 
-			if ( ! is_wp_error( $editor ) )
-				$metadata['sizes'] = $editor->multi_resize( $sizes );
+			if ( ! is_wp_error( $editor ) ) {
+							$metadata['sizes'] = $editor->multi_resize( $sizes );
+			}
 		} else {
 			$metadata['sizes'] = array();
 		}
 
 		// Fetch additional metadata from EXIF/IPTC.
 		$image_meta = wp_read_image_metadata( $file );
-		if ( $image_meta )
-			$metadata['image_meta'] = $image_meta;
+		if ( $image_meta ) {
+					$metadata['image_meta'] = $image_meta;
+		}
 
 	} elseif ( wp_attachment_is( 'video', $attachment ) ) {
 		$metadata = wp_read_video_metadata( $file );
@@ -294,8 +300,9 @@ 
  */
 function wp_exif_frac2dec($str) {
 	@list( $n, $d ) = explode( '/', $str );
-	if ( !empty($d) )
-		return $n / $d;
+	if ( !empty($d) ) {
+			return $n / $d;
+	}
 	return $str;
 }
 
@@ -331,8 +338,9 @@ 
  * @return bool|array False on failure. Image metadata array on success.
  */
 function wp_read_image_metadata( $file ) {
-	if ( ! file_exists( $file ) )
-		return false;
+	if ( ! file_exists( $file ) ) {
+			return false;
+	}
 
 	list( , , $sourceImageType ) = getimagesize( $file );
 
@@ -394,16 +402,23 @@ 
 				$meta['caption'] = $caption;
 			}
 
-			if ( ! empty( $iptc['2#110'][0] ) ) // credit
+			if ( ! empty( $iptc['2#110'][0] ) ) {
+				// credit
 				$meta['credit'] = trim( $iptc['2#110'][0] );
-			elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline
+			} elseif ( ! empty( $iptc['2#080'][0] ) ) {
+				// creator / legacy byline
 				$meta['credit'] = trim( $iptc['2#080'][0] );
+			}
 
-			if ( ! empty( $iptc['2#055'][0] ) && ! empty( $iptc['2#060'][0] ) ) // created date and time
+			if ( ! empty( $iptc['2#055'][0] ) && ! empty( $iptc['2#060'][0] ) ) {
+				// created date and time
 				$meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] );
+			}
 
-			if ( ! empty( $iptc['2#116'][0] ) ) // copyright
+			if ( ! empty( $iptc['2#116'][0] ) ) {
+				// copyright
 				$meta['copyright'] = trim( $iptc['2#116'][0] );
+			}
 
 			if ( ! empty( $iptc['2#025'][0] ) ) { // keywords array
 				$meta['keywords'] = array_values( $iptc['2#025'] );
@@ -562,8 +577,9 @@ 
  */
 function load_image_to_edit( $attachment_id, $mime_type, $size = 'full' ) {
 	$filepath = _load_image_to_edit_path( $attachment_id, $size );
-	if ( empty( $filepath ) )
-		return false;
+	if ( empty( $filepath ) ) {
+			return false;
+	}
 
 	switch ( $mime_type ) {
 		case 'image/jpeg':
@@ -667,8 +683,9 @@ 
  */
 function _copy_image_file( $attachment_id ) {
 	$dst_file = $src_file = get_attached_file( $attachment_id );
-	if ( ! file_exists( $src_file ) )
-		$src_file = _load_image_to_edit_path( $attachment_id );
+	if ( ! file_exists( $src_file ) ) {
+			$src_file = _load_image_to_edit_path( $attachment_id );
+	}
 
 	if ( $src_file ) {
 		$dst_file = str_replace( basename( $dst_file ), 'copy-' . basename( $dst_file ), $dst_file );
@@ -680,8 +697,9 @@ 
 		 */
 		wp_mkdir_p( dirname( $dst_file ) );
 
-		if ( ! @copy( $src_file, $dst_file ) )
-			$dst_file = false;
+		if ( ! @copy( $src_file, $dst_file ) ) {
+					$dst_file = false;
+		}
 	} else {
 		$dst_file = false;
 	}

Spacing +190 added lines, -190 removed lines

@@ -22,41 +22,41 @@ 
  * @param string $dst_file Optional. The destination file to write to.
  * @return string|WP_Error New filepath on success, WP_Error on failure.
  */
-function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
+function wp_crop_image($src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false) {
 	$src_file = $src;
-	if ( is_numeric( $src ) ) { // Handle int as attachment ID
-		$src_file = get_attached_file( $src );
+	if (is_numeric($src)) { // Handle int as attachment ID
+		$src_file = get_attached_file($src);
 
-		if ( ! file_exists( $src_file ) ) {
+		if ( ! file_exists($src_file)) {
 			// If the file doesn't exist, attempt a URL fopen on the src link.
 			// This can occur with certain file replication plugins.
-			$src = _load_image_to_edit_path( $src, 'full' );
+			$src = _load_image_to_edit_path($src, 'full');
 		} else {
 			$src = $src_file;
 		}
 	}
 
-	$editor = wp_get_image_editor( $src );
-	if ( is_wp_error( $editor ) )
+	$editor = wp_get_image_editor($src);
+	if (is_wp_error($editor))
 		return $editor;
 
-	$src = $editor->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs );
-	if ( is_wp_error( $src ) )
+	$src = $editor->crop($src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs);
+	if (is_wp_error($src))
 		return $src;
 
-	if ( ! $dst_file )
-		$dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
+	if ( ! $dst_file)
+		$dst_file = str_replace(basename($src_file), 'cropped-'.basename($src_file), $src_file);
 
 	/*
 	 * The directory containing the original file may no longer exist when
 	 * using a replication plugin.
 	 */
-	wp_mkdir_p( dirname( $dst_file ) );
+	wp_mkdir_p(dirname($dst_file));
 
-	$dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
+	$dst_file = dirname($dst_file).'/'.wp_unique_filename(dirname($dst_file), basename($dst_file));
 
-	$result = $editor->save( $dst_file );
-	if ( is_wp_error( $result ) )
+	$result = $editor->save($dst_file);
+	if (is_wp_error($result))
 		return $result;
 
 	return $dst_file;
@@ -71,15 +71,15 @@ 
  * @param string $file Filepath of the Attached image.
  * @return mixed Metadata for attachment.
  */
-function wp_generate_attachment_metadata( $attachment_id, $file ) {
-	$attachment = get_post( $attachment_id );
+function wp_generate_attachment_metadata($attachment_id, $file) {
+	$attachment = get_post($attachment_id);
 
 	$metadata = array();
 	$support = false;
-	$mime_type = get_post_mime_type( $attachment );
+	$mime_type = get_post_mime_type($attachment);
 
-	if ( preg_match( '!^image/!', $mime_type ) && file_is_displayable_image( $file ) ) {
-		$imagesize = getimagesize( $file );
+	if (preg_match('!^image/!', $mime_type) && file_is_displayable_image($file)) {
+		$imagesize = getimagesize($file);
 		$metadata['width'] = $imagesize[0];
 		$metadata['height'] = $imagesize[1];
 
@@ -90,30 +90,30 @@ 
 		$_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
 		$sizes = array();
-		foreach ( get_intermediate_image_sizes() as $s ) {
-			$sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => false );
-			if ( isset( $_wp_additional_image_sizes[$s]['width'] ) ) {
+		foreach (get_intermediate_image_sizes() as $s) {
+			$sizes[$s] = array('width' => '', 'height' => '', 'crop' => false);
+			if (isset($_wp_additional_image_sizes[$s]['width'])) {
 				// For theme-added sizes
-				$sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] );
+				$sizes[$s]['width'] = intval($_wp_additional_image_sizes[$s]['width']);
 			} else {
 				// For default sizes set in options
-				$sizes[$s]['width'] = get_option( "{$s}_size_w" );
+				$sizes[$s]['width'] = get_option("{$s}_size_w");
 			}
 
-			if ( isset( $_wp_additional_image_sizes[$s]['height'] ) ) {
+			if (isset($_wp_additional_image_sizes[$s]['height'])) {
 				// For theme-added sizes
-				$sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] );
+				$sizes[$s]['height'] = intval($_wp_additional_image_sizes[$s]['height']);
 			} else {
 				// For default sizes set in options
-				$sizes[$s]['height'] = get_option( "{$s}_size_h" );
+				$sizes[$s]['height'] = get_option("{$s}_size_h");
 			}
 
-			if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) ) {
+			if (isset($_wp_additional_image_sizes[$s]['crop'])) {
 				// For theme-added sizes
 				$sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop'];
 			} else {
 				// For default sizes set in options
-				$sizes[$s]['crop'] = get_option( "{$s}_crop" );
+				$sizes[$s]['crop'] = get_option("{$s}_crop");
 			}
 		}
 
@@ -126,34 +126,34 @@ 
 		 * @param array $sizes    An associative array of image sizes.
 		 * @param array $metadata An associative array of image metadata: width, height, file.
 		 */
-		$sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes, $metadata );
+		$sizes = apply_filters('intermediate_image_sizes_advanced', $sizes, $metadata);
 
-		if ( $sizes ) {
-			$editor = wp_get_image_editor( $file );
+		if ($sizes) {
+			$editor = wp_get_image_editor($file);
 
-			if ( ! is_wp_error( $editor ) )
-				$metadata['sizes'] = $editor->multi_resize( $sizes );
+			if ( ! is_wp_error($editor))
+				$metadata['sizes'] = $editor->multi_resize($sizes);
 		} else {
 			$metadata['sizes'] = array();
 		}
 
 		// Fetch additional metadata from EXIF/IPTC.
-		$image_meta = wp_read_image_metadata( $file );
-		if ( $image_meta )
+		$image_meta = wp_read_image_metadata($file);
+		if ($image_meta)
 			$metadata['image_meta'] = $image_meta;
 
-	} elseif ( wp_attachment_is( 'video', $attachment ) ) {
-		$metadata = wp_read_video_metadata( $file );
-		$support = current_theme_supports( 'post-thumbnails', 'attachment:video' ) || post_type_supports( 'attachment:video', 'thumbnail' );
-	} elseif ( wp_attachment_is( 'audio', $attachment ) ) {
-		$metadata = wp_read_audio_metadata( $file );
-		$support = current_theme_supports( 'post-thumbnails', 'attachment:audio' ) || post_type_supports( 'attachment:audio', 'thumbnail' );
+	} elseif (wp_attachment_is('video', $attachment)) {
+		$metadata = wp_read_video_metadata($file);
+		$support = current_theme_supports('post-thumbnails', 'attachment:video') || post_type_supports('attachment:video', 'thumbnail');
+	} elseif (wp_attachment_is('audio', $attachment)) {
+		$metadata = wp_read_audio_metadata($file);
+		$support = current_theme_supports('post-thumbnails', 'attachment:audio') || post_type_supports('attachment:audio', 'thumbnail');
 	}
 
-	if ( $support && ! empty( $metadata['image']['data'] ) ) {
+	if ($support && ! empty($metadata['image']['data'])) {
 		// Check for existing cover.
-		$hash = md5( $metadata['image']['data'] );
-		$posts = get_posts( array(
+		$hash = md5($metadata['image']['data']);
+		$posts = get_posts(array(
 			'fields' => 'ids',
 			'post_type' => 'attachment',
 			'post_mime_type' => $metadata['image']['mime'],
@@ -161,14 +161,14 @@ 
 			'posts_per_page' => 1,
 			'meta_key' => '_cover_hash',
 			'meta_value' => $hash
-		) );
-		$exists = reset( $posts );
+		));
+		$exists = reset($posts);
 
-		if ( ! empty( $exists ) ) {
-			update_post_meta( $attachment_id, '_thumbnail_id', $exists );
+		if ( ! empty($exists)) {
+			update_post_meta($attachment_id, '_thumbnail_id', $exists);
 		} else {
 			$ext = '.jpg';
-			switch ( $metadata['image']['mime'] ) {
+			switch ($metadata['image']['mime']) {
 			case 'image/gif':
 				$ext = '.gif';
 				break;
@@ -176,9 +176,9 @@ 
 				$ext = '.png';
 				break;
 			}
-			$basename = str_replace( '.', '-', basename( $file ) ) . '-image' . $ext;
-			$uploaded = wp_upload_bits( $basename, '', $metadata['image']['data'] );
-			if ( false === $uploaded['error'] ) {
+			$basename = str_replace('.', '-', basename($file)).'-image'.$ext;
+			$uploaded = wp_upload_bits($basename, '', $metadata['image']['data']);
+			if (false === $uploaded['error']) {
 				$image_attachment = array(
 					'post_mime_type' => $metadata['image']['mime'],
 					'post_type' => 'attachment',
@@ -193,18 +193,18 @@ 
 				 * @param array $metadata         Current attachment metadata.
 				 * @param array $uploaded         An array containing the thumbnail path and url.
 				 */
-				$image_attachment = apply_filters( 'attachment_thumbnail_args', $image_attachment, $metadata, $uploaded );
+				$image_attachment = apply_filters('attachment_thumbnail_args', $image_attachment, $metadata, $uploaded);
 
-				$sub_attachment_id = wp_insert_attachment( $image_attachment, $uploaded['file'] );
-				add_post_meta( $sub_attachment_id, '_cover_hash', $hash );
-				$attach_data = wp_generate_attachment_metadata( $sub_attachment_id, $uploaded['file'] );
-				wp_update_attachment_metadata( $sub_attachment_id, $attach_data );
-				update_post_meta( $attachment_id, '_thumbnail_id', $sub_attachment_id );
+				$sub_attachment_id = wp_insert_attachment($image_attachment, $uploaded['file']);
+				add_post_meta($sub_attachment_id, '_cover_hash', $hash);
+				$attach_data = wp_generate_attachment_metadata($sub_attachment_id, $uploaded['file']);
+				wp_update_attachment_metadata($sub_attachment_id, $attach_data);
+				update_post_meta($attachment_id, '_thumbnail_id', $sub_attachment_id);
 			}
 		}
 	}
 	// Try to create image thumbnails for PDFs
-	else if ( 'application/pdf' === $mime_type ) {
+	else if ('application/pdf' === $mime_type) {
 		$fallback_sizes = array(
 			'thumbnail',
 			'medium',
@@ -218,57 +218,57 @@ 
 		 *
 		 * @param array $fallback_sizes An array of image size names.
 		 */
-		$fallback_sizes = apply_filters( 'fallback_intermediate_image_sizes', $fallback_sizes, $metadata );
+		$fallback_sizes = apply_filters('fallback_intermediate_image_sizes', $fallback_sizes, $metadata);
 
 		$sizes = array();
 		$_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
-		foreach ( $fallback_sizes as $s ) {
-			if ( isset( $_wp_additional_image_sizes[ $s ]['width'] ) ) {
-				$sizes[ $s ]['width'] = intval( $_wp_additional_image_sizes[ $s ]['width'] );
+		foreach ($fallback_sizes as $s) {
+			if (isset($_wp_additional_image_sizes[$s]['width'])) {
+				$sizes[$s]['width'] = intval($_wp_additional_image_sizes[$s]['width']);
 			} else {
-				$sizes[ $s ]['width'] = get_option( "{$s}_size_w" );
+				$sizes[$s]['width'] = get_option("{$s}_size_w");
 			}
 
-			if ( isset( $_wp_additional_image_sizes[ $s ]['height'] ) ) {
-				$sizes[ $s ]['height'] = intval( $_wp_additional_image_sizes[ $s ]['height'] );
+			if (isset($_wp_additional_image_sizes[$s]['height'])) {
+				$sizes[$s]['height'] = intval($_wp_additional_image_sizes[$s]['height']);
 			} else {
-				$sizes[ $s ]['height'] = get_option( "{$s}_size_h" );
+				$sizes[$s]['height'] = get_option("{$s}_size_h");
 			}
 
-			if ( isset( $_wp_additional_image_sizes[ $s ]['crop'] ) ) {
-				$sizes[ $s ]['crop'] = $_wp_additional_image_sizes[ $s ]['crop'];
+			if (isset($_wp_additional_image_sizes[$s]['crop'])) {
+				$sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop'];
 			} else {
 				// Force thumbnails to be soft crops.
-				if ( ! 'thumbnail' === $s ) {
-					$sizes[ $s ]['crop'] = get_option( "{$s}_crop" );
+				if ( ! 'thumbnail' === $s) {
+					$sizes[$s]['crop'] = get_option("{$s}_crop");
 				}
 			}
 		}
 
 		// Only load PDFs in an image editor if we're processing sizes.
-		if ( ! empty( $sizes ) ) {
-			$editor = wp_get_image_editor( $file );
+		if ( ! empty($sizes)) {
+			$editor = wp_get_image_editor($file);
 
-			if ( ! is_wp_error( $editor ) ) { // No support for this type of file
+			if ( ! is_wp_error($editor)) { // No support for this type of file
 				/*
 				 * PDFs may have the same file filename as JPEGs.
 				 * Ensure the PDF preview image does not overwrite any JPEG images that already exist.
 				 */
-				$dirname = dirname( $file ) . '/';
-				$ext = '.' . pathinfo( $file, PATHINFO_EXTENSION );
-				$preview_file = $dirname . wp_unique_filename( $dirname, wp_basename( $file, $ext ) . '-pdf.jpg' );
+				$dirname = dirname($file).'/';
+				$ext = '.'.pathinfo($file, PATHINFO_EXTENSION);
+				$preview_file = $dirname.wp_unique_filename($dirname, wp_basename($file, $ext).'-pdf.jpg');
 
-				$uploaded = $editor->save( $preview_file, 'image/jpeg' );
-				unset( $editor );
+				$uploaded = $editor->save($preview_file, 'image/jpeg');
+				unset($editor);
 
 				// Resize based on the full size image, rather than the source.
-				if ( ! is_wp_error( $uploaded ) ) {
-					$editor = wp_get_image_editor( $uploaded['path'] );
-					unset( $uploaded['path'] );
+				if ( ! is_wp_error($uploaded)) {
+					$editor = wp_get_image_editor($uploaded['path']);
+					unset($uploaded['path']);
 
-					if ( ! is_wp_error( $editor ) ) {
-						$metadata['sizes'] = $editor->multi_resize( $sizes );
+					if ( ! is_wp_error($editor)) {
+						$metadata['sizes'] = $editor->multi_resize($sizes);
 						$metadata['sizes']['full'] = $uploaded;
 					}
 				}
@@ -277,8 +277,8 @@ 
 	}
 
 	// Remove the blob of binary data from the array.
-	if ( $metadata ) {
-		unset( $metadata['image']['data'] );
+	if ($metadata) {
+		unset($metadata['image']['data']);
 	}
 
 	/**
@@ -289,7 +289,7 @@ 
 	 * @param array $metadata      An array of attachment meta data.
 	 * @param int   $attachment_id Current attachment ID.
 	 */
-	return apply_filters( 'wp_generate_attachment_metadata', $metadata, $attachment_id );
+	return apply_filters('wp_generate_attachment_metadata', $metadata, $attachment_id);
 }
 
 /**
@@ -301,8 +301,8 @@ 
  * @return int|float
  */
 function wp_exif_frac2dec($str) {
-	@list( $n, $d ) = explode( '/', $str );
-	if ( !empty($d) )
+	@list($n, $d) = explode('/', $str);
+	if ( ! empty($d))
 		return $n / $d;
 	return $str;
 }
@@ -316,10 +316,10 @@ 
  * @return int
  */
 function wp_exif_date2ts($str) {
-	@list( $date, $time ) = explode( ' ', trim($str) );
-	@list( $y, $m, $d ) = explode( ':', $date );
+	@list($date, $time) = explode(' ', trim($str));
+	@list($y, $m, $d) = explode(':', $date);
 
-	return strtotime( "{$y}-{$m}-{$d} {$time}" );
+	return strtotime("{$y}-{$m}-{$d} {$time}");
 }
 
 /**
@@ -338,11 +338,11 @@ 
  * @param string $file
  * @return bool|array False on failure. Image metadata array on success.
  */
-function wp_read_image_metadata( $file ) {
-	if ( ! file_exists( $file ) )
+function wp_read_image_metadata($file) {
+	if ( ! file_exists($file))
 		return false;
 
-	list( , , $sourceImageType ) = getimagesize( $file );
+	list(,, $sourceImageType) = getimagesize($file);
 
 	/*
 	 * EXIF contains a bunch of data we'll probably never need formatted in ways
@@ -370,31 +370,31 @@ 
 	 * Read IPTC first, since it might contain data not available in exif such
 	 * as caption, description etc.
 	 */
-	if ( is_callable( 'iptcparse' ) ) {
-		getimagesize( $file, $info );
+	if (is_callable('iptcparse')) {
+		getimagesize($file, $info);
 
-		if ( ! empty( $info['APP13'] ) ) {
-			$iptc = iptcparse( $info['APP13'] );
+		if ( ! empty($info['APP13'])) {
+			$iptc = iptcparse($info['APP13']);
 
 			// Headline, "A brief synopsis of the caption."
-			if ( ! empty( $iptc['2#105'][0] ) ) {
-				$meta['title'] = trim( $iptc['2#105'][0] );
+			if ( ! empty($iptc['2#105'][0])) {
+				$meta['title'] = trim($iptc['2#105'][0]);
 			/*
 			 * Title, "Many use the Title field to store the filename of the image,
 			 * though the field may be used in many ways."
 			 */
-			} elseif ( ! empty( $iptc['2#005'][0] ) ) {
-				$meta['title'] = trim( $iptc['2#005'][0] );
+			} elseif ( ! empty($iptc['2#005'][0])) {
+				$meta['title'] = trim($iptc['2#005'][0]);
 			}
 
-			if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption
-				$caption = trim( $iptc['2#120'][0] );
+			if ( ! empty($iptc['2#120'][0])) { // description / legacy caption
+				$caption = trim($iptc['2#120'][0]);
 
 				mbstring_binary_safe_encoding();
-				$caption_length = strlen( $caption );
+				$caption_length = strlen($caption);
 				reset_mbstring_encoding();
 
-				if ( empty( $meta['title'] ) && $caption_length < 80 ) {
+				if (empty($meta['title']) && $caption_length < 80) {
 					// Assume the title is stored in 2:120 if it's short.
 					$meta['title'] = $caption;
 				}
@@ -402,19 +402,19 @@ 
 				$meta['caption'] = $caption;
 			}
 
-			if ( ! empty( $iptc['2#110'][0] ) ) // credit
-				$meta['credit'] = trim( $iptc['2#110'][0] );
-			elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline
-				$meta['credit'] = trim( $iptc['2#080'][0] );
+			if ( ! empty($iptc['2#110'][0])) // credit
+				$meta['credit'] = trim($iptc['2#110'][0]);
+			elseif ( ! empty($iptc['2#080'][0])) // creator / legacy byline
+				$meta['credit'] = trim($iptc['2#080'][0]);
 
-			if ( ! empty( $iptc['2#055'][0] ) && ! empty( $iptc['2#060'][0] ) ) // created date and time
-				$meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] );
+			if ( ! empty($iptc['2#055'][0]) && ! empty($iptc['2#060'][0])) // created date and time
+				$meta['created_timestamp'] = strtotime($iptc['2#055'][0].' '.$iptc['2#060'][0]);
 
-			if ( ! empty( $iptc['2#116'][0] ) ) // copyright
-				$meta['copyright'] = trim( $iptc['2#116'][0] );
+			if ( ! empty($iptc['2#116'][0])) // copyright
+				$meta['copyright'] = trim($iptc['2#116'][0]);
 
-			if ( ! empty( $iptc['2#025'][0] ) ) { // keywords array
-				$meta['keywords'] = array_values( $iptc['2#025'] );
+			if ( ! empty($iptc['2#025'][0])) { // keywords array
+				$meta['keywords'] = array_values($iptc['2#025']);
 			}
 		 }
 	}
@@ -426,78 +426,78 @@ 
 	 *
 	 * @param array $image_types Image types to check for exif data.
 	 */
-	if ( is_callable( 'exif_read_data' ) && in_array( $sourceImageType, apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) ) ) ) {
-		$exif = @exif_read_data( $file );
+	if (is_callable('exif_read_data') && in_array($sourceImageType, apply_filters('wp_read_image_metadata_types', array(IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM)))) {
+		$exif = @exif_read_data($file);
 
-		if ( ! empty( $exif['ImageDescription'] ) ) {
+		if ( ! empty($exif['ImageDescription'])) {
 			mbstring_binary_safe_encoding();
-			$description_length = strlen( $exif['ImageDescription'] );
+			$description_length = strlen($exif['ImageDescription']);
 			reset_mbstring_encoding();
 
-			if ( empty( $meta['title'] ) && $description_length < 80 ) {
+			if (empty($meta['title']) && $description_length < 80) {
 				// Assume the title is stored in ImageDescription
-				$meta['title'] = trim( $exif['ImageDescription'] );
+				$meta['title'] = trim($exif['ImageDescription']);
 			}
 
-			if ( empty( $meta['caption'] ) && ! empty( $exif['COMPUTED']['UserComment'] ) ) {
-				$meta['caption'] = trim( $exif['COMPUTED']['UserComment'] );
+			if (empty($meta['caption']) && ! empty($exif['COMPUTED']['UserComment'])) {
+				$meta['caption'] = trim($exif['COMPUTED']['UserComment']);
 			}
 
-			if ( empty( $meta['caption'] ) ) {
-				$meta['caption'] = trim( $exif['ImageDescription'] );
+			if (empty($meta['caption'])) {
+				$meta['caption'] = trim($exif['ImageDescription']);
 			}
-		} elseif ( empty( $meta['caption'] ) && ! empty( $exif['Comments'] ) ) {
-			$meta['caption'] = trim( $exif['Comments'] );
+		} elseif (empty($meta['caption']) && ! empty($exif['Comments'])) {
+			$meta['caption'] = trim($exif['Comments']);
 		}
 
-		if ( empty( $meta['credit'] ) ) {
-			if ( ! empty( $exif['Artist'] ) ) {
-				$meta['credit'] = trim( $exif['Artist'] );
-			} elseif ( ! empty($exif['Author'] ) ) {
-				$meta['credit'] = trim( $exif['Author'] );
+		if (empty($meta['credit'])) {
+			if ( ! empty($exif['Artist'])) {
+				$meta['credit'] = trim($exif['Artist']);
+			} elseif ( ! empty($exif['Author'])) {
+				$meta['credit'] = trim($exif['Author']);
 			}
 		}
 
-		if ( empty( $meta['copyright'] ) && ! empty( $exif['Copyright'] ) ) {
-			$meta['copyright'] = trim( $exif['Copyright'] );
+		if (empty($meta['copyright']) && ! empty($exif['Copyright'])) {
+			$meta['copyright'] = trim($exif['Copyright']);
 		}
-		if ( ! empty( $exif['FNumber'] ) ) {
-			$meta['aperture'] = round( wp_exif_frac2dec( $exif['FNumber'] ), 2 );
+		if ( ! empty($exif['FNumber'])) {
+			$meta['aperture'] = round(wp_exif_frac2dec($exif['FNumber']), 2);
 		}
-		if ( ! empty( $exif['Model'] ) ) {
-			$meta['camera'] = trim( $exif['Model'] );
+		if ( ! empty($exif['Model'])) {
+			$meta['camera'] = trim($exif['Model']);
 		}
-		if ( empty( $meta['created_timestamp'] ) && ! empty( $exif['DateTimeDigitized'] ) ) {
-			$meta['created_timestamp'] = wp_exif_date2ts( $exif['DateTimeDigitized'] );
+		if (empty($meta['created_timestamp']) && ! empty($exif['DateTimeDigitized'])) {
+			$meta['created_timestamp'] = wp_exif_date2ts($exif['DateTimeDigitized']);
 		}
-		if ( ! empty( $exif['FocalLength'] ) ) {
-			$meta['focal_length'] = (string) wp_exif_frac2dec( $exif['FocalLength'] );
+		if ( ! empty($exif['FocalLength'])) {
+			$meta['focal_length'] = (string) wp_exif_frac2dec($exif['FocalLength']);
 		}
-		if ( ! empty( $exif['ISOSpeedRatings'] ) ) {
-			$meta['iso'] = is_array( $exif['ISOSpeedRatings'] ) ? reset( $exif['ISOSpeedRatings'] ) : $exif['ISOSpeedRatings'];
-			$meta['iso'] = trim( $meta['iso'] );
+		if ( ! empty($exif['ISOSpeedRatings'])) {
+			$meta['iso'] = is_array($exif['ISOSpeedRatings']) ? reset($exif['ISOSpeedRatings']) : $exif['ISOSpeedRatings'];
+			$meta['iso'] = trim($meta['iso']);
 		}
-		if ( ! empty( $exif['ExposureTime'] ) ) {
-			$meta['shutter_speed'] = (string) wp_exif_frac2dec( $exif['ExposureTime'] );
+		if ( ! empty($exif['ExposureTime'])) {
+			$meta['shutter_speed'] = (string) wp_exif_frac2dec($exif['ExposureTime']);
 		}
-		if ( ! empty( $exif['Orientation'] ) ) {
+		if ( ! empty($exif['Orientation'])) {
 			$meta['orientation'] = $exif['Orientation'];
 		}
 	}
 
-	foreach ( array( 'title', 'caption', 'credit', 'copyright', 'camera', 'iso' ) as $key ) {
-		if ( $meta[ $key ] && ! seems_utf8( $meta[ $key ] ) ) {
-			$meta[ $key ] = utf8_encode( $meta[ $key ] );
+	foreach (array('title', 'caption', 'credit', 'copyright', 'camera', 'iso') as $key) {
+		if ($meta[$key] && ! seems_utf8($meta[$key])) {
+			$meta[$key] = utf8_encode($meta[$key]);
 		}
 	}
 
-	foreach ( $meta['keywords'] as $key => $keyword ) {
-		if ( ! seems_utf8( $keyword ) ) {
-			$meta['keywords'][ $key ] = utf8_encode( $keyword );
+	foreach ($meta['keywords'] as $key => $keyword) {
+		if ( ! seems_utf8($keyword)) {
+			$meta['keywords'][$key] = utf8_encode($keyword);
 		}
 	}
 
-	$meta = wp_kses_post_deep( $meta );
+	$meta = wp_kses_post_deep($meta);
 
 	/**
 	 * Filters the array of meta data read from an image's exif data.
@@ -510,7 +510,7 @@ 
 	 * @param int    $sourceImageType Type of image.
 	 * @param array  $iptc            IPTC data.
 	 */
-	return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType, $iptc );
+	return apply_filters('wp_read_image_metadata', $meta, $file, $sourceImageType, $iptc);
 
 }
 
@@ -524,7 +524,7 @@ 
  */
 function file_is_valid_image($path) {
 	$size = @getimagesize($path);
-	return !empty($size);
+	return ! empty($size);
 }
 
 /**
@@ -536,12 +536,12 @@ 
  * @return bool True if suitable, false if not suitable.
  */
 function file_is_displayable_image($path) {
-	$displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP );
+	$displayable_image_types = array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP);
 
-	$info = @getimagesize( $path );
-	if ( empty( $info ) ) {
+	$info = @getimagesize($path);
+	if (empty($info)) {
 		$result = false;
-	} elseif ( ! in_array( $info[2], $displayable_image_types ) ) {
+	} elseif ( ! in_array($info[2], $displayable_image_types)) {
 		$result = false;
 	} else {
 		$result = true;
@@ -555,7 +555,7 @@ 
 	 * @param bool   $result Whether the image can be displayed. Default true.
 	 * @param string $path   Path to the image.
 	 */
-	return apply_filters( 'file_is_displayable_image', $result, $path );
+	return apply_filters('file_is_displayable_image', $result, $path);
 }
 
 /**
@@ -568,12 +568,12 @@ 
  * @param string $size Optional. Image size, defaults to 'full'.
  * @return resource|false The resulting image resource on success, false on failure.
  */
-function load_image_to_edit( $attachment_id, $mime_type, $size = 'full' ) {
-	$filepath = _load_image_to_edit_path( $attachment_id, $size );
-	if ( empty( $filepath ) )
+function load_image_to_edit($attachment_id, $mime_type, $size = 'full') {
+	$filepath = _load_image_to_edit_path($attachment_id, $size);
+	if (empty($filepath))
 		return false;
 
-	switch ( $mime_type ) {
+	switch ($mime_type) {
 		case 'image/jpeg':
 			$image = imagecreatefromjpeg($filepath);
 			break;
@@ -587,7 +587,7 @@ 
 			$image = false;
 			break;
 	}
-	if ( is_resource($image) ) {
+	if (is_resource($image)) {
 		/**
 		 * Filters the current image being loaded for editing.
 		 *
@@ -597,8 +597,8 @@ 
 		 * @param string   $attachment_id Attachment ID.
 		 * @param string   $size          Image size.
 		 */
-		$image = apply_filters( 'load_image_to_edit', $image, $attachment_id, $size );
-		if ( function_exists('imagealphablending') && function_exists('imagesavealpha') ) {
+		$image = apply_filters('load_image_to_edit', $image, $attachment_id, $size);
+		if (function_exists('imagealphablending') && function_exists('imagesavealpha')) {
 			imagealphablending($image, false);
 			imagesavealpha($image, true);
 		}
@@ -619,11 +619,11 @@ 
  * @param string $size Optional. Image size, defaults to 'full'.
  * @return string|false File path or url on success, false on failure.
  */
-function _load_image_to_edit_path( $attachment_id, $size = 'full' ) {
-	$filepath = get_attached_file( $attachment_id );
+function _load_image_to_edit_path($attachment_id, $size = 'full') {
+	$filepath = get_attached_file($attachment_id);
 
-	if ( $filepath && file_exists( $filepath ) ) {
-		if ( 'full' != $size && ( $data = image_get_intermediate_size( $attachment_id, $size ) ) ) {
+	if ($filepath && file_exists($filepath)) {
+		if ('full' != $size && ($data = image_get_intermediate_size($attachment_id, $size))) {
 			/**
 			 * Filters the path to the current image.
 			 *
@@ -635,9 +635,9 @@ 
 			 * @param string $attachment_id Attachment ID.
 			 * @param string $size          Size of the image.
 			 */
-			$filepath = apply_filters( 'load_image_to_edit_filesystempath', path_join( dirname( $filepath ), $data['file'] ), $attachment_id, $size );
+			$filepath = apply_filters('load_image_to_edit_filesystempath', path_join(dirname($filepath), $data['file']), $attachment_id, $size);
 		}
-	} elseif ( function_exists( 'fopen' ) && true == ini_get( 'allow_url_fopen' ) ) {
+	} elseif (function_exists('fopen') && true == ini_get('allow_url_fopen')) {
 		/**
 		 * Filters the image URL if not in the local filesystem.
 		 *
@@ -649,7 +649,7 @@ 
 		 * @param string $attachment_id Attachment ID.
 		 * @param string $size          Size of the image.
 		 */
-		$filepath = apply_filters( 'load_image_to_edit_attachmenturl', wp_get_attachment_url( $attachment_id ), $attachment_id, $size );
+		$filepath = apply_filters('load_image_to_edit_attachmenturl', wp_get_attachment_url($attachment_id), $attachment_id, $size);
 	}
 
 	/**
@@ -661,7 +661,7 @@ 
 	 * @param string      $attachment_id Attachment ID.
 	 * @param string      $size          Size of the image.
 	 */
-	return apply_filters( 'load_image_to_edit_path', $filepath, $attachment_id, $size );
+	return apply_filters('load_image_to_edit_path', $filepath, $attachment_id, $size);
 }
 
 /**
@@ -673,22 +673,22 @@ 
  * @param string $attachment_id Attachment ID.
  * @return string|false New file path on success, false on failure.
  */
-function _copy_image_file( $attachment_id ) {
-	$dst_file = $src_file = get_attached_file( $attachment_id );
-	if ( ! file_exists( $src_file ) )
-		$src_file = _load_image_to_edit_path( $attachment_id );
+function _copy_image_file($attachment_id) {
+	$dst_file = $src_file = get_attached_file($attachment_id);
+	if ( ! file_exists($src_file))
+		$src_file = _load_image_to_edit_path($attachment_id);
 
-	if ( $src_file ) {
-		$dst_file = str_replace( basename( $dst_file ), 'copy-' . basename( $dst_file ), $dst_file );
-		$dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
+	if ($src_file) {
+		$dst_file = str_replace(basename($dst_file), 'copy-'.basename($dst_file), $dst_file);
+		$dst_file = dirname($dst_file).'/'.wp_unique_filename(dirname($dst_file), basename($dst_file));
 
 		/*
 		 * The directory containing the original file may no longer
 		 * exist when using a replication plugin.
 		 */
-		wp_mkdir_p( dirname( $dst_file ) );
+		wp_mkdir_p(dirname($dst_file));
 
-		if ( ! @copy( $src_file, $dst_file ) )
+		if ( ! @copy($src_file, $dst_file))
 			$dst_file = false;
 	} else {
 		$dst_file = false;

src/wp-admin/includes/revision.php

Braces +24 added lines, -16 removed lines

@@ -19,26 +19,31 @@ 
  *                    Or, false on failure.
  */
 function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
-	if ( ! $post = get_post( $post ) )
-		return false;
+	if ( ! $post = get_post( $post ) ) {
+			return false;
+	}
 
 	if ( $compare_from ) {
-		if ( ! $compare_from = get_post( $compare_from ) )
-			return false;
+		if ( ! $compare_from = get_post( $compare_from ) ) {
+					return false;
+		}
 	} else {
 		// If we're dealing with the first revision...
 		$compare_from = false;
 	}
 
-	if ( ! $compare_to = get_post( $compare_to ) )
-		return false;
+	if ( ! $compare_to = get_post( $compare_to ) ) {
+			return false;
+	}
 
 	// If comparing revisions, make sure we're dealing with the right post parent.
 	// The parent post may be a 'revision' when revisions are disabled and we're looking at autosaves.
-	if ( $compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID )
-		return false;
-	if ( $compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID )
-		return false;
+	if ( $compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID ) {
+			return false;
+	}
+	if ( $compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID ) {
+			return false;
+	}
 
 	if ( $compare_from && strtotime( $compare_from->post_date_gmt ) > strtotime( $compare_to->post_date_gmt ) ) {
 		$temp = $compare_from;
@@ -47,10 +52,12 @@ 
 	}
 
 	// Add default title if title field is empty
-	if ( $compare_from && empty( $compare_from->post_title ) )
-		$compare_from->post_title = __( '(no title)' );
-	if ( empty( $compare_to->post_title ) )
-		$compare_to->post_title = __( '(no title)' );
+	if ( $compare_from && empty( $compare_from->post_title ) ) {
+			$compare_from->post_title = __( '(no title)' );
+	}
+	if ( empty( $compare_to->post_title ) ) {
+			$compare_to->post_title = __( '(no title)' );
+	}
 
 	$return = array();
 
@@ -150,8 +157,9 @@ 
 	// If revisions are disabled, we only want autosaves and the current post.
 	if ( ! wp_revisions_enabled( $post ) ) {
 		foreach ( $revisions as $revision_id => $revision ) {
-			if ( ! wp_is_post_autosave( $revision ) )
-				unset( $revisions[ $revision_id ] );
+			if ( ! wp_is_post_autosave( $revision ) ) {
+							unset( $revisions[ $revision_id ] );
+			}
 		}
 		$revisions = array( $post->ID => $post ) + $revisions;
 	}

Spacing +99 added lines, -99 removed lines

@@ -19,43 +19,43 @@ 
  * @return array|bool Associative array of a post's revisioned fields and their diffs.
  *                    Or, false on failure.
  */
-function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
-	if ( ! $post = get_post( $post ) )
+function wp_get_revision_ui_diff($post, $compare_from, $compare_to) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	if ( $compare_from ) {
-		if ( ! $compare_from = get_post( $compare_from ) )
+	if ($compare_from) {
+		if ( ! $compare_from = get_post($compare_from))
 			return false;
 	} else {
 		// If we're dealing with the first revision...
 		$compare_from = false;
 	}
 
-	if ( ! $compare_to = get_post( $compare_to ) )
+	if ( ! $compare_to = get_post($compare_to))
 		return false;
 
 	// If comparing revisions, make sure we're dealing with the right post parent.
 	// The parent post may be a 'revision' when revisions are disabled and we're looking at autosaves.
-	if ( $compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID )
+	if ($compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID)
 		return false;
-	if ( $compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID )
+	if ($compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID)
 		return false;
 
-	if ( $compare_from && strtotime( $compare_from->post_date_gmt ) > strtotime( $compare_to->post_date_gmt ) ) {
+	if ($compare_from && strtotime($compare_from->post_date_gmt) > strtotime($compare_to->post_date_gmt)) {
 		$temp = $compare_from;
 		$compare_from = $compare_to;
 		$compare_to = $temp;
 	}
 
 	// Add default title if title field is empty
-	if ( $compare_from && empty( $compare_from->post_title ) )
-		$compare_from->post_title = __( '(no title)' );
-	if ( empty( $compare_to->post_title ) )
-		$compare_to->post_title = __( '(no title)' );
+	if ($compare_from && empty($compare_from->post_title))
+		$compare_from->post_title = __('(no title)');
+	if (empty($compare_to->post_title))
+		$compare_to->post_title = __('(no title)');
 
 	$return = array();
 
-	foreach ( _wp_post_revision_fields( $post ) as $field => $name ) {
+	foreach (_wp_post_revision_fields($post) as $field => $name) {
 		/**
 		 * Contextually filter a post revision field.
 		 *
@@ -70,10 +70,10 @@ 
 		 * @param string  null                  The context of whether the current revision is the old
 		 *                                      or the new one. Values are 'to' or 'from'.
 		 */
-		$content_from = $compare_from ? apply_filters( "_wp_post_revision_field_{$field}", $compare_from->$field, $field, $compare_from, 'from' ) : '';
+		$content_from = $compare_from ? apply_filters("_wp_post_revision_field_{$field}", $compare_from->$field, $field, $compare_from, 'from') : '';
 
 		/** This filter is documented in wp-admin/includes/revision.php */
-		$content_to = apply_filters( "_wp_post_revision_field_{$field}", $compare_to->$field, $field, $compare_to, 'to' );
+		$content_to = apply_filters("_wp_post_revision_field_{$field}", $compare_to->$field, $field, $compare_to, 'to');
 
 		$args = array(
 			'show_split_view' => true
@@ -96,20 +96,20 @@ 
 		 * @param WP_Post $compare_from The revision post to compare from.
 		 * @param WP_Post $compare_to   The revision post to compare to.
 		 */
-		$args = apply_filters( 'revision_text_diff_options', $args, $field, $compare_from, $compare_to );
+		$args = apply_filters('revision_text_diff_options', $args, $field, $compare_from, $compare_to);
 
-		$diff = wp_text_diff( $content_from, $content_to, $args );
+		$diff = wp_text_diff($content_from, $content_to, $args);
 
-		if ( ! $diff && 'post_title' === $field ) {
+		if ( ! $diff && 'post_title' === $field) {
 			// It's a better user experience to still show the Title, even if it didn't change.
 			// No, you didn't see this.
 			$diff = '<table class="diff"><colgroup><col class="content diffsplit left"><col class="content diffsplit middle"><col class="content diffsplit right"></colgroup><tbody><tr>';
-			$diff .= '<td>' . esc_html( $compare_from->post_title ) . '</td><td></td><td>' . esc_html( $compare_to->post_title ) . '</td>';
+			$diff .= '<td>'.esc_html($compare_from->post_title).'</td><td></td><td>'.esc_html($compare_to->post_title).'</td>';
 			$diff .= '</tr></tbody>';
 			$diff .= '</table>';
 		}
 
-		if ( $diff ) {
+		if ($diff) {
 			$return[] = array(
 				'id' => $field,
 				'name' => $name,
@@ -127,7 +127,7 @@ 
 	 * @param WP_Post $compare_from The revision post to compare from.
 	 * @param WP_Post $compare_to   The revision post to compare to.
 	 */
-	return apply_filters( 'wp_get_revision_ui_diff', $return, $compare_from, $compare_to );
+	return apply_filters('wp_get_revision_ui_diff', $return, $compare_from, $compare_to);
 
 }
 
@@ -142,71 +142,71 @@ 
  *
  * @return array An associative array of revision data and related settings.
  */
-function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null ) {
-	$post = get_post( $post );
+function wp_prepare_revisions_for_js($post, $selected_revision_id, $from = null) {
+	$post = get_post($post);
 	$authors = array();
 	$now_gmt = time();
 
-	$revisions = wp_get_post_revisions( $post->ID, array( 'order' => 'ASC', 'check_enabled' => false ) );
+	$revisions = wp_get_post_revisions($post->ID, array('order' => 'ASC', 'check_enabled' => false));
 	// If revisions are disabled, we only want autosaves and the current post.
-	if ( ! wp_revisions_enabled( $post ) ) {
-		foreach ( $revisions as $revision_id => $revision ) {
-			if ( ! wp_is_post_autosave( $revision ) )
-				unset( $revisions[ $revision_id ] );
+	if ( ! wp_revisions_enabled($post)) {
+		foreach ($revisions as $revision_id => $revision) {
+			if ( ! wp_is_post_autosave($revision))
+				unset($revisions[$revision_id]);
 		}
-		$revisions = array( $post->ID => $post ) + $revisions;
+		$revisions = array($post->ID => $post) + $revisions;
 	}
 
-	$show_avatars = get_option( 'show_avatars' );
+	$show_avatars = get_option('show_avatars');
 
-	cache_users( wp_list_pluck( $revisions, 'post_author' ) );
+	cache_users(wp_list_pluck($revisions, 'post_author'));
 
-	$can_restore = current_user_can( 'edit_post', $post->ID );
+	$can_restore = current_user_can('edit_post', $post->ID);
 	$current_id = false;
 
-	foreach ( $revisions as $revision ) {
-		$modified = strtotime( $revision->post_modified );
-		$modified_gmt = strtotime( $revision->post_modified_gmt );
-		if ( $can_restore ) {
-			$restore_link = str_replace( '&amp;', '&', wp_nonce_url(
+	foreach ($revisions as $revision) {
+		$modified = strtotime($revision->post_modified);
+		$modified_gmt = strtotime($revision->post_modified_gmt);
+		if ($can_restore) {
+			$restore_link = str_replace('&amp;', '&', wp_nonce_url(
 				add_query_arg(
-					array( 'revision' => $revision->ID,
-						'action' => 'restore' ),
-						admin_url( 'revision.php' )
+					array('revision' => $revision->ID,
+						'action' => 'restore'),
+						admin_url('revision.php')
 				),
 				"restore-post_{$revision->ID}"
-			) );
+			));
 		}
 
-		if ( ! isset( $authors[ $revision->post_author ] ) ) {
-			$authors[ $revision->post_author ] = array(
+		if ( ! isset($authors[$revision->post_author])) {
+			$authors[$revision->post_author] = array(
 				'id' => (int) $revision->post_author,
-				'avatar' => $show_avatars ? get_avatar( $revision->post_author, 32 ) : '',
-				'name' => get_the_author_meta( 'display_name', $revision->post_author ),
+				'avatar' => $show_avatars ? get_avatar($revision->post_author, 32) : '',
+				'name' => get_the_author_meta('display_name', $revision->post_author),
 			);
 		}
 
-		$autosave = (bool) wp_is_post_autosave( $revision );
+		$autosave = (bool) wp_is_post_autosave($revision);
 		$current = ! $autosave && $revision->post_modified_gmt === $post->post_modified_gmt;
-		if ( $current && ! empty( $current_id ) ) {
+		if ($current && ! empty($current_id)) {
 			// If multiple revisions have the same post_modified_gmt, highest ID is current.
-			if ( $current_id < $revision->ID ) {
-				$revisions[ $current_id ]['current'] = false;
+			if ($current_id < $revision->ID) {
+				$revisions[$current_id]['current'] = false;
 				$current_id = $revision->ID;
 			} else {
 				$current = false;
 			}
-		} elseif ( $current ) {
+		} elseif ($current) {
 			$current_id = $revision->ID;
 		}
 
 		$revisions_data = array(
 			'id'         => $revision->ID,
-			'title'      => get_the_title( $post->ID ),
-			'author'     => $authors[ $revision->post_author ],
-			'date'       => date_i18n( __( 'M j, Y @ H:i' ), $modified ),
-			'dateShort'  => date_i18n( _x( 'j M @ H:i', 'revision date short format' ), $modified ),
-			'timeAgo'    => sprintf( __( '%s ago' ), human_time_diff( $modified_gmt, $now_gmt ) ),
+			'title'      => get_the_title($post->ID),
+			'author'     => $authors[$revision->post_author],
+			'date'       => date_i18n(__('M j, Y @ H:i'), $modified),
+			'dateShort'  => date_i18n(_x('j M @ H:i', 'revision date short format'), $modified),
+			'timeAgo'    => sprintf(__('%s ago'), human_time_diff($modified_gmt, $now_gmt)),
 			'autosave'   => $autosave,
 			'current'    => $current,
 			'restoreUrl' => $can_restore ? $restore_link : false,
@@ -234,21 +234,21 @@ 
 		 * @param WP_Post $revision       The revision's WP_Post object.
 		 * @param WP_Post $post           The revision's parent WP_Post object.
 		 */
-		$revisions[ $revision->ID ] = apply_filters( 'wp_prepare_revision_for_js', $revisions_data, $revision, $post );
+		$revisions[$revision->ID] = apply_filters('wp_prepare_revision_for_js', $revisions_data, $revision, $post);
 	}
 
 	/**
 	 * If we only have one revision, the initial revision is missing; This happens
 	 * when we have an autsosave and the user has clicked 'View the Autosave'
 	 */
-	if ( 1 === sizeof( $revisions ) ) {
-		$revisions[ $post->ID ] = array(
+	if (1 === sizeof($revisions)) {
+		$revisions[$post->ID] = array(
 			'id'         => $post->ID,
-			'title'      => get_the_title( $post->ID ),
-			'author'     => $authors[ $post->post_author ],
-			'date'       => date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_modified ) ),
-			'dateShort'  => date_i18n( _x( 'j M @ H:i', 'revision date short format' ), strtotime( $post->post_modified ) ),
-			'timeAgo'    => sprintf( __( '%s ago' ), human_time_diff( strtotime( $post->post_modified_gmt ), $now_gmt ) ),
+			'title'      => get_the_title($post->ID),
+			'author'     => $authors[$post->post_author],
+			'date'       => date_i18n(__('M j, Y @ H:i'), strtotime($post->post_modified)),
+			'dateShort'  => date_i18n(_x('j M @ H:i', 'revision date short format'), strtotime($post->post_modified)),
+			'timeAgo'    => sprintf(__('%s ago'), human_time_diff(strtotime($post->post_modified_gmt), $now_gmt)),
 			'autosave'   => false,
 			'current'    => true,
 			'restoreUrl' => false,
@@ -261,48 +261,48 @@ 
 	 * were changed), we may not have a "current" revision. Mark the latest
 	 * revision as "current".
 	 */
-	if ( empty( $current_id ) ) {
-		if ( $revisions[ $revision->ID ]['autosave'] ) {
-			$revision = end( $revisions );
-			while ( $revision['autosave'] ) {
-				$revision = prev( $revisions );
+	if (empty($current_id)) {
+		if ($revisions[$revision->ID]['autosave']) {
+			$revision = end($revisions);
+			while ($revision['autosave']) {
+				$revision = prev($revisions);
 			}
 			$current_id = $revision['id'];
 		} else {
 			$current_id = $revision->ID;
 		}
-		$revisions[ $current_id ]['current'] = true;
+		$revisions[$current_id]['current'] = true;
 	}
 
 	// Now, grab the initial diff.
-	$compare_two_mode = is_numeric( $from );
-	if ( ! $compare_two_mode ) {
-		$found = array_search( $selected_revision_id, array_keys( $revisions ) );
-		if ( $found ) {
-			$from = array_keys( array_slice( $revisions, $found - 1, 1, true ) );
-			$from = reset( $from );
+	$compare_two_mode = is_numeric($from);
+	if ( ! $compare_two_mode) {
+		$found = array_search($selected_revision_id, array_keys($revisions));
+		if ($found) {
+			$from = array_keys(array_slice($revisions, $found - 1, 1, true));
+			$from = reset($from);
 		} else {
 			$from = 0;
 		}
 	}
 
-	$from = absint( $from );
+	$from = absint($from);
 
-	$diffs = array( array(
-		'id' => $from . ':' . $selected_revision_id,
-		'fields' => wp_get_revision_ui_diff( $post->ID, $from, $selected_revision_id ),
+	$diffs = array(array(
+		'id' => $from.':'.$selected_revision_id,
+		'fields' => wp_get_revision_ui_diff($post->ID, $from, $selected_revision_id),
 	));
 
 	return array(
 		'postId'           => $post->ID,
-		'nonce'            => wp_create_nonce( 'revisions-ajax-nonce' ),
-		'revisionData'     => array_values( $revisions ),
+		'nonce'            => wp_create_nonce('revisions-ajax-nonce'),
+		'revisionData'     => array_values($revisions),
 		'to'               => $selected_revision_id,
 		'from'             => $from,
 		'diffData'         => $diffs,
-		'baseUrl'          => parse_url( admin_url( 'revision.php' ), PHP_URL_PATH ),
-		'compareTwoMode'   => absint( $compare_two_mode ), // Apparently booleans are not allowed
-		'revisionIds'      => array_keys( $revisions ),
+		'baseUrl'          => parse_url(admin_url('revision.php'), PHP_URL_PATH),
+		'compareTwoMode'   => absint($compare_two_mode), // Apparently booleans are not allowed
+		'revisionIds'      => array_keys($revisions),
 	);
 }
 
@@ -322,11 +322,11 @@ 
 
 	<script id="tmpl-revisions-buttons" type="text/html">
 		<div class="revisions-previous">
-			<input class="button" type="button" value="<?php echo esc_attr_x( 'Previous', 'Button label for a previous revision' ); ?>" />
+			<input class="button" type="button" value="<?php echo esc_attr_x('Previous', 'Button label for a previous revision'); ?>" />
 		</div>
 
 		<div class="revisions-next">
-			<input class="button" type="button" value="<?php echo esc_attr_x( 'Next', 'Button label for a next revision' ); ?>" />
+			<input class="button" type="button" value="<?php echo esc_attr_x('Next', 'Button label for a next revision'); ?>" />
 		</div>
 	</script>
 
@@ -340,7 +340,7 @@ 
 				}
 				#>
 				/>
-				<?php esc_html_e( 'Compare any two revisions' ); ?>
+				<?php esc_html_e('Compare any two revisions'); ?>
 			</label>
 		</div>
 	</script>
@@ -349,28 +349,28 @@ 
 		<# if ( ! _.isUndefined( data.attributes ) ) { #>
 			<div class="diff-title">
 				<# if ( 'from' === data.type ) { #>
-					<strong><?php _ex( 'From:', 'Followed by post revision info' ); ?></strong>
+					<strong><?php _ex('From:', 'Followed by post revision info'); ?></strong>
 				<# } else if ( 'to' === data.type ) { #>
-					<strong><?php _ex( 'To:', 'Followed by post revision info' ); ?></strong>
+					<strong><?php _ex('To:', 'Followed by post revision info'); ?></strong>
 				<# } #>
 				<div class="author-card<# if ( data.attributes.autosave ) { #> autosave<# } #>">
 					{{{ data.attributes.author.avatar }}}
 					<div class="author-info">
 					<# if ( data.attributes.autosave ) { #>
-						<span class="byline"><?php printf( __( 'Autosave by %s' ),
-							'<span class="author-name">{{ data.attributes.author.name }}</span>' ); ?></span>
+						<span class="byline"><?php printf(__('Autosave by %s'),
+							'<span class="author-name">{{ data.attributes.author.name }}</span>'); ?></span>
 					<# } else if ( data.attributes.current ) { #>
-						<span class="byline"><?php printf( __( 'Current Revision by %s' ),
-							'<span class="author-name">{{ data.attributes.author.name }}</span>' ); ?></span>
+						<span class="byline"><?php printf(__('Current Revision by %s'),
+							'<span class="author-name">{{ data.attributes.author.name }}</span>'); ?></span>
 					<# } else { #>
-						<span class="byline"><?php printf( __( 'Revision by %s' ),
-							'<span class="author-name">{{ data.attributes.author.name }}</span>' ); ?></span>
+						<span class="byline"><?php printf(__('Revision by %s'),
+							'<span class="author-name">{{ data.attributes.author.name }}</span>'); ?></span>
 					<# } #>
 						<span class="time-ago">{{ data.attributes.timeAgo }}</span>
 						<span class="date">({{ data.attributes.dateShort }})</span>
 					</div>
 				<# if ( 'to' === data.type && data.attributes.restoreUrl ) { #>
-					<input  <?php if ( wp_check_post_lock( $post->ID ) ) { ?>
+					<input  <?php if (wp_check_post_lock($post->ID)) { ?>
 						disabled="disabled"
 					<?php } else { ?>
 						<# if ( data.attributes.current ) { #>
@@ -378,9 +378,9 @@ 
 						<# } #>
 					<?php } ?>
 					<# if ( data.attributes.autosave ) { #>
-						type="button" class="restore-revision button button-primary" value="<?php esc_attr_e( 'Restore This Autosave' ); ?>" />
+						type="button" class="restore-revision button button-primary" value="<?php esc_attr_e('Restore This Autosave'); ?>" />
 					<# } else { #>
-						type="button" class="restore-revision button button-primary" value="<?php esc_attr_e( 'Restore This Revision' ); ?>" />
+						type="button" class="restore-revision button button-primary" value="<?php esc_attr_e('Restore This Revision'); ?>" />
 					<# } #>
 				<# } #>
 			</div>
@@ -392,7 +392,7 @@ 
 
 	<script id="tmpl-revisions-diff" type="text/html">
 		<div class="loading-indicator"><span class="spinner"></span></div>
-		<div class="diff-error"><?php _e( 'Sorry, something went wrong. The requested comparison could not be loaded.' ); ?></div>
+		<div class="diff-error"><?php _e('Sorry, something went wrong. The requested comparison could not be loaded.'); ?></div>
 		<div class="diff">
 		<# _.each( data.fields, function( field ) { #>
 			<h3>{{ field.name }}</h3>

src/wp-admin/includes/class-wp-users-list-table.php

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 	/**
 	 * Check the current user's permissions.
 	 *
- 	 * @since 3.1.0
+	 * @since 3.1.0
 	 * @access public
 	 *
 	 * @return bool

Spacing +109 added lines, -109 removed lines

@@ -45,17 +45,17 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( array(
+	public function __construct($args = array()) {
+		parent::__construct(array(
 			'singular' => 'user',
 			'plural'   => 'users',
-			'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen'   => isset($args['screen']) ? $args['screen'] : null,
+		));
 
 		$this->is_site_users = 'site-users-network' === $this->screen->id;
 
-		if ( $this->is_site_users )
-			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		if ($this->is_site_users)
+			$this->site_id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 	}
 
 	/**
@@ -67,10 +67,10 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		if ( $this->is_site_users )
-			return current_user_can( 'manage_sites' );
+		if ($this->is_site_users)
+			return current_user_can('manage_sites');
 		else
-			return current_user_can( 'list_users' );
+			return current_user_can('list_users');
 	}
 
 	/**
@@ -85,19 +85,19 @@ 
 	public function prepare_items() {
 		global $role, $usersearch;
 
-		$usersearch = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
+		$usersearch = isset($_REQUEST['s']) ? wp_unslash(trim($_REQUEST['s'])) : '';
 
-		$role = isset( $_REQUEST['role'] ) ? $_REQUEST['role'] : '';
+		$role = isset($_REQUEST['role']) ? $_REQUEST['role'] : '';
 
-		$per_page = ( $this->is_site_users ) ? 'site_users_network_per_page' : 'users_per_page';
-		$users_per_page = $this->get_items_per_page( $per_page );
+		$per_page = ($this->is_site_users) ? 'site_users_network_per_page' : 'users_per_page';
+		$users_per_page = $this->get_items_per_page($per_page);
 
 		$paged = $this->get_pagenum();
 
-		if ( 'none' === $role ) {
+		if ('none' === $role) {
 			$args = array(
 				'number' => $users_per_page,
-				'offset' => ( $paged-1 ) * $users_per_page,
+				'offset' => ($paged - 1) * $users_per_page,
 				'include' => wp_get_users_with_no_role(),
 				'search' => $usersearch,
 				'fields' => 'all_with_meta'
@@ -105,23 +105,23 @@ 
 		} else {
 			$args = array(
 				'number' => $users_per_page,
-				'offset' => ( $paged-1 ) * $users_per_page,
+				'offset' => ($paged - 1) * $users_per_page,
 				'role' => $role,
 				'search' => $usersearch,
 				'fields' => 'all_with_meta'
 			);
 		}
 
-		if ( '' !== $args['search'] )
-			$args['search'] = '*' . $args['search'] . '*';
+		if ('' !== $args['search'])
+			$args['search'] = '*'.$args['search'].'*';
 
-		if ( $this->is_site_users )
+		if ($this->is_site_users)
 			$args['blog_id'] = $this->site_id;
 
-		if ( isset( $_REQUEST['orderby'] ) )
+		if (isset($_REQUEST['orderby']))
 			$args['orderby'] = $_REQUEST['orderby'];
 
-		if ( isset( $_REQUEST['order'] ) )
+		if (isset($_REQUEST['order']))
 			$args['order'] = $_REQUEST['order'];
 
 		/**
@@ -132,17 +132,17 @@ 
 		 * @param array $args Arguments passed to WP_User_Query to retrieve items for the current
 		 *                    users list table.
 		 */
-		$args = apply_filters( 'users_list_table_query_args', $args );
+		$args = apply_filters('users_list_table_query_args', $args);
 
 		// Query the user IDs for this page
-		$wp_user_search = new WP_User_Query( $args );
+		$wp_user_search = new WP_User_Query($args);
 
 		$this->items = $wp_user_search->get_results();
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $wp_user_search->get_total(),
 			'per_page' => $users_per_page,
-		) );
+		));
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No users found.' );
+		_e('No users found.');
 	}
 
 	/**
@@ -174,9 +174,9 @@ 
 
 		$wp_roles = wp_roles();
 
-		if ( $this->is_site_users ) {
-			$url = 'site-users.php?id=' . $this->site_id;
-			switch_to_blog( $this->site_id );
+		if ($this->is_site_users) {
+			$url = 'site-users.php?id='.$this->site_id;
+			switch_to_blog($this->site_id);
 			$users_of_blog = count_users();
 			restore_current_blog();
 		} else {
@@ -185,40 +185,40 @@ 
 		}
 
 		$total_users = $users_of_blog['total_users'];
-		$avail_roles =& $users_of_blog['avail_roles'];
+		$avail_roles = & $users_of_blog['avail_roles'];
 		unset($users_of_blog);
 
 		$class = empty($role) ? ' class="current"' : '';
 		$role_links = array();
-		$role_links['all'] = "<a href='$url'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
-		foreach ( $wp_roles->get_names() as $this_role => $name ) {
-			if ( !isset($avail_roles[$this_role]) )
+		$role_links['all'] = "<a href='$url'$class>".sprintf(_nx('All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users'), number_format_i18n($total_users)).'</a>';
+		foreach ($wp_roles->get_names() as $this_role => $name) {
+			if ( ! isset($avail_roles[$this_role]))
 				continue;
 
 			$class = '';
 
-			if ( $this_role === $role ) {
+			if ($this_role === $role) {
 				$class = ' class="current"';
 			}
 
-			$name = translate_user_role( $name );
+			$name = translate_user_role($name);
 			/* translators: User role name with count */
-			$name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles[$this_role] ) );
-			$role_links[$this_role] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$class>$name</a>";
+			$name = sprintf(__('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n($avail_roles[$this_role]));
+			$role_links[$this_role] = "<a href='".esc_url(add_query_arg('role', $this_role, $url))."'$class>$name</a>";
 		}
 
-		if ( ! empty( $avail_roles['none' ] ) ) {
+		if ( ! empty($avail_roles['none'])) {
 
 			$class = '';
 
-			if ( 'none' === $role ) {
+			if ('none' === $role) {
 				$class = ' class="current"';
 			}
 
-			$name = __( 'No role' );
+			$name = __('No role');
 			/* translators: User role name with count */
-			$name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles['none' ] ) );
-			$role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$class>$name</a>";
+			$name = sprintf(__('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n($avail_roles['none']));
+			$role_links['none'] = "<a href='".esc_url(add_query_arg('role', 'none', $url))."'$class>$name</a>";
 
 		}
 
@@ -236,12 +236,12 @@ 
 	protected function get_bulk_actions() {
 		$actions = array();
 
-		if ( is_multisite() ) {
-			if ( current_user_can( 'remove_users' ) )
-				$actions['remove'] = __( 'Remove' );
+		if (is_multisite()) {
+			if (current_user_can('remove_users'))
+				$actions['remove'] = __('Remove');
 		} else {
-			if ( current_user_can( 'delete_users' ) )
-				$actions['delete'] = __( 'Delete' );
+			if (current_user_can('delete_users'))
+				$actions['delete'] = __('Delete');
 		}
 
 		return $actions;
@@ -256,19 +256,19 @@ 
 	 * @param string $which Whether this is being invoked above ("top")
 	 *                      or below the table ("bottom").
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		$id = 'bottom' === $which ? 'new_role2' : 'new_role';
 		$button_id = 'bottom' === $which ? 'changeit2' : 'changeit';
 	?>
 	<div class="alignleft actions">
-		<?php if ( current_user_can( 'promote_users' ) && $this->has_items() ) : ?>
-		<label class="screen-reader-text" for="<?php echo $id ?>"><?php _e( 'Change role to&hellip;' ) ?></label>
+		<?php if (current_user_can('promote_users') && $this->has_items()) : ?>
+		<label class="screen-reader-text" for="<?php echo $id ?>"><?php _e('Change role to&hellip;') ?></label>
 		<select name="<?php echo $id ?>" id="<?php echo $id ?>">
-			<option value=""><?php _e( 'Change role to&hellip;' ) ?></option>
+			<option value=""><?php _e('Change role to&hellip;') ?></option>
 			<?php wp_dropdown_roles(); ?>
 		</select>
 	<?php
-			submit_button( __( 'Change' ), '', $button_id, false );
+			submit_button(__('Change'), '', $button_id, false);
 		endif;
 
 		/**
@@ -280,7 +280,7 @@ 
 		 *
 		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
 		 */
-		do_action( 'restrict_manage_users', $which );
+		do_action('restrict_manage_users', $which);
 		echo '</div>';
 	}
 
@@ -296,8 +296,8 @@ 
 	 * @return string The bulk action required.
 	 */
 	public function current_action() {
-		if ( ( isset( $_REQUEST['changeit'] ) || isset( $_REQUEST['changeit2'] ) ) &&
-			( ! empty( $_REQUEST['new_role'] ) || ! empty( $_REQUEST['new_role2'] ) ) ) {
+		if ((isset($_REQUEST['changeit']) || isset($_REQUEST['changeit2'])) &&
+			( ! empty($_REQUEST['new_role']) || ! empty($_REQUEST['new_role2']))) {
 			return 'promote';
 		}
 
@@ -316,15 +316,15 @@ 
 	public function get_columns() {
 		$c = array(
 			'cb'       => '<input type="checkbox" />',
-			'username' => __( 'Username' ),
-			'name'     => __( 'Name' ),
-			'email'    => __( 'Email' ),
-			'role'     => __( 'Role' ),
-			'posts'    => __( 'Posts' )
+			'username' => __('Username'),
+			'name'     => __('Name'),
+			'email'    => __('Email'),
+			'role'     => __('Role'),
+			'posts'    => __('Posts')
 		);
 
-		if ( $this->is_site_users )
-			unset( $c['posts'] );
+		if ($this->is_site_users)
+			unset($c['posts']);
 
 		return $c;
 	}
@@ -354,14 +354,14 @@ 
 	 */
 	public function display_rows() {
 		// Query the post counts for this page
-		if ( ! $this->is_site_users )
-			$post_counts = count_many_users_posts( array_keys( $this->items ) );
+		if ( ! $this->is_site_users)
+			$post_counts = count_many_users_posts(array_keys($this->items));
 
-		foreach ( $this->items as $userid => $user_object ) {
-			if ( is_multisite() && empty( $user_object->allcaps ) )
+		foreach ($this->items as $userid => $user_object) {
+			if (is_multisite() && empty($user_object->allcaps))
 				continue;
 
-			echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
+			echo "\n\t".$this->single_row($user_object, '', '', isset($post_counts) ? $post_counts[$userid] : 0);
 		}
 	}
 
@@ -380,39 +380,39 @@ 
 	 *                             to zero, as in, a new user has made zero posts.
 	 * @return string Output for a single row.
 	 */
-	public function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) {
-		if ( ! ( $user_object instanceof WP_User ) ) {
-			$user_object = get_userdata( (int) $user_object );
+	public function single_row($user_object, $style = '', $role = '', $numposts = 0) {
+		if ( ! ($user_object instanceof WP_User)) {
+			$user_object = get_userdata((int) $user_object);
 		}
 		$user_object->filter = 'display';
 		$email = $user_object->user_email;
 
-		if ( $this->is_site_users )
+		if ($this->is_site_users)
 			$url = "site-users.php?id={$this->site_id}&amp;";
 		else
 			$url = 'users.php?';
 
-		$user_roles = $this->get_role_list( $user_object );
+		$user_roles = $this->get_role_list($user_object);
 
 		// Set up the hover actions for this user
 		$actions = array();
 		$checkbox = '';
 		// Check if the user for this row is editable
-		if ( current_user_can( 'list_users' ) ) {
+		if (current_user_can('list_users')) {
 			// Set up the user editing link
-			$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_object->ID ) ) );
+			$edit_link = esc_url(add_query_arg('wp_http_referer', urlencode(wp_unslash($_SERVER['REQUEST_URI'])), get_edit_user_link($user_object->ID)));
 
-			if ( current_user_can( 'edit_user',  $user_object->ID ) ) {
+			if (current_user_can('edit_user', $user_object->ID)) {
 				$edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
-				$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+				$actions['edit'] = '<a href="'.$edit_link.'">'.__('Edit').'</a>';
 			} else {
 				$edit = "<strong>$user_object->user_login</strong><br />";
 			}
 
-			if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) )
-				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . "</a>";
-			if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) )
-				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url."action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
+			if ( ! is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('delete_user', $user_object->ID))
+				$actions['delete'] = "<a class='submitdelete' href='".wp_nonce_url("users.php?action=delete&amp;user=$user_object->ID", 'bulk-users')."'>".__('Delete')."</a>";
+			if (is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('remove_user', $user_object->ID))
+				$actions['remove'] = "<a class='submitdelete' href='".wp_nonce_url($url."action=remove&amp;user=$user_object->ID", 'bulk-users')."'>".__('Remove')."</a>";
 
 			/**
 			 * Filters the action links displayed under each user in the Users list table.
@@ -424,49 +424,49 @@ 
 			 *                             'Edit', 'Remove' for Multisite.
 			 * @param WP_User $user_object WP_User object for the currently-listed user.
 			 */
-			$actions = apply_filters( 'user_row_actions', $actions, $user_object );
+			$actions = apply_filters('user_row_actions', $actions, $user_object);
 
 			// Role classes.
-			$role_classes = esc_attr( implode( ' ', array_keys( $user_roles ) ) );
+			$role_classes = esc_attr(implode(' ', array_keys($user_roles)));
 
 			// Set up the checkbox ( because the user is editable, otherwise it's empty )
-			$checkbox = '<label class="screen-reader-text" for="user_' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), $user_object->user_login ) . '</label>'
+			$checkbox = '<label class="screen-reader-text" for="user_'.$user_object->ID.'">'.sprintf(__('Select %s'), $user_object->user_login).'</label>'
 						. "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='{$role_classes}' value='{$user_object->ID}' />";
 
 		} else {
-			$edit = '<strong>' . $user_object->user_login . '</strong>';
+			$edit = '<strong>'.$user_object->user_login.'</strong>';
 		}
-		$avatar = get_avatar( $user_object->ID, 32 );
+		$avatar = get_avatar($user_object->ID, 32);
 
 		// Comma-separated list of user roles.
-		$roles_list = implode( ', ', $user_roles );
+		$roles_list = implode(', ', $user_roles);
 
 		$r = "<tr id='user-$user_object->ID'>";
 
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 			$classes = "$column_name column-$column_name";
-			if ( $primary === $column_name ) {
+			if ($primary === $column_name) {
 				$classes .= ' has-row-actions column-primary';
 			}
-			if ( 'posts' === $column_name ) {
+			if ('posts' === $column_name) {
 				$classes .= ' num'; // Special case for that column
 			}
 
-			if ( in_array( $column_name, $hidden ) ) {
+			if (in_array($column_name, $hidden)) {
 				$classes .= ' hidden';
 			}
 
-			$data = 'data-colname="' . wp_strip_all_tags( $column_display_name ) . '"';
+			$data = 'data-colname="'.wp_strip_all_tags($column_display_name).'"';
 
 			$attributes = "class='$classes' $data";
 
-			if ( 'cb' === $column_name ) {
+			if ('cb' === $column_name) {
 				$r .= "<th scope='row' class='check-column'>$checkbox</th>";
 			} else {
 				$r .= "<td $attributes>";
-				switch ( $column_name ) {
+				switch ($column_name) {
 					case 'username':
 						$r .= "$avatar $edit";
 						break;
@@ -474,16 +474,16 @@ 
 						$r .= "$user_object->first_name $user_object->last_name";
 						break;
 					case 'email':
-						$r .= "<a href='" . esc_url( "mailto:$email" ) . "'>$email</a>";
+						$r .= "<a href='".esc_url("mailto:$email")."'>$email</a>";
 						break;
 					case 'role':
-						$r .= esc_html( $roles_list );
+						$r .= esc_html($roles_list);
 						break;
 					case 'posts':
-						if ( $numposts > 0 ) {
+						if ($numposts > 0) {
 							$r .= "<a href='edit.php?author=$user_object->ID' class='edit'>";
-							$r .= '<span aria-hidden="true">' . $numposts . '</span>';
-							$r .= '<span class="screen-reader-text">' . sprintf( _n( '%s post by this author', '%s posts by this author', $numposts ), number_format_i18n( $numposts ) ) . '</span>';
+							$r .= '<span aria-hidden="true">'.$numposts.'</span>';
+							$r .= '<span class="screen-reader-text">'.sprintf(_n('%s post by this author', '%s posts by this author', $numposts), number_format_i18n($numposts)).'</span>';
 							$r .= '</a>';
 						} else {
 							$r .= 0;
@@ -499,11 +499,11 @@ 
 						 * @param string $column_name Column name.
 						 * @param int    $user_id     ID of the currently-listed user.
 						 */
-						$r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID );
+						$r .= apply_filters('manage_users_custom_column', '', $column_name, $user_object->ID);
 				}
 
-				if ( $primary === $column_name ) {
-					$r .= $this->row_actions( $actions );
+				if ($primary === $column_name) {
+					$r .= $this->row_actions($actions);
 				}
 				$r .= "</td>";
 			}
@@ -534,19 +534,19 @@ 
 	 * @param WP_User $user_object The WP_User object.
 	 * @return array An array of user roles.
 	 */
-	protected function get_role_list( $user_object ) {
+	protected function get_role_list($user_object) {
 		$wp_roles = wp_roles();
 
 		$role_list = array();
 
-		foreach ( $user_object->roles as $role ) {
-			if ( isset( $wp_roles->role_names[ $role ] ) ) {
-				$role_list[ $role ] = translate_user_role( $wp_roles->role_names[ $role ] );
+		foreach ($user_object->roles as $role) {
+			if (isset($wp_roles->role_names[$role])) {
+				$role_list[$role] = translate_user_role($wp_roles->role_names[$role]);
 			}
 		}
 
-		if ( empty( $role_list ) ) {
-			$role_list['none'] = _x( 'None', 'no user roles' );
+		if (empty($role_list)) {
+			$role_list['none'] = _x('None', 'no user roles');
 		}
 
 		/**
@@ -557,7 +557,7 @@ 
 		 * @param array   $role_list   An array of user roles.
 		 * @param WP_User $user_object A WP_User object.
 		 */
-		return apply_filters( 'get_role_list', $role_list, $user_object );
+		return apply_filters('get_role_list', $role_list, $user_object);
 	}
 
 }

Braces +49 added lines, -34 removed lines

@@ -54,8 +54,9 @@ 
 
 		$this->is_site_users = 'site-users-network' === $this->screen->id;
 
-		if ( $this->is_site_users )
-			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		if ( $this->is_site_users ) {
+					$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		}
 	}
 
 	/**
@@ -67,10 +68,11 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		if ( $this->is_site_users )
-			return current_user_can( 'manage_sites' );
-		else
-			return current_user_can( 'list_users' );
+		if ( $this->is_site_users ) {
+					return current_user_can( 'manage_sites' );
+		} else {
+					return current_user_can( 'list_users' );
+		}
 	}
 
 	/**
@@ -112,17 +114,21 @@ 
 			);
 		}
 
-		if ( '' !== $args['search'] )
-			$args['search'] = '*' . $args['search'] . '*';
+		if ( '' !== $args['search'] ) {
+					$args['search'] = '*' . $args['search'] . '*';
+		}
 
-		if ( $this->is_site_users )
-			$args['blog_id'] = $this->site_id;
+		if ( $this->is_site_users ) {
+					$args['blog_id'] = $this->site_id;
+		}
 
-		if ( isset( $_REQUEST['orderby'] ) )
-			$args['orderby'] = $_REQUEST['orderby'];
+		if ( isset( $_REQUEST['orderby'] ) ) {
+					$args['orderby'] = $_REQUEST['orderby'];
+		}
 
-		if ( isset( $_REQUEST['order'] ) )
-			$args['order'] = $_REQUEST['order'];
+		if ( isset( $_REQUEST['order'] ) ) {
+					$args['order'] = $_REQUEST['order'];
+		}
 
 		/**
 		 * Filters the query arguments used to retrieve users for the current users list table.
@@ -192,8 +198,9 @@ 
 		$role_links = array();
 		$role_links['all'] = "<a href='$url'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
 		foreach ( $wp_roles->get_names() as $this_role => $name ) {
-			if ( !isset($avail_roles[$this_role]) )
-				continue;
+			if ( !isset($avail_roles[$this_role]) ) {
+							continue;
+			}
 
 			$class = '';
 
@@ -237,11 +244,13 @@ 
 		$actions = array();
 
 		if ( is_multisite() ) {
-			if ( current_user_can( 'remove_users' ) )
-				$actions['remove'] = __( 'Remove' );
+			if ( current_user_can( 'remove_users' ) ) {
+							$actions['remove'] = __( 'Remove' );
+			}
 		} else {
-			if ( current_user_can( 'delete_users' ) )
-				$actions['delete'] = __( 'Delete' );
+			if ( current_user_can( 'delete_users' ) ) {
+							$actions['delete'] = __( 'Delete' );
+			}
 		}
 
 		return $actions;
@@ -323,8 +332,9 @@ 
 			'posts'    => __( 'Posts' )
 		);
 
-		if ( $this->is_site_users )
-			unset( $c['posts'] );
+		if ( $this->is_site_users ) {
+					unset( $c['posts'] );
+		}
 
 		return $c;
 	}
@@ -354,12 +364,14 @@ 
 	 */
 	public function display_rows() {
 		// Query the post counts for this page
-		if ( ! $this->is_site_users )
-			$post_counts = count_many_users_posts( array_keys( $this->items ) );
+		if ( ! $this->is_site_users ) {
+					$post_counts = count_many_users_posts( array_keys( $this->items ) );
+		}
 
 		foreach ( $this->items as $userid => $user_object ) {
-			if ( is_multisite() && empty( $user_object->allcaps ) )
-				continue;
+			if ( is_multisite() && empty( $user_object->allcaps ) ) {
+							continue;
+			}
 
 			echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
 		}
@@ -387,10 +399,11 @@ 
 		$user_object->filter = 'display';
 		$email = $user_object->user_email;
 
-		if ( $this->is_site_users )
-			$url = "site-users.php?id={$this->site_id}&amp;";
-		else
-			$url = 'users.php?';
+		if ( $this->is_site_users ) {
+					$url = "site-users.php?id={$this->site_id}&amp;";
+		} else {
+					$url = 'users.php?';
+		}
 
 		$user_roles = $this->get_role_list( $user_object );
 
@@ -409,10 +422,12 @@ 
 				$edit = "<strong>$user_object->user_login</strong><br />";
 			}
 
-			if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) )
-				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . "</a>";
-			if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) )
-				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url."action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
+			if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) ) {
+							$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . "</a>";
+			}
+			if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) ) {
+							$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url."action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
+			}
 
 			/**
 			 * Filters the action links displayed under each user in the Users list table.

src/wp-admin/includes/class-wp-filesystem-direct.php

Spacing +62 added lines, -62 removed lines

@@ -55,25 +55,25 @@ 
 	 *                         Default false.
 	 * @return bool False upon failure, true otherwise.
 	 */
-	public function put_contents( $file, $contents, $mode = false ) {
-		$fp = @fopen( $file, 'wb' );
-		if ( ! $fp )
+	public function put_contents($file, $contents, $mode = false) {
+		$fp = @fopen($file, 'wb');
+		if ( ! $fp)
 			return false;
 
 		mbstring_binary_safe_encoding();
 
-		$data_length = strlen( $contents );
+		$data_length = strlen($contents);
 
-		$bytes_written = fwrite( $fp, $contents );
+		$bytes_written = fwrite($fp, $contents);
 
 		reset_mbstring_encoding();
 
-		fclose( $fp );
+		fclose($fp);
 
-		if ( $data_length !== $bytes_written )
+		if ($data_length !== $bytes_written)
 			return false;
 
-		$this->chmod( $file, $mode );
+		$this->chmod($file, $mode);
 
 		return true;
 	}
@@ -106,17 +106,17 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chgrp($file, $group, $recursive = false) {
-		if ( ! $this->exists($file) )
+		if ( ! $this->exists($file))
 			return false;
-		if ( ! $recursive )
+		if ( ! $recursive)
 			return @chgrp($file, $group);
-		if ( ! $this->is_dir($file) )
+		if ( ! $this->is_dir($file))
 			return @chgrp($file, $group);
 		// Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
 		foreach ($filelist as $filename)
-			$this->chgrp($file . $filename, $group, $recursive);
+			$this->chgrp($file.$filename, $group, $recursive);
 
 		return true;
 	}
@@ -131,22 +131,22 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
-		if ( ! $mode ) {
-			if ( $this->is_file($file) )
+		if ( ! $mode) {
+			if ($this->is_file($file))
 				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
+			elseif ($this->is_dir($file))
 				$mode = FS_CHMOD_DIR;
 			else
 				return false;
 		}
 
-		if ( ! $recursive || ! $this->is_dir($file) )
+		if ( ! $recursive || ! $this->is_dir($file))
 			return @chmod($file, $mode);
 		// Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
-		foreach ( (array)$filelist as $filename => $filemeta)
-			$this->chmod($file . $filename, $mode, $recursive);
+		foreach ((array) $filelist as $filename => $filemeta)
+			$this->chmod($file.$filename, $mode, $recursive);
 
 		return true;
 	}
@@ -161,16 +161,16 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chown($file, $owner, $recursive = false) {
-		if ( ! $this->exists($file) )
+		if ( ! $this->exists($file))
 			return false;
-		if ( ! $recursive )
+		if ( ! $recursive)
 			return @chown($file, $owner);
-		if ( ! $this->is_dir($file) )
+		if ( ! $this->is_dir($file))
 			return @chown($file, $owner);
 		// Is a directory, and we want recursive
 		$filelist = $this->dirlist($file);
 		foreach ($filelist as $filename) {
-			$this->chown($file . '/' . $filename, $owner, $recursive);
+			$this->chown($file.'/'.$filename, $owner, $recursive);
 		}
 		return true;
 	}
@@ -183,9 +183,9 @@ 
 	 */
 	public function owner($file) {
 		$owneruid = @fileowner($file);
-		if ( ! $owneruid )
+		if ( ! $owneruid)
 			return false;
-		if ( ! function_exists('posix_getpwuid') )
+		if ( ! function_exists('posix_getpwuid'))
 			return $owneruid;
 		$ownerarray = posix_getpwuid($owneruid);
 		return $ownerarray['name'];
@@ -200,7 +200,7 @@ 
 	 * @return string Mode of the file (last 3 digits).
 	 */
 	public function getchmod($file) {
-		return substr( decoct( @fileperms( $file ) ), -3 );
+		return substr(decoct(@fileperms($file)), -3);
 	}
 
 	/**
@@ -209,9 +209,9 @@ 
 	 */
 	public function group($file) {
 		$gid = @filegroup($file);
-		if ( ! $gid )
+		if ( ! $gid)
 			return false;
-		if ( ! function_exists('posix_getgrgid') )
+		if ( ! function_exists('posix_getgrgid'))
 			return $gid;
 		$grouparray = posix_getgrgid($gid);
 		return $grouparray['name'];
@@ -225,11 +225,11 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+		if ( ! $overwrite && $this->exists($destination))
 			return false;
 
 		$rtval = copy($source, $destination);
-		if ( $mode )
+		if ($mode)
 			$this->chmod($destination, $mode);
 		return $rtval;
 	}
@@ -241,14 +241,14 @@ 
 	 * @return bool
 	 */
 	public function move($source, $destination, $overwrite = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+		if ( ! $overwrite && $this->exists($destination))
 			return false;
 
 		// Try using rename first. if that fails (for example, source is read only) try copy.
-		if ( @rename($source, $destination) )
+		if (@rename($source, $destination))
 			return true;
 
-		if ( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ) {
+		if ($this->copy($source, $destination, $overwrite) && $this->exists($destination)) {
 			$this->delete($source);
 			return true;
 		} else {
@@ -263,13 +263,13 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty( $file ) ) // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
+		if (empty($file)) // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
 			return false;
-		$file = str_replace( '\\', '/', $file ); // for win32, occasional problems deleting files otherwise
+		$file = str_replace('\\', '/', $file); // for win32, occasional problems deleting files otherwise
 
-		if ( 'f' == $type || $this->is_file($file) )
+		if ('f' == $type || $this->is_file($file))
 			return @unlink($file);
-		if ( ! $recursive && $this->is_dir($file) )
+		if ( ! $recursive && $this->is_dir($file))
 			return @rmdir($file);
 
 		// At this point it's a folder, and we're in recursive mode
@@ -277,14 +277,14 @@ 
 		$filelist = $this->dirlist($file, true);
 
 		$retval = true;
-		if ( is_array( $filelist ) ) {
-			foreach ( $filelist as $filename => $fileinfo ) {
-				if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) )
+		if (is_array($filelist)) {
+			foreach ($filelist as $filename => $fileinfo) {
+				if ( ! $this->delete($file.$filename, $recursive, $fileinfo['type']))
 					$retval = false;
 			}
 		}
 
-		if ( file_exists($file) && ! @rmdir($file) )
+		if (file_exists($file) && ! @rmdir($file))
 			$retval = false;
 
 		return $retval;
@@ -375,18 +375,18 @@ 
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		// Safe mode fails with a trailing slash under certain PHP versions.
 		$path = untrailingslashit($path);
-		if ( empty($path) )
+		if (empty($path))
 			return false;
 
-		if ( ! $chmod )
+		if ( ! $chmod)
 			$chmod = FS_CHMOD_DIR;
 
-		if ( ! @mkdir($path) )
+		if ( ! @mkdir($path))
 			return false;
 		$this->chmod($path, $chmod);
-		if ( $chown )
+		if ($chown)
 			$this->chown($path, $chown);
-		if ( $chgrp )
+		if ($chgrp)
 			$this->chgrp($path, $chgrp);
 		return true;
 	}
@@ -407,54 +407,54 @@ 
 	 * @return bool|array
 	 */
 	public function dirlist($path, $include_hidden = true, $recursive = false) {
-		if ( $this->is_file($path) ) {
+		if ($this->is_file($path)) {
 			$limit_file = basename($path);
 			$path = dirname($path);
 		} else {
 			$limit_file = false;
 		}
 
-		if ( ! $this->is_dir($path) )
+		if ( ! $this->is_dir($path))
 			return false;
 
 		$dir = @dir($path);
-		if ( ! $dir )
+		if ( ! $dir)
 			return false;
 
 		$ret = array();
 
-		while (false !== ($entry = $dir->read()) ) {
+		while (false !== ($entry = $dir->read())) {
 			$struc = array();
 			$struc['name'] = $entry;
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
+			if ('.' == $struc['name'] || '..' == $struc['name'])
 				continue;
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
+			if ( ! $include_hidden && '.' == $struc['name'][0])
 				continue;
 
-			if ( $limit_file && $struc['name'] != $limit_file)
+			if ($limit_file && $struc['name'] != $limit_file)
 				continue;
 
 			$struc['perms'] 	= $this->gethchmod($path.'/'.$entry);
 			$struc['permsn']	= $this->getnumchmodfromh($struc['perms']);
-			$struc['number'] 	= false;
+			$struc['number'] = false;
 			$struc['owner']    	= $this->owner($path.'/'.$entry);
 			$struc['group']    	= $this->group($path.'/'.$entry);
 			$struc['size']    	= $this->size($path.'/'.$entry);
-			$struc['lastmodunix']= $this->mtime($path.'/'.$entry);
-			$struc['lastmod']   = date('M j',$struc['lastmodunix']);
-			$struc['time']    	= date('h:i:s',$struc['lastmodunix']);
-			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
-
-			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+			$struc['lastmodunix'] = $this->mtime($path.'/'.$entry);
+			$struc['lastmod']   = date('M j', $struc['lastmodunix']);
+			$struc['time']    	= date('h:i:s', $struc['lastmodunix']);
+			$struc['type'] = $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
+
+			if ('d' == $struc['type']) {
+				if ($recursive)
+					$struc['files'] = $this->dirlist($path.'/'.$struc['name'], $include_hidden, $recursive);
 				else
 					$struc['files'] = array();
 			}
 
-			$ret[ $struc['name'] ] = $struc;
+			$ret[$struc['name']] = $struc;
 		}
 		$dir->close();
 		unset($dir);

Braces +120 added lines, -81 removed lines

@@ -57,8 +57,9 @@ 
 	 */
 	public function put_contents( $file, $contents, $mode = false ) {
 		$fp = @fopen( $file, 'wb' );
-		if ( ! $fp )
-			return false;
+		if ( ! $fp ) {
+					return false;
+		}
 
 		mbstring_binary_safe_encoding();
 
@@ -70,8 +71,9 @@ 
 
 		fclose( $fp );
 
-		if ( $data_length !== $bytes_written )
-			return false;
+		if ( $data_length !== $bytes_written ) {
+					return false;
+		}
 
 		$this->chmod( $file, $mode );
 
@@ -106,17 +108,21 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chgrp($file, $group, $recursive = false) {
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive )
-			return @chgrp($file, $group);
-		if ( ! $this->is_dir($file) )
-			return @chgrp($file, $group);
+		if ( ! $this->exists($file) ) {
+					return false;
+		}
+		if ( ! $recursive ) {
+					return @chgrp($file, $group);
+		}
+		if ( ! $this->is_dir($file) ) {
+					return @chgrp($file, $group);
+		}
 		// Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
-		foreach ($filelist as $filename)
-			$this->chgrp($file . $filename, $group, $recursive);
+		foreach ($filelist as $filename) {
+					$this->chgrp($file . $filename, $group, $recursive);
+		}
 
 		return true;
 	}
@@ -132,21 +138,24 @@ 
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
 		if ( ! $mode ) {
-			if ( $this->is_file($file) )
-				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
-				$mode = FS_CHMOD_DIR;
-			else
-				return false;
+			if ( $this->is_file($file) ) {
+							$mode = FS_CHMOD_FILE;
+			} elseif ( $this->is_dir($file) ) {
+							$mode = FS_CHMOD_DIR;
+			} else {
+							return false;
+			}
 		}
 
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return @chmod($file, $mode);
+		if ( ! $recursive || ! $this->is_dir($file) ) {
+					return @chmod($file, $mode);
+		}
 		// Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
-		foreach ( (array)$filelist as $filename => $filemeta)
-			$this->chmod($file . $filename, $mode, $recursive);
+		foreach ( (array)$filelist as $filename => $filemeta) {
+					$this->chmod($file . $filename, $mode, $recursive);
+		}
 
 		return true;
 	}
@@ -161,12 +170,15 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chown($file, $owner, $recursive = false) {
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive )
-			return @chown($file, $owner);
-		if ( ! $this->is_dir($file) )
-			return @chown($file, $owner);
+		if ( ! $this->exists($file) ) {
+					return false;
+		}
+		if ( ! $recursive ) {
+					return @chown($file, $owner);
+		}
+		if ( ! $this->is_dir($file) ) {
+					return @chown($file, $owner);
+		}
 		// Is a directory, and we want recursive
 		$filelist = $this->dirlist($file);
 		foreach ($filelist as $filename) {
@@ -183,10 +195,12 @@ 
 	 */
 	public function owner($file) {
 		$owneruid = @fileowner($file);
-		if ( ! $owneruid )
-			return false;
-		if ( ! function_exists('posix_getpwuid') )
-			return $owneruid;
+		if ( ! $owneruid ) {
+					return false;
+		}
+		if ( ! function_exists('posix_getpwuid') ) {
+					return $owneruid;
+		}
 		$ownerarray = posix_getpwuid($owneruid);
 		return $ownerarray['name'];
 	}
@@ -209,10 +223,12 @@ 
 	 */
 	public function group($file) {
 		$gid = @filegroup($file);
-		if ( ! $gid )
-			return false;
-		if ( ! function_exists('posix_getgrgid') )
-			return $gid;
+		if ( ! $gid ) {
+					return false;
+		}
+		if ( ! function_exists('posix_getgrgid') ) {
+					return $gid;
+		}
 		$grouparray = posix_getgrgid($gid);
 		return $grouparray['name'];
 	}
@@ -225,12 +241,14 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
-			return false;
+		if ( ! $overwrite && $this->exists($destination) ) {
+					return false;
+		}
 
 		$rtval = copy($source, $destination);
-		if ( $mode )
-			$this->chmod($destination, $mode);
+		if ( $mode ) {
+					$this->chmod($destination, $mode);
+		}
 		return $rtval;
 	}
 
@@ -241,12 +259,14 @@ 
 	 * @return bool
 	 */
 	public function move($source, $destination, $overwrite = false) {
-		if ( ! $overwrite && $this->exists($destination) )
-			return false;
+		if ( ! $overwrite && $this->exists($destination) ) {
+					return false;
+		}
 
 		// Try using rename first. if that fails (for example, source is read only) try copy.
-		if ( @rename($source, $destination) )
-			return true;
+		if ( @rename($source, $destination) ) {
+					return true;
+		}
 
 		if ( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ) {
 			$this->delete($source);
@@ -263,14 +283,18 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty( $file ) ) // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
+		if ( empty( $file ) ) {
+			// Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
 			return false;
+		}
 		$file = str_replace( '\\', '/', $file ); // for win32, occasional problems deleting files otherwise
 
-		if ( 'f' == $type || $this->is_file($file) )
-			return @unlink($file);
-		if ( ! $recursive && $this->is_dir($file) )
-			return @rmdir($file);
+		if ( 'f' == $type || $this->is_file($file) ) {
+					return @unlink($file);
+		}
+		if ( ! $recursive && $this->is_dir($file) ) {
+					return @rmdir($file);
+		}
 
 		// At this point it's a folder, and we're in recursive mode
 		$file = trailingslashit($file);
@@ -279,13 +303,15 @@ 
 		$retval = true;
 		if ( is_array( $filelist ) ) {
 			foreach ( $filelist as $filename => $fileinfo ) {
-				if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) )
-					$retval = false;
+				if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) ) {
+									$retval = false;
+				}
 			}
 		}
 
-		if ( file_exists($file) && ! @rmdir($file) )
-			$retval = false;
+		if ( file_exists($file) && ! @rmdir($file) ) {
+					$retval = false;
+		}
 
 		return $retval;
 	}
@@ -358,10 +384,12 @@ 
 	 * @return bool
 	 */
 	public function touch($file, $time = 0, $atime = 0) {
-		if ($time == 0)
-			$time = time();
-		if ($atime == 0)
-			$atime = time();
+		if ($time == 0) {
+					$time = time();
+		}
+		if ($atime == 0) {
+					$atime = time();
+		}
 		return @touch($file, $time, $atime);
 	}
 
@@ -375,19 +403,24 @@ 
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		// Safe mode fails with a trailing slash under certain PHP versions.
 		$path = untrailingslashit($path);
-		if ( empty($path) )
-			return false;
+		if ( empty($path) ) {
+					return false;
+		}
 
-		if ( ! $chmod )
-			$chmod = FS_CHMOD_DIR;
+		if ( ! $chmod ) {
+					$chmod = FS_CHMOD_DIR;
+		}
 
-		if ( ! @mkdir($path) )
-			return false;
+		if ( ! @mkdir($path) ) {
+					return false;
+		}
 		$this->chmod($path, $chmod);
-		if ( $chown )
-			$this->chown($path, $chown);
-		if ( $chgrp )
-			$this->chgrp($path, $chgrp);
+		if ( $chown ) {
+					$this->chown($path, $chown);
+		}
+		if ( $chgrp ) {
+					$this->chgrp($path, $chgrp);
+		}
 		return true;
 	}
 
@@ -414,12 +447,14 @@ 
 			$limit_file = false;
 		}
 
-		if ( ! $this->is_dir($path) )
-			return false;
+		if ( ! $this->is_dir($path) ) {
+					return false;
+		}
 
 		$dir = @dir($path);
-		if ( ! $dir )
-			return false;
+		if ( ! $dir ) {
+					return false;
+		}
 
 		$ret = array();
 
@@ -427,14 +462,17 @@ 
 			$struc = array();
 			$struc['name'] = $entry;
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
-				continue;
+			if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
+							continue;
+			}
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
-				continue;
+			if ( ! $include_hidden && '.' == $struc['name'][0] ) {
+							continue;
+			}
 
-			if ( $limit_file && $struc['name'] != $limit_file)
-				continue;
+			if ( $limit_file && $struc['name'] != $limit_file) {
+							continue;
+			}
 
 			$struc['perms'] 	= $this->gethchmod($path.'/'.$entry);
 			$struc['permsn']	= $this->getnumchmodfromh($struc['perms']);
@@ -448,10 +486,11 @@ 
 			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
 
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
-				else
-					$struc['files'] = array();
+				if ( $recursive ) {
+									$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+				} else {
+									$struc['files'] = array();
+				}
 			}
 
 			$ret[ $struc['name'] ] = $struc;

src/wp-admin/includes/menu.php

Braces +31 added lines, -22 removed lines

@@ -49,20 +49,22 @@ 
 		$hook_args = substr($menu_page[2], $pos + 1);
 		wp_parse_str($hook_args, $hook_args);
 		// Set the hook name to be the post type.
-		if ( isset($hook_args['post_type']) )
-			$hook_name = $hook_args['post_type'];
-		else
-			$hook_name = basename($hook_name, '.php');
+		if ( isset($hook_args['post_type']) ) {
+					$hook_name = $hook_args['post_type'];
+		} else {
+					$hook_name = basename($hook_name, '.php');
+		}
 		unset($hook_args);
 	} else {
 		$hook_name = basename($menu_page[2], '.php');
 	}
 	$hook_name = sanitize_title($hook_name);
 
-	if ( isset($compat[$hook_name]) )
-		$hook_name = $compat[$hook_name];
-	elseif ( !$hook_name )
-		continue;
+	if ( isset($compat[$hook_name]) ) {
+			$hook_name = $compat[$hook_name];
+	} elseif ( !$hook_name ) {
+			continue;
+	}
 
 	$admin_page_hooks[$menu_page[2]] = $hook_name;
 }
@@ -80,9 +82,10 @@ 
 	}
 	unset($index, $data);
 
-	if ( empty($submenu[$parent]) )
-		unset($submenu[$parent]);
-}
+	if ( empty($submenu[$parent]) ) {
+			unset($submenu[$parent]);
+	}
+	}
 unset($sub, $parent);
 
 /*
@@ -91,8 +94,9 @@ 
  * will have the next submenu in line be assigned as the new menu parent.
  */
 foreach ( $menu as $id => $data ) {
-	if ( empty($submenu[$data[2]]) )
-		continue;
+	if ( empty($submenu[$data[2]]) ) {
+			continue;
+	}
 	$subs = $submenu[$data[2]];
 	$first_sub = reset( $subs );
 	$old_parent = $data[2];
@@ -111,8 +115,9 @@ 
 		}
 		unset($submenu[$old_parent], $index);
 
-		if ( isset($_wp_submenu_nopriv[$old_parent]) )
-			$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
+		if ( isset($_wp_submenu_nopriv[$old_parent]) ) {
+					$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
+		}
 	}
 }
 unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
@@ -154,8 +159,9 @@ 
  * that the user does not have. Run re-parent loop again.
  */
 foreach ( $menu as $id => $data ) {
-	if ( ! current_user_can($data[1]) )
-		$_wp_menu_nopriv[$data[2]] = true;
+	if ( ! current_user_can($data[1]) ) {
+			$_wp_menu_nopriv[$data[2]] = true;
+	}
 
 	/*
 	 * If there is only one submenu and it is has same destination as the parent,
@@ -164,8 +170,9 @@ 
 	if ( ! empty( $submenu[$data[2]] ) && 1 == count ( $submenu[$data[2]] ) ) {
 		$subs = $submenu[$data[2]];
 		$first_sub = reset( $subs );
-		if ( $data[2] == $first_sub[2] )
-			unset( $submenu[$data[2]] );
+		if ( $data[2] == $first_sub[2] ) {
+					unset( $submenu[$data[2]] );
+		}
 	}
 
 	// If submenu is empty...
@@ -307,8 +314,9 @@ 
 		} elseif ( !isset($menu_order[$a]) && isset($menu_order[$b]) ) {
 			return 1;
 		} elseif ( isset($menu_order[$a]) && isset($menu_order[$b]) ) {
-			if ( $menu_order[$a] == $menu_order[$b] )
-				return 0;
+			if ( $menu_order[$a] == $menu_order[$b] ) {
+							return 0;
+			}
 			return ($menu_order[$a] < $menu_order[$b]) ? -1 : 1;
 		} else {
 			return ($default_menu_order[$a] <= $default_menu_order[$b]) ? -1 : 1;
@@ -322,8 +330,9 @@ 
 // Remove the last menu item if it is a separator.
 $last_menu_key = array_keys( $menu );
 $last_menu_key = array_pop( $last_menu_key );
-if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
+if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] ) {
 	unset( $menu[ $last_menu_key ] );
+}
 unset( $last_menu_key );
 
 if ( !user_can_access_admin_page() ) {

Spacing +56 added lines, -56 removed lines

@@ -6,7 +6,7 @@ 
  * @subpackage Administration
  */
 
-if ( is_network_admin() ) {
+if (is_network_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the Network Admin.
@@ -16,8 +16,8 @@ 
 	 * @private
 	 * @since 3.1.0
 	 */
-	do_action( '_network_admin_menu' );
-} elseif ( is_user_admin() ) {
+	do_action('_network_admin_menu');
+} elseif (is_user_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the User Admin.
@@ -27,7 +27,7 @@ 
 	 * @private
 	 * @since 3.1.0
 	 */
-	do_action( '_user_admin_menu' );
+	do_action('_user_admin_menu');
 } else {
 
 	/**
@@ -38,18 +38,18 @@ 
 	 * @private
 	 * @since 2.2.0
 	 */
-	do_action( '_admin_menu' );
+	do_action('_admin_menu');
 }
 
 // Create list of page plugin hook names.
 foreach ($menu as $menu_page) {
-	if ( false !== $pos = strpos($menu_page[2], '?') ) {
+	if (false !== $pos = strpos($menu_page[2], '?')) {
 		// Handle post_type=post|page|foo pages.
 		$hook_name = substr($menu_page[2], 0, $pos);
 		$hook_args = substr($menu_page[2], $pos + 1);
 		wp_parse_str($hook_args, $hook_args);
 		// Set the hook name to be the post type.
-		if ( isset($hook_args['post_type']) )
+		if (isset($hook_args['post_type']))
 			$hook_name = $hook_args['post_type'];
 		else
 			$hook_name = basename($hook_name, '.php');
@@ -59,9 +59,9 @@ 
 	}
 	$hook_name = sanitize_title($hook_name);
 
-	if ( isset($compat[$hook_name]) )
+	if (isset($compat[$hook_name]))
 		$hook_name = $compat[$hook_name];
-	elseif ( !$hook_name )
+	elseif ( ! $hook_name)
 		continue;
 
 	$admin_page_hooks[$menu_page[2]] = $hook_name;
@@ -73,14 +73,14 @@ 
 // Loop over submenus and remove pages for which the user does not have privs.
 foreach ($submenu as $parent => $sub) {
 	foreach ($sub as $index => $data) {
-		if ( ! current_user_can($data[1]) ) {
+		if ( ! current_user_can($data[1])) {
 			unset($submenu[$parent][$index]);
 			$_wp_submenu_nopriv[$parent][$data[2]] = true;
 		}
 	}
 	unset($index, $data);
 
-	if ( empty($submenu[$parent]) )
+	if (empty($submenu[$parent]))
 		unset($submenu[$parent]);
 }
 unset($sub, $parent);
@@ -90,18 +90,18 @@ 
  * Menus for which the original parent is not accessible due to lack of privileges
  * will have the next submenu in line be assigned as the new menu parent.
  */
-foreach ( $menu as $id => $data ) {
-	if ( empty($submenu[$data[2]]) )
+foreach ($menu as $id => $data) {
+	if (empty($submenu[$data[2]]))
 		continue;
 	$subs = $submenu[$data[2]];
-	$first_sub = reset( $subs );
+	$first_sub = reset($subs);
 	$old_parent = $data[2];
 	$new_parent = $first_sub[2];
 	/*
 	 * If the first submenu is not the same as the assigned parent,
 	 * make the first submenu the new parent.
 	 */
-	if ( $new_parent != $old_parent ) {
+	if ($new_parent != $old_parent) {
 		$_wp_real_parent_file[$old_parent] = $new_parent;
 		$menu[$id][2] = $new_parent;
 
@@ -111,13 +111,13 @@ 
 		}
 		unset($submenu[$old_parent], $index);
 
-		if ( isset($_wp_submenu_nopriv[$old_parent]) )
+		if (isset($_wp_submenu_nopriv[$old_parent]))
 			$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
 	}
 }
 unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
 
-if ( is_network_admin() ) {
+if (is_network_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the Network Admin.
@@ -126,8 +126,8 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'network_admin_menu', '' );
-} elseif ( is_user_admin() ) {
+	do_action('network_admin_menu', '');
+} elseif (is_user_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the User Admin.
@@ -136,7 +136,7 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'user_admin_menu', '' );
+	do_action('user_admin_menu', '');
 } else {
 
 	/**
@@ -146,32 +146,32 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'admin_menu', '' );
+	do_action('admin_menu', '');
 }
 
 /*
  * Remove menus that have no accessible submenus and require privileges
  * that the user does not have. Run re-parent loop again.
  */
-foreach ( $menu as $id => $data ) {
-	if ( ! current_user_can($data[1]) )
+foreach ($menu as $id => $data) {
+	if ( ! current_user_can($data[1]))
 		$_wp_menu_nopriv[$data[2]] = true;
 
 	/*
 	 * If there is only one submenu and it is has same destination as the parent,
 	 * remove the submenu.
 	 */
-	if ( ! empty( $submenu[$data[2]] ) && 1 == count ( $submenu[$data[2]] ) ) {
+	if ( ! empty($submenu[$data[2]]) && 1 == count($submenu[$data[2]])) {
 		$subs = $submenu[$data[2]];
-		$first_sub = reset( $subs );
-		if ( $data[2] == $first_sub[2] )
-			unset( $submenu[$data[2]] );
+		$first_sub = reset($subs);
+		if ($data[2] == $first_sub[2])
+			unset($submenu[$data[2]]);
 	}
 
 	// If submenu is empty...
-	if ( empty($submenu[$data[2]]) ) {
+	if (empty($submenu[$data[2]])) {
 		// And user doesn't have privs, remove menu.
-		if ( isset( $_wp_menu_nopriv[$data[2]] ) ) {
+		if (isset($_wp_menu_nopriv[$data[2]])) {
 			unset($menu[$id]);
 		}
 	}
@@ -185,7 +185,7 @@ 
  * @return string
  */
 function add_cssclass($add, $class) {
-	$class = empty($class) ? $add : $class .= ' ' . $add;
+	$class = empty($class) ? $add : $class .= ' '.$add;
 	return $class;
 }
 
@@ -198,29 +198,29 @@ 
 	$first = $lastorder = false;
 	$i = 0;
 	$mc = count($menu);
-	foreach ( $menu as $order => $top ) {
+	foreach ($menu as $order => $top) {
 		$i++;
 
-		if ( 0 == $order ) { // dashboard is always shown/single
+		if (0 == $order) { // dashboard is always shown/single
 			$menu[0][4] = add_cssclass('menu-top-first', $top[4]);
 			$lastorder = 0;
 			continue;
 		}
 
-		if ( 0 === strpos($top[2], 'separator') && false !== $lastorder ) { // if separator
+		if (0 === strpos($top[2], 'separator') && false !== $lastorder) { // if separator
 			$first = true;
 			$c = $menu[$lastorder][4];
 			$menu[$lastorder][4] = add_cssclass('menu-top-last', $c);
 			continue;
 		}
 
-		if ( $first ) {
+		if ($first) {
 			$c = $menu[$order][4];
 			$menu[$order][4] = add_cssclass('menu-top-first', $c);
 			$first = false;
 		}
 
-		if ( $mc == $i ) { // last item
+		if ($mc == $i) { // last item
 			$c = $menu[$order][4];
 			$menu[$order][4] = add_cssclass('menu-top-last', $c);
 		}
@@ -235,7 +235,7 @@ 
 	 *
 	 * @param array $menu Associative array of administration menu items.
 	 */
-	return apply_filters( 'add_menu_classes', $menu );
+	return apply_filters('add_menu_classes', $menu);
 }
 
 uksort($menu, "strnatcasecmp"); // make it all pretty
@@ -249,9 +249,9 @@ 
  *
  * @param bool $custom Whether custom ordering is enabled. Default false.
  */
-if ( apply_filters( 'custom_menu_order', false ) ) {
+if (apply_filters('custom_menu_order', false)) {
 	$menu_order = array();
-	foreach ( $menu as $menu_item ) {
+	foreach ($menu as $menu_item) {
 		$menu_order[] = $menu_item[2];
 	}
 	unset($menu_item);
@@ -269,7 +269,7 @@ 
 	 *
 	 * @param array $menu_order An ordered array of menu items.
 	 */
-	$menu_order = apply_filters( 'menu_order', $menu_order );
+	$menu_order = apply_filters('menu_order', $menu_order);
 	$menu_order = array_flip($menu_order);
 	$default_menu_order = array_flip($default_menu_order);
 
@@ -286,12 +286,12 @@ 
 		global $menu_order, $default_menu_order;
 		$a = $a[2];
 		$b = $b[2];
-		if ( isset($menu_order[$a]) && !isset($menu_order[$b]) ) {
+		if (isset($menu_order[$a]) && ! isset($menu_order[$b])) {
 			return -1;
-		} elseif ( !isset($menu_order[$a]) && isset($menu_order[$b]) ) {
+		} elseif ( ! isset($menu_order[$a]) && isset($menu_order[$b])) {
 			return 1;
-		} elseif ( isset($menu_order[$a]) && isset($menu_order[$b]) ) {
-			if ( $menu_order[$a] == $menu_order[$b] )
+		} elseif (isset($menu_order[$a]) && isset($menu_order[$b])) {
+			if ($menu_order[$a] == $menu_order[$b])
 				return 0;
 			return ($menu_order[$a] < $menu_order[$b]) ? -1 : 1;
 		} else {
@@ -305,41 +305,41 @@ 
 
 // Prevent adjacent separators
 $prev_menu_was_separator = false;
-foreach ( $menu as $id => $data ) {
-	if ( false === stristr( $data[4], 'wp-menu-separator' ) ) {
+foreach ($menu as $id => $data) {
+	if (false === stristr($data[4], 'wp-menu-separator')) {
 
 		// This item is not a separator, so falsey the toggler and do nothing
 		$prev_menu_was_separator = false;
 	} else {
 
 		// The previous item was a separator, so unset this one
-		if ( true === $prev_menu_was_separator ) {
-			unset( $menu[ $id ] );
+		if (true === $prev_menu_was_separator) {
+			unset($menu[$id]);
 		}
 
 		// This item is a separator, so truthy the toggler and move on
 		$prev_menu_was_separator = true;
 	}
 }
-unset( $id, $data, $prev_menu_was_separator );
+unset($id, $data, $prev_menu_was_separator);
 
 // Remove the last menu item if it is a separator.
-$last_menu_key = array_keys( $menu );
-$last_menu_key = array_pop( $last_menu_key );
-if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
-	unset( $menu[ $last_menu_key ] );
-unset( $last_menu_key );
+$last_menu_key = array_keys($menu);
+$last_menu_key = array_pop($last_menu_key);
+if ( ! empty($menu) && 'wp-menu-separator' == $menu[$last_menu_key][4])
+	unset($menu[$last_menu_key]);
+unset($last_menu_key);
 
-if ( !user_can_access_admin_page() ) {
+if ( ! user_can_access_admin_page()) {
 
 	/**
 	 * Fires when access to an admin page is denied.
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( 'admin_page_access_denied' );
+	do_action('admin_page_access_denied');
 
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 }
 
 $menu = add_menu_classes($menu);

src/wp-admin/includes/class-wp-themes-list-table.php

Braces +30 added lines, -20 removed lines

@@ -44,16 +44,19 @@ 
 	public function prepare_items() {
 		$themes = wp_get_themes( array( 'allowed' => true ) );
 
-		if ( ! empty( $_REQUEST['s'] ) )
-			$this->search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', strtolower( wp_unslash( $_REQUEST['s'] ) ) ) ) ) );
+		if ( ! empty( $_REQUEST['s'] ) ) {
+					$this->search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', strtolower( wp_unslash( $_REQUEST['s'] ) ) ) ) ) );
+		}
 
-		if ( ! empty( $_REQUEST['features'] ) )
-			$this->features = $_REQUEST['features'];
+		if ( ! empty( $_REQUEST['features'] ) ) {
+					$this->features = $_REQUEST['features'];
+		}
 
 		if ( $this->search_terms || $this->features ) {
 			foreach ( $themes as $key => $theme ) {
-				if ( ! $this->search_theme( $theme ) )
-					unset( $themes[ $key ] );
+				if ( ! $this->search_theme( $theme ) ) {
+									unset( $themes[ $key ] );
+				}
 			}
 		}
 
@@ -109,8 +112,9 @@ 
 	 * @param string $which
 	 */
 	public function tablenav( $which = 'top' ) {
-		if ( $this->get_pagination_arg( 'total_pages' ) <= 1 )
-			return;
+		if ( $this->get_pagination_arg( 'total_pages' ) <= 1 ) {
+					return;
+		}
 		?>
 		<div class="tablenav themes <?php echo $which; ?>">
 			<?php $this->pagination( $which ); ?>
@@ -183,10 +187,11 @@ 
 					. __( 'Live Preview' ) . '</a>';
 			}
 
-			if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
-				$actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( 'themes.php?action=delete&amp;stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet )
+			if ( ! is_multisite() && current_user_can( 'delete_themes' ) ) {
+							$actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( 'themes.php?action=delete&amp;stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet )
 					. '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete." ), $title ) )
 					. "' );" . '">' . __( 'Delete' ) . '</a>';
+			}
 
 			/** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */
 			$actions       = apply_filters( 'theme_action_links', $actions, $theme );
@@ -245,14 +250,16 @@ 
 	public function search_theme( $theme ) {
 		// Search the features
 		foreach ( $this->features as $word ) {
-			if ( ! in_array( $word, $theme->get('Tags') ) )
-				return false;
+			if ( ! in_array( $word, $theme->get('Tags') ) ) {
+							return false;
+			}
 		}
 
 		// Match all phrases
 		foreach ( $this->search_terms as $word ) {
-			if ( in_array( $word, $theme->get('Tags') ) )
-				continue;
+			if ( in_array( $word, $theme->get('Tags') ) ) {
+							continue;
+			}
 
 			foreach ( array( 'Name', 'Description', 'Author', 'AuthorURI' ) as $header ) {
 				// Don't mark up; Do translate.
@@ -261,11 +268,13 @@ 
 				}
 			}
 
-			if ( false !== stripos( $theme->get_stylesheet(), $word ) )
-				continue;
+			if ( false !== stripos( $theme->get_stylesheet(), $word ) ) {
+							continue;
+			}
 
-			if ( false !== stripos( $theme->get_template(), $word ) )
-				continue;
+			if ( false !== stripos( $theme->get_template(), $word ) ) {
+							continue;
+			}
 
 			return false;
 		}
@@ -291,8 +300,9 @@ 
 			'total_pages' => ! empty( $this->_pagination_args['total_pages'] ) ? $this->_pagination_args['total_pages'] : 1,
 		);
 
-		if ( is_array( $extra_args ) )
-			$args = array_merge( $args, $extra_args );
+		if ( is_array( $extra_args ) ) {
+					$args = array_merge( $args, $extra_args );
+		}
 
 		printf( "<script type='text/javascript'>var theme_list_args = %s;</script>\n", wp_json_encode( $args ) );
 		parent::_js_vars();

Spacing +79 added lines, -79 removed lines

@@ -30,11 +30,11 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( array(
+	public function __construct($args = array()) {
+		parent::__construct(array(
 			'ajax' => true,
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 	}
 
 	/**
@@ -43,86 +43,86 @@ 
 	 */
 	public function ajax_user_can() {
 		// Do not check edit_theme_options here. Ajax calls for available themes require switch_themes.
-		return current_user_can( 'switch_themes' );
+		return current_user_can('switch_themes');
 	}
 
 	/**
 	 * @access public
 	 */
 	public function prepare_items() {
-		$themes = wp_get_themes( array( 'allowed' => true ) );
+		$themes = wp_get_themes(array('allowed' => true));
 
-		if ( ! empty( $_REQUEST['s'] ) )
-			$this->search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', strtolower( wp_unslash( $_REQUEST['s'] ) ) ) ) ) );
+		if ( ! empty($_REQUEST['s']))
+			$this->search_terms = array_unique(array_filter(array_map('trim', explode(',', strtolower(wp_unslash($_REQUEST['s']))))));
 
-		if ( ! empty( $_REQUEST['features'] ) )
+		if ( ! empty($_REQUEST['features']))
 			$this->features = $_REQUEST['features'];
 
-		if ( $this->search_terms || $this->features ) {
-			foreach ( $themes as $key => $theme ) {
-				if ( ! $this->search_theme( $theme ) )
-					unset( $themes[ $key ] );
+		if ($this->search_terms || $this->features) {
+			foreach ($themes as $key => $theme) {
+				if ( ! $this->search_theme($theme))
+					unset($themes[$key]);
 			}
 		}
 
-		unset( $themes[ get_option( 'stylesheet' ) ] );
-		WP_Theme::sort_by_name( $themes );
+		unset($themes[get_option('stylesheet')]);
+		WP_Theme::sort_by_name($themes);
 
 		$per_page = 36;
 		$page = $this->get_pagenum();
 
-		$start = ( $page - 1 ) * $per_page;
+		$start = ($page - 1) * $per_page;
 
-		$this->items = array_slice( $themes, $start, $per_page, true );
+		$this->items = array_slice($themes, $start, $per_page, true);
 
-		$this->set_pagination_args( array(
-			'total_items' => count( $themes ),
+		$this->set_pagination_args(array(
+			'total_items' => count($themes),
 			'per_page' => $per_page,
 			'infinite_scroll' => true,
-		) );
+		));
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		if ( $this->search_terms || $this->features ) {
-			_e( 'No items found.' );
+		if ($this->search_terms || $this->features) {
+			_e('No items found.');
 			return;
 		}
 
 		$blog_id = get_current_blog_id();
-		if ( is_multisite() ) {
-			if ( current_user_can( 'install_themes' ) && current_user_can( 'manage_network_themes' ) ) {
-				printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $blog_id ), network_admin_url( 'theme-install.php' ) );
+		if (is_multisite()) {
+			if (current_user_can('install_themes') && current_user_can('manage_network_themes')) {
+				printf(__('You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.'), network_admin_url('site-themes.php?id='.$blog_id), network_admin_url('theme-install.php'));
 
 				return;
-			} elseif ( current_user_can( 'manage_network_themes' ) ) {
-				printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $blog_id ) );
+			} elseif (current_user_can('manage_network_themes')) {
+				printf(__('You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> more themes.'), network_admin_url('site-themes.php?id='.$blog_id));
 
 				return;
 			}
 			// Else, fallthrough. install_themes doesn't help if you can't enable it.
 		} else {
-			if ( current_user_can( 'install_themes' ) ) {
-				printf( __( 'You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress Theme Directory at any time: just click on the <a href="%s">Install Themes</a> tab above.' ), admin_url( 'theme-install.php' ) );
+			if (current_user_can('install_themes')) {
+				printf(__('You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress Theme Directory at any time: just click on the <a href="%s">Install Themes</a> tab above.'), admin_url('theme-install.php'));
 
 				return;
 			}
 		}
 		// Fallthrough.
-		printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) );
+		printf(__('Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.'), get_site_option('site_name'));
 	}
 
 	/**
 	 * @param string $which
 	 */
-	public function tablenav( $which = 'top' ) {
-		if ( $this->get_pagination_arg( 'total_pages' ) <= 1 )
+	public function tablenav($which = 'top') {
+		if ($this->get_pagination_arg('total_pages') <= 1)
 			return;
 		?>
 		<div class="tablenav themes <?php echo $which; ?>">
-			<?php $this->pagination( $which ); ?>
+			<?php $this->pagination($which); ?>
 			<span class="spinner"></span>
 			<br class="clear" />
 		</div>
@@ -133,15 +133,15 @@ 
 	 * @access public
 	 */
 	public function display() {
-		wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+		wp_nonce_field("fetch-list-".get_class($this), '_ajax_fetch_list_nonce');
 ?>
-		<?php $this->tablenav( 'top' ); ?>
+		<?php $this->tablenav('top'); ?>
 
 		<div id="availablethemes">
 			<?php $this->display_rows_or_placeholder(); ?>
 		</div>
 
-		<?php $this->tablenav( 'bottom' ); ?>
+		<?php $this->tablenav('bottom'); ?>
 <?php
 	}
 
@@ -157,7 +157,7 @@ 
 	 * @access public
 	 */
 	public function display_rows_or_placeholder() {
-		if ( $this->has_items() ) {
+		if ($this->has_items()) {
 			$this->display_rows();
 		} else {
 			echo '<div class="no-items">';
@@ -172,7 +172,7 @@ 
 	public function display_rows() {
 		$themes = $this->items;
 
-		foreach ( $themes as $theme ):
+		foreach ($themes as $theme):
 			?><div class="available-theme"><?php
 
 			$template   = $theme->get_template();
@@ -181,64 +181,64 @@ 
 			$version    = $theme->display('Version');
 			$author     = $theme->display('Author');
 
-			$activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=" . urlencode( $template ) . "&amp;stylesheet=" . urlencode( $stylesheet ), 'switch-theme_' . $stylesheet );
+			$activate_link = wp_nonce_url("themes.php?action=activate&amp;template=".urlencode($template)."&amp;stylesheet=".urlencode($stylesheet), 'switch-theme_'.$stylesheet);
 
 			$actions = array();
-			$actions['activate'] = '<a href="' . $activate_link . '" class="activatelink" title="'
-				. esc_attr( sprintf( __( 'Activate &#8220;%s&#8221;' ), $title ) ) . '">' . __( 'Activate' ) . '</a>';
+			$actions['activate'] = '<a href="'.$activate_link.'" class="activatelink" title="'
+				. esc_attr(sprintf(__('Activate &#8220;%s&#8221;'), $title)).'">'.__('Activate').'</a>';
 
-			if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-				$actions['preview'] .= '<a href="' . wp_customize_url( $stylesheet ) . '" class="load-customize hide-if-no-customize">'
-					. __( 'Live Preview' ) . '</a>';
+			if (current_user_can('edit_theme_options') && current_user_can('customize')) {
+				$actions['preview'] .= '<a href="'.wp_customize_url($stylesheet).'" class="load-customize hide-if-no-customize">'
+					. __('Live Preview').'</a>';
 			}
 
-			if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
-				$actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( 'themes.php?action=delete&amp;stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet )
-					. '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete." ), $title ) )
-					. "' );" . '">' . __( 'Delete' ) . '</a>';
+			if ( ! is_multisite() && current_user_can('delete_themes'))
+				$actions['delete'] = '<a class="submitdelete deletion" href="'.wp_nonce_url('themes.php?action=delete&amp;stylesheet='.urlencode($stylesheet), 'delete-theme_'.$stylesheet)
+					. '" onclick="'."return confirm( '".esc_js(sprintf(__("You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete."), $title))
+					. "' );".'">'.__('Delete').'</a>';
 
 			/** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */
-			$actions       = apply_filters( 'theme_action_links', $actions, $theme );
+			$actions       = apply_filters('theme_action_links', $actions, $theme);
 
 			/** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */
-			$actions       = apply_filters( "theme_action_links_$stylesheet", $actions, $theme );
-			$delete_action = isset( $actions['delete'] ) ? '<div class="delete-theme">' . $actions['delete'] . '</div>' : '';
-			unset( $actions['delete'] );
+			$actions       = apply_filters("theme_action_links_$stylesheet", $actions, $theme);
+			$delete_action = isset($actions['delete']) ? '<div class="delete-theme">'.$actions['delete'].'</div>' : '';
+			unset($actions['delete']);
 
 			?>
 
 			<span class="screenshot hide-if-customize">
-				<?php if ( $screenshot = $theme->get_screenshot() ) : ?>
-					<img src="<?php echo esc_url( $screenshot ); ?>" alt="" />
+				<?php if ($screenshot = $theme->get_screenshot()) : ?>
+					<img src="<?php echo esc_url($screenshot); ?>" alt="" />
 				<?php endif; ?>
 			</span>
-			<a href="<?php echo wp_customize_url( $stylesheet ); ?>" class="screenshot load-customize hide-if-no-customize">
-				<?php if ( $screenshot = $theme->get_screenshot() ) : ?>
-					<img src="<?php echo esc_url( $screenshot ); ?>" alt="" />
+			<a href="<?php echo wp_customize_url($stylesheet); ?>" class="screenshot load-customize hide-if-no-customize">
+				<?php if ($screenshot = $theme->get_screenshot()) : ?>
+					<img src="<?php echo esc_url($screenshot); ?>" alt="" />
 				<?php endif; ?>
 			</a>
 
 			<h3><?php echo $title; ?></h3>
-			<div class="theme-author"><?php printf( __( 'By %s' ), $author ); ?></div>
+			<div class="theme-author"><?php printf(__('By %s'), $author); ?></div>
 			<div class="action-links">
 				<ul>
-					<?php foreach ( $actions as $action ): ?>
+					<?php foreach ($actions as $action): ?>
 						<li><?php echo $action; ?></li>
 					<?php endforeach; ?>
 					<li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e('Details') ?></a></li>
 				</ul>
 				<?php echo $delete_action; ?>
 
-				<?php theme_update_available( $theme ); ?>
+				<?php theme_update_available($theme); ?>
 			</div>
 
 			<div class="themedetaildiv hide-if-js">
 				<p><strong><?php _e('Version:'); ?></strong> <?php echo $version; ?></p>
 				<p><?php echo $theme->display('Description'); ?></p>
-				<?php if ( $theme->parent() ) {
-					printf( ' <p class="howto">' . __( 'This <a href="%1$s">child theme</a> requires its parent theme, %2$s.' ) . '</p>',
-						__( 'https://codex.wordpress.org/Child_Themes' ),
-						$theme->parent()->display( 'Name' ) );
+				<?php if ($theme->parent()) {
+					printf(' <p class="howto">'.__('This <a href="%1$s">child theme</a> requires its parent theme, %2$s.').'</p>',
+						__('https://codex.wordpress.org/Child_Themes'),
+						$theme->parent()->display('Name'));
 				} ?>
 			</div>
 
@@ -251,29 +251,29 @@ 
 	 * @param WP_Theme $theme
 	 * @return bool
 	 */
-	public function search_theme( $theme ) {
+	public function search_theme($theme) {
 		// Search the features
-		foreach ( $this->features as $word ) {
-			if ( ! in_array( $word, $theme->get('Tags') ) )
+		foreach ($this->features as $word) {
+			if ( ! in_array($word, $theme->get('Tags')))
 				return false;
 		}
 
 		// Match all phrases
-		foreach ( $this->search_terms as $word ) {
-			if ( in_array( $word, $theme->get('Tags') ) )
+		foreach ($this->search_terms as $word) {
+			if (in_array($word, $theme->get('Tags')))
 				continue;
 
-			foreach ( array( 'Name', 'Description', 'Author', 'AuthorURI' ) as $header ) {
+			foreach (array('Name', 'Description', 'Author', 'AuthorURI') as $header) {
 				// Don't mark up; Do translate.
-				if ( false !== stripos( strip_tags( $theme->display( $header, false, true ) ), $word ) ) {
+				if (false !== stripos(strip_tags($theme->display($header, false, true)), $word)) {
 					continue 2;
 				}
 			}
 
-			if ( false !== stripos( $theme->get_stylesheet(), $word ) )
+			if (false !== stripos($theme->get_stylesheet(), $word))
 				continue;
 
-			if ( false !== stripos( $theme->get_template(), $word ) )
+			if (false !== stripos($theme->get_template(), $word))
 				continue;
 
 			return false;
@@ -290,20 +290,20 @@ 
 	 *
 	 * @param array $extra_args
 	 */
-	public function _js_vars( $extra_args = array() ) {
-		$search_string = isset( $_REQUEST['s'] ) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : '';
+	public function _js_vars($extra_args = array()) {
+		$search_string = isset($_REQUEST['s']) ? esc_attr(wp_unslash($_REQUEST['s'])) : '';
 
 		$args = array(
 			'search' => $search_string,
 			'features' => $this->features,
 			'paged' => $this->get_pagenum(),
-			'total_pages' => ! empty( $this->_pagination_args['total_pages'] ) ? $this->_pagination_args['total_pages'] : 1,
+			'total_pages' => ! empty($this->_pagination_args['total_pages']) ? $this->_pagination_args['total_pages'] : 1,
 		);
 
-		if ( is_array( $extra_args ) )
-			$args = array_merge( $args, $extra_args );
+		if (is_array($extra_args))
+			$args = array_merge($args, $extra_args);
 
-		printf( "<script type='text/javascript'>var theme_list_args = %s;</script>\n", wp_json_encode( $args ) );
+		printf("<script type='text/javascript'>var theme_list_args = %s;</script>\n", wp_json_encode($args));
 		parent::_js_vars();
 	}
 }

src/wp-admin/includes/class-wp-press-this.php

Indentation +1 added lines, -1 removed lines

@@ -1039,7 +1039,7 @@
 	 * @since 4.2.0
 	 * @access public
 	 *
- 	 * @param array $data The site's data.
+	 * @param array $data The site's data.
 	 * @return string Discovered canonical URL, or empty
 	 */
 	public function get_canonical_link( $data ) {

Spacing +405 added lines, -405 removed lines

@@ -48,7 +48,7 @@ 
 			 *
 			 * @param bool $redirect Whether to redirect in parent window or not. Default false.
 			 */
-			'redirInParent' => apply_filters( 'press_this_redirect_in_parent', false ),
+			'redirInParent' => apply_filters('press_this_redirect_in_parent', false),
 		);
 	}
 
@@ -62,37 +62,37 @@ 
 	 * @param string $content Optional. Current expected markup for Press This. Expects slashed. Default empty.
 	 * @return string New markup with old image URLs replaced with the local attachment ones if swapped.
 	 */
-	public function side_load_images( $post_id, $content = '' ) {
-		$content = wp_unslash( $content );
+	public function side_load_images($post_id, $content = '') {
+		$content = wp_unslash($content);
 
-		if ( preg_match_all( '/<img [^>]+>/', $content, $matches ) && current_user_can( 'upload_files' ) ) {
-			foreach ( (array) $matches[0] as $image ) {
+		if (preg_match_all('/<img [^>]+>/', $content, $matches) && current_user_can('upload_files')) {
+			foreach ((array) $matches[0] as $image) {
 				// This is inserted from our JS so HTML attributes should always be in double quotes.
-				if ( ! preg_match( '/src="([^"]+)"/', $image, $url_matches ) ) {
+				if ( ! preg_match('/src="([^"]+)"/', $image, $url_matches)) {
 					continue;
 				}
 
 				$image_src = $url_matches[1];
 
 				// Don't try to sideload a file without a file extension, leads to WP upload error.
-				if ( ! preg_match( '/[^\?]+\.(?:jpe?g|jpe|gif|png)(?:\?|$)/i', $image_src ) ) {
+				if ( ! preg_match('/[^\?]+\.(?:jpe?g|jpe|gif|png)(?:\?|$)/i', $image_src)) {
 					continue;
 				}
 
 				// Sideload image, which gives us a new image src.
-				$new_src = media_sideload_image( $image_src, $post_id, null, 'src' );
+				$new_src = media_sideload_image($image_src, $post_id, null, 'src');
 
-				if ( ! is_wp_error( $new_src ) ) {
+				if ( ! is_wp_error($new_src)) {
 					// Replace the POSTED content <img> with correct uploaded ones.
 					// Need to do it in two steps so we don't replace links to the original image if any.
-					$new_image = str_replace( $image_src, $new_src, $image );
-					$content = str_replace( $image, $new_image, $content );
+					$new_image = str_replace($image_src, $new_src, $image);
+					$content = str_replace($image, $new_image, $content);
 				}
 			}
 		}
 
 		// Expected slashed
-		return wp_slash( $content );
+		return wp_slash($content);
 	}
 
 	/**
@@ -102,38 +102,38 @@ 
 	 * @access public
 	 */
 	public function save_post() {
-		if ( empty( $_POST['post_ID'] ) || ! $post_id = (int) $_POST['post_ID'] ) {
-			wp_send_json_error( array( 'errorMessage' => __( 'Missing post ID.' ) ) );
+		if (empty($_POST['post_ID']) || ! $post_id = (int) $_POST['post_ID']) {
+			wp_send_json_error(array('errorMessage' => __('Missing post ID.')));
 		}
 
-		if ( empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'update-post_' . $post_id ) ||
-			! current_user_can( 'edit_post', $post_id ) ) {
+		if (empty($_POST['_wpnonce']) || ! wp_verify_nonce($_POST['_wpnonce'], 'update-post_'.$post_id) ||
+			! current_user_can('edit_post', $post_id)) {
 
-			wp_send_json_error( array( 'errorMessage' => __( 'Invalid post.' ) ) );
+			wp_send_json_error(array('errorMessage' => __('Invalid post.')));
 		}
 
 		$post_data = array(
 			'ID'            => $post_id,
-			'post_title'    => ( ! empty( $_POST['post_title'] ) ) ? sanitize_text_field( trim( $_POST['post_title'] ) ) : '',
-			'post_content'  => ( ! empty( $_POST['post_content'] ) ) ? trim( $_POST['post_content'] ) : '',
+			'post_title'    => ( ! empty($_POST['post_title'])) ? sanitize_text_field(trim($_POST['post_title'])) : '',
+			'post_content'  => ( ! empty($_POST['post_content'])) ? trim($_POST['post_content']) : '',
 			'post_type'     => 'post',
 			'post_status'   => 'draft',
-			'post_format'   => ( ! empty( $_POST['post_format'] ) ) ? sanitize_text_field( $_POST['post_format'] ) : '',
+			'post_format'   => ( ! empty($_POST['post_format'])) ? sanitize_text_field($_POST['post_format']) : '',
 		);
 
 		// Only accept categories if the user actually can assign
-		$category_tax = get_taxonomy( 'category' );
-		if ( current_user_can( $category_tax->cap->assign_terms ) ) {
-			$post_data['post_category'] = ( ! empty( $_POST['post_category'] ) ) ? $_POST['post_category'] : array();
+		$category_tax = get_taxonomy('category');
+		if (current_user_can($category_tax->cap->assign_terms)) {
+			$post_data['post_category'] = ( ! empty($_POST['post_category'])) ? $_POST['post_category'] : array();
 		}
 
 		// Only accept taxonomies if the user can actually assign
-		if ( ! empty( $_POST['tax_input'] ) ) {
+		if ( ! empty($_POST['tax_input'])) {
 			$tax_input = $_POST['tax_input'];
-			foreach ( $tax_input as $tax => $_ti ) {
-				$tax_object = get_taxonomy( $tax );
-				if ( ! $tax_object || ! current_user_can( $tax_object->cap->assign_terms ) ) {
-					unset( $tax_input[ $tax ] );
+			foreach ($tax_input as $tax => $_ti) {
+				$tax_object = get_taxonomy($tax);
+				if ( ! $tax_object || ! current_user_can($tax_object->cap->assign_terms)) {
+					unset($tax_input[$tax]);
 				}
 			}
 
@@ -141,15 +141,15 @@ 
 		}
 
 		// Toggle status to pending if user cannot actually publish
-		if ( ! empty( $_POST['post_status'] ) && 'publish' === $_POST['post_status'] ) {
-			if ( current_user_can( 'publish_posts' ) ) {
+		if ( ! empty($_POST['post_status']) && 'publish' === $_POST['post_status']) {
+			if (current_user_can('publish_posts')) {
 				$post_data['post_status'] = 'publish';
 			} else {
 				$post_data['post_status'] = 'pending';
 			}
 		}
 
-		$post_data['post_content'] = $this->side_load_images( $post_id, $post_data['post_content'] );
+		$post_data['post_content'] = $this->side_load_images($post_id, $post_data['post_content']);
 
 		/**
 		 * Filters the post data of a Press This post before saving/updating.
@@ -160,28 +160,28 @@ 
 		 *
 		 * @param array $post_data The post data.
 		 */
-		$post_data = apply_filters( 'press_this_save_post', $post_data );
+		$post_data = apply_filters('press_this_save_post', $post_data);
 
-		$updated = wp_update_post( $post_data, true );
+		$updated = wp_update_post($post_data, true);
 
-		if ( is_wp_error( $updated ) ) {
-			wp_send_json_error( array( 'errorMessage' => $updated->get_error_message() ) );
+		if (is_wp_error($updated)) {
+			wp_send_json_error(array('errorMessage' => $updated->get_error_message()));
 		} else {
-			if ( isset( $post_data['post_format'] ) ) {
-				if ( current_theme_supports( 'post-formats', $post_data['post_format'] ) ) {
-					set_post_format( $post_id, $post_data['post_format'] );
-				} elseif ( $post_data['post_format'] ) {
-					set_post_format( $post_id, false );
+			if (isset($post_data['post_format'])) {
+				if (current_theme_supports('post-formats', $post_data['post_format'])) {
+					set_post_format($post_id, $post_data['post_format']);
+				} elseif ($post_data['post_format']) {
+					set_post_format($post_id, false);
 				}
 			}
 
 			$forceRedirect = false;
 
-			if ( 'publish' === get_post_status( $post_id ) ) {
-				$redirect = get_post_permalink( $post_id );
-			} elseif ( isset( $_POST['pt-force-redirect'] ) && $_POST['pt-force-redirect'] === 'true' ) {
+			if ('publish' === get_post_status($post_id)) {
+				$redirect = get_post_permalink($post_id);
+			} elseif (isset($_POST['pt-force-redirect']) && $_POST['pt-force-redirect'] === 'true') {
 				$forceRedirect = true;
-				$redirect = get_edit_post_link( $post_id, 'js' );
+				$redirect = get_edit_post_link($post_id, 'js');
 			} else {
 				$redirect = false;
 			}
@@ -196,12 +196,12 @@ 
 			 * @param int    $post_id Post ID.
 			 * @param string $status  Post status.
 			 */
-			$redirect = apply_filters( 'press_this_save_redirect', $redirect, $post_id, $post_data['post_status'] );
+			$redirect = apply_filters('press_this_save_redirect', $redirect, $post_id, $post_data['post_status']);
 
-			if ( $redirect ) {
-				wp_send_json_success( array( 'redirect' => $redirect, 'force' => $forceRedirect ) );
+			if ($redirect) {
+				wp_send_json_success(array('redirect' => $redirect, 'force' => $forceRedirect));
 			} else {
-				wp_send_json_success( array( 'postSaved' => true ) );
+				wp_send_json_success(array('postSaved' => true));
 			}
 		}
 	}
@@ -213,57 +213,57 @@ 
 	 * @access public
 	 */
 	public function add_category() {
-		if ( false === wp_verify_nonce( $_POST['new_cat_nonce'], 'add-category' ) ) {
+		if (false === wp_verify_nonce($_POST['new_cat_nonce'], 'add-category')) {
 			wp_send_json_error();
 		}
 
-		$taxonomy = get_taxonomy( 'category' );
+		$taxonomy = get_taxonomy('category');
 
-		if ( ! current_user_can( $taxonomy->cap->edit_terms ) || empty( $_POST['name'] ) ) {
+		if ( ! current_user_can($taxonomy->cap->edit_terms) || empty($_POST['name'])) {
 			wp_send_json_error();
 		}
 
-		$parent = isset( $_POST['parent'] ) && (int) $_POST['parent'] > 0 ? (int) $_POST['parent'] : 0;
-		$names = explode( ',', $_POST['name'] );
+		$parent = isset($_POST['parent']) && (int) $_POST['parent'] > 0 ? (int) $_POST['parent'] : 0;
+		$names = explode(',', $_POST['name']);
 		$added = $data = array();
 
-		foreach ( $names as $cat_name ) {
-			$cat_name = trim( $cat_name );
-			$cat_nicename = sanitize_title( $cat_name );
+		foreach ($names as $cat_name) {
+			$cat_name = trim($cat_name);
+			$cat_nicename = sanitize_title($cat_name);
 
-			if ( empty( $cat_nicename ) ) {
+			if (empty($cat_nicename)) {
 				continue;
 			}
 
 			// @todo Find a more performant way to check existence, maybe get_term() with a separate parent check.
-			if ( term_exists( $cat_name, $taxonomy->name, $parent ) ) {
-				if ( count( $names ) === 1 ) {
-					wp_send_json_error( array( 'errorMessage' => __( 'This category already exists.' ) ) );
+			if (term_exists($cat_name, $taxonomy->name, $parent)) {
+				if (count($names) === 1) {
+					wp_send_json_error(array('errorMessage' => __('This category already exists.')));
 				} else {
 					continue;
 				}
 			}
 
-			$cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
+			$cat_id = wp_insert_term($cat_name, $taxonomy->name, array('parent' => $parent));
 
-			if ( is_wp_error( $cat_id ) ) {
+			if (is_wp_error($cat_id)) {
 				continue;
-			} elseif ( is_array( $cat_id ) ) {
+			} elseif (is_array($cat_id)) {
 				$cat_id = $cat_id['term_id'];
 			}
 
 			$added[] = $cat_id;
 		}
 
-		if ( empty( $added ) ) {
-			wp_send_json_error( array( 'errorMessage' => __( 'This category cannot be added. Please change the name and try again.' ) ) );
+		if (empty($added)) {
+			wp_send_json_error(array('errorMessage' => __('This category cannot be added. Please change the name and try again.')));
 		}
 
-		foreach ( $added as $new_cat_id ) {
-			$new_cat = get_category( $new_cat_id );
+		foreach ($added as $new_cat_id) {
+			$new_cat = get_category($new_cat_id);
 
-			if ( is_wp_error( $new_cat ) ) {
-				wp_send_json_error( array( 'errorMessage' => __( 'Error while adding the category. Please try again later.' ) ) );
+			if (is_wp_error($new_cat)) {
+				wp_send_json_error(array('errorMessage' => __('Error while adding the category. Please try again later.')));
 			}
 
 			$data[] = array(
@@ -272,7 +272,7 @@ 
 				'parent' => $new_cat->parent,
 			);
 		}
-		wp_send_json_success( $data );
+		wp_send_json_success($data);
 	}
 
 	/**
@@ -284,18 +284,18 @@ 
 	 * @param string $url URL to scan.
 	 * @return string Source's HTML sanitized markup
 	 */
-	public function fetch_source_html( $url ) {
-		if ( empty( $url ) ) {
-			return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
+	public function fetch_source_html($url) {
+		if (empty($url)) {
+			return new WP_Error('invalid-url', __('A valid URL was not provided.'));
 		}
 
-		$remote_url = wp_safe_remote_get( $url, array(
+		$remote_url = wp_safe_remote_get($url, array(
 			'timeout' => 30,
 			// Use an explicit user-agent for Press This
-			'user-agent' => 'Press This (WordPress/' . get_bloginfo( 'version' ) . '); ' . get_bloginfo( 'url' )
-		) );
+			'user-agent' => 'Press This (WordPress/'.get_bloginfo('version').'); '.get_bloginfo('url')
+		));
 
-		if ( is_wp_error( $remote_url ) ) {
+		if (is_wp_error($remote_url)) {
 			return $remote_url;
 		}
 
@@ -320,8 +320,8 @@ 
 			)
 		);
 
-		$source_content = wp_remote_retrieve_body( $remote_url );
-		$source_content = wp_kses( $source_content, $allowed_elements );
+		$source_content = wp_remote_retrieve_body($remote_url);
+		$source_content = wp_kses($source_content, $allowed_elements);
 
 		return $source_content;
 	}
@@ -335,10 +335,10 @@ 
 	 * @param array $value Array to limit.
 	 * @return array Original array if fewer than 50 values, limited array, empty array otherwise.
 	 */
-	private function _limit_array( $value ) {
-		if ( is_array( $value ) ) {
-			if ( count( $value ) > 50 ) {
-				return array_slice( $value, 0, 50 );
+	private function _limit_array($value) {
+		if (is_array($value)) {
+			if (count($value) > 50) {
+				return array_slice($value, 0, 50);
 			}
 
 			return $value;
@@ -358,20 +358,20 @@ 
 	 *                         if fewer than 5,000 characters, a truncated version, otherwise an
 	 *                         empty string.
 	 */
-	private function _limit_string( $value ) {
+	private function _limit_string($value) {
 		$return = '';
 
-		if ( is_numeric( $value ) || is_bool( $value ) ) {
+		if (is_numeric($value) || is_bool($value)) {
 			$return = $value;
-		} else if ( is_string( $value ) ) {
-			if ( mb_strlen( $value ) > 5000 ) {
-				$return = mb_substr( $value, 0, 5000 );
+		} else if (is_string($value)) {
+			if (mb_strlen($value) > 5000) {
+				$return = mb_substr($value, 0, 5000);
 			} else {
 				$return = $value;
 			}
 
-			$return = html_entity_decode( $return, ENT_QUOTES, 'UTF-8' );
-			$return = sanitize_text_field( trim( $return ) );
+			$return = html_entity_decode($return, ENT_QUOTES, 'UTF-8');
+			$return = sanitize_text_field(trim($return));
 		}
 
 		return $return;
@@ -386,32 +386,32 @@ 
 	 * @param string $url URL to check for length and validity.
 	 * @return string Escaped URL if of valid length (< 2048) and makeup. Empty string otherwise.
 	 */
-	private function _limit_url( $url ) {
-		if ( ! is_string( $url ) ) {
+	private function _limit_url($url) {
+		if ( ! is_string($url)) {
 			return '';
 		}
 
 		// HTTP 1.1 allows 8000 chars but the "de-facto" standard supported in all current browsers is 2048.
-		if ( strlen( $url ) > 2048 ) {
+		if (strlen($url) > 2048) {
 			return ''; // Return empty rather than a truncated/invalid URL
 		}
 
 		// Does not look like a URL.
-		if ( ! preg_match( '/^([!#$&-;=?-\[\]_a-z~]|%[0-9a-fA-F]{2})+$/', $url ) ) {
+		if ( ! preg_match('/^([!#$&-;=?-\[\]_a-z~]|%[0-9a-fA-F]{2})+$/', $url)) {
 			return '';
 		}
 
 		// If the URL is root-relative, prepend the protocol and domain name
-		if ( $url && $this->domain && preg_match( '%^/[^/]+%', $url ) ) {
-			$url = $this->domain . $url;
+		if ($url && $this->domain && preg_match('%^/[^/]+%', $url)) {
+			$url = $this->domain.$url;
 		}
 
 		// Not absolute or protocol-relative URL.
-		if ( ! preg_match( '%^(?:https?:)?//[^/]+%', $url ) ) {
+		if ( ! preg_match('%^(?:https?:)?//[^/]+%', $url)) {
 			return '';
 		}
 
-		return esc_url_raw( $url, array( 'http', 'https' ) );
+		return esc_url_raw($url, array('http', 'https'));
 	}
 
 	/**
@@ -426,34 +426,34 @@ 
 	 * @param string $src Image source URL.
 	 * @return string If not matched an excluded URL type, the original URL, empty string otherwise.
 	 */
-	private function _limit_img( $src ) {
-		$src = $this->_limit_url( $src );
+	private function _limit_img($src) {
+		$src = $this->_limit_url($src);
 
-		if ( preg_match( '!/ad[sx]?/!i', $src ) ) {
+		if (preg_match('!/ad[sx]?/!i', $src)) {
 			// Ads
 			return '';
-		} else if ( preg_match( '!(/share-?this[^.]+?\.[a-z0-9]{3,4})(\?.*)?$!i', $src ) ) {
+		} else if (preg_match('!(/share-?this[^.]+?\.[a-z0-9]{3,4})(\?.*)?$!i', $src)) {
 			// Share-this type button
 			return '';
-		} else if ( preg_match( '!/(spinner|loading|spacer|blank|rss)\.(gif|jpg|png)!i', $src ) ) {
+		} else if (preg_match('!/(spinner|loading|spacer|blank|rss)\.(gif|jpg|png)!i', $src)) {
 			// Loaders, spinners, spacers
 			return '';
-		} else if ( preg_match( '!/([^./]+[-_])?(spinner|loading|spacer|blank)s?([-_][^./]+)?\.[a-z0-9]{3,4}!i', $src ) ) {
+		} else if (preg_match('!/([^./]+[-_])?(spinner|loading|spacer|blank)s?([-_][^./]+)?\.[a-z0-9]{3,4}!i', $src)) {
 			// Fancy loaders, spinners, spacers
 			return '';
-		} else if ( preg_match( '!([^./]+[-_])?thumb[^.]*\.(gif|jpg|png)$!i', $src ) ) {
+		} else if (preg_match('!([^./]+[-_])?thumb[^.]*\.(gif|jpg|png)$!i', $src)) {
 			// Thumbnails, too small, usually irrelevant to context
 			return '';
-		} else if ( false !== stripos( $src, '/wp-includes/' ) ) {
+		} else if (false !== stripos($src, '/wp-includes/')) {
 			// Classic WordPress interface images
 			return '';
-		} else if ( preg_match( '![^\d]\d{1,2}x\d+\.(gif|jpg|png)$!i', $src ) ) {
+		} else if (preg_match('![^\d]\d{1,2}x\d+\.(gif|jpg|png)$!i', $src)) {
 			// Most often tiny buttons/thumbs (< 100px wide)
 			return '';
-		} else if ( preg_match( '!/pixel\.(mathtag|quantserve)\.com!i', $src ) ) {
+		} else if (preg_match('!/pixel\.(mathtag|quantserve)\.com!i', $src)) {
 			// See mathtag.com and https://www.quantcast.com/how-we-do-it/iab-standard-measurement/how-we-collect-data/
 			return '';
-		} else if ( preg_match( '!/[gb]\.gif(\?.+)?$!i', $src ) ) {
+		} else if (preg_match('!/[gb]\.gif(\?.+)?$!i', $src)) {
 			// WordPress.com stats gif
 			return '';
 		}
@@ -473,31 +473,31 @@ 
 	 * @param string $src Embed source URL.
 	 * @return string If not from a supported provider, an empty string. Otherwise, a reformatted embed URL.
 	 */
-	private function _limit_embed( $src ) {
-		$src = $this->_limit_url( $src );
+	private function _limit_embed($src) {
+		$src = $this->_limit_url($src);
 
-		if ( empty( $src ) )
+		if (empty($src))
 			return '';
 
-		if ( preg_match( '!//(m|www)\.youtube\.com/(embed|v)/([^?]+)\?.+$!i', $src, $src_matches ) ) {
+		if (preg_match('!//(m|www)\.youtube\.com/(embed|v)/([^?]+)\?.+$!i', $src, $src_matches)) {
 			// Embedded Youtube videos (www or mobile)
-			$src = 'https://www.youtube.com/watch?v=' . $src_matches[3];
-		} else if ( preg_match( '!//player\.vimeo\.com/video/([\d]+)([?/].*)?$!i', $src, $src_matches ) ) {
+			$src = 'https://www.youtube.com/watch?v='.$src_matches[3];
+		} else if (preg_match('!//player\.vimeo\.com/video/([\d]+)([?/].*)?$!i', $src, $src_matches)) {
 			// Embedded Vimeo iframe videos
-			$src = 'https://vimeo.com/' . (int) $src_matches[1];
-		} else if ( preg_match( '!//vimeo\.com/moogaloop\.swf\?clip_id=([\d]+)$!i', $src, $src_matches ) ) {
+			$src = 'https://vimeo.com/'.(int) $src_matches[1];
+		} else if (preg_match('!//vimeo\.com/moogaloop\.swf\?clip_id=([\d]+)$!i', $src, $src_matches)) {
 			// Embedded Vimeo Flash videos
-			$src = 'https://vimeo.com/' . (int) $src_matches[1];
-		} else if ( preg_match( '!//vine\.co/v/([^/]+)/embed!i', $src, $src_matches ) ) {
+			$src = 'https://vimeo.com/'.(int) $src_matches[1];
+		} else if (preg_match('!//vine\.co/v/([^/]+)/embed!i', $src, $src_matches)) {
 			// Embedded Vine videos
-			$src = 'https://vine.co/v/' . $src_matches[1];
-		} else if ( preg_match( '!//(www\.)?dailymotion\.com/embed/video/([^/?]+)([/?].+)?!i', $src, $src_matches ) ) {
+			$src = 'https://vine.co/v/'.$src_matches[1];
+		} else if (preg_match('!//(www\.)?dailymotion\.com/embed/video/([^/?]+)([/?].+)?!i', $src, $src_matches)) {
 			// Embedded Daily Motion videos
-			$src = 'https://www.dailymotion.com/video/' . $src_matches[2];
+			$src = 'https://www.dailymotion.com/video/'.$src_matches[2];
 		} else {
 			$oembed = _wp_oembed_get_object();
 
-			if ( ! $oembed->get_provider( $src, array( 'discover' => false ) ) ) {
+			if ( ! $oembed->get_provider($src, array('discover' => false))) {
 				$src = '';
 			}
 		}
@@ -516,21 +516,21 @@ 
 	 * @param array  $data       Associative array of source data.
 	 * @return array Processed data array.
 	 */
-	private function _process_meta_entry( $meta_name, $meta_value, $data ) {
-		if ( preg_match( '/:?(title|description|keywords|site_name)$/', $meta_name ) ) {
-			$data['_meta'][ $meta_name ] = $meta_value;
+	private function _process_meta_entry($meta_name, $meta_value, $data) {
+		if (preg_match('/:?(title|description|keywords|site_name)$/', $meta_name)) {
+			$data['_meta'][$meta_name] = $meta_value;
 		} else {
-			switch ( $meta_name ) {
+			switch ($meta_name) {
 				case 'og:url':
 				case 'og:video':
 				case 'og:video:secure_url':
-					$meta_value = $this->_limit_embed( $meta_value );
+					$meta_value = $this->_limit_embed($meta_value);
 
-					if ( ! isset( $data['_embeds'] ) ) {
+					if ( ! isset($data['_embeds'])) {
 						$data['_embeds'] = array();
 					}
 
-					if ( ! empty( $meta_value ) && ! in_array( $meta_value, $data['_embeds'] ) ) {
+					if ( ! empty($meta_value) && ! in_array($meta_value, $data['_embeds'])) {
 						$data['_embeds'][] = $meta_value;
 					}
 
@@ -541,13 +541,13 @@ 
 				case 'twitter:image0':
 				case 'twitter:image:src':
 				case 'twitter:image':
-					$meta_value = $this->_limit_img( $meta_value );
+					$meta_value = $this->_limit_img($meta_value);
 
-					if ( ! isset( $data['_images'] ) ) {
+					if ( ! isset($data['_images'])) {
 						$data['_images'] = array();
 					}
 
-					if ( ! empty( $meta_value ) && ! in_array( $meta_value, $data['_images'] ) ) {
+					if ( ! empty($meta_value) && ! in_array($meta_value, $data['_images'])) {
 						$data['_images'][] = $meta_value;
 					}
 
@@ -568,58 +568,58 @@ 
 	 * @param array  $data Optional. Existing data array if you have one. Default empty array.
 	 * @return array New data array.
 	 */
-	public function source_data_fetch_fallback( $url, $data = array() ) {
-		if ( empty( $url ) ) {
+	public function source_data_fetch_fallback($url, $data = array()) {
+		if (empty($url)) {
 			return array();
 		}
 
 		// Download source page to tmp file.
-		$source_content = $this->fetch_source_html( $url );
-		if ( is_wp_error( $source_content ) ) {
-			return array( 'errors' => $source_content->get_error_messages() );
+		$source_content = $this->fetch_source_html($url);
+		if (is_wp_error($source_content)) {
+			return array('errors' => $source_content->get_error_messages());
 		}
 
 		// Fetch and gather <meta> data first, so discovered media is offered 1st to user.
-		if ( empty( $data['_meta'] ) ) {
+		if (empty($data['_meta'])) {
 			$data['_meta'] = array();
 		}
 
-		if ( preg_match_all( '/<meta [^>]+>/', $source_content, $matches ) ) {
-			$items = $this->_limit_array( $matches[0] );
+		if (preg_match_all('/<meta [^>]+>/', $source_content, $matches)) {
+			$items = $this->_limit_array($matches[0]);
 
-			foreach ( $items as $value ) {
-				if ( preg_match( '/(property|name)="([^"]+)"[^>]+content="([^"]+)"/', $value, $new_matches ) ) {
-					$meta_name  = $this->_limit_string( $new_matches[2] );
-					$meta_value = $this->_limit_string( $new_matches[3] );
+			foreach ($items as $value) {
+				if (preg_match('/(property|name)="([^"]+)"[^>]+content="([^"]+)"/', $value, $new_matches)) {
+					$meta_name  = $this->_limit_string($new_matches[2]);
+					$meta_value = $this->_limit_string($new_matches[3]);
 
 					// Sanity check. $key is usually things like 'title', 'description', 'keywords', etc.
-					if ( strlen( $meta_name ) > 100 ) {
+					if (strlen($meta_name) > 100) {
 						continue;
 					}
 
-					$data = $this->_process_meta_entry( $meta_name, $meta_value, $data );
+					$data = $this->_process_meta_entry($meta_name, $meta_value, $data);
 				}
 			}
 		}
 
 		// Fetch and gather <img> data.
-		if ( empty( $data['_images'] ) ) {
+		if (empty($data['_images'])) {
 			$data['_images'] = array();
 		}
 
-		if ( preg_match_all( '/<img [^>]+>/', $source_content, $matches ) ) {
-			$items = $this->_limit_array( $matches[0] );
+		if (preg_match_all('/<img [^>]+>/', $source_content, $matches)) {
+			$items = $this->_limit_array($matches[0]);
 
-			foreach ( $items as $value ) {
-				if ( ( preg_match( '/width=(\'|")(\d+)\\1/i', $value, $new_matches ) && $new_matches[2] < 256 ) ||
-					( preg_match( '/height=(\'|")(\d+)\\1/i', $value, $new_matches ) && $new_matches[2] < 128 ) ) {
+			foreach ($items as $value) {
+				if ((preg_match('/width=(\'|")(\d+)\\1/i', $value, $new_matches) && $new_matches[2] < 256) ||
+					(preg_match('/height=(\'|")(\d+)\\1/i', $value, $new_matches) && $new_matches[2] < 128)) {
 
 					continue;
 				}
 
-				if ( preg_match( '/src=(\'|")([^\'"]+)\\1/i', $value, $new_matches ) ) {
-					$src = $this->_limit_img( $new_matches[2] );
-					if ( ! empty( $src ) && ! in_array( $src, $data['_images'] ) ) {
+				if (preg_match('/src=(\'|")([^\'"]+)\\1/i', $value, $new_matches)) {
+					$src = $this->_limit_img($new_matches[2]);
+					if ( ! empty($src) && ! in_array($src, $data['_images'])) {
 						$data['_images'][] = $src;
 					}
 				}
@@ -627,18 +627,18 @@ 
 		}
 
 		// Fetch and gather <iframe> data.
-		if ( empty( $data['_embeds'] ) ) {
+		if (empty($data['_embeds'])) {
 			$data['_embeds'] = array();
 		}
 
-		if ( preg_match_all( '/<iframe [^>]+>/', $source_content, $matches ) ) {
-			$items = $this->_limit_array( $matches[0] );
+		if (preg_match_all('/<iframe [^>]+>/', $source_content, $matches)) {
+			$items = $this->_limit_array($matches[0]);
 
-			foreach ( $items as $value ) {
-				if ( preg_match( '/src=(\'|")([^\'"]+)\\1/', $value, $new_matches ) ) {
-					$src = $this->_limit_embed( $new_matches[2] );
+			foreach ($items as $value) {
+				if (preg_match('/src=(\'|")([^\'"]+)\\1/', $value, $new_matches)) {
+					$src = $this->_limit_embed($new_matches[2]);
 
-					if ( ! empty( $src ) && ! in_array( $src, $data['_embeds'] ) ) {
+					if ( ! empty($src) && ! in_array($src, $data['_embeds'])) {
 						$data['_embeds'][] = $src;
 					}
 				}
@@ -646,20 +646,20 @@ 
 		}
 
 		// Fetch and gather <link> data.
-		if ( empty( $data['_links'] ) ) {
+		if (empty($data['_links'])) {
 			$data['_links'] = array();
 		}
 
-		if ( preg_match_all( '/<link [^>]+>/', $source_content, $matches ) ) {
-			$items = $this->_limit_array( $matches[0] );
+		if (preg_match_all('/<link [^>]+>/', $source_content, $matches)) {
+			$items = $this->_limit_array($matches[0]);
 
-			foreach ( $items as $value ) {
-				if ( preg_match( '/rel=["\'](canonical|shortlink|icon)["\']/i', $value, $matches_rel ) && preg_match( '/href=[\'"]([^\'" ]+)[\'"]/i', $value, $matches_url ) ) {
+			foreach ($items as $value) {
+				if (preg_match('/rel=["\'](canonical|shortlink|icon)["\']/i', $value, $matches_rel) && preg_match('/href=[\'"]([^\'" ]+)[\'"]/i', $value, $matches_url)) {
 					$rel = $matches_rel[1];
-					$url = $this->_limit_url( $matches_url[1] );
+					$url = $this->_limit_url($matches_url[1]);
 
-					if ( ! empty( $url ) && empty( $data['_links'][ $rel ] ) ) {
-						$data['_links'][ $rel ] = $url;
+					if ( ! empty($url) && empty($data['_links'][$rel])) {
+						$data['_links'][$rel] = $url;
 					}
 				}
 			}
@@ -681,27 +681,27 @@ 
 		$data = array();
 
 		// Only instantiate the keys we want. Sanity check and sanitize each one.
-		foreach ( array( 'u', 's', 't', 'v' ) as $key ) {
-			if ( ! empty( $_POST[ $key ] ) ) {
-				$value = wp_unslash( $_POST[ $key ] );
-			} else if ( ! empty( $_GET[ $key ] ) ) {
-				$value = wp_unslash( $_GET[ $key ] );
+		foreach (array('u', 's', 't', 'v') as $key) {
+			if ( ! empty($_POST[$key])) {
+				$value = wp_unslash($_POST[$key]);
+			} else if ( ! empty($_GET[$key])) {
+				$value = wp_unslash($_GET[$key]);
 			} else {
 				continue;
 			}
 
-			if ( 'u' === $key ) {
-				$value = $this->_limit_url( $value );
+			if ('u' === $key) {
+				$value = $this->_limit_url($value);
 
-				if ( preg_match( '%^(?:https?:)?//[^/]+%i', $value, $domain_match ) ) {
+				if (preg_match('%^(?:https?:)?//[^/]+%i', $value, $domain_match)) {
 					$this->domain = $domain_match[0];
 				}
 			} else {
-				$value = $this->_limit_string( $value );
+				$value = $this->_limit_string($value);
 			}
 
-			if ( ! empty( $value ) ) {
-				$data[ $key ] = $value;
+			if ( ! empty($value)) {
+				$data[$key] = $value;
 			}
 		}
 
@@ -712,62 +712,62 @@ 
 		 *
 		 * @param bool $enable Whether to enable media discovery.
 		 */
-		if ( apply_filters( 'enable_press_this_media_discovery', true ) ) {
+		if (apply_filters('enable_press_this_media_discovery', true)) {
 			/*
 			 * If no title, _images, _embed, and _meta was passed via $_POST, fetch data from source as fallback,
 			 * making PT fully backward compatible with the older bookmarklet.
 			 */
-			if ( empty( $_POST ) && ! empty( $data['u'] ) ) {
-				if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], 'scan-site' ) ) {
-					$data = $this->source_data_fetch_fallback( $data['u'], $data );
+			if (empty($_POST) && ! empty($data['u'])) {
+				if (isset($_GET['_wpnonce']) && wp_verify_nonce($_GET['_wpnonce'], 'scan-site')) {
+					$data = $this->source_data_fetch_fallback($data['u'], $data);
 				} else {
 					$data['errors'] = 'missing nonce';
 				}
 			} else {
-				foreach ( array( '_images', '_embeds' ) as $type ) {
-					if ( empty( $_POST[ $type ] ) ) {
+				foreach (array('_images', '_embeds') as $type) {
+					if (empty($_POST[$type])) {
 						continue;
 					}
 
-					$data[ $type ] = array();
-					$items = $this->_limit_array( $_POST[ $type ] );
+					$data[$type] = array();
+					$items = $this->_limit_array($_POST[$type]);
 
-					foreach ( $items as $key => $value ) {
-						if ( $type === '_images' ) {
-							$value = $this->_limit_img( wp_unslash( $value ) );
+					foreach ($items as $key => $value) {
+						if ($type === '_images') {
+							$value = $this->_limit_img(wp_unslash($value));
 						} else {
-							$value = $this->_limit_embed( wp_unslash( $value ) );
+							$value = $this->_limit_embed(wp_unslash($value));
 						}
 
-						if ( ! empty( $value ) ) {
-							$data[ $type ][] = $value;
+						if ( ! empty($value)) {
+							$data[$type][] = $value;
 						}
 					}
 				}
 
-				foreach ( array( '_meta', '_links' ) as $type ) {
-					if ( empty( $_POST[ $type ] ) ) {
+				foreach (array('_meta', '_links') as $type) {
+					if (empty($_POST[$type])) {
 						continue;
 					}
 
-					$data[ $type ] = array();
-					$items = $this->_limit_array( $_POST[ $type ] );
+					$data[$type] = array();
+					$items = $this->_limit_array($_POST[$type]);
 
-					foreach ( $items as $key => $value ) {
+					foreach ($items as $key => $value) {
 						// Sanity check. These are associative arrays, $key is usually things like 'title', 'description', 'keywords', etc.
-						if ( empty( $key ) || strlen( $key ) > 100 ) {
+						if (empty($key) || strlen($key) > 100) {
 							continue;
 						}
 
-						if ( $type === '_meta' ) {
-							$value = $this->_limit_string( wp_unslash( $value ) );
+						if ($type === '_meta') {
+							$value = $this->_limit_string(wp_unslash($value));
 
-							if ( ! empty( $value ) ) {
-								$data = $this->_process_meta_entry( $key, $value, $data );
+							if ( ! empty($value)) {
+								$data = $this->_process_meta_entry($key, $value, $data);
 							}
 						} else {
-							if ( in_array( $key, array( 'canonical', 'shortlink', 'icon' ), true ) ) {
-								$data[ $type ][ $key ] = $this->_limit_url( wp_unslash( $value ) );
+							if (in_array($key, array('canonical', 'shortlink', 'icon'), true)) {
+								$data[$type][$key] = $this->_limit_url(wp_unslash($value));
 							}
 						}
 					}
@@ -775,11 +775,11 @@ 
 			}
 
 			// Support passing a single image src as `i`
-			if ( ! empty( $_REQUEST['i'] ) && ( $img_src = $this->_limit_img( wp_unslash( $_REQUEST['i'] ) ) ) ) {
-				if ( empty( $data['_images'] ) ) {
-					$data['_images'] = array( $img_src );
-				} elseif ( ! in_array( $img_src, $data['_images'], true ) ) {
-					array_unshift( $data['_images'], $img_src );
+			if ( ! empty($_REQUEST['i']) && ($img_src = $this->_limit_img(wp_unslash($_REQUEST['i'])))) {
+				if (empty($data['_images'])) {
+					$data['_images'] = array($img_src);
+				} elseif ( ! in_array($img_src, $data['_images'], true)) {
+					array_unshift($data['_images'], $img_src);
 				}
 			}
 		}
@@ -791,7 +791,7 @@ 
 		 *
 		 * @param array $data Press This Data array.
 		 */
-		return apply_filters( 'press_this_data', $data );
+		return apply_filters('press_this_data', $data);
 	}
 
 	/**
@@ -803,17 +803,17 @@ 
 	 * @param string $styles URL to editor stylesheet.
 	 * @return string Possibly modified stylesheets list.
 	 */
-	public function add_editor_style( $styles ) {
-		if ( ! empty( $styles ) ) {
+	public function add_editor_style($styles) {
+		if ( ! empty($styles)) {
 			$styles .= ',';
 		}
 
-		$press_this = admin_url( 'css/press-this-editor.css' );
-		if ( is_rtl() ) {
-			$press_this = str_replace( '.css', '-rtl.css', $press_this );
+		$press_this = admin_url('css/press-this-editor.css');
+		if (is_rtl()) {
+			$press_this = str_replace('.css', '-rtl.css', $press_this);
 		}
 
-		return $styles . $press_this;
+		return $styles.$press_this;
 	}
 
 	/**
@@ -824,35 +824,35 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function post_formats_html( $post ) {
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) {
-			$post_formats = get_theme_support( 'post-formats' );
+	public function post_formats_html($post) {
+		if (current_theme_supports('post-formats') && post_type_supports($post->post_type, 'post-formats')) {
+			$post_formats = get_theme_support('post-formats');
 
-			if ( is_array( $post_formats[0] ) ) {
-				$post_format = get_post_format( $post->ID );
+			if (is_array($post_formats[0])) {
+				$post_format = get_post_format($post->ID);
 
-				if ( ! $post_format ) {
+				if ( ! $post_format) {
 					$post_format = '0';
 				}
 
 				// Add in the current one if it isn't there yet, in case the current theme doesn't support it.
-				if ( $post_format && ! in_array( $post_format, $post_formats[0] ) ) {
+				if ($post_format && ! in_array($post_format, $post_formats[0])) {
 					$post_formats[0][] = $post_format;
 				}
 
 				?>
 				<div id="post-formats-select">
-				<fieldset><legend class="screen-reader-text"><?php _e( 'Post Formats' ); ?></legend>
-					<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> />
-					<label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string( 'standard' ); ?></label>
+				<fieldset><legend class="screen-reader-text"><?php _e('Post Formats'); ?></legend>
+					<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked($post_format, '0'); ?> />
+					<label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string('standard'); ?></label>
 					<?php
 
-					foreach ( $post_formats[0] as $format ) {
-						$attr_format = esc_attr( $format );
+					foreach ($post_formats[0] as $format) {
+						$attr_format = esc_attr($format);
 						?>
 						<br />
-						<input type="radio" name="post_format" class="post-format" id="post-format-<?php echo $attr_format; ?>" value="<?php echo $attr_format; ?>" <?php checked( $post_format, $format ); ?> />
-						<label for="post-format-<?php echo $attr_format ?>" class="post-format-icon post-format-<?php echo $attr_format; ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></label>
+						<input type="radio" name="post_format" class="post-format" id="post-format-<?php echo $attr_format; ?>" value="<?php echo $attr_format; ?>" <?php checked($post_format, $format); ?> />
+						<label for="post-format-<?php echo $attr_format ?>" class="post-format-icon post-format-<?php echo $attr_format; ?>"><?php echo esc_html(get_post_format_string($format)); ?></label>
 						<?php
 					 }
 
@@ -872,51 +872,51 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function categories_html( $post ) {
-		$taxonomy = get_taxonomy( 'category' );
+	public function categories_html($post) {
+		$taxonomy = get_taxonomy('category');
 
 		// Bail if user cannot assign terms
-		if ( ! current_user_can( $taxonomy->cap->assign_terms ) ) {
+		if ( ! current_user_can($taxonomy->cap->assign_terms)) {
 			return;
 		}
 
 		// Only show "add" if user can edit terms
-		if ( current_user_can( $taxonomy->cap->edit_terms ) ) {
+		if (current_user_can($taxonomy->cap->edit_terms)) {
 			?>
 			<button type="button" class="add-cat-toggle button-link" aria-expanded="false">
-				<span class="dashicons dashicons-plus"></span><span class="screen-reader-text"><?php _e( 'Toggle add category' ); ?></span>
+				<span class="dashicons dashicons-plus"></span><span class="screen-reader-text"><?php _e('Toggle add category'); ?></span>
 			</button>
 			<div class="add-category is-hidden">
 				<label class="screen-reader-text" for="new-category"><?php echo $taxonomy->labels->add_new_item; ?></label>
-				<input type="text" id="new-category" class="add-category-name" placeholder="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>" value="" aria-required="true">
+				<input type="text" id="new-category" class="add-category-name" placeholder="<?php echo esc_attr($taxonomy->labels->new_item_name); ?>" value="" aria-required="true">
 				<label class="screen-reader-text" for="new-category-parent"><?php echo $taxonomy->labels->parent_item_colon; ?></label>
 				<div class="postform-wrapper">
 					<?php
-					wp_dropdown_categories( array(
+					wp_dropdown_categories(array(
 						'taxonomy'         => 'category',
 						'hide_empty'       => 0,
 						'name'             => 'new-category-parent',
 						'orderby'          => 'name',
 						'hierarchical'     => 1,
-						'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;'
-					) );
+						'show_option_none' => '&mdash; '.$taxonomy->labels->parent_item.' &mdash;'
+					));
 					?>
 				</div>
-				<button type="button" class="add-cat-submit"><?php _e( 'Add' ); ?></button>
+				<button type="button" class="add-cat-submit"><?php _e('Add'); ?></button>
 			</div>
 			<?php
 
 		}
 		?>
 		<div class="categories-search-wrapper">
-			<input id="categories-search" type="search" class="categories-search" placeholder="<?php esc_attr_e( 'Search categories by name' ) ?>">
+			<input id="categories-search" type="search" class="categories-search" placeholder="<?php esc_attr_e('Search categories by name') ?>">
 			<label for="categories-search">
-				<span class="dashicons dashicons-search"></span><span class="screen-reader-text"><?php _e( 'Search categories' ); ?></span>
+				<span class="dashicons dashicons-search"></span><span class="screen-reader-text"><?php _e('Search categories'); ?></span>
 			</label>
 		</div>
-		<div aria-label="<?php esc_attr_e( 'Categories' ); ?>">
+		<div aria-label="<?php esc_attr_e('Categories'); ?>">
 			<ul class="categories-select">
-				<?php wp_terms_checklist( $post->ID, array( 'taxonomy' => 'category', 'list_only' => true ) ); ?>
+				<?php wp_terms_checklist($post->ID, array('taxonomy' => 'category', 'list_only' => true)); ?>
 			</ul>
 		</div>
 		<?php
@@ -930,12 +930,12 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function tags_html( $post ) {
-		$taxonomy              = get_taxonomy( 'post_tag' );
-		$user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
-		$esc_tags              = get_terms_to_edit( $post->ID, 'post_tag' );
+	public function tags_html($post) {
+		$taxonomy              = get_taxonomy('post_tag');
+		$user_can_assign_terms = current_user_can($taxonomy->cap->assign_terms);
+		$esc_tags              = get_terms_to_edit($post->ID, 'post_tag');
 
-		if ( ! $esc_tags || is_wp_error( $esc_tags ) ) {
+		if ( ! $esc_tags || is_wp_error($esc_tags)) {
 			$esc_tags = '';
 		}
 
@@ -945,13 +945,13 @@ 
 			<input type="hidden" name="tax_input[post_tag]" class="the-tags" value="<?php echo $esc_tags; // escaped in get_terms_to_edit() ?>">
 		 	<?php
 
-			if ( $user_can_assign_terms ) {
+			if ($user_can_assign_terms) {
 				?>
 				<div class="ajaxtag hide-if-no-js">
-					<label class="screen-reader-text" for="new-tag-post_tag"><?php _e( 'Tags' ); ?></label>
+					<label class="screen-reader-text" for="new-tag-post_tag"><?php _e('Tags'); ?></label>
 					<p>
 						<input type="text" id="new-tag-post_tag" name="newtag[post_tag]" class="newtag form-input-tip" size="16" autocomplete="off" value="" aria-describedby="new-tag-desc" />
-						<button type="button" class="tagadd"><?php _e( 'Add' ); ?></button>
+						<button type="button" class="tagadd"><?php _e('Add'); ?></button>
 					</p>
 				</div>
 				<p class="howto" id="new-tag-desc">
@@ -966,7 +966,7 @@ 
 		</div>
 		<?php
 
-		if ( $user_can_assign_terms ) {
+		if ($user_can_assign_terms) {
 			?>
 			<button type="button" class="button-link tagcloud-link" id="link-post_tag" aria-expanded="false"><?php echo $taxonomy->labels->choose_from_most_used; ?></button>
 			<?php
@@ -982,19 +982,19 @@ 
 	 * @param array $data The site's data.
 	 * @return array Embeds selected to be available.
 	 */
-	public function get_embeds( $data ) {
+	public function get_embeds($data) {
 		$selected_embeds = array();
 
 		// Make sure to add the Pressed page if it's a valid oembed itself
-		if ( ! empty ( $data['u'] ) && $this->_limit_embed( $data['u'] ) ) {
+		if ( ! empty ($data['u']) && $this->_limit_embed($data['u'])) {
 			$data['_embeds'][] = $data['u'];
 		}
 
-		if ( ! empty( $data['_embeds'] ) ) {
-			foreach ( $data['_embeds'] as $src ) {
-				$prot_relative_src = preg_replace( '/^https?:/', '', $src );
+		if ( ! empty($data['_embeds'])) {
+			foreach ($data['_embeds'] as $src) {
+				$prot_relative_src = preg_replace('/^https?:/', '', $src);
 
-				if ( in_array( $prot_relative_src, $this->embeds ) ) {
+				if (in_array($prot_relative_src, $this->embeds)) {
 					continue;
 				}
 
@@ -1015,19 +1015,19 @@ 
 	 * @param array $data The site's data.
 	 * @return array
 	 */
-	public function get_images( $data ) {
+	public function get_images($data) {
 		$selected_images = array();
 
-		if ( ! empty( $data['_images'] ) ) {
-			foreach ( $data['_images'] as $src ) {
-				if ( false !== strpos( $src, 'gravatar.com' ) ) {
-					$src = preg_replace( '%http://[\d]+\.gravatar\.com/%', 'https://secure.gravatar.com/', $src );
+		if ( ! empty($data['_images'])) {
+			foreach ($data['_images'] as $src) {
+				if (false !== strpos($src, 'gravatar.com')) {
+					$src = preg_replace('%http://[\d]+\.gravatar\.com/%', 'https://secure.gravatar.com/', $src);
 				}
 
-				$prot_relative_src = preg_replace( '/^https?:/', '', $src );
+				$prot_relative_src = preg_replace('/^https?:/', '', $src);
 
-				if ( in_array( $prot_relative_src, $this->images ) ||
-					( false !== strpos( $src, 'avatar' ) && count( $this->images ) > 15 ) ) {
+				if (in_array($prot_relative_src, $this->images) ||
+					(false !== strpos($src, 'avatar') && count($this->images) > 15)) {
 					// Skip: already selected or some type of avatar and we've already gathered more than 15 images.
 					continue;
 				}
@@ -1049,22 +1049,22 @@ 
  	 * @param array $data The site's data.
 	 * @return string Discovered canonical URL, or empty
 	 */
-	public function get_canonical_link( $data ) {
+	public function get_canonical_link($data) {
 		$link = '';
 
-		if ( ! empty( $data['_links']['canonical'] ) ) {
+		if ( ! empty($data['_links']['canonical'])) {
 			$link = $data['_links']['canonical'];
-		} elseif ( ! empty( $data['u'] ) ) {
+		} elseif ( ! empty($data['u'])) {
 			$link = $data['u'];
-		} elseif ( ! empty( $data['_meta'] ) ) {
-			if ( ! empty( $data['_meta']['twitter:url'] ) ) {
+		} elseif ( ! empty($data['_meta'])) {
+			if ( ! empty($data['_meta']['twitter:url'])) {
 				$link = $data['_meta']['twitter:url'];
-			} else if ( ! empty( $data['_meta']['og:url'] ) ) {
+			} else if ( ! empty($data['_meta']['og:url'])) {
 				$link = $data['_meta']['og:url'];
 			}
 		}
 
-		if ( empty( $link ) && ! empty( $data['_links']['shortlink'] ) ) {
+		if (empty($link) && ! empty($data['_links']['shortlink'])) {
 			$link = $data['_links']['shortlink'];
 		}
 
@@ -1080,13 +1080,13 @@ 
 	 * @param array $data The site's data.
 	 * @return string Discovered site name, or empty
 	 */
-	public function get_source_site_name( $data ) {
+	public function get_source_site_name($data) {
 		$name = '';
 
-		if ( ! empty( $data['_meta'] ) ) {
-			if ( ! empty( $data['_meta']['og:site_name'] ) ) {
+		if ( ! empty($data['_meta'])) {
+			if ( ! empty($data['_meta']['og:site_name'])) {
 				$name = $data['_meta']['og:site_name'];
-			} else if ( ! empty( $data['_meta']['application-name'] ) ) {
+			} else if ( ! empty($data['_meta']['application-name'])) {
 				$name = $data['_meta']['application-name'];
 			}
 		}
@@ -1103,17 +1103,17 @@ 
 	 * @param array $data The site's data.
 	 * @return string Discovered page title, or empty
 	 */
-	public function get_suggested_title( $data ) {
+	public function get_suggested_title($data) {
 		$title = '';
 
-		if ( ! empty( $data['t'] ) ) {
+		if ( ! empty($data['t'])) {
 			$title = $data['t'];
-		} elseif ( ! empty( $data['_meta'] ) ) {
-			if ( ! empty( $data['_meta']['twitter:title'] ) ) {
+		} elseif ( ! empty($data['_meta'])) {
+			if ( ! empty($data['_meta']['twitter:title'])) {
 				$title = $data['_meta']['twitter:title'];
-			} else if ( ! empty( $data['_meta']['og:title'] ) ) {
+			} else if ( ! empty($data['_meta']['og:title'])) {
 				$title = $data['_meta']['og:title'];
-			} else if ( ! empty( $data['_meta']['title'] ) ) {
+			} else if ( ! empty($data['_meta']['title'])) {
 				$title = $data['_meta']['title'];
 			}
 		}
@@ -1132,38 +1132,38 @@ 
 	 * @param array $data The site's data.
 	 * @return string Discovered content, or empty
 	 */
-	public function get_suggested_content( $data ) {
+	public function get_suggested_content($data) {
 		$content = $text = '';
 
-		if ( ! empty( $data['s'] ) ) {
+		if ( ! empty($data['s'])) {
 			$text = $data['s'];
-		} else if ( ! empty( $data['_meta'] ) ) {
-			if ( ! empty( $data['_meta']['twitter:description'] ) ) {
+		} else if ( ! empty($data['_meta'])) {
+			if ( ! empty($data['_meta']['twitter:description'])) {
 				$text = $data['_meta']['twitter:description'];
-			} else if ( ! empty( $data['_meta']['og:description'] ) ) {
+			} else if ( ! empty($data['_meta']['og:description'])) {
 				$text = $data['_meta']['og:description'];
-			} else if ( ! empty( $data['_meta']['description'] ) ) {
+			} else if ( ! empty($data['_meta']['description'])) {
 				$text = $data['_meta']['description'];
 			}
 
 			// If there is an ellipsis at the end, the description is very likely auto-generated. Better to ignore it.
-			if ( $text && substr( $text, -3 ) === '...' ) {
+			if ($text && substr($text, -3) === '...') {
 				$text = '';
 			}
 		}
 
-		$default_html = array( 'quote' => '', 'link' => '', 'embed' => '' );
+		$default_html = array('quote' => '', 'link' => '', 'embed' => '');
 
-		if ( ! empty( $data['u'] ) && $this->_limit_embed( $data['u'] ) ) {
-			$default_html['embed'] = '<p>[embed]' . $data['u'] . '[/embed]</p>';
+		if ( ! empty($data['u']) && $this->_limit_embed($data['u'])) {
+			$default_html['embed'] = '<p>[embed]'.$data['u'].'[/embed]</p>';
 
-			if ( ! empty( $data['s'] ) ) {
+			if ( ! empty($data['s'])) {
 				// If the user has selected some text, do quote it.
 				$default_html['quote'] = '<blockquote>%1$s</blockquote>';
 			}
 		} else {
 			$default_html['quote'] = '<blockquote>%1$s</blockquote>';
-			$default_html['link'] = '<p>' . _x( 'Source:', 'Used in Press This to indicate where the content comes from.' ) .
+			$default_html['link'] = '<p>'._x('Source:', 'Used in Press This to indicate where the content comes from.').
 				' <em><a href="%1$s">%2$s</a></em></p>';
 		}
 
@@ -1180,28 +1180,28 @@ 
 		 *                                - 'embed' which contains an [embed] shortcode when the source page offers embeddable content.
 		 * @param array $data         Associative array containing the data from the source page.
 		 */
-		$default_html = apply_filters( 'press_this_suggested_html', $default_html, $data );
+		$default_html = apply_filters('press_this_suggested_html', $default_html, $data);
 
-		if ( ! empty( $default_html['embed'] ) ) {
+		if ( ! empty($default_html['embed'])) {
 			$content .= $default_html['embed'];
 		}
 
 		// Wrap suggested content in the specified HTML.
-		if ( ! empty( $default_html['quote'] ) && $text ) {
-			$content .= sprintf( $default_html['quote'], $text );
+		if ( ! empty($default_html['quote']) && $text) {
+			$content .= sprintf($default_html['quote'], $text);
 		}
 
 		// Add source attribution if there is one available.
-		if ( ! empty( $default_html['link'] ) ) {
-			$title = $this->get_suggested_title( $data );
-			$url = $this->get_canonical_link( $data );
+		if ( ! empty($default_html['link'])) {
+			$title = $this->get_suggested_title($data);
+			$url = $this->get_canonical_link($data);
 
-			if ( ! $title ) {
-				$title = $this->get_source_site_name( $data );
+			if ( ! $title) {
+				$title = $this->get_source_site_name($data);
 			}
 
-			if ( $url && $title ) {
-				$content .= sprintf( $default_html['link'], $url, $title );
+			if ($url && $title) {
+				$content .= sprintf($default_html['link'], $url, $title);
 			}
 		}
 
@@ -1220,46 +1220,46 @@ 
 	public function html() {
 		global $wp_locale;
 
-		$wp_version = get_bloginfo( 'version' );
+		$wp_version = get_bloginfo('version');
 
 		// Get data, new (POST) and old (GET).
 		$data = $this->merge_or_fetch_data();
 
-		$post_title = $this->get_suggested_title( $data );
+		$post_title = $this->get_suggested_title($data);
 
-		$post_content = $this->get_suggested_content( $data );
+		$post_content = $this->get_suggested_content($data);
 
 		// Get site settings array/data.
 		$site_settings = $this->site_settings();
 
 		// Pass the images and embeds
-		$images = $this->get_images( $data );
-		$embeds = $this->get_embeds( $data );
+		$images = $this->get_images($data);
+		$embeds = $this->get_embeds($data);
 
 		$site_data = array(
-			'v' => ! empty( $data['v'] ) ? $data['v'] : '',
-			'u' => ! empty( $data['u'] ) ? $data['u'] : '',
-			'hasData' => ! empty( $data ) && ! isset( $data['errors'] ),
+			'v' => ! empty($data['v']) ? $data['v'] : '',
+			'u' => ! empty($data['u']) ? $data['u'] : '',
+			'hasData' => ! empty($data) && ! isset($data['errors']),
 		);
 
-		if ( ! empty( $images ) ) {
+		if ( ! empty($images)) {
 			$site_data['_images'] = $images;
 		}
 
-		if ( ! empty( $embeds ) ) {
+		if ( ! empty($embeds)) {
 			$site_data['_embeds'] = $embeds;
 		}
 
 		// Add press-this-editor.css and remove theme's editor-style.css, if any.
 		remove_editor_styles();
 
-		add_filter( 'mce_css', array( $this, 'add_editor_style' ) );
+		add_filter('mce_css', array($this, 'add_editor_style'));
 
-		if ( ! empty( $GLOBALS['is_IE'] ) ) {
-			@header( 'X-UA-Compatible: IE=edge' );
+		if ( ! empty($GLOBALS['is_IE'])) {
+			@header('X-UA-Compatible: IE=edge');
 		}
 
-		@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
+		@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
 
 ?>
 <!DOCTYPE html>
@@ -1267,22 +1267,22 @@ 
 <!--[if IE 8]>         <html class="lt-ie9" <?php language_attributes(); ?>> <![endif]-->
 <!--[if gt IE 8]><!--> <html <?php language_attributes(); ?>> <!--<![endif]-->
 <head>
-	<meta http-equiv="Content-Type" content="<?php echo esc_attr( get_bloginfo( 'html_type' ) ); ?>; charset=<?php echo esc_attr( get_option( 'blog_charset' ) ); ?>" />
+	<meta http-equiv="Content-Type" content="<?php echo esc_attr(get_bloginfo('html_type')); ?>; charset=<?php echo esc_attr(get_option('blog_charset')); ?>" />
 	<meta name="viewport" content="width=device-width">
-	<title><?php esc_html_e( 'Press This!' ) ?></title>
+	<title><?php esc_html_e('Press This!') ?></title>
 
 	<script>
-		window.wpPressThisData   = <?php echo wp_json_encode( $site_data ); ?>;
-		window.wpPressThisConfig = <?php echo wp_json_encode( $site_settings ); ?>;
+		window.wpPressThisData   = <?php echo wp_json_encode($site_data); ?>;
+		window.wpPressThisConfig = <?php echo wp_json_encode($site_settings); ?>;
 	</script>
 
 	<script type="text/javascript">
-		var ajaxurl = '<?php echo esc_js( admin_url( 'admin-ajax.php', 'relative' ) ); ?>',
+		var ajaxurl = '<?php echo esc_js(admin_url('admin-ajax.php', 'relative')); ?>',
 			pagenow = 'press-this',
 			typenow = 'post',
 			adminpage = 'press-this-php',
-			thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
-			decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+			thousandsSeparator = '<?php echo addslashes($wp_locale->number_format['thousands_sep']); ?>',
+			decimalPoint = '<?php echo addslashes($wp_locale->number_format['decimal_point']); ?>',
 			isRtl = <?php echo (int) is_rtl(); ?>;
 	</script>
 
@@ -1291,89 +1291,89 @@ 
 		 * $post->ID is needed for the embed shortcode so we can show oEmbed previews in the editor.
 		 * Maybe find a way without it.
 		 */
-		$post = get_default_post_to_edit( 'post', true );
+		$post = get_default_post_to_edit('post', true);
 		$post_ID = (int) $post->ID;
 
-		wp_enqueue_media( array( 'post' => $post_ID ) );
-		wp_enqueue_style( 'press-this' );
-		wp_enqueue_script( 'press-this' );
-		wp_enqueue_script( 'json2' );
-		wp_enqueue_script( 'editor' );
+		wp_enqueue_media(array('post' => $post_ID));
+		wp_enqueue_style('press-this');
+		wp_enqueue_script('press-this');
+		wp_enqueue_script('json2');
+		wp_enqueue_script('editor');
 
-		$categories_tax   = get_taxonomy( 'category' );
-		$show_categories  = current_user_can( $categories_tax->cap->assign_terms ) || current_user_can( $categories_tax->cap->edit_terms );
+		$categories_tax   = get_taxonomy('category');
+		$show_categories  = current_user_can($categories_tax->cap->assign_terms) || current_user_can($categories_tax->cap->edit_terms);
 
-		$tag_tax          = get_taxonomy( 'post_tag' );
-		$show_tags        = current_user_can( $tag_tax->cap->assign_terms );
+		$tag_tax          = get_taxonomy('post_tag');
+		$show_tags        = current_user_can($tag_tax->cap->assign_terms);
 
 		$supports_formats = false;
 		$post_format      = 0;
 
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) {
+		if (current_theme_supports('post-formats') && post_type_supports($post->post_type, 'post-formats')) {
 			$supports_formats = true;
 
-			if ( ! ( $post_format = get_post_format( $post_ID ) ) ) {
+			if ( ! ($post_format = get_post_format($post_ID))) {
 				$post_format = 0;
 			}
 		}
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_enqueue_scripts', 'press-this.php' );
+		do_action('admin_enqueue_scripts', 'press-this.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_styles-press-this.php' );
+		do_action('admin_print_styles-press-this.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_styles' );
+		do_action('admin_print_styles');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_scripts-press-this.php' );
+		do_action('admin_print_scripts-press-this.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_scripts' );
+		do_action('admin_print_scripts');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_head-press-this.php' );
+		do_action('admin_head-press-this.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_head' );
+		do_action('admin_head');
 	?>
 </head>
 <?php
 
 	$admin_body_class  = 'press-this';
-	$admin_body_class .= ( is_rtl() ) ? ' rtl' : '';
-	$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
-	$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
-	$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
-	$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
+	$admin_body_class .= (is_rtl()) ? ' rtl' : '';
+	$admin_body_class .= ' branch-'.str_replace(array('.', ','), '-', floatval($wp_version));
+	$admin_body_class .= ' version-'.str_replace('.', '-', preg_replace('/^([.0-9]+).*/', '$1', $wp_version));
+	$admin_body_class .= ' admin-color-'.sanitize_html_class(get_user_option('admin_color'), 'fresh');
+	$admin_body_class .= ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_user_locale())));
 
 	/** This filter is documented in wp-admin/admin-header.php */
-	$admin_body_classes = apply_filters( 'admin_body_class', '' );
+	$admin_body_classes = apply_filters('admin_body_class', '');
 
 ?>
-<body class="wp-admin wp-core-ui <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+<body class="wp-admin wp-core-ui <?php echo $admin_body_classes.' '.$admin_body_class; ?>">
 	<div id="adminbar" class="adminbar">
 		<h1 id="current-site" class="current-site">
-			<a class="current-site-link" href="<?php echo esc_url( home_url( '/' ) ); ?>" target="_blank" rel="home">
+			<a class="current-site-link" href="<?php echo esc_url(home_url('/')); ?>" target="_blank" rel="home">
 				<span class="dashicons dashicons-wordpress"></span>
-				<span class="current-site-name"><?php bloginfo( 'name' ); ?></span>
+				<span class="current-site-name"><?php bloginfo('name'); ?></span>
 			</a>
 		</h1>
 		<button type="button" class="options button-link closed">
 			<span class="dashicons dashicons-tag on-closed"></span>
-			<span class="screen-reader-text on-closed"><?php _e( 'Show post options' ); ?></span>
-			<span aria-hidden="true" class="on-open"><?php _e( 'Done' ); ?></span>
-			<span class="screen-reader-text on-open"><?php _e( 'Hide post options' ); ?></span>
+			<span class="screen-reader-text on-closed"><?php _e('Show post options'); ?></span>
+			<span aria-hidden="true" class="on-open"><?php _e('Done'); ?></span>
+			<span class="screen-reader-text on-open"><?php _e('Hide post options'); ?></span>
 		</button>
 	</div>
 
 	<div id="scanbar" class="scan">
 		<form method="GET">
-			<label for="url-scan" class="screen-reader-text"><?php _e( 'Scan site for content' ); ?></label>
-			<input type="url" name="u" id="url-scan" class="scan-url" value="<?php echo esc_attr( $site_data['u'] ) ?>" placeholder="<?php esc_attr_e( 'Enter a URL to scan' ) ?>" />
-			<input type="submit" name="url-scan-submit" id="url-scan-submit" class="scan-submit" value="<?php esc_attr_e( 'Scan' ) ?>" />
-			<?php wp_nonce_field( 'scan-site' ); ?>
+			<label for="url-scan" class="screen-reader-text"><?php _e('Scan site for content'); ?></label>
+			<input type="url" name="u" id="url-scan" class="scan-url" value="<?php echo esc_attr($site_data['u']) ?>" placeholder="<?php esc_attr_e('Enter a URL to scan') ?>" />
+			<input type="submit" name="url-scan-submit" id="url-scan-submit" class="scan-submit" value="<?php esc_attr_e('Scan') ?>" />
+			<?php wp_nonce_field('scan-site'); ?>
 		</form>
 	</div>
 
@@ -1386,8 +1386,8 @@ 
 		<input type="hidden" name="pt-force-redirect" id="pt-force-redirect" value="" />
 		<?php
 
-		wp_nonce_field( 'update-post_' . $post_ID, '_wpnonce', false );
-		wp_nonce_field( 'add-category', '_ajax_nonce-add-category', false );
+		wp_nonce_field('update-post_'.$post_ID, '_wpnonce', false);
+		wp_nonce_field('add-category', '_ajax_nonce-add-category', false);
 
 		?>
 
@@ -1396,10 +1396,10 @@ 
 			<div class="alerts" role="alert" aria-live="assertive" aria-relevant="all" aria-atomic="true">
 				<?php
 
-				if ( isset( $data['v'] ) && $this->version > $data['v'] ) {
+				if (isset($data['v']) && $this->version > $data['v']) {
 					?>
 					<p class="alert is-notice">
-						<?php printf( __( 'You should upgrade <a href="%s" target="_blank">your bookmarklet</a> to the latest version!' ), admin_url( 'tools.php' ) ); ?>
+						<?php printf(__('You should upgrade <a href="%s" target="_blank">your bookmarklet</a> to the latest version!'), admin_url('tools.php')); ?>
 					</p>
 					<?php
 				}
@@ -1408,18 +1408,18 @@ 
 			</div>
 
 			<div id="app-container" class="editor">
-				<span id="title-container-label" class="post-title-placeholder" aria-hidden="true"><?php _e( 'Post title' ); ?></span>
-				<h2 id="title-container" class="post-title" contenteditable="true" spellcheck="true" aria-label="<?php esc_attr_e( 'Post title' ); ?>" tabindex="0"><?php echo esc_html( $post_title ); ?></h2>
+				<span id="title-container-label" class="post-title-placeholder" aria-hidden="true"><?php _e('Post title'); ?></span>
+				<h2 id="title-container" class="post-title" contenteditable="true" spellcheck="true" aria-label="<?php esc_attr_e('Post title'); ?>" tabindex="0"><?php echo esc_html($post_title); ?></h2>
 
 				<div class="media-list-container">
 					<div class="media-list-inner-container">
-						<h2 class="screen-reader-text"><?php _e( 'Suggested media' ); ?></h2>
+						<h2 class="screen-reader-text"><?php _e('Suggested media'); ?></h2>
 						<ul class="media-list"></ul>
 					</div>
 				</div>
 
 				<?php
-				wp_editor( $post_content, 'pressthis', array(
+				wp_editor($post_content, 'pressthis', array(
 					'drag_drop_upload' => true,
 					'editor_height'    => 600,
 					'media_buttons'    => false,
@@ -1439,7 +1439,7 @@ 
 					'quicktags' => array(
 						'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,more',
 					),
-				) );
+				));
 
 				?>
 			</div>
@@ -1449,62 +1449,62 @@ 
 		<div class="options-panel is-off-screen is-hidden" tabindex="-1">
 			<div class="post-options">
 
-				<?php if ( $supports_formats ) : ?>
+				<?php if ($supports_formats) : ?>
 					<button type="button" class="post-option">
 						<span class="dashicons dashicons-admin-post"></span>
-						<span class="post-option-title"><?php _ex( 'Format', 'post format' ); ?></span>
-						<span class="post-option-contents" id="post-option-post-format"><?php echo esc_html( get_post_format_string( $post_format ) ); ?></span>
+						<span class="post-option-title"><?php _ex('Format', 'post format'); ?></span>
+						<span class="post-option-contents" id="post-option-post-format"><?php echo esc_html(get_post_format_string($post_format)); ?></span>
 						<span class="dashicons post-option-forward"></span>
 					</button>
 				<?php endif; ?>
 
-				<?php if ( $show_categories ) : ?>
+				<?php if ($show_categories) : ?>
 					<button type="button" class="post-option">
 						<span class="dashicons dashicons-category"></span>
-						<span class="post-option-title"><?php _e( 'Categories' ); ?></span>
+						<span class="post-option-title"><?php _e('Categories'); ?></span>
 						<span class="dashicons post-option-forward"></span>
 					</button>
 				<?php endif; ?>
 
-				<?php if ( $show_tags ) : ?>
+				<?php if ($show_tags) : ?>
 					<button type="button" class="post-option">
 						<span class="dashicons dashicons-tag"></span>
-						<span class="post-option-title"><?php _e( 'Tags' ); ?></span>
+						<span class="post-option-title"><?php _e('Tags'); ?></span>
 						<span class="dashicons post-option-forward"></span>
 					</button>
 				<?php endif; ?>
 			</div>
 
-			<?php if ( $supports_formats ) : ?>
+			<?php if ($supports_formats) : ?>
 				<div class="setting-modal is-off-screen is-hidden">
 					<button type="button" class="modal-close">
 						<span class="dashicons post-option-back"></span>
-						<span class="setting-title" aria-hidden="true"><?php _ex( 'Format', 'post format' ); ?></span>
-						<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+						<span class="setting-title" aria-hidden="true"><?php _ex('Format', 'post format'); ?></span>
+						<span class="screen-reader-text"><?php _e('Back to post options') ?></span>
 					</button>
-					<?php $this->post_formats_html( $post ); ?>
+					<?php $this->post_formats_html($post); ?>
 				</div>
 			<?php endif; ?>
 
-			<?php if ( $show_categories ) : ?>
+			<?php if ($show_categories) : ?>
 				<div class="setting-modal is-off-screen is-hidden">
 					<button type="button" class="modal-close">
 						<span class="dashicons post-option-back"></span>
-						<span class="setting-title" aria-hidden="true"><?php _e( 'Categories' ); ?></span>
-						<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+						<span class="setting-title" aria-hidden="true"><?php _e('Categories'); ?></span>
+						<span class="screen-reader-text"><?php _e('Back to post options') ?></span>
 					</button>
-					<?php $this->categories_html( $post ); ?>
+					<?php $this->categories_html($post); ?>
 				</div>
 			<?php endif; ?>
 
-			<?php if ( $show_tags ) : ?>
+			<?php if ($show_tags) : ?>
 				<div class="setting-modal tags is-off-screen is-hidden">
 					<button type="button" class="modal-close">
 						<span class="dashicons post-option-back"></span>
-						<span class="setting-title" aria-hidden="true"><?php _e( 'Tags' ); ?></span>
-						<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+						<span class="setting-title" aria-hidden="true"><?php _e('Tags'); ?></span>
+						<span class="screen-reader-text"><?php _e('Back to post options') ?></span>
 					</button>
-					<?php $this->tags_html( $post ); ?>
+					<?php $this->tags_html($post); ?>
 				</div>
 			<?php endif; ?>
 		</div><!-- .options-panel -->
@@ -1514,7 +1514,7 @@ 
 		<div class="pressthis-media-buttons">
 			<button type="button" class="insert-media" data-editor="pressthis">
 				<span class="dashicons dashicons-admin-media"></span>
-				<span class="screen-reader-text"><?php _e( 'Add Media' ); ?></span>
+				<span class="screen-reader-text"><?php _e('Add Media'); ?></span>
 			</button>
 		</div>
 		<div class="post-actions">
@@ -1522,17 +1522,17 @@ 
 			<div class="split-button">
 				<div class="split-button-head">
 					<button type="button" class="publish-button split-button-primary" aria-live="polite">
-						<span class="publish"><?php echo ( current_user_can( 'publish_posts' ) ) ? __( 'Publish' ) : __( 'Submit for Review' ); ?></span>
-						<span class="saving-draft"><?php _e( 'Saving&hellip;' ); ?></span>
+						<span class="publish"><?php echo (current_user_can('publish_posts')) ? __('Publish') : __('Submit for Review'); ?></span>
+						<span class="saving-draft"><?php _e('Saving&hellip;'); ?></span>
 					</button><button type="button" class="split-button-toggle" aria-haspopup="true" aria-expanded="false">
 						<i class="dashicons dashicons-arrow-down-alt2"></i>
 						<span class="screen-reader-text"><?php _e('More actions'); ?></span>
 					</button>
 				</div>
 				<ul class="split-button-body">
-					<li><button type="button" class="button-link draft-button split-button-option"><?php _e( 'Save Draft' ); ?></button></li>
-					<li><button type="button" class="button-link standard-editor-button split-button-option"><?php _e( 'Standard Editor' ); ?></button></li>
-					<li><button type="button" class="button-link preview-button split-button-option"><?php _e( 'Preview' ); ?></button></li>
+					<li><button type="button" class="button-link draft-button split-button-option"><?php _e('Save Draft'); ?></button></li>
+					<li><button type="button" class="button-link standard-editor-button split-button-option"><?php _e('Standard Editor'); ?></button></li>
+					<li><button type="button" class="button-link preview-button split-button-option"><?php _e('Preview'); ?></button></li>
 				</ul>
 			</div>
 		</div>
@@ -1541,16 +1541,16 @@ 
 
 	<?php
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_footer' );
+	do_action('admin_footer');
 
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_print_footer_scripts-press-this.php' );
+	do_action('admin_print_footer_scripts-press-this.php');
 
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_print_footer_scripts' );
+	do_action('admin_print_footer_scripts');
 
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_footer-press-this.php' );
+	do_action('admin_footer-press-this.php');
 	?>
 </body>
 </html>

Braces +3 added lines, -2 removed lines

@@ -476,8 +476,9 @@
 	private function _limit_embed( $src ) {
 		$src = $this->_limit_url( $src );
 
-		if ( empty( $src ) )
-			return '';
+		if ( empty( $src ) ) {
+					return '';
+		}
 
 		if ( preg_match( '!//(m|www)\.youtube\.com/(embed|v)/([^?]+)\?.+$!i', $src, $src_matches ) ) {
 			// Embedded Youtube videos (www or mobile)