ntwb / wordpress

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 ) {

Braces +3 added lines, -2 removed lines

@@ -449,8 +449,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)\/([^\?]+)\?.+$/', $src, $src_matches ) ) {
 			// Embedded Youtube videos (www or mobile)

Spacing +388 added lines, -388 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,36 +102,36 @@ 
 	 * @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'] ) : '',
-			'tax_input'     => ( ! empty( $_POST['tax_input'] ) ) ? $_POST['tax_input'] : array(),
-			'post_category' => ( ! empty( $_POST['post_category'] ) ) ? $_POST['post_category'] : array(),
+			'post_format'   => ( ! empty($_POST['post_format'])) ? sanitize_text_field($_POST['post_format']) : '',
+			'tax_input'     => ( ! empty($_POST['tax_input'])) ? $_POST['tax_input'] : array(),
+			'post_category' => ( ! empty($_POST['post_category'])) ? $_POST['post_category'] : array(),
 		);
 
-		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.
@@ -142,28 +142,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;
 			}
@@ -178,12 +178,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));
 			}
 		}
 	}
@@ -195,57 +195,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(
@@ -254,7 +254,7 @@ 
 				'parent' => $new_cat->parent,
 			);
 		}
-		wp_send_json_success( $data );
+		wp_send_json_success($data);
 	}
 
 	/**
@@ -266,18 +266,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;
 		}
 
@@ -302,8 +302,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;
 	}
@@ -317,10 +317,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;
@@ -340,20 +340,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;
@@ -368,32 +368,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'));
 	}
 
 	/**
@@ -408,34 +408,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 '';
 		}
@@ -455,31 +455,31 @@ 
 	 * @param string $src Embed source URL.
 	 * @return string If not from a supported provider, an empty string. Otherwise, a reformattd 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 = '';
 			}
 		}
@@ -498,21 +498,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;
 					}
 
@@ -523,13 +523,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;
 					}
 
@@ -550,58 +550,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;
 					}
 				}
@@ -609,18 +609,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;
 					}
 				}
@@ -628,20 +628,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;
 					}
 				}
 			}
@@ -663,27 +663,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;
 			}
 		}
 
@@ -694,58 +694,58 @@ 
 		 *
 		 * @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'] ) ) {
-				$data = $this->source_data_fetch_fallback( $data['u'], $data );
+			if (empty($_POST) && ! empty($data['u'])) {
+				$data = $this->source_data_fetch_fallback($data['u'], $data);
 			} 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));
 							}
 						}
 					}
@@ -753,11 +753,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);
 				}
 			}
 		}
@@ -769,7 +769,7 @@ 
 		 *
 		 * @param array $data Press This Data array.
 		 */
-		return apply_filters( 'press_this_data', $data );
+		return apply_filters('press_this_data', $data);
 	}
 
 	/**
@@ -781,17 +781,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;
 	}
 
 	/**
@@ -802,35 +802,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
 					 }
 
@@ -850,45 +850,45 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function categories_html( $post ) {
-		$taxonomy = get_taxonomy( 'category' );
+	public function categories_html($post) {
+		$taxonomy = get_taxonomy('category');
 
-		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
@@ -902,12 +902,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 = '';
 		}
 
@@ -917,13 +917,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">
@@ -938,7 +938,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
@@ -954,19 +954,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;
 				}
 
@@ -987,19 +987,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;
 				}
@@ -1021,22 +1021,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'];
 		}
 
@@ -1052,13 +1052,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'];
 			}
 		}
@@ -1075,17 +1075,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'];
 			}
 		}
@@ -1104,38 +1104,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>';
 		}
 
@@ -1152,28 +1152,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);
 			}
 		}
 
@@ -1192,46 +1192,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 ),
+			'v' => ! empty($data['v']) ? $data['v'] : '',
+			'u' => ! empty($data['u']) ? $data['u'] : '',
+			'hasData' => ! empty($data),
 		);
 
-		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>
@@ -1239,22 +1239,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>
 
@@ -1263,82 +1263,82 @@ 
 		 * $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');
 
 		$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="" 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' ) ?>" />
+			<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="" 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') ?>" />
 		</form>
 	</div>
 
@@ -1351,8 +1351,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);
 
 		?>
 
@@ -1361,10 +1361,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
 				}
@@ -1373,18 +1373,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,
@@ -1404,7 +1404,7 @@ 
 					'quicktags' => array(
 						'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,more',
 					),
-				) );
+				));
 
 				?>
 			</div>
@@ -1414,55 +1414,55 @@ 
 		<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="button-link 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; ?>
 
 				<button type="button" class="button-link 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>
 
 				<button type="button" class="button-link 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>
 			</div>
 
-			<?php if ( $supports_formats ) : ?>
+			<?php if ($supports_formats) : ?>
 				<div class="setting-modal is-off-screen is-hidden">
 					<button type="button" class="button-link 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; ?>
 
 			<div class="setting-modal is-off-screen is-hidden">
 				<button type="button" class="button-link 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>
 
 			<div class="setting-modal tags is-off-screen is-hidden">
 				<button type="button" class="button-link 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>
 		</div><!-- .options-panel -->
 	</div><!-- .wrapper -->
@@ -1471,7 +1471,7 @@ 
 		<div class="pressthis-media-buttons">
 			<button type="button" class="insert-media button-link" 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">
@@ -1479,17 +1479,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>
@@ -1498,16 +1498,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>

src/wp-admin/includes/ms-deprecated.php

Braces +4 added lines, -3 removed lines

@@ -28,9 +28,10 @@
 function wpmu_checkAvailableSpace() {
 	_deprecated_function(__FUNCTION__, '3.0', 'is_upload_space_available()' );
 
-	if ( !is_upload_space_available() )
-		wp_die( __('Sorry, you must delete files before you can upload any more.') );
-}
+	if ( !is_upload_space_available() ) {
+			wp_die( __('Sorry, you must delete files before you can upload any more.') );
+	}
+	}
 
 /**
  * WPMU options.

Spacing +17 added lines, -17 removed lines

@@ -16,7 +16,7 @@ 
  * @deprecated 3.0.0
  */
 function wpmu_menu() {
-	_deprecated_function(__FUNCTION__, '3.0.0' );
+	_deprecated_function(__FUNCTION__, '3.0.0');
 	// Deprecated. See #11763.
 }
 
