ntwb / wordpress

src/wp-admin/includes/admin-filters.php

Spacing +61 added lines, -61 removed lines

@@ -8,83 +8,83 @@ 
  */
 
 // Bookmark hooks.
-add_action( 'admin_page_access_denied', 'wp_link_manager_disabled_message' );
+add_action('admin_page_access_denied', 'wp_link_manager_disabled_message');
 
 // Dashboard hooks.
-add_action( 'activity_box_end', 'wp_dashboard_quota' );
+add_action('activity_box_end', 'wp_dashboard_quota');
 
 // Media hooks.
-add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
+add_action('attachment_submitbox_misc_actions', 'attachment_submitbox_metadata');
 
-add_action( 'media_upload_image', 'wp_media_upload_handler' );
-add_action( 'media_upload_audio', 'wp_media_upload_handler' );
-add_action( 'media_upload_video', 'wp_media_upload_handler' );
-add_action( 'media_upload_file',  'wp_media_upload_handler' );
+add_action('media_upload_image', 'wp_media_upload_handler');
+add_action('media_upload_audio', 'wp_media_upload_handler');
+add_action('media_upload_video', 'wp_media_upload_handler');
+add_action('media_upload_file', 'wp_media_upload_handler');
 
-add_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' );
+add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
 
-add_action( 'post-html-upload-ui', 'media_upload_html_bypass'  );
+add_action('post-html-upload-ui', 'media_upload_html_bypass');
 
-add_filter( 'async_upload_image', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_audio', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_video', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_file',  'get_media_item', 10, 2 );
+add_filter('async_upload_image', 'get_media_item', 10, 2);
+add_filter('async_upload_audio', 'get_media_item', 10, 2);
+add_filter('async_upload_video', 'get_media_item', 10, 2);
+add_filter('async_upload_file', 'get_media_item', 10, 2);
 
-add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 );
+add_filter('attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2);
 
-add_filter( 'media_upload_gallery', 'media_upload_gallery' );
-add_filter( 'media_upload_library', 'media_upload_library' );
+add_filter('media_upload_gallery', 'media_upload_gallery');
+add_filter('media_upload_library', 'media_upload_library');
 
-add_filter( 'media_upload_tabs', 'update_gallery_tab' );
+add_filter('media_upload_tabs', 'update_gallery_tab');
 
 // Misc hooks.
-add_action( 'admin_head', 'wp_admin_canonical_url'   );
-add_action( 'admin_head', 'wp_color_scheme_settings' );
-add_action( 'admin_head', 'wp_site_icon'             );
-add_action( 'admin_head', '_ipad_meta'               );
+add_action('admin_head', 'wp_admin_canonical_url');
+add_action('admin_head', 'wp_color_scheme_settings');
+add_action('admin_head', 'wp_site_icon');
+add_action('admin_head', '_ipad_meta');
 
 // Prerendering.
-if ( ! is_customize_preview() ) {
-	add_filter( 'admin_print_styles', 'wp_resource_hints', 1 );
+if ( ! is_customize_preview()) {
+	add_filter('admin_print_styles', 'wp_resource_hints', 1);
 }
 
-add_action( 'admin_print_scripts-post.php',     'wp_page_reload_on_back_button_js' );
-add_action( 'admin_print_scripts-post-new.php', 'wp_page_reload_on_back_button_js' );
+add_action('admin_print_scripts-post.php', 'wp_page_reload_on_back_button_js');
+add_action('admin_print_scripts-post-new.php', 'wp_page_reload_on_back_button_js');
 
-add_action( 'update_option_home',          'update_home_siteurl', 10, 2 );
-add_action( 'update_option_siteurl',       'update_home_siteurl', 10, 2 );
-add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 );
+add_action('update_option_home', 'update_home_siteurl', 10, 2);
+add_action('update_option_siteurl', 'update_home_siteurl', 10, 2);
+add_action('update_option_page_on_front', 'update_home_siteurl', 10, 2);
 
-add_filter( 'heartbeat_received', 'wp_check_locked_posts',  10,  3 );
-add_filter( 'heartbeat_received', 'wp_refresh_post_lock',   10,  3 );
-add_filter( 'wp_refresh_nonces', 'wp_refresh_post_nonces', 10,  3 );
-add_filter( 'heartbeat_received', 'heartbeat_autosave',     500, 2 );
+add_filter('heartbeat_received', 'wp_check_locked_posts', 10, 3);
+add_filter('heartbeat_received', 'wp_refresh_post_lock', 10, 3);
+add_filter('wp_refresh_nonces', 'wp_refresh_post_nonces', 10, 3);
+add_filter('heartbeat_received', 'heartbeat_autosave', 500, 2);
 
-add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
+add_filter('heartbeat_settings', 'wp_heartbeat_set_suspension');
 
 // Nav Menu hooks.
-add_action( 'admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items' );
+add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items');
 
 // Plugin hooks.
-add_filter( 'whitelist_options', 'option_update_filter' );
+add_filter('whitelist_options', 'option_update_filter');
 
 // Plugin Install hooks.
-add_action( 'install_plugins_featured',               'install_dashboard' );
-add_action( 'install_plugins_upload',                 'install_plugins_upload' );
-add_action( 'install_plugins_search',                 'display_plugins_table' );
-add_action( 'install_plugins_popular',                'display_plugins_table' );
-add_action( 'install_plugins_recommended',            'display_plugins_table' );
-add_action( 'install_plugins_new',                    'display_plugins_table' );
-add_action( 'install_plugins_beta',                   'display_plugins_table' );
-add_action( 'install_plugins_favorites',              'display_plugins_table' );
-add_action( 'install_plugins_pre_plugin-information', 'install_plugin_information' );
+add_action('install_plugins_featured', 'install_dashboard');
+add_action('install_plugins_upload', 'install_plugins_upload');
+add_action('install_plugins_search', 'display_plugins_table');
+add_action('install_plugins_popular', 'display_plugins_table');
+add_action('install_plugins_recommended', 'display_plugins_table');
+add_action('install_plugins_new', 'display_plugins_table');
+add_action('install_plugins_beta', 'display_plugins_table');
+add_action('install_plugins_favorites', 'display_plugins_table');
+add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
 
 // Template hooks.
-add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts'                ) );
-add_action( 'user_register',         array( 'WP_Internal_Pointers', 'dismiss_pointers_for_new_users' ) );
+add_action('admin_enqueue_scripts', array('WP_Internal_Pointers', 'enqueue_scripts'));
+add_action('user_register', array('WP_Internal_Pointers', 'dismiss_pointers_for_new_users'));
 
 // Theme hooks.
-add_action( 'customize_controls_print_footer_scripts', 'customize_themes_print_templates' );
+add_action('customize_controls_print_footer_scripts', 'customize_themes_print_templates');
 
 // Theme Install hooks.
 // add_action('install_themes_dashboard', 'install_themes_dashboard');
@@ -93,29 +93,29 @@ 
 // add_action('install_themes_featured', 'display_themes');
 // add_action('install_themes_new', 'display_themes');
 // add_action('install_themes_updated', 'display_themes');
-add_action( 'install_themes_pre_theme-information', 'install_theme_information' );
+add_action('install_themes_pre_theme-information', 'install_theme_information');
 
 // User hooks.
-add_action( 'admin_init', 'default_password_nag_handler' );
+add_action('admin_init', 'default_password_nag_handler');
 
-add_action( 'admin_notices', 'default_password_nag' );
+add_action('admin_notices', 'default_password_nag');
 
-add_action( 'profile_update', 'default_password_nag_edit_user', 10, 2 );
+add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
 
 // Update hooks.
-add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called.
-add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called.
+add_action('load-plugins.php', 'wp_plugin_update_rows', 20); // After wp_update_plugins() is called.
+add_action('load-themes.php', 'wp_theme_update_rows', 20); // After wp_update_themes() is called.
 
-add_action( 'admin_notices', 'update_nag',      3  );
-add_action( 'admin_notices', 'maintenance_nag', 10 );
+add_action('admin_notices', 'update_nag', 3);
+add_action('admin_notices', 'maintenance_nag', 10);
 
-add_filter( 'update_footer', 'core_update_footer' );
+add_filter('update_footer', 'core_update_footer');
 
 // Update Core hooks.
-add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
+add_action('_core_updated_successfully', '_redirect_to_about_wordpress');
 
 // Upgrade hooks.
-add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
-add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 );
-add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 );
-add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
+add_action('upgrader_process_complete', array('Language_Pack_Upgrader', 'async_upgrade'), 20);
+add_action('upgrader_process_complete', 'wp_version_check', 10, 0);
+add_action('upgrader_process_complete', 'wp_update_plugins', 10, 0);
+add_action('upgrader_process_complete', 'wp_update_themes', 10, 0);

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

Spacing +96 added lines, -96 removed lines

@@ -22,44 +22,44 @@ 
 	 *
 	 * @param array $opt
 	 */
-	public function __construct( $opt = '' ) {
+	public function __construct($opt = '') {
 		$this->method = 'ftpext';
 		$this->errors = new WP_Error();
 
 		// Check if possible to use ftp functions.
-		if ( ! extension_loaded('ftp') ) {
+		if ( ! extension_loaded('ftp')) {
 			$this->errors->add('no_ftp_ext', __('The ftp PHP extension is not available'));
 			return;
 		}
 
 		// This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
 
-		if ( ! defined('FS_TIMEOUT') )
+		if ( ! defined('FS_TIMEOUT'))
 			define('FS_TIMEOUT', 240);
 
-		if ( empty($opt['port']) )
+		if (empty($opt['port']))
 			$this->options['port'] = 21;
 		else
 			$this->options['port'] = $opt['port'];
 
-		if ( empty($opt['hostname']) )
+		if (empty($opt['hostname']))
 			$this->errors->add('empty_hostname', __('FTP hostname is required'));
 		else
 			$this->options['hostname'] = $opt['hostname'];
 
 		// Check if the options provided are OK.
-		if ( empty($opt['username']) )
+		if (empty($opt['username']))
 			$this->errors->add('empty_username', __('FTP username is required'));
 		else
 			$this->options['username'] = $opt['username'];
 
-		if ( empty($opt['password']) )
+		if (empty($opt['password']))
 			$this->errors->add('empty_password', __('FTP password is required'));
 		else
 			$this->options['password'] = $opt['password'];
 
 		$this->options['ssl'] = false;
-		if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] )
+		if (isset($opt['connection_type']) && 'ftps' == $opt['connection_type'])
 			$this->options['ssl'] = true;
 	}
 
@@ -69,25 +69,25 @@ 
 	 * @return bool
 	 */
 	public function connect() {
-		if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
+		if (isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect'))
 			$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
 		else
 			$this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
 
-		if ( ! $this->link ) {
-			$this->errors->add( 'connect',
+		if ( ! $this->link) {
+			$this->errors->add('connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to connect to FTP Server %s' ),
-					$this->options['hostname'] . ':' . $this->options['port']
+				sprintf(__('Failed to connect to FTP Server %s'),
+					$this->options['hostname'].':'.$this->options['port']
 				)
 			);
 			return false;
 		}
 
-		if ( ! @ftp_login( $this->link,$this->options['username'], $this->options['password'] ) ) {
-			$this->errors->add( 'auth',
+		if ( ! @ftp_login($this->link, $this->options['username'], $this->options['password'])) {
+			$this->errors->add('auth',
 				/* translators: %s: username */
-				sprintf( __( 'Username/Password incorrect for %s' ),
+				sprintf(__('Username/Password incorrect for %s'),
 					$this->options['username']
 				)
 			);
@@ -95,8 +95,8 @@ 
 		}
 
 		// Set the Connection to use Passive FTP
-		@ftp_pasv( $this->link, true );
-		if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT )
+		@ftp_pasv($this->link, true);
+		if (@ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT)
 			@ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
 
 		return true;
@@ -112,25 +112,25 @@ 
 	 * @return string|false File contents on success, false if no temp file could be opened,
 	 *                      or if the file couldn't be retrieved.
 	 */
-	public function get_contents( $file ) {
+	public function get_contents($file) {
 		$tempfile = wp_tempnam($file);
 		$temp = fopen($tempfile, 'w+');
 
-		if ( ! $temp ) {
-			unlink( $tempfile );
+		if ( ! $temp) {
+			unlink($tempfile);
 			return false;
 		}
 
-		if ( ! @ftp_fget( $this->link, $temp, $file, FTP_BINARY ) ) {
-			fclose( $temp );
-			unlink( $tempfile );
+		if ( ! @ftp_fget($this->link, $temp, $file, FTP_BINARY)) {
+			fclose($temp);
+			unlink($tempfile);
 			return false;
 		}
 
-		fseek( $temp, 0 ); // Skip back to the start of the file being written to
+		fseek($temp, 0); // Skip back to the start of the file being written to
 		$contents = '';
 
-		while ( ! feof($temp) )
+		while ( ! feof($temp))
 			$contents .= fread($temp, 8192);
 
 		fclose($temp);
@@ -156,31 +156,31 @@ 
 	 * @param bool|int $mode
 	 * @return bool
 	 */
-	public function put_contents($file, $contents, $mode = false ) {
+	public function put_contents($file, $contents, $mode = false) {
 		$tempfile = wp_tempnam($file);
-		$temp = fopen( $tempfile, 'wb+' );
+		$temp = fopen($tempfile, 'wb+');
 
-		if ( ! $temp ) {
-			unlink( $tempfile );
+		if ( ! $temp) {
+			unlink($tempfile);
 			return false;
 		}
 
 		mbstring_binary_safe_encoding();
 
-		$data_length = strlen( $contents );
-		$bytes_written = fwrite( $temp, $contents );
+		$data_length = strlen($contents);
+		$bytes_written = fwrite($temp, $contents);
 
 		reset_mbstring_encoding();
 
-		if ( $data_length !== $bytes_written ) {
-			fclose( $temp );
-			unlink( $tempfile );
+		if ($data_length !== $bytes_written) {
+			fclose($temp);
+			unlink($tempfile);
 			return false;
 		}
 
-		fseek( $temp, 0 ); // Skip back to the start of the file being written to
+		fseek($temp, 0); // Skip back to the start of the file being written to
 
-		$ret = @ftp_fput( $this->link, $file, $temp, FTP_BINARY );
+		$ret = @ftp_fput($this->link, $file, $temp, FTP_BINARY);
 
 		fclose($temp);
 		unlink($tempfile);
@@ -197,7 +197,7 @@ 
 	 */
 	public function cwd() {
 		$cwd = @ftp_pwd($this->link);
-		if ( $cwd )
+		if ($cwd)
 			$cwd = trailingslashit($cwd);
 		return $cwd;
 	}
@@ -221,26 +221,26 @@ 
 	 * @return bool
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
-		if ( ! $mode ) {
-			if ( $this->is_file($file) )
+		if ( ! $mode) {
+			if ($this->is_file($file))
 				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
+			elseif ($this->is_dir($file))
 				$mode = FS_CHMOD_DIR;
 			else
 				return false;
 		}
 
 		// chmod any sub-objects if recursive.
-		if ( $recursive && $this->is_dir($file) ) {
+		if ($recursive && $this->is_dir($file)) {
 			$filelist = $this->dirlist($file);
-			foreach ( (array)$filelist as $filename => $filemeta )
-				$this->chmod($file . '/' . $filename, $mode, $recursive);
+			foreach ((array) $filelist as $filename => $filemeta)
+				$this->chmod($file.'/'.$filename, $mode, $recursive);
 		}
 
 		// chmod the file or directory
-		if ( ! function_exists('ftp_chmod') )
-			return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
-		return (bool)@ftp_chmod($this->link, $mode, $file);
+		if ( ! function_exists('ftp_chmod'))
+			return (bool) @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+		return (bool) @ftp_chmod($this->link, $mode, $file);
 	}
 
 	/**
@@ -285,10 +285,10 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+		if ( ! $overwrite && $this->exists($destination))
 			return false;
 		$content = $this->get_contents($source);
-		if ( false === $content )
+		if (false === $content)
 			return false;
 		return $this->put_contents($destination, $content, $mode);
 	}
@@ -314,17 +314,17 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty($file) )
+		if (empty($file))
 			return false;
-		if ( 'f' == $type || $this->is_file($file) )
+		if ('f' == $type || $this->is_file($file))
 			return @ftp_delete($this->link, $file);
-		if ( !$recursive )
+		if ( ! $recursive)
 			return @ftp_rmdir($this->link, $file);
 
-		$filelist = $this->dirlist( trailingslashit($file) );
-		if ( !empty($filelist) )
-			foreach ( $filelist as $delete_file )
-				$this->delete( trailingslashit($file) . $delete_file['name'], $recursive, $delete_file['type'] );
+		$filelist = $this->dirlist(trailingslashit($file));
+		if ( ! empty($filelist))
+			foreach ($filelist as $delete_file)
+				$this->delete(trailingslashit($file).$delete_file['name'], $recursive, $delete_file['type']);
 		return @ftp_rmdir($this->link, $file);
 	}
 
@@ -337,11 +337,11 @@ 
 	public function exists($file) {
 		$list = @ftp_nlist($this->link, $file);
 
-		if ( empty( $list ) && $this->is_dir( $file ) ) {
+		if (empty($list) && $this->is_dir($file)) {
 			return true; // File is an empty directory.
 		}
 
-		return !empty($list); //empty list = no file, so invert.
+		return ! empty($list); //empty list = no file, so invert.
 	}
 
 	/**
@@ -351,7 +351,7 @@ 
 	 * @return bool
 	 */
 	public function is_file($file) {
-		return $this->exists($file) && !$this->is_dir($file);
+		return $this->exists($file) && ! $this->is_dir($file);
 	}
 
 	/**
@@ -362,8 +362,8 @@ 
 	 */
 	public function is_dir($path) {
 		$cwd = $this->cwd();
-		$result = @ftp_chdir($this->link, trailingslashit($path) );
-		if ( $result && $path == $this->cwd() || $this->cwd() != $cwd ) {
+		$result = @ftp_chdir($this->link, trailingslashit($path));
+		if ($result && $path == $this->cwd() || $this->cwd() != $cwd) {
 			@ftp_chdir($this->link, $cwd);
 			return true;
 		}
@@ -441,10 +441,10 @@ 
 	 */
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		$path = untrailingslashit($path);
-		if ( empty($path) )
+		if (empty($path))
 			return false;
 
-		if ( !@ftp_mkdir($this->link, $path) )
+		if ( ! @ftp_mkdir($this->link, $path))
 			return false;
 		$this->chmod($path, $chmod);
 		return true;
@@ -470,17 +470,17 @@ 
 	 */
 	public function parselisting($line) {
 		static $is_windows = null;
-		if ( is_null($is_windows) )
-			$is_windows = stripos( ftp_systype($this->link), 'win') !== false;
+		if (is_null($is_windows))
+			$is_windows = stripos(ftp_systype($this->link), 'win') !== false;
 
-		if ( $is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer) ) {
+		if ($is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer)) {
 			$b = array();
-			if ( $lucifer[3] < 70 )
-				$lucifer[3] +=2000;
+			if ($lucifer[3] < 70)
+				$lucifer[3] += 2000;
 			else
 				$lucifer[3] += 1900; // 4digit year fix
-			$b['isdir'] = ( $lucifer[7] == '<DIR>');
-			if ( $b['isdir'] )
+			$b['isdir'] = ($lucifer[7] == '<DIR>');
+			if ($b['isdir'])
 				$b['type'] = 'd';
 			else
 				$b['type'] = 'f';
@@ -493,27 +493,27 @@ 
 			$b['time'] = @mktime($lucifer[4] + (strcasecmp($lucifer[6], "PM") == 0 ? 12 : 0), $lucifer[5], 0, $lucifer[1], $lucifer[2], $lucifer[3]);
 			$b['am/pm'] = $lucifer[6];
 			$b['name'] = $lucifer[8];
-		} elseif ( !$is_windows && $lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY)) {
+		} elseif ( ! $is_windows && $lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY)) {
 			//echo $line."\n";
 			$lcount = count($lucifer);
-			if ( $lcount < 8 )
+			if ($lcount < 8)
 				return '';
 			$b = array();
 			$b['isdir'] = $lucifer[0]{0} === 'd';
 			$b['islink'] = $lucifer[0]{0} === 'l';
-			if ( $b['isdir'] )
+			if ($b['isdir'])
 				$b['type'] = 'd';
-			elseif ( $b['islink'] )
+			elseif ($b['islink'])
 				$b['type'] = 'l';
 			else
 				$b['type'] = 'f';
 			$b['perms'] = $lucifer[0];
-			$b['permsn'] = $this->getnumchmodfromh( $b['perms'] );
+			$b['permsn'] = $this->getnumchmodfromh($b['perms']);
 			$b['number'] = $lucifer[1];
 			$b['owner'] = $lucifer[2];
 			$b['group'] = $lucifer[3];
 			$b['size'] = $lucifer[4];
-			if ( $lcount == 8 ) {
+			if ($lcount == 8) {
 				sscanf($lucifer[5], '%d-%d-%d', $b['year'], $b['month'], $b['day']);
 				sscanf($lucifer[6], '%d:%d', $b['hour'], $b['minute']);
 				$b['time'] = @mktime($b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year']);
@@ -521,7 +521,7 @@ 
 			} else {
 				$b['month'] = $lucifer[5];
 				$b['day'] = $lucifer[6];
-				if ( preg_match('/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2) ) {
+				if (preg_match('/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2)) {
 					$b['year'] = date("Y");
 					$b['hour'] = $l2[1];
 					$b['minute'] = $l2[2];
@@ -530,14 +530,14 @@ 
 					$b['hour'] = 0;
 					$b['minute'] = 0;
 				}
-				$b['time'] = strtotime( sprintf('%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute']) );
+				$b['time'] = strtotime(sprintf('%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute']));
 				$b['name'] = $lucifer[8];
 			}
 		}
 
 		// Replace symlinks formatted as "source -> target" with just the source name
-		if ( isset( $b['islink'] ) && $b['islink'] ) {
-			$b['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $b['name'] );
+		if (isset($b['islink']) && $b['islink']) {
+			$b['name'] = preg_replace('/(\s*->\s*.*)$/', '', $b['name']);
 		}
 
 		return $b;
@@ -552,50 +552,50 @@ 
 	 * @return bool|array
 	 */
 	public function dirlist($path = '.', $include_hidden = true, $recursive = false) {
-		if ( $this->is_file($path) ) {
+		if ($this->is_file($path)) {
 			$limit_file = basename($path);
-			$path = dirname($path) . '/';
+			$path = dirname($path).'/';
 		} else {
 			$limit_file = false;
 		}
 
 		$pwd = @ftp_pwd($this->link);
-		if ( ! @ftp_chdir($this->link, $path) ) // Cant change to folder = folder doesn't exist
+		if ( ! @ftp_chdir($this->link, $path)) // Cant change to folder = folder doesn't exist
 			return false;
 		$list = @ftp_rawlist($this->link, '-a', false);
 		@ftp_chdir($this->link, $pwd);
 
-		if ( empty($list) ) // Empty array = non-existent folder (real folder will show . at least)
+		if (empty($list)) // Empty array = non-existent folder (real folder will show . at least)
 			return false;
 
 		$dirlist = array();
-		foreach ( $list as $k => $v ) {
+		foreach ($list as $k => $v) {
 			$entry = $this->parselisting($v);
-			if ( empty($entry) )
+			if (empty($entry))
 				continue;
 
-			if ( '.' == $entry['name'] || '..' == $entry['name'] )
+			if ('.' == $entry['name'] || '..' == $entry['name'])
 				continue;
 
-			if ( ! $include_hidden && '.' == $entry['name'][0] )
+			if ( ! $include_hidden && '.' == $entry['name'][0])
 				continue;
 
-			if ( $limit_file && $entry['name'] != $limit_file)
+			if ($limit_file && $entry['name'] != $limit_file)
 				continue;
 
-			$dirlist[ $entry['name'] ] = $entry;
+			$dirlist[$entry['name']] = $entry;
 		}
 
 		$ret = array();
-		foreach ( (array)$dirlist as $struc ) {
-			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+		foreach ((array) $dirlist as $struc) {
+			if ('d' == $struc['type']) {
+				if ($recursive)
+					$struc['files'] = $this->dirlist($path.'/'.$struc['name'], $include_hidden, $recursive);
 				else
 					$struc['files'] = array();
 			}
 
-			$ret[ $struc['name'] ] = $struc;
+			$ret[$struc['name']] = $struc;
 		}
 		return $ret;
 	}
@@ -604,7 +604,7 @@ 
 	 * @access public
 	 */
 	public function __destruct() {
-		if ( $this->link )
+		if ($this->link)
 			ftp_close($this->link);
 	}
 }

Braces +127 added lines, -90 removed lines

@@ -34,33 +34,39 @@ 
 
 		// This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
 
-		if ( ! defined('FS_TIMEOUT') )
-			define('FS_TIMEOUT', 240);
+		if ( ! defined('FS_TIMEOUT') ) {
+					define('FS_TIMEOUT', 240);
+		}
 
-		if ( empty($opt['port']) )
-			$this->options['port'] = 21;
-		else
-			$this->options['port'] = $opt['port'];
+		if ( empty($opt['port']) ) {
+					$this->options['port'] = 21;
+		} else {
+					$this->options['port'] = $opt['port'];
+		}
 
-		if ( empty($opt['hostname']) )
-			$this->errors->add('empty_hostname', __('FTP hostname is required'));
-		else
-			$this->options['hostname'] = $opt['hostname'];
+		if ( empty($opt['hostname']) ) {
+					$this->errors->add('empty_hostname', __('FTP hostname is required'));
+		} else {
+					$this->options['hostname'] = $opt['hostname'];
+		}
 
 		// Check if the options provided are OK.
-		if ( empty($opt['username']) )
-			$this->errors->add('empty_username', __('FTP username is required'));
-		else
-			$this->options['username'] = $opt['username'];
+		if ( empty($opt['username']) ) {
+					$this->errors->add('empty_username', __('FTP username is required'));
+		} else {
+					$this->options['username'] = $opt['username'];
+		}
 
-		if ( empty($opt['password']) )
-			$this->errors->add('empty_password', __('FTP password is required'));
-		else
-			$this->options['password'] = $opt['password'];
+		if ( empty($opt['password']) ) {
+					$this->errors->add('empty_password', __('FTP password is required'));
+		} else {
+					$this->options['password'] = $opt['password'];
+		}
 
 		$this->options['ssl'] = false;
-		if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] )
-			$this->options['ssl'] = true;
+		if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] ) {
+					$this->options['ssl'] = true;
+		}
 	}
 
 	/**
@@ -69,10 +75,11 @@ 
 	 * @return bool
 	 */
 	public function connect() {
-		if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
-			$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
-		else
-			$this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
+		if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') ) {
+					$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
+		} else {
+					$this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
+		}
 
 		if ( ! $this->link ) {
 			$this->errors->add( 'connect',
@@ -96,8 +103,9 @@ 
 
 		// Set the Connection to use Passive FTP
 		@ftp_pasv( $this->link, true );
-		if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT )
-			@ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
+		if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT ) {
+					@ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
+		}
 
 		return true;
 	}
@@ -130,8 +138,9 @@ 
 		fseek( $temp, 0 ); // Skip back to the start of the file being written to
 		$contents = '';
 
-		while ( ! feof($temp) )
-			$contents .= fread($temp, 8192);
+		while ( ! feof($temp) ) {
+					$contents .= fread($temp, 8192);
+		}
 
 		fclose($temp);
 		unlink($tempfile);
@@ -197,8 +206,9 @@ 
 	 */
 	public function cwd() {
 		$cwd = @ftp_pwd($this->link);
-		if ( $cwd )
-			$cwd = trailingslashit($cwd);
+		if ( $cwd ) {
+					$cwd = trailingslashit($cwd);
+		}
 		return $cwd;
 	}
 
@@ -222,24 +232,27 @@ 
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
 		if ( ! $mode ) {
-			if ( $this->is_file($file) )
-				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
-				$mode = FS_CHMOD_DIR;
-			else
-				return false;
+			if ( $this->is_file($file) ) {
+							$mode = FS_CHMOD_FILE;
+			} elseif ( $this->is_dir($file) ) {
+							$mode = FS_CHMOD_DIR;
+			} else {
+							return false;
+			}
 		}
 
 		// chmod any sub-objects if recursive.
 		if ( $recursive && $this->is_dir($file) ) {
 			$filelist = $this->dirlist($file);
-			foreach ( (array)$filelist as $filename => $filemeta )
-				$this->chmod($file . '/' . $filename, $mode, $recursive);
+			foreach ( (array)$filelist as $filename => $filemeta ) {
+							$this->chmod($file . '/' . $filename, $mode, $recursive);
+			}
 		}
 
 		// chmod the file or directory
-		if ( ! function_exists('ftp_chmod') )
-			return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+		if ( ! function_exists('ftp_chmod') ) {
+					return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+		}
 		return (bool)@ftp_chmod($this->link, $mode, $file);
 	}
 
@@ -285,11 +298,13 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
-			return false;
+		if ( ! $overwrite && $this->exists($destination) ) {
+					return false;
+		}
 		$content = $this->get_contents($source);
-		if ( false === $content )
-			return false;
+		if ( false === $content ) {
+					return false;
+		}
 		return $this->put_contents($destination, $content, $mode);
 	}
 
@@ -314,17 +329,21 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty($file) )
-			return false;
-		if ( 'f' == $type || $this->is_file($file) )
-			return @ftp_delete($this->link, $file);
-		if ( !$recursive )
-			return @ftp_rmdir($this->link, $file);
+		if ( empty($file) ) {
+					return false;
+		}
+		if ( 'f' == $type || $this->is_file($file) ) {
+					return @ftp_delete($this->link, $file);
+		}
+		if ( !$recursive ) {
+					return @ftp_rmdir($this->link, $file);
+		}
 
 		$filelist = $this->dirlist( trailingslashit($file) );
-		if ( !empty($filelist) )
-			foreach ( $filelist as $delete_file )
+		if ( !empty($filelist) ) {
+					foreach ( $filelist as $delete_file )
 				$this->delete( trailingslashit($file) . $delete_file['name'], $recursive, $delete_file['type'] );
+		}
 		return @ftp_rmdir($this->link, $file);
 	}
 
@@ -441,11 +460,13 @@ 
 	 */
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		$path = untrailingslashit($path);
-		if ( empty($path) )
-			return false;
+		if ( empty($path) ) {
+					return false;
+		}
 
-		if ( !@ftp_mkdir($this->link, $path) )
-			return false;
+		if ( !@ftp_mkdir($this->link, $path) ) {
+					return false;
+		}
 		$this->chmod($path, $chmod);
 		return true;
 	}
@@ -470,20 +491,24 @@ 
 	 */
 	public function parselisting($line) {
 		static $is_windows = null;
-		if ( is_null($is_windows) )
-			$is_windows = stripos( ftp_systype($this->link), 'win') !== false;
+		if ( is_null($is_windows) ) {
+					$is_windows = stripos( ftp_systype($this->link), 'win') !== false;
+		}
 
 		if ( $is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer) ) {
 			$b = array();
-			if ( $lucifer[3] < 70 )
-				$lucifer[3] +=2000;
-			else
-				$lucifer[3] += 1900; // 4digit year fix
+			if ( $lucifer[3] < 70 ) {
+							$lucifer[3] +=2000;
+			} else {
+							$lucifer[3] += 1900;
+			}
+			// 4digit year fix
 			$b['isdir'] = ( $lucifer[7] == '<DIR>');
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			else
-				$b['type'] = 'f';
+			if ( $b['isdir'] ) {
+							$b['type'] = 'd';
+			} else {
+							$b['type'] = 'f';
+			}
 			$b['size'] = $lucifer[7];
 			$b['month'] = $lucifer[1];
 			$b['day'] = $lucifer[2];
@@ -496,17 +521,19 @@ 
 		} elseif ( !$is_windows && $lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY)) {
 			//echo $line."\n";
 			$lcount = count($lucifer);
-			if ( $lcount < 8 )
-				return '';
+			if ( $lcount < 8 ) {
+							return '';
+			}
 			$b = array();
 			$b['isdir'] = $lucifer[0]{0} === 'd';
 			$b['islink'] = $lucifer[0]{0} === 'l';
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			elseif ( $b['islink'] )
-				$b['type'] = 'l';
-			else
-				$b['type'] = 'f';
+			if ( $b['isdir'] ) {
+							$b['type'] = 'd';
+			} elseif ( $b['islink'] ) {
+							$b['type'] = 'l';
+			} else {
+							$b['type'] = 'f';
+			}
 			$b['perms'] = $lucifer[0];
 			$b['permsn'] = $this->getnumchmodfromh( $b['perms'] );
 			$b['number'] = $lucifer[1];
@@ -560,28 +587,36 @@ 
 		}
 
 		$pwd = @ftp_pwd($this->link);
-		if ( ! @ftp_chdir($this->link, $path) ) // Cant change to folder = folder doesn't exist
+		if ( ! @ftp_chdir($this->link, $path) ) {
+			// Cant change to folder = folder doesn't exist
 			return false;
+		}
 		$list = @ftp_rawlist($this->link, '-a', false);
 		@ftp_chdir($this->link, $pwd);
 
-		if ( empty($list) ) // Empty array = non-existent folder (real folder will show . at least)
+		if ( empty($list) ) {
+			// Empty array = non-existent folder (real folder will show . at least)
 			return false;
+		}
 
 		$dirlist = array();
 		foreach ( $list as $k => $v ) {
 			$entry = $this->parselisting($v);
-			if ( empty($entry) )
-				continue;
+			if ( empty($entry) ) {
+							continue;
+			}
 
-			if ( '.' == $entry['name'] || '..' == $entry['name'] )
-				continue;
+			if ( '.' == $entry['name'] || '..' == $entry['name'] ) {
+							continue;
+			}
 
-			if ( ! $include_hidden && '.' == $entry['name'][0] )
-				continue;
+			if ( ! $include_hidden && '.' == $entry['name'][0] ) {
+							continue;
+			}
 
-			if ( $limit_file && $entry['name'] != $limit_file)
-				continue;
+			if ( $limit_file && $entry['name'] != $limit_file) {
+							continue;
+			}
 
 			$dirlist[ $entry['name'] ] = $entry;
 		}
@@ -589,10 +624,11 @@ 
 		$ret = array();
 		foreach ( (array)$dirlist as $struc ) {
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
-				else
-					$struc['files'] = array();
+				if ( $recursive ) {
+									$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+				} else {
+									$struc['files'] = array();
+				}
 			}
 
 			$ret[ $struc['name'] ] = $struc;
@@ -604,7 +640,8 @@ 
 	 * @access public
 	 */
 	public function __destruct() {
-		if ( $this->link )
-			ftp_close($this->link);
+		if ( $this->link ) {
+					ftp_close($this->link);
+		}
 	}
 }

src/wp-admin/includes/plugin.php

Spacing +436 added lines, -436 removed lines

@@ -65,7 +65,7 @@ 
  *     @type bool   $Network     Whether the plugin can only be activated network-wide.
  * }
  */
-function get_plugin_data( $plugin_file, $markup = true, $translate = true ) {
+function get_plugin_data($plugin_file, $markup = true, $translate = true) {
 
 	$default_headers = array(
 		'Name' => 'Plugin Name',
@@ -81,27 +81,27 @@ 
 		'_sitewide' => 'Site Wide Only',
 	);
 
-	$plugin_data = get_file_data( $plugin_file, $default_headers, 'plugin' );
+	$plugin_data = get_file_data($plugin_file, $default_headers, 'plugin');
 
 	// Site Wide Only is the old header for Network
-	if ( ! $plugin_data['Network'] && $plugin_data['_sitewide'] ) {
+	if ( ! $plugin_data['Network'] && $plugin_data['_sitewide']) {
 		/* translators: 1: Site Wide Only: true, 2: Network: true */
-		_deprecated_argument( __FUNCTION__, '3.0.0', sprintf( __( 'The %1$s plugin header is deprecated. Use %2$s instead.' ), '<code>Site Wide Only: true</code>', '<code>Network: true</code>' ) );
+		_deprecated_argument(__FUNCTION__, '3.0.0', sprintf(__('The %1$s plugin header is deprecated. Use %2$s instead.'), '<code>Site Wide Only: true</code>', '<code>Network: true</code>'));
 		$plugin_data['Network'] = $plugin_data['_sitewide'];
 	}
-	$plugin_data['Network'] = ( 'true' == strtolower( $plugin_data['Network'] ) );
-	unset( $plugin_data['_sitewide'] );
+	$plugin_data['Network'] = ('true' == strtolower($plugin_data['Network']));
+	unset($plugin_data['_sitewide']);
 
 	// If no text domain is defined fall back to the plugin slug.
-	if ( ! $plugin_data['TextDomain'] ) {
-		$plugin_slug = dirname( plugin_basename( $plugin_file ) );
-		if ( '.' !== $plugin_slug && false === strpos( $plugin_slug, '/' ) ) {
+	if ( ! $plugin_data['TextDomain']) {
+		$plugin_slug = dirname(plugin_basename($plugin_file));
+		if ('.' !== $plugin_slug && false === strpos($plugin_slug, '/')) {
 			$plugin_data['TextDomain'] = $plugin_slug;
 		}
 	}
 
-	if ( $markup || $translate ) {
-		$plugin_data = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup, $translate );
+	if ($markup || $translate) {
+		$plugin_data = _get_plugin_data_markup_translate($plugin_file, $plugin_data, $markup, $translate);
 	} else {
 		$plugin_data['Title']      = $plugin_data['Name'];
 		$plugin_data['AuthorName'] = $plugin_data['Author'];
@@ -117,66 +117,66 @@ 
  * @access private
  * @see get_plugin_data()
  */
-function _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup = true, $translate = true ) {
+function _get_plugin_data_markup_translate($plugin_file, $plugin_data, $markup = true, $translate = true) {
 
 	// Sanitize the plugin filename to a WP_PLUGIN_DIR relative path
-	$plugin_file = plugin_basename( $plugin_file );
+	$plugin_file = plugin_basename($plugin_file);
 
 	// Translate fields
-	if ( $translate ) {
-		if ( $textdomain = $plugin_data['TextDomain'] ) {
-			if ( ! is_textdomain_loaded( $textdomain ) ) {
-				if ( $plugin_data['DomainPath'] ) {
-					load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) . $plugin_data['DomainPath'] );
+	if ($translate) {
+		if ($textdomain = $plugin_data['TextDomain']) {
+			if ( ! is_textdomain_loaded($textdomain)) {
+				if ($plugin_data['DomainPath']) {
+					load_plugin_textdomain($textdomain, false, dirname($plugin_file).$plugin_data['DomainPath']);
 				} else {
-					load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) );
+					load_plugin_textdomain($textdomain, false, dirname($plugin_file));
 				}
 			}
-		} elseif ( 'hello.php' == basename( $plugin_file ) ) {
+		} elseif ('hello.php' == basename($plugin_file)) {
 			$textdomain = 'default';
 		}
-		if ( $textdomain ) {
-			foreach ( array( 'Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version' ) as $field )
-				$plugin_data[ $field ] = translate( $plugin_data[ $field ], $textdomain );
+		if ($textdomain) {
+			foreach (array('Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version') as $field)
+				$plugin_data[$field] = translate($plugin_data[$field], $textdomain);
 		}
 	}
 
 	// Sanitize fields
 	$allowed_tags = $allowed_tags_in_links = array(
-		'abbr'    => array( 'title' => true ),
-		'acronym' => array( 'title' => true ),
+		'abbr'    => array('title' => true),
+		'acronym' => array('title' => true),
 		'code'    => true,
 		'em'      => true,
 		'strong'  => true,
 	);
-	$allowed_tags['a'] = array( 'href' => true, 'title' => true );
+	$allowed_tags['a'] = array('href' => true, 'title' => true);
 
 	// Name is marked up inside <a> tags. Don't allow these.
 	// Author is too, but some plugins have used <a> here (omitting Author URI).
-	$plugin_data['Name']        = wp_kses( $plugin_data['Name'],        $allowed_tags_in_links );
-	$plugin_data['Author']      = wp_kses( $plugin_data['Author'],      $allowed_tags );
+	$plugin_data['Name']        = wp_kses($plugin_data['Name'], $allowed_tags_in_links);
+	$plugin_data['Author']      = wp_kses($plugin_data['Author'], $allowed_tags);
 
-	$plugin_data['Description'] = wp_kses( $plugin_data['Description'], $allowed_tags );
-	$plugin_data['Version']     = wp_kses( $plugin_data['Version'],     $allowed_tags );
+	$plugin_data['Description'] = wp_kses($plugin_data['Description'], $allowed_tags);
+	$plugin_data['Version']     = wp_kses($plugin_data['Version'], $allowed_tags);
 
-	$plugin_data['PluginURI']   = esc_url( $plugin_data['PluginURI'] );
-	$plugin_data['AuthorURI']   = esc_url( $plugin_data['AuthorURI'] );
+	$plugin_data['PluginURI']   = esc_url($plugin_data['PluginURI']);
+	$plugin_data['AuthorURI']   = esc_url($plugin_data['AuthorURI']);
 
 	$plugin_data['Title']      = $plugin_data['Name'];
 	$plugin_data['AuthorName'] = $plugin_data['Author'];
 
 	// Apply markup
-	if ( $markup ) {
-		if ( $plugin_data['PluginURI'] && $plugin_data['Name'] )
-			$plugin_data['Title'] = '<a href="' . $plugin_data['PluginURI'] . '">' . $plugin_data['Name'] . '</a>';
+	if ($markup) {
+		if ($plugin_data['PluginURI'] && $plugin_data['Name'])
+			$plugin_data['Title'] = '<a href="'.$plugin_data['PluginURI'].'">'.$plugin_data['Name'].'</a>';
 
-		if ( $plugin_data['AuthorURI'] && $plugin_data['Author'] )
-			$plugin_data['Author'] = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+		if ($plugin_data['AuthorURI'] && $plugin_data['Author'])
+			$plugin_data['Author'] = '<a href="'.$plugin_data['AuthorURI'].'">'.$plugin_data['Author'].'</a>';
 
-		$plugin_data['Description'] = wptexturize( $plugin_data['Description'] );
+		$plugin_data['Description'] = wptexturize($plugin_data['Description']);
 
-		if ( $plugin_data['Author'] )
-			$plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s.'), $plugin_data['Author'] ) . '</cite>';
+		if ($plugin_data['Author'])
+			$plugin_data['Description'] .= ' <cite>'.sprintf(__('By %s.'), $plugin_data['Author']).'</cite>';
 	}
 
 	return $plugin_data;
@@ -191,31 +191,31 @@ 
  * @return array List of files relative to the plugin root.
  */
 function get_plugin_files($plugin) {
-	$plugin_file = WP_PLUGIN_DIR . '/' . $plugin;
+	$plugin_file = WP_PLUGIN_DIR.'/'.$plugin;
 	$dir = dirname($plugin_file);
 	$plugin_files = array($plugin);
-	if ( is_dir($dir) && $dir != WP_PLUGIN_DIR ) {
-		$plugins_dir = @ opendir( $dir );
-		if ( $plugins_dir ) {
-			while (($file = readdir( $plugins_dir ) ) !== false ) {
-				if ( substr($file, 0, 1) == '.' )
+	if (is_dir($dir) && $dir != WP_PLUGIN_DIR) {
+		$plugins_dir = @ opendir($dir);
+		if ($plugins_dir) {
+			while (($file = readdir($plugins_dir)) !== false) {
+				if (substr($file, 0, 1) == '.')
 					continue;
-				if ( is_dir( $dir . '/' . $file ) ) {
-					$plugins_subdir = @ opendir( $dir . '/' . $file );
-					if ( $plugins_subdir ) {
-						while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
-							if ( substr($subfile, 0, 1) == '.' )
+				if (is_dir($dir.'/'.$file)) {
+					$plugins_subdir = @ opendir($dir.'/'.$file);
+					if ($plugins_subdir) {
+						while (($subfile = readdir($plugins_subdir)) !== false) {
+							if (substr($subfile, 0, 1) == '.')
 								continue;
 							$plugin_files[] = plugin_basename("$dir/$file/$subfile");
 						}
-						@closedir( $plugins_subdir );
+						@closedir($plugins_subdir);
 					}
 				} else {
-					if ( plugin_basename("$dir/$file") != $plugin )
+					if (plugin_basename("$dir/$file") != $plugin)
 						$plugin_files[] = plugin_basename("$dir/$file");
 				}
 			}
-			@closedir( $plugins_dir );
+			@closedir($plugins_dir);
 		}
 	}
 
@@ -244,61 +244,61 @@ 
  */
 function get_plugins($plugin_folder = '') {
 
-	if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') )
+	if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins'))
 		$cache_plugins = array();
 
-	if ( isset($cache_plugins[ $plugin_folder ]) )
-		return $cache_plugins[ $plugin_folder ];
+	if (isset($cache_plugins[$plugin_folder]))
+		return $cache_plugins[$plugin_folder];
 
-	$wp_plugins = array ();
+	$wp_plugins = array();
 	$plugin_root = WP_PLUGIN_DIR;
-	if ( !empty($plugin_folder) )
+	if ( ! empty($plugin_folder))
 		$plugin_root .= $plugin_folder;
 
 	// Files in wp-content/plugins directory
-	$plugins_dir = @ opendir( $plugin_root);
+	$plugins_dir = @ opendir($plugin_root);
 	$plugin_files = array();
-	if ( $plugins_dir ) {
-		while (($file = readdir( $plugins_dir ) ) !== false ) {
-			if ( substr($file, 0, 1) == '.' )
+	if ($plugins_dir) {
+		while (($file = readdir($plugins_dir)) !== false) {
+			if (substr($file, 0, 1) == '.')
 				continue;
-			if ( is_dir( $plugin_root.'/'.$file ) ) {
-				$plugins_subdir = @ opendir( $plugin_root.'/'.$file );
-				if ( $plugins_subdir ) {
-					while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
-						if ( substr($subfile, 0, 1) == '.' )
+			if (is_dir($plugin_root.'/'.$file)) {
+				$plugins_subdir = @ opendir($plugin_root.'/'.$file);
+				if ($plugins_subdir) {
+					while (($subfile = readdir($plugins_subdir)) !== false) {
+						if (substr($subfile, 0, 1) == '.')
 							continue;
-						if ( substr($subfile, -4) == '.php' )
+						if (substr($subfile, -4) == '.php')
 							$plugin_files[] = "$file/$subfile";
 					}
-					closedir( $plugins_subdir );
+					closedir($plugins_subdir);
 				}
 			} else {
-				if ( substr($file, -4) == '.php' )
+				if (substr($file, -4) == '.php')
 					$plugin_files[] = $file;
 			}
 		}
-		closedir( $plugins_dir );
+		closedir($plugins_dir);
 	}
 
-	if ( empty($plugin_files) )
+	if (empty($plugin_files))
 		return $wp_plugins;
 
-	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( "$plugin_root/$plugin_file" ) )
+	foreach ($plugin_files as $plugin_file) {
+		if ( ! is_readable("$plugin_root/$plugin_file"))
 			continue;
 
-		$plugin_data = get_plugin_data( "$plugin_root/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
+		$plugin_data = get_plugin_data("$plugin_root/$plugin_file", false, false); //Do not apply markup/translate as it'll be cached.
 
-		if ( empty ( $plugin_data['Name'] ) )
+		if (empty ($plugin_data['Name']))
 			continue;
 
-		$wp_plugins[plugin_basename( $plugin_file )] = $plugin_data;
+		$wp_plugins[plugin_basename($plugin_file)] = $plugin_data;
 	}
 
-	uasort( $wp_plugins, '_sort_uname_callback' );
+	uasort($wp_plugins, '_sort_uname_callback');
 
-	$cache_plugins[ $plugin_folder ] = $wp_plugins;
+	$cache_plugins[$plugin_folder] = $wp_plugins;
 	wp_cache_set('plugins', $cache_plugins, 'plugins');
 
 	return $wp_plugins;
@@ -317,38 +317,38 @@ 
 	// Files in wp-content/mu-plugins directory
 	$plugin_files = array();
 
-	if ( ! is_dir( WPMU_PLUGIN_DIR ) )
+	if ( ! is_dir(WPMU_PLUGIN_DIR))
 		return $wp_plugins;
-	if ( $plugins_dir = @ opendir( WPMU_PLUGIN_DIR ) ) {
-		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( substr( $file, -4 ) == '.php' )
+	if ($plugins_dir = @ opendir(WPMU_PLUGIN_DIR)) {
+		while (($file = readdir($plugins_dir)) !== false) {
+			if (substr($file, -4) == '.php')
 				$plugin_files[] = $file;
 		}
 	} else {
 		return $wp_plugins;
 	}
 
-	@closedir( $plugins_dir );
+	@closedir($plugins_dir);
 
-	if ( empty($plugin_files) )
+	if (empty($plugin_files))
 		return $wp_plugins;
 
-	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( WPMU_PLUGIN_DIR . "/$plugin_file" ) )
+	foreach ($plugin_files as $plugin_file) {
+		if ( ! is_readable(WPMU_PLUGIN_DIR."/$plugin_file"))
 			continue;
 
-		$plugin_data = get_plugin_data( WPMU_PLUGIN_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
+		$plugin_data = get_plugin_data(WPMU_PLUGIN_DIR."/$plugin_file", false, false); //Do not apply markup/translate as it'll be cached.
 
-		if ( empty ( $plugin_data['Name'] ) )
+		if (empty ($plugin_data['Name']))
 			$plugin_data['Name'] = $plugin_file;
 
-		$wp_plugins[ $plugin_file ] = $plugin_data;
+		$wp_plugins[$plugin_file] = $plugin_data;
 	}
 
-	if ( isset( $wp_plugins['index.php'] ) && filesize( WPMU_PLUGIN_DIR . '/index.php') <= 30 ) // silence is golden
-		unset( $wp_plugins['index.php'] );
+	if (isset($wp_plugins['index.php']) && filesize(WPMU_PLUGIN_DIR.'/index.php') <= 30) // silence is golden
+		unset($wp_plugins['index.php']);
 
-	uasort( $wp_plugins, '_sort_uname_callback' );
+	uasort($wp_plugins, '_sort_uname_callback');
 
 	return $wp_plugins;
 }
@@ -359,8 +359,8 @@ 
  * @since 3.1.0
  * @access private
  */
-function _sort_uname_callback( $a, $b ) {
-	return strnatcasecmp( $a['Name'], $b['Name'] );
+function _sort_uname_callback($a, $b) {
+	return strnatcasecmp($a['Name'], $b['Name']);
 }
 
 /**
@@ -376,30 +376,30 @@ 
 	$_dropins = _get_dropins();
 
 	// These exist in the wp-content directory
-	if ( $plugins_dir = @ opendir( WP_CONTENT_DIR ) ) {
-		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( isset( $_dropins[ $file ] ) )
+	if ($plugins_dir = @ opendir(WP_CONTENT_DIR)) {
+		while (($file = readdir($plugins_dir)) !== false) {
+			if (isset($_dropins[$file]))
 				$plugin_files[] = $file;
 		}
 	} else {
 		return $dropins;
 	}
 
-	@closedir( $plugins_dir );
+	@closedir($plugins_dir);
 
-	if ( empty($plugin_files) )
+	if (empty($plugin_files))
 		return $dropins;
 
-	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( WP_CONTENT_DIR . "/$plugin_file" ) )
+	foreach ($plugin_files as $plugin_file) {
+		if ( ! is_readable(WP_CONTENT_DIR."/$plugin_file"))
 			continue;
-		$plugin_data = get_plugin_data( WP_CONTENT_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
-		if ( empty( $plugin_data['Name'] ) )
+		$plugin_data = get_plugin_data(WP_CONTENT_DIR."/$plugin_file", false, false); //Do not apply markup/translate as it'll be cached.
+		if (empty($plugin_data['Name']))
 			$plugin_data['Name'] = $plugin_file;
-		$dropins[ $plugin_file ] = $plugin_data;
+		$dropins[$plugin_file] = $plugin_data;
 	}
 
-	uksort( $dropins, 'strnatcasecmp' );
+	uksort($dropins, 'strnatcasecmp');
 
 	return $dropins;
 }
@@ -416,19 +416,19 @@ 
  */
 function _get_dropins() {
 	$dropins = array(
-		'advanced-cache.php' => array( __( 'Advanced caching plugin.'       ), 'WP_CACHE' ), // WP_CACHE
-		'db.php'             => array( __( 'Custom database class.'         ), true ), // auto on load
-		'db-error.php'       => array( __( 'Custom database error message.' ), true ), // auto on error
-		'install.php'        => array( __( 'Custom install script.'         ), true ), // auto on install
-		'maintenance.php'    => array( __( 'Custom maintenance message.'    ), true ), // auto on maintenance
-		'object-cache.php'   => array( __( 'External object cache.'         ), true ), // auto on load
+		'advanced-cache.php' => array(__('Advanced caching plugin.'), 'WP_CACHE'), // WP_CACHE
+		'db.php'             => array(__('Custom database class.'), true), // auto on load
+		'db-error.php'       => array(__('Custom database error message.'), true), // auto on error
+		'install.php'        => array(__('Custom install script.'), true), // auto on install
+		'maintenance.php'    => array(__('Custom maintenance message.'), true), // auto on maintenance
+		'object-cache.php'   => array(__('External object cache.'), true), // auto on load
 	);
 
-	if ( is_multisite() ) {
-		$dropins['sunrise.php'       ] = array( __( 'Executed before Multisite is loaded.' ), 'SUNRISE' ); // SUNRISE
-		$dropins['blog-deleted.php'  ] = array( __( 'Custom site deleted message.'   ), true ); // auto on deleted blog
-		$dropins['blog-inactive.php' ] = array( __( 'Custom site inactive message.'  ), true ); // auto on inactive blog
-		$dropins['blog-suspended.php'] = array( __( 'Custom site suspended message.' ), true ); // auto on archived or spammed blog
+	if (is_multisite()) {
+		$dropins['sunrise.php'] = array(__('Executed before Multisite is loaded.'), 'SUNRISE'); // SUNRISE
+		$dropins['blog-deleted.php'] = array(__('Custom site deleted message.'), true); // auto on deleted blog
+		$dropins['blog-inactive.php'] = array(__('Custom site inactive message.'), true); // auto on inactive blog
+		$dropins['blog-suspended.php'] = array(__('Custom site suspended message.'), true); // auto on archived or spammed blog
 	}
 
 	return $dropins;
@@ -447,8 +447,8 @@ 
  * @param string $plugin Base plugin path from plugins directory.
  * @return bool True, if in the active plugins list. False, not in the list.
  */
-function is_plugin_active( $plugin ) {
-	return in_array( $plugin, (array) get_option( 'active_plugins', array() ) ) || is_plugin_active_for_network( $plugin );
+function is_plugin_active($plugin) {
+	return in_array($plugin, (array) get_option('active_plugins', array())) || is_plugin_active_for_network($plugin);
 }
 
 /**
@@ -462,8 +462,8 @@ 
  * @param string $plugin Base plugin path from plugins directory.
  * @return bool True if inactive. False if active.
  */
-function is_plugin_inactive( $plugin ) {
-	return ! is_plugin_active( $plugin );
+function is_plugin_inactive($plugin) {
+	return ! is_plugin_active($plugin);
 }
 
 /**
@@ -479,12 +479,12 @@ 
  * @param string $plugin Base plugin path from plugins directory.
  * @return bool True, if active for the network, otherwise false.
  */
-function is_plugin_active_for_network( $plugin ) {
-	if ( !is_multisite() )
+function is_plugin_active_for_network($plugin) {
+	if ( ! is_multisite())
 		return false;
 
-	$plugins = get_site_option( 'active_sitewide_plugins');
-	if ( isset($plugins[$plugin]) )
+	$plugins = get_site_option('active_sitewide_plugins');
+	if (isset($plugins[$plugin]))
 		return true;
 
 	return false;
@@ -502,9 +502,9 @@ 
  * @param string $plugin Plugin to check
  * @return bool True if plugin is network only, false otherwise.
  */
-function is_network_only_plugin( $plugin ) {
-	$plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
-	if ( $plugin_data )
+function is_network_only_plugin($plugin) {
+	$plugin_data = get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin);
+	if ($plugin_data)
 		return $plugin_data['Network'];
 	return false;
 }
@@ -536,31 +536,31 @@ 
  * @param bool   $silent       Optional. Whether to prevent calling activation hooks. Default false.
  * @return WP_Error|null WP_Error on invalid file or null on success.
  */
-function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silent = false ) {
-	$plugin = plugin_basename( trim( $plugin ) );
+function activate_plugin($plugin, $redirect = '', $network_wide = false, $silent = false) {
+	$plugin = plugin_basename(trim($plugin));
 
-	if ( is_multisite() && ( $network_wide || is_network_only_plugin($plugin) ) ) {
+	if (is_multisite() && ($network_wide || is_network_only_plugin($plugin))) {
 		$network_wide = true;
-		$current = get_site_option( 'active_sitewide_plugins', array() );
+		$current = get_site_option('active_sitewide_plugins', array());
 		$_GET['networkwide'] = 1; // Back compat for plugins looking for this value.
 	} else {
-		$current = get_option( 'active_plugins', array() );
+		$current = get_option('active_plugins', array());
 	}
 
 	$valid = validate_plugin($plugin);
-	if ( is_wp_error($valid) )
+	if (is_wp_error($valid))
 		return $valid;
 
-	if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current ) ) ) {
-		if ( !empty($redirect) )
-			wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
+	if (($network_wide && ! isset($current[$plugin])) || ( ! $network_wide && ! in_array($plugin, $current))) {
+		if ( ! empty($redirect))
+			wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_'.$plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
 		ob_start();
-		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
+		wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.$plugin);
 		$_wp_plugin_file = $plugin;
-		include_once( WP_PLUGIN_DIR . '/' . $plugin );
+		include_once(WP_PLUGIN_DIR.'/'.$plugin);
 		$plugin = $_wp_plugin_file; // Avoid stomping of the $plugin variable in a plugin.
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires before a plugin is activated.
 			 *
@@ -573,7 +573,7 @@ 
 			 * @param bool   $network_wide Whether to enable the plugin for all sites in the network
 			 *                             or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'activate_plugin', $plugin, $network_wide );
+			do_action('activate_plugin', $plugin, $network_wide);
 
 			/**
 			 * Fires as a specific plugin is being activated.
@@ -588,21 +588,21 @@ 
 			 * @param bool $network_wide Whether to enable the plugin for all sites in the network
 			 *                           or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'activate_' . $plugin, $network_wide );
+			do_action('activate_'.$plugin, $network_wide);
 		}
 
-		if ( $network_wide ) {
-			$current = get_site_option( 'active_sitewide_plugins', array() );
+		if ($network_wide) {
+			$current = get_site_option('active_sitewide_plugins', array());
 			$current[$plugin] = time();
-			update_site_option( 'active_sitewide_plugins', $current );
+			update_site_option('active_sitewide_plugins', $current);
 		} else {
-			$current = get_option( 'active_plugins', array() );
+			$current = get_option('active_plugins', array());
 			$current[] = $plugin;
 			sort($current);
 			update_option('active_plugins', $current);
 		}
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires after a plugin has been activated.
 			 *
@@ -615,10 +615,10 @@ 
 			 * @param bool   $network_wide Whether to enable the plugin for all sites in the network
 			 *                             or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'activated_plugin', $plugin, $network_wide );
+			do_action('activated_plugin', $plugin, $network_wide);
 		}
 
-		if ( ob_get_length() > 0 ) {
+		if (ob_get_length() > 0) {
 			$output = ob_get_clean();
 			return new WP_Error('unexpected_output', __('The plugin generated unexpected output.'), $output);
 		}
@@ -641,20 +641,20 @@ 
  * @param mixed $network_wide Whether to deactivate the plugin for all sites in the network.
  * 	A value of null (the default) will deactivate plugins for both the site and the network.
  */
-function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
-	if ( is_multisite() )
-		$network_current = get_site_option( 'active_sitewide_plugins', array() );
-	$current = get_option( 'active_plugins', array() );
+function deactivate_plugins($plugins, $silent = false, $network_wide = null) {
+	if (is_multisite())
+		$network_current = get_site_option('active_sitewide_plugins', array());
+	$current = get_option('active_plugins', array());
 	$do_blog = $do_network = false;
 
-	foreach ( (array) $plugins as $plugin ) {
-		$plugin = plugin_basename( trim( $plugin ) );
-		if ( ! is_plugin_active($plugin) )
+	foreach ((array) $plugins as $plugin) {
+		$plugin = plugin_basename(trim($plugin));
+		if ( ! is_plugin_active($plugin))
 			continue;
 
-		$network_deactivating = false !== $network_wide && is_plugin_active_for_network( $plugin );
+		$network_deactivating = false !== $network_wide && is_plugin_active_for_network($plugin);
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires before a plugin is deactivated.
 			 *
@@ -667,27 +667,27 @@ 
 			 * @param bool   $network_deactivating Whether the plugin is deactivated for all sites in the network
 			 *                                     or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'deactivate_plugin', $plugin, $network_deactivating );
+			do_action('deactivate_plugin', $plugin, $network_deactivating);
 		}
 
-		if ( false !== $network_wide ) {
-			if ( is_plugin_active_for_network( $plugin ) ) {
+		if (false !== $network_wide) {
+			if (is_plugin_active_for_network($plugin)) {
 				$do_network = true;
-				unset( $network_current[ $plugin ] );
-			} elseif ( $network_wide ) {
+				unset($network_current[$plugin]);
+			} elseif ($network_wide) {
 				continue;
 			}
 		}
 
-		if ( true !== $network_wide ) {
-			$key = array_search( $plugin, $current );
-			if ( false !== $key ) {
+		if (true !== $network_wide) {
+			$key = array_search($plugin, $current);
+			if (false !== $key) {
 				$do_blog = true;
-				unset( $current[ $key ] );
+				unset($current[$key]);
 			}
 		}
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires as a specific plugin is being deactivated.
 			 *
@@ -701,7 +701,7 @@ 
 			 * @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
 			 *                                   or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'deactivate_' . $plugin, $network_deactivating );
+			do_action('deactivate_'.$plugin, $network_deactivating);
 
 			/**
 			 * Fires after a plugin is deactivated.
@@ -715,14 +715,14 @@ 
 			 * @param bool   $network_deactivating Whether the plugin is deactivated for all sites in the network
 			 *                                     or just the current site. Multisite only. Default false.
 			 */
-			do_action( 'deactivated_plugin', $plugin, $network_deactivating );
+			do_action('deactivated_plugin', $plugin, $network_deactivating);
 		}
 	}
 
-	if ( $do_blog )
+	if ($do_blog)
 		update_option('active_plugins', $current);
-	if ( $do_network )
-		update_site_option( 'active_sitewide_plugins', $network_current );
+	if ($do_network)
+		update_site_option('active_sitewide_plugins', $network_current);
 }
 
 /**
@@ -741,20 +741,20 @@ 
  * @param bool $silent Prevent calling activation hooks. Default is false.
  * @return bool|WP_Error True when finished or WP_Error if there were errors during a plugin activation.
  */
-function activate_plugins( $plugins, $redirect = '', $network_wide = false, $silent = false ) {
-	if ( !is_array($plugins) )
+function activate_plugins($plugins, $redirect = '', $network_wide = false, $silent = false) {
+	if ( ! is_array($plugins))
 		$plugins = array($plugins);
 
 	$errors = array();
-	foreach ( $plugins as $plugin ) {
-		if ( !empty($redirect) )
+	foreach ($plugins as $plugin) {
+		if ( ! empty($redirect))
 			$redirect = add_query_arg('plugin', $plugin, $redirect);
 		$result = activate_plugin($plugin, $redirect, $network_wide, $silent);
-		if ( is_wp_error($result) )
+		if (is_wp_error($result))
 			$errors[$plugin] = $result;
 	}
 
-	if ( !empty($errors) )
+	if ( ! empty($errors))
 		return new WP_Error('plugins_invalid', __('One of the plugins is invalid.'), $errors);
 
 	return true;
@@ -772,67 +772,67 @@ 
  * @return bool|null|WP_Error True on success, false is $plugins is empty, WP_Error on failure.
  *                            Null if filesystem credentials are required to proceed.
  */
-function delete_plugins( $plugins, $deprecated = '' ) {
+function delete_plugins($plugins, $deprecated = '') {
 	global $wp_filesystem;
 
-	if ( empty($plugins) )
+	if (empty($plugins))
 		return false;
 
 	$checked = array();
-	foreach ( $plugins as $plugin )
-		$checked[] = 'checked[]=' . $plugin;
+	foreach ($plugins as $plugin)
+		$checked[] = 'checked[]='.$plugin;
 
-	$url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-plugins');
+	$url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&'.implode('&', $checked), 'bulk-plugins');
 
 	ob_start();
-	$credentials = request_filesystem_credentials( $url );
+	$credentials = request_filesystem_credentials($url);
 	$data = ob_get_clean();
 
-	if ( false === $credentials ) {
-		if ( ! empty($data) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+	if (false === $credentials) {
+		if ( ! empty($data)) {
+			include_once(ABSPATH.'wp-admin/admin-header.php');
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 		}
 		return;
 	}
 
-	if ( ! WP_Filesystem( $credentials ) ) {
+	if ( ! WP_Filesystem($credentials)) {
 		ob_start();
-		request_filesystem_credentials( $url, '', true ); // Failed to connect, Error and request again.
+		request_filesystem_credentials($url, '', true); // Failed to connect, Error and request again.
 		$data = ob_get_clean();
 
-		if ( ! empty($data) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty($data)) {
+			include_once(ABSPATH.'wp-admin/admin-header.php');
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 		}
 		return;
 	}
 
-	if ( ! is_object($wp_filesystem) )
+	if ( ! is_object($wp_filesystem))
 		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
+	if (is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code())
 		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
 
 	// Get the base plugin folder.
 	$plugins_dir = $wp_filesystem->wp_plugins_dir();
-	if ( empty( $plugins_dir ) ) {
-		return new WP_Error( 'fs_no_plugins_dir', __( 'Unable to locate WordPress plugin directory.' ) );
+	if (empty($plugins_dir)) {
+		return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress plugin directory.'));
 	}
 
-	$plugins_dir = trailingslashit( $plugins_dir );
+	$plugins_dir = trailingslashit($plugins_dir);
 
-	$plugin_translations = wp_get_installed_translations( 'plugins' );
+	$plugin_translations = wp_get_installed_translations('plugins');
 
 	$errors = array();
 
-	foreach ( $plugins as $plugin_file ) {
+	foreach ($plugins as $plugin_file) {
 		// Run Uninstall hook.
-		if ( is_uninstallable_plugin( $plugin_file ) ) {
+		if (is_uninstallable_plugin($plugin_file)) {
 			uninstall_plugin($plugin_file);
 		}
 
@@ -843,15 +843,15 @@ 
 		 *
 		 * @param string $plugin_file Plugin file name.
 		 */
-		do_action( 'delete_plugin', $plugin_file );
+		do_action('delete_plugin', $plugin_file);
 
-		$this_plugin_dir = trailingslashit( dirname( $plugins_dir . $plugin_file ) );
+		$this_plugin_dir = trailingslashit(dirname($plugins_dir.$plugin_file));
 
 		// If plugin is in its own directory, recursively delete the directory.
-		if ( strpos( $plugin_file, '/' ) && $this_plugin_dir != $plugins_dir ) { //base check on if plugin includes directory separator AND that it's not the root plugin folder
-			$deleted = $wp_filesystem->delete( $this_plugin_dir, true );
+		if (strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir) { //base check on if plugin includes directory separator AND that it's not the root plugin folder
+			$deleted = $wp_filesystem->delete($this_plugin_dir, true);
 		} else {
-			$deleted = $wp_filesystem->delete( $plugins_dir . $plugin_file );
+			$deleted = $wp_filesystem->delete($plugins_dir.$plugin_file);
 		}
 
 		/**
@@ -862,39 +862,39 @@ 
 		 * @param string $plugin_file Plugin file name.
 		 * @param bool   $deleted     Whether the plugin deletion was successful.
 		 */
-		do_action( 'deleted_plugin', $plugin_file, $deleted );
+		do_action('deleted_plugin', $plugin_file, $deleted);
 
-		if ( ! $deleted ) {
+		if ( ! $deleted) {
 			$errors[] = $plugin_file;
 			continue;
 		}
 
 		// Remove language files, silently.
-		$plugin_slug = dirname( $plugin_file );
-		if ( '.' !== $plugin_slug && ! empty( $plugin_translations[ $plugin_slug ] ) ) {
-			$translations = $plugin_translations[ $plugin_slug ];
+		$plugin_slug = dirname($plugin_file);
+		if ('.' !== $plugin_slug && ! empty($plugin_translations[$plugin_slug])) {
+			$translations = $plugin_translations[$plugin_slug];
 
-			foreach ( $translations as $translation => $data ) {
-				$wp_filesystem->delete( WP_LANG_DIR . '/plugins/' . $plugin_slug . '-' . $translation . '.po' );
-				$wp_filesystem->delete( WP_LANG_DIR . '/plugins/' . $plugin_slug . '-' . $translation . '.mo' );
+			foreach ($translations as $translation => $data) {
+				$wp_filesystem->delete(WP_LANG_DIR.'/plugins/'.$plugin_slug.'-'.$translation.'.po');
+				$wp_filesystem->delete(WP_LANG_DIR.'/plugins/'.$plugin_slug.'-'.$translation.'.mo');
 			}
 		}
 	}
 
 	// Remove deleted plugins from the plugin updates list.
-	if ( $current = get_site_transient('update_plugins') ) {
+	if ($current = get_site_transient('update_plugins')) {
 		// Don't remove the plugins that weren't deleted.
-		$deleted = array_diff( $plugins, $errors );
+		$deleted = array_diff($plugins, $errors);
 
-		foreach ( $deleted as $plugin_file ) {
-			unset( $current->response[ $plugin_file ] );
+		foreach ($deleted as $plugin_file) {
+			unset($current->response[$plugin_file]);
 		}
 
-		set_site_transient( 'update_plugins', $current );
+		set_site_transient('update_plugins', $current);
 	}
 
-	if ( ! empty($errors) )
-		return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) );
+	if ( ! empty($errors))
+		return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)));
 
 	return true;
 }
@@ -909,29 +909,29 @@ 
  * @return array invalid plugins, plugin as key, error as value
  */
 function validate_active_plugins() {
-	$plugins = get_option( 'active_plugins', array() );
+	$plugins = get_option('active_plugins', array());
 	// Validate vartype: array.
-	if ( ! is_array( $plugins ) ) {
-		update_option( 'active_plugins', array() );
+	if ( ! is_array($plugins)) {
+		update_option('active_plugins', array());
 		$plugins = array();
 	}
 
-	if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
-		$network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-		$plugins = array_merge( $plugins, array_keys( $network_plugins ) );
+	if (is_multisite() && current_user_can('manage_network_plugins')) {
+		$network_plugins = (array) get_site_option('active_sitewide_plugins', array());
+		$plugins = array_merge($plugins, array_keys($network_plugins));
 	}
 
-	if ( empty( $plugins ) )
+	if (empty($plugins))
 		return array();
 
 	$invalid = array();
 
 	// Invalid plugins get deactivated.
-	foreach ( $plugins as $plugin ) {
-		$result = validate_plugin( $plugin );
-		if ( is_wp_error( $result ) ) {
+	foreach ($plugins as $plugin) {
+		$result = validate_plugin($plugin);
+		if (is_wp_error($result)) {
 			$invalid[$plugin] = $result;
-			deactivate_plugins( $plugin, true );
+			deactivate_plugins($plugin, true);
 		}
 	}
 	return $invalid;
@@ -948,13 +948,13 @@ 
  * @return WP_Error|int 0 on success, WP_Error on failure.
  */
 function validate_plugin($plugin) {
-	if ( validate_file($plugin) )
+	if (validate_file($plugin))
 		return new WP_Error('plugin_invalid', __('Invalid plugin path.'));
-	if ( ! file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
+	if ( ! file_exists(WP_PLUGIN_DIR.'/'.$plugin))
 		return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));
 
 	$installed_plugins = get_plugins();
-	if ( ! isset($installed_plugins[$plugin]) )
+	if ( ! isset($installed_plugins[$plugin]))
 		return new WP_Error('no_plugin_header', __('The plugin does not have a valid header.'));
 	return 0;
 }
@@ -971,7 +971,7 @@ 
 	$file = plugin_basename($plugin);
 
 	$uninstallable_plugins = (array) get_option('uninstall_plugins');
-	if ( isset( $uninstallable_plugins[$file] ) || file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) )
+	if (isset($uninstallable_plugins[$file]) || file_exists(WP_PLUGIN_DIR.'/'.dirname($file).'/uninstall.php'))
 		return true;
 
 	return false;
@@ -1000,32 +1000,32 @@ 
 	 * @param string $plugin                Relative plugin path from plugin directory.
 	 * @param array  $uninstallable_plugins Uninstallable plugins.
 	 */
-	do_action( 'pre_uninstall_plugin', $plugin, $uninstallable_plugins );
+	do_action('pre_uninstall_plugin', $plugin, $uninstallable_plugins);
 
-	if ( file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) ) {
-		if ( isset( $uninstallable_plugins[$file] ) ) {
+	if (file_exists(WP_PLUGIN_DIR.'/'.dirname($file).'/uninstall.php')) {
+		if (isset($uninstallable_plugins[$file])) {
 			unset($uninstallable_plugins[$file]);
 			update_option('uninstall_plugins', $uninstallable_plugins);
 		}
 		unset($uninstallable_plugins);
 
 		define('WP_UNINSTALL_PLUGIN', $file);
-		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
-		include( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' );
+		wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.$file);
+		include(WP_PLUGIN_DIR.'/'.dirname($file).'/uninstall.php');
 
 		return true;
 	}
 
-	if ( isset( $uninstallable_plugins[$file] ) ) {
+	if (isset($uninstallable_plugins[$file])) {
 		$callable = $uninstallable_plugins[$file];
 		unset($uninstallable_plugins[$file]);
 		update_option('uninstall_plugins', $uninstallable_plugins);
 		unset($uninstallable_plugins);
 
-		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
-		include( WP_PLUGIN_DIR . '/' . $file );
+		wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.$file);
+		include(WP_PLUGIN_DIR.'/'.$file);
 
-		add_action( 'uninstall_' . $file, $callable );
+		add_action('uninstall_'.$file, $callable);
 
 		/**
 		 * Fires in uninstall_plugin() once the plugin has been uninstalled.
@@ -1035,7 +1035,7 @@ 
 		 *
 		 * @since 2.7.0
 		 */
-		do_action( 'uninstall_' . $file );
+		do_action('uninstall_'.$file);
 	}
 }
 
@@ -1071,35 +1071,35 @@ 
  * @param int      $position   The position in the menu order this one should appear.
  * @return string The resulting page's hook_suffix.
  */
-function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = null ) {
+function add_menu_page($page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = null) {
 	global $menu, $admin_page_hooks, $_registered_pages, $_parent_pages;
 
-	$menu_slug = plugin_basename( $menu_slug );
+	$menu_slug = plugin_basename($menu_slug);
 
-	$admin_page_hooks[$menu_slug] = sanitize_title( $menu_title );
+	$admin_page_hooks[$menu_slug] = sanitize_title($menu_title);
 
-	$hookname = get_plugin_page_hookname( $menu_slug, '' );
+	$hookname = get_plugin_page_hookname($menu_slug, '');
 
-	if ( !empty( $function ) && !empty( $hookname ) && current_user_can( $capability ) )
-		add_action( $hookname, $function );
+	if ( ! empty($function) && ! empty($hookname) && current_user_can($capability))
+		add_action($hookname, $function);
 
-	if ( empty($icon_url) ) {
+	if (empty($icon_url)) {
 		$icon_url = 'dashicons-admin-generic';
 		$icon_class = 'menu-icon-generic ';
 	} else {
-		$icon_url = set_url_scheme( $icon_url );
+		$icon_url = set_url_scheme($icon_url);
 		$icon_class = '';
 	}
 
-	$new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $icon_class . $hookname, $hookname, $icon_url );
+	$new_menu = array($menu_title, $capability, $menu_slug, $page_title, 'menu-top '.$icon_class.$hookname, $hookname, $icon_url);
 
-	if ( null === $position ) {
+	if (null === $position) {
 		$menu[] = $new_menu;
-	} elseif ( isset( $menu[ "$position" ] ) ) {
-	 	$position = $position + substr( base_convert( md5( $menu_slug . $menu_title ), 16, 10 ) , -5 ) * 0.00001;
-		$menu[ "$position" ] = $new_menu;
+	} elseif (isset($menu["$position"])) {
+	 	$position = $position + substr(base_convert(md5($menu_slug.$menu_title), 16, 10), -5) * 0.00001;
+		$menu["$position"] = $new_menu;
 	} else {
-		$menu[ $position ] = $new_menu;
+		$menu[$position] = $new_menu;
 	}
 
 	$_registered_pages[$hookname] = true;
@@ -1134,17 +1134,17 @@ 
  * @param callable $function    The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
+function add_submenu_page($parent_slug, $page_title, $menu_title, $capability, $menu_slug, $function = '') {
 	global $submenu, $menu, $_wp_real_parent_file, $_wp_submenu_nopriv,
 		$_registered_pages, $_parent_pages;
 
-	$menu_slug = plugin_basename( $menu_slug );
-	$parent_slug = plugin_basename( $parent_slug);
+	$menu_slug = plugin_basename($menu_slug);
+	$parent_slug = plugin_basename($parent_slug);
 
-	if ( isset( $_wp_real_parent_file[$parent_slug] ) )
+	if (isset($_wp_real_parent_file[$parent_slug]))
 		$parent_slug = $_wp_real_parent_file[$parent_slug];
 
-	if ( !current_user_can( $capability ) ) {
+	if ( ! current_user_can($capability)) {
 		$_wp_submenu_nopriv[$parent_slug][$menu_slug] = true;
 		return false;
 	}
@@ -1155,18 +1155,18 @@ 
 	 * parent file someone is trying to link back to the parent manually. In
 	 * this case, don't automatically add a link back to avoid duplication.
 	 */
-	if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
-		foreach ( (array)$menu as $parent_menu ) {
-			if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) )
-				$submenu[$parent_slug][] = array_slice( $parent_menu, 0, 4 );
+	if ( ! isset($submenu[$parent_slug]) && $menu_slug != $parent_slug) {
+		foreach ((array) $menu as $parent_menu) {
+			if ($parent_menu[2] == $parent_slug && current_user_can($parent_menu[1]))
+				$submenu[$parent_slug][] = array_slice($parent_menu, 0, 4);
 		}
 	}
 
-	$submenu[$parent_slug][] = array ( $menu_title, $capability, $menu_slug, $page_title );
+	$submenu[$parent_slug][] = array($menu_title, $capability, $menu_slug, $page_title);
 
-	$hookname = get_plugin_page_hookname( $menu_slug, $parent_slug);
-	if (!empty ( $function ) && !empty ( $hookname ))
-		add_action( $hookname, $function );
+	$hookname = get_plugin_page_hookname($menu_slug, $parent_slug);
+	if ( ! empty ($function) && ! empty ($hookname))
+		add_action($hookname, $function);
 
 	$_registered_pages[$hookname] = true;
 
@@ -1174,8 +1174,8 @@ 
 	 * Backward-compatibility for plugins using add_management page.
 	 * See wp-admin/admin.php for redirect from edit.php to tools.php
 	 */
-	if ( 'tools.php' == $parent_slug )
-		$_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
+	if ('tools.php' == $parent_slug)
+		$_registered_pages[get_plugin_page_hookname($menu_slug, 'edit.php')] = true;
 
 	// No parent as top level.
 	$_parent_pages[$menu_slug] = $parent_slug;
@@ -1199,8 +1199,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_management_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'tools.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_management_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('tools.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1219,8 +1219,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_options_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'options-general.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_options_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('options-general.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1239,8 +1239,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_theme_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'themes.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_theme_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('themes.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1259,8 +1259,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_plugins_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'plugins.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_plugins_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('plugins.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1279,12 +1279,12 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_users_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	if ( current_user_can('edit_users') )
+function add_users_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	if (current_user_can('edit_users'))
 		$parent = 'users.php';
 	else
 		$parent = 'profile.php';
-	return add_submenu_page( $parent, $page_title, $menu_title, $capability, $menu_slug, $function );
+	return add_submenu_page($parent, $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 /**
  * Add submenu page to the Dashboard main menu.
@@ -1302,8 +1302,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_dashboard_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'index.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_dashboard_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('index.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1322,8 +1322,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_posts_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'edit.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_posts_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('edit.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1342,8 +1342,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_media_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'upload.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_media_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('upload.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1362,8 +1362,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_links_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'link-manager.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_links_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('link-manager.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1382,8 +1382,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_pages_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'edit.php?post_type=page', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_pages_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('edit.php?post_type=page', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1402,8 +1402,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_comments_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'edit-comments.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_comments_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('edit-comments.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1416,12 +1416,12 @@ 
  * @param string $menu_slug The slug of the menu.
  * @return array|bool The removed menu on success, false if not found.
  */
-function remove_menu_page( $menu_slug ) {
+function remove_menu_page($menu_slug) {
 	global $menu;
 
-	foreach ( $menu as $i => $item ) {
-		if ( $menu_slug == $item[2] ) {
-			unset( $menu[$i] );
+	foreach ($menu as $i => $item) {
+		if ($menu_slug == $item[2]) {
+			unset($menu[$i]);
 			return $item;
 		}
 	}
@@ -1440,15 +1440,15 @@ 
  * @param string $submenu_slug The slug of the submenu.
  * @return array|bool The removed submenu on success, false if not found.
  */
-function remove_submenu_page( $menu_slug, $submenu_slug ) {
+function remove_submenu_page($menu_slug, $submenu_slug) {
 	global $submenu;
 
-	if ( !isset( $submenu[$menu_slug] ) )
+	if ( ! isset($submenu[$menu_slug]))
 		return false;
 
-	foreach ( $submenu[$menu_slug] as $i => $item ) {
-		if ( $submenu_slug == $item[2] ) {
-			unset( $submenu[$menu_slug][$i] );
+	foreach ($submenu[$menu_slug] as $i => $item) {
+		if ($submenu_slug == $item[2]) {
+			unset($submenu[$menu_slug][$i]);
 			return $item;
 		}
 	}
@@ -1472,12 +1472,12 @@ 
 function menu_page_url($menu_slug, $echo = true) {
 	global $_parent_pages;
 
-	if ( isset( $_parent_pages[$menu_slug] ) ) {
+	if (isset($_parent_pages[$menu_slug])) {
 		$parent_slug = $_parent_pages[$menu_slug];
-		if ( $parent_slug && ! isset( $_parent_pages[$parent_slug] ) ) {
-			$url = admin_url( add_query_arg( 'page', $menu_slug, $parent_slug ) );
+		if ($parent_slug && ! isset($_parent_pages[$parent_slug])) {
+			$url = admin_url(add_query_arg('page', $menu_slug, $parent_slug));
 		} else {
-			$url = admin_url( 'admin.php?page=' . $menu_slug );
+			$url = admin_url('admin.php?page='.$menu_slug);
 		}
 	} else {
 		$url = '';
@@ -1485,7 +1485,7 @@ 
 
 	$url = esc_url($url);
 
-	if ( $echo )
+	if ($echo)
 		echo $url;
 
 	return $url;
@@ -1506,58 +1506,58 @@ 
  * @global array $_wp_menu_nopriv
  * @global array $_wp_submenu_nopriv
  */
-function get_admin_page_parent( $parent = '' ) {
+function get_admin_page_parent($parent = '') {
 	global $parent_file, $menu, $submenu, $pagenow, $typenow,
 		$plugin_page, $_wp_real_parent_file, $_wp_menu_nopriv, $_wp_submenu_nopriv;
 
-	if ( !empty ( $parent ) && 'admin.php' != $parent ) {
-		if ( isset( $_wp_real_parent_file[$parent] ) )
+	if ( ! empty ($parent) && 'admin.php' != $parent) {
+		if (isset($_wp_real_parent_file[$parent]))
 			$parent = $_wp_real_parent_file[$parent];
 		return $parent;
 	}
 
-	if ( $pagenow == 'admin.php' && isset( $plugin_page ) ) {
-		foreach ( (array)$menu as $parent_menu ) {
-			if ( $parent_menu[2] == $plugin_page ) {
+	if ($pagenow == 'admin.php' && isset($plugin_page)) {
+		foreach ((array) $menu as $parent_menu) {
+			if ($parent_menu[2] == $plugin_page) {
 				$parent_file = $plugin_page;
-				if ( isset( $_wp_real_parent_file[$parent_file] ) )
+				if (isset($_wp_real_parent_file[$parent_file]))
 					$parent_file = $_wp_real_parent_file[$parent_file];
 				return $parent_file;
 			}
 		}
-		if ( isset( $_wp_menu_nopriv[$plugin_page] ) ) {
+		if (isset($_wp_menu_nopriv[$plugin_page])) {
 			$parent_file = $plugin_page;
-			if ( isset( $_wp_real_parent_file[$parent_file] ) )
+			if (isset($_wp_real_parent_file[$parent_file]))
 					$parent_file = $_wp_real_parent_file[$parent_file];
 			return $parent_file;
 		}
 	}
 
-	if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) ) {
+	if (isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page])) {
 		$parent_file = $pagenow;
-		if ( isset( $_wp_real_parent_file[$parent_file] ) )
+		if (isset($_wp_real_parent_file[$parent_file]))
 			$parent_file = $_wp_real_parent_file[$parent_file];
 		return $parent_file;
 	}
 
-	foreach (array_keys( (array)$submenu ) as $parent) {
-		foreach ( $submenu[$parent] as $submenu_array ) {
-			if ( isset( $_wp_real_parent_file[$parent] ) )
+	foreach (array_keys((array) $submenu) as $parent) {
+		foreach ($submenu[$parent] as $submenu_array) {
+			if (isset($_wp_real_parent_file[$parent]))
 				$parent = $_wp_real_parent_file[$parent];
-			if ( !empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow") ) {
+			if ( ! empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow")) {
 				$parent_file = $parent;
 				return $parent;
-			} elseif ( $submenu_array[2] == $pagenow && empty($typenow) && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
+			} elseif ($submenu_array[2] == $pagenow && empty($typenow) && (empty($parent_file) || false === strpos($parent_file, '?'))) {
 				$parent_file = $parent;
 				return $parent;
-			} elseif ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) ) {
+			} elseif (isset($plugin_page) && ($plugin_page == $submenu_array[2])) {
 				$parent_file = $parent;
 				return $parent;
 			}
 		}
 	}
 
-	if ( empty($parent_file) )
+	if (empty($parent_file))
 		$parent_file = '';
 	return '';
 }
@@ -1574,20 +1574,20 @@ 
 function get_admin_page_title() {
 	global $title, $menu, $submenu, $pagenow, $plugin_page, $typenow;
 
-	if ( ! empty ( $title ) )
+	if ( ! empty ($title))
 		return $title;
 
-	$hook = get_plugin_page_hook( $plugin_page, $pagenow );
+	$hook = get_plugin_page_hook($plugin_page, $pagenow);
 
 	$parent = $parent1 = get_admin_page_parent();
 
-	if ( empty ( $parent) ) {
-		foreach ( (array)$menu as $menu_array ) {
-			if ( isset( $menu_array[3] ) ) {
-				if ( $menu_array[2] == $pagenow ) {
+	if (empty ($parent)) {
+		foreach ((array) $menu as $menu_array) {
+			if (isset($menu_array[3])) {
+				if ($menu_array[2] == $pagenow) {
 					$title = $menu_array[3];
 					return $menu_array[3];
-				} elseif ( isset( $plugin_page ) && ($plugin_page == $menu_array[2] ) && ($hook == $menu_array[3] ) ) {
+				} elseif (isset($plugin_page) && ($plugin_page == $menu_array[2]) && ($hook == $menu_array[3])) {
 					$title = $menu_array[3];
 					return $menu_array[3];
 				}
@@ -1597,26 +1597,26 @@ 
 			}
 		}
 	} else {
-		foreach ( array_keys( $submenu ) as $parent ) {
-			foreach ( $submenu[$parent] as $submenu_array ) {
-				if ( isset( $plugin_page ) &&
-					( $plugin_page == $submenu_array[2] ) &&
+		foreach (array_keys($submenu) as $parent) {
+			foreach ($submenu[$parent] as $submenu_array) {
+				if (isset($plugin_page) &&
+					($plugin_page == $submenu_array[2]) &&
 					(
-						( $parent == $pagenow ) ||
-						( $parent == $plugin_page ) ||
-						( $plugin_page == $hook ) ||
-						( $pagenow == 'admin.php' && $parent1 != $submenu_array[2] ) ||
-						( !empty($typenow) && $parent == $pagenow . '?post_type=' . $typenow)
+						($parent == $pagenow) ||
+						($parent == $plugin_page) ||
+						($plugin_page == $hook) ||
+						($pagenow == 'admin.php' && $parent1 != $submenu_array[2]) ||
+						( ! empty($typenow) && $parent == $pagenow.'?post_type='.$typenow)
 					)
 					) {
 						$title = $submenu_array[3];
 						return $submenu_array[3];
 					}
 
-				if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) // not the current page
+				if ($submenu_array[2] != $pagenow || isset($_GET['page'])) // not the current page
 					continue;
 
-				if ( isset( $submenu_array[3] ) ) {
+				if (isset($submenu_array[3])) {
 					$title = $submenu_array[3];
 					return $submenu_array[3];
 				} else {
@@ -1625,12 +1625,12 @@ 
 				}
 			}
 		}
-		if ( empty ( $title ) ) {
-			foreach ( $menu as $menu_array ) {
-				if ( isset( $plugin_page ) &&
-					( $plugin_page == $menu_array[2] ) &&
-					( $pagenow == 'admin.php' ) &&
-					( $parent1 == $menu_array[2] ) )
+		if (empty ($title)) {
+			foreach ($menu as $menu_array) {
+				if (isset($plugin_page) &&
+					($plugin_page == $menu_array[2]) &&
+					($pagenow == 'admin.php') &&
+					($parent1 == $menu_array[2]))
 					{
 						$title = $menu_array[3];
 						return $menu_array[3];
@@ -1649,9 +1649,9 @@ 
  * @param string $parent_page
  * @return string|null
  */
-function get_plugin_page_hook( $plugin_page, $parent_page ) {
-	$hook = get_plugin_page_hookname( $plugin_page, $parent_page );
-	if ( has_action($hook) )
+function get_plugin_page_hook($plugin_page, $parent_page) {
+	$hook = get_plugin_page_hookname($plugin_page, $parent_page);
+	if (has_action($hook))
 		return $hook;
 	else
 		return null;
@@ -1663,25 +1663,25 @@ 
  * @param string $plugin_page
  * @param string $parent_page
  */
-function get_plugin_page_hookname( $plugin_page, $parent_page ) {
+function get_plugin_page_hookname($plugin_page, $parent_page) {
 	global $admin_page_hooks;
 
-	$parent = get_admin_page_parent( $parent_page );
+	$parent = get_admin_page_parent($parent_page);
 
 	$page_type = 'admin';
-	if ( empty ( $parent_page ) || 'admin.php' == $parent_page || isset( $admin_page_hooks[$plugin_page] ) ) {
-		if ( isset( $admin_page_hooks[$plugin_page] ) ) {
+	if (empty ($parent_page) || 'admin.php' == $parent_page || isset($admin_page_hooks[$plugin_page])) {
+		if (isset($admin_page_hooks[$plugin_page])) {
 			$page_type = 'toplevel';
-		} elseif ( isset( $admin_page_hooks[$parent] )) {
+		} elseif (isset($admin_page_hooks[$parent])) {
 			$page_type = $admin_page_hooks[$parent];
 		}
-	} elseif ( isset( $admin_page_hooks[$parent] ) ) {
+	} elseif (isset($admin_page_hooks[$parent])) {
 		$page_type = $admin_page_hooks[$parent];
 	}
 
-	$plugin_name = preg_replace( '!\.php!', '', $plugin_page );
+	$plugin_name = preg_replace('!\.php!', '', $plugin_page);
 
-	return $page_type . '_page_' . $plugin_name;
+	return $page_type.'_page_'.$plugin_name;
 }
 
 /**
@@ -1700,49 +1700,49 @@ 
 
 	$parent = get_admin_page_parent();
 
-	if ( !isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$pagenow] ) )
+	if ( ! isset($plugin_page) && isset($_wp_submenu_nopriv[$parent][$pagenow]))
 		return false;
 
-	if ( isset( $plugin_page ) ) {
-		if ( isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
+	if (isset($plugin_page)) {
+		if (isset($_wp_submenu_nopriv[$parent][$plugin_page]))
 			return false;
 
 		$hookname = get_plugin_page_hookname($plugin_page, $parent);
 
-		if ( !isset($_registered_pages[$hookname]) )
+		if ( ! isset($_registered_pages[$hookname]))
 			return false;
 	}
 
-	if ( empty( $parent) ) {
-		if ( isset( $_wp_menu_nopriv[$pagenow] ) )
+	if (empty($parent)) {
+		if (isset($_wp_menu_nopriv[$pagenow]))
 			return false;
-		if ( isset( $_wp_submenu_nopriv[$pagenow][$pagenow] ) )
+		if (isset($_wp_submenu_nopriv[$pagenow][$pagenow]))
 			return false;
-		if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) )
+		if (isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page]))
 			return false;
-		if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
+		if (isset($plugin_page) && isset($_wp_menu_nopriv[$plugin_page]))
 			return false;
-		foreach (array_keys( $_wp_submenu_nopriv ) as $key ) {
-			if ( isset( $_wp_submenu_nopriv[$key][$pagenow] ) )
+		foreach (array_keys($_wp_submenu_nopriv) as $key) {
+			if (isset($_wp_submenu_nopriv[$key][$pagenow]))
 				return false;
-			if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
+			if (isset($plugin_page) && isset($_wp_submenu_nopriv[$key][$plugin_page]))
 			return false;
 		}
 		return true;
 	}
 
-	if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
+	if (isset($plugin_page) && ($plugin_page == $parent) && isset($_wp_menu_nopriv[$plugin_page]))
 		return false;
 
-	if ( isset( $submenu[$parent] ) ) {
-		foreach ( $submenu[$parent] as $submenu_array ) {
-			if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {
-				if ( current_user_can( $submenu_array[1] ))
+	if (isset($submenu[$parent])) {
+		foreach ($submenu[$parent] as $submenu_array) {
+			if (isset($plugin_page) && ($submenu_array[2] == $plugin_page)) {
+				if (current_user_can($submenu_array[1]))
 					return true;
 				else
 					return false;
-			} elseif ( $submenu_array[2] == $pagenow ) {
-				if ( current_user_can( $submenu_array[1] ))
+			} elseif ($submenu_array[2] == $pagenow) {
+				if (current_user_can($submenu_array[1]))
 					return true;
 				else
 					return false;
@@ -1750,9 +1750,9 @@ 
 		}
 	}
 
-	foreach ( $menu as $menu_array ) {
-		if ( $menu_array[2] == $parent) {
-			if ( current_user_can( $menu_array[1] ))
+	foreach ($menu as $menu_array) {
+		if ($menu_array[2] == $parent) {
+			if (current_user_can($menu_array[1]))
 				return true;
 			else
 				return false;
@@ -1776,22 +1776,22 @@ 
  * @param string $option_name The name of an option to sanitize and save.
  * @param callable $sanitize_callback A callback function that sanitizes the option's value.
  */
-function register_setting( $option_group, $option_name, $sanitize_callback = '' ) {
+function register_setting($option_group, $option_name, $sanitize_callback = '') {
 	global $new_whitelist_options;
 
-	if ( 'misc' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
+	if ('misc' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.0.0', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'misc'));
 		$option_group = 'general';
 	}
 
-	if ( 'privacy' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
+	if ('privacy' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.5.0', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'privacy'));
 		$option_group = 'reading';
 	}
 
-	$new_whitelist_options[ $option_group ][] = $option_name;
-	if ( $sanitize_callback != '' )
-		add_filter( "sanitize_option_{$option_name}", $sanitize_callback );
+	$new_whitelist_options[$option_group][] = $option_name;
+	if ($sanitize_callback != '')
+		add_filter("sanitize_option_{$option_name}", $sanitize_callback);
 }
 
 /**
@@ -1805,24 +1805,24 @@ 
  * @param string   $option_name
  * @param callable $sanitize_callback
  */
-function unregister_setting( $option_group, $option_name, $sanitize_callback = '' ) {
+function unregister_setting($option_group, $option_name, $sanitize_callback = '') {
 	global $new_whitelist_options;
 
-	if ( 'misc' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
+	if ('misc' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.0.0', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'misc'));
 		$option_group = 'general';
 	}
 
-	if ( 'privacy' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
+	if ('privacy' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.5.0', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'privacy'));
 		$option_group = 'reading';
 	}
 
-	$pos = array_search( $option_name, (array) $new_whitelist_options[ $option_group ] );
-	if ( $pos !== false )
-		unset( $new_whitelist_options[ $option_group ][ $pos ] );
-	if ( $sanitize_callback != '' )
-		remove_filter( "sanitize_option_{$option_name}", $sanitize_callback );
+	$pos = array_search($option_name, (array) $new_whitelist_options[$option_group]);
+	if ($pos !== false)
+		unset($new_whitelist_options[$option_group][$pos]);
+	if ($sanitize_callback != '')
+		remove_filter("sanitize_option_{$option_name}", $sanitize_callback);
 }
 
 /**
@@ -1837,11 +1837,11 @@ 
  * @param array $options
  * @return array
  */
-function option_update_filter( $options ) {
+function option_update_filter($options) {
 	global $new_whitelist_options;
 
-	if ( is_array( $new_whitelist_options ) )
-		$options = add_option_whitelist( $new_whitelist_options, $options );
+	if (is_array($new_whitelist_options))
+		$options = add_option_whitelist($new_whitelist_options, $options);
 
 	return $options;
 }
@@ -1857,21 +1857,21 @@ 
  * @param string|array $options
  * @return array
  */
-function add_option_whitelist( $new_options, $options = '' ) {
-	if ( $options == '' )
+function add_option_whitelist($new_options, $options = '') {
+	if ($options == '')
 		global $whitelist_options;
 	else
 		$whitelist_options = $options;
 
-	foreach ( $new_options as $page => $keys ) {
-		foreach ( $keys as $key ) {
-			if ( !isset($whitelist_options[ $page ]) || !is_array($whitelist_options[ $page ]) ) {
-				$whitelist_options[ $page ] = array();
-				$whitelist_options[ $page ][] = $key;
+	foreach ($new_options as $page => $keys) {
+		foreach ($keys as $key) {
+			if ( ! isset($whitelist_options[$page]) || ! is_array($whitelist_options[$page])) {
+				$whitelist_options[$page] = array();
+				$whitelist_options[$page][] = $key;
 			} else {
-				$pos = array_search( $key, $whitelist_options[ $page ] );
-				if ( $pos === false )
-					$whitelist_options[ $page ][] = $key;
+				$pos = array_search($key, $whitelist_options[$page]);
+				if ($pos === false)
+					$whitelist_options[$page][] = $key;
 			}
 		}
 	}
@@ -1890,18 +1890,18 @@ 
  * @param string|array $options
  * @return array
  */
-function remove_option_whitelist( $del_options, $options = '' ) {
-	if ( $options == '' )
+function remove_option_whitelist($del_options, $options = '') {
+	if ($options == '')
 		global $whitelist_options;
 	else
 		$whitelist_options = $options;
 
-	foreach ( $del_options as $page => $keys ) {
-		foreach ( $keys as $key ) {
-			if ( isset($whitelist_options[ $page ]) && is_array($whitelist_options[ $page ]) ) {
-				$pos = array_search( $key, $whitelist_options[ $page ] );
-				if ( $pos !== false )
-					unset( $whitelist_options[ $page ][ $pos ] );
+	foreach ($del_options as $page => $keys) {
+		foreach ($keys as $key) {
+			if (isset($whitelist_options[$page]) && is_array($whitelist_options[$page])) {
+				$pos = array_search($key, $whitelist_options[$page]);
+				if ($pos !== false)
+					unset($whitelist_options[$page][$pos]);
 			}
 		}
 	}
@@ -1917,7 +1917,7 @@ 
  * @param string $option_group A settings group name. This should match the group name used in register_setting().
  */
 function settings_fields($option_group) {
-	echo "<input type='hidden' name='option_page' value='" . esc_attr($option_group) . "' />";
+	echo "<input type='hidden' name='option_page' value='".esc_attr($option_group)."' />";
 	echo '<input type="hidden" name="action" value="update" />';
 	wp_nonce_field("$option_group-options");
 }
@@ -1929,16 +1929,16 @@ 
  *
  * @param bool $clear_update_cache Whether to clear the Plugin updates cache
  */
-function wp_clean_plugins_cache( $clear_update_cache = true ) {
-	if ( $clear_update_cache )
-		delete_site_transient( 'update_plugins' );
-	wp_cache_delete( 'plugins', 'plugins' );
+function wp_clean_plugins_cache($clear_update_cache = true) {
+	if ($clear_update_cache)
+		delete_site_transient('update_plugins');
+	wp_cache_delete('plugins', 'plugins');
 }
 
 /**
  * @param string $plugin
  */
-function plugin_sandbox_scrape( $plugin ) {
-	wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
-	include( WP_PLUGIN_DIR . '/' . $plugin );
+function plugin_sandbox_scrape($plugin) {
+	wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.$plugin);
+	include(WP_PLUGIN_DIR.'/'.$plugin);
 }

src/wp-admin/includes/meta-boxes.php

Spacing +207 added lines, -207 removed lines

@@ -19,7 +19,7 @@ 
  *     @type array    $args     Extra meta box arguments.
  * }
  */
-function post_submit_meta_box( $post, $args = array() ) {
+function post_submit_meta_box($post, $args = array()) {
 	global $action;
 
 	$post_type = $post->post_type;
@@ -32,27 +32,27 @@ 
 
 <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
 <div style="display:none;">
-<?php submit_button( __( 'Save' ), 'button', 'save' ); ?>
+<?php submit_button(__('Save'), 'button', 'save'); ?>
 </div>
 
 <div id="minor-publishing-actions">
 <div id="save-action">
-<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?>
-<input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save Draft'); ?>" class="button" />
+<?php if ('publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status) { ?>
+<input <?php if ('private' == $post->post_status) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save Draft'); ?>" class="button" />
 <span class="spinner"></span>
-<?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
+<?php } elseif ('pending' == $post->post_status && $can_publish) { ?>
 <input type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save as Pending'); ?>" class="button" />
 <span class="spinner"></span>
 <?php } ?>
 </div>
-<?php if ( is_post_type_viewable( $post_type_object ) ) : ?>
+<?php if (is_post_type_viewable($post_type_object)) : ?>
 <div id="preview-action">
 <?php
-$preview_link = esc_url( get_preview_post_link( $post ) );
-if ( 'publish' == $post->post_status ) {
-	$preview_button = __( 'Preview Changes' );
+$preview_link = esc_url(get_preview_post_link($post));
+if ('publish' == $post->post_status) {
+	$preview_button = __('Preview Changes');
 } else {
-	$preview_button = __( 'Preview' );
+	$preview_button = __('Preview');
 }
 ?>
 <a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview-<?php echo (int) $post->ID; ?>" id="post-preview"><?php echo $preview_button; ?></a>
@@ -67,7 +67,7 @@ 
  *
  * @param WP_Post $post WP_Post object for the current post.
  */
-do_action( 'post_submitbox_minor_actions', $post );
+do_action('post_submitbox_minor_actions', $post);
 ?>
 <div class="clear"></div>
 </div><!-- #minor-publishing-actions -->
@@ -77,7 +77,7 @@ 
 <div class="misc-pub-section misc-pub-post-status"><label for="post_status"><?php _e('Status:') ?></label>
 <span id="post-status-display">
 <?php
-switch ( $post->post_status ) {
+switch ($post->post_status) {
 	case 'private':
 		_e('Privately Published');
 		break;
@@ -97,24 +97,24 @@ 
 }
 ?>
 </span>
-<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?>
-<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit status' ); ?></span></a>
+<?php if ('publish' == $post->post_status || 'private' == $post->post_status || $can_publish) { ?>
+<a href="#post_status" <?php if ('private' == $post->post_status) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js"><span aria-hidden="true"><?php _e('Edit'); ?></span> <span class="screen-reader-text"><?php _e('Edit status'); ?></span></a>
 
 <div id="post-status-select" class="hide-if-js">
-<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr( ('auto-draft' == $post->post_status ) ? 'draft' : $post->post_status); ?>" />
+<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr(('auto-draft' == $post->post_status) ? 'draft' : $post->post_status); ?>" />
 <select name='post_status' id='post_status'>
-<?php if ( 'publish' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e('Published') ?></option>
-<?php elseif ( 'private' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e('Privately Published') ?></option>
-<?php elseif ( 'future' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>
+<?php if ('publish' == $post->post_status) : ?>
+<option<?php selected($post->post_status, 'publish'); ?> value='publish'><?php _e('Published') ?></option>
+<?php elseif ('private' == $post->post_status) : ?>
+<option<?php selected($post->post_status, 'private'); ?> value='publish'><?php _e('Privately Published') ?></option>
+<?php elseif ('future' == $post->post_status) : ?>
+<option<?php selected($post->post_status, 'future'); ?> value='future'><?php _e('Scheduled') ?></option>
 <?php endif; ?>
-<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
-<?php if ( 'auto-draft' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+<option<?php selected($post->post_status, 'pending'); ?> value='pending'><?php _e('Pending Review') ?></option>
+<?php if ('auto-draft' == $post->post_status) : ?>
+<option<?php selected($post->post_status, 'auto-draft'); ?> value='draft'><?php _e('Draft') ?></option>
 <?php else : ?>
-<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+<option<?php selected($post->post_status, 'draft'); ?> value='draft'><?php _e('Draft') ?></option>
 <?php endif; ?>
 </select>
  <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
@@ -127,14 +127,14 @@ 
 <div class="misc-pub-section misc-pub-visibility" id="visibility">
 <?php _e('Visibility:'); ?> <span id="post-visibility-display"><?php
 
-if ( 'private' == $post->post_status ) {
+if ('private' == $post->post_status) {
 	$post->post_password = '';
 	$visibility = 'private';
 	$visibility_trans = __('Private');
-} elseif ( !empty( $post->post_password ) ) {
+} elseif ( ! empty($post->post_password)) {
 	$visibility = 'password';
 	$visibility_trans = __('Password protected');
-} elseif ( $post_type == 'post' && is_sticky( $post->ID ) ) {
+} elseif ($post_type == 'post' && is_sticky($post->ID)) {
 	$visibility = 'public';
 	$visibility_trans = __('Public, Sticky');
 } else {
@@ -142,23 +142,23 @@ 
 	$visibility_trans = __('Public');
 }
 
-echo esc_html( $visibility_trans ); ?></span>
-<?php if ( $can_publish ) { ?>
-<a href="#visibility" class="edit-visibility hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit visibility' ); ?></span></a>
+echo esc_html($visibility_trans); ?></span>
+<?php if ($can_publish) { ?>
+<a href="#visibility" class="edit-visibility hide-if-no-js"><span aria-hidden="true"><?php _e('Edit'); ?></span> <span class="screen-reader-text"><?php _e('Edit visibility'); ?></span></a>
 
 <div id="post-visibility-select" class="hide-if-js">
 <input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo esc_attr($post->post_password); ?>" />
 <?php if ($post_type == 'post'): ?>
 <input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked(is_sticky($post->ID)); ?> />
 <?php endif; ?>
-<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr( $visibility ); ?>" />
-<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br />
-<?php if ( $post_type == 'post' && current_user_can( 'edit_others_posts' ) ) : ?>
-<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked( is_sticky( $post->ID ) ); ?> /> <label for="sticky" class="selectit"><?php _e( 'Stick this post to the front page' ); ?></label><br /></span>
+<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr($visibility); ?>" />
+<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked($visibility, 'public'); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br />
+<?php if ($post_type == 'post' && current_user_can('edit_others_posts')) : ?>
+<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID)); ?> /> <label for="sticky" class="selectit"><?php _e('Stick this post to the front page'); ?></label><br /></span>
 <?php endif; ?>
-<input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br />
+<input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked($visibility, 'password'); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br />
 <span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo esc_attr($post->post_password); ?>"  maxlength="20" /><br /></span>
-<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br />
+<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked($visibility, 'private'); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br />
 
 <p>
  <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a>
@@ -171,40 +171,40 @@ 
 
 <?php
 /* translators: Publish box date format, see https://secure.php.net/date */
-$datef = __( 'M j, Y @ H:i' );
-if ( 0 != $post->ID ) {
-	if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
+$datef = __('M j, Y @ H:i');
+if (0 != $post->ID) {
+	if ('future' == $post->post_status) { // scheduled for publishing at a future date
 		$stamp = __('Scheduled for: <b>%1$s</b>');
-	} elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
+	} elseif ('publish' == $post->post_status || 'private' == $post->post_status) { // already published
 		$stamp = __('Published on: <b>%1$s</b>');
-	} elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
+	} elseif ('0000-00-00 00:00:00' == $post->post_date_gmt) { // draft, 1 or more saves, no date specified
 		$stamp = __('Publish <b>immediately</b>');
-	} elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
+	} elseif (time() < strtotime($post->post_date_gmt.' +0000')) { // draft, 1 or more saves, future date specified
 		$stamp = __('Schedule for: <b>%1$s</b>');
 	} else { // draft, 1 or more saves, date specified
 		$stamp = __('Publish on: <b>%1$s</b>');
 	}
-	$date = date_i18n( $datef, strtotime( $post->post_date ) );
+	$date = date_i18n($datef, strtotime($post->post_date));
 } else { // draft (no saves, and thus no date specified)
 	$stamp = __('Publish <b>immediately</b>');
-	$date = date_i18n( $datef, strtotime( current_time('mysql') ) );
+	$date = date_i18n($datef, strtotime(current_time('mysql')));
 }
 
-if ( ! empty( $args['args']['revisions_count'] ) ) : ?>
+if ( ! empty($args['args']['revisions_count'])) : ?>
 <div class="misc-pub-section misc-pub-revisions">
-	<?php printf( __( 'Revisions: %s' ), '<b>' . number_format_i18n( $args['args']['revisions_count'] ) . '</b>' ); ?>
-	<a class="hide-if-no-js" href="<?php echo esc_url( get_edit_post_link( $args['args']['revision_id'] ) ); ?>"><span aria-hidden="true"><?php _ex( 'Browse', 'revisions' ); ?></span> <span class="screen-reader-text"><?php _e( 'Browse revisions' ); ?></span></a>
+	<?php printf(__('Revisions: %s'), '<b>'.number_format_i18n($args['args']['revisions_count']).'</b>'); ?>
+	<a class="hide-if-no-js" href="<?php echo esc_url(get_edit_post_link($args['args']['revision_id'])); ?>"><span aria-hidden="true"><?php _ex('Browse', 'revisions'); ?></span> <span class="screen-reader-text"><?php _e('Browse revisions'); ?></span></a>
 </div>
 <?php endif;
 
-if ( $can_publish ) : // Contributors don't get to choose the date of publish ?>
+if ($can_publish) : // Contributors don't get to choose the date of publish ?>
 <div class="misc-pub-section curtime misc-pub-curtime">
 	<span id="timestamp">
 	<?php printf($stamp, $date); ?></span>
-	<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
+	<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e('Edit'); ?></span> <span class="screen-reader-text"><?php _e('Edit date and time'); ?></span></a>
 	<fieldset id="timestampdiv" class="hide-if-js">
-	<legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
-	<?php touch_time( ( $action === 'edit' ), 1 ); ?>
+	<legend class="screen-reader-text"><?php _e('Date and time'); ?></legend>
+	<?php touch_time(($action === 'edit'), 1); ?>
 	</fieldset>
 </div><?php // /misc-pub-section ?>
 <?php endif; ?>
@@ -218,7 +218,7 @@ 
  *
  * @param WP_Post $post WP_Post object for the current post.
  */
-do_action( 'post_submitbox_misc_actions', $post );
+do_action('post_submitbox_misc_actions', $post);
 ?>
 </div>
 <div class="clear"></div>
@@ -231,12 +231,12 @@ 
  *
  * @since 2.7.0
  */
-do_action( 'post_submitbox_start' );
+do_action('post_submitbox_start');
 ?>
 <div id="delete-action">
 <?php
-if ( current_user_can( "delete_post", $post->ID ) ) {
-	if ( !EMPTY_TRASH_DAYS )
+if (current_user_can("delete_post", $post->ID)) {
+	if ( ! EMPTY_TRASH_DAYS)
 		$delete_text = __('Delete Permanently');
 	else
 		$delete_text = __('Move to Trash');
@@ -248,23 +248,23 @@ 
 <div id="publishing-action">
 <span class="spinner"></span>
 <?php
-if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) {
-	if ( $can_publish ) :
-		if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
+if ( ! in_array($post->post_status, array('publish', 'future', 'private')) || 0 == $post->ID) {
+	if ($can_publish) :
+		if ( ! empty($post->post_date_gmt) && time() < strtotime($post->post_date_gmt.' +0000')) : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Schedule') ?>" />
-		<?php submit_button( __( 'Schedule' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button(__('Schedule'), 'primary button-large', 'publish', false); ?>
 <?php	else : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Publish') ?>" />
-		<?php submit_button( __( 'Publish' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button(__('Publish'), 'primary button-large', 'publish', false); ?>
 <?php	endif;
 	else : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Submit for Review') ?>" />
-		<?php submit_button( __( 'Submit for Review' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button(__('Submit for Review'), 'primary button-large', 'publish', false); ?>
 <?php
 	endif;
 } else { ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update') ?>" />
-		<input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e( 'Update' ) ?>" />
+		<input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e('Update') ?>" />
 <?php
 } ?>
 </div>
@@ -282,7 +282,7 @@ 
  *
  * @param object $post
  */
-function attachment_submit_meta_box( $post ) {
+function attachment_submit_meta_box($post) {
 ?>
 <div class="submitbox" id="submitpost">
 
@@ -290,16 +290,16 @@ 
 
 <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
 <div style="display:none;">
-<?php submit_button( __( 'Save' ), 'button', 'save' ); ?>
+<?php submit_button(__('Save'), 'button', 'save'); ?>
 </div>
 
 
 <div id="misc-publishing-actions">
 	<?php
 	/* translators: Publish box date format, see https://secure.php.net/date */
-	$datef = __( 'M j, Y @ H:i' );
+	$datef = __('M j, Y @ H:i');
 	$stamp = __('Uploaded on: <b>%1$s</b>');
-	$date = date_i18n( $datef, strtotime( $post->post_date ) );
+	$date = date_i18n($datef, strtotime($post->post_date));
 	?>
 	<div class="misc-pub-section curtime misc-pub-curtime">
 		<span id="timestamp"><?php printf($stamp, $date); ?></span>
@@ -312,7 +312,7 @@ 
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( 'attachment_submitbox_misc_actions' );
+	do_action('attachment_submitbox_misc_actions');
 	?>
 </div><!-- #misc-publishing-actions -->
 <div class="clear"></div>
@@ -321,12 +321,12 @@ 
 <div id="major-publishing-actions">
 	<div id="delete-action">
 	<?php
-	if ( current_user_can( 'delete_post', $post->ID ) )
-		if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
-			echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . _x( 'Trash', 'verb' ) . "</a>";
+	if (current_user_can('delete_post', $post->ID))
+		if (EMPTY_TRASH_DAYS && MEDIA_TRASH) {
+			echo "<a class='submitdelete deletion' href='".get_delete_post_link($post->ID)."'>"._x('Trash', 'verb')."</a>";
 		} else {
 			$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
-			echo  "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+			echo  "<a class='submitdelete deletion'$delete_ays href='".get_delete_post_link($post->ID, null, true)."'>".__('Delete Permanently')."</a>";
 		}
 	?>
 	</div>
@@ -334,7 +334,7 @@ 
 	<div id="publishing-action">
 		<span class="spinner"></span>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update') ?>" />
-		<input name="save" type="submit" class="button-primary button-large" id="publish" value="<?php esc_attr_e( 'Update' ) ?>" />
+		<input name="save" type="submit" class="button-primary button-large" id="publish" value="<?php esc_attr_e('Update') ?>" />
 	</div>
 	<div class="clear"></div>
 </div><!-- #major-publishing-actions -->
@@ -359,24 +359,24 @@ 
  *     @type array    $args     Extra meta box arguments.
  * }
  */
-function post_format_meta_box( $post, $box ) {
-	if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) :
-	$post_formats = get_theme_support( 'post-formats' );
+function post_format_meta_box($post, $box) {
+	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 ( !$post_format )
+	if (is_array($post_formats[0])) :
+		$post_format = get_post_format($post->ID);
+		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>
-			<?php foreach ( $post_formats[0] as $format ) : ?>
-			<br /><input type="radio" name="post_format" class="post-format" id="post-format-<?php echo esc_attr( $format ); ?>" value="<?php echo esc_attr( $format ); ?>" <?php checked( $post_format, $format ); ?> /> <label for="post-format-<?php echo esc_attr( $format ); ?>" class="post-format-icon post-format-<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></label>
+			<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) : ?>
+			<br /><input type="radio" name="post_format" class="post-format" id="post-format-<?php echo esc_attr($format); ?>" value="<?php echo esc_attr($format); ?>" <?php checked($post_format, $format); ?> /> <label for="post-format-<?php echo esc_attr($format); ?>" class="post-format-icon post-format-<?php echo esc_attr($format); ?>"><?php echo esc_html(get_post_format_string($format)); ?></label>
 			<?php endforeach; ?>
 		</fieldset>
 	</div>
@@ -404,20 +404,20 @@ 
  *     }
  * }
  */
-function post_tags_meta_box( $post, $box ) {
-	$defaults = array( 'taxonomy' => 'post_tag' );
-	if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
+function post_tags_meta_box($post, $box) {
+	$defaults = array('taxonomy' => 'post_tag');
+	if ( ! isset($box['args']) || ! is_array($box['args'])) {
 		$args = array();
 	} else {
 		$args = $box['args'];
 	}
-	$r = wp_parse_args( $args, $defaults );
-	$tax_name = esc_attr( $r['taxonomy'] );
-	$taxonomy = get_taxonomy( $r['taxonomy'] );
-	$user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
-	$comma = _x( ',', 'tag delimiter' );
-	$terms_to_edit = get_terms_to_edit( $post->ID, $tax_name );
-	if ( ! is_string( $terms_to_edit ) ) {
+	$r = wp_parse_args($args, $defaults);
+	$tax_name = esc_attr($r['taxonomy']);
+	$taxonomy = get_taxonomy($r['taxonomy']);
+	$user_can_assign_terms = current_user_can($taxonomy->cap->assign_terms);
+	$comma = _x(',', 'tag delimiter');
+	$terms_to_edit = get_terms_to_edit($post->ID, $tax_name);
+	if ( ! is_string($terms_to_edit)) {
 		$terms_to_edit = '';
 	}
 ?>
@@ -425,9 +425,9 @@ 
 	<div class="jaxtag">
 	<div class="nojs-tags hide-if-js">
 		<label for="tax-input-<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_or_remove_items; ?></label>
-		<p><textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php disabled( ! $user_can_assign_terms ); ?> aria-describedby="new-tag-<?php echo $tax_name; ?>-desc"><?php echo str_replace( ',', $comma . ' ', $terms_to_edit ); // textarea_escaped by esc_attr() ?></textarea></p>
+		<p><textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php disabled( ! $user_can_assign_terms); ?> aria-describedby="new-tag-<?php echo $tax_name; ?>-desc"><?php echo str_replace(',', $comma.' ', $terms_to_edit); // textarea_escaped by esc_attr() ?></textarea></p>
 	</div>
- 	<?php if ( $user_can_assign_terms ) : ?>
+ 	<?php if ($user_can_assign_terms) : ?>
 	<div class="ajaxtag hide-if-no-js">
 		<label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
 		<p><input type="text" id="new-tag-<?php echo $tax_name; ?>" name="newtag[<?php echo $tax_name; ?>]" class="newtag form-input-tip" size="16" autocomplete="off" aria-describedby="new-tag-<?php echo $tax_name; ?>-desc" value="" />
@@ -438,7 +438,7 @@ 
 	</div>
 	<div class="tagchecklist"></div>
 </div>
-<?php if ( $user_can_assign_terms ) : ?>
+<?php if ($user_can_assign_terms) : ?>
 <p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->choose_from_most_used; ?></a></p>
 <?php endif; ?>
 <?php
@@ -465,49 +465,49 @@ 
  *     }
  * }
  */
-function post_categories_meta_box( $post, $box ) {
-	$defaults = array( 'taxonomy' => 'category' );
-	if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
+function post_categories_meta_box($post, $box) {
+	$defaults = array('taxonomy' => 'category');
+	if ( ! isset($box['args']) || ! is_array($box['args'])) {
 		$args = array();
 	} else {
 		$args = $box['args'];
 	}
-	$r = wp_parse_args( $args, $defaults );
-	$tax_name = esc_attr( $r['taxonomy'] );
-	$taxonomy = get_taxonomy( $r['taxonomy'] );
+	$r = wp_parse_args($args, $defaults);
+	$tax_name = esc_attr($r['taxonomy']);
+	$taxonomy = get_taxonomy($r['taxonomy']);
 	?>
 	<div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
 		<ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
 			<li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a></li>
-			<li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e( 'Most Used' ); ?></a></li>
+			<li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e('Most Used'); ?></a></li>
 		</ul>
 
 		<div id="<?php echo $tax_name; ?>-pop" class="tabs-panel" style="display: none;">
 			<ul id="<?php echo $tax_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
-				<?php $popular_ids = wp_popular_terms_checklist( $tax_name ); ?>
+				<?php $popular_ids = wp_popular_terms_checklist($tax_name); ?>
 			</ul>
 		</div>
 
 		<div id="<?php echo $tax_name; ?>-all" class="tabs-panel">
 			<?php
-			$name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+			$name = ($tax_name == 'category') ? 'post_category' : 'tax_input['.$tax_name.']';
 			echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
 			?>
 			<ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>" class="categorychecklist form-no-clear">
-				<?php wp_terms_checklist( $post->ID, array( 'taxonomy' => $tax_name, 'popular_cats' => $popular_ids ) ); ?>
+				<?php wp_terms_checklist($post->ID, array('taxonomy' => $tax_name, 'popular_cats' => $popular_ids)); ?>
 			</ul>
 		</div>
-	<?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
+	<?php if (current_user_can($taxonomy->cap->edit_terms)) : ?>
 			<div id="<?php echo $tax_name; ?>-adder" class="wp-hidden-children">
 				<a id="<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add" class="hide-if-no-js taxonomy-add-new">
 					<?php
 						/* translators: %s: add new taxonomy label */
-						printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
+						printf(__('+ %s'), $taxonomy->labels->add_new_item);
 					?>
 				</a>
 				<p id="<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
 					<label class="screen-reader-text" for="new<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
-					<input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>" aria-required="true"/>
+					<input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr($taxonomy->labels->new_item_name); ?>" aria-required="true"/>
 					<label class="screen-reader-text" for="new<?php echo $tax_name; ?>_parent">
 						<?php echo $taxonomy->labels->parent_item_colon; ?>
 					</label>
@@ -515,10 +515,10 @@ 
 					$parent_dropdown_args = array(
 						'taxonomy'         => $tax_name,
 						'hide_empty'       => 0,
-						'name'             => 'new' . $tax_name . '_parent',
+						'name'             => 'new'.$tax_name.'_parent',
 						'orderby'          => 'name',
 						'hierarchical'     => 1,
-						'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;',
+						'show_option_none' => '&mdash; '.$taxonomy->labels->parent_item.' &mdash;',
 					);
 
 					/**
@@ -545,12 +545,12 @@ 
 					 *                                      taxonomy label.
 					 * }
 					 */
-					$parent_dropdown_args = apply_filters( 'post_edit_category_parent_dropdown_args', $parent_dropdown_args );
+					$parent_dropdown_args = apply_filters('post_edit_category_parent_dropdown_args', $parent_dropdown_args);
 
-					wp_dropdown_categories( $parent_dropdown_args );
+					wp_dropdown_categories($parent_dropdown_args);
 					?>
-					<input type="button" id="<?php echo $tax_name; ?>-add-submit" data-wp-lists="add:<?php echo $tax_name; ?>checklist:<?php echo $tax_name; ?>-add" class="button category-add-submit" value="<?php echo esc_attr( $taxonomy->labels->add_new_item ); ?>" />
-					<?php wp_nonce_field( 'add-' . $tax_name, '_ajax_nonce-add-' . $tax_name, false ); ?>
+					<input type="button" id="<?php echo $tax_name; ?>-add-submit" data-wp-lists="add:<?php echo $tax_name; ?>checklist:<?php echo $tax_name; ?>-add" class="button category-add-submit" value="<?php echo esc_attr($taxonomy->labels->add_new_item); ?>" />
+					<?php wp_nonce_field('add-'.$tax_name, '_ajax_nonce-add-'.$tax_name, false); ?>
 					<span id="<?php echo $tax_name; ?>-ajax-response"></span>
 				</p>
 			</div>
@@ -572,8 +572,8 @@ 
 <p><?php
 	printf(
 		/* translators: %s: Codex URL */
-		__( 'Excerpts are optional hand-crafted summaries of your content that can be used in your theme. <a href="%s">Learn more about manual excerpts</a>.' ),
-		__( 'https://codex.wordpress.org/Excerpt' )
+		__('Excerpts are optional hand-crafted summaries of your content that can be used in your theme. <a href="%s">Learn more about manual excerpts</a>.'),
+		__('https://codex.wordpress.org/Excerpt')
 	);
 ?></p>
 <?php
@@ -587,32 +587,32 @@ 
  * @param object $post
  */
 function post_trackback_meta_box($post) {
-	$form_trackback = '<input type="text" name="trackback_url" id="trackback_url" class="code" value="' .
-		esc_attr( str_replace( "\n", ' ', $post->to_ping ) ) . '" aria-describedby="trackback-url-desc" />';
+	$form_trackback = '<input type="text" name="trackback_url" id="trackback_url" class="code" value="'.
+		esc_attr(str_replace("\n", ' ', $post->to_ping)).'" aria-describedby="trackback-url-desc" />';
 	if ('' != $post->pinged) {
-		$pings = '<p>'. __('Already pinged:') . '</p><ul>';
+		$pings = '<p>'.__('Already pinged:').'</p><ul>';
 		$already_pinged = explode("\n", trim($post->pinged));
 		foreach ($already_pinged as $pinged_url) {
-			$pings .= "\n\t<li>" . esc_html($pinged_url) . "</li>";
+			$pings .= "\n\t<li>".esc_html($pinged_url)."</li>";
 		}
 		$pings .= '</ul>';
 	}
 
 ?>
 <p>
-	<label for="trackback_url"><?php _e( 'Send trackbacks to:' ); ?></label>
+	<label for="trackback_url"><?php _e('Send trackbacks to:'); ?></label>
 	<?php echo $form_trackback; ?>
 </p>
-<p id="trackback-url-desc" class="howto"><?php _e( 'Separate multiple URLs with spaces' ); ?></p>
+<p id="trackback-url-desc" class="howto"><?php _e('Separate multiple URLs with spaces'); ?></p>
 <p><?php
 	printf(
 		/* translators: %s: Codex URL */
-		__( 'Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites, they&#8217;ll be notified automatically using <a href="%s">pingbacks</a>, no other action necessary.' ),
-		__( 'https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments' )
+		__('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites, they&#8217;ll be notified automatically using <a href="%s">pingbacks</a>, no other action necessary.'),
+		__('https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments')
 	);
 ?></p>
 <?php
-if ( ! empty($pings) )
+if ( ! empty($pings))
 	echo $pings;
 }
 
@@ -629,18 +629,18 @@ 
 <div id="ajax-response"></div>
 <?php
 $metadata = has_meta($post->ID);
-foreach ( $metadata as $key => $value ) {
-	if ( is_protected_meta( $metadata[ $key ][ 'meta_key' ], 'post' ) || ! current_user_can( 'edit_post_meta', $post->ID, $metadata[ $key ][ 'meta_key' ] ) )
-		unset( $metadata[ $key ] );
+foreach ($metadata as $key => $value) {
+	if (is_protected_meta($metadata[$key]['meta_key'], 'post') || ! current_user_can('edit_post_meta', $post->ID, $metadata[$key]['meta_key']))
+		unset($metadata[$key]);
 }
-list_meta( $metadata );
-meta_form( $post ); ?>
+list_meta($metadata);
+meta_form($post); ?>
 </div>
 <p><?php
 	printf(
 		/* translators: %s: Codex URL */
-		__( 'Custom fields can be used to add extra metadata to a post that you can <a href="%s">use in your theme</a>.' ),
-		__( 'https://codex.wordpress.org/Using_Custom_Fields' )
+		__('Custom fields can be used to add extra metadata to a post that you can <a href="%s">use in your theme</a>.'),
+		__('https://codex.wordpress.org/Using_Custom_Fields')
 	);
 ?></p>
 <?php
@@ -657,12 +657,12 @@ 
 ?>
 <input name="advanced_view" type="hidden" value="1" />
 <p class="meta-options">
-	<label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> <?php _e( 'Allow comments.' ) ?></label><br />
+	<label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> <?php _e('Allow comments.') ?></label><br />
 	<label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php
 		printf(
 			/* translators: %s: Codex URL */
-			__( 'Allow <a href="%s">trackbacks and pingbacks</a> on this page.' ),
-			__( 'https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments' ) );
+			__('Allow <a href="%s">trackbacks and pingbacks</a> on this page.'),
+			__('https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments') );
 		?></label>
 	<?php
 	/**
@@ -672,7 +672,7 @@ 
 	 *
 	 * @param WP_Post $post WP_Post object of the current post.
 	 */
-	do_action( 'post_comment_status_meta_box-options', $post );
+	do_action('post_comment_status_meta_box-options', $post);
 	?>
 </p>
 <?php
@@ -698,21 +698,21 @@ 
  *
  * @param object $post
  */
-function post_comment_meta_box( $post ) {
-	wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
+function post_comment_meta_box($post) {
+	wp_nonce_field('get-comments', 'add_comment_nonce', false);
 	?>
 	<p class="hide-if-no-js" id="add-new-comment"><a class="button" href="#commentstatusdiv" onclick="window.commentReply && commentReply.addcomment(<?php echo $post->ID; ?>);return false;"><?php _e('Add comment'); ?></a></p>
 	<?php
 
-	$total = get_comments( array( 'post_id' => $post->ID, 'number' => 1, 'count' => true ) );
+	$total = get_comments(array('post_id' => $post->ID, 'number' => 1, 'count' => true));
 	$wp_list_table = _get_list_table('WP_Post_Comments_List_Table');
-	$wp_list_table->display( true );
+	$wp_list_table->display(true);
 
-	if ( 1 > $total ) {
-		echo '<p id="no-comments">' . __('No comments yet.') . '</p>';
+	if (1 > $total) {
+		echo '<p id="no-comments">'.__('No comments yet.').'</p>';
 	} else {
-		$hidden = get_hidden_meta_boxes( get_current_screen() );
-		if ( ! in_array('commentsdiv', $hidden) ) {
+		$hidden = get_hidden_meta_boxes(get_current_screen());
+		if ( ! in_array('commentsdiv', $hidden)) {
 			?>
 			<script type="text/javascript">jQuery(document).ready(function(){commentsBox.get(<?php echo $total; ?>, 10);});</script>
 			<?php
@@ -735,9 +735,9 @@ 
  */
 function post_slug_meta_box($post) {
 /** This filter is documented in wp-admin/edit-tag-form.php */
-$editable_slug = apply_filters( 'editable_slug', $post->post_name, $post );
+$editable_slug = apply_filters('editable_slug', $post->post_name, $post);
 ?>
-<label class="screen-reader-text" for="post_name"><?php _e('Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo esc_attr( $editable_slug ); ?>" />
+<label class="screen-reader-text" for="post_name"><?php _e('Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo esc_attr($editable_slug); ?>" />
 <?php
 }
 
@@ -755,13 +755,13 @@ 
 ?>
 <label class="screen-reader-text" for="post_author_override"><?php _e('Author'); ?></label>
 <?php
-	wp_dropdown_users( array(
+	wp_dropdown_users(array(
 		'who' => 'authors',
 		'name' => 'post_author_override',
 		'selected' => empty($post->ID) ? $user_ID : $post->post_author,
 		'include_selected' => true,
 		'show' => 'display_name_with_login',
-	) );
+	));
 }
 
 /**
@@ -771,8 +771,8 @@ 
  *
  * @param object $post
  */
-function post_revisions_meta_box( $post ) {
-	wp_list_post_revisions( $post );
+function post_revisions_meta_box($post) {
+	wp_list_post_revisions($post);
 }
 
 // -- Page related Meta Boxes
@@ -786,7 +786,7 @@ 
  */
 function page_attributes_meta_box($post) {
 	$post_type_object = get_post_type_object($post->post_type);
-	if ( $post_type_object->hierarchical ) {
+	if ($post_type_object->hierarchical) {
 		$dropdown_args = array(
 			'post_type'        => $post->post_type,
 			'exclude_tree'     => $post->ID,
@@ -807,9 +807,9 @@ 
 		 * @param array   $dropdown_args Array of arguments used to generate the pages drop-down.
 		 * @param WP_Post $post          The current WP_Post object.
 		 */
-		$dropdown_args = apply_filters( 'page_attributes_dropdown_pages_args', $dropdown_args, $post );
-		$pages = wp_dropdown_pages( $dropdown_args );
-		if ( ! empty($pages) ) {
+		$dropdown_args = apply_filters('page_attributes_dropdown_pages_args', $dropdown_args, $post);
+		$pages = wp_dropdown_pages($dropdown_args);
+		if ( ! empty($pages)) {
 ?>
 <p><strong><?php _e('Parent') ?></strong></p>
 <label class="screen-reader-text" for="parent_id"><?php _e('Parent') ?></label>
@@ -817,8 +817,8 @@ 
 <?php
 		} // end empty pages check
 	} // end hierarchical check.
-	if ( 'page' == $post->post_type && 0 != count( get_page_templates( $post ) ) && get_option( 'page_for_posts' ) != $post->ID ) {
-		$template = !empty($post->page_template) ? $post->page_template : false;
+	if ('page' == $post->post_type && 0 != count(get_page_templates($post)) && get_option('page_for_posts') != $post->ID) {
+		$template = ! empty($post->page_template) ? $post->page_template : false;
 		?>
 <p><strong><?php _e('Template') ?></strong><?php
 	/**
@@ -830,7 +830,7 @@ 
 	 * @param string  $template The template used for the current post.
 	 * @param WP_Post $post     The current post.
 	 */
-	do_action( 'page_attributes_meta_box_template', $template, $post );
+	do_action('page_attributes_meta_box_template', $template, $post);
 ?></p>
 <label class="screen-reader-text" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template">
 <?php
@@ -843,17 +843,17 @@ 
  * @param string $context Where the option label is displayed. Possible values
  *                        include 'meta-box' or 'quick-edit'.
  */
-$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'meta-box' );
+$default_title = apply_filters('default_page_template_title', __('Default Template'), 'meta-box');
 ?>
-<option value="default"><?php echo esc_html( $default_title ); ?></option>
+<option value="default"><?php echo esc_html($default_title); ?></option>
 <?php page_template_dropdown($template); ?>
 </select>
 <?php
 	} ?>
 <p><strong><?php _e('Order') ?></strong></p>
 <p><label class="screen-reader-text" for="menu_order"><?php _e('Order') ?></label><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo esc_attr($post->menu_order) ?>" /></p>
-<?php if ( 'page' == $post->post_type && get_current_screen()->get_help_tabs() ) { ?>
-<p><?php _e( 'Need help? Use the Help tab above the screen title.' ); ?></p>
+<?php if ('page' == $post->post_type && get_current_screen()->get_help_tabs()) { ?>
+<p><?php _e('Need help? Use the Help tab above the screen title.'); ?></p>
 <?php
 	}
 }
@@ -875,12 +875,12 @@ 
 
 <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
 <div style="display:none;">
-<?php submit_button( __( 'Save' ), 'button', 'save', false ); ?>
+<?php submit_button(__('Save'), 'button', 'save', false); ?>
 </div>
 
 <div id="minor-publishing-actions">
 <div id="preview-action">
-<?php if ( !empty($link->link_id) ) { ?>
+<?php if ( ! empty($link->link_id)) { ?>
 	<a class="preview button" href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
 <?php } ?>
 </div>
@@ -898,20 +898,20 @@ 
 <div id="major-publishing-actions">
 <?php
 /** This action is documented in wp-admin/includes/meta-boxes.php */
-do_action( 'post_submitbox_start' );
+do_action('post_submitbox_start');
 ?>
 <div id="delete-action">
 <?php
-if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?>
-	<a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo 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;"><?php _e('Delete'); ?></a>
+if ( ! empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links')) { ?>
+	<a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_'.$link->link_id); ?>" onclick="if ( confirm('<?php echo 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;"><?php _e('Delete'); ?></a>
 <?php } ?>
 </div>
 
 <div id="publishing-action">
-<?php if ( !empty($link->link_id) ) { ?>
-	<input name="save" type="submit" class="button-large button-primary" id="publish" value="<?php esc_attr_e( 'Update Link' ) ?>" />
+<?php if ( ! empty($link->link_id)) { ?>
+	<input name="save" type="submit" class="button-large button-primary" id="publish" value="<?php esc_attr_e('Update Link') ?>" />
 <?php } else { ?>
-	<input name="save" type="submit" class="button-large button-primary" id="publish" value="<?php esc_attr_e( 'Add Link' ) ?>" />
+	<input name="save" type="submit" class="button-large button-primary" id="publish" value="<?php esc_attr_e('Add Link') ?>" />
 <?php } ?>
 </div>
 <div class="clear"></div>
@@ -922,7 +922,7 @@ 
  *
  * @since 2.5.0
  */
-do_action( 'submitlink_box' );
+do_action('submitlink_box');
 ?>
 <div class="clear"></div>
 </div>
@@ -940,14 +940,14 @@ 
 ?>
 <div id="taxonomy-linkcategory" class="categorydiv">
 	<ul id="category-tabs" class="category-tabs">
-		<li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
-		<li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
+		<li class="tabs"><a href="#categories-all"><?php _e('All Categories'); ?></a></li>
+		<li class="hide-if-no-js"><a href="#categories-pop"><?php _e('Most Used'); ?></a></li>
 	</ul>
 
 	<div id="categories-all" class="tabs-panel">
 		<ul id="categorychecklist" data-wp-lists="list:category" class="categorychecklist form-no-clear">
 			<?php
-			if ( isset($link->link_id) )
+			if (isset($link->link_id))
 				wp_link_category_checklist($link->link_id);
 			else
 				wp_link_category_checklist();
@@ -962,12 +962,12 @@ 
 	</div>
 
 	<div id="category-adder" class="wp-hidden-children">
-		<a id="category-add-toggle" href="#category-add" class="taxonomy-add-new"><?php _e( '+ Add New Category' ); ?></a>
+		<a id="category-add-toggle" href="#category-add" class="taxonomy-add-new"><?php _e('+ Add New Category'); ?></a>
 		<p id="link-category-add" class="wp-hidden-child">
-			<label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
-			<input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
-			<input type="button" id="link-category-add-submit" data-wp-lists="add:categorychecklist:link-category-add" class="button" value="<?php esc_attr_e( 'Add' ); ?>" />
-			<?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
+			<label class="screen-reader-text" for="newcat"><?php _e('+ Add New Category'); ?></label>
+			<input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e('New category name'); ?>" aria-required="true" />
+			<input type="button" id="link-category-add-submit" data-wp-lists="add:categorychecklist:link-category-add" class="button" value="<?php esc_attr_e('Add'); ?>" />
+			<?php wp_nonce_field('add-link-category', '_ajax_nonce', false); ?>
 			<span id="category-ajax-response"></span>
 		</p>
 	</div>
@@ -985,13 +985,13 @@ 
 function link_target_meta_box($link) { ?>
 <fieldset><legend class="screen-reader-text"><span><?php _e('Target') ?></span></legend>
 <p><label for="link_target_blank" class="selectit">
-<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
+<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo (isset($link->link_target) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
 <?php _e('<code>_blank</code> &mdash; new window or tab.'); ?></label></p>
 <p><label for="link_target_top" class="selectit">
-<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
+<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo (isset($link->link_target) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
 <?php _e('<code>_top</code> &mdash; current window or tab, with no frames.'); ?></label></p>
 <p><label for="link_target_none" class="selectit">
-<input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> />
+<input id="link_target_none" type="radio" name="link_target" value="" <?php echo (isset($link->link_target) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> />
 <?php _e('<code>_none</code> &mdash; same window or tab.'); ?></label></p>
 </fieldset>
 <p><?php _e('Choose the target frame for your link.'); ?></p>
@@ -1009,16 +1009,16 @@ 
  * @param string $value
  * @param mixed $deprecated Never used.
  */
-function xfn_check( $class, $value = '', $deprecated = '' ) {
+function xfn_check($class, $value = '', $deprecated = '') {
 	global $link;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.0.0' ); // Never implemented
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '0.0.0'); // Never implemented
 
-	$link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
+	$link_rel = isset($link->link_rel) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
 	$rels = preg_split('/\s+/', $link_rel);
 
-	if ('' != $value && in_array($value, $rels) ) {
+	if ('' != $value && in_array($value, $rels)) {
 		echo ' checked="checked"';
 	}
 
@@ -1026,7 +1026,7 @@ 
 		if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) echo ' checked="checked"';
 		if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) echo ' checked="checked"';
 		if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) echo ' checked="checked"';
-		if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
+		if ('identity' == $class && in_array('me', $rels)) echo ' checked="checked"';
 	}
 }
 
@@ -1042,7 +1042,7 @@ 
 <table class="links-table">
 	<tr>
 		<th scope="row"><label for="link_rel"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('rel:') ?></label></th>
-		<td><input type="text" name="link_rel" id="link_rel" value="<?php echo ( isset( $link->link_rel ) ? esc_attr($link->link_rel) : ''); ?>" /></td>
+		<td><input type="text" name="link_rel" id="link_rel" value="<?php echo (isset($link->link_rel) ? esc_attr($link->link_rel) : ''); ?>" /></td>
 	</tr>
 	<tr>
 		<th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?></th>
@@ -1160,25 +1160,25 @@ 
 <table class="links-table" cellpadding="0">
 	<tr>
 		<th scope="row"><label for="link_image"><?php _e('Image Address') ?></label></th>
-		<td><input type="text" name="link_image" class="code" id="link_image" maxlength="255" value="<?php echo ( isset( $link->link_image ) ? esc_attr($link->link_image) : ''); ?>" /></td>
+		<td><input type="text" name="link_image" class="code" id="link_image" maxlength="255" value="<?php echo (isset($link->link_image) ? esc_attr($link->link_image) : ''); ?>" /></td>
 	</tr>
 	<tr>
 		<th scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th>
-		<td><input name="link_rss" class="code" type="text" id="rss_uri" maxlength="255" value="<?php echo ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" /></td>
+		<td><input name="link_rss" class="code" type="text" id="rss_uri" maxlength="255" value="<?php echo (isset($link->link_rss) ? esc_attr($link->link_rss) : ''); ?>" /></td>
 	</tr>
 	<tr>
 		<th scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
-		<td><textarea name="link_notes" id="link_notes" rows="10"><?php echo ( isset( $link->link_notes ) ? $link->link_notes : ''); // textarea_escaped ?></textarea></td>
+		<td><textarea name="link_notes" id="link_notes" rows="10"><?php echo (isset($link->link_notes) ? $link->link_notes : ''); // textarea_escaped ?></textarea></td>
 	</tr>
 	<tr>
 		<th scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th>
 		<td><select name="link_rating" id="link_rating" size="1">
 		<?php
-			for ( $r = 0; $r <= 10; $r++ ) {
-				echo '<option value="' . $r . '"';
-				if ( isset($link->link_rating) && $link->link_rating == $r )
+			for ($r = 0; $r <= 10; $r++) {
+				echo '<option value="'.$r.'"';
+				if (isset($link->link_rating) && $link->link_rating == $r)
 					echo ' selected="selected"';
-				echo('>' . $r . '</option>');
+				echo('>'.$r.'</option>');
 			}
 		?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>
 		</td>
@@ -1194,9 +1194,9 @@ 
  *
  * @param WP_Post $post A post object.
  */
-function post_thumbnail_meta_box( $post ) {
-	$thumbnail_id = get_post_meta( $post->ID, '_thumbnail_id', true );
-	echo _wp_post_thumbnail_html( $thumbnail_id, $post->ID );
+function post_thumbnail_meta_box($post) {
+	$thumbnail_id = get_post_meta($post->ID, '_thumbnail_id', true);
+	echo _wp_post_thumbnail_html($thumbnail_id, $post->ID);
 }
 
 /**
@@ -1206,18 +1206,18 @@ 
  *
  * @param WP_Post $post A post object.
  */
-function attachment_id3_data_meta_box( $post ) {
+function attachment_id3_data_meta_box($post) {
 	$meta = array();
-	if ( ! empty( $post->ID ) ) {
-		$meta = wp_get_attachment_metadata( $post->ID );
+	if ( ! empty($post->ID)) {
+		$meta = wp_get_attachment_metadata($post->ID);
 	}
 
-	foreach ( wp_get_attachment_id3_keys( $post, 'edit' ) as $key => $label ) : ?>
+	foreach (wp_get_attachment_id3_keys($post, 'edit') as $key => $label) : ?>
 	<p>
 		<label for="title"><?php echo $label ?></label><br />
-		<input type="text" name="id3_<?php echo esc_attr( $key ) ?>" id="id3_<?php echo esc_attr( $key ) ?>" class="large-text" value="<?php
-			if ( ! empty( $meta[ $key ] ) ) {
-				echo esc_attr( $meta[ $key ] );
+		<input type="text" name="id3_<?php echo esc_attr($key) ?>" id="id3_<?php echo esc_attr($key) ?>" class="large-text" value="<?php
+			if ( ! empty($meta[$key])) {
+				echo esc_attr($meta[$key]);
 			}
 		?>" />
 	</p>

Braces +59 added lines, -32 removed lines

@@ -113,8 +113,11 @@ 
 <option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
 <?php if ( 'auto-draft' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e('Draft') ?></option>
-<?php else : ?>
-<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+<?php else {
+	: ?>
+<option<?php selected( $post->post_status, 'draft' );
+}
+?> value='draft'><?php _e('Draft') ?></option>
 <?php endif; ?>
 </select>
  <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
@@ -236,10 +239,11 @@ 
 <div id="delete-action">
 <?php
 if ( current_user_can( "delete_post", $post->ID ) ) {
-	if ( !EMPTY_TRASH_DAYS )
-		$delete_text = __('Delete Permanently');
-	else
-		$delete_text = __('Move to Trash');
+	if ( !EMPTY_TRASH_DAYS ) {
+			$delete_text = __('Delete Permanently');
+	} else {
+			$delete_text = __('Move to Trash');
+	}
 	?>
 <a class="submitdelete deletion" href="<?php echo get_delete_post_link($post->ID); ?>"><?php echo $delete_text; ?></a><?php
 } ?>
@@ -253,13 +257,19 @@ 
 		if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Schedule') ?>" />
 		<?php submit_button( __( 'Schedule' ), 'primary button-large', 'publish', false ); ?>
-<?php	else : ?>
+<?php	else {
+	: ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Publish') ?>" />
-		<?php submit_button( __( 'Publish' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button( __( 'Publish' ), 'primary button-large', 'publish', false );
+}
+?>
 <?php	endif;
-	else : ?>
+	else {
+		: ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Submit for Review') ?>" />
-		<?php submit_button( __( 'Submit for Review' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button( __( 'Submit for Review' ), 'primary button-large', 'publish', false );
+	}
+	?>
 <?php
 	endif;
 } else { ?>
@@ -321,9 +331,10 @@ 
 <div id="major-publishing-actions">
 	<div id="delete-action">
 	<?php
-	if ( current_user_can( 'delete_post', $post->ID ) )
-		if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+	if ( current_user_can( 'delete_post', $post->ID ) ) {
+			if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
 			echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . _x( 'Trash', 'verb' ) . "</a>";
+	}
 		} else {
 			$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
 			echo  "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
@@ -365,11 +376,13 @@ 
 
 	if ( is_array( $post_formats[0] ) ) :
 		$post_format = get_post_format( $post->ID );
-		if ( !$post_format )
-			$post_format = '0';
+		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] ) )
-			$post_formats[0][] = $post_format;
+		if ( $post_format && !in_array( $post_format, $post_formats[0] ) ) {
+					$post_formats[0][] = $post_format;
+		}
 	?>
 	<div id="post-formats-select">
 		<fieldset>
@@ -612,9 +625,10 @@ 
 	);
 ?></p>
 <?php
-if ( ! empty($pings) )
+if ( ! empty($pings) ) {
 	echo $pings;
 }
+}
 
 /**
  * Display custom fields form fields.
@@ -630,9 +644,10 @@ 
 <?php
 $metadata = has_meta($post->ID);
 foreach ( $metadata as $key => $value ) {
-	if ( is_protected_meta( $metadata[ $key ][ 'meta_key' ], 'post' ) || ! current_user_can( 'edit_post_meta', $post->ID, $metadata[ $key ][ 'meta_key' ] ) )
-		unset( $metadata[ $key ] );
-}
+	if ( is_protected_meta( $metadata[ $key ][ 'meta_key' ], 'post' ) || ! current_user_can( 'edit_post_meta', $post->ID, $metadata[ $key ][ 'meta_key' ] ) ) {
+			unset( $metadata[ $key ] );
+	}
+	}
 list_meta( $metadata );
 meta_form( $post ); ?>
 </div>
@@ -947,10 +962,11 @@ 
 	<div id="categories-all" class="tabs-panel">
 		<ul id="categorychecklist" data-wp-lists="list:category" class="categorychecklist form-no-clear">
 			<?php
-			if ( isset($link->link_id) )
-				wp_link_category_checklist($link->link_id);
-			else
-				wp_link_category_checklist();
+			if ( isset($link->link_id) ) {
+							wp_link_category_checklist($link->link_id);
+			} else {
+							wp_link_category_checklist();
+			}
 			?>
 		</ul>
 	</div>
@@ -1012,8 +1028,10 @@ 
 function xfn_check( $class, $value = '', $deprecated = '' ) {
 	global $link;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.0.0' ); // Never implemented
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '0.0.0' );
+	}
+	// Never implemented
 
 	$link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
 	$rels = preg_split('/\s+/', $link_rel);
@@ -1023,10 +1041,18 @@ 
 	}
 
 	if ('' == $value) {
-		if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) echo ' checked="checked"';
-		if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) echo ' checked="checked"';
-		if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) echo ' checked="checked"';
-		if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
+		if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) {
+			echo ' checked="checked"';
+		}
+		if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) {
+			echo ' checked="checked"';
+		}
+		if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) {
+			echo ' checked="checked"';
+		}
+		if ('identity' == $class && in_array('me', $rels) ) {
+			echo ' checked="checked"';
+		}
 	}
 }
 
@@ -1176,8 +1202,9 @@ 
 		<?php
 			for ( $r = 0; $r <= 10; $r++ ) {
 				echo '<option value="' . $r . '"';
-				if ( isset($link->link_rating) && $link->link_rating == $r )
-					echo ' selected="selected"';
+				if ( isset($link->link_rating) && $link->link_rating == $r ) {
+									echo ' selected="selected"';
+				}
 				echo('>' . $r . '</option>');
 			}
 		?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>

src/wp-admin/includes/comment.php

Spacing +44 added lines, -44 removed lines

@@ -24,19 +24,19 @@ 
  *
  * @return mixed Comment post ID on success.
  */
-function comment_exists( $comment_author, $comment_date, $timezone = 'blog' ) {
+function comment_exists($comment_author, $comment_date, $timezone = 'blog') {
 	global $wpdb;
 
 	$date_field = 'comment_date';
-	if ( 'gmt' === $timezone ) {
+	if ('gmt' === $timezone) {
 		$date_field = 'comment_date_gmt';
 	}
 
-	return $wpdb->get_var( $wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
+	return $wpdb->get_var($wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
 			WHERE comment_author = %s AND $date_field = %s",
-			stripslashes( $comment_author ),
-			stripslashes( $comment_date )
-	) );
+			stripslashes($comment_author),
+			stripslashes($comment_date)
+	));
 }
 
 /**
@@ -45,44 +45,44 @@ 
  * @since 2.0.0
  */
 function edit_comment() {
-	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
-		wp_die ( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
+	if ( ! current_user_can('edit_comment', (int) $_POST['comment_ID']))
+		wp_die(__('Sorry, you are not allowed to edit comments on this post.'));
 
-	if ( isset( $_POST['newcomment_author'] ) )
+	if (isset($_POST['newcomment_author']))
 		$_POST['comment_author'] = $_POST['newcomment_author'];
-	if ( isset( $_POST['newcomment_author_email'] ) )
+	if (isset($_POST['newcomment_author_email']))
 		$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
-	if ( isset( $_POST['newcomment_author_url'] ) )
+	if (isset($_POST['newcomment_author_url']))
 		$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-	if ( isset( $_POST['comment_status'] ) )
+	if (isset($_POST['comment_status']))
 		$_POST['comment_approved'] = $_POST['comment_status'];
-	if ( isset( $_POST['content'] ) )
+	if (isset($_POST['content']))
 		$_POST['comment_content'] = $_POST['content'];
-	if ( isset( $_POST['comment_ID'] ) )
+	if (isset($_POST['comment_ID']))
 		$_POST['comment_ID'] = (int) $_POST['comment_ID'];
 
-	foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
-		if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
+	foreach (array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit) {
+		if ( ! empty($_POST['hidden_'.$timeunit]) && $_POST['hidden_'.$timeunit] != $_POST[$timeunit]) {
 			$_POST['edit_date'] = '1';
 			break;
 		}
 	}
 
-	if ( !empty ( $_POST['edit_date'] ) ) {
+	if ( ! empty ($_POST['edit_date'])) {
 		$aa = $_POST['aa'];
 		$mm = $_POST['mm'];
 		$jj = $_POST['jj'];
 		$hh = $_POST['hh'];
 		$mn = $_POST['mn'];
 		$ss = $_POST['ss'];
-		$jj = ($jj > 31 ) ? 31 : $jj;
-		$hh = ($hh > 23 ) ? $hh -24 : $hh;
-		$mn = ($mn > 59 ) ? $mn -60 : $mn;
-		$ss = ($ss > 59 ) ? $ss -60 : $ss;
+		$jj = ($jj > 31) ? 31 : $jj;
+		$hh = ($hh > 23) ? $hh - 24 : $hh;
+		$mn = ($mn > 59) ? $mn - 60 : $mn;
+		$ss = ($ss > 59) ? $ss - 60 : $ss;
 		$_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
 	}
 
-	wp_update_comment( $_POST );
+	wp_update_comment($_POST);
 }
 
 /**
@@ -93,14 +93,14 @@ 
  * @param int $id ID of comment to retrieve.
  * @return WP_Comment|false Comment if found. False on failure.
  */
-function get_comment_to_edit( $id ) {
-	if ( !$comment = get_comment($id) )
+function get_comment_to_edit($id) {
+	if ( ! $comment = get_comment($id))
 		return false;
 
 	$comment->comment_ID = (int) $comment->comment_ID;
 	$comment->comment_post_ID = (int) $comment->comment_post_ID;
 
-	$comment->comment_content = format_to_edit( $comment->comment_content );
+	$comment->comment_content = format_to_edit($comment->comment_content);
 	/**
 	 * Filters the comment content before editing.
 	 *
@@ -108,11 +108,11 @@ 
 	 *
 	 * @param string $comment->comment_content Comment content.
 	 */
-	$comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
+	$comment->comment_content = apply_filters('comment_edit_pre', $comment->comment_content);
 
-	$comment->comment_author = format_to_edit( $comment->comment_author );
-	$comment->comment_author_email = format_to_edit( $comment->comment_author_email );
-	$comment->comment_author_url = format_to_edit( $comment->comment_author_url );
+	$comment->comment_author = format_to_edit($comment->comment_author);
+	$comment->comment_author_email = format_to_edit($comment->comment_author_email);
+	$comment->comment_author_url = format_to_edit($comment->comment_author_url);
 	$comment->comment_author_url = esc_url($comment->comment_author_url);
 
 	return $comment;
@@ -128,23 +128,23 @@ 
  * @param int|array $post_id Either a single Post ID or an array of Post IDs
  * @return int|array Either a single Posts pending comments as an int or an array of ints keyed on the Post IDs
  */
-function get_pending_comments_num( $post_id ) {
+function get_pending_comments_num($post_id) {
 	global $wpdb;
 
 	$single = false;
-	if ( !is_array($post_id) ) {
+	if ( ! is_array($post_id)) {
 		$post_id_array = (array) $post_id;
 		$single = true;
 	} else {
 		$post_id_array = $post_id;
 	}
 	$post_id_array = array_map('intval', $post_id_array);
-	$post_id_in = "'" . implode("', '", $post_id_array) . "'";
+	$post_id_in = "'".implode("', '", $post_id_array)."'";
 
-	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
+	$pending = $wpdb->get_results("SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A);
 
-	if ( $single ) {
-		if ( empty($pending) )
+	if ($single) {
+		if (empty($pending))
 			return 0;
 		else
 			return absint($pending[0]['num_comments']);
@@ -153,11 +153,11 @@ 
 	$pending_keyed = array();
 
 	// Default to zero pending for all posts in request
-	foreach ( $post_id_array as $id )
+	foreach ($post_id_array as $id)
 		$pending_keyed[$id] = 0;
 
-	if ( !empty($pending) )
-		foreach ( $pending as $pend )
+	if ( ! empty($pending))
+		foreach ($pending as $pend)
 			$pending_keyed[$pend['comment_post_ID']] = absint($pend['num_comments']);
 
 	return $pending_keyed;
@@ -171,8 +171,8 @@ 
  * @param string $name User name.
  * @return string Avatar with Admin name.
  */
-function floated_admin_avatar( $name ) {
-	$avatar = get_avatar( get_comment(), 32, 'mystery' );
+function floated_admin_avatar($name) {
+	$avatar = get_avatar(get_comment(), 32, 'mystery');
 	return "$avatar $name";
 }
 
@@ -180,8 +180,8 @@ 
  * @since 2.7.0
  */
 function enqueue_comment_hotkeys_js() {
-	if ( 'true' == get_user_option( 'comment_shortcuts' ) )
-		wp_enqueue_script( 'jquery-table-hotkeys' );
+	if ('true' == get_user_option('comment_shortcuts'))
+		wp_enqueue_script('jquery-table-hotkeys');
 }
 
 /**
@@ -189,8 +189,8 @@ 
  *
  * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
  */
-function comment_footer_die( $msg ) {
+function comment_footer_die($msg) {
 	echo "<div class='wrap'><p>$msg</p></div>";
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	die;
 }
\ No newline at end of file

Braces +40 added lines, -28 removed lines

@@ -45,21 +45,28 @@ 
  * @since 2.0.0
  */
 function edit_comment() {
-	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
-		wp_die ( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
-
-	if ( isset( $_POST['newcomment_author'] ) )
-		$_POST['comment_author'] = $_POST['newcomment_author'];
-	if ( isset( $_POST['newcomment_author_email'] ) )
-		$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
-	if ( isset( $_POST['newcomment_author_url'] ) )
-		$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-	if ( isset( $_POST['comment_status'] ) )
-		$_POST['comment_approved'] = $_POST['comment_status'];
-	if ( isset( $_POST['content'] ) )
-		$_POST['comment_content'] = $_POST['content'];
-	if ( isset( $_POST['comment_ID'] ) )
-		$_POST['comment_ID'] = (int) $_POST['comment_ID'];
+	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) ) {
+			wp_die ( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
+	}
+
+	if ( isset( $_POST['newcomment_author'] ) ) {
+			$_POST['comment_author'] = $_POST['newcomment_author'];
+	}
+	if ( isset( $_POST['newcomment_author_email'] ) ) {
+			$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
+	}
+	if ( isset( $_POST['newcomment_author_url'] ) ) {
+			$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
+	}
+	if ( isset( $_POST['comment_status'] ) ) {
+			$_POST['comment_approved'] = $_POST['comment_status'];
+	}
+	if ( isset( $_POST['content'] ) ) {
+			$_POST['comment_content'] = $_POST['content'];
+	}
+	if ( isset( $_POST['comment_ID'] ) ) {
+			$_POST['comment_ID'] = (int) $_POST['comment_ID'];
+	}
 
 	foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
 		if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
@@ -94,8 +101,9 @@ 
  * @return WP_Comment|false Comment if found. False on failure.
  */
 function get_comment_to_edit( $id ) {
-	if ( !$comment = get_comment($id) )
-		return false;
+	if ( !$comment = get_comment($id) ) {
+			return false;
+	}
 
 	$comment->comment_ID = (int) $comment->comment_ID;
 	$comment->comment_post_ID = (int) $comment->comment_post_ID;
@@ -144,21 +152,24 @@ 
 	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
 
 	if ( $single ) {
-		if ( empty($pending) )
-			return 0;
-		else
-			return absint($pending[0]['num_comments']);
+		if ( empty($pending) ) {
+					return 0;
+		} else {
+					return absint($pending[0]['num_comments']);
+		}
 	}
 
 	$pending_keyed = array();
 
 	// Default to zero pending for all posts in request
-	foreach ( $post_id_array as $id )
-		$pending_keyed[$id] = 0;
+	foreach ( $post_id_array as $id ) {
+			$pending_keyed[$id] = 0;
+	}
 
-	if ( !empty($pending) )
-		foreach ( $pending as $pend )
+	if ( !empty($pending) ) {
+			foreach ( $pending as $pend )
 			$pending_keyed[$pend['comment_post_ID']] = absint($pend['num_comments']);
+	}
 
 	return $pending_keyed;
 }
@@ -180,9 +191,10 @@ 
  * @since 2.7.0
  */
 function enqueue_comment_hotkeys_js() {
-	if ( 'true' == get_user_option( 'comment_shortcuts' ) )
-		wp_enqueue_script( 'jquery-table-hotkeys' );
-}
+	if ( 'true' == get_user_option( 'comment_shortcuts' ) ) {
+			wp_enqueue_script( 'jquery-table-hotkeys' );
+	}
+	}
 
 /**
  * Display error message at bottom of comments.

src/wp-admin/includes/post.php

Spacing +510 added lines, -510 removed lines

@@ -18,157 +18,157 @@ 
  * @param array $post_data Array of post data. Defaults to the contents of $_POST.
  * @return object|bool WP_Error on failure, true on success.
  */
-function _wp_translate_postdata( $update = false, $post_data = null ) {
+function _wp_translate_postdata($update = false, $post_data = null) {
 
-	if ( empty($post_data) )
+	if (empty($post_data))
 		$post_data = &$_POST;
 
-	if ( $update )
+	if ($update)
 		$post_data['ID'] = (int) $post_data['post_ID'];
 
-	$ptype = get_post_type_object( $post_data['post_type'] );
+	$ptype = get_post_type_object($post_data['post_type']);
 
-	if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
+	if ($update && ! current_user_can('edit_post', $post_data['ID'])) {
+		if ('page' == $post_data['post_type'])
+			return new WP_Error('edit_others_pages', __('Sorry, you are not allowed to edit pages as this user.'));
 		else
-			return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
-	} elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
+			return new WP_Error('edit_others_posts', __('Sorry, you are not allowed to edit posts as this user.'));
+	} elseif ( ! $update && ! current_user_can($ptype->cap->create_posts)) {
+		if ('page' == $post_data['post_type'])
+			return new WP_Error('edit_others_pages', __('Sorry, you are not allowed to create pages as this user.'));
 		else
-			return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+			return new WP_Error('edit_others_posts', __('Sorry, you are not allowed to create posts as this user.'));
 	}
 
-	if ( isset( $post_data['content'] ) )
+	if (isset($post_data['content']))
 		$post_data['post_content'] = $post_data['content'];
 
-	if ( isset( $post_data['excerpt'] ) )
+	if (isset($post_data['excerpt']))
 		$post_data['post_excerpt'] = $post_data['excerpt'];
 
-	if ( isset( $post_data['parent_id'] ) )
+	if (isset($post_data['parent_id']))
 		$post_data['post_parent'] = (int) $post_data['parent_id'];
 
-	if ( isset($post_data['trackback_url']) )
+	if (isset($post_data['trackback_url']))
 		$post_data['to_ping'] = $post_data['trackback_url'];
 
 	$post_data['user_ID'] = get_current_user_id();
 
-	if (!empty ( $post_data['post_author_override'] ) ) {
+	if ( ! empty ($post_data['post_author_override'])) {
 		$post_data['post_author'] = (int) $post_data['post_author_override'];
 	} else {
-		if (!empty ( $post_data['post_author'] ) ) {
+		if ( ! empty ($post_data['post_author'])) {
 			$post_data['post_author'] = (int) $post_data['post_author'];
 		} else {
 			$post_data['post_author'] = (int) $post_data['user_ID'];
 		}
 	}
 
-	if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
-		 && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
-		if ( $update ) {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
+	if (isset($post_data['user_ID']) && ($post_data['post_author'] != $post_data['user_ID'])
+		 && ! current_user_can($ptype->cap->edit_others_posts)) {
+		if ($update) {
+			if ('page' == $post_data['post_type'])
+				return new WP_Error('edit_others_pages', __('Sorry, you are not allowed to edit pages as this user.'));
 			else
-				return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
+				return new WP_Error('edit_others_posts', __('Sorry, you are not allowed to edit posts as this user.'));
 		} else {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
+			if ('page' == $post_data['post_type'])
+				return new WP_Error('edit_others_pages', __('Sorry, you are not allowed to create pages as this user.'));
 			else
-				return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+				return new WP_Error('edit_others_posts', __('Sorry, you are not allowed to create posts as this user.'));
 		}
 	}
 
-	if ( ! empty( $post_data['post_status'] ) ) {
-		$post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+	if ( ! empty($post_data['post_status'])) {
+		$post_data['post_status'] = sanitize_key($post_data['post_status']);
 
 		// No longer an auto-draft
-		if ( 'auto-draft' === $post_data['post_status'] ) {
+		if ('auto-draft' === $post_data['post_status']) {
 			$post_data['post_status'] = 'draft';
 		}
 
-		if ( ! get_post_status_object( $post_data['post_status'] ) ) {
-			unset( $post_data['post_status'] );
+		if ( ! get_post_status_object($post_data['post_status'])) {
+			unset($post_data['post_status']);
 		}
 	}
 
 	// What to do based on which button they pressed
-	if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] )
+	if (isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'])
 		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] )
+	if (isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'])
 		$post_data['post_status'] = 'private';
-	if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( !isset($post_data['post_status']) || $post_data['post_status'] != 'private' ) )
+	if (isset($post_data['publish']) && ('' != $post_data['publish']) && ( ! isset($post_data['post_status']) || $post_data['post_status'] != 'private'))
 		$post_data['post_status'] = 'publish';
-	if ( isset($post_data['advanced']) && '' != $post_data['advanced'] )
+	if (isset($post_data['advanced']) && '' != $post_data['advanced'])
 		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['pending']) && '' != $post_data['pending'] )
+	if (isset($post_data['pending']) && '' != $post_data['pending'])
 		$post_data['post_status'] = 'pending';
 
-	if ( isset( $post_data['ID'] ) )
+	if (isset($post_data['ID']))
 		$post_id = $post_data['ID'];
 	else
 		$post_id = false;
-	$previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false;
+	$previous_status = $post_id ? get_post_field('post_status', $post_id) : false;
 
-	if ( isset( $post_data['post_status'] ) && 'private' == $post_data['post_status'] && ! current_user_can( $ptype->cap->publish_posts ) ) {
+	if (isset($post_data['post_status']) && 'private' == $post_data['post_status'] && ! current_user_can($ptype->cap->publish_posts)) {
 		$post_data['post_status'] = $previous_status ? $previous_status : 'pending';
 	}
 
-	$published_statuses = array( 'publish', 'future' );
+	$published_statuses = array('publish', 'future');
 
 	// Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
 	// Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
-	if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) )
-		if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) )
+	if (isset($post_data['post_status']) && (in_array($post_data['post_status'], $published_statuses) && ! current_user_can($ptype->cap->publish_posts)))
+		if ( ! in_array($previous_status, $published_statuses) || ! current_user_can('edit_post', $post_id))
 			$post_data['post_status'] = 'pending';
 
-	if ( ! isset( $post_data['post_status'] ) ) {
+	if ( ! isset($post_data['post_status'])) {
 		$post_data['post_status'] = 'auto-draft' === $previous_status ? 'draft' : $previous_status;
 	}
 
-	if ( isset( $post_data['post_password'] ) && ! current_user_can( $ptype->cap->publish_posts ) ) {
-		unset( $post_data['post_password'] );
+	if (isset($post_data['post_password']) && ! current_user_can($ptype->cap->publish_posts)) {
+		unset($post_data['post_password']);
 	}
 
-	if (!isset( $post_data['comment_status'] ))
+	if ( ! isset($post_data['comment_status']))
 		$post_data['comment_status'] = 'closed';
 
-	if (!isset( $post_data['ping_status'] ))
+	if ( ! isset($post_data['ping_status']))
 		$post_data['ping_status'] = 'closed';
 
-	foreach ( array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
-		if ( !empty( $post_data['hidden_' . $timeunit] ) && $post_data['hidden_' . $timeunit] != $post_data[$timeunit] ) {
+	foreach (array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit) {
+		if ( ! empty($post_data['hidden_'.$timeunit]) && $post_data['hidden_'.$timeunit] != $post_data[$timeunit]) {
 			$post_data['edit_date'] = '1';
 			break;
 		}
 	}
 
-	if ( !empty( $post_data['edit_date'] ) ) {
+	if ( ! empty($post_data['edit_date'])) {
 		$aa = $post_data['aa'];
 		$mm = $post_data['mm'];
 		$jj = $post_data['jj'];
 		$hh = $post_data['hh'];
 		$mn = $post_data['mn'];
 		$ss = $post_data['ss'];
-		$aa = ($aa <= 0 ) ? date('Y') : $aa;
-		$mm = ($mm <= 0 ) ? date('n') : $mm;
-		$jj = ($jj > 31 ) ? 31 : $jj;
-		$jj = ($jj <= 0 ) ? date('j') : $jj;
-		$hh = ($hh > 23 ) ? $hh -24 : $hh;
-		$mn = ($mn > 59 ) ? $mn -60 : $mn;
-		$ss = ($ss > 59 ) ? $ss -60 : $ss;
-		$post_data['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
-		$valid_date = wp_checkdate( $mm, $jj, $aa, $post_data['post_date'] );
-		if ( !$valid_date ) {
-			return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) );
+		$aa = ($aa <= 0) ? date('Y') : $aa;
+		$mm = ($mm <= 0) ? date('n') : $mm;
+		$jj = ($jj > 31) ? 31 : $jj;
+		$jj = ($jj <= 0) ? date('j') : $jj;
+		$hh = ($hh > 23) ? $hh - 24 : $hh;
+		$mn = ($mn > 59) ? $mn - 60 : $mn;
+		$ss = ($ss > 59) ? $ss - 60 : $ss;
+		$post_data['post_date'] = sprintf("%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss);
+		$valid_date = wp_checkdate($mm, $jj, $aa, $post_data['post_date']);
+		if ( ! $valid_date) {
+			return new WP_Error('invalid_date', __('Whoops, the provided date is invalid.'));
 		}
-		$post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
+		$post_data['post_date_gmt'] = get_gmt_from_date($post_data['post_date']);
 	}
 
-	if ( isset( $post_data['post_category'] ) ) {
-		$category_object = get_taxonomy( 'category' );
-		if ( ! current_user_can( $category_object->cap->assign_terms ) ) {
-			unset( $post_data['post_category'] );
+	if (isset($post_data['post_category'])) {
+		$category_object = get_taxonomy('category');
+		if ( ! current_user_can($category_object->cap->assign_terms)) {
+			unset($post_data['post_category']);
 		}
 	}
 
@@ -185,149 +185,149 @@ 
  * @param array $post_data Optional.
  * @return int Post ID.
  */
-function edit_post( $post_data = null ) {
+function edit_post($post_data = null) {
 	global $wpdb;
 
-	if ( empty($post_data) )
+	if (empty($post_data))
 		$post_data = &$_POST;
 
 	// Clear out any data in internal vars.
-	unset( $post_data['filter'] );
+	unset($post_data['filter']);
 
 	$post_ID = (int) $post_data['post_ID'];
-	$post = get_post( $post_ID );
+	$post = get_post($post_ID);
 	$post_data['post_type'] = $post->post_type;
 	$post_data['post_mime_type'] = $post->post_mime_type;
 
-	if ( ! empty( $post_data['post_status'] ) ) {
-		$post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+	if ( ! empty($post_data['post_status'])) {
+		$post_data['post_status'] = sanitize_key($post_data['post_status']);
 
-		if ( 'inherit' == $post_data['post_status'] ) {
-			unset( $post_data['post_status'] );
+		if ('inherit' == $post_data['post_status']) {
+			unset($post_data['post_status']);
 		}
 	}
 
 	$ptype = get_post_type_object($post_data['post_type']);
-	if ( !current_user_can( 'edit_post', $post_ID ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			wp_die( __('Sorry, you are not allowed to edit this page.' ));
+	if ( ! current_user_can('edit_post', $post_ID)) {
+		if ('page' == $post_data['post_type'])
+			wp_die(__('Sorry, you are not allowed to edit this page.'));
 		else
-			wp_die( __('Sorry, you are not allowed to edit this post.' ));
+			wp_die(__('Sorry, you are not allowed to edit this post.'));
 	}
 
-	if ( post_type_supports( $ptype->name, 'revisions' ) ) {
-		$revisions = wp_get_post_revisions( $post_ID, array( 'order' => 'ASC', 'posts_per_page' => 1 ) );
-		$revision = current( $revisions );
+	if (post_type_supports($ptype->name, 'revisions')) {
+		$revisions = wp_get_post_revisions($post_ID, array('order' => 'ASC', 'posts_per_page' => 1));
+		$revision = current($revisions);
 
 		// Check if the revisions have been upgraded
-		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 )
-			_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+		if ($revisions && _wp_get_post_revision_version($revision) < 1)
+			_wp_upgrade_revisions_of_post($post, wp_get_post_revisions($post_ID));
 	}
 
-	if ( isset($post_data['visibility']) ) {
-		switch ( $post_data['visibility'] ) {
+	if (isset($post_data['visibility'])) {
+		switch ($post_data['visibility']) {
 			case 'public' :
 				$post_data['post_password'] = '';
 				break;
 			case 'password' :
-				unset( $post_data['sticky'] );
+				unset($post_data['sticky']);
 				break;
 			case 'private' :
 				$post_data['post_status'] = 'private';
 				$post_data['post_password'] = '';
-				unset( $post_data['sticky'] );
+				unset($post_data['sticky']);
 				break;
 		}
 	}
 
-	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error($post_data) )
-		wp_die( $post_data->get_error_message() );
+	$post_data = _wp_translate_postdata(true, $post_data);
+	if (is_wp_error($post_data))
+		wp_die($post_data->get_error_message());
 
 	// Post Formats
-	if ( isset( $post_data['post_format'] ) )
-		set_post_format( $post_ID, $post_data['post_format'] );
+	if (isset($post_data['post_format']))
+		set_post_format($post_ID, $post_data['post_format']);
 
-	$format_meta_urls = array( 'url', 'link_url', 'quote_source_url' );
-	foreach ( $format_meta_urls as $format_meta_url ) {
-		$keyed = '_format_' . $format_meta_url;
-		if ( isset( $post_data[ $keyed ] ) )
-			update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
+	$format_meta_urls = array('url', 'link_url', 'quote_source_url');
+	foreach ($format_meta_urls as $format_meta_url) {
+		$keyed = '_format_'.$format_meta_url;
+		if (isset($post_data[$keyed]))
+			update_post_meta($post_ID, $keyed, wp_slash(esc_url_raw(wp_unslash($post_data[$keyed]))));
 	}
 
-	$format_keys = array( 'quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed' );
+	$format_keys = array('quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed');
 
-	foreach ( $format_keys as $key ) {
-		$keyed = '_format_' . $key;
-		if ( isset( $post_data[ $keyed ] ) ) {
-			if ( current_user_can( 'unfiltered_html' ) )
-				update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
+	foreach ($format_keys as $key) {
+		$keyed = '_format_'.$key;
+		if (isset($post_data[$keyed])) {
+			if (current_user_can('unfiltered_html'))
+				update_post_meta($post_ID, $keyed, $post_data[$keyed]);
 			else
-				update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+				update_post_meta($post_ID, $keyed, wp_filter_post_kses($post_data[$keyed]));
 		}
 	}
 
-	if ( 'attachment' === $post_data['post_type'] && preg_match( '#^(audio|video)/#', $post_data['post_mime_type'] ) ) {
-		$id3data = wp_get_attachment_metadata( $post_ID );
-		if ( ! is_array( $id3data ) ) {
+	if ('attachment' === $post_data['post_type'] && preg_match('#^(audio|video)/#', $post_data['post_mime_type'])) {
+		$id3data = wp_get_attachment_metadata($post_ID);
+		if ( ! is_array($id3data)) {
 			$id3data = array();
 		}
 
-		foreach ( wp_get_attachment_id3_keys( $post, 'edit' ) as $key => $label ) {
-			if ( isset( $post_data[ 'id3_' . $key ] ) ) {
-				$id3data[ $key ] = sanitize_text_field( wp_unslash( $post_data[ 'id3_' . $key ] ) );
+		foreach (wp_get_attachment_id3_keys($post, 'edit') as $key => $label) {
+			if (isset($post_data['id3_'.$key])) {
+				$id3data[$key] = sanitize_text_field(wp_unslash($post_data['id3_'.$key]));
 			}
 		}
-		wp_update_attachment_metadata( $post_ID, $id3data );
+		wp_update_attachment_metadata($post_ID, $id3data);
 	}
 
 	// Meta Stuff
-	if ( isset($post_data['meta']) && $post_data['meta'] ) {
-		foreach ( $post_data['meta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
+	if (isset($post_data['meta']) && $post_data['meta']) {
+		foreach ($post_data['meta'] as $key => $value) {
+			if ( ! $meta = get_post_meta_by_id($key))
 				continue;
-			if ( $meta->post_id != $post_ID )
+			if ($meta->post_id != $post_ID)
 				continue;
-			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) )
+			if (is_protected_meta($value['key'], 'post') || ! current_user_can('edit_post_meta', $post_ID, $value['key']))
 				continue;
-			update_meta( $key, $value['key'], $value['value'] );
+			update_meta($key, $value['key'], $value['value']);
 		}
 	}
 
-	if ( isset($post_data['deletemeta']) && $post_data['deletemeta'] ) {
-		foreach ( $post_data['deletemeta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
+	if (isset($post_data['deletemeta']) && $post_data['deletemeta']) {
+		foreach ($post_data['deletemeta'] as $key => $value) {
+			if ( ! $meta = get_post_meta_by_id($key))
 				continue;
-			if ( $meta->post_id != $post_ID )
+			if ($meta->post_id != $post_ID)
 				continue;
-			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) )
+			if (is_protected_meta($meta->meta_key, 'post') || ! current_user_can('delete_post_meta', $post_ID, $meta->meta_key))
 				continue;
-			delete_meta( $key );
+			delete_meta($key);
 		}
 	}
 
 	// Attachment stuff
-	if ( 'attachment' == $post_data['post_type'] ) {
-		if ( isset( $post_data[ '_wp_attachment_image_alt' ] ) ) {
-			$image_alt = wp_unslash( $post_data['_wp_attachment_image_alt'] );
-			if ( $image_alt != get_post_meta( $post_ID, '_wp_attachment_image_alt', true ) ) {
-				$image_alt = wp_strip_all_tags( $image_alt, true );
+	if ('attachment' == $post_data['post_type']) {
+		if (isset($post_data['_wp_attachment_image_alt'])) {
+			$image_alt = wp_unslash($post_data['_wp_attachment_image_alt']);
+			if ($image_alt != get_post_meta($post_ID, '_wp_attachment_image_alt', true)) {
+				$image_alt = wp_strip_all_tags($image_alt, true);
 				// update_meta expects slashed.
-				update_post_meta( $post_ID, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
+				update_post_meta($post_ID, '_wp_attachment_image_alt', wp_slash($image_alt));
 			}
 		}
 
-		$attachment_data = isset( $post_data['attachments'][ $post_ID ] ) ? $post_data['attachments'][ $post_ID ] : array();
+		$attachment_data = isset($post_data['attachments'][$post_ID]) ? $post_data['attachments'][$post_ID] : array();
 
 		/** This filter is documented in wp-admin/includes/media.php */
-		$post_data = apply_filters( 'attachment_fields_to_save', $post_data, $attachment_data );
+		$post_data = apply_filters('attachment_fields_to_save', $post_data, $attachment_data);
 	}
 
 	// Convert taxonomy input to term IDs, to avoid ambiguity.
-	if ( isset( $post_data['tax_input'] ) ) {
-		foreach ( (array) $post_data['tax_input'] as $taxonomy => $terms ) {
+	if (isset($post_data['tax_input'])) {
+		foreach ((array) $post_data['tax_input'] as $taxonomy => $terms) {
 			// Hierarchical taxonomy data is already sent as term IDs, so no conversion is necessary.
-			if ( is_taxonomy_hierarchical( $taxonomy ) ) {
+			if (is_taxonomy_hierarchical($taxonomy)) {
 				continue;
 			}
 
@@ -336,67 +336,67 @@ 
 			 * Some languages may use a character other than a comma as a delimiter, so we standardize on
 			 * commas before parsing the list.
 			 */
-			if ( ! is_array( $terms ) ) {
-				$comma = _x( ',', 'tag delimiter' );
-				if ( ',' !== $comma ) {
-					$terms = str_replace( $comma, ',', $terms );
+			if ( ! is_array($terms)) {
+				$comma = _x(',', 'tag delimiter');
+				if (',' !== $comma) {
+					$terms = str_replace($comma, ',', $terms);
 				}
-				$terms = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
+				$terms = explode(',', trim($terms, " \n\t\r\0\x0B,"));
 			}
 
 			$clean_terms = array();
-			foreach ( $terms as $term ) {
+			foreach ($terms as $term) {
 				// Empty terms are invalid input.
-				if ( empty( $term ) ) {
+				if (empty($term)) {
 					continue;
 				}
 
-				$_term = get_terms( $taxonomy, array(
+				$_term = get_terms($taxonomy, array(
 					'name' => $term,
 					'fields' => 'ids',
 					'hide_empty' => false,
-				) );
+				));
 
-				if ( ! empty( $_term ) ) {
-					$clean_terms[] = intval( $_term[0] );
+				if ( ! empty($_term)) {
+					$clean_terms[] = intval($_term[0]);
 				} else {
 					// No existing term was found, so pass the string. A new term will be created.
 					$clean_terms[] = $term;
 				}
 			}
 
-			$post_data['tax_input'][ $taxonomy ] = $clean_terms;
+			$post_data['tax_input'][$taxonomy] = $clean_terms;
 		}
 	}
 
-	add_meta( $post_ID );
+	add_meta($post_ID);
 
-	update_post_meta( $post_ID, '_edit_last', get_current_user_id() );
+	update_post_meta($post_ID, '_edit_last', get_current_user_id());
 
-	$success = wp_update_post( $post_data );
+	$success = wp_update_post($post_data);
 	// If the save failed, see if we can sanity check the main fields and try again
-	if ( ! $success && is_callable( array( $wpdb, 'strip_invalid_text_for_column' ) ) ) {
-		$fields = array( 'post_title', 'post_content', 'post_excerpt' );
+	if ( ! $success && is_callable(array($wpdb, 'strip_invalid_text_for_column'))) {
+		$fields = array('post_title', 'post_content', 'post_excerpt');
 
-		foreach ( $fields as $field ) {
-			if ( isset( $post_data[ $field ] ) ) {
-				$post_data[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->posts, $field, $post_data[ $field ] );
+		foreach ($fields as $field) {
+			if (isset($post_data[$field])) {
+				$post_data[$field] = $wpdb->strip_invalid_text_for_column($wpdb->posts, $field, $post_data[$field]);
 			}
 		}
 
-		wp_update_post( $post_data );
+		wp_update_post($post_data);
 	}
 
 	// Now that we have an ID we can fix any attachment anchor hrefs
-	_fix_attachment_links( $post_ID );
+	_fix_attachment_links($post_ID);
 
-	wp_set_post_lock( $post_ID );
+	wp_set_post_lock($post_ID);
 
-	if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) {
-		if ( ! empty( $post_data['sticky'] ) )
-			stick_post( $post_ID );
+	if (current_user_can($ptype->cap->edit_others_posts) && current_user_can($ptype->cap->publish_posts)) {
+		if ( ! empty($post_data['sticky']))
+			stick_post($post_ID);
 		else
-			unstick_post( $post_ID );
+			unstick_post($post_ID);
 	}
 
 	return $post_ID;
@@ -415,22 +415,22 @@ 
  * @param array $post_data Optional, the array of post data to process if not provided will use $_POST superglobal.
  * @return array
  */
-function bulk_edit_posts( $post_data = null ) {
+function bulk_edit_posts($post_data = null) {
 	global $wpdb;
 
-	if ( empty($post_data) )
+	if (empty($post_data))
 		$post_data = &$_POST;
 
-	if ( isset($post_data['post_type']) )
+	if (isset($post_data['post_type']))
 		$ptype = get_post_type_object($post_data['post_type']);
 	else
 		$ptype = get_post_type_object('post');
 
-	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			wp_die( __('Sorry, you are not allowed to edit pages.'));
+	if ( ! current_user_can($ptype->cap->edit_posts)) {
+		if ('page' == $ptype->name)
+			wp_die(__('Sorry, you are not allowed to edit pages.'));
 		else
-			wp_die( __('Sorry, you are not allowed to edit posts.'));
+			wp_die(__('Sorry, you are not allowed to edit posts.'));
 	}
 
 	if ( -1 == $post_data['_status'] ) {
@@ -441,15 +441,15 @@ 
 	}
 	unset($post_data['_status']);
 
-	if ( ! empty( $post_data['post_status'] ) ) {
-		$post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+	if ( ! empty($post_data['post_status'])) {
+		$post_data['post_status'] = sanitize_key($post_data['post_status']);
 
-		if ( 'inherit' == $post_data['post_status'] ) {
-			unset( $post_data['post_status'] );
+		if ('inherit' == $post_data['post_status']) {
+			unset($post_data['post_status']);
 		}
 	}
 
-	$post_IDs = array_map( 'intval', (array) $post_data['post'] );
+	$post_IDs = array_map('intval', (array) $post_data['post']);
 
 	$reset = array(
 		'post_author', 'post_status', 'post_password',
@@ -458,43 +458,43 @@ 
 		'post_category', 'sticky', 'post_format',
 	);
 
-	foreach ( $reset as $field ) {
-		if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) )
+	foreach ($reset as $field) {
+		if (isset($post_data[$field]) && ('' == $post_data[$field] || -1 == $post_data[$field]))
 			unset($post_data[$field]);
 	}
 
-	if ( isset($post_data['post_category']) ) {
-		if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) )
-			$new_cats = array_map( 'absint', $post_data['post_category'] );
+	if (isset($post_data['post_category'])) {
+		if (is_array($post_data['post_category']) && ! empty($post_data['post_category']))
+			$new_cats = array_map('absint', $post_data['post_category']);
 		else
 			unset($post_data['post_category']);
 	}
 
 	$tax_input = array();
-	if ( isset($post_data['tax_input'])) {
-		foreach ( $post_data['tax_input'] as $tax_name => $terms ) {
-			if ( empty($terms) )
+	if (isset($post_data['tax_input'])) {
+		foreach ($post_data['tax_input'] as $tax_name => $terms) {
+			if (empty($terms))
 				continue;
-			if ( is_taxonomy_hierarchical( $tax_name ) ) {
-				$tax_input[ $tax_name ] = array_map( 'absint', $terms );
+			if (is_taxonomy_hierarchical($tax_name)) {
+				$tax_input[$tax_name] = array_map('absint', $terms);
 			} else {
-				$comma = _x( ',', 'tag delimiter' );
-				if ( ',' !== $comma )
-					$terms = str_replace( $comma, ',', $terms );
-				$tax_input[ $tax_name ] = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
+				$comma = _x(',', 'tag delimiter');
+				if (',' !== $comma)
+					$terms = str_replace($comma, ',', $terms);
+				$tax_input[$tax_name] = explode(',', trim($terms, " \n\t\r\0\x0B,"));
 			}
 		}
 	}
 
-	if ( isset($post_data['post_parent']) && ($parent = (int) $post_data['post_parent']) ) {
+	if (isset($post_data['post_parent']) && ($parent = (int) $post_data['post_parent'])) {
 		$pages = $wpdb->get_results("SELECT ID, post_parent FROM $wpdb->posts WHERE post_type = 'page'");
 		$children = array();
 
-		for ( $i = 0; $i < 50 && $parent > 0; $i++ ) {
+		for ($i = 0; $i < 50 && $parent > 0; $i++) {
 			$children[] = $parent;
 
-			foreach ( $pages as $page ) {
-				if ( $page->ID == $parent ) {
+			foreach ($pages as $page) {
+				if ($page->ID == $parent) {
 					$parent = $page->post_parent;
 					break;
 				}
@@ -505,78 +505,78 @@ 
 	$updated = $skipped = $locked = array();
 	$shared_post_data = $post_data;
 
-	foreach ( $post_IDs as $post_ID ) {
+	foreach ($post_IDs as $post_ID) {
 		// Start with fresh post data with each iteration.
 		$post_data = $shared_post_data;
 
-		$post_type_object = get_post_type_object( get_post_type( $post_ID ) );
+		$post_type_object = get_post_type_object(get_post_type($post_ID));
 
-		if ( !isset( $post_type_object ) || ( isset($children) && in_array($post_ID, $children) ) || !current_user_can( 'edit_post', $post_ID ) ) {
+		if ( ! isset($post_type_object) || (isset($children) && in_array($post_ID, $children)) || ! current_user_can('edit_post', $post_ID)) {
 			$skipped[] = $post_ID;
 			continue;
 		}
 
-		if ( wp_check_post_lock( $post_ID ) ) {
+		if (wp_check_post_lock($post_ID)) {
 			$locked[] = $post_ID;
 			continue;
 		}
 
-		$post = get_post( $post_ID );
-		$tax_names = get_object_taxonomies( $post );
-		foreach ( $tax_names as $tax_name ) {
+		$post = get_post($post_ID);
+		$tax_names = get_object_taxonomies($post);
+		foreach ($tax_names as $tax_name) {
 			$taxonomy_obj = get_taxonomy($tax_name);
-			if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
+			if (isset($tax_input[$tax_name]) && current_user_can($taxonomy_obj->cap->assign_terms))
 				$new_terms = $tax_input[$tax_name];
 			else
 				$new_terms = array();
 
-			if ( $taxonomy_obj->hierarchical )
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
+			if ($taxonomy_obj->hierarchical)
+				$current_terms = (array) wp_get_object_terms($post_ID, $tax_name, array('fields' => 'ids'));
 			else
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
+				$current_terms = (array) wp_get_object_terms($post_ID, $tax_name, array('fields' => 'names'));
 
-			$post_data['tax_input'][$tax_name] = array_merge( $current_terms, $new_terms );
+			$post_data['tax_input'][$tax_name] = array_merge($current_terms, $new_terms);
 		}
 
-		if ( isset($new_cats) && in_array( 'category', $tax_names ) ) {
+		if (isset($new_cats) && in_array('category', $tax_names)) {
 			$cats = (array) wp_get_post_categories($post_ID);
-			$post_data['post_category'] = array_unique( array_merge($cats, $new_cats) );
-			unset( $post_data['tax_input']['category'] );
+			$post_data['post_category'] = array_unique(array_merge($cats, $new_cats));
+			unset($post_data['tax_input']['category']);
 		}
 
 		$post_data['post_type'] = $post->post_type;
 		$post_data['post_mime_type'] = $post->post_mime_type;
 		$post_data['guid'] = $post->guid;
 
-		foreach ( array( 'comment_status', 'ping_status', 'post_author' ) as $field ) {
-			if ( ! isset( $post_data[ $field ] ) ) {
-				$post_data[ $field ] = $post->$field;
+		foreach (array('comment_status', 'ping_status', 'post_author') as $field) {
+			if ( ! isset($post_data[$field])) {
+				$post_data[$field] = $post->$field;
 			}
 		}
 
 		$post_data['ID'] = $post_ID;
 		$post_data['post_ID'] = $post_ID;
 
-		$post_data = _wp_translate_postdata( true, $post_data );
-		if ( is_wp_error( $post_data ) ) {
+		$post_data = _wp_translate_postdata(true, $post_data);
+		if (is_wp_error($post_data)) {
 			$skipped[] = $post_ID;
 			continue;
 		}
 
-		$updated[] = wp_update_post( $post_data );
+		$updated[] = wp_update_post($post_data);
 
-		if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
-			if ( 'sticky' == $post_data['sticky'] )
-				stick_post( $post_ID );
+		if (isset($post_data['sticky']) && current_user_can($ptype->cap->edit_others_posts)) {
+			if ('sticky' == $post_data['sticky'])
+				stick_post($post_ID);
 			else
-				unstick_post( $post_ID );
+				unstick_post($post_ID);
 		}
 
-		if ( isset( $post_data['post_format'] ) )
-			set_post_format( $post_ID, $post_data['post_format'] );
+		if (isset($post_data['post_format']))
+			set_post_format($post_ID, $post_data['post_format']);
 	}
 
-	return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked );
+	return array('updated' => $updated, 'skipped' => $skipped, 'locked' => $locked);
 }
 
 /**
@@ -588,24 +588,24 @@ 
  * @param bool   $create_in_db Optional. Whether to insert the post into database. Default false.
  * @return WP_Post Post object containing all the default post data as attributes
  */
-function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
+function get_default_post_to_edit($post_type = 'post', $create_in_db = false) {
 	$post_title = '';
-	if ( !empty( $_REQUEST['post_title'] ) )
-		$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ));
+	if ( ! empty($_REQUEST['post_title']))
+		$post_title = esc_html(wp_unslash($_REQUEST['post_title']));
 
 	$post_content = '';
-	if ( !empty( $_REQUEST['content'] ) )
-		$post_content = esc_html( wp_unslash( $_REQUEST['content'] ));
+	if ( ! empty($_REQUEST['content']))
+		$post_content = esc_html(wp_unslash($_REQUEST['content']));
 
 	$post_excerpt = '';
-	if ( !empty( $_REQUEST['excerpt'] ) )
-		$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ));
-
-	if ( $create_in_db ) {
-		$post_id = wp_insert_post( array( 'post_title' => __( 'Auto Draft' ), 'post_type' => $post_type, 'post_status' => 'auto-draft' ) );
-		$post = get_post( $post_id );
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) )
-			set_post_format( $post, get_option( 'default_post_format' ) );
+	if ( ! empty($_REQUEST['excerpt']))
+		$post_excerpt = esc_html(wp_unslash($_REQUEST['excerpt']));
+
+	if ($create_in_db) {
+		$post_id = wp_insert_post(array('post_title' => __('Auto Draft'), 'post_type' => $post_type, 'post_status' => 'auto-draft'));
+		$post = get_post($post_id);
+		if (current_theme_supports('post-formats') && post_type_supports($post->post_type, 'post-formats') && get_option('default_post_format'))
+			set_post_format($post, get_option('default_post_format'));
 	} else {
 		$post = new stdClass;
 		$post->ID = 0;
@@ -618,14 +618,14 @@ 
 		$post->post_status = 'draft';
 		$post->to_ping = '';
 		$post->pinged = '';
-		$post->comment_status = get_default_comment_status( $post_type );
-		$post->ping_status = get_default_comment_status( $post_type, 'pingback' );
-		$post->post_pingback = get_option( 'default_pingback_flag' );
-		$post->post_category = get_option( 'default_category' );
+		$post->comment_status = get_default_comment_status($post_type);
+		$post->ping_status = get_default_comment_status($post_type, 'pingback');
+		$post->post_pingback = get_option('default_pingback_flag');
+		$post->post_category = get_option('default_category');
 		$post->page_template = 'default';
 		$post->post_parent = 0;
 		$post->menu_order = 0;
-		$post = new WP_Post( $post );
+		$post = new WP_Post($post);
 	}
 
 	/**
@@ -636,7 +636,7 @@ 
 	 * @param string  $post_content Default post content.
 	 * @param WP_Post $post         Post object.
 	 */
-	$post->post_content = apply_filters( 'default_content', $post_content, $post );
+	$post->post_content = apply_filters('default_content', $post_content, $post);
 
 	/**
 	 * Filters the default post title initially used in the "Write Post" form.
@@ -646,7 +646,7 @@ 
 	 * @param string  $post_title Default post title.
 	 * @param WP_Post $post       Post object.
 	 */
-	$post->post_title = apply_filters( 'default_title', $post_title, $post );
+	$post->post_title = apply_filters('default_title', $post_title, $post);
 
 	/**
 	 * Filters the default post excerpt initially used in the "Write Post" form.
@@ -656,7 +656,7 @@ 
 	 * @param string  $post_excerpt Default post excerpt.
 	 * @param WP_Post $post         Post object.
 	 */
-	$post->post_excerpt = apply_filters( 'default_excerpt', $post_excerpt, $post );
+	$post->post_excerpt = apply_filters('default_excerpt', $post_excerpt, $post);
 
 	return $post;
 }
@@ -676,30 +676,30 @@ 
 function post_exists($title, $content = '', $date = '') {
 	global $wpdb;
 
-	$post_title = wp_unslash( sanitize_post_field( 'post_title', $title, 0, 'db' ) );
-	$post_content = wp_unslash( sanitize_post_field( 'post_content', $content, 0, 'db' ) );
-	$post_date = wp_unslash( sanitize_post_field( 'post_date', $date, 0, 'db' ) );
+	$post_title = wp_unslash(sanitize_post_field('post_title', $title, 0, 'db'));
+	$post_content = wp_unslash(sanitize_post_field('post_content', $content, 0, 'db'));
+	$post_date = wp_unslash(sanitize_post_field('post_date', $date, 0, 'db'));
 
 	$query = "SELECT ID FROM $wpdb->posts WHERE 1=1";
 	$args = array();
 
-	if ( !empty ( $date ) ) {
+	if ( ! empty ($date)) {
 		$query .= ' AND post_date = %s';
 		$args[] = $post_date;
 	}
 
-	if ( !empty ( $title ) ) {
+	if ( ! empty ($title)) {
 		$query .= ' AND post_title = %s';
 		$args[] = $post_title;
 	}
 
-	if ( !empty ( $content ) ) {
+	if ( ! empty ($content)) {
 		$query .= ' AND post_content = %s';
 		$args[] = $post_content;
 	}
 
-	if ( !empty ( $args ) )
-		return (int) $wpdb->get_var( $wpdb->prepare($query, $args) );
+	if ( ! empty ($args))
+		return (int) $wpdb->get_var($wpdb->prepare($query, $args));
 
 	return 0;
 }
@@ -714,63 +714,63 @@ 
  * @return int|WP_Error
  */
 function wp_write_post() {
-	if ( isset($_POST['post_type']) )
+	if (isset($_POST['post_type']))
 		$ptype = get_post_type_object($_POST['post_type']);
 	else
 		$ptype = get_post_type_object('post');
 
-	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			return new WP_Error( 'edit_pages', __( 'Sorry, you are not allowed to create pages on this site.' ) );
+	if ( ! current_user_can($ptype->cap->edit_posts)) {
+		if ('page' == $ptype->name)
+			return new WP_Error('edit_pages', __('Sorry, you are not allowed to create pages on this site.'));
 		else
-			return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to create posts or drafts on this site.' ) );
+			return new WP_Error('edit_posts', __('Sorry, you are not allowed to create posts or drafts on this site.'));
 	}
 
 	$_POST['post_mime_type'] = '';
 
 	// Clear out any data in internal vars.
-	unset( $_POST['filter'] );
+	unset($_POST['filter']);
 
 	// Edit don't write if we have a post id.
-	if ( isset( $_POST['post_ID'] ) )
+	if (isset($_POST['post_ID']))
 		return edit_post();
 
-	if ( isset($_POST['visibility']) ) {
-		switch ( $_POST['visibility'] ) {
+	if (isset($_POST['visibility'])) {
+		switch ($_POST['visibility']) {
 			case 'public' :
 				$_POST['post_password'] = '';
 				break;
 			case 'password' :
-				unset( $_POST['sticky'] );
+				unset($_POST['sticky']);
 				break;
 			case 'private' :
 				$_POST['post_status'] = 'private';
 				$_POST['post_password'] = '';
-				unset( $_POST['sticky'] );
+				unset($_POST['sticky']);
 				break;
 		}
 	}
 
-	$translated = _wp_translate_postdata( false );
-	if ( is_wp_error($translated) )
+	$translated = _wp_translate_postdata(false);
+	if (is_wp_error($translated))
 		return $translated;
 
 	// Create the post.
-	$post_ID = wp_insert_post( $_POST );
-	if ( is_wp_error( $post_ID ) )
+	$post_ID = wp_insert_post($_POST);
+	if (is_wp_error($post_ID))
 		return $post_ID;
 
-	if ( empty($post_ID) )
+	if (empty($post_ID))
 		return 0;
 
-	add_meta( $post_ID );
+	add_meta($post_ID);
 
-	add_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );
+	add_post_meta($post_ID, '_edit_last', $GLOBALS['current_user']->ID);
 
 	// Now that we have an ID we can fix any attachment anchor hrefs
-	_fix_attachment_links( $post_ID );
+	_fix_attachment_links($post_ID);
 
-	wp_set_post_lock( $post_ID );
+	wp_set_post_lock($post_ID);
 
 	return $post_ID;
 }
@@ -784,8 +784,8 @@ 
  */
 function write_post() {
 	$result = wp_write_post();
-	if ( is_wp_error( $result ) )
-		wp_die( $result->get_error_message() );
+	if (is_wp_error($result))
+		wp_die($result->get_error_message());
 	else
 		return $result;
 }
@@ -802,32 +802,32 @@ 
  * @param int $post_ID
  * @return int|bool
  */
-function add_meta( $post_ID ) {
+function add_meta($post_ID) {
 	$post_ID = (int) $post_ID;
 
-	$metakeyselect = isset($_POST['metakeyselect']) ? wp_unslash( trim( $_POST['metakeyselect'] ) ) : '';
-	$metakeyinput = isset($_POST['metakeyinput']) ? wp_unslash( trim( $_POST['metakeyinput'] ) ) : '';
+	$metakeyselect = isset($_POST['metakeyselect']) ? wp_unslash(trim($_POST['metakeyselect'])) : '';
+	$metakeyinput = isset($_POST['metakeyinput']) ? wp_unslash(trim($_POST['metakeyinput'])) : '';
 	$metavalue = isset($_POST['metavalue']) ? $_POST['metavalue'] : '';
-	if ( is_string( $metavalue ) )
-		$metavalue = trim( $metavalue );
+	if (is_string($metavalue))
+		$metavalue = trim($metavalue);
 
-	if ( ('0' === $metavalue || ! empty ( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput ) ) ) {
+	if (('0' === $metavalue || ! empty ($metavalue)) && ((('#NONE#' != $metakeyselect) && ! empty ($metakeyselect)) || ! empty ($metakeyinput))) {
 		/*
 		 * We have a key/value pair. If both the select and the input
 		 * for the key have data, the input takes precedence.
 		 */
- 		if ( '#NONE#' != $metakeyselect )
+ 		if ('#NONE#' != $metakeyselect)
 			$metakey = $metakeyselect;
 
-		if ( $metakeyinput )
+		if ($metakeyinput)
 			$metakey = $metakeyinput; // default
 
-		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) )
+		if (is_protected_meta($metakey, 'post') || ! current_user_can('add_post_meta', $post_ID, $metakey))
 			return false;
 
-		$metakey = wp_slash( $metakey );
+		$metakey = wp_slash($metakey);
 
-		return add_post_meta( $post_ID, $metakey, $metavalue );
+		return add_post_meta($post_ID, $metakey, $metavalue);
 	}
 
 	return false;
@@ -841,8 +841,8 @@ 
  * @param int $mid
  * @return bool
  */
-function delete_meta( $mid ) {
-	return delete_metadata_by_mid( 'post' , $mid );
+function delete_meta($mid) {
+	return delete_metadata_by_mid('post', $mid);
 }
 
 /**
@@ -857,11 +857,11 @@ 
 function get_meta_keys() {
 	global $wpdb;
 
-	$keys = $wpdb->get_col( "
+	$keys = $wpdb->get_col("
 			SELECT meta_key
 			FROM $wpdb->postmeta
 			GROUP BY meta_key
-			ORDER BY meta_key" );
+			ORDER BY meta_key");
 
 	return $keys;
 }
@@ -874,8 +874,8 @@ 
  * @param int $mid
  * @return object|bool
  */
-function get_post_meta_by_id( $mid ) {
-	return get_metadata_by_mid( 'post', $mid );
+function get_post_meta_by_id($mid) {
+	return get_metadata_by_mid('post', $mid);
 }
 
 /**
@@ -888,12 +888,12 @@ 
  * @param int $postid
  * @return mixed
  */
-function has_meta( $postid ) {
+function has_meta($postid) {
 	global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare("SELECT meta_key, meta_value, meta_id, post_id
+	return $wpdb->get_results($wpdb->prepare("SELECT meta_key, meta_value, meta_id, post_id
 			FROM $wpdb->postmeta WHERE post_id = %d
-			ORDER BY meta_key,meta_id", $postid), ARRAY_A );
+			ORDER BY meta_key,meta_id", $postid), ARRAY_A);
 }
 
 /**
@@ -906,11 +906,11 @@ 
  * @param string $meta_value Expect Slashed
  * @return bool
  */
-function update_meta( $meta_id, $meta_key, $meta_value ) {
-	$meta_key = wp_unslash( $meta_key );
-	$meta_value = wp_unslash( $meta_value );
+function update_meta($meta_id, $meta_key, $meta_value) {
+	$meta_key = wp_unslash($meta_key);
+	$meta_value = wp_unslash($meta_value);
 
-	return update_metadata_by_mid( 'post', $meta_id, $meta_value, $meta_key );
+	return update_metadata_by_mid('post', $meta_id, $meta_value, $meta_key);
 }
 
 //
@@ -926,42 +926,42 @@ 
  * @param int|object $post Post ID or post object.
  * @return void|int|WP_Error Void if nothing fixed. 0 or WP_Error on update failure. The post ID on update success.
  */
-function _fix_attachment_links( $post ) {
-	$post = get_post( $post, ARRAY_A );
+function _fix_attachment_links($post) {
+	$post = get_post($post, ARRAY_A);
 	$content = $post['post_content'];
 
 	// Don't run if no pretty permalinks or post is not published, scheduled, or privately published.
-	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ) ) )
+	if ( ! get_option('permalink_structure') || ! in_array($post['post_status'], array('publish', 'future', 'private')))
 		return;
 
 	// Short if there aren't any links or no '?attachment_id=' strings (strpos cannot be zero)
-	if ( !strpos($content, '?attachment_id=') || !preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) )
+	if ( ! strpos($content, '?attachment_id=') || ! preg_match_all('/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches))
 		return;
 
 	$site_url = get_bloginfo('url');
-	$site_url = substr( $site_url, (int) strpos($site_url, '://') ); // remove the http(s)
+	$site_url = substr($site_url, (int) strpos($site_url, '://')); // remove the http(s)
 	$replace = '';
 
-	foreach ( $link_matches[1] as $key => $value ) {
-		if ( !strpos($value, '?attachment_id=') || !strpos($value, 'wp-att-')
-			|| !preg_match( '/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match )
-			|| !preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) )
+	foreach ($link_matches[1] as $key => $value) {
+		if ( ! strpos($value, '?attachment_id=') || ! strpos($value, 'wp-att-')
+			|| ! preg_match('/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match)
+			|| ! preg_match('/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match))
 				continue;
 
 		$quote = $url_match[1]; // the quote (single or double)
 		$url_id = (int) $url_match[2];
 		$rel_id = (int) $rel_match[1];
 
-		if ( !$url_id || !$rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false )
+		if ( ! $url_id || ! $rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false)
 			continue;
 
 		$link = $link_matches[0][$key];
-		$replace = str_replace( $url_match[0], 'href=' . $quote . get_attachment_link( $url_id ) . $quote, $link );
+		$replace = str_replace($url_match[0], 'href='.$quote.get_attachment_link($url_id).$quote, $link);
 
-		$content = str_replace( $link, $replace, $content );
+		$content = str_replace($link, $replace, $content);
 	}
 
-	if ( $replace ) {
+	if ($replace) {
 		$post['post_content'] = $content;
 		// Escape data pulled from DB.
 		$post = add_magic_quotes($post);
@@ -992,40 +992,40 @@ 
  * @param array|bool $q Array of query variables to use to build the query or false to use $_GET superglobal.
  * @return array
  */
-function wp_edit_posts_query( $q = false ) {
-	if ( false === $q )
+function wp_edit_posts_query($q = false) {
+	if (false === $q)
 		$q = $_GET;
 	$q['m'] = isset($q['m']) ? (int) $q['m'] : 0;
 	$q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
-	$post_stati  = get_post_stati();
+	$post_stati = get_post_stati();
 
-	if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) )
+	if (isset($q['post_type']) && in_array($q['post_type'], get_post_types()))
 		$post_type = $q['post_type'];
 	else
 		$post_type = 'post';
 
 	$avail_post_stati = get_available_post_statuses($post_type);
 
-	if ( isset($q['post_status']) && in_array( $q['post_status'], $post_stati ) ) {
+	if (isset($q['post_status']) && in_array($q['post_status'], $post_stati)) {
 		$post_status = $q['post_status'];
 		$perm = 'readable';
 	}
 
-	if ( isset( $q['orderby'] ) ) {
+	if (isset($q['orderby'])) {
 		$orderby = $q['orderby'];
-	} elseif ( isset( $q['post_status'] ) && in_array( $q['post_status'], array( 'pending', 'draft' ) ) ) {
+	} elseif (isset($q['post_status']) && in_array($q['post_status'], array('pending', 'draft'))) {
 		$orderby = 'modified';
 	}
 
-	if ( isset( $q['order'] ) ) {
+	if (isset($q['order'])) {
 		$order = $q['order'];
-	} elseif ( isset( $q['post_status'] ) && 'pending' == $q['post_status'] ) {
+	} elseif (isset($q['post_status']) && 'pending' == $q['post_status']) {
 		$order = 'ASC';
 	}
 
 	$per_page = "edit_{$post_type}_per_page";
-	$posts_per_page = (int) get_user_option( $per_page );
-	if ( empty( $posts_per_page ) || $posts_per_page < 1 )
+	$posts_per_page = (int) get_user_option($per_page);
+	if (empty($posts_per_page) || $posts_per_page < 1)
 		$posts_per_page = 20;
 
 	/**
@@ -1041,7 +1041,7 @@ 
 	 * @param int $posts_per_page Number of posts to display per page for the given post
 	 *                            type. Default 20.
 	 */
-	$posts_per_page = apply_filters( "edit_{$post_type}_per_page", $posts_per_page );
+	$posts_per_page = apply_filters("edit_{$post_type}_per_page", $posts_per_page);
 
 	/**
 	 * Filters the number of posts displayed per page when specifically listing "posts".
@@ -1051,12 +1051,12 @@ 
 	 * @param int    $posts_per_page Number of posts to be displayed. Default 20.
 	 * @param string $post_type      The post type.
 	 */
-	$posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page, $post_type );
+	$posts_per_page = apply_filters('edit_posts_per_page', $posts_per_page, $post_type);
 
 	$query = compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page');
 
 	// Hierarchical types require special args.
-	if ( is_post_type_hierarchical( $post_type ) && !isset($orderby) ) {
+	if (is_post_type_hierarchical($post_type) && ! isset($orderby)) {
 		$query['orderby'] = 'menu_order title';
 		$query['order'] = 'asc';
 		$query['posts_per_page'] = -1;
@@ -1064,10 +1064,10 @@ 
 		$query['fields'] = 'id=>parent';
 	}
 
-	if ( ! empty( $q['show_sticky'] ) )
-		$query['post__in'] = (array) get_option( 'sticky_posts' );
+	if ( ! empty($q['show_sticky']))
+		$query['post__in'] = (array) get_option('sticky_posts');
 
-	wp( $query );
+	wp($query);
 
 	return $avail_post_stati;
 }
@@ -1098,24 +1098,24 @@ 
  *                       to use $_GET superglobal. Default false.
  * @return array The parsed query vars.
  */
-function wp_edit_attachments_query_vars( $q = false ) {
-	if ( false === $q ) {
+function wp_edit_attachments_query_vars($q = false) {
+	if (false === $q) {
 		$q = $_GET;
 	}
-	$q['m']   = isset( $q['m'] ) ? (int) $q['m'] : 0;
-	$q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
+	$q['m']   = isset($q['m']) ? (int) $q['m'] : 0;
+	$q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
 	$q['post_type'] = 'attachment';
-	$post_type = get_post_type_object( 'attachment' );
+	$post_type = get_post_type_object('attachment');
 	$states = 'inherit';
-	if ( current_user_can( $post_type->cap->read_private_posts ) ) {
+	if (current_user_can($post_type->cap->read_private_posts)) {
 		$states .= ',private';
 	}
 
-	$q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : $states;
-	$q['post_status'] = isset( $q['attachment-filter'] ) && 'trash' == $q['attachment-filter'] ? 'trash' : $states;
+	$q['post_status'] = isset($q['status']) && 'trash' == $q['status'] ? 'trash' : $states;
+	$q['post_status'] = isset($q['attachment-filter']) && 'trash' == $q['attachment-filter'] ? 'trash' : $states;
 
-	$media_per_page = (int) get_user_option( 'upload_per_page' );
-	if ( empty( $media_per_page ) || $media_per_page < 1 ) {
+	$media_per_page = (int) get_user_option('upload_per_page');
+	if (empty($media_per_page) || $media_per_page < 1) {
 		$media_per_page = 20;
 	}
 
@@ -1126,21 +1126,21 @@ 
 	 *
 	 * @param int $media_per_page Number of media to list. Default 20.
 	 */
-	$q['posts_per_page'] = apply_filters( 'upload_per_page', $media_per_page );
+	$q['posts_per_page'] = apply_filters('upload_per_page', $media_per_page);
 
 	$post_mime_types = get_post_mime_types();
-	if ( isset($q['post_mime_type']) && !array_intersect( (array) $q['post_mime_type'], array_keys($post_mime_types) ) ) {
+	if (isset($q['post_mime_type']) && ! array_intersect((array) $q['post_mime_type'], array_keys($post_mime_types))) {
 		unset($q['post_mime_type']);
 	}
 
-	foreach ( array_keys( $post_mime_types ) as $type ) {
-		if ( isset( $q['attachment-filter'] ) && "post_mime_type:$type" == $q['attachment-filter'] ) {
+	foreach (array_keys($post_mime_types) as $type) {
+		if (isset($q['attachment-filter']) && "post_mime_type:$type" == $q['attachment-filter']) {
 			$q['post_mime_type'] = $type;
 			break;
 		}
 	}
 
-	if ( isset( $q['detached'] ) || ( isset( $q['attachment-filter'] ) && 'detached' == $q['attachment-filter'] ) ) {
+	if (isset($q['detached']) || (isset($q['attachment-filter']) && 'detached' == $q['attachment-filter'])) {
 		$q['post_parent'] = 0;
 	}
 
@@ -1156,13 +1156,13 @@ 
  * @param array|false $q Array of query variables to use to build the query or false to use $_GET superglobal.
  * @return array
  */
-function wp_edit_attachments_query( $q = false ) {
-	wp( wp_edit_attachments_query_vars( $q ) );
+function wp_edit_attachments_query($q = false) {
+	wp(wp_edit_attachments_query_vars($q));
 
 	$post_mime_types = get_post_mime_types();
-	$avail_post_mime_types = get_available_post_mime_types( 'attachment' );
+	$avail_post_mime_types = get_available_post_mime_types('attachment');
 
-	return array( $post_mime_types, $avail_post_mime_types );
+	return array($post_mime_types, $avail_post_mime_types);
 }
 
 /**
@@ -1174,17 +1174,17 @@ 
  * @param string $page
  * @return string
  */
-function postbox_classes( $id, $page ) {
-	if ( isset( $_GET['edit'] ) && $_GET['edit'] == $id ) {
-		$classes = array( '' );
-	} elseif ( $closed = get_user_option('closedpostboxes_'.$page ) ) {
-		if ( !is_array( $closed ) ) {
-			$classes = array( '' );
+function postbox_classes($id, $page) {
+	if (isset($_GET['edit']) && $_GET['edit'] == $id) {
+		$classes = array('');
+	} elseif ($closed = get_user_option('closedpostboxes_'.$page)) {
+		if ( ! is_array($closed)) {
+			$classes = array('');
 		} else {
-			$classes = in_array( $id, $closed ) ? array( 'closed' ) : array( '' );
+			$classes = in_array($id, $closed) ? array('closed') : array('');
 		}
 	} else {
-		$classes = array( '' );
+		$classes = array('');
 	}
 
 	/**
@@ -1197,8 +1197,8 @@ 
 	 *
 	 * @param array $classes An array of postbox classes.
 	 */
-	$classes = apply_filters( "postbox_classes_{$page}_{$id}", $classes );
-	return implode( ' ', $classes );
+	$classes = apply_filters("postbox_classes_{$page}_{$id}", $classes);
+	return implode(' ', $classes);
 }
 
 /**
@@ -1212,9 +1212,9 @@ 
  * @return array Array with two entries of type string.
  */
 function get_sample_permalink($id, $title = null, $name = null) {
-	$post = get_post( $id );
-	if ( ! $post )
-		return array( '', '' );
+	$post = get_post($id);
+	if ( ! $post)
+		return array('', '');
 
 	$ptype = get_post_type_object($post->post_type);
 
@@ -1223,14 +1223,14 @@ 
 	$original_name = $post->post_name;
 
 	// Hack: get_permalink() would return ugly permalink for drafts, so we will fake that our post is published.
-	if ( in_array( $post->post_status, array( 'draft', 'pending', 'future' ) ) ) {
+	if (in_array($post->post_status, array('draft', 'pending', 'future'))) {
 		$post->post_status = 'publish';
 		$post->post_name = sanitize_title($post->post_name ? $post->post_name : $post->post_title, $post->ID);
 	}
 
 	// If the user wants to set a new name -- override the current one
 	// Note: if empty name is supplied -- use the title instead, see #6072
-	if ( !is_null($name) )
+	if ( ! is_null($name))
 		$post->post_name = sanitize_title($name ? $name : $title, $post->ID);
 
 	$post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
@@ -1243,23 +1243,23 @@ 
 	$permalink = str_replace("%$post->post_type%", '%pagename%', $permalink);
 
 	// Handle page hierarchy
-	if ( $ptype->hierarchical ) {
+	if ($ptype->hierarchical) {
 		$uri = get_page_uri($post);
-		if ( $uri ) {
+		if ($uri) {
 			$uri = untrailingslashit($uri);
-			$uri = strrev( stristr( strrev( $uri ), '/' ) );
+			$uri = strrev(stristr(strrev($uri), '/'));
 			$uri = untrailingslashit($uri);
 		}
 
 		/** This filter is documented in wp-admin/edit-tag-form.php */
-		$uri = apply_filters( 'editable_slug', $uri, $post );
-		if ( !empty($uri) )
+		$uri = apply_filters('editable_slug', $uri, $post);
+		if ( ! empty($uri))
 			$uri .= '/';
 		$permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink);
 	}
 
 	/** This filter is documented in wp-admin/edit-tag-form.php */
-	$permalink = array( $permalink, apply_filters( 'editable_slug', $post->post_name, $post ) );
+	$permalink = array($permalink, apply_filters('editable_slug', $post->post_name, $post));
 	$post->post_status = $original_status;
 	$post->post_date = $original_date;
 	$post->post_name = $original_name;
@@ -1276,7 +1276,7 @@ 
 	 * @param string  $name      Post name (slug).
 	 * @param WP_Post $post      Post object.
 	 */
-	return apply_filters( 'get_sample_permalink', $permalink, $post->ID, $title, $name, $post );
+	return apply_filters('get_sample_permalink', $permalink, $post->ID, $title, $name, $post);
 }
 
 /**
@@ -1289,9 +1289,9 @@ 
  * @param string $new_slug  Optional. New slug. Default null.
  * @return string The HTML of the sample permalink slug editor.
  */
-function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
-	$post = get_post( $id );
-	if ( ! $post )
+function get_sample_permalink_html($id, $new_title = null, $new_slug = null) {
+	$post = get_post($id);
+	if ( ! $post)
 		return '';
 
 	list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
@@ -1299,50 +1299,50 @@ 
 	$view_link = false;
 	$preview_target = '';
 
-	if ( current_user_can( 'read_post', $post->ID ) ) {
-		if ( 'draft' === $post->post_status ) {
-			$view_link = get_preview_post_link( $post );
+	if (current_user_can('read_post', $post->ID)) {
+		if ('draft' === $post->post_status) {
+			$view_link = get_preview_post_link($post);
 			$preview_target = " target='wp-preview-{$post->ID}'";
 		} else {
-			if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) {
-				$view_link = get_permalink( $post );
+			if ('publish' === $post->post_status || 'attachment' === $post->post_type) {
+				$view_link = get_permalink($post);
 			} else {
 				// Allow non-published (private, future) to be viewed at a pretty permalink.
-				$view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, $permalink );
+				$view_link = str_replace(array('%pagename%', '%postname%'), $post->post_name, $permalink);
 			}
 		}
 	}
 
 	// Permalinks without a post/page name placeholder don't have anything to edit
-	if ( false === strpos( $permalink, '%postname%' ) && false === strpos( $permalink, '%pagename%' ) ) {
-		$return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
+	if (false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%')) {
+		$return = '<strong>'.__('Permalink:')."</strong>\n";
 
-		if ( false !== $view_link ) {
-			$display_link = urldecode( $view_link );
-			$return .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . esc_html( $display_link ) . "</a>\n";
+		if (false !== $view_link) {
+			$display_link = urldecode($view_link);
+			$return .= '<a id="sample-permalink" href="'.esc_url($view_link).'"'.$preview_target.'>'.esc_html($display_link)."</a>\n";
 		} else {
-			$return .= '<span id="sample-permalink">' . $permalink . "</span>\n";
+			$return .= '<span id="sample-permalink">'.$permalink."</span>\n";
 		}
 
 		// Encourage a pretty permalink setting
-		if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) ) {
-			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
+		if ('' == get_option('permalink_structure') && current_user_can('manage_options') && ! ('page' == get_option('show_on_front') && $id == get_option('page_on_front'))) {
+			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">'.__('Change Permalinks')."</a></span>\n";
 		}
 	} else {
-		if ( mb_strlen( $post_name ) > 34 ) {
-			$post_name_abridged = mb_substr( $post_name, 0, 16 ) . '&hellip;' . mb_substr( $post_name, -16 );
+		if (mb_strlen($post_name) > 34) {
+			$post_name_abridged = mb_substr($post_name, 0, 16).'&hellip;'.mb_substr($post_name, -16);
 		} else {
 			$post_name_abridged = $post_name;
 		}
 
-		$post_name_html = '<span id="editable-post-name">' . esc_html( $post_name_abridged ) . '</span>';
-		$display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, esc_html( urldecode( $permalink ) ) );
+		$post_name_html = '<span id="editable-post-name">'.esc_html($post_name_abridged).'</span>';
+		$display_link = str_replace(array('%pagename%', '%postname%'), $post_name_html, esc_html(urldecode($permalink)));
 
-		$return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
-		$return .= '<span id="sample-permalink"><a href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $display_link . "</a></span>\n";
+		$return = '<strong>'.__('Permalink:')."</strong>\n";
+		$return .= '<span id="sample-permalink"><a href="'.esc_url($view_link).'"'.$preview_target.'>'.$display_link."</a></span>\n";
 		$return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
-		$return .= '<span id="edit-slug-buttons"><button type="button" class="edit-slug button button-small hide-if-no-js" aria-label="' . __( 'Edit permalink' ) . '">' . __( 'Edit' ) . "</button></span>\n";
-		$return .= '<span id="editable-post-name-full">' . esc_html( $post_name ) . "</span>\n";
+		$return .= '<span id="edit-slug-buttons"><button type="button" class="edit-slug button button-small hide-if-no-js" aria-label="'.__('Edit permalink').'">'.__('Edit')."</button></span>\n";
+		$return .= '<span id="editable-post-name-full">'.esc_html($post_name)."</span>\n";
 	}
 
 	/**
@@ -1357,7 +1357,7 @@ 
 	 * @param string  $new_slug  New sample permalink slug.
 	 * @param WP_Post $post      Post object.
 	 */
-	$return = apply_filters( 'get_sample_permalink_html', $return, $post->ID, $new_title, $new_slug, $post );
+	$return = apply_filters('get_sample_permalink_html', $return, $post->ID, $new_title, $new_slug, $post);
 
 	return $return;
 }
@@ -1373,22 +1373,22 @@ 
  * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post.
  * @return string html
  */
-function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
+function _wp_post_thumbnail_html($thumbnail_id = null, $post = null) {
 	global $_wp_additional_image_sizes;
 
-	$post               = get_post( $post );
-	$post_type_object   = get_post_type_object( $post->post_type );
+	$post               = get_post($post);
+	$post_type_object   = get_post_type_object($post->post_type);
 	$set_thumbnail_link = '<p class="hide-if-no-js"><a href="%s" id="set-post-thumbnail"%s class="thickbox">%s</a></p>';
-	$upload_iframe_src  = get_upload_iframe_src( 'image', $post->ID );
+	$upload_iframe_src  = get_upload_iframe_src('image', $post->ID);
 
-	$content = sprintf( $set_thumbnail_link,
-		esc_url( $upload_iframe_src ),
+	$content = sprintf($set_thumbnail_link,
+		esc_url($upload_iframe_src),
 		'', // Empty when there's no featured image set, `aria-describedby` attribute otherwise.
-		esc_html( $post_type_object->labels->set_featured_image )
+		esc_html($post_type_object->labels->set_featured_image)
 	);
 
-	if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
-		$size = isset( $_wp_additional_image_sizes['post-thumbnail'] ) ? 'post-thumbnail' : array( 266, 266 );
+	if ($thumbnail_id && get_post($thumbnail_id)) {
+		$size = isset($_wp_additional_image_sizes['post-thumbnail']) ? 'post-thumbnail' : array(266, 266);
 
 		/**
 		 * Filters the size used to display the post thumbnail image in the 'Featured Image' meta box.
@@ -1407,22 +1407,22 @@ 
 		 * @param int          $thumbnail_id Post thumbnail attachment ID.
 		 * @param WP_Post      $post         The post object associated with the thumbnail.
 		 */
-		$size = apply_filters( 'admin_post_thumbnail_size', $size, $thumbnail_id, $post );
+		$size = apply_filters('admin_post_thumbnail_size', $size, $thumbnail_id, $post);
 
-		$thumbnail_html = wp_get_attachment_image( $thumbnail_id, $size );
+		$thumbnail_html = wp_get_attachment_image($thumbnail_id, $size);
 
-		if ( ! empty( $thumbnail_html ) ) {
-			$content = sprintf( $set_thumbnail_link,
-				esc_url( $upload_iframe_src ),
+		if ( ! empty($thumbnail_html)) {
+			$content = sprintf($set_thumbnail_link,
+				esc_url($upload_iframe_src),
 				' aria-describedby="set-post-thumbnail-desc"',
 				$thumbnail_html
 			);
-			$content .= '<p class="hide-if-no-js howto" id="set-post-thumbnail-desc">' . __( 'Click the image to edit or update' ) . '</p>';
-			$content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail">' . esc_html( $post_type_object->labels->remove_featured_image ) . '</a></p>';
+			$content .= '<p class="hide-if-no-js howto" id="set-post-thumbnail-desc">'.__('Click the image to edit or update').'</p>';
+			$content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail">'.esc_html($post_type_object->labels->remove_featured_image).'</a></p>';
 		}
 	}
 
-	$content .= '<input type="hidden" id="_thumbnail_id" name="_thumbnail_id" value="' . esc_attr( $thumbnail_id ? $thumbnail_id : '-1' ) . '" />';
+	$content .= '<input type="hidden" id="_thumbnail_id" name="_thumbnail_id" value="'.esc_attr($thumbnail_id ? $thumbnail_id : '-1').'" />';
 
 	/**
 	 * Filters the admin post thumbnail HTML markup to return.
@@ -1435,7 +1435,7 @@ 
 	 * @param int    $post_id      Post ID.
 	 * @param int    $thumbnail_id Thumbnail ID.
 	 */
-	return apply_filters( 'admin_post_thumbnail_html', $content, $post->ID, $thumbnail_id );
+	return apply_filters('admin_post_thumbnail_html', $content, $post->ID, $thumbnail_id);
 }
 
 /**
@@ -1446,21 +1446,21 @@ 
  * @param int $post_id ID of the post to check for editing
  * @return integer False: not locked or locked by current user. Int: user ID of user with lock.
  */
-function wp_check_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
+function wp_check_post_lock($post_id) {
+	if ( ! $post = get_post($post_id))
 		return false;
 
-	if ( !$lock = get_post_meta( $post->ID, '_edit_lock', true ) )
+	if ( ! $lock = get_post_meta($post->ID, '_edit_lock', true))
 		return false;
 
-	$lock = explode( ':', $lock );
+	$lock = explode(':', $lock);
 	$time = $lock[0];
-	$user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
+	$user = isset($lock[1]) ? $lock[1] : get_post_meta($post->ID, '_edit_last', true);
 
 	/** This filter is documented in wp-admin/includes/ajax-actions.php */
-	$time_window = apply_filters( 'wp_check_post_lock_window', 150 );
+	$time_window = apply_filters('wp_check_post_lock_window', 150);
 
-	if ( $time && $time > time() - $time_window && $user != get_current_user_id() )
+	if ($time && $time > time() - $time_window && $user != get_current_user_id())
 		return $user;
 	return false;
 }
@@ -1474,17 +1474,17 @@ 
  * @return bool|array Returns false if the post doesn't exist of there is no current user, or
  * 	an array of the lock time and the user ID.
  */
-function wp_set_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
+function wp_set_post_lock($post_id) {
+	if ( ! $post = get_post($post_id))
 		return false;
-	if ( 0 == ($user_id = get_current_user_id()) )
+	if (0 == ($user_id = get_current_user_id()))
 		return false;
 
 	$now = time();
 	$lock = "$now:$user_id";
 
-	update_post_meta( $post->ID, '_edit_lock', $lock );
-	return array( $now, $user_id );
+	update_post_meta($post->ID, '_edit_lock', $lock);
+	return array($now, $user_id);
 }
 
 /**
@@ -1494,14 +1494,14 @@ 
  * @return none
  */
 function _admin_notice_post_locked() {
-	if ( ! $post = get_post() )
+	if ( ! $post = get_post())
 		return;
 
 	$user = null;
-	if (  $user_id = wp_check_post_lock( $post->ID ) )
-		$user = get_userdata( $user_id );
+	if ($user_id = wp_check_post_lock($post->ID))
+		$user = get_userdata($user_id);
 
-	if ( $user ) {
+	if ($user) {
 
 		/**
 		 * Filters whether to show the post locked dialog.
@@ -1513,7 +1513,7 @@ 
 		 * @param bool         $display Whether to display the dialog. Default true.
 		 * @param WP_User|bool $user    WP_User object on success, false otherwise.
 		 */
-		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) )
+		if ( ! apply_filters('show_post_locked_dialog', true, $post, $user))
 			return;
 
 		$locked = true;
@@ -1521,17 +1521,17 @@ 
 		$locked = false;
 	}
 
-	if ( $locked && ( $sendback = wp_get_referer() ) &&
-		false === strpos( $sendback, 'post.php' ) && false === strpos( $sendback, 'post-new.php' ) ) {
+	if ($locked && ($sendback = wp_get_referer()) &&
+		false === strpos($sendback, 'post.php') && false === strpos($sendback, 'post-new.php')) {
 
 		$sendback_text = __('Go back');
 	} else {
-		$sendback = admin_url( 'edit.php' );
+		$sendback = admin_url('edit.php');
 
-		if ( 'post' != $post->post_type )
-			$sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
+		if ('post' != $post->post_type)
+			$sendback = add_query_arg('post_type', $post->post_type, $sendback);
 
-		$sendback_text = get_post_type_object( $post->post_type )->labels->all_items;
+		$sendback_text = get_post_type_object($post->post_type)->labels->all_items;
 	}
 
 	$hidden = $locked ? '' : ' hidden';
@@ -1542,18 +1542,18 @@ 
 	<div class="notification-dialog">
 	<?php
 
-	if ( $locked ) {
+	if ($locked) {
 		$query_args = array();
-		if ( get_post_type_object( $post->post_type )->public ) {
-			if ( 'publish' == $post->post_status || $user->ID != $post->post_author ) {
+		if (get_post_type_object($post->post_type)->public) {
+			if ('publish' == $post->post_status || $user->ID != $post->post_author) {
 				// Latest content is in autosave
-				$nonce = wp_create_nonce( 'post_preview_' . $post->ID );
+				$nonce = wp_create_nonce('post_preview_'.$post->ID);
 				$query_args['preview_id'] = $post->ID;
 				$query_args['preview_nonce'] = $nonce;
 			}
 		}
 
-		$preview_link = get_preview_post_link( $post->ID, $query_args );
+		$preview_link = get_preview_post_link($post->ID, $query_args);
 
 		/**
 		 * Filters whether to allow the post lock to be overridden.
@@ -1567,17 +1567,17 @@ 
 		 * @param WP_Post $post     Post object.
 		 * @param WP_User $user     User object.
 		 */
-		$override = apply_filters( 'override_post_lock', true, $post, $user );
+		$override = apply_filters('override_post_lock', true, $post, $user);
 		$tab_last = $override ? '' : ' wp-tab-last';
 
 		?>
 		<div class="post-locked-message">
-		<div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div>
+		<div class="post-locked-avatar"><?php echo get_avatar($user->ID, 64); ?></div>
 		<p class="currently-editing wp-tab-first" tabindex="0">
 		<?php
-			_e( 'This content is currently locked.' );
-			if ( $override )
-				printf( ' ' . __( 'If you take over, %s will be blocked from continuing to edit.' ), esc_html( $user->display_name ) );
+			_e('This content is currently locked.');
+			if ($override)
+				printf(' '.__('If you take over, %s will be blocked from continuing to edit.'), esc_html($user->display_name));
 		?>
 		</p>
 		<?php
@@ -1588,19 +1588,19 @@ 
 		 *
 		 * @param WP_Post $post Post object.
 		 */
-		do_action( 'post_locked_dialog', $post );
+		do_action('post_locked_dialog', $post);
 		?>
 		<p>
-		<a class="button" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a>
-		<?php if ( $preview_link ) { ?>
-		<a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url( $preview_link ); ?>"><?php _e('Preview'); ?></a>
+		<a class="button" href="<?php echo esc_url($sendback); ?>"><?php echo $sendback_text; ?></a>
+		<?php if ($preview_link) { ?>
+		<a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url($preview_link); ?>"><?php _e('Preview'); ?></a>
 		<?php
 		}
 
 		// Allow plugins to prevent some users overriding the post lock
-		if ( $override ) {
+		if ($override) {
 			?>
-			<a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', wp_nonce_url( get_edit_post_link( $post->ID, 'url' ), 'lock-post_' . $post->ID ) ) ); ?>"><?php _e('Take over'); ?></a>
+			<a class="button button-primary wp-tab-last" href="<?php echo esc_url(add_query_arg('get-post-lock', '1', wp_nonce_url(get_edit_post_link($post->ID, 'url'), 'lock-post_'.$post->ID))); ?>"><?php _e('Take over'); ?></a>
 			<?php
 		}
 
@@ -1614,7 +1614,7 @@ 
 			<div class="post-locked-avatar"></div>
 			<p class="wp-tab-first" tabindex="0">
 			<span class="currently-editing"></span><br />
-			<span class="locked-saving hidden"><img src="<?php echo esc_url( admin_url( 'images/spinner-2x.gif' ) ); ?>" width="16" height="16" alt="" /> <?php _e( 'Saving revision&hellip;' ); ?></span>
+			<span class="locked-saving hidden"><img src="<?php echo esc_url(admin_url('images/spinner-2x.gif')); ?>" width="16" height="16" alt="" /> <?php _e('Saving revision&hellip;'); ?></span>
 			<span class="locked-saved hidden"><?php _e('Your latest changes were saved as a revision.'); ?></span>
 			</p>
 			<?php
@@ -1625,9 +1625,9 @@ 
 			 *
 			 * @param WP_Post $post Post object.
 			 */
-			do_action( 'post_lock_lost_dialog', $post );
+			do_action('post_lock_lost_dialog', $post);
 			?>
-			<p><a class="button button-primary wp-tab-last" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a></p>
+			<p><a class="button button-primary wp-tab-last" href="<?php echo esc_url($sendback); ?>"><?php echo $sendback_text; ?></a></p>
 		</div>
 		<?php
 	}
@@ -1648,38 +1648,38 @@ 
  * @param mixed $post_data Associative array containing the post data or int post ID.
  * @return mixed The autosave revision ID. WP_Error or 0 on error.
  */
-function wp_create_post_autosave( $post_data ) {
-	if ( is_numeric( $post_data ) ) {
+function wp_create_post_autosave($post_data) {
+	if (is_numeric($post_data)) {
 		$post_id = $post_data;
 		$post_data = $_POST;
 	} else {
 		$post_id = (int) $post_data['post_ID'];
 	}
 
-	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error( $post_data ) )
+	$post_data = _wp_translate_postdata(true, $post_data);
+	if (is_wp_error($post_data))
 		return $post_data;
 
 	$post_author = get_current_user_id();
 
 	// Store one autosave per author. If there is already an autosave, overwrite it.
-	if ( $old_autosave = wp_get_post_autosave( $post_id, $post_author ) ) {
-		$new_autosave = _wp_post_revision_data( $post_data, true );
+	if ($old_autosave = wp_get_post_autosave($post_id, $post_author)) {
+		$new_autosave = _wp_post_revision_data($post_data, true);
 		$new_autosave['ID'] = $old_autosave->ID;
 		$new_autosave['post_author'] = $post_author;
 
 		// If the new autosave has the same content as the post, delete the autosave.
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 		$autosave_is_different = false;
-		foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields( $post ) ) ) as $field ) {
-			if ( normalize_whitespace( $new_autosave[ $field ] ) != normalize_whitespace( $post->$field ) ) {
+		foreach (array_intersect(array_keys($new_autosave), array_keys(_wp_post_revision_fields($post))) as $field) {
+			if (normalize_whitespace($new_autosave[$field]) != normalize_whitespace($post->$field)) {
 				$autosave_is_different = true;
 				break;
 			}
 		}
 
-		if ( ! $autosave_is_different ) {
-			wp_delete_post_revision( $old_autosave->ID );
+		if ( ! $autosave_is_different) {
+			wp_delete_post_revision($old_autosave->ID);
 			return 0;
 		}
 
@@ -1690,16 +1690,16 @@ 
 		 *
 		 * @param array $new_autosave Post array - the autosave that is about to be saved.
 		 */
-		do_action( 'wp_creating_autosave', $new_autosave );
+		do_action('wp_creating_autosave', $new_autosave);
 
-		return wp_update_post( $new_autosave );
+		return wp_update_post($new_autosave);
 	}
 
 	// _wp_put_post_revision() expects unescaped.
-	$post_data = wp_unslash( $post_data );
+	$post_data = wp_unslash($post_data);
 
 	// Otherwise create the new autosave as a special post revision
-	return _wp_put_post_revision( $post_data, true );
+	return _wp_put_post_revision($post_data, true);
 }
 
 /**
@@ -1715,46 +1715,46 @@ 
 	$post_ID = (int) $_POST['post_ID'];
 	$_POST['ID'] = $post_ID;
 
-	if ( ! $post = get_post( $post_ID ) ) {
-		wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
+	if ( ! $post = get_post($post_ID)) {
+		wp_die(__('Sorry, you are not allowed to edit this post.'));
 	}
 
-	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
-		wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
+	if ( ! current_user_can('edit_post', $post->ID)) {
+		wp_die(__('Sorry, you are not allowed to edit this post.'));
 	}
 
 	$is_autosave = false;
 
-	if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'draft' == $post->post_status || 'auto-draft' == $post->post_status ) ) {
+	if ( ! wp_check_post_lock($post->ID) && get_current_user_id() == $post->post_author && ('draft' == $post->post_status || 'auto-draft' == $post->post_status)) {
 		$saved_post_id = edit_post();
 	} else {
 		$is_autosave = true;
 
-		if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] )
+		if (isset($_POST['post_status']) && 'auto-draft' == $_POST['post_status'])
 			$_POST['post_status'] = 'draft';
 
-		$saved_post_id = wp_create_post_autosave( $post->ID );
+		$saved_post_id = wp_create_post_autosave($post->ID);
 	}
 
-	if ( is_wp_error( $saved_post_id ) )
-		wp_die( $saved_post_id->get_error_message() );
+	if (is_wp_error($saved_post_id))
+		wp_die($saved_post_id->get_error_message());
 
 	$query_args = array();
 
-	if ( $is_autosave && $saved_post_id ) {
+	if ($is_autosave && $saved_post_id) {
 		$query_args['preview_id'] = $post->ID;
-		$query_args['preview_nonce'] = wp_create_nonce( 'post_preview_' . $post->ID );
+		$query_args['preview_nonce'] = wp_create_nonce('post_preview_'.$post->ID);
 
-		if ( isset( $_POST['post_format'] ) ) {
-			$query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
+		if (isset($_POST['post_format'])) {
+			$query_args['post_format'] = empty($_POST['post_format']) ? 'standard' : sanitize_key($_POST['post_format']);
 		}
 
-		if ( isset( $_POST['_thumbnail_id'] ) ) {
-			$query_args['_thumbnail_id'] = ( intval( $_POST['_thumbnail_id'] ) <= 0 ) ? '-1' : intval( $_POST['_thumbnail_id'] );
+		if (isset($_POST['_thumbnail_id'])) {
+			$query_args['_thumbnail_id'] = (intval($_POST['_thumbnail_id']) <= 0) ? '-1' : intval($_POST['_thumbnail_id']);
 		}
 	}
 
-	return get_preview_post_link( $post, $query_args );
+	return get_preview_post_link($post, $query_args);
 }
 
 /**
@@ -1768,36 +1768,36 @@ 
  * @return mixed The value 0 or WP_Error on failure. The saved post ID on success.
  *               The ID can be the draft post_id or the autosave revision post_id.
  */
-function wp_autosave( $post_data ) {
+function wp_autosave($post_data) {
 	// Back-compat
-	if ( ! defined( 'DOING_AUTOSAVE' ) )
-		define( 'DOING_AUTOSAVE', true );
+	if ( ! defined('DOING_AUTOSAVE'))
+		define('DOING_AUTOSAVE', true);
 
 	$post_id = (int) $post_data['post_id'];
 	$post_data['ID'] = $post_data['post_ID'] = $post_id;
 
-	if ( false === wp_verify_nonce( $post_data['_wpnonce'], 'update-post_' . $post_id ) ) {
-		return new WP_Error( 'invalid_nonce', __( 'Error while saving.' ) );
+	if (false === wp_verify_nonce($post_data['_wpnonce'], 'update-post_'.$post_id)) {
+		return new WP_Error('invalid_nonce', __('Error while saving.'));
 	}
 
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
-		return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to edit this item.' ) );
+	if ( ! current_user_can('edit_post', $post->ID)) {
+		return new WP_Error('edit_posts', __('Sorry, you are not allowed to edit this item.'));
 	}
 
-	if ( 'auto-draft' == $post->post_status )
+	if ('auto-draft' == $post->post_status)
 		$post_data['post_status'] = 'draft';
 
-	if ( $post_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) )
-		$post_data['post_category'] = explode( ',', $post_data['catslist'] );
+	if ($post_data['post_type'] != 'page' && ! empty($post_data['catslist']))
+		$post_data['post_category'] = explode(',', $post_data['catslist']);
 
-	if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) ) {
+	if ( ! wp_check_post_lock($post->ID) && get_current_user_id() == $post->post_author && ('auto-draft' == $post->post_status || 'draft' == $post->post_status)) {
 		// Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked
-		return edit_post( wp_slash( $post_data ) );
+		return edit_post(wp_slash($post_data));
 	} else {
 		// Non drafts or other users drafts are not overwritten. The autosave is stored in a special post revision for each user.
-		return wp_create_post_autosave( wp_slash( $post_data ) );
+		return wp_create_post_autosave(wp_slash($post_data));
 	}
 }
 
@@ -1807,11 +1807,11 @@ 
  * @param int $post_id Optional. Post ID.
  */
 function redirect_post($post_id = '') {
-	if ( isset($_POST['save']) || isset($_POST['publish']) ) {
-		$status = get_post_status( $post_id );
+	if (isset($_POST['save']) || isset($_POST['publish'])) {
+		$status = get_post_status($post_id);
 
-		if ( isset( $_POST['publish'] ) ) {
-			switch ( $status ) {
+		if (isset($_POST['publish'])) {
+			switch ($status) {
 				case 'pending':
 					$message = 8;
 					break;
@@ -1825,17 +1825,17 @@ 
 			$message = 'draft' == $status ? 10 : 1;
 		}
 
-		$location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) );
-	} elseif ( isset($_POST['addmeta']) && $_POST['addmeta'] ) {
-		$location = add_query_arg( 'message', 2, wp_get_referer() );
+		$location = add_query_arg('message', $message, get_edit_post_link($post_id, 'url'));
+	} elseif (isset($_POST['addmeta']) && $_POST['addmeta']) {
+		$location = add_query_arg('message', 2, wp_get_referer());
 		$location = explode('#', $location);
-		$location = $location[0] . '#postcustom';
-	} elseif ( isset($_POST['deletemeta']) && $_POST['deletemeta'] ) {
-		$location = add_query_arg( 'message', 3, wp_get_referer() );
+		$location = $location[0].'#postcustom';
+	} elseif (isset($_POST['deletemeta']) && $_POST['deletemeta']) {
+		$location = add_query_arg('message', 3, wp_get_referer());
 		$location = explode('#', $location);
-		$location = $location[0] . '#postcustom';
+		$location = $location[0].'#postcustom';
 	} else {
-		$location = add_query_arg( 'message', 4, get_edit_post_link( $post_id, 'url' ) );
+		$location = add_query_arg('message', 4, get_edit_post_link($post_id, 'url'));
 	}
 
 	/**
@@ -1846,6 +1846,6 @@ 
 	 * @param string $location The destination URL.
 	 * @param int    $post_id  The post ID.
 	 */
-	wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
+	wp_redirect(apply_filters('redirect_post_location', $location, $post_id));
 	exit;
 }

Braces +303 added lines, -214 removed lines

@@ -20,37 +20,45 @@ 
  */
 function _wp_translate_postdata( $update = false, $post_data = null ) {
 
-	if ( empty($post_data) )
-		$post_data = &$_POST;
+	if ( empty($post_data) ) {
+			$post_data = &$_POST;
+	}
 
-	if ( $update )
-		$post_data['ID'] = (int) $post_data['post_ID'];
+	if ( $update ) {
+			$post_data['ID'] = (int) $post_data['post_ID'];
+	}
 
 	$ptype = get_post_type_object( $post_data['post_type'] );
 
 	if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
-		else
-			return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
+		if ( 'page' == $post_data['post_type'] ) {
+					return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
+		} else {
+					return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
+		}
 	} elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
-		else
-			return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+		if ( 'page' == $post_data['post_type'] ) {
+					return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
+		} else {
+					return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+		}
 	}
 
-	if ( isset( $post_data['content'] ) )
-		$post_data['post_content'] = $post_data['content'];
+	if ( isset( $post_data['content'] ) ) {
+			$post_data['post_content'] = $post_data['content'];
+	}
 
-	if ( isset( $post_data['excerpt'] ) )
-		$post_data['post_excerpt'] = $post_data['excerpt'];
+	if ( isset( $post_data['excerpt'] ) ) {
+			$post_data['post_excerpt'] = $post_data['excerpt'];
+	}
 
-	if ( isset( $post_data['parent_id'] ) )
-		$post_data['post_parent'] = (int) $post_data['parent_id'];
+	if ( isset( $post_data['parent_id'] ) ) {
+			$post_data['post_parent'] = (int) $post_data['parent_id'];
+	}
 
-	if ( isset($post_data['trackback_url']) )
-		$post_data['to_ping'] = $post_data['trackback_url'];
+	if ( isset($post_data['trackback_url']) ) {
+			$post_data['to_ping'] = $post_data['trackback_url'];
+	}
 
 	$post_data['user_ID'] = get_current_user_id();
 
@@ -67,15 +75,17 @@ 
 	if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
 		 && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
 		if ( $update ) {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
-			else
-				return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
+			if ( 'page' == $post_data['post_type'] ) {
+							return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
+			} else {
+							return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
+			}
 		} else {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
-			else
-				return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+			if ( 'page' == $post_data['post_type'] ) {
+							return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
+			} else {
+							return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+			}
 		}
 	}
 
@@ -93,21 +103,27 @@ 
 	}
 
 	// What to do based on which button they pressed
-	if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] )
-		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] )
-		$post_data['post_status'] = 'private';
-	if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( !isset($post_data['post_status']) || $post_data['post_status'] != 'private' ) )
-		$post_data['post_status'] = 'publish';
-	if ( isset($post_data['advanced']) && '' != $post_data['advanced'] )
-		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['pending']) && '' != $post_data['pending'] )
-		$post_data['post_status'] = 'pending';
-
-	if ( isset( $post_data['ID'] ) )
-		$post_id = $post_data['ID'];
-	else
-		$post_id = false;
+	if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] ) {
+			$post_data['post_status'] = 'draft';
+	}
+	if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] ) {
+			$post_data['post_status'] = 'private';
+	}
+	if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( !isset($post_data['post_status']) || $post_data['post_status'] != 'private' ) ) {
+			$post_data['post_status'] = 'publish';
+	}
+	if ( isset($post_data['advanced']) && '' != $post_data['advanced'] ) {
+			$post_data['post_status'] = 'draft';
+	}
+	if ( isset($post_data['pending']) && '' != $post_data['pending'] ) {
+			$post_data['post_status'] = 'pending';
+	}
+
+	if ( isset( $post_data['ID'] ) ) {
+			$post_id = $post_data['ID'];
+	} else {
+			$post_id = false;
+	}
 	$previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false;
 
 	if ( isset( $post_data['post_status'] ) && 'private' == $post_data['post_status'] && ! current_user_can( $ptype->cap->publish_posts ) ) {
@@ -118,9 +134,10 @@ 
 
 	// Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
 	// Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
-	if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) )
-		if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) )
+	if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) ) {
+			if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) )
 			$post_data['post_status'] = 'pending';
+	}
 
 	if ( ! isset( $post_data['post_status'] ) ) {
 		$post_data['post_status'] = 'auto-draft' === $previous_status ? 'draft' : $previous_status;
@@ -130,11 +147,13 @@ 
 		unset( $post_data['post_password'] );
 	}
 
-	if (!isset( $post_data['comment_status'] ))
-		$post_data['comment_status'] = 'closed';
+	if (!isset( $post_data['comment_status'] )) {
+			$post_data['comment_status'] = 'closed';
+	}
 
-	if (!isset( $post_data['ping_status'] ))
-		$post_data['ping_status'] = 'closed';
+	if (!isset( $post_data['ping_status'] )) {
+			$post_data['ping_status'] = 'closed';
+	}
 
 	foreach ( array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
 		if ( !empty( $post_data['hidden_' . $timeunit] ) && $post_data['hidden_' . $timeunit] != $post_data[$timeunit] ) {
@@ -188,8 +207,9 @@ 
 function edit_post( $post_data = null ) {
 	global $wpdb;
 
-	if ( empty($post_data) )
-		$post_data = &$_POST;
+	if ( empty($post_data) ) {
+			$post_data = &$_POST;
+	}
 
 	// Clear out any data in internal vars.
 	unset( $post_data['filter'] );
@@ -209,10 +229,11 @@ 
 
 	$ptype = get_post_type_object($post_data['post_type']);
 	if ( !current_user_can( 'edit_post', $post_ID ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			wp_die( __('Sorry, you are not allowed to edit this page.' ));
-		else
-			wp_die( __('Sorry, you are not allowed to edit this post.' ));
+		if ( 'page' == $post_data['post_type'] ) {
+					wp_die( __('Sorry, you are not allowed to edit this page.' ));
+		} else {
+					wp_die( __('Sorry, you are not allowed to edit this post.' ));
+		}
 	}
 
 	if ( post_type_supports( $ptype->name, 'revisions' ) ) {
@@ -220,8 +241,9 @@ 
 		$revision = current( $revisions );
 
 		// Check if the revisions have been upgraded
-		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 )
-			_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 ) {
+					_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+		}
 	}
 
 	if ( isset($post_data['visibility']) ) {
@@ -241,18 +263,21 @@ 
 	}
 
 	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error($post_data) )
-		wp_die( $post_data->get_error_message() );
+	if ( is_wp_error($post_data) ) {
+			wp_die( $post_data->get_error_message() );
+	}
 
 	// Post Formats
-	if ( isset( $post_data['post_format'] ) )
-		set_post_format( $post_ID, $post_data['post_format'] );
+	if ( isset( $post_data['post_format'] ) ) {
+			set_post_format( $post_ID, $post_data['post_format'] );
+	}
 
 	$format_meta_urls = array( 'url', 'link_url', 'quote_source_url' );
 	foreach ( $format_meta_urls as $format_meta_url ) {
 		$keyed = '_format_' . $format_meta_url;
-		if ( isset( $post_data[ $keyed ] ) )
-			update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
+		if ( isset( $post_data[ $keyed ] ) ) {
+					update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
+		}
 	}
 
 	$format_keys = array( 'quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed' );
@@ -260,10 +285,11 @@ 
 	foreach ( $format_keys as $key ) {
 		$keyed = '_format_' . $key;
 		if ( isset( $post_data[ $keyed ] ) ) {
-			if ( current_user_can( 'unfiltered_html' ) )
-				update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
-			else
-				update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+			if ( current_user_can( 'unfiltered_html' ) ) {
+							update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
+			} else {
+							update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+			}
 		}
 	}
 
@@ -284,24 +310,30 @@ 
 	// Meta Stuff
 	if ( isset($post_data['meta']) && $post_data['meta'] ) {
 		foreach ( $post_data['meta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
-				continue;
-			if ( $meta->post_id != $post_ID )
-				continue;
-			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) )
-				continue;
+			if ( !$meta = get_post_meta_by_id( $key ) ) {
+							continue;
+			}
+			if ( $meta->post_id != $post_ID ) {
+							continue;
+			}
+			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) ) {
+							continue;
+			}
 			update_meta( $key, $value['key'], $value['value'] );
 		}
 	}
 
 	if ( isset($post_data['deletemeta']) && $post_data['deletemeta'] ) {
 		foreach ( $post_data['deletemeta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
-				continue;
-			if ( $meta->post_id != $post_ID )
-				continue;
-			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) )
-				continue;
+			if ( !$meta = get_post_meta_by_id( $key ) ) {
+							continue;
+			}
+			if ( $meta->post_id != $post_ID ) {
+							continue;
+			}
+			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) ) {
+							continue;
+			}
 			delete_meta( $key );
 		}
 	}
@@ -393,10 +425,11 @@ 
 	wp_set_post_lock( $post_ID );
 
 	if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) {
-		if ( ! empty( $post_data['sticky'] ) )
-			stick_post( $post_ID );
-		else
-			unstick_post( $post_ID );
+		if ( ! empty( $post_data['sticky'] ) ) {
+					stick_post( $post_ID );
+		} else {
+					unstick_post( $post_ID );
+		}
 	}
 
 	return $post_ID;
@@ -418,19 +451,22 @@ 
 function bulk_edit_posts( $post_data = null ) {
 	global $wpdb;
 
-	if ( empty($post_data) )
-		$post_data = &$_POST;
+	if ( empty($post_data) ) {
+			$post_data = &$_POST;
+	}
 
-	if ( isset($post_data['post_type']) )
-		$ptype = get_post_type_object($post_data['post_type']);
-	else
-		$ptype = get_post_type_object('post');
+	if ( isset($post_data['post_type']) ) {
+			$ptype = get_post_type_object($post_data['post_type']);
+	} else {
+			$ptype = get_post_type_object('post');
+	}
 
 	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			wp_die( __('Sorry, you are not allowed to edit pages.'));
-		else
-			wp_die( __('Sorry, you are not allowed to edit posts.'));
+		if ( 'page' == $ptype->name ) {
+					wp_die( __('Sorry, you are not allowed to edit pages.'));
+		} else {
+					wp_die( __('Sorry, you are not allowed to edit posts.'));
+		}
 	}
 
 	if ( -1 == $post_data['_status'] ) {
@@ -459,28 +495,32 @@ 
 	);
 
 	foreach ( $reset as $field ) {
-		if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) )
-			unset($post_data[$field]);
+		if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) ) {
+					unset($post_data[$field]);
+		}
 	}
 
 	if ( isset($post_data['post_category']) ) {
-		if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) )
-			$new_cats = array_map( 'absint', $post_data['post_category'] );
-		else
-			unset($post_data['post_category']);
+		if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) ) {
+					$new_cats = array_map( 'absint', $post_data['post_category'] );
+		} else {
+					unset($post_data['post_category']);
+		}
 	}
 
 	$tax_input = array();
 	if ( isset($post_data['tax_input'])) {
 		foreach ( $post_data['tax_input'] as $tax_name => $terms ) {
-			if ( empty($terms) )
-				continue;
+			if ( empty($terms) ) {
+							continue;
+			}
 			if ( is_taxonomy_hierarchical( $tax_name ) ) {
 				$tax_input[ $tax_name ] = array_map( 'absint', $terms );
 			} else {
 				$comma = _x( ',', 'tag delimiter' );
-				if ( ',' !== $comma )
-					$terms = str_replace( $comma, ',', $terms );
+				if ( ',' !== $comma ) {
+									$terms = str_replace( $comma, ',', $terms );
+				}
 				$tax_input[ $tax_name ] = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
 			}
 		}
@@ -525,15 +565,17 @@ 
 		$tax_names = get_object_taxonomies( $post );
 		foreach ( $tax_names as $tax_name ) {
 			$taxonomy_obj = get_taxonomy($tax_name);
-			if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
-				$new_terms = $tax_input[$tax_name];
-			else
-				$new_terms = array();
+			if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) ) {
+							$new_terms = $tax_input[$tax_name];
+			} else {
+							$new_terms = array();
+			}
 
-			if ( $taxonomy_obj->hierarchical )
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
-			else
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
+			if ( $taxonomy_obj->hierarchical ) {
+							$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
+			} else {
+							$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
+			}
 
 			$post_data['tax_input'][$tax_name] = array_merge( $current_terms, $new_terms );
 		}
@@ -566,14 +608,16 @@ 
 		$updated[] = wp_update_post( $post_data );
 
 		if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
-			if ( 'sticky' == $post_data['sticky'] )
-				stick_post( $post_ID );
-			else
-				unstick_post( $post_ID );
+			if ( 'sticky' == $post_data['sticky'] ) {
+							stick_post( $post_ID );
+			} else {
+							unstick_post( $post_ID );
+			}
 		}
 
-		if ( isset( $post_data['post_format'] ) )
-			set_post_format( $post_ID, $post_data['post_format'] );
+		if ( isset( $post_data['post_format'] ) ) {
+					set_post_format( $post_ID, $post_data['post_format'] );
+		}
 	}
 
 	return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked );
@@ -590,22 +634,26 @@ 
  */
 function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
 	$post_title = '';
-	if ( !empty( $_REQUEST['post_title'] ) )
-		$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ));
+	if ( !empty( $_REQUEST['post_title'] ) ) {
+			$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ));
+	}
 
 	$post_content = '';
-	if ( !empty( $_REQUEST['content'] ) )
-		$post_content = esc_html( wp_unslash( $_REQUEST['content'] ));
+	if ( !empty( $_REQUEST['content'] ) ) {
+			$post_content = esc_html( wp_unslash( $_REQUEST['content'] ));
+	}
 
 	$post_excerpt = '';
-	if ( !empty( $_REQUEST['excerpt'] ) )
-		$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ));
+	if ( !empty( $_REQUEST['excerpt'] ) ) {
+			$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ));
+	}
 
 	if ( $create_in_db ) {
 		$post_id = wp_insert_post( array( 'post_title' => __( 'Auto Draft' ), 'post_type' => $post_type, 'post_status' => 'auto-draft' ) );
 		$post = get_post( $post_id );
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) )
-			set_post_format( $post, get_option( 'default_post_format' ) );
+		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) ) {
+					set_post_format( $post, get_option( 'default_post_format' ) );
+		}
 	} else {
 		$post = new stdClass;
 		$post->ID = 0;
@@ -698,8 +746,9 @@ 
 		$args[] = $post_content;
 	}
 
-	if ( !empty ( $args ) )
-		return (int) $wpdb->get_var( $wpdb->prepare($query, $args) );
+	if ( !empty ( $args ) ) {
+			return (int) $wpdb->get_var( $wpdb->prepare($query, $args) );
+	}
 
 	return 0;
 }
@@ -714,16 +763,18 @@ 
  * @return int|WP_Error
  */
 function wp_write_post() {
-	if ( isset($_POST['post_type']) )
-		$ptype = get_post_type_object($_POST['post_type']);
-	else
-		$ptype = get_post_type_object('post');
+	if ( isset($_POST['post_type']) ) {
+			$ptype = get_post_type_object($_POST['post_type']);
+	} else {
+			$ptype = get_post_type_object('post');
+	}
 
 	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			return new WP_Error( 'edit_pages', __( 'Sorry, you are not allowed to create pages on this site.' ) );
-		else
-			return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to create posts or drafts on this site.' ) );
+		if ( 'page' == $ptype->name ) {
+					return new WP_Error( 'edit_pages', __( 'Sorry, you are not allowed to create pages on this site.' ) );
+		} else {
+					return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to create posts or drafts on this site.' ) );
+		}
 	}
 
 	$_POST['post_mime_type'] = '';
@@ -732,8 +783,9 @@ 
 	unset( $_POST['filter'] );
 
 	// Edit don't write if we have a post id.
-	if ( isset( $_POST['post_ID'] ) )
-		return edit_post();
+	if ( isset( $_POST['post_ID'] ) ) {
+			return edit_post();
+	}
 
 	if ( isset($_POST['visibility']) ) {
 		switch ( $_POST['visibility'] ) {
@@ -752,16 +804,19 @@ 
 	}
 
 	$translated = _wp_translate_postdata( false );
-	if ( is_wp_error($translated) )
-		return $translated;
+	if ( is_wp_error($translated) ) {
+			return $translated;
+	}
 
 	// Create the post.
 	$post_ID = wp_insert_post( $_POST );
-	if ( is_wp_error( $post_ID ) )
-		return $post_ID;
+	if ( is_wp_error( $post_ID ) ) {
+			return $post_ID;
+	}
 
-	if ( empty($post_ID) )
-		return 0;
+	if ( empty($post_ID) ) {
+			return 0;
+	}
 
 	add_meta( $post_ID );
 
@@ -784,11 +839,12 @@ 
  */
 function write_post() {
 	$result = wp_write_post();
-	if ( is_wp_error( $result ) )
-		wp_die( $result->get_error_message() );
-	else
-		return $result;
-}
+	if ( is_wp_error( $result ) ) {
+			wp_die( $result->get_error_message() );
+	} else {
+			return $result;
+	}
+	}
 
 //
 // Post Meta
@@ -808,22 +864,27 @@ 
 	$metakeyselect = isset($_POST['metakeyselect']) ? wp_unslash( trim( $_POST['metakeyselect'] ) ) : '';
 	$metakeyinput = isset($_POST['metakeyinput']) ? wp_unslash( trim( $_POST['metakeyinput'] ) ) : '';
 	$metavalue = isset($_POST['metavalue']) ? $_POST['metavalue'] : '';
-	if ( is_string( $metavalue ) )
-		$metavalue = trim( $metavalue );
+	if ( is_string( $metavalue ) ) {
+			$metavalue = trim( $metavalue );
+	}
 
 	if ( ('0' === $metavalue || ! empty ( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput ) ) ) {
 		/*
 		 * We have a key/value pair. If both the select and the input
 		 * for the key have data, the input takes precedence.
 		 */
- 		if ( '#NONE#' != $metakeyselect )
-			$metakey = $metakeyselect;
+ 		if ( '#NONE#' != $metakeyselect ) {
+ 					$metakey = $metakeyselect;
+ 		}
 
-		if ( $metakeyinput )
-			$metakey = $metakeyinput; // default
+		if ( $metakeyinput ) {
+					$metakey = $metakeyinput;
+		}
+		// default
 
-		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) )
-			return false;
+		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) ) {
+					return false;
+		}
 
 		$metakey = wp_slash( $metakey );
 
@@ -931,12 +992,14 @@ 
 	$content = $post['post_content'];
 
 	// Don't run if no pretty permalinks or post is not published, scheduled, or privately published.
-	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ) ) )
-		return;
+	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ) ) ) {
+			return;
+	}
 
 	// Short if there aren't any links or no '?attachment_id=' strings (strpos cannot be zero)
-	if ( !strpos($content, '?attachment_id=') || !preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) )
-		return;
+	if ( !strpos($content, '?attachment_id=') || !preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) ) {
+			return;
+	}
 
 	$site_url = get_bloginfo('url');
 	$site_url = substr( $site_url, (int) strpos($site_url, '://') ); // remove the http(s)
@@ -945,15 +1008,17 @@ 
 	foreach ( $link_matches[1] as $key => $value ) {
 		if ( !strpos($value, '?attachment_id=') || !strpos($value, 'wp-att-')
 			|| !preg_match( '/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match )
-			|| !preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) )
-				continue;
+			|| !preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) ) {
+						continue;
+		}
 
 		$quote = $url_match[1]; // the quote (single or double)
 		$url_id = (int) $url_match[2];
 		$rel_id = (int) $rel_match[1];
 
-		if ( !$url_id || !$rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false )
-			continue;
+		if ( !$url_id || !$rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false ) {
+					continue;
+		}
 
 		$link = $link_matches[0][$key];
 		$replace = str_replace( $url_match[0], 'href=' . $quote . get_attachment_link( $url_id ) . $quote, $link );
@@ -993,16 +1058,18 @@ 
  * @return array
  */
 function wp_edit_posts_query( $q = false ) {
-	if ( false === $q )
-		$q = $_GET;
+	if ( false === $q ) {
+			$q = $_GET;
+	}
 	$q['m'] = isset($q['m']) ? (int) $q['m'] : 0;
 	$q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
 	$post_stati  = get_post_stati();
 
-	if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) )
-		$post_type = $q['post_type'];
-	else
-		$post_type = 'post';
+	if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) ) {
+			$post_type = $q['post_type'];
+	} else {
+			$post_type = 'post';
+	}
 
 	$avail_post_stati = get_available_post_statuses($post_type);
 
@@ -1025,8 +1092,9 @@ 
 
 	$per_page = "edit_{$post_type}_per_page";
 	$posts_per_page = (int) get_user_option( $per_page );
-	if ( empty( $posts_per_page ) || $posts_per_page < 1 )
-		$posts_per_page = 20;
+	if ( empty( $posts_per_page ) || $posts_per_page < 1 ) {
+			$posts_per_page = 20;
+	}
 
 	/**
 	 * Filters the number of items per page to show for a specific 'per_page' type.
@@ -1064,8 +1132,9 @@ 
 		$query['fields'] = 'id=>parent';
 	}
 
-	if ( ! empty( $q['show_sticky'] ) )
-		$query['post__in'] = (array) get_option( 'sticky_posts' );
+	if ( ! empty( $q['show_sticky'] ) ) {
+			$query['post__in'] = (array) get_option( 'sticky_posts' );
+	}
 
 	wp( $query );
 
@@ -1213,8 +1282,9 @@ 
  */
 function get_sample_permalink($id, $title = null, $name = null) {
 	$post = get_post( $id );
-	if ( ! $post )
-		return array( '', '' );
+	if ( ! $post ) {
+			return array( '', '' );
+	}
 
 	$ptype = get_post_type_object($post->post_type);
 
@@ -1230,8 +1300,9 @@ 
 
 	// If the user wants to set a new name -- override the current one
 	// Note: if empty name is supplied -- use the title instead, see #6072
-	if ( !is_null($name) )
-		$post->post_name = sanitize_title($name ? $name : $title, $post->ID);
+	if ( !is_null($name) ) {
+			$post->post_name = sanitize_title($name ? $name : $title, $post->ID);
+	}
 
 	$post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
 
@@ -1253,8 +1324,9 @@ 
 
 		/** This filter is documented in wp-admin/edit-tag-form.php */
 		$uri = apply_filters( 'editable_slug', $uri, $post );
-		if ( !empty($uri) )
-			$uri .= '/';
+		if ( !empty($uri) ) {
+					$uri .= '/';
+		}
 		$permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink);
 	}
 
@@ -1291,8 +1363,9 @@ 
  */
 function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
 	$post = get_post( $id );
-	if ( ! $post )
-		return '';
+	if ( ! $post ) {
+			return '';
+	}
 
 	list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
 
@@ -1447,11 +1520,13 @@ 
  * @return integer False: not locked or locked by current user. Int: user ID of user with lock.
  */
 function wp_check_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
 
-	if ( !$lock = get_post_meta( $post->ID, '_edit_lock', true ) )
-		return false;
+	if ( !$lock = get_post_meta( $post->ID, '_edit_lock', true ) ) {
+			return false;
+	}
 
 	$lock = explode( ':', $lock );
 	$time = $lock[0];
@@ -1460,8 +1535,9 @@ 
 	/** This filter is documented in wp-admin/includes/ajax-actions.php */
 	$time_window = apply_filters( 'wp_check_post_lock_window', 150 );
 
-	if ( $time && $time > time() - $time_window && $user != get_current_user_id() )
-		return $user;
+	if ( $time && $time > time() - $time_window && $user != get_current_user_id() ) {
+			return $user;
+	}
 	return false;
 }
 
@@ -1475,10 +1551,12 @@ 
  * 	an array of the lock time and the user ID.
  */
 function wp_set_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
-		return false;
-	if ( 0 == ($user_id = get_current_user_id()) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
+	if ( 0 == ($user_id = get_current_user_id()) ) {
+			return false;
+	}
 
 	$now = time();
 	$lock = "$now:$user_id";
@@ -1494,12 +1572,14 @@ 
  * @return none
  */
 function _admin_notice_post_locked() {
-	if ( ! $post = get_post() )
-		return;
+	if ( ! $post = get_post() ) {
+			return;
+	}
 
 	$user = null;
-	if (  $user_id = wp_check_post_lock( $post->ID ) )
-		$user = get_userdata( $user_id );
+	if (  $user_id = wp_check_post_lock( $post->ID ) ) {
+			$user = get_userdata( $user_id );
+	}
 
 	if ( $user ) {
 
@@ -1513,8 +1593,9 @@ 
 		 * @param bool         $display Whether to display the dialog. Default true.
 		 * @param WP_User|bool $user    WP_User object on success, false otherwise.
 		 */
-		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) )
-			return;
+		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) ) {
+					return;
+		}
 
 		$locked = true;
 	} else {
@@ -1528,8 +1609,9 @@ 
 	} else {
 		$sendback = admin_url( 'edit.php' );
 
-		if ( 'post' != $post->post_type )
-			$sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
+		if ( 'post' != $post->post_type ) {
+					$sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
+		}
 
 		$sendback_text = get_post_type_object( $post->post_type )->labels->all_items;
 	}
@@ -1576,8 +1658,9 @@ 
 		<p class="currently-editing wp-tab-first" tabindex="0">
 		<?php
 			_e( 'This content is currently locked.' );
-			if ( $override )
-				printf( ' ' . __( 'If you take over, %s will be blocked from continuing to edit.' ), esc_html( $user->display_name ) );
+			if ( $override ) {
+							printf( ' ' . __( 'If you take over, %s will be blocked from continuing to edit.' ), esc_html( $user->display_name ) );
+			}
 		?>
 		</p>
 		<?php
@@ -1657,8 +1740,9 @@ 
 	}
 
 	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error( $post_data ) )
-		return $post_data;
+	if ( is_wp_error( $post_data ) ) {
+			return $post_data;
+	}
 
 	$post_author = get_current_user_id();
 
@@ -1730,14 +1814,16 @@ 
 	} else {
 		$is_autosave = true;
 
-		if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] )
-			$_POST['post_status'] = 'draft';
+		if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] ) {
+					$_POST['post_status'] = 'draft';
+		}
 
 		$saved_post_id = wp_create_post_autosave( $post->ID );
 	}
 
-	if ( is_wp_error( $saved_post_id ) )
-		wp_die( $saved_post_id->get_error_message() );
+	if ( is_wp_error( $saved_post_id ) ) {
+			wp_die( $saved_post_id->get_error_message() );
+	}
 
 	$query_args = array();
 
@@ -1770,8 +1856,9 @@ 
  */
 function wp_autosave( $post_data ) {
 	// Back-compat
-	if ( ! defined( 'DOING_AUTOSAVE' ) )
-		define( 'DOING_AUTOSAVE', true );
+	if ( ! defined( 'DOING_AUTOSAVE' ) ) {
+			define( 'DOING_AUTOSAVE', true );
+	}
 
 	$post_id = (int) $post_data['post_id'];
 	$post_data['ID'] = $post_data['post_ID'] = $post_id;
@@ -1786,11 +1873,13 @@ 
 		return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to edit this item.' ) );
 	}
 
-	if ( 'auto-draft' == $post->post_status )
-		$post_data['post_status'] = 'draft';
+	if ( 'auto-draft' == $post->post_status ) {
+			$post_data['post_status'] = 'draft';
+	}
 
-	if ( $post_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) )
-		$post_data['post_category'] = explode( ',', $post_data['catslist'] );
+	if ( $post_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) ) {
+			$post_data['post_category'] = explode( ',', $post_data['catslist'] );
+	}
 
 	if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) ) {
 		// Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked

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

Spacing +271 added lines, -271 removed lines

@@ -93,7 +93,7 @@ 
 	 * @access protected
 	 * @var array
 	 */
-	protected $compat_fields = array( '_args', '_pagination_args', 'screen', '_actions', '_pagination' );
+	protected $compat_fields = array('_args', '_pagination_args', 'screen', '_actions', '_pagination');
 
 	/**
 	 * {@internal Missing Summary}
@@ -101,10 +101,10 @@ 
 	 * @access protected
 	 * @var array
 	 */
-	protected $compat_methods = array( 'set_pagination_args', 'get_views', 'get_bulk_actions', 'bulk_actions',
+	protected $compat_methods = array('set_pagination_args', 'get_views', 'get_bulk_actions', 'bulk_actions',
 		'row_actions', 'months_dropdown', 'view_switcher', 'comments_bubble', 'get_items_per_page', 'pagination',
 		'get_sortable_columns', 'get_column_info', 'get_table_classes', 'display_tablenav', 'extra_tablenav',
-		'single_row_columns' );
+		'single_row_columns');
 
 	/**
 	 * Constructor.
@@ -132,35 +132,35 @@ 
 	 *                            Default null.
 	 * }
 	 */
-	public function __construct( $args = array() ) {
-		$args = wp_parse_args( $args, array(
+	public function __construct($args = array()) {
+		$args = wp_parse_args($args, array(
 			'plural' => '',
 			'singular' => '',
 			'ajax' => false,
 			'screen' => null,
-		) );
+		));
 
-		$this->screen = convert_to_screen( $args['screen'] );
+		$this->screen = convert_to_screen($args['screen']);
 
-		add_filter( "manage_{$this->screen->id}_columns", array( $this, 'get_columns' ), 0 );
+		add_filter("manage_{$this->screen->id}_columns", array($this, 'get_columns'), 0);
 
-		if ( !$args['plural'] )
+		if ( ! $args['plural'])
 			$args['plural'] = $this->screen->base;
 
-		$args['plural'] = sanitize_key( $args['plural'] );
-		$args['singular'] = sanitize_key( $args['singular'] );
+		$args['plural'] = sanitize_key($args['plural']);
+		$args['singular'] = sanitize_key($args['singular']);
 
 		$this->_args = $args;
 
-		if ( $args['ajax'] ) {
+		if ($args['ajax']) {
 			// wp_enqueue_script( 'list-table' );
-			add_action( 'admin_footer', array( $this, '_js_vars' ) );
+			add_action('admin_footer', array($this, '_js_vars'));
 		}
 
-		if ( empty( $this->modes ) ) {
+		if (empty($this->modes)) {
 			$this->modes = array(
-				'list'    => __( 'List View' ),
-				'excerpt' => __( 'Excerpt View' )
+				'list'    => __('List View'),
+				'excerpt' => __('Excerpt View')
 			);
 		}
 	}
@@ -174,8 +174,8 @@ 
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 	 */
-	public function __get( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __get($name) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name;
 		}
 	}
@@ -190,8 +190,8 @@ 
 	 * @param mixed  $value Property value.
 	 * @return mixed Newly-set property.
 	 */
-	public function __set( $name, $value ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __set($name, $value) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name = $value;
 		}
 	}
@@ -205,9 +205,9 @@ 
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			return isset( $this->$name );
+	public function __isset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			return isset($this->$name);
 		}
 	}
 
@@ -219,9 +219,9 @@ 
 	 *
 	 * @param string $name Property to unset.
 	 */
-	public function __unset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			unset( $this->$name );
+	public function __unset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			unset($this->$name);
 		}
 	}
 
@@ -235,9 +235,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|bool Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( in_array( $name, $this->compat_methods ) ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if (in_array($name, $this->compat_methods)) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -250,7 +250,7 @@ 
 	 * @abstract
 	 */
 	public function ajax_user_can() {
-		die( 'function WP_List_Table::ajax_user_can() must be over-ridden in a sub-class.' );
+		die('function WP_List_Table::ajax_user_can() must be over-ridden in a sub-class.');
 	}
 
 	/**
@@ -262,7 +262,7 @@ 
 	 * @abstract
 	 */
 	public function prepare_items() {
-		die( 'function WP_List_Table::prepare_items() must be over-ridden in a sub-class.' );
+		die('function WP_List_Table::prepare_items() must be over-ridden in a sub-class.');
 	}
 
 	/**
@@ -273,19 +273,19 @@ 
 	 *
 	 * @param array|string $args Array or string of arguments with information about the pagination.
 	 */
-	protected function set_pagination_args( $args ) {
-		$args = wp_parse_args( $args, array(
+	protected function set_pagination_args($args) {
+		$args = wp_parse_args($args, array(
 			'total_items' => 0,
 			'total_pages' => 0,
 			'per_page' => 0,
-		) );
+		));
 
-		if ( !$args['total_pages'] && $args['per_page'] > 0 )
-			$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+		if ( ! $args['total_pages'] && $args['per_page'] > 0)
+			$args['total_pages'] = ceil($args['total_items'] / $args['per_page']);
 
 		// Redirect if page number is invalid and headers are not already sent.
-		if ( ! headers_sent() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
-			wp_redirect( add_query_arg( 'paged', $args['total_pages'] ) );
+		if ( ! headers_sent() && ( ! defined('DOING_AJAX') || ! DOING_AJAX) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages']) {
+			wp_redirect(add_query_arg('paged', $args['total_pages']));
 			exit;
 		}
 
@@ -302,12 +302,12 @@ 
 	 *                    'total_pages', 'per_page', or 'infinite_scroll'.
 	 * @return int Number of items that correspond to the given pagination argument.
 	 */
-	public function get_pagination_arg( $key ) {
-		if ( 'page' === $key ) {
+	public function get_pagination_arg($key) {
+		if ('page' === $key) {
 			return $this->get_pagenum();
 		}
 
-		if ( isset( $this->_pagination_args[$key] ) ) {
+		if (isset($this->_pagination_args[$key])) {
 			return $this->_pagination_args[$key];
 		}
 	}
@@ -321,7 +321,7 @@ 
 	 * @return bool
 	 */
 	public function has_items() {
-		return !empty( $this->items );
+		return ! empty($this->items);
 	}
 
 	/**
@@ -331,7 +331,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No items found.' );
+		_e('No items found.');
 	}
 
 	/**
@@ -343,25 +343,25 @@ 
 	 * @param string $text     The 'submit' button label.
 	 * @param string $input_id ID attribute value for the search input field.
 	 */
-	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
+	public function search_box($text, $input_id) {
+		if (empty($_REQUEST['s']) && ! $this->has_items())
 			return;
 
-		$input_id = $input_id . '-search-input';
+		$input_id = $input_id.'-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) )
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		if ( ! empty( $_REQUEST['order'] ) )
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-		if ( ! empty( $_REQUEST['post_mime_type'] ) )
-			echo '<input type="hidden" name="post_mime_type" value="' . esc_attr( $_REQUEST['post_mime_type'] ) . '" />';
-		if ( ! empty( $_REQUEST['detached'] ) )
-			echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
+		if ( ! empty($_REQUEST['orderby']))
+			echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />';
+		if ( ! empty($_REQUEST['order']))
+			echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />';
+		if ( ! empty($_REQUEST['post_mime_type']))
+			echo '<input type="hidden" name="post_mime_type" value="'.esc_attr($_REQUEST['post_mime_type']).'" />';
+		if ( ! empty($_REQUEST['detached']))
+			echo '<input type="hidden" name="detached" value="'.esc_attr($_REQUEST['detached']).'" />';
 ?>
 <p class="search-box">
-	<label class="screen-reader-text" for="<?php echo esc_attr( $input_id ); ?>"><?php echo $text; ?>:</label>
-	<input type="search" id="<?php echo esc_attr( $input_id ); ?>" name="s" value="<?php _admin_search_query(); ?>" />
-	<?php submit_button( $text, 'button', '', false, array( 'id' => 'search-submit' ) ); ?>
+	<label class="screen-reader-text" for="<?php echo esc_attr($input_id); ?>"><?php echo $text; ?>:</label>
+	<input type="search" id="<?php echo esc_attr($input_id); ?>" name="s" value="<?php _admin_search_query(); ?>" />
+	<?php submit_button($text, 'button', '', false, array('id' => 'search-submit')); ?>
 </p>
 <?php
 	}
@@ -397,18 +397,18 @@ 
 		 *
 		 * @param array $views An array of available list table views.
 		 */
-		$views = apply_filters( "views_{$this->screen->id}", $views );
+		$views = apply_filters("views_{$this->screen->id}", $views);
 
-		if ( empty( $views ) )
+		if (empty($views))
 			return;
 
-		$this->screen->render_screen_reader_content( 'heading_views' );
+		$this->screen->render_screen_reader_content('heading_views');
 
 		echo "<ul class='subsubsub'>\n";
-		foreach ( $views as $class => $view ) {
-			$views[ $class ] = "\t<li class='$class'>$view";
+		foreach ($views as $class => $view) {
+			$views[$class] = "\t<li class='$class'>$view";
 		}
-		echo implode( " |</li>\n", $views ) . "</li>\n";
+		echo implode(" |</li>\n", $views)."</li>\n";
 		echo "</ul>";
 	}
 
@@ -434,8 +434,8 @@ 
 	 * @param string $which The location of the bulk actions: 'top' or 'bottom'.
 	 *                      This is designated as optional for backward compatibility.
 	 */
-	protected function bulk_actions( $which = '' ) {
-		if ( is_null( $this->_actions ) ) {
+	protected function bulk_actions($which = '') {
+		if (is_null($this->_actions)) {
 			$no_new_actions = $this->_actions = $this->get_bulk_actions();
 			/**
 			 * Filters the list table Bulk Actions drop-down.
@@ -449,29 +449,29 @@ 
 			 *
 			 * @param array $actions An array of the available bulk actions.
 			 */
-			$this->_actions = apply_filters( "bulk_actions-{$this->screen->id}", $this->_actions );
-			$this->_actions = array_intersect_assoc( $this->_actions, $no_new_actions );
+			$this->_actions = apply_filters("bulk_actions-{$this->screen->id}", $this->_actions);
+			$this->_actions = array_intersect_assoc($this->_actions, $no_new_actions);
 			$two = '';
 		} else {
 			$two = '2';
 		}
 
-		if ( empty( $this->_actions ) )
+		if (empty($this->_actions))
 			return;
 
-		echo '<label for="bulk-action-selector-' . esc_attr( $which ) . '" class="screen-reader-text">' . __( 'Select bulk action' ) . '</label>';
-		echo '<select name="action' . $two . '" id="bulk-action-selector-' . esc_attr( $which ) . "\">\n";
-		echo '<option value="-1">' . __( 'Bulk Actions' ) . "</option>\n";
+		echo '<label for="bulk-action-selector-'.esc_attr($which).'" class="screen-reader-text">'.__('Select bulk action').'</label>';
+		echo '<select name="action'.$two.'" id="bulk-action-selector-'.esc_attr($which)."\">\n";
+		echo '<option value="-1">'.__('Bulk Actions')."</option>\n";
 
-		foreach ( $this->_actions as $name => $title ) {
+		foreach ($this->_actions as $name => $title) {
 			$class = 'edit' === $name ? ' class="hide-if-no-js"' : '';
 
-			echo "\t" . '<option value="' . $name . '"' . $class . '>' . $title . "</option>\n";
+			echo "\t".'<option value="'.$name.'"'.$class.'>'.$title."</option>\n";
 		}
 
 		echo "</select>\n";
 
-		submit_button( __( 'Apply' ), 'action', '', false, array( 'id' => "doaction$two" ) );
+		submit_button(__('Apply'), 'action', '', false, array('id' => "doaction$two"));
 		echo "\n";
 	}
 
@@ -484,13 +484,13 @@ 
 	 * @return string|false The action name or False if no action was selected
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) )
+		if (isset($_REQUEST['filter_action']) && ! empty($_REQUEST['filter_action']))
 			return false;
 
-		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
+		if (isset($_REQUEST['action']) && -1 != $_REQUEST['action'])
 			return $_REQUEST['action'];
 
-		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
+		if (isset($_REQUEST['action2']) && -1 != $_REQUEST['action2'])
 			return $_REQUEST['action2'];
 
 		return false;
@@ -506,22 +506,22 @@ 
 	 * @param bool $always_visible Whether the actions should be always visible
 	 * @return string
 	 */
-	protected function row_actions( $actions, $always_visible = false ) {
-		$action_count = count( $actions );
+	protected function row_actions($actions, $always_visible = false) {
+		$action_count = count($actions);
 		$i = 0;
 
-		if ( !$action_count )
+		if ( ! $action_count)
 			return '';
 
-		$out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
-		foreach ( $actions as $action => $link ) {
+		$out = '<div class="'.($always_visible ? 'row-actions visible' : 'row-actions').'">';
+		foreach ($actions as $action => $link) {
 			++$i;
-			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
+			($i == $action_count) ? $sep = '' : $sep = ' | ';
 			$out .= "<span class='$action'>$link$sep</span>";
 		}
 		$out .= '</div>';
 
-		$out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>';
+		$out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">'.__('Show more details').'</span></button>';
 
 		return $out;
 	}
@@ -537,7 +537,7 @@ 
 	 *
 	 * @param string $post_type
 	 */
-	protected function months_dropdown( $post_type ) {
+	protected function months_dropdown($post_type) {
 		global $wpdb, $wp_locale;
 
 		/**
@@ -548,24 +548,24 @@ 
 		 * @param bool   $disable   Whether to disable the drop-down. Default false.
 		 * @param string $post_type The post type.
 		 */
-		if ( apply_filters( 'disable_months_dropdown', false, $post_type ) ) {
+		if (apply_filters('disable_months_dropdown', false, $post_type)) {
 			return;
 		}
 
 		$extra_checks = "AND post_status != 'auto-draft'";
-		if ( ! isset( $_GET['post_status'] ) || 'trash' !== $_GET['post_status'] ) {
+		if ( ! isset($_GET['post_status']) || 'trash' !== $_GET['post_status']) {
 			$extra_checks .= " AND post_status != 'trash'";
-		} elseif ( isset( $_GET['post_status'] ) ) {
-			$extra_checks = $wpdb->prepare( ' AND post_status = %s', $_GET['post_status'] );
+		} elseif (isset($_GET['post_status'])) {
+			$extra_checks = $wpdb->prepare(' AND post_status = %s', $_GET['post_status']);
 		}
 
-		$months = $wpdb->get_results( $wpdb->prepare( "
+		$months = $wpdb->get_results($wpdb->prepare("
 			SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
 			FROM $wpdb->posts
 			WHERE post_type = %s
 			$extra_checks
 			ORDER BY post_date DESC
-		", $post_type ) );
+		", $post_type));
 
 		/**
 		 * Filters the 'Months' drop-down results.
@@ -575,31 +575,31 @@ 
 		 * @param object $months    The months drop-down query results.
 		 * @param string $post_type The post type.
 		 */
-		$months = apply_filters( 'months_dropdown_results', $months, $post_type );
+		$months = apply_filters('months_dropdown_results', $months, $post_type);
 
-		$month_count = count( $months );
+		$month_count = count($months);
 
-		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
+		if ( ! $month_count || (1 == $month_count && 0 == $months[0]->month))
 			return;
 
-		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
+		$m = isset($_GET['m']) ? (int) $_GET['m'] : 0;
 ?>
-		<label for="filter-by-date" class="screen-reader-text"><?php _e( 'Filter by date' ); ?></label>
+		<label for="filter-by-date" class="screen-reader-text"><?php _e('Filter by date'); ?></label>
 		<select name="m" id="filter-by-date">
-			<option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
+			<option<?php selected($m, 0); ?> value="0"><?php _e('All dates'); ?></option>
 <?php
-		foreach ( $months as $arc_row ) {
-			if ( 0 == $arc_row->year )
+		foreach ($months as $arc_row) {
+			if (0 == $arc_row->year)
 				continue;
 
-			$month = zeroise( $arc_row->month, 2 );
+			$month = zeroise($arc_row->month, 2);
 			$year = $arc_row->year;
 
-			printf( "<option %s value='%s'>%s</option>\n",
-				selected( $m, $year . $month, false ),
-				esc_attr( $arc_row->year . $month ),
+			printf("<option %s value='%s'>%s</option>\n",
+				selected($m, $year.$month, false),
+				esc_attr($arc_row->year.$month),
 				/* translators: 1: month name, 2: 4-digit year */
-				sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month ), $year )
+				sprintf(__('%1$s %2$d'), $wp_locale->get_month($month), $year)
 			);
 		}
 ?>
@@ -615,19 +615,19 @@ 
 	 *
 	 * @param string $current_mode
 	 */
-	protected function view_switcher( $current_mode ) {
+	protected function view_switcher($current_mode) {
 ?>
-		<input type="hidden" name="mode" value="<?php echo esc_attr( $current_mode ); ?>" />
+		<input type="hidden" name="mode" value="<?php echo esc_attr($current_mode); ?>" />
 		<div class="view-switch">
 <?php
-			foreach ( $this->modes as $mode => $title ) {
-				$classes = array( 'view-' . $mode );
-				if ( $current_mode === $mode )
+			foreach ($this->modes as $mode => $title) {
+				$classes = array('view-'.$mode);
+				if ($current_mode === $mode)
 					$classes[] = 'current';
 				printf(
 					"<a href='%s' class='%s' id='view-switch-$mode'><span class='screen-reader-text'>%s</span></a>\n",
-					esc_url( add_query_arg( 'mode', $mode ) ),
-					implode( ' ', $classes ),
+					esc_url(add_query_arg('mode', $mode)),
+					implode(' ', $classes),
 					$title
 				);
 			}
@@ -645,45 +645,45 @@ 
 	 * @param int $post_id          The post ID.
 	 * @param int $pending_comments Number of pending comments.
 	 */
-	protected function comments_bubble( $post_id, $pending_comments ) {
+	protected function comments_bubble($post_id, $pending_comments) {
 		$approved_comments = get_comments_number();
 
-		$approved_comments_number = number_format_i18n( $approved_comments );
-		$pending_comments_number = number_format_i18n( $pending_comments );
+		$approved_comments_number = number_format_i18n($approved_comments);
+		$pending_comments_number = number_format_i18n($pending_comments);
 
-		$approved_only_phrase = sprintf( _n( '%s comment', '%s comments', $approved_comments ), $approved_comments_number );
-		$approved_phrase = sprintf( _n( '%s approved comment', '%s approved comments', $approved_comments ), $approved_comments_number );
-		$pending_phrase = sprintf( _n( '%s pending comment', '%s pending comments', $pending_comments ), $pending_comments_number );
+		$approved_only_phrase = sprintf(_n('%s comment', '%s comments', $approved_comments), $approved_comments_number);
+		$approved_phrase = sprintf(_n('%s approved comment', '%s approved comments', $approved_comments), $approved_comments_number);
+		$pending_phrase = sprintf(_n('%s pending comment', '%s pending comments', $pending_comments), $pending_comments_number);
 
 		// No comments at all.
-		if ( ! $approved_comments && ! $pending_comments ) {
-			printf( '<span aria-hidden="true">—</span><span class="screen-reader-text">%s</span>',
-				__( 'No comments' )
+		if ( ! $approved_comments && ! $pending_comments) {
+			printf('<span aria-hidden="true">—</span><span class="screen-reader-text">%s</span>',
+				__('No comments')
 			);
 		// Approved comments have different display depending on some conditions.
-		} elseif ( $approved_comments ) {
-			printf( '<a href="%s" class="post-com-count post-com-count-approved"><span class="comment-count-approved" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
-				esc_url( add_query_arg( array( 'p' => $post_id, 'comment_status' => 'approved' ), admin_url( 'edit-comments.php' ) ) ),
+		} elseif ($approved_comments) {
+			printf('<a href="%s" class="post-com-count post-com-count-approved"><span class="comment-count-approved" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+				esc_url(add_query_arg(array('p' => $post_id, 'comment_status' => 'approved'), admin_url('edit-comments.php'))),
 				$approved_comments_number,
 				$pending_comments ? $approved_phrase : $approved_only_phrase
 			);
 		} else {
-			printf( '<span class="post-com-count post-com-count-no-comments"><span class="comment-count comment-count-no-comments" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+			printf('<span class="post-com-count post-com-count-no-comments"><span class="comment-count comment-count-no-comments" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
 				$approved_comments_number,
-				$pending_comments ? __( 'No approved comments' ) : __( 'No comments' )
+				$pending_comments ? __('No approved comments') : __('No comments')
 			);
 		}
 
-		if ( $pending_comments ) {
-			printf( '<a href="%s" class="post-com-count post-com-count-pending"><span class="comment-count-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
-				esc_url( add_query_arg( array( 'p' => $post_id, 'comment_status' => 'moderated' ), admin_url( 'edit-comments.php' ) ) ),
+		if ($pending_comments) {
+			printf('<a href="%s" class="post-com-count post-com-count-pending"><span class="comment-count-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+				esc_url(add_query_arg(array('p' => $post_id, 'comment_status' => 'moderated'), admin_url('edit-comments.php'))),
 				$pending_comments_number,
 				$pending_phrase
 			);
 		} else {
-			printf( '<span class="post-com-count post-com-count-pending post-com-count-no-pending"><span class="comment-count comment-count-no-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+			printf('<span class="post-com-count post-com-count-pending post-com-count-no-pending"><span class="comment-count comment-count-no-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
 				$pending_comments_number,
-				$approved_comments ? __( 'No pending comments' ) : __( 'No comments' )
+				$approved_comments ? __('No pending comments') : __('No comments')
 			);
 		}
 	}
@@ -697,12 +697,12 @@ 
 	 * @return int
 	 */
 	public function get_pagenum() {
-		$pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
+		$pagenum = isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 0;
 
-		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
+		if (isset($this->_pagination_args['total_pages']) && $pagenum > $this->_pagination_args['total_pages'])
 			$pagenum = $this->_pagination_args['total_pages'];
 
-		return max( 1, $pagenum );
+		return max(1, $pagenum);
 	}
 
 	/**
@@ -715,9 +715,9 @@ 
 	 * @param int    $default
 	 * @return int
 	 */
-	protected function get_items_per_page( $option, $default = 20 ) {
-		$per_page = (int) get_user_option( $option );
-		if ( empty( $per_page ) || $per_page < 1 )
+	protected function get_items_per_page($option, $default = 20) {
+		$per_page = (int) get_user_option($option);
+		if (empty($per_page) || $per_page < 1)
 			$per_page = $default;
 
 		/**
@@ -733,7 +733,7 @@ 
 		 *
 		 * @param int $per_page Number of items to be displayed. Default 20.
 		 */
-		return (int) apply_filters( $option, $per_page );
+		return (int) apply_filters($option, $per_page);
 	}
 
 	/**
@@ -744,30 +744,30 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function pagination( $which ) {
-		if ( empty( $this->_pagination_args ) ) {
+	protected function pagination($which) {
+		if (empty($this->_pagination_args)) {
 			return;
 		}
 
 		$total_items = $this->_pagination_args['total_items'];
 		$total_pages = $this->_pagination_args['total_pages'];
 		$infinite_scroll = false;
-		if ( isset( $this->_pagination_args['infinite_scroll'] ) ) {
+		if (isset($this->_pagination_args['infinite_scroll'])) {
 			$infinite_scroll = $this->_pagination_args['infinite_scroll'];
 		}
 
-		if ( 'top' === $which && $total_pages > 1 ) {
-			$this->screen->render_screen_reader_content( 'heading_pagination' );
+		if ('top' === $which && $total_pages > 1) {
+			$this->screen->render_screen_reader_content('heading_pagination');
 		}
 
-		$output = '<span class="displaying-num">' . sprintf( _n( '%s item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
+		$output = '<span class="displaying-num">'.sprintf(_n('%s item', '%s items', $total_items), number_format_i18n($total_items)).'</span>';
 
 		$current = $this->get_pagenum();
 		$removable_query_args = wp_removable_query_args();
 
-		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+		$current_url = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 
-		$current_url = remove_query_arg( $removable_query_args, $current_url );
+		$current_url = remove_query_arg($removable_query_args, $current_url);
 
 		$page_links = array();
 
@@ -776,81 +776,81 @@ 
 
 		$disable_first = $disable_last = $disable_prev = $disable_next = false;
 
- 		if ( $current == 1 ) {
+ 		if ($current == 1) {
 			$disable_first = true;
 			$disable_prev = true;
  		}
-		if ( $current == 2 ) {
+		if ($current == 2) {
 			$disable_first = true;
 		}
- 		if ( $current == $total_pages ) {
+ 		if ($current == $total_pages) {
 			$disable_last = true;
 			$disable_next = true;
  		}
-		if ( $current == $total_pages - 1 ) {
+		if ($current == $total_pages - 1) {
 			$disable_last = true;
 		}
 
-		if ( $disable_first ) {
+		if ($disable_first) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&laquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='first-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( remove_query_arg( 'paged', $current_url ) ),
-				__( 'First page' ),
+			$page_links[] = sprintf("<a class='first-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url(remove_query_arg('paged', $current_url)),
+				__('First page'),
 				'&laquo;'
 			);
 		}
 
-		if ( $disable_prev ) {
+		if ($disable_prev) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&lsaquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='prev-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $current_url ) ),
-				__( 'Previous page' ),
+			$page_links[] = sprintf("<a class='prev-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url(add_query_arg('paged', max(1, $current - 1), $current_url)),
+				__('Previous page'),
 				'&lsaquo;'
 			);
 		}
 
-		if ( 'bottom' === $which ) {
+		if ('bottom' === $which) {
 			$html_current_page  = $current;
-			$total_pages_before = '<span class="screen-reader-text">' . __( 'Current Page' ) . '</span><span id="table-paging" class="paging-input"><span class="tablenav-paging-text">';
+			$total_pages_before = '<span class="screen-reader-text">'.__('Current Page').'</span><span id="table-paging" class="paging-input"><span class="tablenav-paging-text">';
 		} else {
-			$html_current_page = sprintf( "%s<input class='current-page' id='current-page-selector' type='text' name='paged' value='%s' size='%d' aria-describedby='table-paging' /><span class='tablenav-paging-text'>",
-				'<label for="current-page-selector" class="screen-reader-text">' . __( 'Current Page' ) . '</label>',
+			$html_current_page = sprintf("%s<input class='current-page' id='current-page-selector' type='text' name='paged' value='%s' size='%d' aria-describedby='table-paging' /><span class='tablenav-paging-text'>",
+				'<label for="current-page-selector" class="screen-reader-text">'.__('Current Page').'</label>',
 				$current,
-				strlen( $total_pages )
+				strlen($total_pages)
 			);
 		}
-		$html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
-		$page_links[] = $total_pages_before . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . $total_pages_after;
+		$html_total_pages = sprintf("<span class='total-pages'>%s</span>", number_format_i18n($total_pages));
+		$page_links[] = $total_pages_before.sprintf(_x('%1$s of %2$s', 'paging'), $html_current_page, $html_total_pages).$total_pages_after;
 
-		if ( $disable_next ) {
+		if ($disable_next) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&rsaquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='next-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $current_url ) ),
-				__( 'Next page' ),
+			$page_links[] = sprintf("<a class='next-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url(add_query_arg('paged', min($total_pages, $current + 1), $current_url)),
+				__('Next page'),
 				'&rsaquo;'
 			);
 		}
 
-		if ( $disable_last ) {
+		if ($disable_last) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&raquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='last-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', $total_pages, $current_url ) ),
-				__( 'Last page' ),
+			$page_links[] = sprintf("<a class='last-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url(add_query_arg('paged', $total_pages, $current_url)),
+				__('Last page'),
 				'&raquo;'
 			);
 		}
 
 		$pagination_links_class = 'pagination-links';
-		if ( ! empty( $infinite_scroll ) ) {
+		if ( ! empty($infinite_scroll)) {
 			$pagination_links_class = ' hide-if-js';
 		}
-		$output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
+		$output .= "\n<span class='$pagination_links_class'>".join("\n", $page_links).'</span>';
 
-		if ( $total_pages ) {
+		if ($total_pages) {
 			$page_class = $total_pages < 2 ? ' one-page' : '';
 		} else {
 			$page_class = ' no-pages';
@@ -871,7 +871,7 @@ 
 	 * @return array
 	 */
 	public function get_columns() {
-		die( 'function WP_List_Table::get_columns() must be over-ridden in a sub-class.' );
+		die('function WP_List_Table::get_columns() must be over-ridden in a sub-class.');
 	}
 
 	/**
@@ -903,14 +903,14 @@ 
 		$columns = $this->get_columns();
 		$column = '';
 
-		if ( empty( $columns ) ) {
+		if (empty($columns)) {
 			return $column;
 		}
 
 		// We need a primary defined so responsive views show something,
 		// so let's fall back to the first non-checkbox column.
-		foreach ( $columns as $col => $column_name ) {
-			if ( 'cb' === $col ) {
+		foreach ($columns as $col => $column_name) {
+			if ('cb' === $col) {
 				continue;
 			}
 
@@ -942,12 +942,12 @@ 
 	 * @return string The name of the primary column.
 	 */
 	protected function get_primary_column_name() {
-		$columns = get_column_headers( $this->screen );
+		$columns = get_column_headers($this->screen);
 		$default = $this->get_default_primary_column_name();
 
 		// If the primary column doesn't exist fall back to the
 		// first non-checkbox column.
-		if ( ! isset( $columns[ $default ] ) ) {
+		if ( ! isset($columns[$default])) {
 			$default = WP_List_Table::get_default_primary_column_name();
 		}
 
@@ -959,9 +959,9 @@ 
 		 * @param string $default Column name default for the specific list table, e.g. 'name'.
 		 * @param string $context Screen ID for specific list table, e.g. 'plugins'.
 		 */
-		$column  = apply_filters( 'list_table_primary_column', $default, $this->screen->id );
+		$column  = apply_filters('list_table_primary_column', $default, $this->screen->id);
 
-		if ( empty( $column ) || ! isset( $columns[ $column ] ) ) {
+		if (empty($column) || ! isset($columns[$column])) {
 			$column = $default;
 		}
 
@@ -978,19 +978,19 @@ 
 	 */
 	protected function get_column_info() {
 		// $_column_headers is already set / cached
-		if ( isset( $this->_column_headers ) && is_array( $this->_column_headers ) ) {
+		if (isset($this->_column_headers) && is_array($this->_column_headers)) {
 			// Back-compat for list tables that have been manually setting $_column_headers for horse reasons.
 			// In 4.3, we added a fourth argument for primary column.
-			$column_headers = array( array(), array(), array(), $this->get_primary_column_name() );
-			foreach ( $this->_column_headers as $key => $value ) {
-				$column_headers[ $key ] = $value;
+			$column_headers = array(array(), array(), array(), $this->get_primary_column_name());
+			foreach ($this->_column_headers as $key => $value) {
+				$column_headers[$key] = $value;
 			}
 
 			return $column_headers;
 		}
 
-		$columns = get_column_headers( $this->screen );
-		$hidden = get_hidden_columns( $this->screen );
+		$columns = get_column_headers($this->screen);
+		$hidden = get_hidden_columns($this->screen);
 
 		$sortable_columns = $this->get_sortable_columns();
 		/**
@@ -1003,22 +1003,22 @@ 
 		 *
 		 * @param array $sortable_columns An array of sortable columns.
 		 */
-		$_sortable = apply_filters( "manage_{$this->screen->id}_sortable_columns", $sortable_columns );
+		$_sortable = apply_filters("manage_{$this->screen->id}_sortable_columns", $sortable_columns);
 
 		$sortable = array();
-		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
+		foreach ($_sortable as $id => $data) {
+			if (empty($data))
 				continue;
 
 			$data = (array) $data;
-			if ( !isset( $data[1] ) )
+			if ( ! isset($data[1]))
 				$data[1] = false;
 
 			$sortable[$id] = $data;
 		}
 
 		$primary = $this->get_primary_column_name();
-		$this->_column_headers = array( $columns, $hidden, $sortable, $primary );
+		$this->_column_headers = array($columns, $hidden, $sortable, $primary);
 
 		return $this->_column_headers;
 	}
@@ -1032,9 +1032,9 @@ 
 	 * @return int
 	 */
 	public function get_column_count() {
-		list ( $columns, $hidden ) = $this->get_column_info();
-		$hidden = array_intersect( array_keys( $columns ), array_filter( $hidden ) );
-		return count( $columns ) - count( $hidden );
+		list ($columns, $hidden) = $this->get_column_info();
+		$hidden = array_intersect(array_keys($columns), array_filter($hidden));
+		return count($columns) - count($hidden);
 	}
 
 	/**
@@ -1047,51 +1047,51 @@ 
 	 *
 	 * @param bool $with_id Whether to set the id attribute or not
 	 */
-	public function print_column_headers( $with_id = true ) {
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+	public function print_column_headers($with_id = true) {
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-		$current_url = remove_query_arg( 'paged', $current_url );
+		$current_url = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+		$current_url = remove_query_arg('paged', $current_url);
 
-		if ( isset( $_GET['orderby'] ) ) {
+		if (isset($_GET['orderby'])) {
 			$current_orderby = $_GET['orderby'];
 		} else {
 			$current_orderby = '';
 		}
 
-		if ( isset( $_GET['order'] ) && 'desc' === $_GET['order'] ) {
+		if (isset($_GET['order']) && 'desc' === $_GET['order']) {
 			$current_order = 'desc';
 		} else {
 			$current_order = 'asc';
 		}
 
-		if ( ! empty( $columns['cb'] ) ) {
+		if ( ! empty($columns['cb'])) {
 			static $cb_counter = 1;
-			$columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'
-				. '<input id="cb-select-all-' . $cb_counter . '" type="checkbox" />';
+			$columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-'.$cb_counter.'">'.__('Select All').'</label>'
+				. '<input id="cb-select-all-'.$cb_counter.'" type="checkbox" />';
 			$cb_counter++;
 		}
 
-		foreach ( $columns as $column_key => $column_display_name ) {
-			$class = array( 'manage-column', "column-$column_key" );
+		foreach ($columns as $column_key => $column_display_name) {
+			$class = array('manage-column', "column-$column_key");
 
-			if ( in_array( $column_key, $hidden ) ) {
+			if (in_array($column_key, $hidden)) {
 				$class[] = 'hidden';
 			}
 
-			if ( 'cb' === $column_key )
+			if ('cb' === $column_key)
 				$class[] = 'check-column';
-			elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) )
+			elseif (in_array($column_key, array('posts', 'comments', 'links')))
 				$class[] = 'num';
 
-			if ( $column_key === $primary ) {
+			if ($column_key === $primary) {
 				$class[] = 'column-primary';
 			}
 
-			if ( isset( $sortable[$column_key] ) ) {
-				list( $orderby, $desc_first ) = $sortable[$column_key];
+			if (isset($sortable[$column_key])) {
+				list($orderby, $desc_first) = $sortable[$column_key];
 
-				if ( $current_orderby === $orderby ) {
+				if ($current_orderby === $orderby) {
 					$order = 'asc' === $current_order ? 'desc' : 'asc';
 					$class[] = 'sorted';
 					$class[] = $current_order;
@@ -1101,15 +1101,15 @@ 
 					$class[] = $desc_first ? 'asc' : 'desc';
 				}
 
-				$column_display_name = '<a href="' . esc_url( add_query_arg( compact( 'orderby', 'order' ), $current_url ) ) . '"><span>' . $column_display_name . '</span><span class="sorting-indicator"></span></a>';
+				$column_display_name = '<a href="'.esc_url(add_query_arg(compact('orderby', 'order'), $current_url)).'"><span>'.$column_display_name.'</span><span class="sorting-indicator"></span></a>';
 			}
 
-			$tag = ( 'cb' === $column_key ) ? 'td' : 'th';
-			$scope = ( 'th' === $tag ) ? 'scope="col"' : '';
+			$tag = ('cb' === $column_key) ? 'td' : 'th';
+			$scope = ('th' === $tag) ? 'scope="col"' : '';
 			$id = $with_id ? "id='$column_key'" : '';
 
-			if ( !empty( $class ) )
-				$class = "class='" . join( ' ', $class ) . "'";
+			if ( ! empty($class))
+				$class = "class='".join(' ', $class)."'";
 
 			echo "<$tag $scope $id $class>$column_display_name</$tag>";
 		}
@@ -1124,11 +1124,11 @@ 
 	public function display() {
 		$singular = $this->_args['singular'];
 
-		$this->display_tablenav( 'top' );
+		$this->display_tablenav('top');
 
-		$this->screen->render_screen_reader_content( 'heading_list' );
+		$this->screen->render_screen_reader_content('heading_list');
 ?>
-<table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
+<table class="wp-list-table <?php echo implode(' ', $this->get_table_classes()); ?>">
 	<thead>
 	<tr>
 		<?php $this->print_column_headers(); ?>
@@ -1136,7 +1136,7 @@ 
 	</thead>
 
 	<tbody id="the-list"<?php
-		if ( $singular ) {
+		if ($singular) {
 			echo " data-wp-lists='list:$singular'";
 		} ?>>
 		<?php $this->display_rows_or_placeholder(); ?>
@@ -1144,13 +1144,13 @@ 
 
 	<tfoot>
 	<tr>
-		<?php $this->print_column_headers( false ); ?>
+		<?php $this->print_column_headers(false); ?>
 	</tr>
 	</tfoot>
 
 </table>
 <?php
-		$this->display_tablenav( 'bottom' );
+		$this->display_tablenav('bottom');
 	}
 
 	/**
@@ -1162,7 +1162,7 @@ 
 	 * @return array List of CSS classes for the table tag.
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', 'fixed', 'striped', $this->_args['plural'] );
+		return array('widefat', 'fixed', 'striped', $this->_args['plural']);
 	}
 
 	/**
@@ -1172,20 +1172,20 @@ 
 	 * @access protected
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
-		if ( 'top' === $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+	protected function display_tablenav($which) {
+		if ('top' === $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-	<div class="tablenav <?php echo esc_attr( $which ); ?>">
+	<div class="tablenav <?php echo esc_attr($which); ?>">
 
-		<?php if ( $this->has_items() ): ?>
+		<?php if ($this->has_items()): ?>
 		<div class="alignleft actions bulkactions">
-			<?php $this->bulk_actions( $which ); ?>
+			<?php $this->bulk_actions($which); ?>
 		</div>
 		<?php endif;
-		$this->extra_tablenav( $which );
-		$this->pagination( $which );
+		$this->extra_tablenav($which);
+		$this->pagination($which);
 ?>
 
 		<br class="clear" />
@@ -1201,7 +1201,7 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {}
+	protected function extra_tablenav($which) {}
 
 	/**
 	 * Generate the tbody element for the list table.
@@ -1210,10 +1210,10 @@ 
 	 * @access public
 	 */
 	public function display_rows_or_placeholder() {
-		if ( $this->has_items() ) {
+		if ($this->has_items()) {
 			$this->display_rows();
 		} else {
-			echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
+			echo '<tr class="no-items"><td class="colspanchange" colspan="'.$this->get_column_count().'">';
 			$this->no_items();
 			echo '</td></tr>';
 		}
@@ -1226,8 +1226,8 @@ 
 	 * @access public
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $item )
-			$this->single_row( $item );
+		foreach ($this->items as $item)
+			$this->single_row($item);
 	}
 
 	/**
@@ -1238,9 +1238,9 @@ 
 	 *
 	 * @param object $item The current item
 	 */
-	public function single_row( $item ) {
+	public function single_row($item) {
 		echo '<tr>';
-		$this->single_row_columns( $item );
+		$this->single_row_columns($item);
 		echo '</tr>';
 	}
 
@@ -1249,13 +1249,13 @@ 
 	 * @param object $item
 	 * @param string $column_name
 	 */
-	protected function column_default( $item, $column_name ) {}
+	protected function column_default($item, $column_name) {}
 
 	/**
 	 *
 	 * @param object $item
 	 */
-	protected function column_cb( $item ) {}
+	protected function column_cb($item) {}
 
 	/**
 	 * Generates the columns for a single row of the table
@@ -1265,46 +1265,46 @@ 
 	 *
 	 * @param object $item The current item
 	 */
-	protected function single_row_columns( $item ) {
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+	protected function single_row_columns($item) {
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 			$classes = "$column_name column-$column_name";
-			if ( $primary === $column_name ) {
+			if ($primary === $column_name) {
 				$classes .= ' has-row-actions column-primary';
 			}
 
-			if ( in_array( $column_name, $hidden ) ) {
+			if (in_array($column_name, $hidden)) {
 				$classes .= ' hidden';
 			}
 
 			// Comments column uses HTML in the display name with screen reader text.
 			// Instead of using esc_attr(), we strip tags to get closer to a user-friendly string.
-			$data = 'data-colname="' . wp_strip_all_tags( $column_display_name ) . '"';
+			$data = 'data-colname="'.wp_strip_all_tags($column_display_name).'"';
 
 			$attributes = "class='$classes' $data";
 
-			if ( 'cb' === $column_name ) {
+			if ('cb' === $column_name) {
 				echo '<th scope="row" class="check-column">';
-				echo $this->column_cb( $item );
+				echo $this->column_cb($item);
 				echo '</th>';
-			} elseif ( method_exists( $this, '_column_' . $column_name ) ) {
+			} elseif (method_exists($this, '_column_'.$column_name)) {
 				echo call_user_func(
-					array( $this, '_column_' . $column_name ),
+					array($this, '_column_'.$column_name),
 					$item,
 					$classes,
 					$data,
 					$primary
 				);
-			} elseif ( method_exists( $this, 'column_' . $column_name ) ) {
+			} elseif (method_exists($this, 'column_'.$column_name)) {
 				echo "<td $attributes>";
-				echo call_user_func( array( $this, 'column_' . $column_name ), $item );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo call_user_func(array($this, 'column_'.$column_name), $item);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			} else {
 				echo "<td $attributes>";
-				echo $this->column_default( $item, $column_name );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo $this->column_default($item, $column_name);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			}
 		}
@@ -1321,8 +1321,8 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string The row actions HTML, or an empty string if the current column is the primary column.
 	 */
-	protected function handle_row_actions( $item, $column_name, $primary ) {
-		return $column_name === $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>' : '';
+	protected function handle_row_actions($item, $column_name, $primary) {
+		return $column_name === $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">'.__('Show more details').'</span></button>' : '';
  	}
 
 	/**
@@ -1335,7 +1335,7 @@ 
 		$this->prepare_items();
 
 		ob_start();
-		if ( ! empty( $_REQUEST['no_placeholder'] ) ) {
+		if ( ! empty($_REQUEST['no_placeholder'])) {
 			$this->display_rows();
 		} else {
 			$this->display_rows_or_placeholder();
@@ -1343,20 +1343,20 @@ 
 
 		$rows = ob_get_clean();
 
-		$response = array( 'rows' => $rows );
+		$response = array('rows' => $rows);
 
-		if ( isset( $this->_pagination_args['total_items'] ) ) {
+		if (isset($this->_pagination_args['total_items'])) {
 			$response['total_items_i18n'] = sprintf(
-				_n( '%s item', '%s items', $this->_pagination_args['total_items'] ),
-				number_format_i18n( $this->_pagination_args['total_items'] )
+				_n('%s item', '%s items', $this->_pagination_args['total_items']),
+				number_format_i18n($this->_pagination_args['total_items'])
 			);
 		}
-		if ( isset( $this->_pagination_args['total_pages'] ) ) {
+		if (isset($this->_pagination_args['total_pages'])) {
 			$response['total_pages'] = $this->_pagination_args['total_pages'];
-			$response['total_pages_i18n'] = number_format_i18n( $this->_pagination_args['total_pages'] );
+			$response['total_pages_i18n'] = number_format_i18n($this->_pagination_args['total_pages']);
 		}
 
-		die( wp_json_encode( $response ) );
+		die(wp_json_encode($response));
 	}
 
 	/**
@@ -1366,13 +1366,13 @@ 
 	 */
 	public function _js_vars() {
 		$args = array(
-			'class'  => get_class( $this ),
+			'class'  => get_class($this),
 			'screen' => array(
 				'id'   => $this->screen->id,
 				'base' => $this->screen->base,
 			)
 		);
 
-		printf( "<script type='text/javascript'>list_args = %s;</script>\n", wp_json_encode( $args ) );
+		printf("<script type='text/javascript'>list_args = %s;</script>\n", wp_json_encode($args));
 	}
 }

src/wp-admin/includes/theme.php

Spacing +188 added lines, -188 removed lines

@@ -20,80 +20,80 @@ 
 function delete_theme($stylesheet, $redirect = '') {
 	global $wp_filesystem;
 
-	if ( empty($stylesheet) )
+	if (empty($stylesheet))
 		return false;
 
-	if ( empty( $redirect ) ) {
-		$redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
+	if (empty($redirect)) {
+		$redirect = wp_nonce_url('themes.php?action=delete&stylesheet='.urlencode($stylesheet), 'delete-theme_'.$stylesheet);
 	}
 
 	ob_start();
-	$credentials = request_filesystem_credentials( $redirect );
+	$credentials = request_filesystem_credentials($redirect);
 	$data = ob_get_clean();
 
-	if ( false === $credentials ) {
-		if ( ! empty( $data ) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+	if (false === $credentials) {
+		if ( ! empty($data)) {
+			include_once(ABSPATH.'wp-admin/admin-header.php');
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 		}
 		return;
 	}
 
-	if ( ! WP_Filesystem( $credentials ) ) {
+	if ( ! WP_Filesystem($credentials)) {
 		ob_start();
-		request_filesystem_credentials( $redirect, '', true ); // Failed to connect, Error and request again.
+		request_filesystem_credentials($redirect, '', true); // Failed to connect, Error and request again.
 		$data = ob_get_clean();
 
-		if ( ! empty($data) ) {
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty($data)) {
+			include_once(ABSPATH.'wp-admin/admin-header.php');
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 		}
 		return;
 	}
 
-	if ( ! is_object($wp_filesystem) )
+	if ( ! is_object($wp_filesystem))
 		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
+	if (is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code())
 		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
 
 	// Get the base plugin folder.
 	$themes_dir = $wp_filesystem->wp_themes_dir();
-	if ( empty( $themes_dir ) ) {
-		return new WP_Error( 'fs_no_themes_dir', __( 'Unable to locate WordPress theme directory.' ) );
+	if (empty($themes_dir)) {
+		return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress theme directory.'));
 	}
 
-	$themes_dir = trailingslashit( $themes_dir );
-	$theme_dir = trailingslashit( $themes_dir . $stylesheet );
-	$deleted = $wp_filesystem->delete( $theme_dir, true );
+	$themes_dir = trailingslashit($themes_dir);
+	$theme_dir = trailingslashit($themes_dir.$stylesheet);
+	$deleted = $wp_filesystem->delete($theme_dir, true);
 
-	if ( ! $deleted ) {
-		return new WP_Error( 'could_not_remove_theme', sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet ) );
+	if ( ! $deleted) {
+		return new WP_Error('could_not_remove_theme', sprintf(__('Could not fully remove the theme %s.'), $stylesheet));
 	}
 
-	$theme_translations = wp_get_installed_translations( 'themes' );
+	$theme_translations = wp_get_installed_translations('themes');
 
 	// Remove language files, silently.
-	if ( ! empty( $theme_translations[ $stylesheet ] ) ) {
-		$translations = $theme_translations[ $stylesheet ];
+	if ( ! empty($theme_translations[$stylesheet])) {
+		$translations = $theme_translations[$stylesheet];
 
-		foreach ( $translations as $translation => $data ) {
-			$wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.po' );
-			$wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.mo' );
+		foreach ($translations as $translation => $data) {
+			$wp_filesystem->delete(WP_LANG_DIR.'/themes/'.$stylesheet.'-'.$translation.'.po');
+			$wp_filesystem->delete(WP_LANG_DIR.'/themes/'.$stylesheet.'-'.$translation.'.mo');
 		}
 	}
 
 	// Remove the theme from allowed themes on the network.
-	if ( is_multisite() ) {
-		WP_Theme::network_disable_theme( $stylesheet );
+	if (is_multisite()) {
+		WP_Theme::network_disable_theme($stylesheet);
 	}
 
 	// Force refresh of theme update information.
-	delete_site_transient( 'update_themes' );
+	delete_site_transient('update_themes');
 
 	return true;
 }
@@ -106,8 +106,8 @@ 
  * @param WP_Post|null $post Optional. The post being edited, provided for context.
  * @return array Key is the template name, value is the filename of the template
  */
-function get_page_templates( $post = null ) {
-	return array_flip( wp_get_theme()->get_page_templates( $post ) );
+function get_page_templates($post = null) {
+	return array_flip(wp_get_theme()->get_page_templates($post));
 }
 
 /**
@@ -121,7 +121,7 @@ 
  * @return string
  */
 function _get_template_edit_filename($fullpath, $containingfolder) {
-	return str_replace(dirname(dirname( $containingfolder )) , '', $fullpath);
+	return str_replace(dirname(dirname($containingfolder)), '', $fullpath);
 }
 
 /**
@@ -134,8 +134,8 @@ 
  *
  * @param WP_Theme $theme Theme data object.
  */
-function theme_update_available( $theme ) {
-	echo get_theme_update_available( $theme );
+function theme_update_available($theme) {
+	echo get_theme_update_available($theme);
 }
 
 /**
@@ -150,16 +150,16 @@ 
  * @param WP_Theme $theme WP_Theme object.
  * @return false|string HTML for the update link, or false if invalid info was passed.
  */
-function get_theme_update_available( $theme ) {
+function get_theme_update_available($theme) {
 	static $themes_update = null;
 
-	if ( !current_user_can('update_themes' ) )
+	if ( ! current_user_can('update_themes'))
 		return false;
 
-	if ( !isset($themes_update) )
+	if ( ! isset($themes_update))
 		$themes_update = get_site_transient('update_themes');
 
-	if ( ! ( $theme instanceof WP_Theme ) ) {
+	if ( ! ($theme instanceof WP_Theme)) {
 		return false;
 	}
 
@@ -167,49 +167,49 @@ 
 
 	$html = '';
 
-	if ( isset($themes_update->response[ $stylesheet ]) ) {
-		$update = $themes_update->response[ $stylesheet ];
+	if (isset($themes_update->response[$stylesheet])) {
+		$update = $themes_update->response[$stylesheet];
 		$theme_name = $theme->display('Name');
 		$details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
-		$update_url = wp_nonce_url( admin_url( 'update.php?action=upgrade-theme&theme=' . urlencode( $stylesheet ) ), 'upgrade-theme_' . $stylesheet );
+		$update_url = wp_nonce_url(admin_url('update.php?action=upgrade-theme&theme='.urlencode($stylesheet)), 'upgrade-theme_'.$stylesheet);
 
-		if ( !is_multisite() ) {
-			if ( ! current_user_can('update_themes') ) {
+		if ( ! is_multisite()) {
+			if ( ! current_user_can('update_themes')) {
 				/* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number */
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ) . '</strong></p>',
+				$html = sprintf('<p><strong>'.__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.').'</strong></p>',
 					$theme_name,
-					esc_url( $details_url ),
-					sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+					esc_url($details_url),
+					sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 						/* translators: 1: theme name, 2: version number */
-						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+						esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $update['new_version']))
 					),
 					$update['new_version']
 				);
-			} elseif ( empty( $update['package'] ) ) {
+			} elseif (empty($update['package'])) {
 				/* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number */
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
+				$html = sprintf('<p><strong>'.__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>').'</strong></p>',
 					$theme_name,
-					esc_url( $details_url ),
-					sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+					esc_url($details_url),
+					sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 						/* translators: 1: theme name, 2: version number */
-						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+						esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $update['new_version']))
 					),
 					$update['new_version']
 				);
 			} else {
 				/* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ) . '</strong></p>',
+				$html = sprintf('<p><strong>'.__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.').'</strong></p>',
 					$theme_name,
-					esc_url( $details_url ),
-					sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+					esc_url($details_url),
+					sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 						/* translators: 1: theme name, 2: version number */
-						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+						esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $update['new_version']))
 					),
 					$update['new_version'],
 					$update_url,
-					sprintf( 'aria-label="%s" id="update-theme" data-slug="%s"',
+					sprintf('aria-label="%s" id="update-theme" data-slug="%s"',
 						/* translators: %s: theme name */
-						esc_attr( sprintf( __( 'Update %s now' ), $theme_name ) ),
+						esc_attr(sprintf(__('Update %s now'), $theme_name)),
 						$stylesheet
 					)
 				);
@@ -228,89 +228,89 @@ 
  * @param bool $api Optional. Whether try to fetch tags from the WordPress.org API. Defaults to true.
  * @return array Array of features keyed by category with translations keyed by slug.
  */
-function get_theme_feature_list( $api = true ) {
+function get_theme_feature_list($api = true) {
 	// Hard-coded list is used if api not accessible.
 	$features = array(
 
-		__( 'Layout' ) => array(
-			'grid-layout'   => __( 'Grid Layout' ),
-			'one-column'    => __( 'One Column' ),
-			'two-columns'   => __( 'Two Columns' ),
-			'three-columns' => __( 'Three Columns' ),
-			'four-columns'  => __( 'Four Columns' ),
-			'left-sidebar'  => __( 'Left Sidebar' ),
-			'right-sidebar' => __( 'Right Sidebar' ),
+		__('Layout') => array(
+			'grid-layout'   => __('Grid Layout'),
+			'one-column'    => __('One Column'),
+			'two-columns'   => __('Two Columns'),
+			'three-columns' => __('Three Columns'),
+			'four-columns'  => __('Four Columns'),
+			'left-sidebar'  => __('Left Sidebar'),
+			'right-sidebar' => __('Right Sidebar'),
 		),
 
-		__( 'Features' ) => array(
-			'accessibility-ready'   => __( 'Accessibility Ready' ),
-			'buddypress'            => __( 'BuddyPress' ),
-			'custom-background'     => __( 'Custom Background' ),
-			'custom-colors'         => __( 'Custom Colors' ),
-			'custom-header'         => __( 'Custom Header' ),
-			'custom-logo'           => __( 'Custom Logo' ),
-			'custom-menu'           => __( 'Custom Menu' ),
-			'editor-style'          => __( 'Editor Style' ),
-			'featured-image-header' => __( 'Featured Image Header' ),
-			'featured-images'       => __( 'Featured Images' ),
-			'flexible-header'       => __( 'Flexible Header' ),
-			'footer-widgets'        => __( 'Footer Widgets' ),
-			'front-page-post-form'  => __( 'Front Page Posting' ),
-			'full-width-template'   => __( 'Full Width Template' ),
-			'microformats'          => __( 'Microformats' ),
-			'post-formats'          => __( 'Post Formats' ),
-			'rtl-language-support'  => __( 'RTL Language Support' ),
-			'sticky-post'           => __( 'Sticky Post' ),
-			'theme-options'         => __( 'Theme Options' ),
-			'threaded-comments'     => __( 'Threaded Comments' ),
-			'translation-ready'     => __( 'Translation Ready' ),
+		__('Features') => array(
+			'accessibility-ready'   => __('Accessibility Ready'),
+			'buddypress'            => __('BuddyPress'),
+			'custom-background'     => __('Custom Background'),
+			'custom-colors'         => __('Custom Colors'),
+			'custom-header'         => __('Custom Header'),
+			'custom-logo'           => __('Custom Logo'),
+			'custom-menu'           => __('Custom Menu'),
+			'editor-style'          => __('Editor Style'),
+			'featured-image-header' => __('Featured Image Header'),
+			'featured-images'       => __('Featured Images'),
+			'flexible-header'       => __('Flexible Header'),
+			'footer-widgets'        => __('Footer Widgets'),
+			'front-page-post-form'  => __('Front Page Posting'),
+			'full-width-template'   => __('Full Width Template'),
+			'microformats'          => __('Microformats'),
+			'post-formats'          => __('Post Formats'),
+			'rtl-language-support'  => __('RTL Language Support'),
+			'sticky-post'           => __('Sticky Post'),
+			'theme-options'         => __('Theme Options'),
+			'threaded-comments'     => __('Threaded Comments'),
+			'translation-ready'     => __('Translation Ready'),
 		),
 
-		__( 'Subject' )  => array(
-			'blog'           => __( 'Blog' ),
-			'e-commerce'     => __( 'E-Commerce' ),
-			'education'      => __( 'Education' ),
-			'entertainment'  => __( 'Entertainment' ),
-			'food-and-drink' => __( 'Food & Drink' ),
-			'holiday'        => __( 'Holiday' ),
-			'news'           => __( 'News' ),
-			'photography'    => __( 'Photography' ),
-			'portfolio'      => __( 'Portfolio' ),
+		__('Subject')  => array(
+			'blog'           => __('Blog'),
+			'e-commerce'     => __('E-Commerce'),
+			'education'      => __('Education'),
+			'entertainment'  => __('Entertainment'),
+			'food-and-drink' => __('Food & Drink'),
+			'holiday'        => __('Holiday'),
+			'news'           => __('News'),
+			'photography'    => __('Photography'),
+			'portfolio'      => __('Portfolio'),
 		)
 	);
 
-	if ( ! $api || ! current_user_can( 'install_themes' ) )
+	if ( ! $api || ! current_user_can('install_themes'))
 		return $features;
 
-	if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) )
-		set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	if ( ! $feature_list = get_site_transient('wporg_theme_feature_list'))
+		set_site_transient('wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS);
 
-	if ( !$feature_list ) {
-		$feature_list = themes_api( 'feature_list', array() );
-		if ( is_wp_error( $feature_list ) )
+	if ( ! $feature_list) {
+		$feature_list = themes_api('feature_list', array());
+		if (is_wp_error($feature_list))
 			return $features;
 	}
 
-	if ( !$feature_list )
+	if ( ! $feature_list)
 		return $features;
 
-	set_site_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
+	set_site_transient('wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS);
 
 	$category_translations = array(
-		'Layout'   => __( 'Layout' ),
-		'Features' => __( 'Features' ),
-		'Subject'  => __( 'Subject' ),
+		'Layout'   => __('Layout'),
+		'Features' => __('Features'),
+		'Subject'  => __('Subject'),
 	);
 
 	// Loop over the wporg canonical list and apply translations
 	$wporg_features = array();
-	foreach ( (array) $feature_list as $feature_category => $feature_items ) {
-		if ( isset($category_translations[$feature_category]) )
+	foreach ((array) $feature_list as $feature_category => $feature_items) {
+		if (isset($category_translations[$feature_category]))
 			$feature_category = $category_translations[$feature_category];
 		$wporg_features[$feature_category] = array();
 
-		foreach ( $feature_items as $feature ) {
-			if ( isset($features[$feature_category][$feature]) )
+		foreach ($feature_items as $feature) {
+			if (isset($features[$feature_category][$feature]))
 				$wporg_features[$feature_category][$feature] = $features[$feature_category][$feature];
 			else
 				$wporg_features[$feature_category][$feature] = $feature;
@@ -401,17 +401,17 @@ 
  *         {@link https://developer.wordpress.org/reference/functions/themes_api/ function reference article}
  *         for more information on the make-up of possible return objects depending on the value of `$action`.
  */
-function themes_api( $action, $args = array() ) {
+function themes_api($action, $args = array()) {
 
-	if ( is_array( $args ) ) {
+	if (is_array($args)) {
 		$args = (object) $args;
 	}
 
-	if ( ! isset( $args->per_page ) ) {
+	if ( ! isset($args->per_page)) {
 		$args->per_page = 24;
 	}
 
-	if ( ! isset( $args->locale ) ) {
+	if ( ! isset($args->locale)) {
 		$args->locale = get_locale();
 	}
 
@@ -426,7 +426,7 @@ 
 	 * @param string $action Requested action. Likely values are 'theme_information',
 	 *                       'feature_list', or 'query_themes'.
 	 */
-	$args = apply_filters( 'themes_api_args', $args, $action );
+	$args = apply_filters('themes_api_args', $args, $action);
 
 	/**
 	 * Filters whether to override the WordPress.org Themes API.
@@ -443,34 +443,34 @@ 
 	 *                                    'feature_list', or 'query_themes'.
 	 * @param object             $args     Arguments used to query for installer pages from the Themes API.
 	 */
-	$res = apply_filters( 'themes_api', false, $action, $args );
+	$res = apply_filters('themes_api', false, $action, $args);
 
-	if ( ! $res ) {
+	if ( ! $res) {
 		$url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
-		if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-			$url = set_url_scheme( $url, 'https' );
+		if ($ssl = wp_http_supports(array('ssl')))
+			$url = set_url_scheme($url, 'https');
 
 		$http_args = array(
 			'body' => array(
 				'action' => $action,
-				'request' => serialize( $args )
+				'request' => serialize($args)
 			)
 		);
-		$request = wp_remote_post( $url, $http_args );
+		$request = wp_remote_post($url, $http_args);
 
-		if ( $ssl && is_wp_error( $request ) ) {
-			if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) {
-				trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+		if ($ssl && is_wp_error($request)) {
+			if ( ! defined('DOING_AJAX') || ! DOING_AJAX) {
+				trigger_error(__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.').' '.__('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE);
 			}
-			$request = wp_remote_post( $http_url, $http_args );
+			$request = wp_remote_post($http_url, $http_args);
 		}
 
-		if ( is_wp_error($request) ) {
-			$res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
+		if (is_wp_error($request)) {
+			$res = new WP_Error('themes_api_failed', __('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.'), $request->get_error_message());
 		} else {
-			$res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
-			if ( ! is_object( $res ) && ! is_array( $res ) )
-				$res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+			$res = maybe_unserialize(wp_remote_retrieve_body($request));
+			if ( ! is_object($res) && ! is_array($res))
+				$res = new WP_Error('themes_api_failed', __('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.'), wp_remote_retrieve_body($request));
 		}
 	}
 
@@ -484,7 +484,7 @@ 
 	 *                                      'feature_list', or 'query_themes'.
 	 * @param object                $args   Arguments used to query for installer pages from the WordPress.org Themes API.
 	 */
-	return apply_filters( 'themes_api_result', $res, $action, $args );
+	return apply_filters('themes_api_result', $res, $action, $args);
 }
 
 /**
@@ -497,7 +497,7 @@ 
  *
  * @return array An associative array of theme data, sorted by name.
  */
-function wp_prepare_themes_for_js( $themes = null ) {
+function wp_prepare_themes_for_js($themes = null) {
 	$current_theme = get_stylesheet();
 
 	/**
@@ -512,78 +512,78 @@ 
 	 * @param null|array $themes          An array of WP_Theme objects to prepare, if any.
 	 * @param string     $current_theme   The current theme slug.
 	 */
-	$prepared_themes = (array) apply_filters( 'pre_prepare_themes_for_js', array(), $themes, $current_theme );
+	$prepared_themes = (array) apply_filters('pre_prepare_themes_for_js', array(), $themes, $current_theme);
 
-	if ( ! empty( $prepared_themes ) ) {
+	if ( ! empty($prepared_themes)) {
 		return $prepared_themes;
 	}
 
 	// Make sure the current theme is listed first.
-	$prepared_themes[ $current_theme ] = array();
+	$prepared_themes[$current_theme] = array();
 
-	if ( null === $themes ) {
-		$themes = wp_get_themes( array( 'allowed' => true ) );
-		if ( ! isset( $themes[ $current_theme ] ) ) {
-			$themes[ $current_theme ] = wp_get_theme();
+	if (null === $themes) {
+		$themes = wp_get_themes(array('allowed' => true));
+		if ( ! isset($themes[$current_theme])) {
+			$themes[$current_theme] = wp_get_theme();
 		}
 	}
 
 	$updates = array();
-	if ( current_user_can( 'update_themes' ) ) {
-		$updates_transient = get_site_transient( 'update_themes' );
-		if ( isset( $updates_transient->response ) ) {
+	if (current_user_can('update_themes')) {
+		$updates_transient = get_site_transient('update_themes');
+		if (isset($updates_transient->response)) {
 			$updates = $updates_transient->response;
 		}
 	}
 
-	WP_Theme::sort_by_name( $themes );
+	WP_Theme::sort_by_name($themes);
 
 	$parents = array();
 
-	foreach ( $themes as $theme ) {
+	foreach ($themes as $theme) {
 		$slug = $theme->get_stylesheet();
-		$encoded_slug = urlencode( $slug );
+		$encoded_slug = urlencode($slug);
 
 		$parent = false;
-		if ( $theme->parent() ) {
-			$parent = $theme->parent()->display( 'Name' );
-			$parents[ $slug ] = $theme->parent()->get_stylesheet();
+		if ($theme->parent()) {
+			$parent = $theme->parent()->display('Name');
+			$parents[$slug] = $theme->parent()->get_stylesheet();
 		}
 
 		$customize_action = null;
-		if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-			$customize_action = esc_url( add_query_arg(
+		if (current_user_can('edit_theme_options') && current_user_can('customize')) {
+			$customize_action = esc_url(add_query_arg(
 				array(
-					'return' => urlencode( esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ),
+					'return' => urlencode(esc_url_raw(wp_unslash($_SERVER['REQUEST_URI']))),
 				),
-				wp_customize_url( $slug )
-			) );
+				wp_customize_url($slug)
+			));
 		}
 
-		$prepared_themes[ $slug ] = array(
+		$prepared_themes[$slug] = array(
 			'id'           => $slug,
-			'name'         => $theme->display( 'Name' ),
-			'screenshot'   => array( $theme->get_screenshot() ), // @todo multiple
-			'description'  => $theme->display( 'Description' ),
-			'author'       => $theme->display( 'Author', false, true ),
-			'authorAndUri' => $theme->display( 'Author' ),
-			'version'      => $theme->display( 'Version' ),
-			'tags'         => $theme->display( 'Tags' ),
+			'name'         => $theme->display('Name'),
+			'screenshot'   => array($theme->get_screenshot()), // @todo multiple
+			'description'  => $theme->display('Description'),
+			'author'       => $theme->display('Author', false, true),
+			'authorAndUri' => $theme->display('Author'),
+			'version'      => $theme->display('Version'),
+			'tags'         => $theme->display('Tags'),
 			'parent'       => $parent,
 			'active'       => $slug === $current_theme,
-			'hasUpdate'    => isset( $updates[ $slug ] ),
-			'update'       => get_theme_update_available( $theme ),
+			'hasUpdate'    => isset($updates[$slug]),
+			'update'       => get_theme_update_available($theme),
 			'actions'      => array(
-				'activate' => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&amp;stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
+				'activate' => current_user_can('switch_themes') ? wp_nonce_url(admin_url('themes.php?action=activate&amp;stylesheet='.$encoded_slug), 'switch-theme_'.$slug) : null,
 				'customize' => $customize_action,
-				'delete'   => current_user_can( 'delete_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&amp;stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
+				'delete'   => current_user_can('delete_themes') ? wp_nonce_url(admin_url('themes.php?action=delete&amp;stylesheet='.$encoded_slug), 'delete-theme_'.$slug) : null,
 			),
 		);
 	}
 
 	// Remove 'delete' action if theme has an active child
-	if ( ! empty( $parents ) && array_key_exists( $current_theme, $parents ) ) {
-		unset( $prepared_themes[ $parents[ $current_theme ] ]['actions']['delete'] );
+	if ( ! empty($parents) && array_key_exists($current_theme, $parents)) {
+		unset($prepared_themes[$parents[$current_theme]]['actions']['delete']);
 	}
 
 	/**
@@ -595,9 +595,9 @@ 
 	 *
 	 * @param array $prepared_themes Array of themes.
 	 */
-	$prepared_themes = apply_filters( 'wp_prepare_themes_for_js', $prepared_themes );
-	$prepared_themes = array_values( $prepared_themes );
-	return array_filter( $prepared_themes );
+	$prepared_themes = apply_filters('wp_prepare_themes_for_js', $prepared_themes);
+	$prepared_themes = array_values($prepared_themes);
+	return array_filter($prepared_themes);
 }
 
 /**
@@ -606,16 +606,16 @@ 
  * @since 4.2.0
  */
 function customize_themes_print_templates() {
-	$preview_url = esc_url( add_query_arg( 'theme', '__THEME__' ) ); // Token because esc_url() strips curly braces.
-	$preview_url = str_replace( '__THEME__', '{{ data.id }}', $preview_url );
+	$preview_url = esc_url(add_query_arg('theme', '__THEME__')); // Token because esc_url() strips curly braces.
+	$preview_url = str_replace('__THEME__', '{{ data.id }}', $preview_url);
 	?>
 	<script type="text/html" id="tmpl-customize-themes-details-view">
 		<div class="theme-backdrop"></div>
 		<div class="theme-wrap wp-clearfix">
 			<div class="theme-header">
-				<button type="button" class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
-				<button type="button" class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>
-				<button type="button" class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close details dialog' ); ?></span></button>
+				<button type="button" class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Show previous theme'); ?></span></button>
+				<button type="button" class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Show next theme'); ?></span></button>
+				<button type="button" class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Close details dialog'); ?></span></button>
 			</div>
 			<div class="theme-about wp-clearfix">
 				<div class="theme-screenshots">
@@ -628,18 +628,18 @@ 
 
 				<div class="theme-info">
 					<# if ( data.active ) { #>
-						<span class="current-label"><?php _e( 'Current Theme' ); ?></span>
+						<span class="current-label"><?php _e('Current Theme'); ?></span>
 					<# } #>
-					<h2 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></span></h2>
-					<h3 class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></h3>
+					<h2 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf(__('Version: %s'), '{{ data.version }}'); ?></span></h2>
+					<h3 class="theme-author"><?php printf(__('By %s'), '{{{ data.authorAndUri }}}'); ?></h3>
 					<p class="theme-description">{{{ data.description }}}</p>
 
 					<# if ( data.parent ) { #>
-						<p class="parent-theme"><?php printf( __( 'This is a child theme of %s.' ), '<strong>{{{ data.parent }}}</strong>' ); ?></p>
+						<p class="parent-theme"><?php printf(__('This is a child theme of %s.'), '<strong>{{{ data.parent }}}</strong>'); ?></p>
 					<# } #>
 
 					<# if ( data.tags ) { #>
-						<p class="theme-tags"><span><?php _e( 'Tags:' ); ?></span> {{ data.tags }}</p>
+						<p class="theme-tags"><span><?php _e('Tags:'); ?></span> {{ data.tags }}</p>
 					<# } #>
 				</div>
 			</div>
@@ -649,9 +649,9 @@ 
 					<div class="inactive-theme">
 						<?php
 						/* translators: %s: Theme name */
-						$aria_label = sprintf( __( 'Preview %s' ), '{{ data.name }}' );
+						$aria_label = sprintf(__('Preview %s'), '{{ data.name }}');
 						?>
-						<a href="<?php echo $preview_url; ?>" target="_top" class="button button-primary" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Live Preview' ); ?></a>
+						<a href="<?php echo $preview_url; ?>" target="_top" class="button button-primary" aria-label="<?php echo esc_attr($aria_label); ?>"><?php _e('Live Preview'); ?></a>
 					</div>
 				</div>
 			<# } #>

Braces +41 added lines, -28 removed lines

@@ -20,8 +20,9 @@ 
 function delete_theme($stylesheet, $redirect = '') {
 	global $wp_filesystem;
 
-	if ( empty($stylesheet) )
-		return false;
+	if ( empty($stylesheet) ) {
+			return false;
+	}
 
 	if ( empty( $redirect ) ) {
 		$redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
@@ -55,11 +56,13 @@ 
 		return;
 	}
 
-	if ( ! is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	if ( ! is_object($wp_filesystem) ) {
+			return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	}
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() ) {
+			return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+	}
 
 	// Get the base plugin folder.
 	$themes_dir = $wp_filesystem->wp_themes_dir();
@@ -153,11 +156,13 @@ 
 function get_theme_update_available( $theme ) {
 	static $themes_update = null;
 
-	if ( !current_user_can('update_themes' ) )
-		return false;
+	if ( !current_user_can('update_themes' ) ) {
+			return false;
+	}
 
-	if ( !isset($themes_update) )
-		$themes_update = get_site_transient('update_themes');
+	if ( !isset($themes_update) ) {
+			$themes_update = get_site_transient('update_themes');
+	}
 
 	if ( ! ( $theme instanceof WP_Theme ) ) {
 		return false;
@@ -279,20 +284,24 @@ 
 		)
 	);
 
-	if ( ! $api || ! current_user_can( 'install_themes' ) )
-		return $features;
+	if ( ! $api || ! current_user_can( 'install_themes' ) ) {
+			return $features;
+	}
 
-	if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) )
-		set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) ) {
+			set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	}
 
 	if ( !$feature_list ) {
 		$feature_list = themes_api( 'feature_list', array() );
-		if ( is_wp_error( $feature_list ) )
-			return $features;
+		if ( is_wp_error( $feature_list ) ) {
+					return $features;
+		}
 	}
 
-	if ( !$feature_list )
-		return $features;
+	if ( !$feature_list ) {
+			return $features;
+	}
 
 	set_site_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
 
@@ -305,15 +314,17 @@ 
 	// Loop over the wporg canonical list and apply translations
 	$wporg_features = array();
 	foreach ( (array) $feature_list as $feature_category => $feature_items ) {
-		if ( isset($category_translations[$feature_category]) )
-			$feature_category = $category_translations[$feature_category];
+		if ( isset($category_translations[$feature_category]) ) {
+					$feature_category = $category_translations[$feature_category];
+		}
 		$wporg_features[$feature_category] = array();
 
 		foreach ( $feature_items as $feature ) {
-			if ( isset($features[$feature_category][$feature]) )
-				$wporg_features[$feature_category][$feature] = $features[$feature_category][$feature];
-			else
-				$wporg_features[$feature_category][$feature] = $feature;
+			if ( isset($features[$feature_category][$feature]) ) {
+							$wporg_features[$feature_category][$feature] = $features[$feature_category][$feature];
+			} else {
+							$wporg_features[$feature_category][$feature] = $feature;
+			}
 		}
 	}
 
@@ -447,8 +458,9 @@ 
 
 	if ( ! $res ) {
 		$url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
-		if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-			$url = set_url_scheme( $url, 'https' );
+		if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
+					$url = set_url_scheme( $url, 'https' );
+		}
 
 		$http_args = array(
 			'body' => array(
@@ -469,8 +481,9 @@ 
 			$res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
 		} else {
 			$res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
-			if ( ! is_object( $res ) && ! is_array( $res ) )
-				$res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+			if ( ! is_object( $res ) && ! is_array( $res ) ) {
+							$res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+			}
 		}
 	}
 

src/wp-admin/options-discussion.php

Spacing +51 added lines, -51 removed lines

@@ -6,34 +6,34 @@ 
  * @subpackage Administration
  */
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('Sorry, you are not allowed to manage options for this site.'));
 
 $title = __('Discussion Settings');
 $parent_file = 'options-general.php';
 
-add_action( 'admin_print_footer_scripts', 'options_discussion_add_js' );
+add_action('admin_print_footer_scripts', 'options_discussion_add_js');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation links to get information on what each discussion setting does.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation links to get information on what each discussion setting does.').'</p>'.
+		'<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>',
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Discussion_Screen" target="_blank">Documentation on Discussion Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Settings_Discussion_Screen" target="_blank">Documentation on Discussion Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form method="post" action="options.php">
 <?php settings_fields('discussion'); ?>
@@ -54,7 +54,7 @@ 
 <input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> />
 <?php _e('Allow people to post comments on new articles'); ?></label>
 <br />
-<p class="description"><?php echo '(' . __( 'These settings may be overridden for individual articles.' ) . ')'; ?></p>
+<p class="description"><?php echo '('.__('These settings may be overridden for individual articles.').')'; ?></p>
 </fieldset></td>
 </tr>
 <tr>
@@ -65,13 +65,13 @@ 
 <label for="comment_registration">
 <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
 <?php _e('Users must be registered and logged in to comment'); ?>
-<?php if ( !get_option( 'users_can_register' ) && is_multisite() ) echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' ); ?>
+<?php if ( ! get_option('users_can_register') && is_multisite()) echo ' '.__('(Signup has been disabled. Only members of this site can comment.)'); ?>
 </label>
 <br />
 
 <label for="close_comments_for_old_posts">
 <input name="close_comments_for_old_posts" type="checkbox" id="close_comments_for_old_posts" value="1" <?php checked('1', get_option('close_comments_for_old_posts')); ?> />
-<?php printf( __('Automatically close comments on articles older than %s days'), '</label><label for="close_comments_days_old"><input name="close_comments_days_old" type="number" min="0" step="1" id="close_comments_days_old" value="' . esc_attr(get_option('close_comments_days_old')) . '" class="small-text" />'); ?>
+<?php printf(__('Automatically close comments on articles older than %s days'), '</label><label for="close_comments_days_old"><input name="close_comments_days_old" type="number" min="0" step="1" id="close_comments_days_old" value="'.esc_attr(get_option('close_comments_days_old')).'" class="small-text" />'); ?>
 </label>
 <br />
 <label for="thread_comments">
@@ -84,42 +84,42 @@ 
  *
  * @param int $max_depth The maximum depth of threaded comments. Default 10.
  */
-$maxdeep = (int) apply_filters( 'thread_comments_depth_max', 10 );
+$maxdeep = (int) apply_filters('thread_comments_depth_max', 10);
 
 $thread_comments_depth = '</label><label for="thread_comments_depth"><select name="thread_comments_depth" id="thread_comments_depth">';
-for ( $i = 2; $i <= $maxdeep; $i++ ) {
-	$thread_comments_depth .= "<option value='" . esc_attr($i) . "'";
-	if ( get_option('thread_comments_depth') == $i ) $thread_comments_depth .= " selected='selected'";
+for ($i = 2; $i <= $maxdeep; $i++) {
+	$thread_comments_depth .= "<option value='".esc_attr($i)."'";
+	if (get_option('thread_comments_depth') == $i) $thread_comments_depth .= " selected='selected'";
 	$thread_comments_depth .= ">$i</option>";
 }
 $thread_comments_depth .= '</select>';
 
-printf( __('Enable threaded (nested) comments %s levels deep'), $thread_comments_depth );
+printf(__('Enable threaded (nested) comments %s levels deep'), $thread_comments_depth);
 
 ?></label>
 <br />
 <label for="page_comments">
-<input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked( '1', get_option( 'page_comments' ) ); ?> />
+<input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked('1', get_option('page_comments')); ?> />
 <?php
 $default_comments_page = '</label><label for="default_comments_page"><select name="default_comments_page" id="default_comments_page"><option value="newest"';
-if ( 'newest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
-$default_comments_page .= '>' . __('last') . '</option><option value="oldest"';
-if ( 'oldest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
-$default_comments_page .= '>' . __('first') . '</option></select>';
+if ('newest' == get_option('default_comments_page')) $default_comments_page .= ' selected="selected"';
+$default_comments_page .= '>'.__('last').'</option><option value="oldest"';
+if ('oldest' == get_option('default_comments_page')) $default_comments_page .= ' selected="selected"';
+$default_comments_page .= '>'.__('first').'</option></select>';
 
-printf( __('Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default'), '</label><label for="comments_per_page"><input name="comments_per_page" type="number" step="1" min="0" id="comments_per_page" value="' . esc_attr(get_option('comments_per_page')) . '" class="small-text" />', $default_comments_page );
+printf(__('Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default'), '</label><label for="comments_per_page"><input name="comments_per_page" type="number" step="1" min="0" id="comments_per_page" value="'.esc_attr(get_option('comments_per_page')).'" class="small-text" />', $default_comments_page);
 
 ?></label>
 <br />
 <label for="comment_order"><?php
 
 $comment_order = '<select name="comment_order" id="comment_order"><option value="asc"';
-if ( 'asc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
-$comment_order .= '>' . __('older') . '</option><option value="desc"';
-if ( 'desc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
-$comment_order .= '>' . __('newer') . '</option></select>';
+if ('asc' == get_option('comment_order')) $comment_order .= ' selected="selected"';
+$comment_order .= '>'.__('older').'</option><option value="desc"';
+if ('desc' == get_option('comment_order')) $comment_order .= ' selected="selected"';
+$comment_order .= '>'.__('newer').'</option></select>';
 
-printf( __('Comments should be displayed with the %s comments at the top of each page'), $comment_order );
+printf(__('Comments should be displayed with the %s comments at the top of each page'), $comment_order);
 
 ?></label>
 </fieldset></td>
@@ -149,11 +149,11 @@ 
 <tr>
 <th scope="row"><?php _e('Comment Moderation'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation'); ?></span></legend>
-<p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ); ?></label></p>
+<p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="'.esc_attr(get_option('comment_max_links')).'" class="small-text" />'); ?></label></p>
 
 <p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
 <p>
-<textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
+<textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea(get_option('moderation_keys')); ?></textarea>
 </p>
 </fieldset></td>
 </tr>
@@ -162,7 +162,7 @@ 
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
 <p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP, it will be put in the trash. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
 <p>
-<textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
+<textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea(get_option('blacklist_keys')); ?></textarea>
 </p>
 </fieldset></td>
 </tr>
@@ -176,7 +176,7 @@ 
 <?php
 // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that?
 
-$show_avatars = get_option( 'show_avatars' );
+$show_avatars = get_option('show_avatars');
 ?>
 
 <table class="form-table">
@@ -184,12 +184,12 @@ 
 <th scope="row"><?php _e('Avatar Display'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display'); ?></span></legend>
 	<label for="show_avatars">
-		<input type="checkbox" id="show_avatars" name="show_avatars" value="1" <?php checked( $show_avatars, 1 ); ?> />
-		<?php _e( 'Show Avatars' ); ?>
+		<input type="checkbox" id="show_avatars" name="show_avatars" value="1" <?php checked($show_avatars, 1); ?> />
+		<?php _e('Show Avatars'); ?>
 	</label>
 </fieldset></td>
 </tr>
-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
+<tr class="avatar-settings<?php if ( ! $show_avatars) echo ' hide-if-js'; ?>">
 <th scope="row"><?php _e('Maximum Rating'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating'); ?></span></legend>
 
@@ -206,13 +206,13 @@ 
 );
 foreach ($ratings as $key => $rating) :
 	$selected = (get_option('avatar_rating') == $key) ? 'checked="checked"' : '';
-	echo "\n\t<label><input type='radio' name='avatar_rating' value='" . esc_attr($key) . "' $selected/> $rating</label><br />";
+	echo "\n\t<label><input type='radio' name='avatar_rating' value='".esc_attr($key)."' $selected/> $rating</label><br />";
 endforeach;
 ?>
 
 </fieldset></td>
 </tr>
-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
+<tr class="avatar-settings<?php if ( ! $show_avatars) echo ' hide-if-js'; ?>">
 <th scope="row"><?php _e('Default Avatar'); ?></th>
 <td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
 
@@ -238,22 +238,22 @@ 
  *
  * @param array $avatar_defaults Array of default avatars.
  */
-$avatar_defaults = apply_filters( 'avatar_defaults', $avatar_defaults );
-$default = get_option( 'avatar_default', 'mystery' );
+$avatar_defaults = apply_filters('avatar_defaults', $avatar_defaults);
+$default = get_option('avatar_default', 'mystery');
 $avatar_list = '';
 
 // Force avatars on to display these choices
-add_filter( 'pre_option_show_avatars', '__return_true', 100 );
+add_filter('pre_option_show_avatars', '__return_true', 100);
 
-foreach ( $avatar_defaults as $default_key => $default_name ) {
+foreach ($avatar_defaults as $default_key => $default_name) {
 	$selected = ($default == $default_key) ? 'checked="checked" ' : '';
-	$avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='" . esc_attr($default_key) . "' {$selected}/> ";
-	$avatar_list .= get_avatar( $user_email, 32, $default_key, '', array( 'force_default' => true ) );
-	$avatar_list .= ' ' . $default_name . '</label>';
+	$avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='".esc_attr($default_key)."' {$selected}/> ";
+	$avatar_list .= get_avatar($user_email, 32, $default_key, '', array('force_default' => true));
+	$avatar_list .= ' '.$default_name.'</label>';
 	$avatar_list .= '<br />';
 }
 
-remove_filter( 'pre_option_show_avatars', '__return_true', 100 );
+remove_filter('pre_option_show_avatars', '__return_true', 100);
 
 /**
  * Filters the HTML output of the default avatar list.
@@ -262,7 +262,7 @@ 
  *
  * @param string $avatar_list HTML markup of the avatar list.
  */
-echo apply_filters( 'default_avatar_select', $avatar_list );
+echo apply_filters('default_avatar_select', $avatar_list);
 ?>
 
 </fieldset></td>
@@ -276,4 +276,4 @@ 
 </form>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>