@@ -27,10 +27,10 @@ 
  * @see is_upload_space_available()
  */
 function wpmu_checkAvailableSpace() {
-	_deprecated_function(__FUNCTION__, '3.0.0', 'is_upload_space_available()' );
+	_deprecated_function(__FUNCTION__, '3.0.0', 'is_upload_space_available()');
 
-	if ( !is_upload_space_available() )
-		wp_die( __('Sorry, you must delete files before you can upload any more.') );
+	if ( ! is_upload_space_available())
+		wp_die(__('Sorry, you must delete files before you can upload any more.'));
 }
 
 /**
@@ -38,8 +38,8 @@ 
  *
  * @deprecated 3.0.0
  */
-function mu_options( $options ) {
-	_deprecated_function(__FUNCTION__, '3.0.0' );
+function mu_options($options) {
+	_deprecated_function(__FUNCTION__, '3.0.0');
 	return $options;
 }
 
@@ -50,7 +50,7 @@ 
  * @see activate_plugin()
  */
 function activate_sitewide_plugin() {
-	_deprecated_function(__FUNCTION__, '3.0.0', 'activate_plugin()' );
+	_deprecated_function(__FUNCTION__, '3.0.0', 'activate_plugin()');
 	return false;
 }
 
@@ -60,8 +60,8 @@ 
  * @deprecated 3.0.0 Use deactivate_sitewide_plugin()
  * @see deactivate_sitewide_plugin()
  */
-function deactivate_sitewide_plugin( $plugin = false ) {
-	_deprecated_function(__FUNCTION__, '3.0.0', 'deactivate_plugin()' );
+function deactivate_sitewide_plugin($plugin = false) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'deactivate_plugin()');
 }
 
 /**
@@ -70,9 +70,9 @@ 
  * @deprecated 3.0.0 Use is_network_only_plugin()
  * @see is_network_only_plugin()
  */
-function is_wpmu_sitewide_plugin( $file ) {
-	_deprecated_function(__FUNCTION__, '3.0.0', 'is_network_only_plugin()' );
-	return is_network_only_plugin( $file );
+function is_wpmu_sitewide_plugin($file) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'is_network_only_plugin()');
+	return is_network_only_plugin($file);
 }
 
 /**
@@ -82,8 +82,8 @@ 
  * @see WP_Theme::get_allowed_on_network()
  */
 function get_site_allowed_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_network()' );
-	return array_map( 'intval', WP_Theme::get_allowed_on_network() );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_network()');
+	return array_map('intval', WP_Theme::get_allowed_on_network());
 }
 
 /**
@@ -92,9 +92,9 @@ 
  * @deprecated 3.4.0 Use WP_Theme::get_allowed_on_site()
  * @see WP_Theme::get_allowed_on_site()
  */
-function wpmu_get_blog_allowedthemes( $blog_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_site()' );
-	return array_map( 'intval', WP_Theme::get_allowed_on_site( $blog_id ) );
+function wpmu_get_blog_allowedthemes($blog_id = 0) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_site()');
+	return array_map('intval', WP_Theme::get_allowed_on_site($blog_id));
 }
 
 /**

src/wp-admin/includes/class-ftp-pure.php

Braces +44 added lines, -16 removed lines

@@ -75,10 +75,14 @@ 
 				$this->PushError($fnction,'Read failed');
 			} else {
 				$this->_message.=$tmp;
-				if(preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) $go=false;
+				if(preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) {
+					$go=false;
+				}
 			}
 		} while($go);
-		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		if($this->LocalEcho) {
+			echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		}
 		$this->_code=(int)$regs[1];
 		return $result;
 	}
@@ -88,19 +92,25 @@ 
 			$this->PushError($fnction,'Connect first');
 			return FALSE;
 		}
-		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
+		if($this->LocalEcho) {
+			echo "PUT > ",$cmd,CRLF;
+		}
 		$status=@fputs($this->_ftp_control_sock, $cmd.CRLF);
 		if($status===false) {
 			$this->PushError($fnction,'socket write failed');
 			return FALSE;
 		}
 		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
+		if(!$this->_readmsg($fnction)) {
+			return FALSE;
+		}
 		return TRUE;
 	}
 
 	function _data_prepare($mode=FTP_ASCII) {
-		if(!$this->_settype($mode)) return FALSE;
+		if(!$this->_settype($mode)) {
+			return FALSE;
+		}
 		if($this->_passive) {
 			if(!$this->_exec("PASV", "pasv")) {
 				$this->_data_close();
@@ -119,8 +129,9 @@ 
 				$this->PushError("_data_prepare","fsockopen fails", $errstr." (".$errno.")");
 				$this->_data_close();
 				return FALSE;
+			} else {
+				$this->_ftp_data_sock;
 			}
-			else $this->_ftp_data_sock;
 		} else {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
@@ -129,24 +140,35 @@ 
 	}
 
 	function _data_read($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
+		if(is_resource($fp)) {
+			$out=0;
+		} else {
+			$out="";
+		}
 		if(!$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
 		}
 		while (!feof($this->_ftp_data_sock)) {
 			$block=fread($this->_ftp_data_sock, $this->_ftp_buff_size);
-			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
-			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
-			else $out.=$block;
+			if($mode!=FTP_BINARY) {
+				$block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+			}
+			if(is_resource($fp)) {
+				$out+=fwrite($fp, $block, strlen($block));
+			} else {
+				$out.=$block;
+			}
 		}
 		return $out;
 	}
 
 	function _data_write($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
+		if(is_resource($fp)) {
+			$out=0;
+		} else {
+			$out="";
+		}
 		if(!$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
@@ -154,14 +176,20 @@ 
 		if(is_resource($fp)) {
 			while(!feof($fp)) {
 				$block=fread($fp, $this->_ftp_buff_size);
-				if(!$this->_data_write_block($mode, $block)) return false;
+				if(!$this->_data_write_block($mode, $block)) {
+					return false;
+				}
 			}
-		} elseif(!$this->_data_write_block($mode, $fp)) return false;
+		} elseif(!$this->_data_write_block($mode, $fp)) {
+			return false;
+		}
 		return TRUE;
 	}
 
 	function _data_write_block($mode, $block) {
-		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		if($mode!=FTP_BINARY) {
+			$block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		}
 		do {
 			if(($t=@fwrite($this->_ftp_data_sock, $block))===FALSE) {
 				$this->PushError("_data_write","Can't write to socket");

Doc Comments +3 added lines

@@ -94,6 +94,9 @@
 		return $result;
 	}
 
+	/**
+	 * @param string $cmd
+	 */
 	function _exec($cmd, $fnction="_exec") {
 		if(!$this->_ready) {
 			$this->PushError($fnction,'Connect first');

Indentation +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 			}
 			$ip_port = explode(",", preg_replace("/^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*$/s", "\\1", $this->_message));
 			$this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
-            $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
+			$this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
 			$this->_ftp_data_sock=@fsockopen($this->_datahost, $this->_dataport, $errno, $errstr, $this->_timeout);
 			if(!$this->_ftp_data_sock) {

Spacing +66 added lines, -66 removed lines

@@ -27,7 +27,7 @@ 
  */
 class ftp_pure extends ftp_base {
 
-	function __construct($verb=FALSE, $le=FALSE) {
+	function __construct($verb = FALSE, $le = FALSE) {
 		parent::__construct(false, $verb, $le);
 	}
 
@@ -36,8 +36,8 @@ 
 // <!-- --------------------------------------------------------------------------------------- -->
 
 	function _settimeout($sock) {
-		if(!@stream_set_timeout($sock, $this->_timeout)) {
-			$this->PushError('_settimeout','socket set send timeout');
+		if ( ! @stream_set_timeout($sock, $this->_timeout)) {
+			$this->PushError('_settimeout', 'socket set send timeout');
 			$this->_quit();
 			return FALSE;
 		}
@@ -47,72 +47,72 @@ 
 	function _connect($host, $port) {
 		$this->SendMSG("Creating socket");
 		$sock = @fsockopen($host, $port, $errno, $errstr, $this->_timeout);
-		if (!$sock) {
-			$this->PushError('_connect','socket connect failed', $errstr." (".$errno.")");
+		if ( ! $sock) {
+			$this->PushError('_connect', 'socket connect failed', $errstr." (".$errno.")");
 			return FALSE;
 		}
-		$this->_connected=true;
+		$this->_connected = true;
 		return $sock;
 	}
 
-	function _readmsg($fnction="_readmsg"){
-		if(!$this->_connected) {
+	function _readmsg($fnction = "_readmsg") {
+		if ( ! $this->_connected) {
 			$this->PushError($fnction, 'Connect first');
 			return FALSE;
 		}
-		$result=true;
-		$this->_message="";
-		$this->_code=0;
-		$go=true;
+		$result = true;
+		$this->_message = "";
+		$this->_code = 0;
+		$go = true;
 		do {
-			$tmp=@fgets($this->_ftp_control_sock, 512);
-			if($tmp===false) {
-				$go=$result=false;
-				$this->PushError($fnction,'Read failed');
+			$tmp = @fgets($this->_ftp_control_sock, 512);
+			if ($tmp === false) {
+				$go = $result = false;
+				$this->PushError($fnction, 'Read failed');
 			} else {
-				$this->_message.=$tmp;
-				if(preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) $go=false;
+				$this->_message .= $tmp;
+				if (preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) $go = false;
 			}
-		} while($go);
-		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
-		$this->_code=(int)$regs[1];
+		} while ($go);
+		if ($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		$this->_code = (int) $regs[1];
 		return $result;
 	}
 
-	function _exec($cmd, $fnction="_exec") {
-		if(!$this->_ready) {
-			$this->PushError($fnction,'Connect first');
+	function _exec($cmd, $fnction = "_exec") {
+		if ( ! $this->_ready) {
+			$this->PushError($fnction, 'Connect first');
 			return FALSE;
 		}
-		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
-		$status=@fputs($this->_ftp_control_sock, $cmd.CRLF);
-		if($status===false) {
-			$this->PushError($fnction,'socket write failed');
+		if ($this->LocalEcho) echo "PUT > ", $cmd, CRLF;
+		$status = @fputs($this->_ftp_control_sock, $cmd.CRLF);
+		if ($status === false) {
+			$this->PushError($fnction, 'socket write failed');
 			return FALSE;
 		}
-		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
+		$this->_lastaction = time();
+		if ( ! $this->_readmsg($fnction)) return FALSE;
 		return TRUE;
 	}
 
-	function _data_prepare($mode=FTP_ASCII) {
-		if(!$this->_settype($mode)) return FALSE;
-		if($this->_passive) {
-			if(!$this->_exec("PASV", "pasv")) {
+	function _data_prepare($mode = FTP_ASCII) {
+		if ( ! $this->_settype($mode)) return FALSE;
+		if ($this->_passive) {
+			if ( ! $this->_exec("PASV", "pasv")) {
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!$this->_checkCode()) {
+			if ( ! $this->_checkCode()) {
 				$this->_data_close();
 				return FALSE;
 			}
 			$ip_port = explode(",", preg_replace("/^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*$/s", "\\1", $this->_message));
-			$this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
-            $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
+			$this->_datahost = $ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
+            $this->_dataport = (((int) $ip_port[4]) << 8) + ((int) $ip_port[5]);
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
-			$this->_ftp_data_sock=@fsockopen($this->_datahost, $this->_dataport, $errno, $errstr, $this->_timeout);
-			if(!$this->_ftp_data_sock) {
-				$this->PushError("_data_prepare","fsockopen fails", $errstr." (".$errno.")");
+			$this->_ftp_data_sock = @fsockopen($this->_datahost, $this->_dataport, $errno, $errstr, $this->_timeout);
+			if ( ! $this->_ftp_data_sock) {
+				$this->PushError("_data_prepare", "fsockopen fails", $errstr." (".$errno.")");
 				$this->_data_close();
 				return FALSE;
 			}
@@ -124,47 +124,47 @@ 
 		return TRUE;
 	}
 
-	function _data_read($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
+	function _data_read($mode = FTP_ASCII, $fp = NULL) {
+		if (is_resource($fp)) $out = 0;
+		else $out = "";
+		if ( ! $this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
 		}
-		while (!feof($this->_ftp_data_sock)) {
-			$block=fread($this->_ftp_data_sock, $this->_ftp_buff_size);
-			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
-			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
-			else $out.=$block;
+		while ( ! feof($this->_ftp_data_sock)) {
+			$block = fread($this->_ftp_data_sock, $this->_ftp_buff_size);
+			if ($mode != FTP_BINARY) $block = preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+			if (is_resource($fp)) $out += fwrite($fp, $block, strlen($block));
+			else $out .= $block;
 		}
 		return $out;
 	}
 
-	function _data_write($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
+	function _data_write($mode = FTP_ASCII, $fp = NULL) {
+		if (is_resource($fp)) $out = 0;
+		else $out = "";
+		if ( ! $this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
 		}
-		if(is_resource($fp)) {
-			while(!feof($fp)) {
-				$block=fread($fp, $this->_ftp_buff_size);
-				if(!$this->_data_write_block($mode, $block)) return false;
+		if (is_resource($fp)) {
+			while ( ! feof($fp)) {
+				$block = fread($fp, $this->_ftp_buff_size);
+				if ( ! $this->_data_write_block($mode, $block)) return false;
 			}
-		} elseif(!$this->_data_write_block($mode, $fp)) return false;
+		} elseif ( ! $this->_data_write_block($mode, $fp)) return false;
 		return TRUE;
 	}
 
 	function _data_write_block($mode, $block) {
-		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		if ($mode != FTP_BINARY) $block = preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
 		do {
-			if(($t=@fwrite($this->_ftp_data_sock, $block))===FALSE) {
-				$this->PushError("_data_write","Can't write to socket");
+			if (($t = @fwrite($this->_ftp_data_sock, $block)) === FALSE) {
+				$this->PushError("_data_write", "Can't write to socket");
 				return FALSE;
 			}
-			$block=substr($block, $t);
-		} while(!empty($block));
+			$block = substr($block, $t);
+		} while ( ! empty($block));
 		return true;
 	}
 
@@ -174,10 +174,10 @@ 
 		return TRUE;
 	}
 
-	function _quit($force=FALSE) {
-		if($this->_connected or $force) {
+	function _quit($force = FALSE) {
+		if ($this->_connected or $force) {
 			@fclose($this->_ftp_control_sock);
-			$this->_connected=false;
+			$this->_connected = false;
 			$this->SendMSG("Socket closed");
 		}
 	}

src/wp-admin/includes/taxonomy.php

Braces +18 added lines, -12 removed lines

@@ -23,8 +23,9 @@ 
  */
 function category_exists( $cat_name, $parent = null ) {
 	$id = term_exists($cat_name, 'category', $parent);
-	if ( is_array($id) )
-		$id = $id['term_id'];
+	if ( is_array($id) ) {
+			$id = $id['term_id'];
+	}
 	return $id;
 }
 
@@ -52,8 +53,9 @@ 
  * @return int|WP_Error
  */
 function wp_create_category( $cat_name, $parent = 0 ) {
-	if ( $id = category_exists($cat_name, $parent) )
-		return $id;
+	if ( $id = category_exists($cat_name, $parent) ) {
+			return $id;
+	}
 
 	return wp_insert_category( array('cat_name' => $cat_name, 'category_parent' => $parent) );
 }
@@ -77,8 +79,9 @@ 
 		}
 	}
 
-	if ( $post_id )
-		wp_set_post_categories($post_id, $cat_ids);
+	if ( $post_id ) {
+			wp_set_post_categories($post_id, $cat_ids);
+	}
 
 	return $cat_ids;
 }
@@ -168,8 +171,9 @@ 
 function wp_update_category($catarr) {
 	$cat_ID = (int) $catarr['cat_ID'];
 
-	if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) )
-		return false;
+	if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) ) {
+			return false;
+	}
 
 	// First, get all of the original fields
 	$category = get_term( $cat_ID, 'category', ARRAY_A );
@@ -236,8 +240,9 @@ 
  */
 function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
 	$post_id = (int) $post_id;
-	if ( !$post_id )
-		return false;
+	if ( !$post_id ) {
+			return false;
+	}
 
 	$terms = get_object_term_cache( $post_id, $taxonomy );
 	if ( false === $terms ) {
@@ -283,8 +288,9 @@ 
  * @return array|WP_Error
  */
 function wp_create_term($tag_name, $taxonomy = 'post_tag') {
-	if ( $id = term_exists($tag_name, $taxonomy) )
-		return $id;
+	if ( $id = term_exists($tag_name, $taxonomy) ) {
+			return $id;
+	}
 
 	return wp_insert_term($tag_name, $taxonomy);
 }

Spacing +48 added lines, -48 removed lines

@@ -21,9 +21,9 @@ 
  * @param int        $parent   Optional. ID of parent term.
  * @return mixed
  */
-function category_exists( $cat_name, $parent = null ) {
+function category_exists($cat_name, $parent = null) {
 	$id = term_exists($cat_name, 'category', $parent);
-	if ( is_array($id) )
+	if (is_array($id))
 		$id = $id['term_id'];
 	return $id;
 }
@@ -36,9 +36,9 @@ 
  * @param int $id
  * @return object
  */
-function get_category_to_edit( $id ) {
-	$category = get_term( $id, 'category', OBJECT, 'edit' );
-	_make_cat_compat( $category );
+function get_category_to_edit($id) {
+	$category = get_term($id, 'category', OBJECT, 'edit');
+	_make_cat_compat($category);
 	return $category;
 }
 
@@ -51,11 +51,11 @@ 
  * @param int        $parent
  * @return int|WP_Error
  */
-function wp_create_category( $cat_name, $parent = 0 ) {
-	if ( $id = category_exists($cat_name, $parent) )
+function wp_create_category($cat_name, $parent = 0) {
+	if ($id = category_exists($cat_name, $parent))
 		return $id;
 
-	return wp_insert_category( array('cat_name' => $cat_name, 'category_parent' => $parent) );
+	return wp_insert_category(array('cat_name' => $cat_name, 'category_parent' => $parent));
 }
 
 /**
@@ -67,17 +67,17 @@ 
  * @param int   $post_id    Optional. The post ID. Default empty.
  * @return array List of categories to create for the given post.
  */
-function wp_create_categories( $categories, $post_id = '' ) {
-	$cat_ids = array ();
-	foreach ( $categories as $category ) {
-		if ( $id = category_exists( $category ) ) {
+function wp_create_categories($categories, $post_id = '') {
+	$cat_ids = array();
+	foreach ($categories as $category) {
+		if ($id = category_exists($category)) {
 			$cat_ids[] = $id;
-		} elseif ( $id = wp_create_category( $category ) ) {
+		} elseif ($id = wp_create_category($category)) {
 			$cat_ids[] = $id;
 		}
 	}
 
-	if ( $post_id )
+	if ($post_id)
 		wp_set_post_categories($post_id, $cat_ids);
 
 	return $cat_ids;
@@ -105,47 +105,47 @@ 
  * @return int|object The ID number of the new or updated Category on success. Zero or a WP_Error on failure,
  *                    depending on param $wp_error.
  */
-function wp_insert_category( $catarr, $wp_error = false ) {
-	$cat_defaults = array( 'cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '' );
-	$catarr = wp_parse_args( $catarr, $cat_defaults );
+function wp_insert_category($catarr, $wp_error = false) {
+	$cat_defaults = array('cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '');
+	$catarr = wp_parse_args($catarr, $cat_defaults);
 
-	if ( trim( $catarr['cat_name'] ) == '' ) {
-		if ( ! $wp_error ) {
+	if (trim($catarr['cat_name']) == '') {
+		if ( ! $wp_error) {
 			return 0;
 		} else {
-			return new WP_Error( 'cat_name', __( 'You did not enter a category name.' ) );
+			return new WP_Error('cat_name', __('You did not enter a category name.'));
 		}
 	}
 
 	$catarr['cat_ID'] = (int) $catarr['cat_ID'];
 
 	// Are we updating or creating?
-	$update = ! empty ( $catarr['cat_ID'] );
+	$update = ! empty ($catarr['cat_ID']);
 
 	$name = $catarr['cat_name'];
 	$description = $catarr['category_description'];
 	$slug = $catarr['category_nicename'];
 	$parent = (int) $catarr['category_parent'];
-	if ( $parent < 0 ) {
+	if ($parent < 0) {
 		$parent = 0;
 	}
 
-	if ( empty( $parent )
-		|| ! term_exists( $parent, $catarr['taxonomy'] )
-		|| ( $catarr['cat_ID'] && term_is_ancestor_of( $catarr['cat_ID'], $parent, $catarr['taxonomy'] ) ) ) {
+	if (empty($parent)
+		|| ! term_exists($parent, $catarr['taxonomy'])
+		|| ($catarr['cat_ID'] && term_is_ancestor_of($catarr['cat_ID'], $parent, $catarr['taxonomy']))) {
 		$parent = 0;
 	}
 
 	$args = compact('name', 'slug', 'parent', 'description');
 
-	if ( $update ) {
-		$catarr['cat_ID'] = wp_update_term( $catarr['cat_ID'], $catarr['taxonomy'], $args );
+	if ($update) {
+		$catarr['cat_ID'] = wp_update_term($catarr['cat_ID'], $catarr['taxonomy'], $args);
 	} else {
-		$catarr['cat_ID'] = wp_insert_term( $catarr['cat_name'], $catarr['taxonomy'], $args );
+		$catarr['cat_ID'] = wp_insert_term($catarr['cat_name'], $catarr['taxonomy'], $args);
 	}
 
-	if ( is_wp_error( $catarr['cat_ID'] ) ) {
-		if ( $wp_error ) {
+	if (is_wp_error($catarr['cat_ID'])) {
+		if ($wp_error) {
 			return $catarr['cat_ID'];
 		} else {
 			return 0;
@@ -168,12 +168,12 @@ 
 function wp_update_category($catarr) {
 	$cat_ID = (int) $catarr['cat_ID'];
 
-	if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) )
+	if (isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']))
 		return false;
 
 	// First, get all of the original fields
-	$category = get_term( $cat_ID, 'category', ARRAY_A );
-	_make_cat_compat( $category );
+	$category = get_term($cat_ID, 'category', ARRAY_A);
+	_make_cat_compat($category);
 
 	// Escape data pulled from DB.
 	$category = wp_slash($category);
@@ -209,7 +209,7 @@ 
  * @return array|WP_Error
  */
 function wp_create_tag($tag_name) {
-	return wp_create_term( $tag_name, 'post_tag');
+	return wp_create_term($tag_name, 'post_tag');
 }
 
 /**
@@ -221,8 +221,8 @@ 
  * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'.
  * @return string|bool|WP_Error
  */
-function get_tags_to_edit( $post_id, $taxonomy = 'post_tag' ) {
-	return get_terms_to_edit( $post_id, $taxonomy);
+function get_tags_to_edit($post_id, $taxonomy = 'post_tag') {
+	return get_terms_to_edit($post_id, $taxonomy);
 }
 
 /**
@@ -234,29 +234,29 @@ 
  * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'.
  * @return string|bool|WP_Error
  */
-function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
+function get_terms_to_edit($post_id, $taxonomy = 'post_tag') {
 	$post_id = (int) $post_id;
-	if ( !$post_id )
+	if ( ! $post_id)
 		return false;
 
-	$terms = get_object_term_cache( $post_id, $taxonomy );
-	if ( false === $terms ) {
-		$terms = wp_get_object_terms( $post_id, $taxonomy );
-		wp_cache_add( $post_id, wp_list_pluck( $terms, 'term_id' ), $taxonomy . '_relationships' );
+	$terms = get_object_term_cache($post_id, $taxonomy);
+	if (false === $terms) {
+		$terms = wp_get_object_terms($post_id, $taxonomy);
+		wp_cache_add($post_id, wp_list_pluck($terms, 'term_id'), $taxonomy.'_relationships');
 	}
 
-	if ( ! $terms ) {
+	if ( ! $terms) {
 		return false;
 	}
-	if ( is_wp_error( $terms ) ) {
+	if (is_wp_error($terms)) {
 		return $terms;
 	}
 	$term_names = array();
-	foreach ( $terms as $term ) {
+	foreach ($terms as $term) {
 		$term_names[] = $term->name;
 	}
 
-	$terms_to_edit = esc_attr( join( ',', $term_names ) );
+	$terms_to_edit = esc_attr(join(',', $term_names));
 
 	/**
 	 * Filters the comma-separated list of terms available to edit.
@@ -268,7 +268,7 @@ 
 	 * @param array  $terms_to_edit An array of terms.
 	 * @param string $taxonomy     The taxonomy for which to retrieve terms. Default 'post_tag'.
 	 */
-	$terms_to_edit = apply_filters( 'terms_to_edit', $terms_to_edit, $taxonomy );
+	$terms_to_edit = apply_filters('terms_to_edit', $terms_to_edit, $taxonomy);
 
 	return $terms_to_edit;
 }
@@ -283,7 +283,7 @@ 
  * @return array|WP_Error
  */
 function wp_create_term($tag_name, $taxonomy = 'post_tag') {
-	if ( $id = term_exists($tag_name, $taxonomy) )
+	if ($id = term_exists($tag_name, $taxonomy))
 		return $id;
 
 	return wp_insert_term($tag_name, $taxonomy);

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

Braces +16 added lines, -11 removed lines

@@ -48,14 +48,18 @@ 
 
 		$args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
 
-		if ( 'all' != $cat_id )
-			$args['category'] = $cat_id;
-		if ( !empty( $s ) )
-			$args['search'] = $s;
-		if ( !empty( $orderby ) )
-			$args['orderby'] = $orderby;
-		if ( !empty( $order ) )
-			$args['order'] = $order;
+		if ( 'all' != $cat_id ) {
+					$args['category'] = $cat_id;
+		}
+		if ( !empty( $s ) ) {
+					$args['search'] = $s;
+		}
+		if ( !empty( $orderby ) ) {
+					$args['orderby'] = $orderby;
+		}
+		if ( !empty( $order ) ) {
+					$args['order'] = $order;
+		}
 
 		$this->items = get_bookmarks( $args );
 	}
@@ -86,9 +90,10 @@ 
 	protected function extra_tablenav( $which ) {
 		global $cat_id;
 
-		if ( 'top' != $which )
-			return;
-?>
+		if ( 'top' != $which ) {
+					return;
+		}
+		?>
 		<div class="alignleft actions">
 <?php
 			$dropdown_options = array(

Spacing +61 added lines, -61 removed lines

@@ -27,11 +27,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(
 			'plural' => 'bookmarks',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 	}
 
 	/**
@@ -39,7 +39,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( 'manage_links' );
+		return current_user_can('manage_links');
 	}
 
 	/**
@@ -52,27 +52,27 @@ 
 	public function prepare_items() {
 		global $cat_id, $s, $orderby, $order;
 
-		wp_reset_vars( array( 'action', 'cat_id', 'link_id', 'orderby', 'order', 's' ) );
+		wp_reset_vars(array('action', 'cat_id', 'link_id', 'orderby', 'order', 's'));
 
-		$args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
+		$args = array('hide_invisible' => 0, 'hide_empty' => 0);
 
-		if ( 'all' != $cat_id )
+		if ('all' != $cat_id)
 			$args['category'] = $cat_id;
-		if ( !empty( $s ) )
+		if ( ! empty($s))
 			$args['search'] = $s;
-		if ( !empty( $orderby ) )
+		if ( ! empty($orderby))
 			$args['orderby'] = $orderby;
-		if ( !empty( $order ) )
+		if ( ! empty($order))
 			$args['order'] = $order;
 
-		$this->items = get_bookmarks( $args );
+		$this->items = get_bookmarks($args);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No links found.' );
+		_e('No links found.');
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		$actions['delete'] = __( 'Delete' );
+		$actions['delete'] = __('Delete');
 
 		return $actions;
 	}
@@ -91,10 +91,10 @@ 
 	 * @global int $cat_id
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		global $cat_id;
 
-		if ( 'top' != $which )
+		if ('top' != $which)
 			return;
 ?>
 		<div class="alignleft actions">
@@ -103,16 +103,16 @@ 
 				'selected' => $cat_id,
 				'name' => 'cat_id',
 				'taxonomy' => 'link_category',
-				'show_option_all' => get_taxonomy( 'link_category' )->labels->all_items,
+				'show_option_all' => get_taxonomy('link_category')->labels->all_items,
 				'hide_empty' => true,
 				'hierarchical' => 1,
 				'show_count' => 0,
 				'orderby' => 'name',
 			);
 
-			echo '<label class="screen-reader-text" for="cat_id">' . __( 'Filter by category' ) . '</label>';
-			wp_dropdown_categories( $dropdown_options );
-			submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+			echo '<label class="screen-reader-text" for="cat_id">'.__('Filter by category').'</label>';
+			wp_dropdown_categories($dropdown_options);
+			submit_button(__('Filter'), '', 'filter_action', false, array('id' => 'post-query-submit'));
 ?>
 		</div>
 <?php
@@ -125,12 +125,12 @@ 
 	public function get_columns() {
 		return array(
 			'cb'         => '<input type="checkbox" />',
-			'name'       => _x( 'Name', 'link name' ),
-			'url'        => __( 'URL' ),
-			'categories' => __( 'Categories' ),
-			'rel'        => __( 'Relationship' ),
-			'visible'    => __( 'Visible' ),
-			'rating'     => __( 'Rating' )
+			'name'       => _x('Name', 'link name'),
+			'url'        => __('URL'),
+			'categories' => __('Categories'),
+			'rel'        => __('Relationship'),
+			'visible'    => __('Visible'),
+			'rating'     => __('Rating')
 		);
 	}
 
@@ -167,10 +167,10 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_cb( $link ) {
+	public function column_cb($link) {
 		?>
-		<label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf( __( 'Select %s' ), $link->link_name ); ?></label>
-		<input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr( $link->link_id ); ?>" />
+		<label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf(__('Select %s'), $link->link_name); ?></label>
+		<input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr($link->link_id); ?>" />
 		<?php
 	}
 
@@ -182,12 +182,12 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_name( $link ) {
-		$edit_link = get_edit_bookmark_link( $link );
-		printf( '<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong>',
+	public function column_name($link) {
+		$edit_link = get_edit_bookmark_link($link);
+		printf('<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong>',
 			$edit_link,
 			/* translators: %s: link name */
-			esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $link->link_name ) ),
+			esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $link->link_name)),
 			$link->link_name
 		);
 	}
@@ -200,8 +200,8 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_url( $link ) {
-		$short_url = url_shorten( $link->link_url );
+	public function column_url($link) {
+		$short_url = url_shorten($link->link_url);
 		echo "<a href='$link->link_url'>$short_url</a>";
 	}
 
@@ -215,22 +215,22 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_categories( $link ) {
+	public function column_categories($link) {
 		global $cat_id;
 
 		$cat_names = array();
-		foreach ( $link->link_category as $category ) {
-			$cat = get_term( $category, 'link_category', OBJECT, 'display' );
-			if ( is_wp_error( $cat ) ) {
+		foreach ($link->link_category as $category) {
+			$cat = get_term($category, 'link_category', OBJECT, 'display');
+			if (is_wp_error($cat)) {
 				echo $cat->get_error_message();
 			}
 			$cat_name = $cat->name;
-			if ( $cat_id != $category ) {
+			if ($cat_id != $category) {
 				$cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
 			}
 			$cat_names[] = $cat_name;
 		}
-		echo implode( ', ', $cat_names );
+		echo implode(', ', $cat_names);
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_rel( $link ) {
-		echo empty( $link->link_rel ) ? '<br />' : $link->link_rel;
+	public function column_rel($link) {
+		echo empty($link->link_rel) ? '<br />' : $link->link_rel;
 	}
 
 	/**
@@ -253,11 +253,11 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_visible( $link ) {
-		if ( 'Y' === $link->link_visible ) {
-			_e( 'Yes' );
+	public function column_visible($link) {
+		if ('Y' === $link->link_visible) {
+			_e('Yes');
 		} else {
-			_e( 'No' );
+			_e('No');
 		}
 	}
 
@@ -269,7 +269,7 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_rating( $link ) {
+	public function column_rating($link) {
 		echo $link->link_rating;
 	}
 
@@ -282,7 +282,7 @@ 
 	 * @param object $link        Link object.
 	 * @param string $column_name Current column name.
 	 */
-	public function column_default( $link, $column_name ) {
+	public function column_default($link, $column_name) {
 		/**
 		 * Fires for each registered custom link column.
 		 *
@@ -291,17 +291,17 @@ 
 		 * @param string $column_name Name of the custom column.
 		 * @param int    $link_id     Link ID.
 		 */
-		do_action( 'manage_link_custom_column', $column_name, $link->link_id );
+		do_action('manage_link_custom_column', $column_name, $link->link_id);
 	}
 
 	public function display_rows() {
-		foreach ( $this->items as $link ) {
-			$link = sanitize_bookmark( $link );
-			$link->link_name = esc_attr( $link->link_name );
-			$link->link_category = wp_get_link_cats( $link->link_id );
+		foreach ($this->items as $link) {
+			$link = sanitize_bookmark($link);
+			$link->link_name = esc_attr($link->link_name);
+			$link->link_category = wp_get_link_cats($link->link_id);
 ?>
 		<tr id="link-<?php echo $link->link_id; ?>">
-			<?php $this->single_row_columns( $link ) ?>
+			<?php $this->single_row_columns($link) ?>
 		</tr>
 <?php
 		}
@@ -318,16 +318,16 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row action output for links.
 	 */
-	protected function handle_row_actions( $link, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($link, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
-		$edit_link = get_edit_bookmark_link( $link );
+		$edit_link = get_edit_bookmark_link($link);
 
 		$actions = array();
-		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-		$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm( '" . esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name)) . "' ) ) { return true;}return false;\">" . __('Delete') . "</a>";
-		return $this->row_actions( $actions );
+		$actions['edit'] = '<a href="'.$edit_link.'">'.__('Edit').'</a>';
+		$actions['delete'] = "<a class='submitdelete' href='".wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_'.$link->link_id)."' onclick=\"if ( confirm( '".esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name))."' ) ) { return true;}return false;\">".__('Delete')."</a>";
+		return $this->row_actions($actions);
 	}
 }

src/wp-admin/ms-options.php

Spacing +2 added lines, -2 removed lines

@@ -7,6 +7,6 @@
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_redirect( network_admin_url('settings.php') );
+wp_redirect(network_admin_url('settings.php'));

src/wp-admin/ms-edit.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_redirect( network_admin_url() );
+wp_redirect(network_admin_url());
 exit;

src/wp-admin/admin-footer.php

Braces +6 added lines, -4 removed lines

@@ -7,8 +7,9 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
 	die('-1');
+}
 ?>
 
 <div class="clear"></div></div><!-- wpbody-content -->
@@ -88,9 +89,10 @@ 
 
 // get_site_option() won't exist when auto upgrading from <= 2.7
 if ( function_exists('get_site_option') ) {
-	if ( false === get_site_option('can_compress_scripts') )
-		compression_test();
-}
+	if ( false === get_site_option('can_compress_scripts') ) {
+			compression_test();
+	}
+	}
 
 ?>
 

Spacing +11 added lines, -11 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( ! defined('ABSPATH'))
 	die('-1');
 
 /**
@@ -27,11 +27,11 @@ 
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( 'in_admin_footer' );
+	do_action('in_admin_footer');
 	?>
 	<p id="footer-left" class="alignleft">
 		<?php
-		$text = sprintf( __( 'Thank you for creating with <a href="%s">WordPress</a>.' ), __( 'https://wordpress.org/' ) );
+		$text = sprintf(__('Thank you for creating with <a href="%s">WordPress</a>.'), __('https://wordpress.org/'));
 		/**
 		 * Filters the "Thank you" text displayed in the admin footer.
 		 *
@@ -39,7 +39,7 @@ 
 		 *
 		 * @param string $text The content that will be printed.
 		 */
-		echo apply_filters( 'admin_footer_text', '<span id="footer-thankyou">' . $text . '</span>' );
+		echo apply_filters('admin_footer_text', '<span id="footer-thankyou">'.$text.'</span>');
 		?>
 	</p>
 	<p id="footer-upgrade" class="alignright">
@@ -56,7 +56,7 @@ 
 		 *
 		 * @param string $content The content that will be printed.
 		 */
-		echo apply_filters( 'update_footer', '' );
+		echo apply_filters('update_footer', '');
 		?>
 	</p>
 	<div class="clear"></div>
@@ -69,7 +69,7 @@ 
  *
  * @param string $data The data to print.
  */
-do_action( 'admin_footer', '' );
+do_action('admin_footer', '');
 
 /**
  * Prints scripts and data queued for the footer.
@@ -83,14 +83,14 @@ 
  *
  * @param string $hook_suffix The current admin page.
  */
-do_action( "admin_print_footer_scripts-{$hook_suffix}" );
+do_action("admin_print_footer_scripts-{$hook_suffix}");
 
 /**
  * Prints any scripts and data queued for the footer.
  *
  * @since 2.8.0
  */
-do_action( 'admin_print_footer_scripts' );
+do_action('admin_print_footer_scripts');
 
 /**
  * Prints scripts or data after the default footer scripts.
@@ -103,11 +103,11 @@ 
  * @global string $hook_suffix
  * @param string $hook_suffix The current admin page.
  */
-do_action( "admin_footer-{$hook_suffix}" );
+do_action("admin_footer-{$hook_suffix}");
 
 // get_site_option() won't exist when auto upgrading from <= 2.7
-if ( function_exists('get_site_option') ) {
-	if ( false === get_site_option('can_compress_scripts') )
+if (function_exists('get_site_option')) {
+	if (false === get_site_option('can_compress_scripts'))
 		compression_test();
 }