ntwb / wordpress

src/wp-includes/ms-default-filters.php

Braces +10 added lines, -4 removed lines

@@ -49,10 +49,12 @@ 
 // Counts
 add_action( 'admin_init', 'wp_schedule_update_network_counts');
 add_action( 'update_network_counts', 'wp_update_network_counts');
-foreach ( array( 'user_register', 'deleted_user', 'wpmu_new_user', 'make_spam_user', 'make_ham_user' ) as $action )
+foreach ( array( 'user_register', 'deleted_user', 'wpmu_new_user', 'make_spam_user', 'make_ham_user' ) as $action ) {
 	add_action( $action, 'wp_maybe_update_network_user_counts' );
-foreach ( array( 'make_spam_blog', 'make_ham_blog', 'archive_blog', 'unarchive_blog', 'make_delete_blog', 'make_undelete_blog' ) as $action )
+}
+foreach ( array( 'make_spam_blog', 'make_ham_blog', 'archive_blog', 'unarchive_blog', 'make_delete_blog', 'make_undelete_blog' ) as $action ) {
 	add_action( $action, 'wp_maybe_update_network_site_counts' );
+}
 unset( $action );
 
 // Files
@@ -67,10 +69,14 @@ 
 
 // Disable somethings by default for multisite
 add_filter( 'enable_update_services_configuration', '__return_false' );
-if ( ! defined('POST_BY_EMAIL') || ! POST_BY_EMAIL ) // back compat constant.
+if ( ! defined('POST_BY_EMAIL') || ! POST_BY_EMAIL ) {
+	// back compat constant.
 	add_filter( 'enable_post_by_email_configuration', '__return_false' );
-if ( ! defined('EDIT_ANY_USER') || ! EDIT_ANY_USER ) // back compat constant.
+}
+if ( ! defined('EDIT_ANY_USER') || ! EDIT_ANY_USER ) {
+	// back compat constant.
 	add_filter( 'enable_edit_any_user_configuration', '__return_false' );
+}
 add_filter( 'force_filtered_html_on_import', '__return_true' );
 
 // WP_HOME and WP_SITEURL should not have any effect in MS

Spacing +53 added lines, -53 removed lines

@@ -13,84 +13,84 @@
  * @since 3.0.0
  */
 
-add_action( 'init', 'ms_subdomain_constants' );
+add_action('init', 'ms_subdomain_constants');
 
 // Functions
-add_action( 'update_option_blog_public', 'update_blog_public', 10, 2 );
-add_filter( 'option_users_can_register', 'users_can_register_signup_filter' );
-add_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
+add_action('update_option_blog_public', 'update_blog_public', 10, 2);
+add_filter('option_users_can_register', 'users_can_register_signup_filter');
+add_filter('site_option_welcome_user_email', 'welcome_user_msg_filter');
 
 // Users
-add_filter( 'wpmu_validate_user_signup', 'signup_nonce_check' );
-add_action( 'init', 'maybe_add_existing_user_to_blog' );
-add_action( 'wpmu_new_user', 'newuser_notify_siteadmin' );
-add_action( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 );
-add_action( 'wpmu_activate_user', 'wpmu_welcome_user_notification', 10, 3 );
-add_action( 'after_signup_user', 'wpmu_signup_user_notification', 10, 4 );
-add_action( 'network_site_new_created_user',   'wp_send_new_user_notifications' );
-add_action( 'network_site_users_created_user', 'wp_send_new_user_notifications' );
-add_action( 'network_user_new_created_user',   'wp_send_new_user_notifications' );
-add_filter( 'sanitize_user', 'strtolower' );
+add_filter('wpmu_validate_user_signup', 'signup_nonce_check');
+add_action('init', 'maybe_add_existing_user_to_blog');
+add_action('wpmu_new_user', 'newuser_notify_siteadmin');
+add_action('wpmu_activate_user', 'add_new_user_to_blog', 10, 3);
+add_action('wpmu_activate_user', 'wpmu_welcome_user_notification', 10, 3);
+add_action('after_signup_user', 'wpmu_signup_user_notification', 10, 4);
+add_action('network_site_new_created_user', 'wp_send_new_user_notifications');
+add_action('network_site_users_created_user', 'wp_send_new_user_notifications');
+add_action('network_user_new_created_user', 'wp_send_new_user_notifications');
+add_filter('sanitize_user', 'strtolower');
 
 // Blogs
-add_filter( 'wpmu_validate_blog_signup', 'signup_nonce_check' );
-add_action( 'wpmu_new_blog', 'wpmu_log_new_registrations', 10, 2 );
-add_action( 'wpmu_new_blog', 'newblog_notify_siteadmin', 10, 2 );
-add_action( 'wpmu_activate_blog', 'wpmu_welcome_notification', 10, 5 );
-add_action( 'after_signup_site', 'wpmu_signup_blog_notification', 10, 7 );
+add_filter('wpmu_validate_blog_signup', 'signup_nonce_check');
+add_action('wpmu_new_blog', 'wpmu_log_new_registrations', 10, 2);
+add_action('wpmu_new_blog', 'newblog_notify_siteadmin', 10, 2);
+add_action('wpmu_activate_blog', 'wpmu_welcome_notification', 10, 5);
+add_action('after_signup_site', 'wpmu_signup_blog_notification', 10, 7);
 
 // Register Nonce
-add_action( 'signup_hidden_fields', 'signup_nonce_fields' );
+add_action('signup_hidden_fields', 'signup_nonce_fields');
 
 // Template
-add_action( 'template_redirect', 'maybe_redirect_404' );
-add_filter( 'allowed_redirect_hosts', 'redirect_this_site' );
+add_action('template_redirect', 'maybe_redirect_404');
+add_filter('allowed_redirect_hosts', 'redirect_this_site');
 
 // Administration
-add_filter( 'term_id_filter', 'global_terms', 10, 2 );
-add_action( 'delete_post', '_update_posts_count_on_delete' );
-add_action( 'delete_post', '_update_blog_date_on_post_delete' );
-add_action( 'transition_post_status', '_update_blog_date_on_post_publish', 10, 3 );
-add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 2 );
+add_filter('term_id_filter', 'global_terms', 10, 2);
+add_action('delete_post', '_update_posts_count_on_delete');
+add_action('delete_post', '_update_blog_date_on_post_delete');
+add_action('transition_post_status', '_update_blog_date_on_post_publish', 10, 3);
+add_action('transition_post_status', '_update_posts_count_on_transition_post_status', 10, 2);
 
 // Counts
-add_action( 'admin_init', 'wp_schedule_update_network_counts');
-add_action( 'update_network_counts', 'wp_update_network_counts');
-foreach ( array( 'user_register', 'deleted_user', 'wpmu_new_user', 'make_spam_user', 'make_ham_user' ) as $action )
-	add_action( $action, 'wp_maybe_update_network_user_counts' );
-foreach ( array( 'make_spam_blog', 'make_ham_blog', 'archive_blog', 'unarchive_blog', 'make_delete_blog', 'make_undelete_blog' ) as $action )
-	add_action( $action, 'wp_maybe_update_network_site_counts' );
-unset( $action );
+add_action('admin_init', 'wp_schedule_update_network_counts');
+add_action('update_network_counts', 'wp_update_network_counts');
+foreach (array('user_register', 'deleted_user', 'wpmu_new_user', 'make_spam_user', 'make_ham_user') as $action)
+	add_action($action, 'wp_maybe_update_network_user_counts');
+foreach (array('make_spam_blog', 'make_ham_blog', 'archive_blog', 'unarchive_blog', 'make_delete_blog', 'make_undelete_blog') as $action)
+	add_action($action, 'wp_maybe_update_network_site_counts');
+unset($action);
 
 // Files
-add_filter( 'wp_upload_bits', 'upload_is_file_too_big' );
-add_filter( 'import_upload_size_limit', 'fix_import_form_size' );
-add_filter( 'upload_mimes', 'check_upload_mimes' );
-add_filter( 'upload_size_limit', 'upload_size_limit_filter' );
-add_action( 'upload_ui_over_quota', 'multisite_over_quota_message' );
+add_filter('wp_upload_bits', 'upload_is_file_too_big');
+add_filter('import_upload_size_limit', 'fix_import_form_size');
+add_filter('upload_mimes', 'check_upload_mimes');
+add_filter('upload_size_limit', 'upload_size_limit_filter');
+add_action('upload_ui_over_quota', 'multisite_over_quota_message');
 
 // Mail
-add_action( 'phpmailer_init', 'fix_phpmailer_messageid' );
+add_action('phpmailer_init', 'fix_phpmailer_messageid');
 
 // Disable somethings by default for multisite
-add_filter( 'enable_update_services_configuration', '__return_false' );
-if ( ! defined('POST_BY_EMAIL') || ! POST_BY_EMAIL ) // back compat constant.
-	add_filter( 'enable_post_by_email_configuration', '__return_false' );
-if ( ! defined('EDIT_ANY_USER') || ! EDIT_ANY_USER ) // back compat constant.
-	add_filter( 'enable_edit_any_user_configuration', '__return_false' );
-add_filter( 'force_filtered_html_on_import', '__return_true' );
+add_filter('enable_update_services_configuration', '__return_false');
+if ( ! defined('POST_BY_EMAIL') || ! POST_BY_EMAIL) // back compat constant.
+	add_filter('enable_post_by_email_configuration', '__return_false');
+if ( ! defined('EDIT_ANY_USER') || ! EDIT_ANY_USER) // back compat constant.
+	add_filter('enable_edit_any_user_configuration', '__return_false');
+add_filter('force_filtered_html_on_import', '__return_true');
 
 // WP_HOME and WP_SITEURL should not have any effect in MS
-remove_filter( 'option_siteurl', '_config_wp_siteurl' );
-remove_filter( 'option_home',    '_config_wp_home'    );
+remove_filter('option_siteurl', '_config_wp_siteurl');
+remove_filter('option_home', '_config_wp_home');
 
 // Some options changes should trigger blog details refresh.
-add_action( 'update_option_blogname',   'refresh_blog_details', 10, 0 );
-add_action( 'update_option_siteurl',    'refresh_blog_details', 10, 0 );
-add_action( 'update_option_post_count', 'refresh_blog_details', 10, 0 );
+add_action('update_option_blogname', 'refresh_blog_details', 10, 0);
+add_action('update_option_siteurl', 'refresh_blog_details', 10, 0);
+add_action('update_option_post_count', 'refresh_blog_details', 10, 0);
 
 // If the network upgrade hasn't run yet, assume ms-files.php rewriting is used.
-add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
+add_filter('default_site_option_ms_files_rewriting', '__return_true');
 
 // Whitelist multisite domains for HTTP requests
-add_filter( 'http_request_host_is_external', 'ms_allowed_http_request_hosts', 20, 2 );
+add_filter('http_request_host_is_external', 'ms_allowed_http_request_hosts', 20, 2);

src/wp-includes/ID3/module.audio.flac.php

Indentation +4 added lines, -4 removed lines

@@ -167,7 +167,7 @@ 
 		if (isset($info['flac']['STREAMINFO']['audio_signature'])) {
 
 			if ($info['flac']['STREAMINFO']['audio_signature'] === str_repeat("\x00", 16)) {
-                $this->warning('FLAC STREAMINFO.audio_signature is null (known issue with libOggFLAC)');
+				$this->warning('FLAC STREAMINFO.audio_signature is null (known issue with libOggFLAC)');
 			}
 			else {
 				$info['md5_data_source'] = '';
@@ -346,9 +346,9 @@ 
 	}
 
 	/**
-	* Parse METADATA_BLOCK_PICTURE flac structure and extract attachment
-	* External usage: audio.ogg
-	*/
+	 * Parse METADATA_BLOCK_PICTURE flac structure and extract attachment
+	 * External usage: audio.ogg
+	 */
 	public function parsePICTURE() {
 		$info = &$this->getid3->info;
 

Spacing +49 added lines, -49 removed lines

@@ -48,7 +48,7 @@ 
 			$BlockHeader   = $this->fread(4);
 			$LBFBT         = getid3_lib::BigEndian2Int(substr($BlockHeader, 0, 1));
 			$LastBlockFlag = (bool) ($LBFBT & 0x80);
-			$BlockType     =        ($LBFBT & 0x7F);
+			$BlockType     = ($LBFBT & 0x7F);
 			$BlockLength   = getid3_lib::BigEndian2Int(substr($BlockHeader, 1, 3));
 			$BlockTypeText = self::metaBlockTypeLookup($BlockType);
 
@@ -70,12 +70,12 @@ 
 			$BlockTypeText_raw['block_type_text'] = $BlockTypeText;
 			$BlockTypeText_raw['block_length']    = $BlockLength;
 			if ($BlockTypeText_raw['block_type'] != 0x06) { // do not read attachment data automatically
-				$BlockTypeText_raw['block_data']  = $this->fread($BlockLength);
+				$BlockTypeText_raw['block_data'] = $this->fread($BlockLength);
 			}
 
 			switch ($BlockTypeText) {
 				case 'STREAMINFO':     // 0x00
-					if (!$this->parseSTREAMINFO($BlockTypeText_raw['block_data'])) {
+					if ( ! $this->parseSTREAMINFO($BlockTypeText_raw['block_data'])) {
 						return false;
 					}
 					break;
@@ -85,31 +85,31 @@ 
 					break;
 
 				case 'APPLICATION':    // 0x02
-					if (!$this->parseAPPLICATION($BlockTypeText_raw['block_data'])) {
+					if ( ! $this->parseAPPLICATION($BlockTypeText_raw['block_data'])) {
 						return false;
 					}
 					break;
 
 				case 'SEEKTABLE':      // 0x03
-					if (!$this->parseSEEKTABLE($BlockTypeText_raw['block_data'])) {
+					if ( ! $this->parseSEEKTABLE($BlockTypeText_raw['block_data'])) {
 						return false;
 					}
 					break;
 
 				case 'VORBIS_COMMENT': // 0x04
-					if (!$this->parseVORBIS_COMMENT($BlockTypeText_raw['block_data'])) {
+					if ( ! $this->parseVORBIS_COMMENT($BlockTypeText_raw['block_data'])) {
 						return false;
 					}
 					break;
 
 				case 'CUESHEET':       // 0x05
-					if (!$this->parseCUESHEET($BlockTypeText_raw['block_data'])) {
+					if ( ! $this->parseCUESHEET($BlockTypeText_raw['block_data'])) {
 						return false;
 					}
 					break;
 
 				case 'PICTURE':        // 0x06
-					if (!$this->parsePICTURE()) {
+					if ( ! $this->parsePICTURE()) {
 						return false;
 					}
 					break;
@@ -124,18 +124,18 @@ 
 		while ($LastBlockFlag === false);
 
 		// handle tags
-		if (!empty($info['flac']['VORBIS_COMMENT']['comments'])) {
+		if ( ! empty($info['flac']['VORBIS_COMMENT']['comments'])) {
 			$info['flac']['comments'] = $info['flac']['VORBIS_COMMENT']['comments'];
 		}
-		if (!empty($info['flac']['VORBIS_COMMENT']['vendor'])) {
+		if ( ! empty($info['flac']['VORBIS_COMMENT']['vendor'])) {
 			$info['audio']['encoder'] = str_replace('reference ', '', $info['flac']['VORBIS_COMMENT']['vendor']);
 		}
 
 		// copy attachments to 'comments' array if nesesary
 		if (isset($info['flac']['PICTURE']) && ($this->getid3->option_save_attachments !== getID3::ATTACHMENTS_NONE)) {
 			foreach ($info['flac']['PICTURE'] as $entry) {
-				if (!empty($entry['data'])) {
-					if (!isset($info['flac']['comments']['picture'])) {
+				if ( ! empty($entry['data'])) {
+					if ( ! isset($info['flac']['comments']['picture'])) {
 						$info['flac']['comments']['picture'] = array();
 					}
 					$comments_picture_data = array();
@@ -151,14 +151,14 @@ 
 		}
 
 		if (isset($info['flac']['STREAMINFO'])) {
-			if (!$this->isDependencyFor('matroska')) {
+			if ( ! $this->isDependencyFor('matroska')) {
 				$info['flac']['compressed_audio_bytes'] = $info['avdataend'] - $info['avdataoffset'];
 			}
 			$info['flac']['uncompressed_audio_bytes'] = $info['flac']['STREAMINFO']['samples_stream'] * $info['flac']['STREAMINFO']['channels'] * ($info['flac']['STREAMINFO']['bits_per_sample'] / 8);
 			if ($info['flac']['uncompressed_audio_bytes'] == 0) {
 				return $this->error('Corrupt FLAC file: uncompressed_audio_bytes == zero');
 			}
-			if (!empty($info['flac']['compressed_audio_bytes'])) {
+			if ( ! empty($info['flac']['compressed_audio_bytes'])) {
 				$info['flac']['compression_ratio'] = $info['flac']['compressed_audio_bytes'] / $info['flac']['uncompressed_audio_bytes'];
 			}
 		}
@@ -175,7 +175,7 @@ 
 				for ($i = 0; $i < strlen($md5); $i++) {
 					$info['md5_data_source'] .= str_pad(dechex(ord($md5[$i])), 2, '00', STR_PAD_LEFT);
 				}
-				if (!preg_match('/^[0-9a-f]{32}$/', $info['md5_data_source'])) {
+				if ( ! preg_match('/^[0-9a-f]{32}$/', $info['md5_data_source'])) {
 					unset($info['md5_data_source']);
 				}
 			}
@@ -206,14 +206,14 @@ 
 		$streaminfo['max_frame_size']  = getid3_lib::BigEndian2Int(substr($BlockData, 7, 3));
 
 		$SRCSBSS                       = getid3_lib::BigEndian2Bin(substr($BlockData, 10, 8));
-		$streaminfo['sample_rate']     = getid3_lib::Bin2Dec(substr($SRCSBSS,  0, 20));
-		$streaminfo['channels']        = getid3_lib::Bin2Dec(substr($SRCSBSS, 20,  3)) + 1;
-		$streaminfo['bits_per_sample'] = getid3_lib::Bin2Dec(substr($SRCSBSS, 23,  5)) + 1;
+		$streaminfo['sample_rate']     = getid3_lib::Bin2Dec(substr($SRCSBSS, 0, 20));
+		$streaminfo['channels']        = getid3_lib::Bin2Dec(substr($SRCSBSS, 20, 3)) + 1;
+		$streaminfo['bits_per_sample'] = getid3_lib::Bin2Dec(substr($SRCSBSS, 23, 5)) + 1;
 		$streaminfo['samples_stream']  = getid3_lib::Bin2Dec(substr($SRCSBSS, 28, 36));
 
 		$streaminfo['audio_signature'] = substr($BlockData, 18, 16);
 
-		if (!empty($streaminfo['sample_rate'])) {
+		if ( ! empty($streaminfo['sample_rate'])) {
 
 			$info['audio']['bitrate_mode']    = 'vbr';
 			$info['audio']['sample_rate']     = $streaminfo['sample_rate'];
@@ -221,7 +221,7 @@ 
 			$info['audio']['bits_per_sample'] = $streaminfo['bits_per_sample'];
 			$info['playtime_seconds']         = $streaminfo['samples_stream'] / $streaminfo['sample_rate'];
 			if ($info['playtime_seconds'] > 0) {
-				if (!$this->isDependencyFor('matroska')) {
+				if ( ! $this->isDependencyFor('matroska')) {
 					$info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
 				}
 				else {
@@ -297,16 +297,16 @@ 
 	private function parseCUESHEET($BlockData) {
 		$info = &$this->getid3->info;
 		$offset = 0;
-		$info['flac']['CUESHEET']['media_catalog_number'] =                              trim(substr($BlockData, $offset, 128), "\0");
+		$info['flac']['CUESHEET']['media_catalog_number'] = trim(substr($BlockData, $offset, 128), "\0");
 		$offset += 128;
-		$info['flac']['CUESHEET']['lead_in_samples']      =         getid3_lib::BigEndian2Int(substr($BlockData, $offset, 8));
+		$info['flac']['CUESHEET']['lead_in_samples']      = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 8));
 		$offset += 8;
 		$info['flac']['CUESHEET']['flags']['is_cd']       = (bool) (getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1)) & 0x80);
 		$offset += 1;
 
 		$offset += 258; // reserved
 
-		$info['flac']['CUESHEET']['number_tracks']        =         getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
+		$info['flac']['CUESHEET']['number_tracks'] = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
 		$offset += 1;
 
 		for ($track = 0; $track < $info['flac']['CUESHEET']['number_tracks']; $track++) {
@@ -317,7 +317,7 @@ 
 
 			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['sample_offset']         = $TrackSampleOffset;
 
-			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['isrc']                  =                           substr($BlockData, $offset, 12);
+			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['isrc']                  = substr($BlockData, $offset, 12);
 			$offset += 12;
 
 			$TrackFlagsRaw                                                             = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
@@ -327,7 +327,7 @@ 
 
 			$offset += 13; // reserved
 
-			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['index_points']          = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
+			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['index_points'] = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
 			$offset += 1;
 
 			for ($index = 0; $index < $info['flac']['CUESHEET']['tracks'][$TrackNumber]['index_points']; $index++) {
@@ -396,35 +396,35 @@ 
 	public static function applicationIDLookup($applicationid) {
 		// http://flac.sourceforge.net/id.html
 		static $lookup = array(
-			0x41544348 => 'FlacFile',                                                                           // "ATCH"
-			0x42534F4C => 'beSolo',                                                                             // "BSOL"
-			0x42554753 => 'Bugs Player',                                                                        // "BUGS"
-			0x43756573 => 'GoldWave cue points (specification)',                                                // "Cues"
-			0x46696361 => 'CUE Splitter',                                                                       // "Fica"
-			0x46746F6C => 'flac-tools',                                                                         // "Ftol"
-			0x4D4F5442 => 'MOTB MetaCzar',                                                                      // "MOTB"
-			0x4D505345 => 'MP3 Stream Editor',                                                                  // "MPSE"
-			0x4D754D4C => 'MusicML: Music Metadata Language',                                                   // "MuML"
-			0x52494646 => 'Sound Devices RIFF chunk storage',                                                   // "RIFF"
-			0x5346464C => 'Sound Font FLAC',                                                                    // "SFFL"
-			0x534F4E59 => 'Sony Creative Software',                                                             // "SONY"
-			0x5351455A => 'flacsqueeze',                                                                        // "SQEZ"
-			0x54745776 => 'TwistedWave',                                                                        // "TtWv"
-			0x55495453 => 'UITS Embedding tools',                                                               // "UITS"
-			0x61696666 => 'FLAC AIFF chunk storage',                                                            // "aiff"
-			0x696D6167 => 'flac-image application for storing arbitrary files in APPLICATION metadata blocks',  // "imag"
-			0x7065656D => 'Parseable Embedded Extensible Metadata (specification)',                             // "peem"
-			0x71667374 => 'QFLAC Studio',                                                                       // "qfst"
-			0x72696666 => 'FLAC RIFF chunk storage',                                                            // "riff"
-			0x74756E65 => 'TagTuner',                                                                           // "tune"
-			0x78626174 => 'XBAT',                                                                               // "xbat"
-			0x786D6364 => 'xmcd',                                                                               // "xmcd"
+			0x41544348 => 'FlacFile', // "ATCH"
+			0x42534F4C => 'beSolo', // "BSOL"
+			0x42554753 => 'Bugs Player', // "BUGS"
+			0x43756573 => 'GoldWave cue points (specification)', // "Cues"
+			0x46696361 => 'CUE Splitter', // "Fica"
+			0x46746F6C => 'flac-tools', // "Ftol"
+			0x4D4F5442 => 'MOTB MetaCzar', // "MOTB"
+			0x4D505345 => 'MP3 Stream Editor', // "MPSE"
+			0x4D754D4C => 'MusicML: Music Metadata Language', // "MuML"
+			0x52494646 => 'Sound Devices RIFF chunk storage', // "RIFF"
+			0x5346464C => 'Sound Font FLAC', // "SFFL"
+			0x534F4E59 => 'Sony Creative Software', // "SONY"
+			0x5351455A => 'flacsqueeze', // "SQEZ"
+			0x54745776 => 'TwistedWave', // "TtWv"
+			0x55495453 => 'UITS Embedding tools', // "UITS"
+			0x61696666 => 'FLAC AIFF chunk storage', // "aiff"
+			0x696D6167 => 'flac-image application for storing arbitrary files in APPLICATION metadata blocks', // "imag"
+			0x7065656D => 'Parseable Embedded Extensible Metadata (specification)', // "peem"
+			0x71667374 => 'QFLAC Studio', // "qfst"
+			0x72696666 => 'FLAC RIFF chunk storage', // "riff"
+			0x74756E65 => 'TagTuner', // "tune"
+			0x78626174 => 'XBAT', // "xbat"
+			0x786D6364 => 'xmcd', // "xmcd"
 		);
 		return (isset($lookup[$applicationid]) ? $lookup[$applicationid] : 'reserved');
 	}
 
 	public static function pictureTypeLookup($type_id) {
-		static $lookup = array (
+		static $lookup = array(
 			 0 => 'Other',
 			 1 => '32x32 pixels \'file icon\' (PNG only)',
 			 2 => 'Other file icon',

Braces +2 added lines, -4 removed lines

@@ -168,8 +168,7 @@ 
 
 			if ($info['flac']['STREAMINFO']['audio_signature'] === str_repeat("\x00", 16)) {
                 $this->warning('FLAC STREAMINFO.audio_signature is null (known issue with libOggFLAC)');
-			}
-			else {
+			} else {
 				$info['md5_data_source'] = '';
 				$md5 = $info['flac']['STREAMINFO']['audio_signature'];
 				for ($i = 0; $i < strlen($md5); $i++) {
@@ -223,8 +222,7 @@ 
 			if ($info['playtime_seconds'] > 0) {
 				if (!$this->isDependencyFor('matroska')) {
 					$info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-				}
-				else {
+				} else {
 					$this->warning('Cannot determine audio bitrate because total stream size is unknown');
 				}
 			}

src/wp-includes/ID3/module.tag.id3v1.php

Spacing +20 added lines, -20 removed lines

@@ -21,7 +21,7 @@ 
 	public function Analyze() {
 		$info = &$this->getid3->info;
 
-		if (!getid3_lib::intValueSupported($info['filesize'])) {
+		if ( ! getid3_lib::intValueSupported($info['filesize'])) {
 			$info['warning'][] = 'Unable to check for ID3v1 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
 			return false;
 		}
@@ -34,23 +34,23 @@ 
 
 			$info['avdataend'] = $info['filesize'] - 128;
 
-			$ParsedID3v1['title']   = $this->cutfield(substr($id3v1tag,   3, 30));
-			$ParsedID3v1['artist']  = $this->cutfield(substr($id3v1tag,  33, 30));
-			$ParsedID3v1['album']   = $this->cutfield(substr($id3v1tag,  63, 30));
-			$ParsedID3v1['year']    = $this->cutfield(substr($id3v1tag,  93,  4));
-			$ParsedID3v1['comment'] =                 substr($id3v1tag,  97, 30);  // can't remove nulls yet, track detection depends on them
-			$ParsedID3v1['genreid'] =             ord(substr($id3v1tag, 127,  1));
+			$ParsedID3v1['title']   = $this->cutfield(substr($id3v1tag, 3, 30));
+			$ParsedID3v1['artist']  = $this->cutfield(substr($id3v1tag, 33, 30));
+			$ParsedID3v1['album']   = $this->cutfield(substr($id3v1tag, 63, 30));
+			$ParsedID3v1['year']    = $this->cutfield(substr($id3v1tag, 93, 4));
+			$ParsedID3v1['comment'] = substr($id3v1tag, 97, 30); // can't remove nulls yet, track detection depends on them
+			$ParsedID3v1['genreid'] = ord(substr($id3v1tag, 127, 1));
 
 			// If second-last byte of comment field is null and last byte of comment field is non-null
 			// then this is ID3v1.1 and the comment field is 28 bytes long and the 30th byte is the track number
 			if (($id3v1tag{125} === "\x00") && ($id3v1tag{126} !== "\x00")) {
-				$ParsedID3v1['track']   = ord(substr($ParsedID3v1['comment'], 29,  1));
-				$ParsedID3v1['comment'] =     substr($ParsedID3v1['comment'],  0, 28);
+				$ParsedID3v1['track']   = ord(substr($ParsedID3v1['comment'], 29, 1));
+				$ParsedID3v1['comment'] = substr($ParsedID3v1['comment'], 0, 28);
 			}
 			$ParsedID3v1['comment'] = $this->cutfield($ParsedID3v1['comment']);
 
 			$ParsedID3v1['genre'] = $this->LookupGenreName($ParsedID3v1['genreid']);
-			if (!empty($ParsedID3v1['genre'])) {
+			if ( ! empty($ParsedID3v1['genre'])) {
 				unset($ParsedID3v1['genreid']);
 			}
 			if (isset($ParsedID3v1['genre']) && (empty($ParsedID3v1['genre']) || ($ParsedID3v1['genre'] == 'Unknown'))) {
@@ -69,7 +69,7 @@ 
 											$ParsedID3v1['year'],
 											(isset($ParsedID3v1['genre']) ? $this->LookupGenreID($ParsedID3v1['genre']) : false),
 											$ParsedID3v1['comment'],
-											(!empty($ParsedID3v1['track']) ? $ParsedID3v1['track'] : ''));
+											( ! empty($ParsedID3v1['track']) ? $ParsedID3v1['track'] : ''));
 			$ParsedID3v1['padding_valid'] = true;
 			if ($id3v1tag !== $GoodFormatID3v1tag) {
 				$ParsedID3v1['padding_valid'] = false;
@@ -107,7 +107,7 @@ 
 		return trim(substr($str, 0, strcspn($str, "\x00")));
 	}
 
-	public static function ArrayOfGenres($allowSCMPXextended=false) {
+	public static function ArrayOfGenres($allowSCMPXextended = false) {
 		static $GenreLookup = array(
 			0    => 'Blues',
 			1    => 'Classic Rock',
@@ -291,13 +291,13 @@ 
 		return ($allowSCMPXextended ? $GenreLookupSCMPX : $GenreLookup);
 	}
 
-	public static function LookupGenreName($genreid, $allowSCMPXextended=true) {
+	public static function LookupGenreName($genreid, $allowSCMPXextended = true) {
 		switch ($genreid) {
 			case 'RX':
 			case 'CR':
 				break;
 			default:
-				if (!is_numeric($genreid)) {
+				if ( ! is_numeric($genreid)) {
 					return false;
 				}
 				$genreid = intval($genreid); // to handle 3 or '3' or '03'
@@ -307,7 +307,7 @@ 
 		return (isset($GenreLookup[$genreid]) ? $GenreLookup[$genreid] : false);
 	}
 
-	public static function LookupGenreID($genre, $allowSCMPXextended=false) {
+	public static function LookupGenreID($genre, $allowSCMPXextended = false) {
 		$GenreLookup = self::ArrayOfGenres($allowSCMPXextended);
 		$LowerCaseNoSpaceSearchTerm = strtolower(str_replace(' ', '', $genre));
 		foreach ($GenreLookup as $key => $value) {
@@ -325,13 +325,13 @@ 
 		return $OriginalGenre;
 	}
 
-	public static function GenerateID3v1Tag($title, $artist, $album, $year, $genreid, $comment, $track='') {
+	public static function GenerateID3v1Tag($title, $artist, $album, $year, $genreid, $comment, $track = '') {
 		$ID3v1Tag  = 'TAG';
-		$ID3v1Tag .= str_pad(trim(substr($title,  0, 30)), 30, "\x00", STR_PAD_RIGHT);
+		$ID3v1Tag .= str_pad(trim(substr($title, 0, 30)), 30, "\x00", STR_PAD_RIGHT);
 		$ID3v1Tag .= str_pad(trim(substr($artist, 0, 30)), 30, "\x00", STR_PAD_RIGHT);
-		$ID3v1Tag .= str_pad(trim(substr($album,  0, 30)), 30, "\x00", STR_PAD_RIGHT);
-		$ID3v1Tag .= str_pad(trim(substr($year,   0,  4)),  4, "\x00", STR_PAD_LEFT);
-		if (!empty($track) && ($track > 0) && ($track <= 255)) {
+		$ID3v1Tag .= str_pad(trim(substr($album, 0, 30)), 30, "\x00", STR_PAD_RIGHT);
+		$ID3v1Tag .= str_pad(trim(substr($year, 0, 4)), 4, "\x00", STR_PAD_LEFT);
+		if ( ! empty($track) && ($track > 0) && ($track <= 255)) {
 			$ID3v1Tag .= str_pad(trim(substr($comment, 0, 28)), 28, "\x00", STR_PAD_RIGHT);
 			$ID3v1Tag .= "\x00";
 			if (gettype($track) == 'string') {

src/wp-includes/default-filters.php

Indentation +12 added lines, -12 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /**
- * Sets up the default filters and actions for most
- * of the WordPress hooks.
- *
- * If you need to remove a default hook, this file will
- * give you the priority for which to use to remove the
- * hook.
- *
- * Not all of the default hooks are found in default-filters.php
- *
- * @package WordPress
- */
+	 * Sets up the default filters and actions for most
+	 * of the WordPress hooks.
+	 *
+	 * If you need to remove a default hook, this file will
+	 * give you the priority for which to use to remove the
+	 * hook.
+	 *
+	 * Not all of the default hooks are found in default-filters.php
+	 *
+	 * @package WordPress
+	 */
 
 // Strip, trim, kses, special chars for string saves
 foreach ( array( 'pre_term_name', 'pre_comment_author_name', 'pre_link_name', 'pre_link_target', 'pre_link_rel', 'pre_user_display_name', 'pre_user_first_name', 'pre_user_last_name', 'pre_user_nickname' ) as $filter ) {
@@ -229,7 +229,7 @@ 
 add_action( 'wp_print_styles',     'print_emoji_styles'                     );
 
 if ( isset( $_GET['replytocom'] ) )
-    add_action( 'wp_head', 'wp_no_robots' );
+	add_action( 'wp_head', 'wp_no_robots' );
 
 // Login actions
 add_action( 'login_head',          'wp_print_head_scripts',         9     );

Braces +17 added lines, -11 removed lines

@@ -52,9 +52,10 @@ 
 // Email admin display
 foreach ( array( 'comment_author_email', 'user_email' ) as $filter ) {
 	add_filter( $filter, 'sanitize_email' );
-	if ( is_admin() )
-		add_filter( $filter, 'wp_kses_data' );
-}
+	if ( is_admin() ) {
+			add_filter( $filter, 'wp_kses_data' );
+	}
+	}
 
 // Save URL
 foreach ( array( 'pre_comment_author_url', 'pre_user_url', 'pre_link_url', 'pre_link_image',
@@ -66,12 +67,14 @@ 
 
 // Display URL
 foreach ( array( 'user_url', 'link_url', 'link_image', 'link_rss', 'comment_url', 'post_guid' ) as $filter ) {
-	if ( is_admin() )
-		add_filter( $filter, 'wp_strip_all_tags' );
+	if ( is_admin() ) {
+			add_filter( $filter, 'wp_strip_all_tags' );
+	}
 	add_filter( $filter, 'esc_url'           );
-	if ( is_admin() )
-		add_filter( $filter, 'wp_kses_data'    );
-}
+	if ( is_admin() ) {
+			add_filter( $filter, 'wp_kses_data'    );
+	}
+	}
 
 // Slugs
 add_filter( 'pre_term_slug', 'sanitize_title' );
@@ -99,8 +102,9 @@ 
 }
 
 // Format WordPress
-foreach ( array( 'the_content', 'the_title', 'wp_title' ) as $filter )
+foreach ( array( 'the_content', 'the_title', 'wp_title' ) as $filter ) {
 	add_filter( $filter, 'capital_P_dangit', 11 );
+}
 add_filter( 'comment_text', 'capital_P_dangit', 31 );
 
 // Format titles
@@ -228,8 +232,9 @@ 
 add_action( 'after_switch_theme',  '_wp_sidebars_changed'                   );
 add_action( 'wp_print_styles',     'print_emoji_styles'                     );
 
-if ( isset( $_GET['replytocom'] ) )
+if ( isset( $_GET['replytocom'] ) ) {
     add_action( 'wp_head', 'wp_no_robots' );
+}
 
 // Login actions
 add_action( 'login_head',          'wp_print_head_scripts',         9     );
@@ -247,8 +252,9 @@ 
 
 
 // WP Cron
-if ( !defined( 'DOING_CRON' ) )
+if ( !defined( 'DOING_CRON' ) ) {
 	add_action( 'init', 'wp_cron' );
+}
 
 // 2 Actions 2 Furious
 add_action( 'do_feed_rdf',                'do_feed_rdf',                             10, 1 );

Spacing +315 added lines, -315 removed lines

@@ -13,468 +13,468 @@
  */
 
 // Strip, trim, kses, special chars for string saves
-foreach ( array( 'pre_term_name', 'pre_comment_author_name', 'pre_link_name', 'pre_link_target', 'pre_link_rel', 'pre_user_display_name', 'pre_user_first_name', 'pre_user_last_name', 'pre_user_nickname' ) as $filter ) {
-	add_filter( $filter, 'sanitize_text_field'  );
-	add_filter( $filter, 'wp_filter_kses'       );
-	add_filter( $filter, '_wp_specialchars', 30 );
+foreach (array('pre_term_name', 'pre_comment_author_name', 'pre_link_name', 'pre_link_target', 'pre_link_rel', 'pre_user_display_name', 'pre_user_first_name', 'pre_user_last_name', 'pre_user_nickname') as $filter) {
+	add_filter($filter, 'sanitize_text_field');
+	add_filter($filter, 'wp_filter_kses');
+	add_filter($filter, '_wp_specialchars', 30);
 }
 
 // Strip, kses, special chars for string display
-foreach ( array( 'term_name', 'comment_author_name', 'link_name', 'link_target', 'link_rel', 'user_display_name', 'user_first_name', 'user_last_name', 'user_nickname' ) as $filter ) {
-	if ( is_admin() ) {
+foreach (array('term_name', 'comment_author_name', 'link_name', 'link_target', 'link_rel', 'user_display_name', 'user_first_name', 'user_last_name', 'user_nickname') as $filter) {
+	if (is_admin()) {
 		// These are expensive. Run only on admin pages for defense in depth.
-		add_filter( $filter, 'sanitize_text_field'  );
-		add_filter( $filter, 'wp_kses_data'       );
+		add_filter($filter, 'sanitize_text_field');
+		add_filter($filter, 'wp_kses_data');
 	}
-	add_filter( $filter, '_wp_specialchars', 30 );
+	add_filter($filter, '_wp_specialchars', 30);
 }
 
 // Kses only for textarea saves
-foreach ( array( 'pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description' ) as $filter ) {
-	add_filter( $filter, 'wp_filter_kses' );
+foreach (array('pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description') as $filter) {
+	add_filter($filter, 'wp_filter_kses');
 }
 
 // Kses only for textarea admin displays
-if ( is_admin() ) {
-	foreach ( array( 'term_description', 'link_description', 'link_notes', 'user_description' ) as $filter ) {
-		add_filter( $filter, 'wp_kses_data' );
+if (is_admin()) {
+	foreach (array('term_description', 'link_description', 'link_notes', 'user_description') as $filter) {
+		add_filter($filter, 'wp_kses_data');
 	}
-	add_filter( 'comment_text', 'wp_kses_post' );
+	add_filter('comment_text', 'wp_kses_post');
 }
 
 // Email saves
-foreach ( array( 'pre_comment_author_email', 'pre_user_email' ) as $filter ) {
-	add_filter( $filter, 'trim'           );
-	add_filter( $filter, 'sanitize_email' );
-	add_filter( $filter, 'wp_filter_kses' );
+foreach (array('pre_comment_author_email', 'pre_user_email') as $filter) {
+	add_filter($filter, 'trim');
+	add_filter($filter, 'sanitize_email');
+	add_filter($filter, 'wp_filter_kses');
 }
 
 // Email admin display
-foreach ( array( 'comment_author_email', 'user_email' ) as $filter ) {
-	add_filter( $filter, 'sanitize_email' );
-	if ( is_admin() )
-		add_filter( $filter, 'wp_kses_data' );
+foreach (array('comment_author_email', 'user_email') as $filter) {
+	add_filter($filter, 'sanitize_email');
+	if (is_admin())
+		add_filter($filter, 'wp_kses_data');
 }
 
 // Save URL
-foreach ( array( 'pre_comment_author_url', 'pre_user_url', 'pre_link_url', 'pre_link_image',
-	'pre_link_rss', 'pre_post_guid' ) as $filter ) {
-	add_filter( $filter, 'wp_strip_all_tags' );
-	add_filter( $filter, 'esc_url_raw'       );
-	add_filter( $filter, 'wp_filter_kses'    );
+foreach (array('pre_comment_author_url', 'pre_user_url', 'pre_link_url', 'pre_link_image',
+	'pre_link_rss', 'pre_post_guid') as $filter) {
+	add_filter($filter, 'wp_strip_all_tags');
+	add_filter($filter, 'esc_url_raw');
+	add_filter($filter, 'wp_filter_kses');
 }
 
 // Display URL
-foreach ( array( 'user_url', 'link_url', 'link_image', 'link_rss', 'comment_url', 'post_guid' ) as $filter ) {
-	if ( is_admin() )
-		add_filter( $filter, 'wp_strip_all_tags' );
-	add_filter( $filter, 'esc_url'           );
-	if ( is_admin() )
-		add_filter( $filter, 'wp_kses_data'    );
+foreach (array('user_url', 'link_url', 'link_image', 'link_rss', 'comment_url', 'post_guid') as $filter) {
+	if (is_admin())
+		add_filter($filter, 'wp_strip_all_tags');
+	add_filter($filter, 'esc_url');
+	if (is_admin())
+		add_filter($filter, 'wp_kses_data');
 }
 
 // Slugs
-add_filter( 'pre_term_slug', 'sanitize_title' );
+add_filter('pre_term_slug', 'sanitize_title');
 
 // Keys
-foreach ( array( 'pre_post_type', 'pre_post_status', 'pre_post_comment_status', 'pre_post_ping_status' ) as $filter ) {
-	add_filter( $filter, 'sanitize_key' );
+foreach (array('pre_post_type', 'pre_post_status', 'pre_post_comment_status', 'pre_post_ping_status') as $filter) {
+	add_filter($filter, 'sanitize_key');
 }
 
 // Mime types
-add_filter( 'pre_post_mime_type', 'sanitize_mime_type' );
-add_filter( 'post_mime_type', 'sanitize_mime_type' );
+add_filter('pre_post_mime_type', 'sanitize_mime_type');
+add_filter('post_mime_type', 'sanitize_mime_type');
 
 // Places to balance tags on input
-foreach ( array( 'content_save_pre', 'excerpt_save_pre', 'comment_save_pre', 'pre_comment_content' ) as $filter ) {
-	add_filter( $filter, 'convert_invalid_entities' );
-	add_filter( $filter, 'balanceTags', 50 );
+foreach (array('content_save_pre', 'excerpt_save_pre', 'comment_save_pre', 'pre_comment_content') as $filter) {
+	add_filter($filter, 'convert_invalid_entities');
+	add_filter($filter, 'balanceTags', 50);
 }
 
 // Format strings for display.
-foreach ( array( 'comment_author', 'term_name', 'link_name', 'link_description', 'link_notes', 'bloginfo', 'wp_title', 'widget_title' ) as $filter ) {
-	add_filter( $filter, 'wptexturize'   );
-	add_filter( $filter, 'convert_chars' );
-	add_filter( $filter, 'esc_html'      );
+foreach (array('comment_author', 'term_name', 'link_name', 'link_description', 'link_notes', 'bloginfo', 'wp_title', 'widget_title') as $filter) {
+	add_filter($filter, 'wptexturize');
+	add_filter($filter, 'convert_chars');
+	add_filter($filter, 'esc_html');
 }
 
 // Format WordPress
-foreach ( array( 'the_content', 'the_title', 'wp_title' ) as $filter )
-	add_filter( $filter, 'capital_P_dangit', 11 );
-add_filter( 'comment_text', 'capital_P_dangit', 31 );
+foreach (array('the_content', 'the_title', 'wp_title') as $filter)
+	add_filter($filter, 'capital_P_dangit', 11);
+add_filter('comment_text', 'capital_P_dangit', 31);
 
 // Format titles
-foreach ( array( 'single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title', 'nav_menu_attr_title', 'nav_menu_description' ) as $filter ) {
-	add_filter( $filter, 'wptexturize' );
-	add_filter( $filter, 'strip_tags'  );
+foreach (array('single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title', 'nav_menu_attr_title', 'nav_menu_description') as $filter) {
+	add_filter($filter, 'wptexturize');
+	add_filter($filter, 'strip_tags');
 }
 
 // Format text area for display.
-foreach ( array( 'term_description' ) as $filter ) {
-	add_filter( $filter, 'wptexturize'      );
-	add_filter( $filter, 'convert_chars'    );
-	add_filter( $filter, 'wpautop'          );
-	add_filter( $filter, 'shortcode_unautop');
+foreach (array('term_description') as $filter) {
+	add_filter($filter, 'wptexturize');
+	add_filter($filter, 'convert_chars');
+	add_filter($filter, 'wpautop');
+	add_filter($filter, 'shortcode_unautop');
 }
 
 // Format for RSS
-add_filter( 'term_name_rss', 'convert_chars' );
+add_filter('term_name_rss', 'convert_chars');
 
 // Pre save hierarchy
-add_filter( 'wp_insert_post_parent', 'wp_check_post_hierarchy_for_loops', 10, 2 );
-add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
+add_filter('wp_insert_post_parent', 'wp_check_post_hierarchy_for_loops', 10, 2);
+add_filter('wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3);
 
 // Display filters
-add_filter( 'the_title', 'wptexturize'   );
-add_filter( 'the_title', 'convert_chars' );
-add_filter( 'the_title', 'trim'          );
+add_filter('the_title', 'wptexturize');
+add_filter('the_title', 'convert_chars');
+add_filter('the_title', 'trim');
 
-add_filter( 'the_content', 'wptexturize'                       );
-add_filter( 'the_content', 'convert_smilies'                   );
-add_filter( 'the_content', 'wpautop'                           );
-add_filter( 'the_content', 'shortcode_unautop'                 );
-add_filter( 'the_content', 'prepend_attachment'                );
-add_filter( 'the_content', 'wp_make_content_images_responsive' );
+add_filter('the_content', 'wptexturize');
+add_filter('the_content', 'convert_smilies');
+add_filter('the_content', 'wpautop');
+add_filter('the_content', 'shortcode_unautop');
+add_filter('the_content', 'prepend_attachment');
+add_filter('the_content', 'wp_make_content_images_responsive');
 
-add_filter( 'the_excerpt',     'wptexturize'      );
-add_filter( 'the_excerpt',     'convert_smilies'  );
-add_filter( 'the_excerpt',     'convert_chars'    );
-add_filter( 'the_excerpt',     'wpautop'          );
-add_filter( 'the_excerpt',     'shortcode_unautop');
-add_filter( 'get_the_excerpt', 'wp_trim_excerpt'  );
+add_filter('the_excerpt', 'wptexturize');
+add_filter('the_excerpt', 'convert_smilies');
+add_filter('the_excerpt', 'convert_chars');
+add_filter('the_excerpt', 'wpautop');
+add_filter('the_excerpt', 'shortcode_unautop');
+add_filter('get_the_excerpt', 'wp_trim_excerpt');
 
-add_filter( 'comment_text', 'wptexturize'            );
-add_filter( 'comment_text', 'convert_chars'          );
-add_filter( 'comment_text', 'make_clickable',      9 );
-add_filter( 'comment_text', 'force_balance_tags', 25 );
-add_filter( 'comment_text', 'convert_smilies',    20 );
-add_filter( 'comment_text', 'wpautop',            30 );
+add_filter('comment_text', 'wptexturize');
+add_filter('comment_text', 'convert_chars');
+add_filter('comment_text', 'make_clickable', 9);
+add_filter('comment_text', 'force_balance_tags', 25);
+add_filter('comment_text', 'convert_smilies', 20);
+add_filter('comment_text', 'wpautop', 30);
 
-add_filter( 'comment_excerpt', 'convert_chars' );
+add_filter('comment_excerpt', 'convert_chars');
 
-add_filter( 'list_cats',         'wptexturize' );
+add_filter('list_cats', 'wptexturize');
 
-add_filter( 'wp_sprintf', 'wp_sprintf_l', 10, 2 );
+add_filter('wp_sprintf', 'wp_sprintf_l', 10, 2);
 
-add_filter( 'widget_text', 'balanceTags' );
+add_filter('widget_text', 'balanceTags');
 
-add_filter( 'date_i18n', 'wp_maybe_decline_date' );
+add_filter('date_i18n', 'wp_maybe_decline_date');
 
 // RSS filters
-add_filter( 'the_title_rss',      'strip_tags'                    );
-add_filter( 'the_title_rss',      'ent2ncr',                    8 );
-add_filter( 'the_title_rss',      'esc_html'                      );
-add_filter( 'the_content_rss',    'ent2ncr',                    8 );
-add_filter( 'the_content_feed',   'wp_staticize_emoji'            );
-add_filter( 'the_content_feed',   '_oembed_filter_feed_content'   );
-add_filter( 'the_excerpt_rss',    'convert_chars'                 );
-add_filter( 'the_excerpt_rss',    'ent2ncr',                    8 );
-add_filter( 'comment_author_rss', 'ent2ncr',                    8 );
-add_filter( 'comment_text_rss',   'ent2ncr',                    8 );
-add_filter( 'comment_text_rss',   'esc_html'                      );
-add_filter( 'comment_text_rss',   'wp_staticize_emoji'            );
-add_filter( 'bloginfo_rss',       'ent2ncr',                    8 );
-add_filter( 'the_author',         'ent2ncr',                    8 );
-add_filter( 'the_guid',           'esc_url'                       );
+add_filter('the_title_rss', 'strip_tags');
+add_filter('the_title_rss', 'ent2ncr', 8);
+add_filter('the_title_rss', 'esc_html');
+add_filter('the_content_rss', 'ent2ncr', 8);
+add_filter('the_content_feed', 'wp_staticize_emoji');
+add_filter('the_content_feed', '_oembed_filter_feed_content');
+add_filter('the_excerpt_rss', 'convert_chars');
+add_filter('the_excerpt_rss', 'ent2ncr', 8);
+add_filter('comment_author_rss', 'ent2ncr', 8);
+add_filter('comment_text_rss', 'ent2ncr', 8);
+add_filter('comment_text_rss', 'esc_html');
+add_filter('comment_text_rss', 'wp_staticize_emoji');
+add_filter('bloginfo_rss', 'ent2ncr', 8);
+add_filter('the_author', 'ent2ncr', 8);
+add_filter('the_guid', 'esc_url');
 
 // Email filters
-add_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
+add_filter('wp_mail', 'wp_staticize_emoji_for_email');
 
 // Misc filters
-add_filter( 'option_ping_sites',        'privacy_ping_filter'                 );
-add_filter( 'option_blog_charset',      '_wp_specialchars'                    ); // IMPORTANT: This must not be wp_specialchars() or esc_html() or it'll cause an infinite loop
-add_filter( 'option_blog_charset',      '_canonical_charset'                  );
-add_filter( 'option_home',              '_config_wp_home'                     );
-add_filter( 'option_siteurl',           '_config_wp_siteurl'                  );
-add_filter( 'tiny_mce_before_init',     '_mce_set_direction'                  );
-add_filter( 'teeny_mce_before_init',    '_mce_set_direction'                  );
-add_filter( 'pre_kses',                 'wp_pre_kses_less_than'               );
-add_filter( 'sanitize_title',           'sanitize_title_with_dashes',   10, 3 );
-add_action( 'check_comment_flood',      'check_comment_flood_db',       10, 3 );
-add_filter( 'comment_flood_filter',     'wp_throttle_comment_flood',    10, 3 );
-add_filter( 'pre_comment_content',      'wp_rel_nofollow',              15    );
-add_filter( 'comment_email',            'antispambot'                         );
-add_filter( 'option_tag_base',          '_wp_filter_taxonomy_base'            );
-add_filter( 'option_category_base',     '_wp_filter_taxonomy_base'            );
-add_filter( 'the_posts',                '_close_comments_for_old_posts', 10, 2);
-add_filter( 'comments_open',            '_close_comments_for_old_post', 10, 2 );
-add_filter( 'pings_open',               '_close_comments_for_old_post', 10, 2 );
-add_filter( 'editable_slug',            'urldecode'                           );
-add_filter( 'editable_slug',            'esc_textarea'                        );
-add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object'        );
-add_filter( 'pingback_ping_source_uri', 'pingback_ping_source_uri'            );
-add_filter( 'xmlrpc_pingback_error',    'xmlrpc_pingback_error'               );
-add_filter( 'title_save_pre',           'trim'                                );
-
-add_filter( 'http_request_host_is_external', 'allowed_http_request_hosts', 10, 2 );
+add_filter('option_ping_sites', 'privacy_ping_filter');
+add_filter('option_blog_charset', '_wp_specialchars'); // IMPORTANT: This must not be wp_specialchars() or esc_html() or it'll cause an infinite loop
+add_filter('option_blog_charset', '_canonical_charset');
+add_filter('option_home', '_config_wp_home');
+add_filter('option_siteurl', '_config_wp_siteurl');
+add_filter('tiny_mce_before_init', '_mce_set_direction');
+add_filter('teeny_mce_before_init', '_mce_set_direction');
+add_filter('pre_kses', 'wp_pre_kses_less_than');
+add_filter('sanitize_title', 'sanitize_title_with_dashes', 10, 3);
+add_action('check_comment_flood', 'check_comment_flood_db', 10, 3);
+add_filter('comment_flood_filter', 'wp_throttle_comment_flood', 10, 3);
+add_filter('pre_comment_content', 'wp_rel_nofollow', 15);
+add_filter('comment_email', 'antispambot');
+add_filter('option_tag_base', '_wp_filter_taxonomy_base');
+add_filter('option_category_base', '_wp_filter_taxonomy_base');
+add_filter('the_posts', '_close_comments_for_old_posts', 10, 2);
+add_filter('comments_open', '_close_comments_for_old_post', 10, 2);
+add_filter('pings_open', '_close_comments_for_old_post', 10, 2);
+add_filter('editable_slug', 'urldecode');
+add_filter('editable_slug', 'esc_textarea');
+add_filter('nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object');
+add_filter('pingback_ping_source_uri', 'pingback_ping_source_uri');
+add_filter('xmlrpc_pingback_error', 'xmlrpc_pingback_error');
+add_filter('title_save_pre', 'trim');
+
+add_filter('http_request_host_is_external', 'allowed_http_request_hosts', 10, 2);
 
 // REST API filters.
-add_action( 'xmlrpc_rsd_apis',            'rest_output_rsd' );
-add_action( 'wp_head',                    'rest_output_link_wp_head', 10, 0 );
-add_action( 'template_redirect',          'rest_output_link_header', 11, 0 );
-add_action( 'auth_cookie_malformed',      'rest_cookie_collect_status' );
-add_action( 'auth_cookie_expired',        'rest_cookie_collect_status' );
-add_action( 'auth_cookie_bad_username',   'rest_cookie_collect_status' );
-add_action( 'auth_cookie_bad_hash',       'rest_cookie_collect_status' );
-add_action( 'auth_cookie_valid',          'rest_cookie_collect_status' );
-add_filter( 'rest_authentication_errors', 'rest_cookie_check_errors', 100 );
+add_action('xmlrpc_rsd_apis', 'rest_output_rsd');
+add_action('wp_head', 'rest_output_link_wp_head', 10, 0);
+add_action('template_redirect', 'rest_output_link_header', 11, 0);
+add_action('auth_cookie_malformed', 'rest_cookie_collect_status');
+add_action('auth_cookie_expired', 'rest_cookie_collect_status');
+add_action('auth_cookie_bad_username', 'rest_cookie_collect_status');
+add_action('auth_cookie_bad_hash', 'rest_cookie_collect_status');
+add_action('auth_cookie_valid', 'rest_cookie_collect_status');
+add_filter('rest_authentication_errors', 'rest_cookie_check_errors', 100);
 
 // Actions
-add_action( 'wp_head',             '_wp_render_title_tag',            1     );
-add_action( 'wp_head',             'wp_enqueue_scripts',              1     );
-add_action( 'wp_head',             'feed_links',                      2     );
-add_action( 'wp_head',             'feed_links_extra',                3     );
-add_action( 'wp_head',             'rsd_link'                               );
-add_action( 'wp_head',             'wlwmanifest_link'                       );
-add_action( 'wp_head',             'adjacent_posts_rel_link_wp_head', 10, 0 );
-add_action( 'wp_head',             'locale_stylesheet'                      );
-add_action( 'publish_future_post', 'check_and_publish_future_post',   10, 1 );
-add_action( 'wp_head',             'noindex',                          1    );
-add_action( 'wp_head',             'print_emoji_detection_script',     7    );
-add_action( 'wp_head',             'wp_print_styles',                  8    );
-add_action( 'wp_head',             'wp_print_head_scripts',            9    );
-add_action( 'wp_head',             'wp_generator'                           );
-add_action( 'wp_head',             'rel_canonical'                          );
-add_action( 'wp_head',             'wp_shortlink_wp_head',            10, 0 );
-add_action( 'wp_head',             'wp_site_icon',                    99    );
-add_action( 'wp_footer',           'wp_print_footer_scripts',         20    );
-add_action( 'template_redirect',   'wp_shortlink_header',             11, 0 );
-add_action( 'wp_print_footer_scripts', '_wp_footer_scripts'                 );
-add_action( 'init',                'check_theme_switched',            99    );
-add_action( 'after_switch_theme',  '_wp_sidebars_changed'                   );
-add_action( 'wp_print_styles',     'print_emoji_styles'                     );
-
-if ( isset( $_GET['replytocom'] ) )
-    add_action( 'wp_head', 'wp_no_robots' );
+add_action('wp_head', '_wp_render_title_tag', 1);
+add_action('wp_head', 'wp_enqueue_scripts', 1);
+add_action('wp_head', 'feed_links', 2);
+add_action('wp_head', 'feed_links_extra', 3);
+add_action('wp_head', 'rsd_link');
+add_action('wp_head', 'wlwmanifest_link');
+add_action('wp_head', 'adjacent_posts_rel_link_wp_head', 10, 0);
+add_action('wp_head', 'locale_stylesheet');
+add_action('publish_future_post', 'check_and_publish_future_post', 10, 1);
+add_action('wp_head', 'noindex', 1);
+add_action('wp_head', 'print_emoji_detection_script', 7);
+add_action('wp_head', 'wp_print_styles', 8);
+add_action('wp_head', 'wp_print_head_scripts', 9);
+add_action('wp_head', 'wp_generator');
+add_action('wp_head', 'rel_canonical');
+add_action('wp_head', 'wp_shortlink_wp_head', 10, 0);
+add_action('wp_head', 'wp_site_icon', 99);
+add_action('wp_footer', 'wp_print_footer_scripts', 20);
+add_action('template_redirect', 'wp_shortlink_header', 11, 0);
+add_action('wp_print_footer_scripts', '_wp_footer_scripts');
+add_action('init', 'check_theme_switched', 99);
+add_action('after_switch_theme', '_wp_sidebars_changed');
+add_action('wp_print_styles', 'print_emoji_styles');
+
+if (isset($_GET['replytocom']))
+    add_action('wp_head', 'wp_no_robots');
 
 // Login actions
-add_action( 'login_head',          'wp_print_head_scripts',         9     );
-add_action( 'login_head',          'print_admin_styles',            9     );
-add_action( 'login_head',          'wp_site_icon',                  99    );
-add_action( 'login_footer',        'wp_print_footer_scripts',       20    );
-add_action( 'login_init',          'send_frame_options_header',     10, 0 );
+add_action('login_head', 'wp_print_head_scripts', 9);
+add_action('login_head', 'print_admin_styles', 9);
+add_action('login_head', 'wp_site_icon', 99);
+add_action('login_footer', 'wp_print_footer_scripts', 20);
+add_action('login_init', 'send_frame_options_header', 10, 0);
 
 // Feed Generator Tags
-foreach ( array( 'rss2_head', 'commentsrss2_head', 'rss_head', 'rdf_header', 'atom_head', 'comments_atom_head', 'opml_head', 'app_head' ) as $action ) {
-	add_action( $action, 'the_generator' );
+foreach (array('rss2_head', 'commentsrss2_head', 'rss_head', 'rdf_header', 'atom_head', 'comments_atom_head', 'opml_head', 'app_head') as $action) {
+	add_action($action, 'the_generator');
 }
 
 // Feed Site Icon
-add_action( 'atom_head', 'atom_site_icon' );
-add_action( 'rss2_head', 'rss2_site_icon' );
+add_action('atom_head', 'atom_site_icon');
+add_action('rss2_head', 'rss2_site_icon');
 
 
 // WP Cron
-if ( !defined( 'DOING_CRON' ) )
-	add_action( 'init', 'wp_cron' );
+if ( ! defined('DOING_CRON'))
+	add_action('init', 'wp_cron');
 
 // 2 Actions 2 Furious
-add_action( 'do_feed_rdf',                'do_feed_rdf',                             10, 1 );
-add_action( 'do_feed_rss',                'do_feed_rss',                             10, 1 );
-add_action( 'do_feed_rss2',               'do_feed_rss2',                            10, 1 );
-add_action( 'do_feed_atom',               'do_feed_atom',                            10, 1 );
-add_action( 'do_pings',                   'do_all_pings',                            10, 1 );
-add_action( 'do_robots',                  'do_robots'                                      );
-add_action( 'set_comment_cookies',        'wp_set_comment_cookies',                  10, 2 );
-add_action( 'sanitize_comment_cookies',   'sanitize_comment_cookies'                       );
-add_action( 'admin_print_scripts',        'print_emoji_detection_script'                   );
-add_action( 'admin_print_scripts',        'print_head_scripts',                      20    );
-add_action( 'admin_print_footer_scripts', '_wp_footer_scripts'                             );
-add_action( 'admin_print_styles',         'print_emoji_styles'                             );
-add_action( 'admin_print_styles',         'print_admin_styles',                      20    );
-add_action( 'init',                       'smilies_init',                             5    );
-add_action( 'plugins_loaded',             'wp_maybe_load_widgets',                    0    );
-add_action( 'plugins_loaded',             'wp_maybe_load_embeds',                     0    );
-add_action( 'shutdown',                   'wp_ob_end_flush_all',                      1    );
+add_action('do_feed_rdf', 'do_feed_rdf', 10, 1);
+add_action('do_feed_rss', 'do_feed_rss', 10, 1);
+add_action('do_feed_rss2', 'do_feed_rss2', 10, 1);
+add_action('do_feed_atom', 'do_feed_atom', 10, 1);
+add_action('do_pings', 'do_all_pings', 10, 1);
+add_action('do_robots', 'do_robots');
+add_action('set_comment_cookies', 'wp_set_comment_cookies', 10, 2);
+add_action('sanitize_comment_cookies', 'sanitize_comment_cookies');
+add_action('admin_print_scripts', 'print_emoji_detection_script');
+add_action('admin_print_scripts', 'print_head_scripts', 20);
+add_action('admin_print_footer_scripts', '_wp_footer_scripts');
+add_action('admin_print_styles', 'print_emoji_styles');
+add_action('admin_print_styles', 'print_admin_styles', 20);
+add_action('init', 'smilies_init', 5);
+add_action('plugins_loaded', 'wp_maybe_load_widgets', 0);
+add_action('plugins_loaded', 'wp_maybe_load_embeds', 0);
+add_action('shutdown', 'wp_ob_end_flush_all', 1);
 // Create a revision whenever a post is updated.
-add_action( 'post_updated',               'wp_save_post_revision',                   10, 1 );
-add_action( 'publish_post',               '_publish_post_hook',                       5, 1 );
-add_action( 'transition_post_status',     '_transition_post_status',                  5, 3 );
-add_action( 'transition_post_status',     '_update_term_count_on_transition_post_status', 10, 3 );
-add_action( 'comment_form',               'wp_comment_form_unfiltered_html_nonce'          );
-add_action( 'wp_scheduled_delete',        'wp_scheduled_delete'                            );
-add_action( 'wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts'                      );
-add_action( 'admin_init',                 'send_frame_options_header',               10, 0 );
-add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment'                           );
-add_action( 'upgrader_scheduled_cleanup', 'wp_delete_attachment'                           );
-add_action( 'welcome_panel',              'wp_welcome_panel'                               );
+add_action('post_updated', 'wp_save_post_revision', 10, 1);
+add_action('publish_post', '_publish_post_hook', 5, 1);
+add_action('transition_post_status', '_transition_post_status', 5, 3);
+add_action('transition_post_status', '_update_term_count_on_transition_post_status', 10, 3);
+add_action('comment_form', 'wp_comment_form_unfiltered_html_nonce');
+add_action('wp_scheduled_delete', 'wp_scheduled_delete');
+add_action('wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts');
+add_action('admin_init', 'send_frame_options_header', 10, 0);
+add_action('importer_scheduled_cleanup', 'wp_delete_attachment');
+add_action('upgrader_scheduled_cleanup', 'wp_delete_attachment');
+add_action('welcome_panel', 'wp_welcome_panel');
 
 // Navigation menu actions
-add_action( 'delete_post',                '_wp_delete_post_menu_item'         );
-add_action( 'delete_term',                '_wp_delete_tax_menu_item',   10, 3 );
-add_action( 'transition_post_status',     '_wp_auto_add_pages_to_menu', 10, 3 );
+add_action('delete_post', '_wp_delete_post_menu_item');
+add_action('delete_term', '_wp_delete_tax_menu_item', 10, 3);
+add_action('transition_post_status', '_wp_auto_add_pages_to_menu', 10, 3);
 
 // Post Thumbnail CSS class filtering
-add_action( 'begin_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_add'    );
-add_action( 'end_fetch_post_thumbnail_html',   '_wp_post_thumbnail_class_filter_remove' );
+add_action('begin_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_add');
+add_action('end_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_remove');
 
 // Redirect Old Slugs
-add_action( 'template_redirect',  'wp_old_slug_redirect'              );
-add_action( 'post_updated',       'wp_check_for_changed_slugs', 12, 3 );
-add_action( 'attachment_updated', 'wp_check_for_changed_slugs', 12, 3 );
+add_action('template_redirect', 'wp_old_slug_redirect');
+add_action('post_updated', 'wp_check_for_changed_slugs', 12, 3);
+add_action('attachment_updated', 'wp_check_for_changed_slugs', 12, 3);
 
 // Nonce check for Post Previews
-add_action( 'init', '_show_post_preview' );
+add_action('init', '_show_post_preview');
 
 // Output JS to reset window.name for previews
-add_action( 'wp_head', 'wp_post_preview_js', 1 );
+add_action('wp_head', 'wp_post_preview_js', 1);
 
 // Timezone
-add_filter( 'pre_option_gmt_offset','wp_timezone_override_offset' );
+add_filter('pre_option_gmt_offset', 'wp_timezone_override_offset');
 
 // Admin Color Schemes
-add_action( 'admin_init', 'register_admin_color_schemes', 1);
-add_action( 'admin_color_scheme_picker', 'admin_color_scheme_picker' );
+add_action('admin_init', 'register_admin_color_schemes', 1);
+add_action('admin_color_scheme_picker', 'admin_color_scheme_picker');
 
 // If the upgrade hasn't run yet, assume link manager is used.
-add_filter( 'default_option_link_manager_enabled', '__return_true' );
+add_filter('default_option_link_manager_enabled', '__return_true');
 
 // This option no longer exists; tell plugins we always support auto-embedding.
-add_filter( 'default_option_embed_autourls', '__return_true' );
+add_filter('default_option_embed_autourls', '__return_true');
 
 // Default settings for heartbeat
-add_filter( 'heartbeat_settings', 'wp_heartbeat_settings' );
+add_filter('heartbeat_settings', 'wp_heartbeat_settings');
 
 // Check if the user is logged out
-add_action( 'admin_enqueue_scripts', 'wp_auth_check_load' );
-add_filter( 'heartbeat_send',        'wp_auth_check' );
-add_filter( 'heartbeat_nopriv_send', 'wp_auth_check' );
+add_action('admin_enqueue_scripts', 'wp_auth_check_load');
+add_filter('heartbeat_send', 'wp_auth_check');
+add_filter('heartbeat_nopriv_send', 'wp_auth_check');
 
 // Default authentication filters
-add_filter( 'authenticate', 'wp_authenticate_username_password',  20, 3 );
-add_filter( 'authenticate', 'wp_authenticate_email_password',     20, 3 );
-add_filter( 'authenticate', 'wp_authenticate_spam_check',         99    );
-add_filter( 'determine_current_user', 'wp_validate_auth_cookie'          );
-add_filter( 'determine_current_user', 'wp_validate_logged_in_cookie', 20 );
+add_filter('authenticate', 'wp_authenticate_username_password', 20, 3);
+add_filter('authenticate', 'wp_authenticate_email_password', 20, 3);
+add_filter('authenticate', 'wp_authenticate_spam_check', 99);
+add_filter('determine_current_user', 'wp_validate_auth_cookie');
+add_filter('determine_current_user', 'wp_validate_logged_in_cookie', 20);
 
 // Split term updates.
-add_action( 'admin_init',        '_wp_check_for_scheduled_split_terms' );
-add_action( 'split_shared_term', '_wp_check_split_default_terms',  10, 4 );
-add_action( 'split_shared_term', '_wp_check_split_terms_in_menus', 10, 4 );
-add_action( 'split_shared_term', '_wp_check_split_nav_menu_terms', 10, 4 );
-add_action( 'wp_split_shared_term_batch', '_wp_batch_split_terms' );
+add_action('admin_init', '_wp_check_for_scheduled_split_terms');
+add_action('split_shared_term', '_wp_check_split_default_terms', 10, 4);
+add_action('split_shared_term', '_wp_check_split_terms_in_menus', 10, 4);
+add_action('split_shared_term', '_wp_check_split_nav_menu_terms', 10, 4);
+add_action('wp_split_shared_term_batch', '_wp_batch_split_terms');
 
 // Email notifications.
-add_action( 'comment_post', 'wp_new_comment_notify_moderator' );
-add_action( 'comment_post', 'wp_new_comment_notify_postauthor' );
-add_action( 'after_password_reset', 'wp_password_change_notification' );
-add_action( 'register_new_user',      'wp_send_new_user_notifications' );
-add_action( 'edit_user_created_user', 'wp_send_new_user_notifications', 10, 2 );
+add_action('comment_post', 'wp_new_comment_notify_moderator');
+add_action('comment_post', 'wp_new_comment_notify_postauthor');
+add_action('after_password_reset', 'wp_password_change_notification');
+add_action('register_new_user', 'wp_send_new_user_notifications');
+add_action('edit_user_created_user', 'wp_send_new_user_notifications', 10, 2);
 
 // REST API actions.
-add_action( 'init',          'rest_api_init' );
-add_action( 'rest_api_init', 'rest_api_default_filters', 10, 1 );
-add_action( 'parse_request', 'rest_api_loaded' );
+add_action('init', 'rest_api_init');
+add_action('rest_api_init', 'rest_api_default_filters', 10, 1);
+add_action('parse_request', 'rest_api_loaded');
 
 /**
  * Filters formerly mixed into wp-includes
  */
 // Theme
-add_action( 'wp_loaded', '_custom_header_background_just_in_time' );
-add_action( 'wp_head', '_custom_logo_header_styles' );
-add_action( 'plugins_loaded', '_wp_customize_include' );
-add_action( 'admin_enqueue_scripts', '_wp_customize_loader_settings' );
-add_action( 'delete_attachment', '_delete_attachment_theme_mod' );
+add_action('wp_loaded', '_custom_header_background_just_in_time');
+add_action('wp_head', '_custom_logo_header_styles');
+add_action('plugins_loaded', '_wp_customize_include');
+add_action('admin_enqueue_scripts', '_wp_customize_loader_settings');
+add_action('delete_attachment', '_delete_attachment_theme_mod');
 
 // Calendar widget cache
-add_action( 'save_post', 'delete_get_calendar_cache' );
-add_action( 'delete_post', 'delete_get_calendar_cache' );
-add_action( 'update_option_start_of_week', 'delete_get_calendar_cache' );
-add_action( 'update_option_gmt_offset', 'delete_get_calendar_cache' );
+add_action('save_post', 'delete_get_calendar_cache');
+add_action('delete_post', 'delete_get_calendar_cache');
+add_action('update_option_start_of_week', 'delete_get_calendar_cache');
+add_action('update_option_gmt_offset', 'delete_get_calendar_cache');
 
 // Author
-add_action( 'transition_post_status', '__clear_multi_author_cache' );
+add_action('transition_post_status', '__clear_multi_author_cache');
 
 // Post
-add_action( 'init', 'create_initial_post_types', 0 ); // highest priority
-add_action( 'admin_menu', '_add_post_type_submenus' );
-add_action( 'before_delete_post', '_reset_front_page_settings_for_post' );
-add_action( 'wp_trash_post',      '_reset_front_page_settings_for_post' );
+add_action('init', 'create_initial_post_types', 0); // highest priority
+add_action('admin_menu', '_add_post_type_submenus');
+add_action('before_delete_post', '_reset_front_page_settings_for_post');
+add_action('wp_trash_post', '_reset_front_page_settings_for_post');
 
 // Post Formats
-add_filter( 'request', '_post_format_request' );
-add_filter( 'term_link', '_post_format_link', 10, 3 );
-add_filter( 'get_post_format', '_post_format_get_term' );
-add_filter( 'get_terms', '_post_format_get_terms', 10, 3 );
-add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' );
+add_filter('request', '_post_format_request');
+add_filter('term_link', '_post_format_link', 10, 3);
+add_filter('get_post_format', '_post_format_get_term');
+add_filter('get_terms', '_post_format_get_terms', 10, 3);
+add_filter('wp_get_object_terms', '_post_format_wp_get_object_terms');
 
 // KSES
-add_action( 'init', 'kses_init' );
-add_action( 'set_current_user', 'kses_init' );
+add_action('init', 'kses_init');
+add_action('set_current_user', 'kses_init');
 
 // Script Loader
-add_action( 'wp_default_scripts', 'wp_default_scripts' );
-add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' );
-add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );
+add_action('wp_default_scripts', 'wp_default_scripts');
+add_filter('wp_print_scripts', 'wp_just_in_time_script_localization');
+add_filter('print_scripts_array', 'wp_prototype_before_jquery');
 
-add_action( 'wp_default_styles', 'wp_default_styles' );
-add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );
+add_action('wp_default_styles', 'wp_default_styles');
+add_filter('style_loader_src', 'wp_style_loader_src', 10, 2);
 
 // Taxonomy
-add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority
+add_action('init', 'create_initial_taxonomies', 0); // highest priority
 
 // Canonical
-add_action( 'template_redirect', 'redirect_canonical' );
-add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );
+add_action('template_redirect', 'redirect_canonical');
+add_action('template_redirect', 'wp_redirect_admin_locations', 1000);
 
 // Shortcodes
-add_filter( 'the_content', 'do_shortcode', 11 ); // AFTER wpautop()
+add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop()
 
 // Media
-add_action( 'wp_playlist_scripts', 'wp_playlist_scripts' );
-add_action( 'customize_controls_enqueue_scripts', 'wp_plupload_default_settings' );
+add_action('wp_playlist_scripts', 'wp_playlist_scripts');
+add_action('customize_controls_enqueue_scripts', 'wp_plupload_default_settings');
 
 // Nav menu
-add_filter( 'nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2 );
+add_filter('nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2);
 
 // Widgets
-add_action( 'init', 'wp_widgets_init', 1 );
+add_action('init', 'wp_widgets_init', 1);
 
 // Admin Bar
 // Don't remove. Wrong way to disable.
-add_action( 'template_redirect', '_wp_admin_bar_init', 0 );
-add_action( 'admin_init', '_wp_admin_bar_init' );
-add_action( 'before_signup_header', '_wp_admin_bar_init' );
-add_action( 'activate_header', '_wp_admin_bar_init' );
-add_action( 'wp_footer', 'wp_admin_bar_render', 1000 );
-add_action( 'in_admin_header', 'wp_admin_bar_render', 0 );
+add_action('template_redirect', '_wp_admin_bar_init', 0);
+add_action('admin_init', '_wp_admin_bar_init');
+add_action('before_signup_header', '_wp_admin_bar_init');
+add_action('activate_header', '_wp_admin_bar_init');
+add_action('wp_footer', 'wp_admin_bar_render', 1000);
+add_action('in_admin_header', 'wp_admin_bar_render', 0);
 
 // Former admin filters that can also be hooked on the front end
-add_action( 'media_buttons', 'media_buttons' );
-add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 );
-add_filter( 'media_send_to_editor', 'image_media_send_to_editor', 10, 3 );
+add_action('media_buttons', 'media_buttons');
+add_filter('image_send_to_editor', 'image_add_caption', 20, 8);
+add_filter('media_send_to_editor', 'image_media_send_to_editor', 10, 3);
 
 // Embeds
-add_action( 'rest_api_init',          'wp_oembed_register_route'              );
-add_filter( 'rest_pre_serve_request', '_oembed_rest_pre_serve_request', 10, 4 );
-
-add_action( 'wp_head',                'wp_oembed_add_discovery_links'         );
-add_action( 'wp_head',                'wp_oembed_add_host_js'                 );
-
-add_action( 'embed_head',             'enqueue_embed_scripts',           1    );
-add_action( 'embed_head',             'print_emoji_detection_script'          );
-add_action( 'embed_head',             'print_embed_styles'                    );
-add_action( 'embed_head',             'wp_print_head_scripts',          20    );
-add_action( 'embed_head',             'wp_print_styles',                20    );
-add_action( 'embed_head',             'wp_no_robots'                          );
-add_action( 'embed_head',             'rel_canonical'                         );
-add_action( 'embed_head',             'locale_stylesheet'                     );
-
-add_action( 'embed_content_meta',     'print_embed_comments_button'           );
-add_action( 'embed_content_meta',     'print_embed_sharing_button'            );
-
-add_action( 'embed_footer',           'print_embed_sharing_dialog'            );
-add_action( 'embed_footer',           'print_embed_scripts'                   );
-add_action( 'embed_footer',           'wp_print_footer_scripts',        20    );
-
-add_filter( 'excerpt_more',           'wp_embed_excerpt_more',          20    );
-add_filter( 'the_excerpt_embed',      'wptexturize'                           );
-add_filter( 'the_excerpt_embed',      'convert_chars'                         );
-add_filter( 'the_excerpt_embed',      'wpautop'                               );
-add_filter( 'the_excerpt_embed',      'shortcode_unautop'                     );
-add_filter( 'the_excerpt_embed',      'wp_embed_excerpt_attachment'           );
-
-add_filter( 'oembed_dataparse',       'wp_filter_oembed_result',        10, 3 );
-add_filter( 'oembed_response_data',   'get_oembed_response_data_rich',  10, 4 );
-
-unset( $filter, $action );
+add_action('rest_api_init', 'wp_oembed_register_route');
+add_filter('rest_pre_serve_request', '_oembed_rest_pre_serve_request', 10, 4);
+
+add_action('wp_head', 'wp_oembed_add_discovery_links');
+add_action('wp_head', 'wp_oembed_add_host_js');
+
+add_action('embed_head', 'enqueue_embed_scripts', 1);
+add_action('embed_head', 'print_emoji_detection_script');
+add_action('embed_head', 'print_embed_styles');
+add_action('embed_head', 'wp_print_head_scripts', 20);
+add_action('embed_head', 'wp_print_styles', 20);
+add_action('embed_head', 'wp_no_robots');
+add_action('embed_head', 'rel_canonical');
+add_action('embed_head', 'locale_stylesheet');
+
+add_action('embed_content_meta', 'print_embed_comments_button');
+add_action('embed_content_meta', 'print_embed_sharing_button');
+
+add_action('embed_footer', 'print_embed_sharing_dialog');
+add_action('embed_footer', 'print_embed_scripts');
+add_action('embed_footer', 'wp_print_footer_scripts', 20);
+
+add_filter('excerpt_more', 'wp_embed_excerpt_more', 20);
+add_filter('the_excerpt_embed', 'wptexturize');
+add_filter('the_excerpt_embed', 'convert_chars');
+add_filter('the_excerpt_embed', 'wpautop');
+add_filter('the_excerpt_embed', 'shortcode_unautop');
+add_filter('the_excerpt_embed', 'wp_embed_excerpt_attachment');
+
+add_filter('oembed_dataparse', 'wp_filter_oembed_result', 10, 3);
+add_filter('oembed_response_data', 'get_oembed_response_data_rich', 10, 4);
+
+unset($filter, $action);

src/wp-includes/registration-functions.php

Spacing +1 added lines, -1 removed lines

@@ -4,4 +4,4 @@
  *
  * @package WordPress
  */
-_deprecated_file( basename(__FILE__), '2.1', null, __( 'This file no longer needs to be included.' ) );
+_deprecated_file(basename(__FILE__), '2.1', null, __('This file no longer needs to be included.'));

src/wp-includes/functions.php

Switch Indentation +20 added lines, -20 removed lines

@@ -2440,15 +2440,15 @@ 
 		}
 		$errors = $message->get_error_messages();
 		switch ( count( $errors ) ) {
-		case 0 :
-			$message = '';
-			break;
-		case 1 :
-			$message = "<p>{$errors[0]}</p>";
-			break;
-		default :
-			$message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
-			break;
+			case 0 :
+				$message = '';
+				break;
+			case 1 :
+				$message = "<p>{$errors[0]}</p>";
+				break;
+			default :
+				$message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
+				break;
 		}
 	} elseif ( is_string( $message ) ) {
 		$message = "<p>$message</p>";
@@ -4447,17 +4447,17 @@ 
  */
 function _wp_mysql_week( $column ) {
 	switch ( $start_of_week = (int) get_option( 'start_of_week' ) ) {
-	case 1 :
-		return "WEEK( $column, 1 )";
-	case 2 :
-	case 3 :
-	case 4 :
-	case 5 :
-	case 6 :
-		return "WEEK( DATE_SUB( $column, INTERVAL $start_of_week DAY ), 0 )";
-	case 0 :
-	default :
-		return "WEEK( $column, 0 )";
+		case 1 :
+			return "WEEK( $column, 1 )";
+		case 2 :
+		case 3 :
+		case 4 :
+		case 5 :
+		case 6 :
+			return "WEEK( DATE_SUB( $column, INTERVAL $start_of_week DAY ), 0 )";
+		case 0 :
+		default :
+			return "WEEK( $column, 0 )";
 	}
 }
 

Doc Comments +7 added lines, -10 removed lines

@@ -55,7 +55,7 @@ 
  *
  * @param string   $type Type of time to retrieve. Accepts 'mysql', 'timestamp', or PHP date
  *                       format string (e.g. 'Y-m-d').
- * @param int|bool $gmt  Optional. Whether to use GMT timezone. Default false.
+ * @param integer $gmt  Optional. Whether to use GMT timezone. Default false.
  * @return int|string Integer if $type is 'timestamp', string otherwise.
  */
 function current_time( $type, $gmt = 0 ) {
@@ -427,7 +427,7 @@ 
  * @since 2.0.5
  *
  * @param string|array|object $data Data that might be serialized.
- * @return mixed A scalar data
+ * @return string A scalar data
  */
 function maybe_serialize( $data ) {
 	if ( is_array( $data ) || is_object( $data ) )
@@ -762,9 +762,6 @@ 
  *
  * @since 1.5.0
  *
- * @param string|array $key   Either a query variable key, or an associative array of query variables.
- * @param string       $value Optional. Either a query variable value, or a URL to act upon.
- * @param string       $url   Optional. A URL to act upon.
  * @return string New URL query string (unescaped).
  */
 function add_query_arg() {
@@ -1419,7 +1416,7 @@ 
  * @since 2.0.4
  *
  * @param string     $actionurl URL to add nonce action.
- * @param int|string $action    Optional. Nonce action name. Default -1.
+ * @param integer $action    Optional. Nonce action name. Default -1.
  * @param string     $name      Optional. Nonce name. Default '_wpnonce'.
  * @return string Escaped URL with nonce action added.
  */
@@ -1448,7 +1445,7 @@ 
  *
  * @since 2.0.4
  *
- * @param int|string $action  Optional. Action name. Default -1.
+ * @param integer $action  Optional. Action name. Default -1.
  * @param string     $name    Optional. Nonce name. Default '_wpnonce'.
  * @param bool       $referer Optional. Whether to set the referer field for validation. Default true.
  * @param bool       $echo    Optional. Whether to display or return hidden form field. Default true.
@@ -1540,7 +1537,7 @@ 
  *
  * @since 4.5.0
  *
- * @return string|false Referer URL on success, false on failure.
+ * @return string Referer URL on success, false on failure.
  */
 function wp_get_raw_referer() {
 	if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
@@ -4616,7 +4613,7 @@ 
  *
  * @see __return_false()
  *
- * @return true True.
+ * @return boolean True.
  */
 function __return_true() {
 	return true;
@@ -4738,7 +4735,7 @@ 
  * @param int      $start         The ID to start the loop check at.
  * @param int      $start_parent  The parent_ID of $start to use instead of calling $callback( $start ).
  *                                Use null to always use $callback
- * @param array    $callback_args Optional. Additional arguments to send to $callback.
+ * @param string[]    $callback_args Optional. Additional arguments to send to $callback.
  * @return array IDs of all members of loop.
  */
 function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {

Indentation +66 added lines, -66 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 /**
- * Main WordPress API
- *
- * @package WordPress
- */
+	 * Main WordPress API
+	 *
+	 * @package WordPress
+	 */
 
 require( ABSPATH . WPINC . '/option.php' );
 
@@ -2452,14 +2452,14 @@ 
 	) );
 }
 /**
- * Retrieve list of allowed mime types and file extensions.
- *
- * @since 2.8.6
- *
- * @param int|WP_User $user Optional. User to check. Defaults to current user.
- * @return array Array of mime types keyed by the file extension regex corresponding
- *               to those types.
- */
+	 * Retrieve list of allowed mime types and file extensions.
+	 *
+	 * @since 2.8.6
+	 *
+	 * @param int|WP_User $user Optional. User to check. Defaults to current user.
+	 * @return array Array of mime types keyed by the file extension regex corresponding
+	 *               to those types.
+	 */
 function get_allowed_mime_types( $user = null ) {
 	$t = wp_get_mime_types();
 
@@ -3208,7 +3208,7 @@ 
 		  ':arrow:' => "\xe2\x9e\xa1",
 		  ':shock:' => "\xf0\x9f\x98\xaf",
 		  ':smile:' => "\xf0\x9f\x99\x82",
-		    ':???:' => "\xf0\x9f\x98\x95",
+			':???:' => "\xf0\x9f\x98\x95",
 		   ':cool:' => "\xf0\x9f\x98\x8e",
 		   ':evil:' => "\xf0\x9f\x91\xbf",
 		   ':grin:' => "\xf0\x9f\x98\x80",
@@ -3217,36 +3217,36 @@ 
 		   ':razz:' => "\xf0\x9f\x98\x9b",
 		   ':roll:' => 'rolleyes.png',
 		   ':wink:' => "\xf0\x9f\x98\x89",
-		    ':cry:' => "\xf0\x9f\x98\xa5",
-		    ':eek:' => "\xf0\x9f\x98\xae",
-		    ':lol:' => "\xf0\x9f\x98\x86",
-		    ':mad:' => "\xf0\x9f\x98\xa1",
-		    ':sad:' => "\xf0\x9f\x99\x81",
-		      '8-)' => "\xf0\x9f\x98\x8e",
-		      '8-O' => "\xf0\x9f\x98\xaf",
-		      ':-(' => "\xf0\x9f\x99\x81",
-		      ':-)' => "\xf0\x9f\x99\x82",
-		      ':-?' => "\xf0\x9f\x98\x95",
-		      ':-D' => "\xf0\x9f\x98\x80",
-		      ':-P' => "\xf0\x9f\x98\x9b",
-		      ':-o' => "\xf0\x9f\x98\xae",
-		      ':-x' => "\xf0\x9f\x98\xa1",
-		      ':-|' => "\xf0\x9f\x98\x90",
-		      ';-)' => "\xf0\x9f\x98\x89",
+			':cry:' => "\xf0\x9f\x98\xa5",
+			':eek:' => "\xf0\x9f\x98\xae",
+			':lol:' => "\xf0\x9f\x98\x86",
+			':mad:' => "\xf0\x9f\x98\xa1",
+			':sad:' => "\xf0\x9f\x99\x81",
+			  '8-)' => "\xf0\x9f\x98\x8e",
+			  '8-O' => "\xf0\x9f\x98\xaf",
+			  ':-(' => "\xf0\x9f\x99\x81",
+			  ':-)' => "\xf0\x9f\x99\x82",
+			  ':-?' => "\xf0\x9f\x98\x95",
+			  ':-D' => "\xf0\x9f\x98\x80",
+			  ':-P' => "\xf0\x9f\x98\x9b",
+			  ':-o' => "\xf0\x9f\x98\xae",
+			  ':-x' => "\xf0\x9f\x98\xa1",
+			  ':-|' => "\xf0\x9f\x98\x90",
+			  ';-)' => "\xf0\x9f\x98\x89",
 		// This one transformation breaks regular text with frequency.
 		//     '8)' => "\xf0\x9f\x98\x8e",
-		       '8O' => "\xf0\x9f\x98\xaf",
-		       ':(' => "\xf0\x9f\x99\x81",
-		       ':)' => "\xf0\x9f\x99\x82",
-		       ':?' => "\xf0\x9f\x98\x95",
-		       ':D' => "\xf0\x9f\x98\x80",
-		       ':P' => "\xf0\x9f\x98\x9b",
-		       ':o' => "\xf0\x9f\x98\xae",
-		       ':x' => "\xf0\x9f\x98\xa1",
-		       ':|' => "\xf0\x9f\x98\x90",
-		       ';)' => "\xf0\x9f\x98\x89",
-		      ':!:' => "\xe2\x9d\x97",
-		      ':?:' => "\xe2\x9d\x93",
+			   '8O' => "\xf0\x9f\x98\xaf",
+			   ':(' => "\xf0\x9f\x99\x81",
+			   ':)' => "\xf0\x9f\x99\x82",
+			   ':?' => "\xf0\x9f\x98\x95",
+			   ':D' => "\xf0\x9f\x98\x80",
+			   ':P' => "\xf0\x9f\x98\x9b",
+			   ':o' => "\xf0\x9f\x98\xae",
+			   ':x' => "\xf0\x9f\x98\xa1",
+			   ':|' => "\xf0\x9f\x98\x90",
+			   ';)' => "\xf0\x9f\x98\x89",
+			  ':!:' => "\xe2\x9d\x97",
+			  ':?:' => "\xe2\x9d\x93",
 		);
 	}
 
@@ -3795,31 +3795,31 @@ 
 	}
 }
 /**
- * Mark a function argument as deprecated and inform when it has been used.
- *
- * This function is to be used whenever a deprecated function argument is used.
- * Before this function is called, the argument must be checked for whether it was
- * used by comparing it to its default value or evaluating whether it is empty.
- * For example:
- *
- *     if ( ! empty( $deprecated ) ) {
- *         _deprecated_argument( __FUNCTION__, '3.0' );
- *     }
- *
- *
- * There is a hook deprecated_argument_run that will be called that can be used
- * to get the backtrace up to what file and function used the deprecated
- * argument.
- *
- * The current behavior is to trigger a user error if WP_DEBUG is true.
- *
- * @since 3.0.0
- * @access private
- *
- * @param string $function The function that was called.
- * @param string $version  The version of WordPress that deprecated the argument used.
- * @param string $message  Optional. A message regarding the change. Default null.
- */
+	 * Mark a function argument as deprecated and inform when it has been used.
+	 *
+	 * This function is to be used whenever a deprecated function argument is used.
+	 * Before this function is called, the argument must be checked for whether it was
+	 * used by comparing it to its default value or evaluating whether it is empty.
+	 * For example:
+	 *
+	 *     if ( ! empty( $deprecated ) ) {
+	 *         _deprecated_argument( __FUNCTION__, '3.0' );
+	 *     }
+	 *
+	 *
+	 * There is a hook deprecated_argument_run that will be called that can be used
+	 * to get the backtrace up to what file and function used the deprecated
+	 * argument.
+	 *
+	 * The current behavior is to trigger a user error if WP_DEBUG is true.
+	 *
+	 * @since 3.0.0
+	 * @access private
+	 *
+	 * @param string $function The function that was called.
+	 * @param string $version  The version of WordPress that deprecated the argument used.
+	 * @param string $message  Optional. A message regarding the change. Default null.
+	 */
 function _deprecated_argument( $function, $version, $message = null ) {
 
 	/**

Spacing +1005 added lines, -1005 removed lines

@@ -5,7 +5,7 @@ 
  * @package WordPress
  */
 
-require( ABSPATH . WPINC . '/option.php' );
+require(ABSPATH.WPINC.'/option.php');
 
 /**
  * Convert given date string into a different format.
@@ -23,22 +23,22 @@ 
  * @param bool   $translate Whether the return date should be translated. Default true.
  * @return string|int|bool Formatted date string or Unix timestamp. False if $date is empty.
  */
-function mysql2date( $format, $date, $translate = true ) {
-	if ( empty( $date ) )
+function mysql2date($format, $date, $translate = true) {
+	if (empty($date))
 		return false;
 
-	if ( 'G' == $format )
-		return strtotime( $date . ' +0000' );
+	if ('G' == $format)
+		return strtotime($date.' +0000');
 
-	$i = strtotime( $date );
+	$i = strtotime($date);
 
-	if ( 'U' == $format )
+	if ('U' == $format)
 		return $i;
 
-	if ( $translate )
-		return date_i18n( $format, $i );
+	if ($translate)
+		return date_i18n($format, $i);
 	else
-		return date( $format, $i );
+		return date($format, $i);
 }
 
 /**
@@ -58,14 +58,14 @@ 
  * @param int|bool $gmt  Optional. Whether to use GMT timezone. Default false.
  * @return int|string Integer if $type is 'timestamp', string otherwise.
  */
-function current_time( $type, $gmt = 0 ) {
-	switch ( $type ) {
+function current_time($type, $gmt = 0) {
+	switch ($type) {
 		case 'mysql':
-			return ( $gmt ) ? gmdate( 'Y-m-d H:i:s' ) : gmdate( 'Y-m-d H:i:s', ( time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) );
+			return ($gmt) ? gmdate('Y-m-d H:i:s') : gmdate('Y-m-d H:i:s', (time() + (get_option('gmt_offset') * HOUR_IN_SECONDS)));
 		case 'timestamp':
-			return ( $gmt ) ? time() : time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+			return ($gmt) ? time() : time() + (get_option('gmt_offset') * HOUR_IN_SECONDS);
 		default:
-			return ( $gmt ) ? date( $type ) : date( $type, time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) );
+			return ($gmt) ? date($type) : date($type, time() + (get_option('gmt_offset') * HOUR_IN_SECONDS));
 	}
 }
 
@@ -86,13 +86,13 @@ 
  *
  * @return string The date, translated if locale specifies it.
  */
-function date_i18n( $dateformatstring, $unixtimestamp = false, $gmt = false ) {
+function date_i18n($dateformatstring, $unixtimestamp = false, $gmt = false) {
 	global $wp_locale;
 	$i = $unixtimestamp;
 
-	if ( false === $i ) {
-		if ( ! $gmt )
-			$i = current_time( 'timestamp' );
+	if (false === $i) {
+		if ( ! $gmt)
+			$i = current_time('timestamp');
 		else
 			$i = time();
 		// we should not let date() interfere with our
@@ -106,43 +106,43 @@ 
 	 */
 	$req_format = $dateformatstring;
 
-	$datefunc = $gmt? 'gmdate' : 'date';
+	$datefunc = $gmt ? 'gmdate' : 'date';
 
-	if ( ( !empty( $wp_locale->month ) ) && ( !empty( $wp_locale->weekday ) ) ) {
-		$datemonth = $wp_locale->get_month( $datefunc( 'm', $i ) );
-		$datemonth_abbrev = $wp_locale->get_month_abbrev( $datemonth );
-		$dateweekday = $wp_locale->get_weekday( $datefunc( 'w', $i ) );
-		$dateweekday_abbrev = $wp_locale->get_weekday_abbrev( $dateweekday );
-		$datemeridiem = $wp_locale->get_meridiem( $datefunc( 'a', $i ) );
-		$datemeridiem_capital = $wp_locale->get_meridiem( $datefunc( 'A', $i ) );
+	if (( ! empty($wp_locale->month)) && ( ! empty($wp_locale->weekday))) {
+		$datemonth = $wp_locale->get_month($datefunc('m', $i));
+		$datemonth_abbrev = $wp_locale->get_month_abbrev($datemonth);
+		$dateweekday = $wp_locale->get_weekday($datefunc('w', $i));
+		$dateweekday_abbrev = $wp_locale->get_weekday_abbrev($dateweekday);
+		$datemeridiem = $wp_locale->get_meridiem($datefunc('a', $i));
+		$datemeridiem_capital = $wp_locale->get_meridiem($datefunc('A', $i));
 		$dateformatstring = ' '.$dateformatstring;
-		$dateformatstring = preg_replace( "/([^\\\])D/", "\\1" . backslashit( $dateweekday_abbrev ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])F/", "\\1" . backslashit( $datemonth ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])l/", "\\1" . backslashit( $dateweekday ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])M/", "\\1" . backslashit( $datemonth_abbrev ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])a/", "\\1" . backslashit( $datemeridiem ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])A/", "\\1" . backslashit( $datemeridiem_capital ), $dateformatstring );
-
-		$dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
-	}
-	$timezone_formats = array( 'P', 'I', 'O', 'T', 'Z', 'e' );
-	$timezone_formats_re = implode( '|', $timezone_formats );
-	if ( preg_match( "/$timezone_formats_re/", $dateformatstring ) ) {
-		$timezone_string = get_option( 'timezone_string' );
-		if ( $timezone_string ) {
-			$timezone_object = timezone_open( $timezone_string );
-			$date_object = date_create( null, $timezone_object );
-			foreach ( $timezone_formats as $timezone_format ) {
-				if ( false !== strpos( $dateformatstring, $timezone_format ) ) {
-					$formatted = date_format( $date_object, $timezone_format );
+		$dateformatstring = preg_replace("/([^\\\])D/", "\\1".backslashit($dateweekday_abbrev), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])F/", "\\1".backslashit($datemonth), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])l/", "\\1".backslashit($dateweekday), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])M/", "\\1".backslashit($datemonth_abbrev), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])a/", "\\1".backslashit($datemeridiem), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])A/", "\\1".backslashit($datemeridiem_capital), $dateformatstring);
+
+		$dateformatstring = substr($dateformatstring, 1, strlen($dateformatstring) - 1);
+	}
+	$timezone_formats = array('P', 'I', 'O', 'T', 'Z', 'e');
+	$timezone_formats_re = implode('|', $timezone_formats);
+	if (preg_match("/$timezone_formats_re/", $dateformatstring)) {
+		$timezone_string = get_option('timezone_string');
+		if ($timezone_string) {
+			$timezone_object = timezone_open($timezone_string);
+			$date_object = date_create(null, $timezone_object);
+			foreach ($timezone_formats as $timezone_format) {
+				if (false !== strpos($dateformatstring, $timezone_format)) {
+					$formatted = date_format($date_object, $timezone_format);
 					$dateformatstring = ' '.$dateformatstring;
-					$dateformatstring = preg_replace( "/([^\\\])$timezone_format/", "\\1" . backslashit( $formatted ), $dateformatstring );
-					$dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
+					$dateformatstring = preg_replace("/([^\\\])$timezone_format/", "\\1".backslashit($formatted), $dateformatstring);
+					$dateformatstring = substr($dateformatstring, 1, strlen($dateformatstring) - 1);
 				}
 			}
 		}
 	}
-	$j = @$datefunc( $dateformatstring, $i );
+	$j = @$datefunc($dateformatstring, $i);
 
 	/**
 	 * Filter the date formatted based on the locale.
@@ -154,7 +154,7 @@ 
 	 * @param int    $i          Unix timestamp.
 	 * @param bool   $gmt        Whether to convert to GMT for time. Default false.
 	 */
-	$j = apply_filters( 'date_i18n', $j, $req_format, $i, $gmt );
+	$j = apply_filters('date_i18n', $j, $req_format, $i, $gmt);
 	return $j;
 }
 
@@ -169,36 +169,36 @@ 
  * @param string $date Formatted date string.
  * @return string The date, declined if locale specifies it.
  */
-function wp_maybe_decline_date( $date ) {
+function wp_maybe_decline_date($date) {
 	global $wp_locale;
 
 	// i18n functions are not available in SHORTINIT mode
-	if ( ! function_exists( '_x' ) ) {
+	if ( ! function_exists('_x')) {
 		return $date;
 	}
 
 	/* translators: If months in your language require a genitive case,
 	 * translate this to 'on'. Do not translate into your own language.
 	 */
-	if ( 'on' === _x( 'off', 'decline months names: on or off' ) ) {
+	if ('on' === _x('off', 'decline months names: on or off')) {
 		// Match a format like 'j F Y' or 'j. F'
-		if ( @preg_match( '#^\d{1,2}\.? \w+#u', $date ) ) {
+		if (@preg_match('#^\d{1,2}\.? \w+#u', $date)) {
 			$months = $wp_locale->month;
 
-			foreach ( $months as $key => $month ) {
-				$months[ $key ] = '#' . $month . '#';
+			foreach ($months as $key => $month) {
+				$months[$key] = '#'.$month.'#';
 			}
 
-			$date = preg_replace( $months, $wp_locale->month_genitive, $date );
+			$date = preg_replace($months, $wp_locale->month_genitive, $date);
 		}
 	}
 
 	// Used for locale-specific rules
 	$locale = get_locale();
 
-	if ( 'ca' === $locale ) {
+	if ('ca' === $locale) {
 		// " de abril| de agost| de octubre..." -> " d'abril| d'agost| d'octubre..."
-		$date = preg_replace( '# de ([ao])#i', " d'\\1", $date );
+		$date = preg_replace('# de ([ao])#i', " d'\\1", $date);
 	}
 
 	return $date;
@@ -215,13 +215,13 @@ 
  * @param int   $decimals Optional. Precision of the number of decimal places. Default 0.
  * @return string Converted number in string format.
  */
-function number_format_i18n( $number, $decimals = 0 ) {
+function number_format_i18n($number, $decimals = 0) {
 	global $wp_locale;
 
-	if ( isset( $wp_locale ) ) {
-		$formatted = number_format( $number, absint( $decimals ), $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep'] );
+	if (isset($wp_locale)) {
+		$formatted = number_format($number, absint($decimals), $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep']);
 	} else {
-		$formatted = number_format( $number, absint( $decimals ) );
+		$formatted = number_format($number, absint($decimals));
 	}
 
 	/**
@@ -231,7 +231,7 @@ 
 	 *
 	 * @param string $formatted Converted number in string format.
 	 */
-	return apply_filters( 'number_format_i18n', $formatted );
+	return apply_filters('number_format_i18n', $formatted);
 }
 
 /**
@@ -254,7 +254,7 @@ 
  * @param int        $decimals Optional. Precision of number of decimal places. Default 0.
  * @return string|false False on failure. Number string on success.
  */
-function size_format( $bytes, $decimals = 0 ) {
+function size_format($bytes, $decimals = 0) {
 	$quant = array(
 		'TB' => TB_IN_BYTES,
 		'GB' => GB_IN_BYTES,
@@ -263,9 +263,9 @@ 
 		'B'  => 1,
 	);
 
-	foreach ( $quant as $unit => $mag ) {
-		if ( doubleval( $bytes ) >= $mag ) {
-			return number_format_i18n( $bytes / $mag, $decimals ) . ' ' . $unit;
+	foreach ($quant as $unit => $mag) {
+		if (doubleval($bytes) >= $mag) {
+			return number_format_i18n($bytes / $mag, $decimals).' '.$unit;
 		}
 	}
 
@@ -281,34 +281,34 @@ 
  * @param int|string $start_of_week Optional. Start of the week as an integer. Default empty string.
  * @return array Keys are 'start' and 'end'.
  */
-function get_weekstartend( $mysqlstring, $start_of_week = '' ) {
+function get_weekstartend($mysqlstring, $start_of_week = '') {
 	// MySQL string year.
-	$my = substr( $mysqlstring, 0, 4 );
+	$my = substr($mysqlstring, 0, 4);
 
 	// MySQL string month.
-	$mm = substr( $mysqlstring, 8, 2 );
+	$mm = substr($mysqlstring, 8, 2);
 
 	// MySQL string day.
-	$md = substr( $mysqlstring, 5, 2 );
+	$md = substr($mysqlstring, 5, 2);
 
 	// The timestamp for MySQL string day.
-	$day = mktime( 0, 0, 0, $md, $mm, $my );
+	$day = mktime(0, 0, 0, $md, $mm, $my);
 
 	// The day of the week from the timestamp.
-	$weekday = date( 'w', $day );
+	$weekday = date('w', $day);
 
-	if ( !is_numeric($start_of_week) )
-		$start_of_week = get_option( 'start_of_week' );
+	if ( ! is_numeric($start_of_week))
+		$start_of_week = get_option('start_of_week');
 
-	if ( $weekday < $start_of_week )
+	if ($weekday < $start_of_week)
 		$weekday += 7;
 
 	// The most recent week start day on or before $day.
-	$start = $day - DAY_IN_SECONDS * ( $weekday - $start_of_week );
+	$start = $day - DAY_IN_SECONDS * ($weekday - $start_of_week);
 
 	// $start + 1 week - 1 second.
 	$end = $start + WEEK_IN_SECONDS - 1;
-	return compact( 'start', 'end' );
+	return compact('start', 'end');
 }
 
 /**
@@ -319,9 +319,9 @@ 
  * @param string $original Maybe unserialized original, if is needed.
  * @return mixed Unserialized data can be any type.
  */
-function maybe_unserialize( $original ) {
-	if ( is_serialized( $original ) ) // don't attempt to unserialize data that wasn't serialized going in
-		return @unserialize( $original );
+function maybe_unserialize($original) {
+	if (is_serialized($original)) // don't attempt to unserialize data that wasn't serialized going in
+		return @unserialize($original);
 	return $original;
 }
 
@@ -337,57 +337,57 @@ 
  * @param bool   $strict Optional. Whether to be strict about the end of the string. Default true.
  * @return bool False if not serialized and true if it was.
  */
-function is_serialized( $data, $strict = true ) {
+function is_serialized($data, $strict = true) {
 	// if it isn't a string, it isn't serialized.
-	if ( ! is_string( $data ) ) {
+	if ( ! is_string($data)) {
 		return false;
 	}
-	$data = trim( $data );
- 	if ( 'N;' == $data ) {
+	$data = trim($data);
+ 	if ('N;' == $data) {
 		return true;
 	}
-	if ( strlen( $data ) < 4 ) {
+	if (strlen($data) < 4) {
 		return false;
 	}
-	if ( ':' !== $data[1] ) {
+	if (':' !== $data[1]) {
 		return false;
 	}
-	if ( $strict ) {
-		$lastc = substr( $data, -1 );
-		if ( ';' !== $lastc && '}' !== $lastc ) {
+	if ($strict) {
+		$lastc = substr($data, -1);
+		if (';' !== $lastc && '}' !== $lastc) {
 			return false;
 		}
 	} else {
-		$semicolon = strpos( $data, ';' );
-		$brace     = strpos( $data, '}' );
+		$semicolon = strpos($data, ';');
+		$brace     = strpos($data, '}');
 		// Either ; or } must exist.
-		if ( false === $semicolon && false === $brace )
+		if (false === $semicolon && false === $brace)
 			return false;
 		// But neither must be in the first X characters.
-		if ( false !== $semicolon && $semicolon < 3 )
+		if (false !== $semicolon && $semicolon < 3)
 			return false;
-		if ( false !== $brace && $brace < 4 )
+		if (false !== $brace && $brace < 4)
 			return false;
 	}
 	$token = $data[0];
-	switch ( $token ) {
+	switch ($token) {
 		case 's' :
-			if ( $strict ) {
-				if ( '"' !== substr( $data, -2, 1 ) ) {
+			if ($strict) {
+				if ('"' !== substr($data, -2, 1)) {
 					return false;
 				}
-			} elseif ( false === strpos( $data, '"' ) ) {
+			} elseif (false === strpos($data, '"')) {
 				return false;
 			}
 			// or else fall through
 		case 'a' :
 		case 'O' :
-			return (bool) preg_match( "/^{$token}:[0-9]+:/s", $data );
+			return (bool) preg_match("/^{$token}:[0-9]+:/s", $data);
 		case 'b' :
 		case 'i' :
 		case 'd' :
 			$end = $strict ? '$' : '';
-			return (bool) preg_match( "/^{$token}:[0-9.E-]+;$end/", $data );
+			return (bool) preg_match("/^{$token}:[0-9.E-]+;$end/", $data);
 	}
 	return false;
 }
@@ -400,21 +400,21 @@ 
  * @param string $data Serialized data.
  * @return bool False if not a serialized string, true if it is.
  */
-function is_serialized_string( $data ) {
+function is_serialized_string($data) {
 	// if it isn't a string, it isn't a serialized string.
-	if ( ! is_string( $data ) ) {
+	if ( ! is_string($data)) {
 		return false;
 	}
-	$data = trim( $data );
-	if ( strlen( $data ) < 4 ) {
+	$data = trim($data);
+	if (strlen($data) < 4) {
 		return false;
-	} elseif ( ':' !== $data[1] ) {
+	} elseif (':' !== $data[1]) {
 		return false;
-	} elseif ( ';' !== substr( $data, -1 ) ) {
+	} elseif (';' !== substr($data, -1)) {
 		return false;
-	} elseif ( $data[0] !== 's' ) {
+	} elseif ($data[0] !== 's') {
 		return false;
-	} elseif ( '"' !== substr( $data, -2, 1 ) ) {
+	} elseif ('"' !== substr($data, -2, 1)) {
 		return false;
 	} else {
 		return true;
@@ -429,15 +429,15 @@ 
  * @param string|array|object $data Data that might be serialized.
  * @return mixed A scalar data
  */
-function maybe_serialize( $data ) {
-	if ( is_array( $data ) || is_object( $data ) )
-		return serialize( $data );
+function maybe_serialize($data) {
+	if (is_array($data) || is_object($data))
+		return serialize($data);
 
 	// Double serialization is required for backward compatibility.
 	// See https://core.trac.wordpress.org/ticket/12930
 	// Also the world will end. See WP 3.6.1.
-	if ( is_serialized( $data, false ) )
-		return serialize( $data );
+	if (is_serialized($data, false))
+		return serialize($data);
 
 	return $data;
 }
@@ -455,9 +455,9 @@ 
  * @param string $content XMLRPC XML Request content
  * @return string Post title
  */
-function xmlrpc_getposttitle( $content ) {
+function xmlrpc_getposttitle($content) {
 	global $post_default_title;
-	if ( preg_match( '/<title>(.+?)<\/title>/is', $content, $matchtitle ) ) {
+	if (preg_match('/<title>(.+?)<\/title>/is', $content, $matchtitle)) {
 		$post_title = $matchtitle[1];
 	} else {
 		$post_title = $post_default_title;
@@ -479,11 +479,11 @@ 
  * @param string $content XMLRPC XML Request content
  * @return string|array List of categories or category name.
  */
-function xmlrpc_getpostcategory( $content ) {
+function xmlrpc_getpostcategory($content) {
 	global $post_default_category;
-	if ( preg_match( '/<category>(.+?)<\/category>/is', $content, $matchcat ) ) {
-		$post_category = trim( $matchcat[1], ',' );
-		$post_category = explode( ',', $post_category );
+	if (preg_match('/<category>(.+?)<\/category>/is', $content, $matchcat)) {
+		$post_category = trim($matchcat[1], ',');
+		$post_category = explode(',', $post_category);
 	} else {
 		$post_category = $post_default_category;
 	}
@@ -498,10 +498,10 @@ 
  * @param string $content XML-RPC XML Request content.
  * @return string XMLRPC XML Request content without title and category elements.
  */
-function xmlrpc_removepostdata( $content ) {
-	$content = preg_replace( '/<title>(.+?)<\/title>/si', '', $content );
-	$content = preg_replace( '/<category>(.+?)<\/category>/si', '', $content );
-	$content = trim( $content );
+function xmlrpc_removepostdata($content) {
+	$content = preg_replace('/<title>(.+?)<\/title>/si', '', $content);
+	$content = preg_replace('/<category>(.+?)<\/category>/si', '', $content);
+	$content = trim($content);
 	return $content;
 }
 
@@ -513,7 +513,7 @@ 
  * @param string $content Content to extract URLs from.
  * @return array URLs found in passed string.
  */
-function wp_extract_urls( $content ) {
+function wp_extract_urls($content) {
 	preg_match_all(
 		"#([\"']?)("
 			. "(?:([\w-]+:)?//?)"
@@ -531,9 +531,9 @@ 
 		$post_links
 	);
 
-	$post_links = array_unique( array_map( 'html_entity_decode', $post_links[2] ) );
+	$post_links = array_unique(array_map('html_entity_decode', $post_links[2]));
 
-	return array_values( $post_links );
+	return array_values($post_links);
 }
 
 /**
@@ -550,34 +550,34 @@ 
  * @param string $content Post Content.
  * @param int    $post_ID Post ID.
  */
-function do_enclose( $content, $post_ID ) {
+function do_enclose($content, $post_ID) {
 	global $wpdb;
 
 	//TODO: Tidy this ghetto code up and make the debug code optional
-	include_once( ABSPATH . WPINC . '/class-IXR.php' );
+	include_once(ABSPATH.WPINC.'/class-IXR.php');
 
 	$post_links = array();
 
-	$pung = get_enclosed( $post_ID );
+	$pung = get_enclosed($post_ID);
 
-	$post_links_temp = wp_extract_urls( $content );
+	$post_links_temp = wp_extract_urls($content);
 
-	foreach ( $pung as $link_test ) {
-		if ( ! in_array( $link_test, $post_links_temp ) ) { // link no longer in post
-			$mids = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $link_test ) . '%') );
-			foreach ( $mids as $mid )
-				delete_metadata_by_mid( 'post', $mid );
+	foreach ($pung as $link_test) {
+		if ( ! in_array($link_test, $post_links_temp)) { // link no longer in post
+			$mids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like($link_test).'%'));
+			foreach ($mids as $mid)
+				delete_metadata_by_mid('post', $mid);
 		}
 	}
 
-	foreach ( (array) $post_links_temp as $link_test ) {
-		if ( !in_array( $link_test, $pung ) ) { // If we haven't pung it already
-			$test = @parse_url( $link_test );
-			if ( false === $test )
+	foreach ((array) $post_links_temp as $link_test) {
+		if ( ! in_array($link_test, $pung)) { // If we haven't pung it already
+			$test = @parse_url($link_test);
+			if (false === $test)
 				continue;
-			if ( isset( $test['query'] ) )
+			if (isset($test['query']))
 				$post_links[] = $link_test;
-			elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) )
+			elseif (isset($test['path']) && ($test['path'] != '/') && ($test['path'] != ''))
 				$post_links[] = $link_test;
 		}
 	}
@@ -593,24 +593,24 @@ 
 	 * @param array $post_links An array of enclosure links.
 	 * @param int   $post_ID    Post ID.
 	 */
-	$post_links = apply_filters( 'enclosure_links', $post_links, $post_ID );
+	$post_links = apply_filters('enclosure_links', $post_links, $post_ID);
 
-	foreach ( (array) $post_links as $url ) {
-		if ( $url != '' && !$wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $url ) . '%' ) ) ) {
+	foreach ((array) $post_links as $url) {
+		if ($url != '' && ! $wpdb->get_var($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like($url).'%'))) {
 
-			if ( $headers = wp_get_http_headers( $url) ) {
-				$len = isset( $headers['content-length'] ) ? (int) $headers['content-length'] : 0;
-				$type = isset( $headers['content-type'] ) ? $headers['content-type'] : '';
-				$allowed_types = array( 'video', 'audio' );
+			if ($headers = wp_get_http_headers($url)) {
+				$len = isset($headers['content-length']) ? (int) $headers['content-length'] : 0;
+				$type = isset($headers['content-type']) ? $headers['content-type'] : '';
+				$allowed_types = array('video', 'audio');
 
 				// Check to see if we can figure out the mime type from
 				// the extension
-				$url_parts = @parse_url( $url );
-				if ( false !== $url_parts ) {
-					$extension = pathinfo( $url_parts['path'], PATHINFO_EXTENSION );
-					if ( !empty( $extension ) ) {
-						foreach ( wp_get_mime_types() as $exts => $mime ) {
-							if ( preg_match( '!^(' . $exts . ')$!i', $extension ) ) {
+				$url_parts = @parse_url($url);
+				if (false !== $url_parts) {
+					$extension = pathinfo($url_parts['path'], PATHINFO_EXTENSION);
+					if ( ! empty($extension)) {
+						foreach (wp_get_mime_types() as $exts => $mime) {
+							if (preg_match('!^('.$exts.')$!i', $extension)) {
 								$type = $mime;
 								break;
 							}
@@ -618,8 +618,8 @@ 
 					}
 				}
 
-				if ( in_array( substr( $type, 0, strpos( $type, "/" ) ), $allowed_types ) ) {
-					add_post_meta( $post_ID, 'enclosure', "$url\n$len\n$mime\n" );
+				if (in_array(substr($type, 0, strpos($type, "/")), $allowed_types)) {
+					add_post_meta($post_ID, 'enclosure', "$url\n$len\n$mime\n");
 				}
 			}
 		}
@@ -635,16 +635,16 @@ 
  * @param bool   $deprecated Not Used.
  * @return bool|string False on failure, headers on success.
  */
-function wp_get_http_headers( $url, $deprecated = false ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7' );
+function wp_get_http_headers($url, $deprecated = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.7');
 
-	$response = wp_safe_remote_head( $url );
+	$response = wp_safe_remote_head($url);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	return wp_remote_retrieve_headers( $response );
+	return wp_remote_retrieve_headers($response);
 }
 
 /**
@@ -660,7 +660,7 @@ 
  */
 function is_new_day() {
 	global $currentday, $previousday;
-	if ( $currentday != $previousday )
+	if ($currentday != $previousday)
 		return 1;
 	else
 		return 0;
@@ -681,8 +681,8 @@ 
  * @param array $data URL-encode key/value pairs.
  * @return string URL-encoded string.
  */
-function build_query( $data ) {
-	return _http_build_query( $data, null, '&', '', false );
+function build_query($data) {
+	return _http_build_query($data, null, '&', '', false);
 }
 
 /**
@@ -703,30 +703,30 @@ 
  *
  * @return string The query string.
  */
-function _http_build_query( $data, $prefix = null, $sep = null, $key = '', $urlencode = true ) {
+function _http_build_query($data, $prefix = null, $sep = null, $key = '', $urlencode = true) {
 	$ret = array();
 
-	foreach ( (array) $data as $k => $v ) {
-		if ( $urlencode)
+	foreach ((array) $data as $k => $v) {
+		if ($urlencode)
 			$k = urlencode($k);
-		if ( is_int($k) && $prefix != null )
+		if (is_int($k) && $prefix != null)
 			$k = $prefix.$k;
-		if ( !empty($key) )
-			$k = $key . '%5B' . $k . '%5D';
-		if ( $v === null )
+		if ( ! empty($key))
+			$k = $key.'%5B'.$k.'%5D';
+		if ($v === null)
 			continue;
-		elseif ( $v === false )
+		elseif ($v === false)
 			$v = '0';
 
-		if ( is_array($v) || is_object($v) )
-			array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
-		elseif ( $urlencode )
+		if (is_array($v) || is_object($v))
+			array_push($ret, _http_build_query($v, '', $sep, $k, $urlencode));
+		elseif ($urlencode)
 			array_push($ret, $k.'='.urlencode($v));
 		else
 			array_push($ret, $k.'='.$v);
 	}
 
-	if ( null === $sep )
+	if (null === $sep)
 		$sep = ini_get('arg_separator.output');
 
 	return implode($sep, $ret);
@@ -769,64 +769,64 @@ 
  */
 function add_query_arg() {
 	$args = func_get_args();
-	if ( is_array( $args[0] ) ) {
-		if ( count( $args ) < 2 || false === $args[1] )
+	if (is_array($args[0])) {
+		if (count($args) < 2 || false === $args[1])
 			$uri = $_SERVER['REQUEST_URI'];
 		else
 			$uri = $args[1];
 	} else {
-		if ( count( $args ) < 3 || false === $args[2] )
+		if (count($args) < 3 || false === $args[2])
 			$uri = $_SERVER['REQUEST_URI'];
 		else
 			$uri = $args[2];
 	}
 
-	if ( $frag = strstr( $uri, '#' ) )
-		$uri = substr( $uri, 0, -strlen( $frag ) );
+	if ($frag = strstr($uri, '#'))
+		$uri = substr($uri, 0, -strlen($frag));
 	else
 		$frag = '';
 
-	if ( 0 === stripos( $uri, 'http://' ) ) {
+	if (0 === stripos($uri, 'http://')) {
 		$protocol = 'http://';
-		$uri = substr( $uri, 7 );
-	} elseif ( 0 === stripos( $uri, 'https://' ) ) {
+		$uri = substr($uri, 7);
+	} elseif (0 === stripos($uri, 'https://')) {
 		$protocol = 'https://';
-		$uri = substr( $uri, 8 );
+		$uri = substr($uri, 8);
 	} else {
 		$protocol = '';
 	}
 
-	if ( strpos( $uri, '?' ) !== false ) {
-		list( $base, $query ) = explode( '?', $uri, 2 );
+	if (strpos($uri, '?') !== false) {
+		list($base, $query) = explode('?', $uri, 2);
 		$base .= '?';
-	} elseif ( $protocol || strpos( $uri, '=' ) === false ) {
-		$base = $uri . '?';
+	} elseif ($protocol || strpos($uri, '=') === false) {
+		$base = $uri.'?';
 		$query = '';
 	} else {
 		$base = '';
 		$query = $uri;
 	}
 
-	wp_parse_str( $query, $qs );
-	$qs = urlencode_deep( $qs ); // this re-URL-encodes things that were already in the query string
-	if ( is_array( $args[0] ) ) {
-		foreach ( $args[0] as $k => $v ) {
-			$qs[ $k ] = $v;
+	wp_parse_str($query, $qs);
+	$qs = urlencode_deep($qs); // this re-URL-encodes things that were already in the query string
+	if (is_array($args[0])) {
+		foreach ($args[0] as $k => $v) {
+			$qs[$k] = $v;
 		}
 	} else {
-		$qs[ $args[0] ] = $args[1];
+		$qs[$args[0]] = $args[1];
 	}
 
-	foreach ( $qs as $k => $v ) {
-		if ( $v === false )
-			unset( $qs[$k] );
+	foreach ($qs as $k => $v) {
+		if ($v === false)
+			unset($qs[$k]);
 	}
 
-	$ret = build_query( $qs );
-	$ret = trim( $ret, '?' );
-	$ret = preg_replace( '#=(&|$)#', '$1', $ret );
-	$ret = $protocol . $base . $ret . $frag;
-	$ret = rtrim( $ret, '?' );
+	$ret = build_query($qs);
+	$ret = trim($ret, '?');
+	$ret = preg_replace('#=(&|$)#', '$1', $ret);
+	$ret = $protocol.$base.$ret.$frag;
+	$ret = rtrim($ret, '?');
 	return $ret;
 }
 
@@ -839,13 +839,13 @@ 
  * @param bool|string  $query Optional. When false uses the current URL. Default false.
  * @return string New URL query string.
  */
-function remove_query_arg( $key, $query = false ) {
-	if ( is_array( $key ) ) { // removing multiple keys
-		foreach ( $key as $k )
-			$query = add_query_arg( $k, false, $query );
+function remove_query_arg($key, $query = false) {
+	if (is_array($key)) { // removing multiple keys
+		foreach ($key as $k)
+			$query = add_query_arg($k, false, $query);
 		return $query;
 	}
-	return add_query_arg( $key, false, $query );
+	return add_query_arg($key, false, $query);
 }
 
 /**
@@ -887,7 +887,7 @@ 
 	 *
 	 * @param array $removable_query_args An array of query variables to remove from a URL.
 	 */
-	return apply_filters( 'removable_query_args', $removable_query_args );
+	return apply_filters('removable_query_args', $removable_query_args);
 }
 
 /**
@@ -898,12 +898,12 @@ 
  * @param array $array Array to walk while sanitizing contents.
  * @return array Sanitized $array.
  */
-function add_magic_quotes( $array ) {
-	foreach ( (array) $array as $k => $v ) {
-		if ( is_array( $v ) ) {
-			$array[$k] = add_magic_quotes( $v );
+function add_magic_quotes($array) {
+	foreach ((array) $array as $k => $v) {
+		if (is_array($v)) {
+			$array[$k] = add_magic_quotes($v);
 		} else {
-			$array[$k] = addslashes( $v );
+			$array[$k] = addslashes($v);
 		}
 	}
 	return $array;
@@ -919,21 +919,21 @@ 
  * @param string $uri URI/URL of web page to retrieve.
  * @return false|string HTTP content. False on failure.
  */
-function wp_remote_fopen( $uri ) {
-	$parsed_url = @parse_url( $uri );
+function wp_remote_fopen($uri) {
+	$parsed_url = @parse_url($uri);
 
-	if ( !$parsed_url || !is_array( $parsed_url ) )
+	if ( ! $parsed_url || ! is_array($parsed_url))
 		return false;
 
 	$options = array();
 	$options['timeout'] = 10;
 
-	$response = wp_safe_remote_get( $uri, $options );
+	$response = wp_safe_remote_get($uri, $options);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	return wp_remote_retrieve_body( $response );
+	return wp_remote_retrieve_body($response);
 }
 
 /**
@@ -947,11 +947,11 @@ 
  *
  * @param string|array $query_vars Default WP_Query arguments.
  */
-function wp( $query_vars = '' ) {
+function wp($query_vars = '') {
 	global $wp, $wp_query, $wp_the_query;
-	$wp->main( $query_vars );
+	$wp->main($query_vars);
 
-	if ( !isset($wp_the_query) )
+	if ( ! isset($wp_the_query))
 		$wp_the_query = $wp_query;
 }
 
@@ -965,12 +965,12 @@ 
  * @param int $code HTTP status code.
  * @return string Empty string if not found, or description if found.
  */
-function get_status_header_desc( $code ) {
+function get_status_header_desc($code) {
 	global $wp_header_to_desc;
 
-	$code = absint( $code );
+	$code = absint($code);
 
-	if ( !isset( $wp_header_to_desc ) ) {
+	if ( ! isset($wp_header_to_desc)) {
 		$wp_header_to_desc = array(
 			100 => 'Continue',
 			101 => 'Switching Protocols',
@@ -1038,7 +1038,7 @@ 
 		);
 	}
 
-	if ( isset( $wp_header_to_desc[$code] ) )
+	if (isset($wp_header_to_desc[$code]))
 		return $wp_header_to_desc[$code];
 	else
 		return '';
@@ -1055,18 +1055,18 @@ 
  * @param int    $code        HTTP status code.
  * @param string $description Optional. A custom description for the HTTP status.
  */
-function status_header( $code, $description = '' ) {
-	if ( ! $description ) {
-		$description = get_status_header_desc( $code );
+function status_header($code, $description = '') {
+	if ( ! $description) {
+		$description = get_status_header_desc($code);
 	}
 
-	if ( empty( $description ) ) {
+	if (empty($description)) {
 		return;
 	}
 
 	$protocol = wp_get_server_protocol();
 	$status_header = "$protocol $code $description";
-	if ( function_exists( 'apply_filters' ) )
+	if (function_exists('apply_filters'))
 
 		/**
 		 * Filter an HTTP status header.
@@ -1078,9 +1078,9 @@ 
 		 * @param string $description   Description for the status code.
 		 * @param string $protocol      Server protocol.
 		 */
-		$status_header = apply_filters( 'status_header', $status_header, $code, $description, $protocol );
+		$status_header = apply_filters('status_header', $status_header, $code, $description, $protocol);
 
-	@header( $status_header, true, $code );
+	@header($status_header, true, $code);
 }
 
 /**
@@ -1100,7 +1100,7 @@ 
 		'Pragma' => 'no-cache',
 	);
 
-	if ( function_exists('apply_filters') ) {
+	if (function_exists('apply_filters')) {
 		/**
 		 * Filter the cache-controlling headers.
 		 *
@@ -1116,7 +1116,7 @@ 
 		 *     @type string $Pragma        Pragma header.
 		 * }
 		 */
-		$headers = (array) apply_filters( 'nocache_headers', $headers );
+		$headers = (array) apply_filters('nocache_headers', $headers);
 	}
 	$headers['Last-Modified'] = false;
 	return $headers;
@@ -1136,23 +1136,23 @@ 
 function nocache_headers() {
 	$headers = wp_get_nocache_headers();
 
-	unset( $headers['Last-Modified'] );
+	unset($headers['Last-Modified']);
 
 	// In PHP 5.3+, make sure we are not sending a Last-Modified header.
-	if ( function_exists( 'header_remove' ) ) {
-		@header_remove( 'Last-Modified' );
+	if (function_exists('header_remove')) {
+		@header_remove('Last-Modified');
 	} else {
 		// In PHP 5.2, send an empty Last-Modified header, but only as a
 		// last resort to override a header already sent. #WP23021
-		foreach ( headers_list() as $header ) {
-			if ( 0 === stripos( $header, 'Last-Modified' ) ) {
+		foreach (headers_list() as $header) {
+			if (0 === stripos($header, 'Last-Modified')) {
 				$headers['Last-Modified'] = '';
 				break;
 			}
 		}
 	}
 
-	foreach ( $headers as $name => $field_value )
+	foreach ($headers as $name => $field_value)
 		@header("{$name}: {$field_value}");
 }
 
@@ -1164,9 +1164,9 @@ 
 function cache_javascript_headers() {
 	$expiresOffset = 10 * DAY_IN_SECONDS;
 
-	header( "Content-Type: text/javascript; charset=" . get_bloginfo( 'charset' ) );
-	header( "Vary: Accept-Encoding" ); // Handle proxies
-	header( "Expires: " . gmdate( "D, d M Y H:i:s", time() + $expiresOffset ) . " GMT" );
+	header("Content-Type: text/javascript; charset=".get_bloginfo('charset'));
+	header("Vary: Accept-Encoding"); // Handle proxies
+	header("Expires: ".gmdate("D, d M Y H:i:s", time() + $expiresOffset)." GMT");
 }
 
 /**
@@ -1193,8 +1193,8 @@ 
  * @param string $yn Character string containing either 'y' (yes) or 'n' (no).
  * @return bool True if yes, false on anything else.
  */
-function bool_from_yn( $yn ) {
-	return ( strtolower( $yn ) == 'y' );
+function bool_from_yn($yn) {
+	return (strtolower($yn) == 'y');
 }
 
 /**
@@ -1212,16 +1212,16 @@ 
 function do_feed() {
 	global $wp_query;
 
-	$feed = get_query_var( 'feed' );
+	$feed = get_query_var('feed');
 
 	// Remove the pad, if present.
-	$feed = preg_replace( '/^_+/', '', $feed );
+	$feed = preg_replace('/^_+/', '', $feed);
 
-	if ( $feed == '' || $feed == 'feed' )
+	if ($feed == '' || $feed == 'feed')
 		$feed = get_default_feed();
 
-	if ( ! has_action( "do_feed_{$feed}" ) ) {
-		wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
+	if ( ! has_action("do_feed_{$feed}")) {
+		wp_die(__('ERROR: This is not a valid feed template.'), '', array('response' => 404));
 	}
 
 	/**
@@ -1236,7 +1236,7 @@ 
 	 * @param bool   $is_comment_feed Whether the feed is a comment feed.
 	 * @param string $feed            The feed name.
 	 */
-	do_action( "do_feed_{$feed}", $wp_query->is_comment_feed, $feed );
+	do_action("do_feed_{$feed}", $wp_query->is_comment_feed, $feed);
 }
 
 /**
@@ -1247,7 +1247,7 @@ 
  * @see load_template()
  */
 function do_feed_rdf() {
-	load_template( ABSPATH . WPINC . '/feed-rdf.php' );
+	load_template(ABSPATH.WPINC.'/feed-rdf.php');
 }
 
 /**
@@ -1258,7 +1258,7 @@ 
  * @see load_template()
  */
 function do_feed_rss() {
-	load_template( ABSPATH . WPINC . '/feed-rss.php' );
+	load_template(ABSPATH.WPINC.'/feed-rss.php');
 }
 
 /**
@@ -1270,11 +1270,11 @@ 
  *
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
-function do_feed_rss2( $for_comments ) {
-	if ( $for_comments )
-		load_template( ABSPATH . WPINC . '/feed-rss2-comments.php' );
+function do_feed_rss2($for_comments) {
+	if ($for_comments)
+		load_template(ABSPATH.WPINC.'/feed-rss2-comments.php');
 	else
-		load_template( ABSPATH . WPINC . '/feed-rss2.php' );
+		load_template(ABSPATH.WPINC.'/feed-rss2.php');
 }
 
 /**
@@ -1286,11 +1286,11 @@ 
  *
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
-function do_feed_atom( $for_comments ) {
+function do_feed_atom($for_comments) {
 	if ($for_comments)
-		load_template( ABSPATH . WPINC . '/feed-atom-comments.php');
+		load_template(ABSPATH.WPINC.'/feed-atom-comments.php');
 	else
-		load_template( ABSPATH . WPINC . '/feed-atom.php' );
+		load_template(ABSPATH.WPINC.'/feed-atom.php');
 }
 
 /**
@@ -1302,22 +1302,22 @@ 
  * @since 2.1.0
  */
 function do_robots() {
-	header( 'Content-Type: text/plain; charset=utf-8' );
+	header('Content-Type: text/plain; charset=utf-8');
 
 	/**
 	 * Fires when displaying the robots.txt file.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'do_robotstxt' );
+	do_action('do_robotstxt');
 
 	$output = "User-agent: *\n";
-	$public = get_option( 'blog_public' );
-	if ( '0' == $public ) {
+	$public = get_option('blog_public');
+	if ('0' == $public) {
 		$output .= "Disallow: /\n";
 	} else {
-		$site_url = parse_url( site_url() );
-		$path = ( !empty( $site_url['path'] ) ) ? $site_url['path'] : '';
+		$site_url = parse_url(site_url());
+		$path = ( ! empty($site_url['path'])) ? $site_url['path'] : '';
 		$output .= "Disallow: $path/wp-admin/\n";
 		$output .= "Allow: $path/wp-admin/admin-ajax.php\n";
 	}
@@ -1330,7 +1330,7 @@ 
 	 * @param string $output Robots.txt output.
 	 * @param bool   $public Whether the site is considered "public".
 	 */
-	echo apply_filters( 'robots_txt', $output, $public );
+	echo apply_filters('robots_txt', $output, $public);
 }
 
 /**
@@ -1355,28 +1355,28 @@ 
 	 * Check cache first. If options table goes away and we have true
 	 * cached, oh well.
 	 */
-	if ( wp_cache_get( 'is_blog_installed' ) )
+	if (wp_cache_get('is_blog_installed'))
 		return true;
 
 	$suppress = $wpdb->suppress_errors();
-	if ( ! wp_installing() ) {
+	if ( ! wp_installing()) {
 		$alloptions = wp_load_alloptions();
 	}
 	// If siteurl is not set to autoload, check it specifically
-	if ( !isset( $alloptions['siteurl'] ) )
-		$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
+	if ( ! isset($alloptions['siteurl']))
+		$installed = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'");
 	else
 		$installed = $alloptions['siteurl'];
-	$wpdb->suppress_errors( $suppress );
+	$wpdb->suppress_errors($suppress);
 
-	$installed = !empty( $installed );
-	wp_cache_set( 'is_blog_installed', $installed );
+	$installed = ! empty($installed);
+	wp_cache_set('is_blog_installed', $installed);
 
-	if ( $installed )
+	if ($installed)
 		return true;
 
 	// If visiting repair.php, return true and let it take over.
-	if ( defined( 'WP_REPAIRING' ) )
+	if (defined('WP_REPAIRING'))
 		return true;
 
 	$suppress = $wpdb->suppress_errors();
@@ -1387,14 +1387,14 @@ 
 	 * options table could not be accessed.
 	 */
 	$wp_tables = $wpdb->tables();
-	foreach ( $wp_tables as $table ) {
+	foreach ($wp_tables as $table) {
 		// The existence of custom user tables shouldn't suggest an insane state or prevent a clean install.
-		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
+		if (defined('CUSTOM_USER_TABLE') && CUSTOM_USER_TABLE == $table)
 			continue;
-		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
+		if (defined('CUSTOM_USER_META_TABLE') && CUSTOM_USER_META_TABLE == $table)
 			continue;
 
-		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) )
+		if ( ! $wpdb->get_results("DESCRIBE $table;"))
 			continue;
 
 		// One or more tables exist. We are insane.
@@ -1402,13 +1402,13 @@ 
 		wp_load_translations_early();
 
 		// Die with a DB error.
-		$wpdb->error = sprintf( __( 'One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.' ), 'maint/repair.php?referrer=is_blog_installed' );
+		$wpdb->error = sprintf(__('One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.'), 'maint/repair.php?referrer=is_blog_installed');
 		dead_db();
 	}
 
-	$wpdb->suppress_errors( $suppress );
+	$wpdb->suppress_errors($suppress);
 
-	wp_cache_set( 'is_blog_installed', false );
+	wp_cache_set('is_blog_installed', false);
 
 	return false;
 }
@@ -1423,9 +1423,9 @@ 
  * @param string     $name      Optional. Nonce name. Default '_wpnonce'.
  * @return string Escaped URL with nonce action added.
  */
-function wp_nonce_url( $actionurl, $action = -1, $name = '_wpnonce' ) {
-	$actionurl = str_replace( '&amp;', '&', $actionurl );
-	return esc_html( add_query_arg( $name, wp_create_nonce( $action ), $actionurl ) );
+function wp_nonce_url($actionurl, $action = -1, $name = '_wpnonce') {
+	$actionurl = str_replace('&amp;', '&', $actionurl);
+	return esc_html(add_query_arg($name, wp_create_nonce($action), $actionurl));
 }
 
 /**
@@ -1454,14 +1454,14 @@ 
  * @param bool       $echo    Optional. Whether to display or return hidden form field. Default true.
  * @return string Nonce field HTML markup.
  */
-function wp_nonce_field( $action = -1, $name = "_wpnonce", $referer = true , $echo = true ) {
-	$name = esc_attr( $name );
-	$nonce_field = '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . wp_create_nonce( $action ) . '" />';
+function wp_nonce_field($action = -1, $name = "_wpnonce", $referer = true, $echo = true) {
+	$name = esc_attr($name);
+	$nonce_field = '<input type="hidden" id="'.$name.'" name="'.$name.'" value="'.wp_create_nonce($action).'" />';
 
-	if ( $referer )
-		$nonce_field .= wp_referer_field( false );
+	if ($referer)
+		$nonce_field .= wp_referer_field(false);
 
-	if ( $echo )
+	if ($echo)
 		echo $nonce_field;
 
 	return $nonce_field;
@@ -1478,10 +1478,10 @@ 
  * @param bool $echo Optional. Whether to echo or return the referer field. Default true.
  * @return string Referer field HTML markup.
  */
-function wp_referer_field( $echo = true ) {
-	$referer_field = '<input type="hidden" name="_wp_http_referer" value="'. esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
+function wp_referer_field($echo = true) {
+	$referer_field = '<input type="hidden" name="_wp_http_referer" value="'.esc_attr(wp_unslash($_SERVER['REQUEST_URI'])).'" />';
 
-	if ( $echo )
+	if ($echo)
 		echo $referer_field;
 	return $referer_field;
 }
@@ -1500,12 +1500,12 @@ 
  *                             Default 'current'.
  * @return string Original referer field.
  */
-function wp_original_referer_field( $echo = true, $jump_back_to = 'current' ) {
-	if ( ! $ref = wp_get_original_referer() ) {
-		$ref = 'previous' == $jump_back_to ? wp_get_referer() : wp_unslash( $_SERVER['REQUEST_URI'] );
+function wp_original_referer_field($echo = true, $jump_back_to = 'current') {
+	if ( ! $ref = wp_get_original_referer()) {
+		$ref = 'previous' == $jump_back_to ? wp_get_referer() : wp_unslash($_SERVER['REQUEST_URI']);
 	}
-	$orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . esc_attr( $ref ) . '" />';
-	if ( $echo )
+	$orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="'.esc_attr($ref).'" />';
+	if ($echo)
 		echo $orig_referer_field;
 	return $orig_referer_field;
 }
@@ -1520,14 +1520,14 @@ 
  * @return false|string False on failure. Referer URL on success.
  */
 function wp_get_referer() {
-	if ( ! function_exists( 'wp_validate_redirect' ) ) {
+	if ( ! function_exists('wp_validate_redirect')) {
 		return false;
 	}
 
 	$ref = wp_get_raw_referer();
 
-	if ( $ref && $ref !== wp_unslash( $_SERVER['REQUEST_URI'] ) && $ref !== home_url() . wp_unslash( $_SERVER['REQUEST_URI'] ) ) {
-		return wp_validate_redirect( $ref, false );
+	if ($ref && $ref !== wp_unslash($_SERVER['REQUEST_URI']) && $ref !== home_url().wp_unslash($_SERVER['REQUEST_URI'])) {
+		return wp_validate_redirect($ref, false);
 	}
 
 	return false;
@@ -1543,10 +1543,10 @@ 
  * @return string|false Referer URL on success, false on failure.
  */
 function wp_get_raw_referer() {
-	if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
-		return wp_unslash( $_REQUEST['_wp_http_referer'] );
-	} else if ( ! empty( $_SERVER['HTTP_REFERER'] ) ) {
-		return wp_unslash( $_SERVER['HTTP_REFERER'] );
+	if ( ! empty($_REQUEST['_wp_http_referer'])) {
+		return wp_unslash($_REQUEST['_wp_http_referer']);
+	} else if ( ! empty($_SERVER['HTTP_REFERER'])) {
+		return wp_unslash($_SERVER['HTTP_REFERER']);
 	}
 
 	return false;
@@ -1560,8 +1560,8 @@ 
  * @return string|false False if no original referer or original referer if set.
  */
 function wp_get_original_referer() {
-	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) )
-		return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
+	if ( ! empty($_REQUEST['_wp_original_http_referer']) && function_exists('wp_validate_redirect'))
+		return wp_validate_redirect(wp_unslash($_REQUEST['_wp_original_http_referer']), false);
 	return false;
 }
 
@@ -1575,20 +1575,20 @@ 
  * @param string $target Full path to attempt to create.
  * @return bool Whether the path was created. True if path already exists.
  */
-function wp_mkdir_p( $target ) {
+function wp_mkdir_p($target) {
 	$wrapper = null;
 
 	// Strip the protocol.
-	if ( wp_is_stream( $target ) ) {
-		list( $wrapper, $target ) = explode( '://', $target, 2 );
+	if (wp_is_stream($target)) {
+		list($wrapper, $target) = explode('://', $target, 2);
 	}
 
 	// From php.net/mkdir user contributed notes.
-	$target = str_replace( '//', '/', $target );
+	$target = str_replace('//', '/', $target);
 
 	// Put the wrapper back on the target.
-	if ( $wrapper !== null ) {
-		$target = $wrapper . '://' . $target;
+	if ($wrapper !== null) {
+		$target = $wrapper.'://'.$target;
 	}
 
 	/*
@@ -1596,35 +1596,35 @@ 
 	 * Use rtrim() instead of untrailingslashit to avoid formatting.php dependency.
 	 */
 	$target = rtrim($target, '/');
-	if ( empty($target) )
+	if (empty($target))
 		$target = '/';
 
-	if ( file_exists( $target ) )
-		return @is_dir( $target );
+	if (file_exists($target))
+		return @is_dir($target);
 
 	// We need to find the permissions of the parent folder that exists and inherit that.
-	$target_parent = dirname( $target );
-	while ( '.' != $target_parent && ! is_dir( $target_parent ) ) {
-		$target_parent = dirname( $target_parent );
+	$target_parent = dirname($target);
+	while ('.' != $target_parent && ! is_dir($target_parent)) {
+		$target_parent = dirname($target_parent);
 	}
 
 	// Get the permission bits.
-	if ( $stat = @stat( $target_parent ) ) {
+	if ($stat = @stat($target_parent)) {
 		$dir_perms = $stat['mode'] & 0007777;
 	} else {
 		$dir_perms = 0777;
 	}
 
-	if ( @mkdir( $target, $dir_perms, true ) ) {
+	if (@mkdir($target, $dir_perms, true)) {
 
 		/*
 		 * If a umask is set that modifies $dir_perms, we'll have to re-set
 		 * the $dir_perms correctly with chmod()
 		 */
-		if ( $dir_perms != ( $dir_perms & ~umask() ) ) {
-			$folder_parts = explode( '/', substr( $target, strlen( $target_parent ) + 1 ) );
-			for ( $i = 1, $c = count( $folder_parts ); $i <= $c; $i++ ) {
-				@chmod( $target_parent . '/' . implode( '/', array_slice( $folder_parts, 0, $i ) ), $dir_perms );
+		if ($dir_perms != ($dir_perms & ~umask())) {
+			$folder_parts = explode('/', substr($target, strlen($target_parent) + 1));
+			for ($i = 1, $c = count($folder_parts); $i <= $c; $i++) {
+				@chmod($target_parent.'/'.implode('/', array_slice($folder_parts, 0, $i)), $dir_perms);
 			}
 		}
 
@@ -1644,23 +1644,23 @@ 
  * @param string $path File path.
  * @return bool True if path is absolute, false is not absolute.
  */
-function path_is_absolute( $path ) {
+function path_is_absolute($path) {
 	/*
 	 * This is definitive if true but fails if $path does not exist or contains
 	 * a symbolic link.
 	 */
-	if ( realpath($path) == $path )
+	if (realpath($path) == $path)
 		return true;
 
-	if ( strlen($path) == 0 || $path[0] == '.' )
+	if (strlen($path) == 0 || $path[0] == '.')
 		return false;
 
 	// Windows allows absolute paths like this.
-	if ( preg_match('#^[a-zA-Z]:\\\\#', $path) )
+	if (preg_match('#^[a-zA-Z]:\\\\#', $path))
 		return true;
 
 	// A path starting with / or \ is absolute; anything else is relative.
-	return ( $path[0] == '/' || $path[0] == '\\' );
+	return ($path[0] == '/' || $path[0] == '\\');
 }
 
 /**
@@ -1675,11 +1675,11 @@ 
  * @param string $path Path relative to $base.
  * @return string The path with the base or absolute path.
  */
-function path_join( $base, $path ) {
-	if ( path_is_absolute($path) )
+function path_join($base, $path) {
+	if (path_is_absolute($path))
 		return $path;
 
-	return rtrim($base, '/') . '/' . ltrim($path, '/');
+	return rtrim($base, '/').'/'.ltrim($path, '/');
 }
 
 /**
@@ -1697,11 +1697,11 @@ 
  * @param string $path Path to normalize.
  * @return string Normalized path.
  */
-function wp_normalize_path( $path ) {
-	$path = str_replace( '\\', '/', $path );
-	$path = preg_replace( '|(?<=.)/+|', '/', $path );
-	if ( ':' === substr( $path, 1, 1 ) ) {
-		$path = ucfirst( $path );
+function wp_normalize_path($path) {
+	$path = str_replace('\\', '/', $path);
+	$path = preg_replace('|(?<=.)/+|', '/', $path);
+	if (':' === substr($path, 1, 1)) {
+		$path = ucfirst($path);
 	}
 	return $path;
 }
@@ -1724,24 +1724,24 @@ 
  */
 function get_temp_dir() {
 	static $temp = '';
-	if ( defined('WP_TEMP_DIR') )
+	if (defined('WP_TEMP_DIR'))
 		return trailingslashit(WP_TEMP_DIR);
 
-	if ( $temp )
-		return trailingslashit( $temp );
+	if ($temp)
+		return trailingslashit($temp);
 
-	if ( function_exists('sys_get_temp_dir') ) {
+	if (function_exists('sys_get_temp_dir')) {
 		$temp = sys_get_temp_dir();
-		if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-			return trailingslashit( $temp );
+		if (@is_dir($temp) && wp_is_writable($temp))
+			return trailingslashit($temp);
 	}
 
 	$temp = ini_get('upload_tmp_dir');
-	if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-		return trailingslashit( $temp );
+	if (@is_dir($temp) && wp_is_writable($temp))
+		return trailingslashit($temp);
 
-	$temp = WP_CONTENT_DIR . '/';
-	if ( is_dir( $temp ) && wp_is_writable( $temp ) )
+	$temp = WP_CONTENT_DIR.'/';
+	if (is_dir($temp) && wp_is_writable($temp))
 		return $temp;
 
 	return '/tmp/';
@@ -1760,11 +1760,11 @@ 
  * @param string $path Path to check for write-ability.
  * @return bool Whether the path is writable.
  */
-function wp_is_writable( $path ) {
-	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) )
-		return win_is_writable( $path );
+function wp_is_writable($path) {
+	if ('WIN' === strtoupper(substr(PHP_OS, 0, 3)))
+		return win_is_writable($path);
 	else
-		return @is_writable( $path );
+		return @is_writable($path);
 }
 
 /**
@@ -1783,21 +1783,21 @@ 
  * @param string $path Windows path to check for write-ability.
  * @return bool Whether the path is writable.
  */
-function win_is_writable( $path ) {
+function win_is_writable($path) {
 
-	if ( $path[strlen( $path ) - 1] == '/' ) { // if it looks like a directory, check a random file within the directory
-		return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp');
-	} elseif ( is_dir( $path ) ) { // If it's a directory (and not a file) check a random file within the directory
-		return win_is_writable( $path . '/' . uniqid( mt_rand() ) . '.tmp' );
+	if ($path[strlen($path) - 1] == '/') { // if it looks like a directory, check a random file within the directory
+		return win_is_writable($path.uniqid(mt_rand()).'.tmp');
+	} elseif (is_dir($path)) { // If it's a directory (and not a file) check a random file within the directory
+		return win_is_writable($path.'/'.uniqid(mt_rand()).'.tmp');
 	}
 	// check tmp file for read/write capabilities
-	$should_delete_tmp_file = !file_exists( $path );
-	$f = @fopen( $path, 'a' );
-	if ( $f === false )
+	$should_delete_tmp_file = ! file_exists($path);
+	$f = @fopen($path, 'a');
+	if ($f === false)
 		return false;
-	fclose( $f );
-	if ( $should_delete_tmp_file )
-		unlink( $path );
+	fclose($f);
+	if ($should_delete_tmp_file)
+		unlink($path);
 	return true;
 }
 
@@ -1815,7 +1815,7 @@ 
  * @return array See wp_upload_dir() for description.
  */
 function wp_get_upload_dir() {
-	return wp_upload_dir( null, false );
+	return wp_upload_dir(null, false);
 }
 
 /**
@@ -1853,13 +1853,13 @@ 
  * @param bool   $refresh_cache Optional. Whether to refresh the cache. Default false.
  * @return array See above for description.
  */
-function wp_upload_dir( $time = null, $create_dir = true, $refresh_cache = false ) {
+function wp_upload_dir($time = null, $create_dir = true, $refresh_cache = false) {
 	static $cache = array();
 
-	$key = sprintf( '%d-%s', get_current_blog_id(), (string) $time );
+	$key = sprintf('%d-%s', get_current_blog_id(), (string) $time);
 
-	if ( $refresh_cache || empty( $cache[ $key ] ) ) {
-		$cache[ $key ] = _wp_upload_dir( $time );
+	if ($refresh_cache || empty($cache[$key])) {
+		$cache[$key] = _wp_upload_dir($time);
 	}
 
 	/**
@@ -1870,28 +1870,28 @@ 
 	 * @param array $uploads Array of upload directory data with keys of 'path',
 	 *                       'url', 'subdir, 'basedir', and 'error'.
 	 */
-	$uploads = apply_filters( 'upload_dir', $cache[ $key ] );
+	$uploads = apply_filters('upload_dir', $cache[$key]);
 
-	if ( $create_dir ) {
+	if ($create_dir) {
 		$path = $uploads['path'];
-		$tested_paths = wp_cache_get( 'upload_dir_tested_paths' );
+		$tested_paths = wp_cache_get('upload_dir_tested_paths');
 
-		if ( ! is_array( $tested_paths ) ) {
+		if ( ! is_array($tested_paths)) {
 			$tested_paths = array();
 		}
 
-		if ( ! in_array( $path, $tested_paths, true ) ) {
-			if ( ! wp_mkdir_p( $path ) ) {
-				if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
-					$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
+		if ( ! in_array($path, $tested_paths, true)) {
+			if ( ! wp_mkdir_p($path)) {
+				if (0 === strpos($uploads['basedir'], ABSPATH)) {
+					$error_path = str_replace(ABSPATH, '', $uploads['basedir']).$uploads['subdir'];
 				} else {
-					$error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+					$error_path = basename($uploads['basedir']).$uploads['subdir'];
 				}
 
-				$uploads['error'] = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), esc_html( $error_path ) );
+				$uploads['error'] = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), esc_html($error_path));
 			} else {
 				$tested_paths[] = $path;
-				wp_cache_set( 'upload_dir_tested_paths', $tested_paths );
+				wp_cache_set('upload_dir_tested_paths', $tested_paths);
 			}
 		}
 	}
@@ -1907,39 +1907,39 @@ 
  * @param string $time Optional. Time formatted in 'yyyy/mm'. Default null.
  * @return array See wp_upload_dir()
  */
-function _wp_upload_dir( $time = null ) {
-	$siteurl = get_option( 'siteurl' );
-	$upload_path = trim( get_option( 'upload_path' ) );
+function _wp_upload_dir($time = null) {
+	$siteurl = get_option('siteurl');
+	$upload_path = trim(get_option('upload_path'));
 
-	if ( empty( $upload_path ) || 'wp-content/uploads' == $upload_path ) {
-		$dir = WP_CONTENT_DIR . '/uploads';
-	} elseif ( 0 !== strpos( $upload_path, ABSPATH ) ) {
+	if (empty($upload_path) || 'wp-content/uploads' == $upload_path) {
+		$dir = WP_CONTENT_DIR.'/uploads';
+	} elseif (0 !== strpos($upload_path, ABSPATH)) {
 		// $dir is absolute, $upload_path is (maybe) relative to ABSPATH
-		$dir = path_join( ABSPATH, $upload_path );
+		$dir = path_join(ABSPATH, $upload_path);
 	} else {
 		$dir = $upload_path;
 	}
 
-	if ( !$url = get_option( 'upload_url_path' ) ) {
-		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
-			$url = WP_CONTENT_URL . '/uploads';
+	if ( ! $url = get_option('upload_url_path')) {
+		if (empty($upload_path) || ('wp-content/uploads' == $upload_path) || ($upload_path == $dir))
+			$url = WP_CONTENT_URL.'/uploads';
 		else
-			$url = trailingslashit( $siteurl ) . $upload_path;
+			$url = trailingslashit($siteurl).$upload_path;
 	}
 
 	/*
 	 * Honor the value of UPLOADS. This happens as long as ms-files rewriting is disabled.
 	 * We also sometimes obey UPLOADS when rewriting is enabled -- see the next block.
 	 */
-	if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) ) {
-		$dir = ABSPATH . UPLOADS;
-		$url = trailingslashit( $siteurl ) . UPLOADS;
+	if (defined('UPLOADS') && ! (is_multisite() && get_site_option('ms_files_rewriting'))) {
+		$dir = ABSPATH.UPLOADS;
+		$url = trailingslashit($siteurl).UPLOADS;
 	}
 
 	// If multisite (and if not the main site in a post-MU network)
-	if ( is_multisite() && ! ( is_main_network() && is_main_site() && defined( 'MULTISITE' ) ) ) {
+	if (is_multisite() && ! (is_main_network() && is_main_site() && defined('MULTISITE'))) {
 
-		if ( ! get_site_option( 'ms_files_rewriting' ) ) {
+		if ( ! get_site_option('ms_files_rewriting')) {
 			/*
 			 * If ms-files rewriting is disabled (networks created post-3.5), it is fairly
 			 * straightforward: Append sites/%d if we're not on the main site (for post-MU
@@ -1949,15 +1949,15 @@ 
 			 * had wp-content/uploads for the main site.)
 			 */
 
-			if ( defined( 'MULTISITE' ) )
-				$ms_dir = '/sites/' . get_current_blog_id();
+			if (defined('MULTISITE'))
+				$ms_dir = '/sites/'.get_current_blog_id();
 			else
-				$ms_dir = '/' . get_current_blog_id();
+				$ms_dir = '/'.get_current_blog_id();
 
 			$dir .= $ms_dir;
 			$url .= $ms_dir;
 
-		} elseif ( defined( 'UPLOADS' ) && ! ms_is_switched() ) {
+		} elseif (defined('UPLOADS') && ! ms_is_switched()) {
 			/*
 			 * Handle the old-form ms-files.php rewriting if the network still has that enabled.
 			 * When ms-files rewriting is enabled, then we only listen to UPLOADS when:
@@ -1972,11 +1972,11 @@ 
 			 * rewriting in multisite, the resulting URL is /files. (#WP22702 for background.)
 			 */
 
-			if ( defined( 'BLOGUPLOADDIR' ) )
-				$dir = untrailingslashit( BLOGUPLOADDIR );
+			if (defined('BLOGUPLOADDIR'))
+				$dir = untrailingslashit(BLOGUPLOADDIR);
 			else
-				$dir = ABSPATH . UPLOADS;
-			$url = trailingslashit( $siteurl ) . 'files';
+				$dir = ABSPATH.UPLOADS;
+			$url = trailingslashit($siteurl).'files';
 		}
 	}
 
@@ -1984,12 +1984,12 @@ 
 	$baseurl = $url;
 
 	$subdir = '';
-	if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
+	if (get_option('uploads_use_yearmonth_folders')) {
 		// Generate the yearly and monthly dirs
-		if ( !$time )
-			$time = current_time( 'mysql' );
-		$y = substr( $time, 0, 4 );
-		$m = substr( $time, 5, 2 );
+		if ( ! $time)
+			$time = current_time('mysql');
+		$y = substr($time, 0, 4);
+		$m = substr($time, 5, 2);
 		$subdir = "/$y/$m";
 	}
 
@@ -2023,38 +2023,38 @@ 
  * @param callable $unique_filename_callback Callback. Default null.
  * @return string New filename, if given wasn't unique.
  */
-function wp_unique_filename( $dir, $filename, $unique_filename_callback = null ) {
+function wp_unique_filename($dir, $filename, $unique_filename_callback = null) {
 	// Sanitize the file name before we begin processing.
 	$filename = sanitize_file_name($filename);
 
 	// Separate the filename into a name and extension.
 	$info = pathinfo($filename);
-	$ext = !empty($info['extension']) ? '.' . $info['extension'] : '';
+	$ext = ! empty($info['extension']) ? '.'.$info['extension'] : '';
 	$name = basename($filename, $ext);
 
 	// Edge case: if file is named '.ext', treat as an empty name.
-	if ( $name === $ext )
+	if ($name === $ext)
 		$name = '';
 
 	/*
 	 * Increment the file number until we have a unique file to save in $dir.
 	 * Use callback if supplied.
 	 */
-	if ( $unique_filename_callback && is_callable( $unique_filename_callback ) ) {
-		$filename = call_user_func( $unique_filename_callback, $dir, $name, $ext );
+	if ($unique_filename_callback && is_callable($unique_filename_callback)) {
+		$filename = call_user_func($unique_filename_callback, $dir, $name, $ext);
 	} else {
 		$number = '';
 
 		// Change '.ext' to lower case.
-		if ( $ext && strtolower($ext) != $ext ) {
+		if ($ext && strtolower($ext) != $ext) {
 			$ext2 = strtolower($ext);
-			$filename2 = preg_replace( '|' . preg_quote($ext) . '$|', $ext2, $filename );
+			$filename2 = preg_replace('|'.preg_quote($ext).'$|', $ext2, $filename);
 
 			// Check for both lower and upper case extension or image sub-sizes may be overwritten.
-			while ( file_exists($dir . "/$filename") || file_exists($dir . "/$filename2") ) {
+			while (file_exists($dir."/$filename") || file_exists($dir."/$filename2")) {
 				$new_number = $number + 1;
-				$filename = str_replace( array( "-$number$ext", "$number$ext" ), "-$new_number$ext", $filename );
-				$filename2 = str_replace( array( "-$number$ext2", "$number$ext2" ), "-$new_number$ext2", $filename2 );
+				$filename = str_replace(array("-$number$ext", "$number$ext"), "-$new_number$ext", $filename);
+				$filename2 = str_replace(array("-$number$ext2", "$number$ext2"), "-$new_number$ext2", $filename2);
 				$number = $new_number;
 			}
 
@@ -2068,20 +2068,20 @@ 
 			 * @param string        $dir                      Directory path.
 			 * @param callable|null $unique_filename_callback Callback function that generates the unique file name.
 			 */
-			return apply_filters( 'wp_unique_filename', $filename2, $ext, $dir, $unique_filename_callback );
+			return apply_filters('wp_unique_filename', $filename2, $ext, $dir, $unique_filename_callback);
 		}
 
-		while ( file_exists( $dir . "/$filename" ) ) {
-			if ( '' == "$number$ext" ) {
-				$filename = "$filename-" . ++$number;
+		while (file_exists($dir."/$filename")) {
+			if ('' == "$number$ext") {
+				$filename = "$filename-".++$number;
 			} else {
-				$filename = str_replace( array( "-$number$ext", "$number$ext" ), "-" . ++$number . $ext, $filename );
+				$filename = str_replace(array("-$number$ext", "$number$ext"), "-".++$number.$ext, $filename);
 			}
 		}
 	}
 
 	/** This filter is documented in wp-includes/functions.php */
-	return apply_filters( 'wp_unique_filename', $filename, $ext, $dir, $unique_filename_callback );
+	return apply_filters('wp_unique_filename', $filename, $ext, $dir, $unique_filename_callback);
 }
 
 /**
@@ -2107,20 +2107,20 @@ 
  * @param string       $time       Optional. Time formatted in 'yyyy/mm'. Default null.
  * @return array
  */
-function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.0' );
+function wp_upload_bits($name, $deprecated, $bits, $time = null) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.0');
 
-	if ( empty( $name ) )
-		return array( 'error' => __( 'Empty filename' ) );
+	if (empty($name))
+		return array('error' => __('Empty filename'));
 
-	$wp_filetype = wp_check_filetype( $name );
-	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) )
-		return array( 'error' => __( 'Invalid file type' ) );
+	$wp_filetype = wp_check_filetype($name);
+	if ( ! $wp_filetype['ext'] && ! current_user_can('unfiltered_upload'))
+		return array('error' => __('Invalid file type'));
 
-	$upload = wp_upload_dir( $time );
+	$upload = wp_upload_dir($time);
 
-	if ( $upload['error'] !== false )
+	if ($upload['error'] !== false)
 		return $upload;
 
 	/**
@@ -2133,45 +2133,45 @@ 
 	 *
 	 * @param mixed $upload_bits_error An array of upload bits data, or a non-array error to return.
 	 */
-	$upload_bits_error = apply_filters( 'wp_upload_bits', array( 'name' => $name, 'bits' => $bits, 'time' => $time ) );
-	if ( !is_array( $upload_bits_error ) ) {
-		$upload[ 'error' ] = $upload_bits_error;
+	$upload_bits_error = apply_filters('wp_upload_bits', array('name' => $name, 'bits' => $bits, 'time' => $time));
+	if ( ! is_array($upload_bits_error)) {
+		$upload['error'] = $upload_bits_error;
 		return $upload;
 	}
 
-	$filename = wp_unique_filename( $upload['path'], $name );
+	$filename = wp_unique_filename($upload['path'], $name);
 
-	$new_file = $upload['path'] . "/$filename";
-	if ( ! wp_mkdir_p( dirname( $new_file ) ) ) {
-		if ( 0 === strpos( $upload['basedir'], ABSPATH ) )
-			$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
+	$new_file = $upload['path']."/$filename";
+	if ( ! wp_mkdir_p(dirname($new_file))) {
+		if (0 === strpos($upload['basedir'], ABSPATH))
+			$error_path = str_replace(ABSPATH, '', $upload['basedir']).$upload['subdir'];
 		else
-			$error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+			$error_path = basename($upload['basedir']).$upload['subdir'];
 
-		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
-		return array( 'error' => $message );
+		$message = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), $error_path);
+		return array('error' => $message);
 	}
 
-	$ifp = @ fopen( $new_file, 'wb' );
-	if ( ! $ifp )
-		return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
+	$ifp = @ fopen($new_file, 'wb');
+	if ( ! $ifp)
+		return array('error' => sprintf(__('Could not write file %s'), $new_file));
 
-	@fwrite( $ifp, $bits );
-	fclose( $ifp );
+	@fwrite($ifp, $bits);
+	fclose($ifp);
 	clearstatcache();
 
 	// Set correct file permissions
-	$stat = @ stat( dirname( $new_file ) );
+	$stat = @ stat(dirname($new_file));
 	$perms = $stat['mode'] & 0007777;
 	$perms = $perms & 0000666;
-	@ chmod( $new_file, $perms );
+	@ chmod($new_file, $perms);
 	clearstatcache();
 
 	// Compute the URL
-	$url = $upload['url'] . "/$filename";
+	$url = $upload['url']."/$filename";
 
 	/** This filter is documented in wp-admin/includes/file.php */
-	return apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $wp_filetype['type'], 'error' => false ), 'sideload' );
+	return apply_filters('wp_handle_upload', array('file' => $new_file, 'url' => $url, 'type' => $wp_filetype['type'], 'error' => false), 'sideload');
 }
 
 /**
@@ -2182,8 +2182,8 @@ 
  * @param string $ext The extension to search.
  * @return string|void The file type, example: audio, video, document, spreadsheet, etc.
  */
-function wp_ext2type( $ext ) {
-	$ext = strtolower( $ext );
+function wp_ext2type($ext) {
+	$ext = strtolower($ext);
 
 	/**
 	 * Filter file type based on the extension name.
@@ -2195,20 +2195,20 @@ 
 	 * @param array $ext2type Multi-dimensional array with extensions for a default set
 	 *                        of file types.
 	 */
-	$ext2type = apply_filters( 'ext2type', array(
-		'image'       => array( 'jpg', 'jpeg', 'jpe',  'gif',  'png',  'bmp',   'tif',  'tiff', 'ico' ),
-		'audio'       => array( 'aac', 'ac3',  'aif',  'aiff', 'm3a',  'm4a',   'm4b',  'mka',  'mp1',  'mp2',  'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
-		'video'       => array( '3g2',  '3gp', '3gpp', 'asf', 'avi',  'divx', 'dv',   'flv',  'm4v',   'mkv',  'mov',  'mp4',  'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt',  'rm', 'vob', 'wmv' ),
-		'document'    => array( 'doc', 'docx', 'docm', 'dotm', 'odt',  'pages', 'pdf',  'xps',  'oxps', 'rtf',  'wp', 'wpd', 'psd', 'xcf' ),
-		'spreadsheet' => array( 'numbers',     'ods',  'xls',  'xlsx', 'xlsm',  'xlsb' ),
-		'interactive' => array( 'swf', 'key',  'ppt',  'pptx', 'pptm', 'pps',   'ppsx', 'ppsm', 'sldx', 'sldm', 'odp' ),
-		'text'        => array( 'asc', 'csv',  'tsv',  'txt' ),
-		'archive'     => array( 'bz2', 'cab',  'dmg',  'gz',   'rar',  'sea',   'sit',  'sqx',  'tar',  'tgz',  'zip', '7z' ),
-		'code'        => array( 'css', 'htm',  'html', 'php',  'js' ),
-	) );
-
-	foreach ( $ext2type as $type => $exts )
-		if ( in_array( $ext, $exts ) )
+	$ext2type = apply_filters('ext2type', array(
+		'image'       => array('jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico'),
+		'audio'       => array('aac', 'ac3', 'aif', 'aiff', 'm3a', 'm4a', 'm4b', 'mka', 'mp1', 'mp2', 'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma'),
+		'video'       => array('3g2', '3gp', '3gpp', 'asf', 'avi', 'divx', 'dv', 'flv', 'm4v', 'mkv', 'mov', 'mp4', 'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt', 'rm', 'vob', 'wmv'),
+		'document'    => array('doc', 'docx', 'docm', 'dotm', 'odt', 'pages', 'pdf', 'xps', 'oxps', 'rtf', 'wp', 'wpd', 'psd', 'xcf'),
+		'spreadsheet' => array('numbers', 'ods', 'xls', 'xlsx', 'xlsm', 'xlsb'),
+		'interactive' => array('swf', 'key', 'ppt', 'pptx', 'pptm', 'pps', 'ppsx', 'ppsm', 'sldx', 'sldm', 'odp'),
+		'text'        => array('asc', 'csv', 'tsv', 'txt'),
+		'archive'     => array('bz2', 'cab', 'dmg', 'gz', 'rar', 'sea', 'sit', 'sqx', 'tar', 'tgz', 'zip', '7z'),
+		'code'        => array('css', 'htm', 'html', 'php', 'js'),
+	));
+
+	foreach ($ext2type as $type => $exts)
+		if (in_array($ext, $exts))
 			return $type;
 }
 
@@ -2223,22 +2223,22 @@ 
  * @param array  $mimes    Optional. Key is the file extension with value as the mime type.
  * @return array Values with extension first and mime type.
  */
-function wp_check_filetype( $filename, $mimes = null ) {
-	if ( empty($mimes) )
+function wp_check_filetype($filename, $mimes = null) {
+	if (empty($mimes))
 		$mimes = get_allowed_mime_types();
 	$type = false;
 	$ext = false;
 
-	foreach ( $mimes as $ext_preg => $mime_match ) {
-		$ext_preg = '!\.(' . $ext_preg . ')$!i';
-		if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {
+	foreach ($mimes as $ext_preg => $mime_match) {
+		$ext_preg = '!\.('.$ext_preg.')$!i';
+		if (preg_match($ext_preg, $filename, $ext_matches)) {
 			$type = $mime_match;
 			$ext = $ext_matches[1];
 			break;
 		}
 	}
 
-	return compact( 'ext', 'type' );
+	return compact('ext', 'type');
 }
 
 /**
@@ -2260,27 +2260,27 @@ 
  * @return array Values for the extension, MIME, and either a corrected filename or false
  *               if original $filename is valid.
  */
-function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
+function wp_check_filetype_and_ext($file, $filename, $mimes = null) {
 	$proper_filename = false;
 
 	// Do basic extension validation and MIME mapping
-	$wp_filetype = wp_check_filetype( $filename, $mimes );
+	$wp_filetype = wp_check_filetype($filename, $mimes);
 	$ext = $wp_filetype['ext'];
 	$type = $wp_filetype['type'];
 
 	// We can't do any further validation without a file to work with
-	if ( ! file_exists( $file ) ) {
-		return compact( 'ext', 'type', 'proper_filename' );
+	if ( ! file_exists($file)) {
+		return compact('ext', 'type', 'proper_filename');
 	}
 
 	// We're able to validate images using GD
-	if ( $type && 0 === strpos( $type, 'image/' ) && function_exists('getimagesize') ) {
+	if ($type && 0 === strpos($type, 'image/') && function_exists('getimagesize')) {
 
 		// Attempt to figure out what type of image it actually is
-		$imgstats = @getimagesize( $file );
+		$imgstats = @getimagesize($file);
 
 		// If getimagesize() knows what kind of image it really is and if the real MIME doesn't match the claimed MIME
-		if ( !empty($imgstats['mime']) && $imgstats['mime'] != $type ) {
+		if ( ! empty($imgstats['mime']) && $imgstats['mime'] != $type) {
 			/**
 			 * Filter the list mapping image mime types to their respective extensions.
 			 *
@@ -2288,26 +2288,26 @@ 
 			 *
 			 * @param  array $mime_to_ext Array of image mime types and their matching extensions.
 			 */
-			$mime_to_ext = apply_filters( 'getimagesize_mimes_to_exts', array(
+			$mime_to_ext = apply_filters('getimagesize_mimes_to_exts', array(
 				'image/jpeg' => 'jpg',
 				'image/png'  => 'png',
 				'image/gif'  => 'gif',
 				'image/bmp'  => 'bmp',
 				'image/tiff' => 'tif',
-			) );
+			));
 
 			// Replace whatever is after the last period in the filename with the correct extension
-			if ( ! empty( $mime_to_ext[ $imgstats['mime'] ] ) ) {
-				$filename_parts = explode( '.', $filename );
-				array_pop( $filename_parts );
-				$filename_parts[] = $mime_to_ext[ $imgstats['mime'] ];
-				$new_filename = implode( '.', $filename_parts );
+			if ( ! empty($mime_to_ext[$imgstats['mime']])) {
+				$filename_parts = explode('.', $filename);
+				array_pop($filename_parts);
+				$filename_parts[] = $mime_to_ext[$imgstats['mime']];
+				$new_filename = implode('.', $filename_parts);
 
-				if ( $new_filename != $filename ) {
+				if ($new_filename != $filename) {
 					$proper_filename = $new_filename; // Mark that it changed
 				}
 				// Redefine the extension / MIME
-				$wp_filetype = wp_check_filetype( $new_filename, $mimes );
+				$wp_filetype = wp_check_filetype($new_filename, $mimes);
 				$ext = $wp_filetype['ext'];
 				$type = $wp_filetype['type'];
 			}
@@ -2326,7 +2326,7 @@ 
 	 *                                          $file being in a tmp directory).
 	 * @param array  $mimes                     Key is the file extension with value as the mime type.
 	 */
-	return apply_filters( 'wp_check_filetype_and_ext', compact( 'ext', 'type', 'proper_filename' ), $file, $filename, $mimes );
+	return apply_filters('wp_check_filetype_and_ext', compact('ext', 'type', 'proper_filename'), $file, $filename, $mimes);
 }
 
 /**
@@ -2349,7 +2349,7 @@ 
 	 * @param array $wp_get_mime_types Mime types keyed by the file extension regex
 	 *                                 corresponding to those types.
 	 */
-	return apply_filters( 'mime_types', array(
+	return apply_filters('mime_types', array(
 	// Image formats.
 	'jpg|jpeg|jpe' => 'image/jpeg',
 	'gif' => 'image/gif',
@@ -2449,7 +2449,7 @@ 
 	'key' => 'application/vnd.apple.keynote',
 	'numbers' => 'application/vnd.apple.numbers',
 	'pages' => 'application/vnd.apple.pages',
-	) );
+	));
 }
 /**
  * Retrieve list of allowed mime types and file extensions.
@@ -2460,15 +2460,15 @@ 
  * @return array Array of mime types keyed by the file extension regex corresponding
  *               to those types.
  */
-function get_allowed_mime_types( $user = null ) {
+function get_allowed_mime_types($user = null) {
 	$t = wp_get_mime_types();
 
-	unset( $t['swf'], $t['exe'] );
-	if ( function_exists( 'current_user_can' ) )
-		$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );
+	unset($t['swf'], $t['exe']);
+	if (function_exists('current_user_can'))
+		$unfiltered = $user ? user_can($user, 'unfiltered_html') : current_user_can('unfiltered_html');
 
-	if ( empty( $unfiltered ) )
-		unset( $t['htm|html'] );
+	if (empty($unfiltered))
+		unset($t['htm|html']);
 
 	/**
 	 * Filter list of allowed mime types and file extensions.
@@ -2480,7 +2480,7 @@ 
 	 *                               removed depending on '$user' capabilities.
 	 * @param int|WP_User|null $user User ID, User object or null if not provided (indicates current user).
 	 */
-	return apply_filters( 'upload_mimes', $t, $user );
+	return apply_filters('upload_mimes', $t, $user);
 }
 
 /**
@@ -2493,18 +2493,18 @@ 
  *
  * @param string $action The nonce action.
  */
-function wp_nonce_ays( $action ) {
-	if ( 'log-out' == $action ) {
-		$html = sprintf( __( 'You are attempting to log out of %s' ), get_bloginfo( 'name' ) ) . '</p><p>';
-		$redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
-		$html .= sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url( $redirect_to ) );
+function wp_nonce_ays($action) {
+	if ('log-out' == $action) {
+		$html = sprintf(__('You are attempting to log out of %s'), get_bloginfo('name')).'</p><p>';
+		$redirect_to = isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '';
+		$html .= sprintf(__("Do you really want to <a href='%s'>log out</a>?"), wp_logout_url($redirect_to));
 	} else {
-		$html = __( 'Are you sure you want to do this?' );
-		if ( wp_get_referer() )
-			$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+		$html = __('Are you sure you want to do this?');
+		if (wp_get_referer())
+			$html .= "</p><p><a href='".esc_url(remove_query_arg('updated', wp_get_referer()))."'>".__('Please try again.')."</a>";
 	}
 
-	wp_die( $html, __( 'WordPress Failure Notice' ), 403 );
+	wp_die($html, __('WordPress Failure Notice'), 403);
 }
 
 /**
@@ -2540,16 +2540,16 @@ 
  *                                  Default is the value of {@see is_rtl()}.
  * }
  */
-function wp_die( $message = '', $title = '', $args = array() ) {
+function wp_die($message = '', $title = '', $args = array()) {
 
-	if ( is_int( $args ) ) {
-		$args = array( 'response' => $args );
-	} elseif ( is_int( $title ) ) {
-		$args  = array( 'response' => $title );
+	if (is_int($args)) {
+		$args = array('response' => $args);
+	} elseif (is_int($title)) {
+		$args  = array('response' => $title);
 		$title = '';
 	}
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+	if (defined('DOING_AJAX') && DOING_AJAX) {
 		/**
 		 * Filter callback for killing WordPress execution for AJAX requests.
 		 *
@@ -2557,8 +2557,8 @@ 
 		 *
 		 * @param callable $function Callback function name.
 		 */
-		$function = apply_filters( 'wp_die_ajax_handler', '_ajax_wp_die_handler' );
-	} elseif ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST ) {
+		$function = apply_filters('wp_die_ajax_handler', '_ajax_wp_die_handler');
+	} elseif (defined('XMLRPC_REQUEST') && XMLRPC_REQUEST) {
 		/**
 		 * Filter callback for killing WordPress execution for XML-RPC requests.
 		 *
@@ -2566,7 +2566,7 @@ 
 		 *
 		 * @param callable $function Callback function name.
 		 */
-		$function = apply_filters( 'wp_die_xmlrpc_handler', '_xmlrpc_wp_die_handler' );
+		$function = apply_filters('wp_die_xmlrpc_handler', '_xmlrpc_wp_die_handler');
 	} else {
 		/**
 		 * Filter callback for killing WordPress execution for all non-AJAX, non-XML-RPC requests.
@@ -2575,10 +2575,10 @@ 
 		 *
 		 * @param callable $function Callback function name.
 		 */
-		$function = apply_filters( 'wp_die_handler', '_default_wp_die_handler' );
+		$function = apply_filters('wp_die_handler', '_default_wp_die_handler');
 	}
 
-	call_user_func( $function, $message, $title, $args );
+	call_user_func($function, $message, $title, $args);
 }
 
 /**
@@ -2594,20 +2594,20 @@ 
  * @param string       $title   Optional. Error title. Default empty.
  * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
-function _default_wp_die_handler( $message, $title = '', $args = array() ) {
-	$defaults = array( 'response' => 500 );
+function _default_wp_die_handler($message, $title = '', $args = array()) {
+	$defaults = array('response' => 500);
 	$r = wp_parse_args($args, $defaults);
 
 	$have_gettext = function_exists('__');
 
-	if ( function_exists( 'is_wp_error' ) && is_wp_error( $message ) ) {
-		if ( empty( $title ) ) {
+	if (function_exists('is_wp_error') && is_wp_error($message)) {
+		if (empty($title)) {
 			$error_data = $message->get_error_data();
-			if ( is_array( $error_data ) && isset( $error_data['title'] ) )
+			if (is_array($error_data) && isset($error_data['title']))
 				$title = $error_data['title'];
 		}
 		$errors = $message->get_error_messages();
-		switch ( count( $errors ) ) {
+		switch (count($errors)) {
 		case 0 :
 			$message = '';
 			break;
@@ -2615,38 +2615,38 @@ 
 			$message = "<p>{$errors[0]}</p>";
 			break;
 		default :
-			$message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
+			$message = "<ul>\n\t\t<li>".join("</li>\n\t\t<li>", $errors)."</li>\n\t</ul>";
 			break;
 		}
-	} elseif ( is_string( $message ) ) {
+	} elseif (is_string($message)) {
 		$message = "<p>$message</p>";
 	}
 
-	if ( isset( $r['back_link'] ) && $r['back_link'] ) {
-		$back_text = $have_gettext? __('&laquo; Back') : '&laquo; Back';
+	if (isset($r['back_link']) && $r['back_link']) {
+		$back_text = $have_gettext ? __('&laquo; Back') : '&laquo; Back';
 		$message .= "\n<p><a href='javascript:history.back()'>$back_text</a></p>";
 	}
 
-	if ( ! did_action( 'admin_head' ) ) :
-		if ( !headers_sent() ) {
-			status_header( $r['response'] );
+	if ( ! did_action('admin_head')) :
+		if ( ! headers_sent()) {
+			status_header($r['response']);
 			nocache_headers();
-			header( 'Content-Type: text/html; charset=utf-8' );
+			header('Content-Type: text/html; charset=utf-8');
 		}
 
-		if ( empty($title) )
+		if (empty($title))
 			$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
 
 		$text_direction = 'ltr';
-		if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
+		if (isset($r['text_direction']) && 'rtl' == $r['text_direction'])
 			$text_direction = 'rtl';
-		elseif ( function_exists( 'is_rtl' ) && is_rtl() )
+		elseif (function_exists('is_rtl') && is_rtl())
 			$text_direction = 'rtl';
 ?>
 <!DOCTYPE html>
 <!-- Ticket #11289, IE bug fix: always pad the error page with enough characters such that it is greater than 512 bytes, even after gzip compression abcdefghijklmnopqrstuvwxyz1234567890aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz11223344556677889900abacbcbdcdcededfefegfgfhghgihihjijikjkjlklkmlmlnmnmononpopoqpqprqrqsrsrtstsubcbcdcdedefefgfabcadefbghicjkldmnoepqrfstugvwxhyz1i234j567k890laabmbccnddeoeffpgghqhiirjjksklltmmnunoovppqwqrrxsstytuuzvvw0wxx1yyz2z113223434455666777889890091abc2def3ghi4jkl5mno6pqr7stu8vwx9yz11aab2bcc3dd4ee5ff6gg7hh8ii9j0jk1kl2lmm3nnoo4p5pq6qrr7ss8tt9uuvv0wwx1x2yyzz13aba4cbcb5dcdc6dedfef8egf9gfh0ghg1ihi2hji3jik4jkj5lkl6kml7mln8mnm9ono
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) language_attributes(); else echo "dir='$text_direction'"; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml" <?php if (function_exists('language_attributes') && function_exists('is_rtl')) language_attributes(); else echo "dir='$text_direction'"; ?>>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width">
@@ -2762,7 +2762,7 @@ 
 		}
 
 		<?php
-		if ( 'rtl' == $text_direction ) {
+		if ('rtl' == $text_direction) {
 			echo 'body { font-family: Tahoma, Arial; }';
 		}
 		?>
@@ -2791,15 +2791,15 @@ 
  * @param string       $title   Optional. Error title. Default empty.
  * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
-function _xmlrpc_wp_die_handler( $message, $title = '', $args = array() ) {
+function _xmlrpc_wp_die_handler($message, $title = '', $args = array()) {
 	global $wp_xmlrpc_server;
-	$defaults = array( 'response' => 500 );
+	$defaults = array('response' => 500);
 
 	$r = wp_parse_args($args, $defaults);
 
-	if ( $wp_xmlrpc_server ) {
-		$error = new IXR_Error( $r['response'] , $message);
-		$wp_xmlrpc_server->output( $error->getXml() );
+	if ($wp_xmlrpc_server) {
+		$error = new IXR_Error($r['response'], $message);
+		$wp_xmlrpc_server->output($error->getXml());
 	}
 	die();
 }
@@ -2814,10 +2814,10 @@ 
  *
  * @param string $message Optional. Response to print. Default empty.
  */
-function _ajax_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
-	die( '0' );
+function _ajax_wp_die_handler($message = '') {
+	if (is_scalar($message))
+		die((string) $message);
+	die('0');
 }
 
 /**
@@ -2830,9 +2830,9 @@ 
  *
  * @param string $message Optional. Response to print. Default empty.
  */
-function _scalar_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
+function _scalar_wp_die_handler($message = '') {
+	if (is_scalar($message))
+		die((string) $message);
 	die();
 }
 
@@ -2847,39 +2847,39 @@ 
  *                       greater than 0. Default 512.
  * @return string|false The JSON encoded string, or false if it cannot be encoded.
  */
-function wp_json_encode( $data, $options = 0, $depth = 512 ) {
+function wp_json_encode($data, $options = 0, $depth = 512) {
 	/*
 	 * json_encode() has had extra params added over the years.
 	 * $options was added in 5.3, and $depth in 5.5.
 	 * We need to make sure we call it with the correct arguments.
 	 */
-	if ( version_compare( PHP_VERSION, '5.5', '>=' ) ) {
-		$args = array( $data, $options, $depth );
-	} elseif ( version_compare( PHP_VERSION, '5.3', '>=' ) ) {
-		$args = array( $data, $options );
+	if (version_compare(PHP_VERSION, '5.5', '>=')) {
+		$args = array($data, $options, $depth);
+	} elseif (version_compare(PHP_VERSION, '5.3', '>=')) {
+		$args = array($data, $options);
 	} else {
-		$args = array( $data );
+		$args = array($data);
 	}
 
 	// Prepare the data for JSON serialization.
-	$data = _wp_json_prepare_data( $data );
+	$data = _wp_json_prepare_data($data);
 
-	$json = @call_user_func_array( 'json_encode', $args );
+	$json = @call_user_func_array('json_encode', $args);
 
 	// If json_encode() was successful, no need to do more sanity checking.
 	// ... unless we're in an old version of PHP, and json_encode() returned
 	// a string containing 'null'. Then we need to do more sanity checking.
-	if ( false !== $json && ( version_compare( PHP_VERSION, '5.5', '>=' ) || false === strpos( $json, 'null' ) ) )  {
+	if (false !== $json && (version_compare(PHP_VERSION, '5.5', '>=') || false === strpos($json, 'null'))) {
 		return $json;
 	}
 
 	try {
-		$args[0] = _wp_json_sanity_check( $data, $depth );
-	} catch ( Exception $e ) {
+		$args[0] = _wp_json_sanity_check($data, $depth);
+	} catch (Exception $e) {
 		return false;
 	}
 
-	return call_user_func_array( 'json_encode', $args );
+	return call_user_func_array('json_encode', $args);
 }
 
 /**
@@ -2895,49 +2895,49 @@ 
  * @param int   $depth Maximum depth to walk through $data. Must be greater than 0.
  * @return mixed The sanitized data that shall be encoded to JSON.
  */
-function _wp_json_sanity_check( $data, $depth ) {
-	if ( $depth < 0 ) {
-		throw new Exception( 'Reached depth limit' );
+function _wp_json_sanity_check($data, $depth) {
+	if ($depth < 0) {
+		throw new Exception('Reached depth limit');
 	}
 
-	if ( is_array( $data ) ) {
+	if (is_array($data)) {
 		$output = array();
-		foreach ( $data as $id => $el ) {
+		foreach ($data as $id => $el) {
 			// Don't forget to sanitize the ID!
-			if ( is_string( $id ) ) {
-				$clean_id = _wp_json_convert_string( $id );
+			if (is_string($id)) {
+				$clean_id = _wp_json_convert_string($id);
 			} else {
 				$clean_id = $id;
 			}
 
 			// Check the element type, so that we're only recursing if we really have to.
-			if ( is_array( $el ) || is_object( $el ) ) {
-				$output[ $clean_id ] = _wp_json_sanity_check( $el, $depth - 1 );
-			} elseif ( is_string( $el ) ) {
-				$output[ $clean_id ] = _wp_json_convert_string( $el );
+			if (is_array($el) || is_object($el)) {
+				$output[$clean_id] = _wp_json_sanity_check($el, $depth - 1);
+			} elseif (is_string($el)) {
+				$output[$clean_id] = _wp_json_convert_string($el);
 			} else {
-				$output[ $clean_id ] = $el;
+				$output[$clean_id] = $el;
 			}
 		}
-	} elseif ( is_object( $data ) ) {
+	} elseif (is_object($data)) {
 		$output = new stdClass;
-		foreach ( $data as $id => $el ) {
-			if ( is_string( $id ) ) {
-				$clean_id = _wp_json_convert_string( $id );
+		foreach ($data as $id => $el) {
+			if (is_string($id)) {
+				$clean_id = _wp_json_convert_string($id);
 			} else {
 				$clean_id = $id;
 			}
 
-			if ( is_array( $el ) || is_object( $el ) ) {
-				$output->$clean_id = _wp_json_sanity_check( $el, $depth - 1 );
-			} elseif ( is_string( $el ) ) {
-				$output->$clean_id = _wp_json_convert_string( $el );
+			if (is_array($el) || is_object($el)) {
+				$output->$clean_id = _wp_json_sanity_check($el, $depth - 1);
+			} elseif (is_string($el)) {
+				$output->$clean_id = _wp_json_convert_string($el);
 			} else {
 				$output->$clean_id = $el;
 			}
 		}
-	} elseif ( is_string( $data ) ) {
-		return _wp_json_convert_string( $data );
+	} elseif (is_string($data)) {
+		return _wp_json_convert_string($data);
 	} else {
 		return $data;
 	}
@@ -2959,21 +2959,21 @@ 
  * @param string $string The string which is to be converted.
  * @return string The checked string.
  */
-function _wp_json_convert_string( $string ) {
+function _wp_json_convert_string($string) {
 	static $use_mb = null;
-	if ( is_null( $use_mb ) ) {
-		$use_mb = function_exists( 'mb_convert_encoding' );
+	if (is_null($use_mb)) {
+		$use_mb = function_exists('mb_convert_encoding');
 	}
 
-	if ( $use_mb ) {
-		$encoding = mb_detect_encoding( $string, mb_detect_order(), true );
-		if ( $encoding ) {
-			return mb_convert_encoding( $string, 'UTF-8', $encoding );
+	if ($use_mb) {
+		$encoding = mb_detect_encoding($string, mb_detect_order(), true);
+		if ($encoding) {
+			return mb_convert_encoding($string, 'UTF-8', $encoding);
 		} else {
-			return mb_convert_encoding( $string, 'UTF-8', 'UTF-8' );
+			return mb_convert_encoding($string, 'UTF-8', 'UTF-8');
 		}
 	} else {
-		return wp_check_invalid_utf8( $string, true );
+		return wp_check_invalid_utf8($string, true);
 	}
 }
 
@@ -2989,12 +2989,12 @@ 
  * @param mixed $data Native representation.
  * @return bool|int|float|null|string|array Data ready for `json_encode()`.
  */
-function _wp_json_prepare_data( $data ) {
-	if ( ! defined( 'WP_JSON_SERIALIZE_COMPATIBLE' ) || WP_JSON_SERIALIZE_COMPATIBLE === false ) {
+function _wp_json_prepare_data($data) {
+	if ( ! defined('WP_JSON_SERIALIZE_COMPATIBLE') || WP_JSON_SERIALIZE_COMPATIBLE === false) {
 		return $data;
 	}
 
-	switch ( gettype( $data ) ) {
+	switch (gettype($data)) {
 		case 'boolean':
 		case 'integer':
 		case 'double':
@@ -3005,22 +3005,22 @@ 
 
 		case 'array':
 			// Arrays must be mapped in case they also return objects.
-			return array_map( '_wp_json_prepare_data', $data );
+			return array_map('_wp_json_prepare_data', $data);
 
 		case 'object':
 			// If this is an incomplete object (__PHP_Incomplete_Class), bail.
-			if ( ! is_object( $data ) ) {
+			if ( ! is_object($data)) {
 				return null;
 			}
 
-			if ( $data instanceof JsonSerializable ) {
+			if ($data instanceof JsonSerializable) {
 				$data = $data->jsonSerialize();
 			} else {
-				$data = get_object_vars( $data );
+				$data = get_object_vars($data);
 			}
 
 			// Now, pass the array (or whatever was returned from jsonSerialize through).
-			return _wp_json_prepare_data( $data );
+			return _wp_json_prepare_data($data);
 
 		default:
 			return null;
@@ -3035,10 +3035,10 @@ 
  * @param mixed $response Variable (usually an array or object) to encode as JSON,
  *                        then print and die.
  */
-function wp_send_json( $response ) {
-	@header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
-	echo wp_json_encode( $response );
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+function wp_send_json($response) {
+	@header('Content-Type: application/json; charset='.get_option('blog_charset'));
+	echo wp_json_encode($response);
+	if (defined('DOING_AJAX') && DOING_AJAX)
 		wp_die();
 	else
 		die;
@@ -3051,13 +3051,13 @@ 
  *
  * @param mixed $data Data to encode as JSON, then print and die.
  */
-function wp_send_json_success( $data = null ) {
-	$response = array( 'success' => true );
+function wp_send_json_success($data = null) {
+	$response = array('success' => true);
 
-	if ( isset( $data ) )
+	if (isset($data))
 		$response['data'] = $data;
 
-	wp_send_json( $response );
+	wp_send_json($response);
 }
 
 /**
@@ -3074,15 +3074,15 @@ 
  *
  * @param mixed $data Data to encode as JSON, then print and die.
  */
-function wp_send_json_error( $data = null ) {
-	$response = array( 'success' => false );
+function wp_send_json_error($data = null) {
+	$response = array('success' => false);
 
-	if ( isset( $data ) ) {
-		if ( is_wp_error( $data ) ) {
+	if (isset($data)) {
+		if (is_wp_error($data)) {
 			$result = array();
-			foreach ( $data->errors as $code => $messages ) {
-				foreach ( $messages as $message ) {
-					$result[] = array( 'code' => $code, 'message' => $message );
+			foreach ($data->errors as $code => $messages) {
+				foreach ($messages as $message) {
+					$result[] = array('code' => $code, 'message' => $message);
 				}
 			}
 
@@ -3092,7 +3092,7 @@ 
 		}
 	}
 
-	wp_send_json( $response );
+	wp_send_json($response);
 }
 
 /**
@@ -3110,9 +3110,9 @@ 
  * @param string $url URL for the home location.
  * @return string Homepage location.
  */
-function _config_wp_home( $url = '' ) {
-	if ( defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+function _config_wp_home($url = '') {
+	if (defined('WP_HOME'))
+		return untrailingslashit(WP_HOME);
 	return $url;
 }
 
@@ -3131,9 +3131,9 @@ 
  * @param string $url URL to set the WordPress site location.
  * @return string The WordPress Site URL.
  */
-function _config_wp_siteurl( $url = '' ) {
-	if ( defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+function _config_wp_siteurl($url = '') {
+	if (defined('WP_SITEURL'))
+		return untrailingslashit(WP_SITEURL);
 	return $url;
 }
 
@@ -3154,15 +3154,15 @@ 
  * @param array $input MCE settings array.
  * @return array Direction set for 'rtl', if needed by locale.
  */
-function _mce_set_direction( $input ) {
-	if ( is_rtl() ) {
+function _mce_set_direction($input) {
+	if (is_rtl()) {
 		$input['directionality'] = 'rtl';
 
-		if ( ! empty( $input['plugins'] ) && strpos( $input['plugins'], 'directionality' ) === false ) {
+		if ( ! empty($input['plugins']) && strpos($input['plugins'], 'directionality') === false) {
 			$input['plugins'] .= ',directionality';
 		}
 
-		if ( ! empty( $input['toolbar1'] ) && ! preg_match( '/\bltr\b/', $input['toolbar1'] ) ) {
+		if ( ! empty($input['toolbar1']) && ! preg_match('/\bltr\b/', $input['toolbar1'])) {
 			$input['toolbar1'] .= ',ltr';
 		}
 	}
@@ -3197,10 +3197,10 @@ 
 	global $wpsmiliestrans, $wp_smiliessearch;
 
 	// don't bother setting up smilies if they are disabled
-	if ( !get_option( 'use_smilies' ) )
+	if ( ! get_option('use_smilies'))
 		return;
 
-	if ( !isset( $wpsmiliestrans ) ) {
+	if ( ! isset($wpsmiliestrans)) {
 		$wpsmiliestrans = array(
 		':mrgreen:' => 'mrgreen.png',
 		':neutral:' => "\xf0\x9f\x98\x90",
@@ -3264,28 +3264,28 @@ 
 	$spaces = wp_spaces_regexp();
 
 	// Begin first "subpattern"
-	$wp_smiliessearch = '/(?<=' . $spaces . '|^)';
+	$wp_smiliessearch = '/(?<='.$spaces.'|^)';
 
 	$subchar = '';
-	foreach ( (array) $wpsmiliestrans as $smiley => $img ) {
+	foreach ((array) $wpsmiliestrans as $smiley => $img) {
 		$firstchar = substr($smiley, 0, 1);
 		$rest = substr($smiley, 1);
 
 		// new subpattern?
 		if ($firstchar != $subchar) {
 			if ($subchar != '') {
-				$wp_smiliessearch .= ')(?=' . $spaces . '|$)';  // End previous "subpattern"
-				$wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern"
+				$wp_smiliessearch .= ')(?='.$spaces.'|$)'; // End previous "subpattern"
+				$wp_smiliessearch .= '|(?<='.$spaces.'|^)'; // Begin another "subpattern"
 			}
 			$subchar = $firstchar;
-			$wp_smiliessearch .= preg_quote($firstchar, '/') . '(?:';
+			$wp_smiliessearch .= preg_quote($firstchar, '/').'(?:';
 		} else {
 			$wp_smiliessearch .= '|';
 		}
 		$wp_smiliessearch .= preg_quote($rest, '/');
 	}
 
-	$wp_smiliessearch .= ')(?=' . $spaces . '|$)/m';
+	$wp_smiliessearch .= ')(?='.$spaces.'|$)/m';
 
 }
 
@@ -3301,16 +3301,16 @@ 
  * @param array        $defaults Optional. Array that serves as the defaults. Default empty.
  * @return array Merged user defined values with defaults.
  */
-function wp_parse_args( $args, $defaults = '' ) {
-	if ( is_object( $args ) )
-		$r = get_object_vars( $args );
-	elseif ( is_array( $args ) )
-		$r =& $args;
+function wp_parse_args($args, $defaults = '') {
+	if (is_object($args))
+		$r = get_object_vars($args);
+	elseif (is_array($args))
+		$r = & $args;
 	else
-		wp_parse_str( $args, $r );
+		wp_parse_str($args, $r);
 
-	if ( is_array( $defaults ) )
-		return array_merge( $defaults, $r );
+	if (is_array($defaults))
+		return array_merge($defaults, $r);
 	return $r;
 }
 
@@ -3322,8 +3322,8 @@ 
  * @param array|string $list List of ids.
  * @return array Sanitized array of IDs.
  */
-function wp_parse_id_list( $list ) {
-	if ( !is_array($list) )
+function wp_parse_id_list($list) {
+	if ( ! is_array($list))
 		$list = preg_split('/[\s,]+/', $list);
 
 	return array_unique(array_map('absint', $list));
@@ -3338,11 +3338,11 @@ 
  * @param array $keys  The list of keys.
  * @return array The array slice.
  */
-function wp_array_slice_assoc( $array, $keys ) {
+function wp_array_slice_assoc($array, $keys) {
 	$slice = array();
-	foreach ( $keys as $key )
-		if ( isset( $array[ $key ] ) )
-			$slice[ $key ] = $array[ $key ];
+	foreach ($keys as $key)
+		if (isset($array[$key]))
+			$slice[$key] = $array[$key];
 
 	return $slice;
 }
@@ -3355,14 +3355,14 @@ 
  * @param mixed $data Variable to check.
  * @return bool Whether the variable is a list.
  */
-function wp_is_numeric_array( $data ) {
-	if ( ! is_array( $data ) ) {
+function wp_is_numeric_array($data) {
+	if ( ! is_array($data)) {
 		return false;
 	}
 
-	$keys = array_keys( $data );
-	$string_keys = array_filter( $keys, 'is_string' );
-	return count( $string_keys ) === 0;
+	$keys = array_keys($data);
+	$string_keys = array_filter($keys, 'is_string');
+	return count($string_keys) === 0;
 }
 
 /**
@@ -3381,14 +3381,14 @@ 
  *                              Default false.
  * @return array A list of objects or object fields.
  */
-function wp_filter_object_list( $list, $args = array(), $operator = 'and', $field = false ) {
-	if ( ! is_array( $list ) )
+function wp_filter_object_list($list, $args = array(), $operator = 'and', $field = false) {
+	if ( ! is_array($list))
 		return array();
 
-	$list = wp_list_filter( $list, $args, $operator );
+	$list = wp_list_filter($list, $args, $operator);
 
-	if ( $field )
-		$list = wp_list_pluck( $list, $field );
+	if ($field)
+		$list = wp_list_pluck($list, $field);
 
 	return $list;
 }
@@ -3407,29 +3407,29 @@ 
  *                         match. Default 'AND'.
  * @return array Array of found values.
  */
-function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
-	if ( ! is_array( $list ) )
+function wp_list_filter($list, $args = array(), $operator = 'AND') {
+	if ( ! is_array($list))
 		return array();
 
-	if ( empty( $args ) )
+	if (empty($args))
 		return $list;
 
-	$operator = strtoupper( $operator );
-	$count = count( $args );
+	$operator = strtoupper($operator);
+	$count = count($args);
 	$filtered = array();
 
-	foreach ( $list as $key => $obj ) {
+	foreach ($list as $key => $obj) {
 		$to_match = (array) $obj;
 
 		$matched = 0;
-		foreach ( $args as $m_key => $m_value ) {
-			if ( array_key_exists( $m_key, $to_match ) && $m_value == $to_match[ $m_key ] )
+		foreach ($args as $m_key => $m_value) {
+			if (array_key_exists($m_key, $to_match) && $m_value == $to_match[$m_key])
 				$matched++;
 		}
 
-		if ( ( 'AND' == $operator && $matched == $count )
-		  || ( 'OR' == $operator && $matched > 0 )
-		  || ( 'NOT' == $operator && 0 == $matched ) ) {
+		if (('AND' == $operator && $matched == $count)
+		  || ('OR' == $operator && $matched > 0)
+		  || ('NOT' == $operator && 0 == $matched)) {
 			$filtered[$key] = $obj;
 		}
 	}
@@ -3454,17 +3454,17 @@ 
  *               corresponding to `$index_key`. If `$index_key` is null, array keys from the original
  *               `$list` will be preserved in the results.
  */
-function wp_list_pluck( $list, $field, $index_key = null ) {
-	if ( ! $index_key ) {
+function wp_list_pluck($list, $field, $index_key = null) {
+	if ( ! $index_key) {
 		/*
 		 * This is simple. Could at some point wrap array_column()
 		 * if we knew we had an array of arrays.
 		 */
-		foreach ( $list as $key => $value ) {
-			if ( is_object( $value ) ) {
-				$list[ $key ] = $value->$field;
+		foreach ($list as $key => $value) {
+			if (is_object($value)) {
+				$list[$key] = $value->$field;
 			} else {
-				$list[ $key ] = $value[ $field ];
+				$list[$key] = $value[$field];
 			}
 		}
 		return $list;
@@ -3475,18 +3475,18 @@ 
 	 * to the end of the stack. This is how array_column() behaves.
 	 */
 	$newlist = array();
-	foreach ( $list as $value ) {
-		if ( is_object( $value ) ) {
-			if ( isset( $value->$index_key ) ) {
-				$newlist[ $value->$index_key ] = $value->$field;
+	foreach ($list as $value) {
+		if (is_object($value)) {
+			if (isset($value->$index_key)) {
+				$newlist[$value->$index_key] = $value->$field;
 			} else {
 				$newlist[] = $value->$field;
 			}
 		} else {
-			if ( isset( $value[ $index_key ] ) ) {
-				$newlist[ $value[ $index_key ] ] = $value[ $field ];
+			if (isset($value[$index_key])) {
+				$newlist[$value[$index_key]] = $value[$field];
 			} else {
-				$newlist[] = $value[ $field ];
+				$newlist[] = $value[$field];
 			}
 		}
 	}
@@ -3514,13 +3514,13 @@ 
 	 * @param bool $wp_maybe_load_widgets Whether to load the Widgets library.
 	 *                                    Default true.
 	 */
-	if ( ! apply_filters( 'load_default_widgets', true ) ) {
+	if ( ! apply_filters('load_default_widgets', true)) {
 		return;
 	}
 
-	require_once( ABSPATH . WPINC . '/default-widgets.php' );
+	require_once(ABSPATH.WPINC.'/default-widgets.php');
 
-	add_action( '_admin_menu', 'wp_widgets_add_menu' );
+	add_action('_admin_menu', 'wp_widgets_add_menu');
 }
 
 /**
@@ -3533,11 +3533,11 @@ 
 function wp_widgets_add_menu() {
 	global $submenu;
 
-	if ( ! current_theme_supports( 'widgets' ) )
+	if ( ! current_theme_supports('widgets'))
 		return;
 
-	$submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_theme_options', 'widgets.php' );
-	ksort( $submenu['themes.php'], SORT_NUMERIC );
+	$submenu['themes.php'][7] = array(__('Widgets'), 'edit_theme_options', 'widgets.php');
+	ksort($submenu['themes.php'], SORT_NUMERIC);
 }
 
 /**
@@ -3549,7 +3549,7 @@ 
  */
 function wp_ob_end_flush_all() {
 	$levels = ob_get_level();
-	for ($i=0; $i<$levels; $i++)
+	for ($i = 0; $i < $levels; $i++)
 		ob_end_flush();
 }
 
@@ -3577,29 +3577,29 @@ 
 	wp_load_translations_early();
 
 	// Load custom DB error template, if present.
-	if ( file_exists( WP_CONTENT_DIR . '/db-error.php' ) ) {
-		require_once( WP_CONTENT_DIR . '/db-error.php' );
+	if (file_exists(WP_CONTENT_DIR.'/db-error.php')) {
+		require_once(WP_CONTENT_DIR.'/db-error.php');
 		die();
 	}
 
 	// If installing or in the admin, provide the verbose message.
-	if ( wp_installing() || defined( 'WP_ADMIN' ) )
+	if (wp_installing() || defined('WP_ADMIN'))
 		wp_die($wpdb->error);
 
 	// Otherwise, be terse.
-	status_header( 500 );
+	status_header(500);
 	nocache_headers();
-	header( 'Content-Type: text/html; charset=utf-8' );
+	header('Content-Type: text/html; charset=utf-8');
 ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if (is_rtl()) echo ' dir="rtl"'; ?>>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title><?php _e( 'Database Error' ); ?></title>
+	<title><?php _e('Database Error'); ?></title>
 
 </head>
 <body>
-	<h1><?php _e( 'Error establishing a database connection' ); ?></h1>
+	<h1><?php _e('Error establishing a database connection'); ?></h1>
 </body>
 </html>
 <?php
@@ -3614,8 +3614,8 @@ 
  * @param mixed $maybeint Data you wish to have converted to a non-negative integer.
  * @return int A non-negative integer.
  */
-function absint( $maybeint ) {
-	return abs( intval( $maybeint ) );
+function absint($maybeint) {
+	return abs(intval($maybeint));
 }
 
 /**
@@ -3636,7 +3636,7 @@ 
  * @param string $version     The version of WordPress that deprecated the function.
  * @param string $replacement Optional. The function that should have been called. Default null.
  */
-function _deprecated_function( $function, $version, $replacement = null ) {
+function _deprecated_function($function, $version, $replacement = null) {
 
 	/**
 	 * Fires when a deprecated function is called.
@@ -3647,7 +3647,7 @@ 
 	 * @param string $replacement The function that should have been called.
 	 * @param string $version     The version of WordPress that deprecated the function.
 	 */
-	do_action( 'deprecated_function_run', $function, $replacement, $version );
+	do_action('deprecated_function_run', $function, $replacement, $version);
 
 	/**
 	 * Filter whether to trigger an error for deprecated functions.
@@ -3656,17 +3656,17 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for deprecated functions. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
-		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
+	if (WP_DEBUG && apply_filters('deprecated_function_trigger_error', true)) {
+		if (function_exists('__')) {
+			if ( ! is_null($replacement))
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement));
 			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version));
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
+			if ( ! is_null($replacement))
+				trigger_error(sprintf('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement));
 			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+				trigger_error(sprintf('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version));
 		}
 	}
 }
@@ -3691,7 +3691,7 @@ 
  * @param string $parent_class Optional. The parent class calling the deprecated constructor.
  *                             Default empty string.
  */
-function _deprecated_constructor( $class, $version, $parent_class = '' ) {
+function _deprecated_constructor($class, $version, $parent_class = '') {
 
 	/**
 	 * Fires when a deprecated constructor is called.
@@ -3703,7 +3703,7 @@ 
 	 * @param string $version      The version of WordPress that deprecated the function.
 	 * @param string $parent_class The parent class calling the deprecated constructor.
 	 */
-	do_action( 'deprecated_constructor_run', $class, $version, $parent_class );
+	do_action('deprecated_constructor_run', $class, $version, $parent_class);
 
 	/**
 	 * Filter whether to trigger an error for deprecated functions.
@@ -3714,24 +3714,24 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for deprecated functions. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'deprecated_constructor_trigger_error', true ) ) {
-		if ( function_exists( '__' ) ) {
-			if ( ! empty( $parent_class ) ) {
+	if (WP_DEBUG && apply_filters('deprecated_constructor_trigger_error', true)) {
+		if (function_exists('__')) {
+			if ( ! empty($parent_class)) {
 				/* translators: 1: PHP class name, 2: PHP parent class name, 3: version number, 4: __construct() method */
-				trigger_error( sprintf( __( 'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.' ),
-					$class, $parent_class, $version, '<pre>__construct()</pre>' ) );
+				trigger_error(sprintf(__('The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.'),
+					$class, $parent_class, $version, '<pre>__construct()</pre>'));
 			} else {
 				/* translators: 1: PHP class name, 2: version number, 3: __construct() method */
-				trigger_error( sprintf( __( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
-					$class, $version, '<pre>__construct()</pre>' ) );
+				trigger_error(sprintf(__('The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'),
+					$class, $version, '<pre>__construct()</pre>'));
 			}
 		} else {
-			if ( ! empty( $parent_class ) ) {
-				trigger_error( sprintf( 'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.',
-					$class, $parent_class, $version, '<pre>__construct()</pre>' ) );
+			if ( ! empty($parent_class)) {
+				trigger_error(sprintf('The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.',
+					$class, $parent_class, $version, '<pre>__construct()</pre>'));
 			} else {
-				trigger_error( sprintf( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
-					$class, $version, '<pre>__construct()</pre>' ) );
+				trigger_error(sprintf('The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
+					$class, $version, '<pre>__construct()</pre>'));
 			}
 		}
 	}
@@ -3758,7 +3758,7 @@ 
  *                            Default null.
  * @param string $message     Optional. A message regarding the change. Default empty.
  */
-function _deprecated_file( $file, $version, $replacement = null, $message = '' ) {
+function _deprecated_file($file, $version, $replacement = null, $message = '') {
 
 	/**
 	 * Fires when a deprecated file is called.
@@ -3770,7 +3770,7 @@ 
 	 * @param string $version     The version of WordPress that deprecated the file.
 	 * @param string $message     A message regarding the change.
 	 */
-	do_action( 'deprecated_file_included', $file, $replacement, $version, $message );
+	do_action('deprecated_file_included', $file, $replacement, $version, $message);
 
 	/**
 	 * Filter whether to trigger an error for deprecated files.
@@ -3779,18 +3779,18 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for deprecated files. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
-		$message = empty( $message ) ? '' : ' ' . $message;
-		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
+	if (WP_DEBUG && apply_filters('deprecated_file_trigger_error', true)) {
+		$message = empty($message) ? '' : ' '.$message;
+		if (function_exists('__')) {
+			if ( ! is_null($replacement))
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement).$message);
 			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version).$message);
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
+			if ( ! is_null($replacement))
+				trigger_error(sprintf('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement).$message);
 			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version ) . $message );
+				trigger_error(sprintf('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version).$message);
 		}
 	}
 }
@@ -3820,7 +3820,7 @@ 
  * @param string $version  The version of WordPress that deprecated the argument used.
  * @param string $message  Optional. A message regarding the change. Default null.
  */
-function _deprecated_argument( $function, $version, $message = null ) {
+function _deprecated_argument($function, $version, $message = null) {
 
 	/**
 	 * Fires when a deprecated argument is called.
@@ -3831,7 +3831,7 @@ 
 	 * @param string $message  A message regarding the change.
 	 * @param string $version  The version of WordPress that deprecated the argument used.
 	 */
-	do_action( 'deprecated_argument_run', $function, $message, $version );
+	do_action('deprecated_argument_run', $function, $message, $version);
 
 	/**
 	 * Filter whether to trigger an error for deprecated arguments.
@@ -3840,17 +3840,17 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for deprecated arguments. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
-		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
+	if (WP_DEBUG && apply_filters('deprecated_argument_trigger_error', true)) {
+		if (function_exists('__')) {
+			if ( ! is_null($message))
+				trigger_error(sprintf(__('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message));
 			else
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+				trigger_error(sprintf(__('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version));
 		} else {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
+			if ( ! is_null($message))
+				trigger_error(sprintf('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message));
 			else
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+				trigger_error(sprintf('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version));
 		}
 	}
 }
@@ -3871,7 +3871,7 @@ 
  * @param string $message  A message explaining what has been done incorrectly.
  * @param string $version  The version of WordPress where the message was added.
  */
-function _doing_it_wrong( $function, $message, $version ) {
+function _doing_it_wrong($function, $message, $version) {
 
 	/**
 	 * Fires when the given function is being used incorrectly.
@@ -3882,7 +3882,7 @@ 
 	 * @param string $message  A message explaining what has been done incorrectly.
 	 * @param string $version  The version of WordPress where the message was added.
 	 */
-	do_action( 'doing_it_wrong_run', $function, $message, $version );
+	do_action('doing_it_wrong_run', $function, $message, $version);
 
 	/**
 	 * Filter whether to trigger an error for _doing_it_wrong() calls.
@@ -3891,20 +3891,20 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for _doing_it_wrong() calls. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) {
-		if ( function_exists( '__' ) ) {
-			$version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version );
+	if (WP_DEBUG && apply_filters('doing_it_wrong_trigger_error', true)) {
+		if (function_exists('__')) {
+			$version = is_null($version) ? '' : sprintf(__('(This message was added in version %s.)'), $version);
 			/* translators: %s: Codex URL */
-			$message .= ' ' . sprintf( __( 'Please see <a href="%s">Debugging in WordPress</a> for more information.' ),
-				__( 'https://codex.wordpress.org/Debugging_in_WordPress' )
+			$message .= ' '.sprintf(__('Please see <a href="%s">Debugging in WordPress</a> for more information.'),
+				__('https://codex.wordpress.org/Debugging_in_WordPress')
 			);
-			trigger_error( sprintf( __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ), $function, $message, $version ) );
+			trigger_error(sprintf(__('%1$s was called <strong>incorrectly</strong>. %2$s %3$s'), $function, $message, $version));
 		} else {
-			$version = is_null( $version ) ? '' : sprintf( '(This message was added in version %s.)', $version );
-			$message .= sprintf( ' Please see <a href="%s">Debugging in WordPress</a> for more information.',
+			$version = is_null($version) ? '' : sprintf('(This message was added in version %s.)', $version);
+			$message .= sprintf(' Please see <a href="%s">Debugging in WordPress</a> for more information.',
 				'https://codex.wordpress.org/Debugging_in_WordPress'
 			);
-			trigger_error( sprintf( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s', $function, $message, $version ) );
+			trigger_error(sprintf('%1$s was called <strong>incorrectly</strong>. %2$s %3$s', $function, $message, $version));
 		}
 	}
 }
@@ -3917,9 +3917,9 @@ 
  * @return bool Whether the server is running lighttpd < 1.5.0.
  */
 function is_lighttpd_before_150() {
-	$server_parts = explode( '/', isset( $_SERVER['SERVER_SOFTWARE'] )? $_SERVER['SERVER_SOFTWARE'] : '' );
-	$server_parts[1] = isset( $server_parts[1] )? $server_parts[1] : '';
-	return  'lighttpd' == $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.0' );
+	$server_parts = explode('/', isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : '');
+	$server_parts[1] = isset($server_parts[1]) ? $server_parts[1] : '';
+	return  'lighttpd' == $server_parts[0] && -1 == version_compare($server_parts[1], '1.5.0');
 }
 
 /**
@@ -3936,18 +3936,18 @@ 
 function apache_mod_loaded($mod, $default = false) {
 	global $is_apache;
 
-	if ( !$is_apache )
+	if ( ! $is_apache)
 		return false;
 
-	if ( function_exists( 'apache_get_modules' ) ) {
+	if (function_exists('apache_get_modules')) {
 		$mods = apache_get_modules();
-		if ( in_array($mod, $mods) )
+		if (in_array($mod, $mods))
 			return true;
-	} elseif ( function_exists( 'phpinfo' ) && false === strpos( ini_get( 'disable_functions' ), 'phpinfo' ) ) {
+	} elseif (function_exists('phpinfo') && false === strpos(ini_get('disable_functions'), 'phpinfo')) {
 			ob_start();
 			phpinfo(8);
 			$phpinfo = ob_get_clean();
-			if ( false !== strpos($phpinfo, $mod) )
+			if (false !== strpos($phpinfo, $mod))
 				return true;
 	}
 	return $default;
@@ -3966,7 +3966,7 @@ 
 	global $is_iis7;
 
 	$supports_permalinks = false;
-	if ( $is_iis7 ) {
+	if ($is_iis7) {
 		/* First we check if the DOMDocument class exists. If it does not exist, then we cannot
 		 * easily update the xml configuration file, hence we just bail out and tell user that
 		 * pretty permalinks cannot be used.
@@ -3976,7 +3976,7 @@ 
 		 * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs
 		 * via ISAPI then pretty permalinks will not work.
 		 */
-		$supports_permalinks = class_exists( 'DOMDocument', false ) && isset($_SERVER['IIS_UrlRewriteModule']) && ( PHP_SAPI == 'cgi-fcgi' );
+		$supports_permalinks = class_exists('DOMDocument', false) && isset($_SERVER['IIS_UrlRewriteModule']) && (PHP_SAPI == 'cgi-fcgi');
 	}
 
 	/**
@@ -3986,7 +3986,7 @@ 
 	 *
 	 * @param bool $supports_permalinks Whether IIS7 supports permalinks. Default false.
 	 */
-	return apply_filters( 'iis7_supports_permalinks', $supports_permalinks );
+	return apply_filters('iis7_supports_permalinks', $supports_permalinks);
 }
 
 /**
@@ -4003,17 +4003,17 @@ 
  * @param array  $allowed_files List of allowed files.
  * @return int 0 means nothing is wrong, greater than 0 means something was wrong.
  */
-function validate_file( $file, $allowed_files = '' ) {
-	if ( false !== strpos( $file, '..' ) )
+function validate_file($file, $allowed_files = '') {
+	if (false !== strpos($file, '..'))
 		return 1;
 
-	if ( false !== strpos( $file, './' ) )
+	if (false !== strpos($file, './'))
 		return 1;
 
-	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) )
+	if ( ! empty($allowed_files) && ! in_array($file, $allowed_files))
 		return 3;
 
-	if (':' == substr( $file, 1, 1 ) )
+	if (':' == substr($file, 1, 1))
 		return 2;
 
 	return 0;
@@ -4027,12 +4027,12 @@ 
  * @return bool True if SSL, false if not used.
  */
 function is_ssl() {
-	if ( isset($_SERVER['HTTPS']) ) {
-		if ( 'on' == strtolower($_SERVER['HTTPS']) )
+	if (isset($_SERVER['HTTPS'])) {
+		if ('on' == strtolower($_SERVER['HTTPS']))
 			return true;
-		if ( '1' == $_SERVER['HTTPS'] )
+		if ('1' == $_SERVER['HTTPS'])
 			return true;
-	} elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+	} elseif (isset($_SERVER['SERVER_PORT']) && ('443' == $_SERVER['SERVER_PORT'])) {
 		return true;
 	}
 	return false;
@@ -4048,10 +4048,10 @@ 
  * @param string|bool $force Optional. Whether to force SSL in admin screens. Default null.
  * @return bool True if forced, false if not forced.
  */
-function force_ssl_admin( $force = null ) {
+function force_ssl_admin($force = null) {
 	static $forced = false;
 
-	if ( !is_null( $force ) ) {
+	if ( ! is_null($force)) {
 		$old_forced = $forced;
 		$forced = $force;
 		return $old_forced;
@@ -4071,39 +4071,39 @@ 
  * @return string The guessed URL.
  */
 function wp_guess_url() {
-	if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
+	if (defined('WP_SITEURL') && '' != WP_SITEURL) {
 		$url = WP_SITEURL;
 	} else {
-		$abspath_fix = str_replace( '\\', '/', ABSPATH );
-		$script_filename_dir = dirname( $_SERVER['SCRIPT_FILENAME'] );
+		$abspath_fix = str_replace('\\', '/', ABSPATH);
+		$script_filename_dir = dirname($_SERVER['SCRIPT_FILENAME']);
 
 		// The request is for the admin
-		if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false || strpos( $_SERVER['REQUEST_URI'], 'wp-login.php' ) !== false ) {
-			$path = preg_replace( '#/(wp-admin/.*|wp-login.php)#i', '', $_SERVER['REQUEST_URI'] );
+		if (strpos($_SERVER['REQUEST_URI'], 'wp-admin') !== false || strpos($_SERVER['REQUEST_URI'], 'wp-login.php') !== false) {
+			$path = preg_replace('#/(wp-admin/.*|wp-login.php)#i', '', $_SERVER['REQUEST_URI']);
 
 		// The request is for a file in ABSPATH
-		} elseif ( $script_filename_dir . '/' == $abspath_fix ) {
+		} elseif ($script_filename_dir.'/' == $abspath_fix) {
 			// Strip off any file/query params in the path
-			$path = preg_replace( '#/[^/]*$#i', '', $_SERVER['PHP_SELF'] );
+			$path = preg_replace('#/[^/]*$#i', '', $_SERVER['PHP_SELF']);
 
 		} else {
-			if ( false !== strpos( $_SERVER['SCRIPT_FILENAME'], $abspath_fix ) ) {
+			if (false !== strpos($_SERVER['SCRIPT_FILENAME'], $abspath_fix)) {
 				// Request is hitting a file inside ABSPATH
-				$directory = str_replace( ABSPATH, '', $script_filename_dir );
+				$directory = str_replace(ABSPATH, '', $script_filename_dir);
 				// Strip off the sub directory, and any file/query params
-				$path = preg_replace( '#/' . preg_quote( $directory, '#' ) . '/[^/]*$#i', '' , $_SERVER['REQUEST_URI'] );
-			} elseif ( false !== strpos( $abspath_fix, $script_filename_dir ) ) {
+				$path = preg_replace('#/'.preg_quote($directory, '#').'/[^/]*$#i', '', $_SERVER['REQUEST_URI']);
+			} elseif (false !== strpos($abspath_fix, $script_filename_dir)) {
 				// Request is hitting a file above ABSPATH
-				$subdirectory = substr( $abspath_fix, strpos( $abspath_fix, $script_filename_dir ) + strlen( $script_filename_dir ) );
+				$subdirectory = substr($abspath_fix, strpos($abspath_fix, $script_filename_dir) + strlen($script_filename_dir));
 				// Strip off any file/query params from the path, appending the sub directory to the install
-				$path = preg_replace( '#/[^/]*$#i', '' , $_SERVER['REQUEST_URI'] ) . $subdirectory;
+				$path = preg_replace('#/[^/]*$#i', '', $_SERVER['REQUEST_URI']).$subdirectory;
 			} else {
 				$path = $_SERVER['REQUEST_URI'];
 			}
 		}
 
 		$schema = is_ssl() ? 'https://' : 'http://'; // set_url_scheme() is not defined yet
-		$url = $schema . $_SERVER['HTTP_HOST'] . $path;
+		$url = $schema.$_SERVER['HTTP_HOST'].$path;
 	}
 
 	return rtrim($url, '/');
@@ -4126,10 +4126,10 @@ 
  * @param bool $suspend Optional. Suspends additions if true, re-enables them if false.
  * @return bool The current suspend setting
  */
-function wp_suspend_cache_addition( $suspend = null ) {
+function wp_suspend_cache_addition($suspend = null) {
 	static $_suspend = false;
 
-	if ( is_bool( $suspend ) )
+	if (is_bool($suspend))
 		$_suspend = $suspend;
 
 	return $_suspend;
@@ -4149,7 +4149,7 @@ 
  * @param bool $suspend Optional. Whether to suspend or enable cache invalidation. Default true.
  * @return bool The current suspend setting.
  */
-function wp_suspend_cache_invalidation( $suspend = true ) {
+function wp_suspend_cache_invalidation($suspend = true) {
 	global $_wp_suspend_cache_invalidation;
 
 	$current_suspend = $_wp_suspend_cache_invalidation;
@@ -4169,14 +4169,14 @@ 
  * @return bool True if $site_id is the main site of the network, or if not
  *              running Multisite.
  */
-function is_main_site( $site_id = null ) {
+function is_main_site($site_id = null) {
 	// This is the current network's information; 'site' is old terminology.
 	global $current_site;
 
-	if ( ! is_multisite() )
+	if ( ! is_multisite())
 		return true;
 
-	if ( ! $site_id )
+	if ( ! $site_id)
 		$site_id = get_current_blog_id();
 
 	return (int) $site_id === (int) $current_site->blog_id;
@@ -4190,20 +4190,20 @@ 
  * @param int $network_id Optional. Network ID to test. Defaults to current network.
  * @return bool True if $network_id is the main network, or if not running Multisite.
  */
-function is_main_network( $network_id = null ) {
-	if ( ! is_multisite() ) {
+function is_main_network($network_id = null) {
+	if ( ! is_multisite()) {
 		return true;
 	}
 
 	$current_network_id = (int) get_current_site()->id;
 
-	if ( null === $network_id ) {
+	if (null === $network_id) {
 		$network_id = $current_network_id;
 	}
 
 	$network_id = (int) $network_id;
 
-	return ( $network_id === get_main_network_id() );
+	return ($network_id === get_main_network_id());
 }
 
 /**
@@ -4218,21 +4218,21 @@ 
 function get_main_network_id() {
 	global $wpdb;
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		return 1;
 	}
 
-	if ( defined( 'PRIMARY_NETWORK_ID' ) ) {
+	if (defined('PRIMARY_NETWORK_ID')) {
 		$main_network_id = PRIMARY_NETWORK_ID;
-	} elseif ( 1 === (int) get_current_site()->id ) {
+	} elseif (1 === (int) get_current_site()->id) {
 		// If the current network has an ID of 1, assume it is the main network.
 		$main_network_id = 1;
 	} else {
-		$main_network_id = wp_cache_get( 'primary_network_id', 'site-options' );
+		$main_network_id = wp_cache_get('primary_network_id', 'site-options');
 
-		if ( false === $main_network_id ) {
-			$main_network_id = (int) $wpdb->get_var( "SELECT id FROM {$wpdb->site} ORDER BY id LIMIT 1" );
-			wp_cache_add( 'primary_network_id', $main_network_id, 'site-options' );
+		if (false === $main_network_id) {
+			$main_network_id = (int) $wpdb->get_var("SELECT id FROM {$wpdb->site} ORDER BY id LIMIT 1");
+			wp_cache_add('primary_network_id', $main_network_id, 'site-options');
 		}
 	}
 
@@ -4243,7 +4243,7 @@ 
 	 *
 	 * @param int $main_network_id The ID of the main network.
 	 */
-	return (int) apply_filters( 'get_main_network_id', $main_network_id );
+	return (int) apply_filters('get_main_network_id', $main_network_id);
 }
 
 /**
@@ -4256,11 +4256,11 @@ 
  * @return bool True if multisite and global terms enabled.
  */
 function global_terms_enabled() {
-	if ( ! is_multisite() )
+	if ( ! is_multisite())
 		return false;
 
 	static $global_terms = null;
-	if ( is_null( $global_terms ) ) {
+	if (is_null($global_terms)) {
 
 		/**
 		 * Filter whether global terms are enabled.
@@ -4272,11 +4272,11 @@ 
 		 *
 		 * @param null $enabled Whether global terms are enabled.
 		 */
-		$filter = apply_filters( 'global_terms_enabled', null );
-		if ( ! is_null( $filter ) )
+		$filter = apply_filters('global_terms_enabled', null);
+		if ( ! is_null($filter))
 			$global_terms = (bool) $filter;
 		else
-			$global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+			$global_terms = (bool) get_site_option('global_terms_enabled', false);
 	}
 	return $global_terms;
 }
@@ -4291,16 +4291,16 @@ 
  * @return float|false Timezone GMT offset, false otherwise.
  */
 function wp_timezone_override_offset() {
-	if ( !$timezone_string = get_option( 'timezone_string' ) ) {
+	if ( ! $timezone_string = get_option('timezone_string')) {
 		return false;
 	}
 
-	$timezone_object = timezone_open( $timezone_string );
+	$timezone_object = timezone_open($timezone_string);
 	$datetime_object = date_create();
-	if ( false === $timezone_object || false === $datetime_object ) {
+	if (false === $timezone_object || false === $datetime_object) {
 		return false;
 	}
-	return round( timezone_offset_get( $timezone_object, $datetime_object ) / HOUR_IN_SECONDS, 2 );
+	return round(timezone_offset_get($timezone_object, $datetime_object) / HOUR_IN_SECONDS, 2);
 }
 
 /**
@@ -4313,41 +4313,41 @@ 
  * @param array $b
  * @return int
  */
-function _wp_timezone_choice_usort_callback( $a, $b ) {
+function _wp_timezone_choice_usort_callback($a, $b) {
 	// Don't use translated versions of Etc
-	if ( 'Etc' === $a['continent'] && 'Etc' === $b['continent'] ) {
+	if ('Etc' === $a['continent'] && 'Etc' === $b['continent']) {
 		// Make the order of these more like the old dropdown
-		if ( 'GMT+' === substr( $a['city'], 0, 4 ) && 'GMT+' === substr( $b['city'], 0, 4 ) ) {
-			return -1 * ( strnatcasecmp( $a['city'], $b['city'] ) );
+		if ('GMT+' === substr($a['city'], 0, 4) && 'GMT+' === substr($b['city'], 0, 4)) {
+			return -1 * (strnatcasecmp($a['city'], $b['city']));
 		}
-		if ( 'UTC' === $a['city'] ) {
-			if ( 'GMT+' === substr( $b['city'], 0, 4 ) ) {
+		if ('UTC' === $a['city']) {
+			if ('GMT+' === substr($b['city'], 0, 4)) {
 				return 1;
 			}
 			return -1;
 		}
-		if ( 'UTC' === $b['city'] ) {
-			if ( 'GMT+' === substr( $a['city'], 0, 4 ) ) {
+		if ('UTC' === $b['city']) {
+			if ('GMT+' === substr($a['city'], 0, 4)) {
 				return -1;
 			}
 			return 1;
 		}
-		return strnatcasecmp( $a['city'], $b['city'] );
+		return strnatcasecmp($a['city'], $b['city']);
 	}
-	if ( $a['t_continent'] == $b['t_continent'] ) {
-		if ( $a['t_city'] == $b['t_city'] ) {
-			return strnatcasecmp( $a['t_subcity'], $b['t_subcity'] );
+	if ($a['t_continent'] == $b['t_continent']) {
+		if ($a['t_city'] == $b['t_city']) {
+			return strnatcasecmp($a['t_subcity'], $b['t_subcity']);
 		}
-		return strnatcasecmp( $a['t_city'], $b['t_city'] );
+		return strnatcasecmp($a['t_city'], $b['t_city']);
 	} else {
 		// Force Etc to the bottom of the list
-		if ( 'Etc' === $a['continent'] ) {
+		if ('Etc' === $a['continent']) {
 			return 1;
 		}
-		if ( 'Etc' === $b['continent'] ) {
+		if ('Etc' === $b['continent']) {
 			return -1;
 		}
-		return strnatcasecmp( $a['t_continent'], $b['t_continent'] );
+		return strnatcasecmp($a['t_continent'], $b['t_continent']);
 	}
 }
 
@@ -4361,125 +4361,125 @@ 
  * @param string $selected_zone Selected timezone.
  * @return string
  */
-function wp_timezone_choice( $selected_zone ) {
+function wp_timezone_choice($selected_zone) {
 	static $mo_loaded = false;
 
-	$continents = array( 'Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific');
+	$continents = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific');
 
 	// Load translations for continents and cities
-	if ( !$mo_loaded ) {
+	if ( ! $mo_loaded) {
 		$locale = get_locale();
-		$mofile = WP_LANG_DIR . '/continents-cities-' . $locale . '.mo';
-		load_textdomain( 'continents-cities', $mofile );
+		$mofile = WP_LANG_DIR.'/continents-cities-'.$locale.'.mo';
+		load_textdomain('continents-cities', $mofile);
 		$mo_loaded = true;
 	}
 
 	$zonen = array();
-	foreach ( timezone_identifiers_list() as $zone ) {
-		$zone = explode( '/', $zone );
-		if ( !in_array( $zone[0], $continents ) ) {
+	foreach (timezone_identifiers_list() as $zone) {
+		$zone = explode('/', $zone);
+		if ( ! in_array($zone[0], $continents)) {
 			continue;
 		}
 
 		// This determines what gets set and translated - we don't translate Etc/* strings here, they are done later
 		$exists = array(
-			0 => ( isset( $zone[0] ) && $zone[0] ),
-			1 => ( isset( $zone[1] ) && $zone[1] ),
-			2 => ( isset( $zone[2] ) && $zone[2] ),
+			0 => (isset($zone[0]) && $zone[0]),
+			1 => (isset($zone[1]) && $zone[1]),
+			2 => (isset($zone[2]) && $zone[2]),
 		);
-		$exists[3] = ( $exists[0] && 'Etc' !== $zone[0] );
-		$exists[4] = ( $exists[1] && $exists[3] );
-		$exists[5] = ( $exists[2] && $exists[3] );
+		$exists[3] = ($exists[0] && 'Etc' !== $zone[0]);
+		$exists[4] = ($exists[1] && $exists[3]);
+		$exists[5] = ($exists[2] && $exists[3]);
 
 		$zonen[] = array(
-			'continent'   => ( $exists[0] ? $zone[0] : '' ),
-			'city'        => ( $exists[1] ? $zone[1] : '' ),
-			'subcity'     => ( $exists[2] ? $zone[2] : '' ),
-			't_continent' => ( $exists[3] ? translate( str_replace( '_', ' ', $zone[0] ), 'continents-cities' ) : '' ),
-			't_city'      => ( $exists[4] ? translate( str_replace( '_', ' ', $zone[1] ), 'continents-cities' ) : '' ),
-			't_subcity'   => ( $exists[5] ? translate( str_replace( '_', ' ', $zone[2] ), 'continents-cities' ) : '' )
+			'continent'   => ($exists[0] ? $zone[0] : ''),
+			'city'        => ($exists[1] ? $zone[1] : ''),
+			'subcity'     => ($exists[2] ? $zone[2] : ''),
+			't_continent' => ($exists[3] ? translate(str_replace('_', ' ', $zone[0]), 'continents-cities') : ''),
+			't_city'      => ($exists[4] ? translate(str_replace('_', ' ', $zone[1]), 'continents-cities') : ''),
+			't_subcity'   => ($exists[5] ? translate(str_replace('_', ' ', $zone[2]), 'continents-cities') : '')
 		);
 	}
-	usort( $zonen, '_wp_timezone_choice_usort_callback' );
+	usort($zonen, '_wp_timezone_choice_usort_callback');
 
 	$structure = array();
 
-	if ( empty( $selected_zone ) ) {
-		$structure[] = '<option selected="selected" value="">' . __( 'Select a city' ) . '</option>';
+	if (empty($selected_zone)) {
+		$structure[] = '<option selected="selected" value="">'.__('Select a city').'</option>';
 	}
 
-	foreach ( $zonen as $key => $zone ) {
+	foreach ($zonen as $key => $zone) {
 		// Build value in an array to join later
-		$value = array( $zone['continent'] );
+		$value = array($zone['continent']);
 
-		if ( empty( $zone['city'] ) ) {
+		if (empty($zone['city'])) {
 			// It's at the continent level (generally won't happen)
 			$display = $zone['t_continent'];
 		} else {
 			// It's inside a continent group
 
 			// Continent optgroup
-			if ( !isset( $zonen[$key - 1] ) || $zonen[$key - 1]['continent'] !== $zone['continent'] ) {
+			if ( ! isset($zonen[$key - 1]) || $zonen[$key - 1]['continent'] !== $zone['continent']) {
 				$label = $zone['t_continent'];
-				$structure[] = '<optgroup label="'. esc_attr( $label ) .'">';
+				$structure[] = '<optgroup label="'.esc_attr($label).'">';
 			}
 
 			// Add the city to the value
 			$value[] = $zone['city'];
 
 			$display = $zone['t_city'];
-			if ( !empty( $zone['subcity'] ) ) {
+			if ( ! empty($zone['subcity'])) {
 				// Add the subcity to the value
 				$value[] = $zone['subcity'];
-				$display .= ' - ' . $zone['t_subcity'];
+				$display .= ' - '.$zone['t_subcity'];
 			}
 		}
 
 		// Build the value
-		$value = join( '/', $value );
+		$value = join('/', $value);
 		$selected = '';
-		if ( $value === $selected_zone ) {
+		if ($value === $selected_zone) {
 			$selected = 'selected="selected" ';
 		}
-		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $value ) . '">' . esc_html( $display ) . "</option>";
+		$structure[] = '<option '.$selected.'value="'.esc_attr($value).'">'.esc_html($display)."</option>";
 
 		// Close continent optgroup
-		if ( !empty( $zone['city'] ) && ( !isset($zonen[$key + 1]) || (isset( $zonen[$key + 1] ) && $zonen[$key + 1]['continent'] !== $zone['continent']) ) ) {
+		if ( ! empty($zone['city']) && ( ! isset($zonen[$key + 1]) || (isset($zonen[$key + 1]) && $zonen[$key + 1]['continent'] !== $zone['continent']))) {
 			$structure[] = '</optgroup>';
 		}
 	}
 
 	// Do UTC
-	$structure[] = '<optgroup label="'. esc_attr__( 'UTC' ) .'">';
+	$structure[] = '<optgroup label="'.esc_attr__('UTC').'">';
 	$selected = '';
-	if ( 'UTC' === $selected_zone )
+	if ('UTC' === $selected_zone)
 		$selected = 'selected="selected" ';
-	$structure[] = '<option ' . $selected . 'value="' . esc_attr( 'UTC' ) . '">' . __('UTC') . '</option>';
+	$structure[] = '<option '.$selected.'value="'.esc_attr('UTC').'">'.__('UTC').'</option>';
 	$structure[] = '</optgroup>';
 
 	// Do manual UTC offsets
-	$structure[] = '<optgroup label="'. esc_attr__( 'Manual Offsets' ) .'">';
-	$offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
+	$structure[] = '<optgroup label="'.esc_attr__('Manual Offsets').'">';
+	$offset_range = array(-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
 		0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
-	foreach ( $offset_range as $offset ) {
-		if ( 0 <= $offset )
-			$offset_name = '+' . $offset;
+	foreach ($offset_range as $offset) {
+		if (0 <= $offset)
+			$offset_name = '+'.$offset;
 		else
 			$offset_name = (string) $offset;
 
 		$offset_value = $offset_name;
-		$offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
-		$offset_name = 'UTC' . $offset_name;
-		$offset_value = 'UTC' . $offset_value;
+		$offset_name = str_replace(array('.25', '.5', '.75'), array(':15', ':30', ':45'), $offset_name);
+		$offset_name = 'UTC'.$offset_name;
+		$offset_value = 'UTC'.$offset_value;
 		$selected = '';
-		if ( $offset_value === $selected_zone )
+		if ($offset_value === $selected_zone)
 			$selected = 'selected="selected" ';
-		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
+		$structure[] = '<option '.$selected.'value="'.esc_attr($offset_value).'">'.esc_html($offset_name)."</option>";
 
 	}
 	$structure[] = '</optgroup>';
 
-	return join( "\n", $structure );
+	return join("\n", $structure);
 }
 
 /**
@@ -4493,7 +4493,7 @@ 
  * @param string $str Header comment to clean up.
  * @return string
  */
-function _cleanup_header_comment( $str ) {
+function _cleanup_header_comment($str) {
 	return trim(preg_replace("/\s*(?:\*\/|\?>).*/", '', $str));
 }
 
@@ -4510,18 +4510,18 @@ 
 function wp_scheduled_delete() {
 	global $wpdb;
 
-	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
+	$delete_timestamp = time() - (DAY_IN_SECONDS * EMPTY_TRASH_DAYS);
 
 	$posts_to_delete = $wpdb->get_results($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A);
 
-	foreach ( (array) $posts_to_delete as $post ) {
+	foreach ((array) $posts_to_delete as $post) {
 		$post_id = (int) $post['post_id'];
-		if ( !$post_id )
+		if ( ! $post_id)
 			continue;
 
 		$del_post = get_post($post_id);
 
-		if ( !$del_post || 'trash' != $del_post->post_status ) {
+		if ( ! $del_post || 'trash' != $del_post->post_status) {
 			delete_post_meta($post_id, '_wp_trash_meta_status');
 			delete_post_meta($post_id, '_wp_trash_meta_time');
 		} else {
@@ -4531,18 +4531,18 @@ 
 
 	$comments_to_delete = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM $wpdb->commentmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A);
 
-	foreach ( (array) $comments_to_delete as $comment ) {
+	foreach ((array) $comments_to_delete as $comment) {
 		$comment_id = (int) $comment['comment_id'];
-		if ( !$comment_id )
+		if ( ! $comment_id)
 			continue;
 
 		$del_comment = get_comment($comment_id);
 
-		if ( !$del_comment || 'trash' != $del_comment->comment_approved ) {
+		if ( ! $del_comment || 'trash' != $del_comment->comment_approved) {
 			delete_comment_meta($comment_id, '_wp_trash_meta_time');
 			delete_comment_meta($comment_id, '_wp_trash_meta_status');
 		} else {
-			wp_delete_comment( $del_comment );
+			wp_delete_comment($del_comment);
 		}
 	}
 }
@@ -4567,18 +4567,18 @@ 
  *                                Default empty.
  * @return array Array of file headers in `HeaderKey => Header Value` format.
  */
-function get_file_data( $file, $default_headers, $context = '' ) {
+function get_file_data($file, $default_headers, $context = '') {
 	// We don't need to write to the file, so just open for reading.
-	$fp = fopen( $file, 'r' );
+	$fp = fopen($file, 'r');
 
 	// Pull only the first 8kiB of the file in.
-	$file_data = fread( $fp, 8192 );
+	$file_data = fread($fp, 8192);
 
 	// PHP will close file handle, but we are good citizens.
-	fclose( $fp );
+	fclose($fp);
 
 	// Make sure we catch CR-only line endings.
-	$file_data = str_replace( "\r", "\n", $file_data );
+	$file_data = str_replace("\r", "\n", $file_data);
 
 	/**
 	 * Filter extra file headers by context.
@@ -4590,18 +4590,18 @@ 
 	 *
 	 * @param array $extra_context_headers Empty array by default.
 	 */
-	if ( $context && $extra_headers = apply_filters( "extra_{$context}_headers", array() ) ) {
-		$extra_headers = array_combine( $extra_headers, $extra_headers ); // keys equal values
-		$all_headers = array_merge( $extra_headers, (array) $default_headers );
+	if ($context && $extra_headers = apply_filters("extra_{$context}_headers", array())) {
+		$extra_headers = array_combine($extra_headers, $extra_headers); // keys equal values
+		$all_headers = array_merge($extra_headers, (array) $default_headers);
 	} else {
 		$all_headers = $default_headers;
 	}
 
-	foreach ( $all_headers as $field => $regex ) {
-		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] )
-			$all_headers[ $field ] = _cleanup_header_comment( $match[1] );
+	foreach ($all_headers as $field => $regex) {
+		if (preg_match('/^[ \t\/*#@]*'.preg_quote($regex, '/').':(.*)$/mi', $file_data, $match) && $match[1])
+			$all_headers[$field] = _cleanup_header_comment($match[1]);
 		else
-			$all_headers[ $field ] = '';
+			$all_headers[$field] = '';
 	}
 
 	return $all_headers;
@@ -4700,7 +4700,7 @@ 
  * @see http://src.chromium.org/viewvc/chrome?view=rev&revision=6985
  */
 function send_nosniff_header() {
-	@header( 'X-Content-Type-Options: nosniff' );
+	@header('X-Content-Type-Options: nosniff');
 }
 
 /**
@@ -4712,8 +4712,8 @@ 
  * @param string $column Database column.
  * @return string SQL clause.
  */
-function _wp_mysql_week( $column ) {
-	switch ( $start_of_week = (int) get_option( 'start_of_week' ) ) {
+function _wp_mysql_week($column) {
+	switch ($start_of_week = (int) get_option('start_of_week')) {
 	case 1 :
 		return "WEEK( $column, 1 )";
 	case 2 :
@@ -4741,13 +4741,13 @@ 
  * @param array    $callback_args Optional. Additional arguments to send to $callback.
  * @return array IDs of all members of loop.
  */
-function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {
-	$override = is_null( $start_parent ) ? array() : array( $start => $start_parent );
+function wp_find_hierarchy_loop($callback, $start, $start_parent, $callback_args = array()) {
+	$override = is_null($start_parent) ? array() : array($start => $start_parent);
 
-	if ( !$arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) )
+	if ( ! $arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare($callback, $start, $override, $callback_args))
 		return array();
 
-	return wp_find_hierarchy_loop_tortoise_hare( $callback, $arbitrary_loop_member, $override, $callback_args, true );
+	return wp_find_hierarchy_loop_tortoise_hare($callback, $arbitrary_loop_member, $override, $callback_args, true);
 }
 
 /**
@@ -4770,7 +4770,7 @@ 
  * @return mixed Scalar ID of some arbitrary member of the loop, or array of IDs of all members of loop if
  *               $_return_loop
  */
-function wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override = array(), $callback_args = array(), $_return_loop = false ) {
+function wp_find_hierarchy_loop_tortoise_hare($callback, $start, $override = array(), $callback_args = array(), $_return_loop = false) {
 	$tortoise = $hare = $evanescent_hare = $start;
 	$return = array();
 
@@ -4779,19 +4779,19 @@ 
 	while (
 		$tortoise
 	&&
-		( $evanescent_hare = isset( $override[$hare] ) ? $override[$hare] : call_user_func_array( $callback, array_merge( array( $hare ), $callback_args ) ) )
+		($evanescent_hare = isset($override[$hare]) ? $override[$hare] : call_user_func_array($callback, array_merge(array($hare), $callback_args)))
 	&&
-		( $hare = isset( $override[$evanescent_hare] ) ? $override[$evanescent_hare] : call_user_func_array( $callback, array_merge( array( $evanescent_hare ), $callback_args ) ) )
+		($hare = isset($override[$evanescent_hare]) ? $override[$evanescent_hare] : call_user_func_array($callback, array_merge(array($evanescent_hare), $callback_args)))
 	) {
-		if ( $_return_loop )
+		if ($_return_loop)
 			$return[$tortoise] = $return[$evanescent_hare] = $return[$hare] = true;
 
 		// tortoise got lapped - must be a loop
-		if ( $tortoise == $evanescent_hare || $tortoise == $hare )
+		if ($tortoise == $evanescent_hare || $tortoise == $hare)
 			return $_return_loop ? $return : $tortoise;
 
 		// Increment tortoise by one step
-		$tortoise = isset( $override[$tortoise] ) ? $override[$tortoise] : call_user_func_array( $callback, array_merge( array( $tortoise ), $callback_args ) );
+		$tortoise = isset($override[$tortoise]) ? $override[$tortoise] : call_user_func_array($callback, array_merge(array($tortoise), $callback_args));
 	}
 
 	return false;
@@ -4805,7 +4805,7 @@ 
  * @see https://developer.mozilla.org/en/the_x-frame-options_response_header
  */
 function send_frame_options_header() {
-	@header( 'X-Frame-Options: SAMEORIGIN' );
+	@header('X-Frame-Options: SAMEORIGIN');
 }
 
 /**
@@ -4826,8 +4826,8 @@ 
 function wp_allowed_protocols() {
 	static $protocols = array();
 
-	if ( empty( $protocols ) ) {
-		$protocols = array( 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn', 'tel', 'fax', 'xmpp', 'webcal' );
+	if (empty($protocols)) {
+		$protocols = array('http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn', 'tel', 'fax', 'xmpp', 'webcal');
 
 		/**
 		 * Filter the list of protocols allowed in HTML attributes.
@@ -4836,7 +4836,7 @@ 
 		 *
 		 * @param array $protocols Array of allowed protocols e.g. 'http', 'ftp', 'tel', and more.
 		 */
-		$protocols = apply_filters( 'kses_allowed_protocols', $protocols );
+		$protocols = apply_filters('kses_allowed_protocols', $protocols);
 	}
 
 	return $protocols;
@@ -4859,36 +4859,36 @@ 
  * @return string|array Either a string containing a reversed comma separated trace or an array
  *                      of individual calls.
  */
-function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pretty = true ) {
-	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) )
-		$trace = debug_backtrace( false );
+function wp_debug_backtrace_summary($ignore_class = null, $skip_frames = 0, $pretty = true) {
+	if (version_compare(PHP_VERSION, '5.2.5', '>='))
+		$trace = debug_backtrace(false);
 	else
 		$trace = debug_backtrace();
 
 	$caller = array();
-	$check_class = ! is_null( $ignore_class );
+	$check_class = ! is_null($ignore_class);
 	$skip_frames++; // skip this function
 
-	foreach ( $trace as $call ) {
-		if ( $skip_frames > 0 ) {
+	foreach ($trace as $call) {
+		if ($skip_frames > 0) {
 			$skip_frames--;
-		} elseif ( isset( $call['class'] ) ) {
-			if ( $check_class && $ignore_class == $call['class'] )
+		} elseif (isset($call['class'])) {
+			if ($check_class && $ignore_class == $call['class'])
 				continue; // Filter out calls
 
 			$caller[] = "{$call['class']}{$call['type']}{$call['function']}";
 		} else {
-			if ( in_array( $call['function'], array( 'do_action', 'apply_filters' ) ) ) {
+			if (in_array($call['function'], array('do_action', 'apply_filters'))) {
 				$caller[] = "{$call['function']}('{$call['args'][0]}')";
-			} elseif ( in_array( $call['function'], array( 'include', 'include_once', 'require', 'require_once' ) ) ) {
-				$caller[] = $call['function'] . "('" . str_replace( array( WP_CONTENT_DIR, ABSPATH ) , '', $call['args'][0] ) . "')";
+			} elseif (in_array($call['function'], array('include', 'include_once', 'require', 'require_once'))) {
+				$caller[] = $call['function']."('".str_replace(array(WP_CONTENT_DIR, ABSPATH), '', $call['args'][0])."')";
 			} else {
 				$caller[] = $call['function'];
 			}
 		}
 	}
-	if ( $pretty )
-		return join( ', ', array_reverse( $caller ) );
+	if ($pretty)
+		return join(', ', array_reverse($caller));
 	else
 		return $caller;
 }
@@ -4904,11 +4904,11 @@ 
  *
  * @return array List of ids not present in the cache.
  */
-function _get_non_cached_ids( $object_ids, $cache_key ) {
+function _get_non_cached_ids($object_ids, $cache_key) {
 	$clean = array();
-	foreach ( $object_ids as $id ) {
+	foreach ($object_ids as $id) {
 		$id = (int) $id;
-		if ( !wp_cache_get( $id, $cache_key ) ) {
+		if ( ! wp_cache_get($id, $cache_key)) {
 			$clean[] = $id;
 		}
 	}
@@ -4925,15 +4925,15 @@ 
  * @return bool Whether the device is able to upload files.
  */
 function _device_can_upload() {
-	if ( ! wp_is_mobile() )
+	if ( ! wp_is_mobile())
 		return true;
 
 	$ua = $_SERVER['HTTP_USER_AGENT'];
 
-	if ( strpos($ua, 'iPhone') !== false
+	if (strpos($ua, 'iPhone') !== false
 		|| strpos($ua, 'iPad') !== false
-		|| strpos($ua, 'iPod') !== false ) {
-			return preg_match( '#OS ([\d_]+) like Mac OS X#', $ua, $version ) && version_compare( $version[1], '6', '>=' );
+		|| strpos($ua, 'iPod') !== false) {
+			return preg_match('#OS ([\d_]+) like Mac OS X#', $ua, $version) && version_compare($version[1], '6', '>=');
 	}
 
 	return true;
@@ -4945,11 +4945,11 @@ 
  * @param string $path The resource path or URL.
  * @return bool True if the path is a stream URL.
  */
-function wp_is_stream( $path ) {
+function wp_is_stream($path) {
 	$wrappers = stream_get_wrappers();
-	$wrappers_re = '(' . join('|', $wrappers) . ')';
+	$wrappers_re = '('.join('|', $wrappers).')';
 
-	return preg_match( "!^$wrappers_re://!", $path ) === 1;
+	return preg_match("!^$wrappers_re://!", $path) === 1;
 }
 
 /**
@@ -4965,7 +4965,7 @@ 
  * @param  string $source_date The date to filter.
  * @return bool True if valid date, false if not valid date.
  */
-function wp_checkdate( $month, $day, $year, $source_date ) {
+function wp_checkdate($month, $day, $year, $source_date) {
 	/**
 	 * Filter whether the given date is valid for the Gregorian calendar.
 	 *
@@ -4974,7 +4974,7 @@ 
 	 * @param bool   $checkdate   Whether the given date is valid.
 	 * @param string $source_date Date to check.
 	 */
-	return apply_filters( 'wp_checkdate', checkdate( $month, $day, $year ), $source_date );
+	return apply_filters('wp_checkdate', checkdate($month, $day, $year), $source_date);
 }
 
 /**
@@ -4989,15 +4989,15 @@ 
  * @since 3.6.0
  */
 function wp_auth_check_load() {
-	if ( ! is_admin() && ! is_user_logged_in() )
+	if ( ! is_admin() && ! is_user_logged_in())
 		return;
 
-	if ( defined( 'IFRAME_REQUEST' ) )
+	if (defined('IFRAME_REQUEST'))
 		return;
 
 	$screen = get_current_screen();
-	$hidden = array( 'update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network' );
-	$show = ! in_array( $screen->id, $hidden );
+	$hidden = array('update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network');
+	$show = ! in_array($screen->id, $hidden);
 
 	/**
 	 * Filter whether to load the authentication check.
@@ -5010,12 +5010,12 @@ 
 	 * @param bool      $show   Whether to load the authentication check.
 	 * @param WP_Screen $screen The current screen object.
 	 */
-	if ( apply_filters( 'wp_auth_check_load', $show, $screen ) ) {
-		wp_enqueue_style( 'wp-auth-check' );
-		wp_enqueue_script( 'wp-auth-check' );
+	if (apply_filters('wp_auth_check_load', $show, $screen)) {
+		wp_enqueue_style('wp-auth-check');
+		wp_enqueue_script('wp-auth-check');
 
-		add_action( 'admin_print_footer_scripts', 'wp_auth_check_html', 5 );
-		add_action( 'wp_print_footer_scripts', 'wp_auth_check_html', 5 );
+		add_action('admin_print_footer_scripts', 'wp_auth_check_html', 5);
+		add_action('wp_print_footer_scripts', 'wp_auth_check_html', 5);
 	}
 }
 
@@ -5026,8 +5026,8 @@ 
  */
 function wp_auth_check_html() {
 	$login_url = wp_login_url();
-	$current_domain = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'];
-	$same_domain = ( strpos( $login_url, $current_domain ) === 0 );
+	$current_domain = (is_ssl() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'];
+	$same_domain = (strpos($login_url, $current_domain) === 0);
 
 	/**
 	 * Filter whether the authentication check originated at the same domain.
@@ -5036,26 +5036,26 @@ 
 	 *
 	 * @param bool $same_domain Whether the authentication check originated at the same domain.
 	 */
-	$same_domain = apply_filters( 'wp_auth_check_same_domain', $same_domain );
+	$same_domain = apply_filters('wp_auth_check_same_domain', $same_domain);
 	$wrap_class = $same_domain ? 'hidden' : 'hidden fallback';
 
 	?>
 	<div id="wp-auth-check-wrap" class="<?php echo $wrap_class; ?>">
 	<div id="wp-auth-check-bg"></div>
 	<div id="wp-auth-check">
-	<button type="button" class="wp-auth-check-close button-link"><span class="screen-reader-text"><?php _e( 'Close dialog' ); ?></span></button>
+	<button type="button" class="wp-auth-check-close button-link"><span class="screen-reader-text"><?php _e('Close dialog'); ?></span></button>
 	<?php
 
-	if ( $same_domain ) {
+	if ($same_domain) {
 		?>
-		<div id="wp-auth-check-form" class="loading" data-src="<?php echo esc_url( add_query_arg( array( 'interim-login' => 1 ), $login_url ) ); ?>"></div>
+		<div id="wp-auth-check-form" class="loading" data-src="<?php echo esc_url(add_query_arg(array('interim-login' => 1), $login_url)); ?>"></div>
 		<?php
 	}
 
 	?>
 	<div class="wp-auth-fallback">
 		<p><b class="wp-auth-fallback-expired" tabindex="0"><?php _e('Session expired'); ?></b></p>
-		<p><a href="<?php echo esc_url( $login_url ); ?>" target="_blank"><?php _e('Please log in again.'); ?></a>
+		<p><a href="<?php echo esc_url($login_url); ?>" target="_blank"><?php _e('Please log in again.'); ?></a>
 		<?php _e('The login page will open in a new window. After logging in you can close it and return to this page.'); ?></p>
 	</div>
 	</div>
@@ -5076,8 +5076,8 @@ 
  * @param array $response  The Heartbeat response.
  * @return array $response The Heartbeat response with 'wp-auth-check' value set.
  */
-function wp_auth_check( $response ) {
-	$response['wp-auth-check'] = is_user_logged_in() && empty( $GLOBALS['login_grace_period'] );
+function wp_auth_check($response) {
+	$response['wp-auth-check'] = is_user_logged_in() && empty($GLOBALS['login_grace_period']);
 	return $response;
 }
 
@@ -5097,10 +5097,10 @@ 
  * @param string $tag An HTML tag name. Example: 'video'.
  * @return string Tag RegEx.
  */
-function get_tag_regex( $tag ) {
-	if ( empty( $tag ) )
+function get_tag_regex($tag) {
+	if (empty($tag))
 		return;
-	return sprintf( '<%1$s[^<]*(?:>[\s\S]*<\/%1$s>|\s*\/>)', tag_escape( $tag ) );
+	return sprintf('<%1$s[^<]*(?:>[\s\S]*<\/%1$s>|\s*\/>)', tag_escape($tag));
 }
 
 /**
@@ -5115,13 +5115,13 @@ 
  * @param string $charset A charset name.
  * @return string The canonical form of the charset.
  */
-function _canonical_charset( $charset ) {
-	if ( 'UTF-8' === $charset || 'utf-8' === $charset || 'utf8' === $charset ||
-		'UTF8' === $charset )
+function _canonical_charset($charset) {
+	if ('UTF-8' === $charset || 'utf-8' === $charset || 'utf8' === $charset ||
+		'UTF8' === $charset)
 		return 'UTF-8';
 
-	if ( 'ISO-8859-1' === $charset || 'iso-8859-1' === $charset ||
-		'iso8859-1' === $charset || 'ISO8859-1' === $charset )
+	if ('ISO-8859-1' === $charset || 'iso-8859-1' === $charset ||
+		'iso8859-1' === $charset || 'ISO8859-1' === $charset)
 		return 'ISO-8859-1';
 
 	return $charset;
@@ -5153,25 +5153,25 @@ 
  * @param bool $reset Optional. Whether to reset the encoding back to a previously-set encoding.
  *                    Default false.
  */
-function mbstring_binary_safe_encoding( $reset = false ) {
+function mbstring_binary_safe_encoding($reset = false) {
 	static $encodings = array();
 	static $overloaded = null;
 
-	if ( is_null( $overloaded ) )
-		$overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 );
+	if (is_null($overloaded))
+		$overloaded = function_exists('mb_internal_encoding') && (ini_get('mbstring.func_overload') & 2);
 
-	if ( false === $overloaded )
+	if (false === $overloaded)
 		return;
 
-	if ( ! $reset ) {
+	if ( ! $reset) {
 		$encoding = mb_internal_encoding();
-		array_push( $encodings, $encoding );
-		mb_internal_encoding( 'ISO-8859-1' );
+		array_push($encodings, $encoding);
+		mb_internal_encoding('ISO-8859-1');
 	}
 
-	if ( $reset && $encodings ) {
-		$encoding = array_pop( $encodings );
-		mb_internal_encoding( $encoding );
+	if ($reset && $encodings) {
+		$encoding = array_pop($encodings);
+		mb_internal_encoding($encoding);
 	}
 }
 
@@ -5183,7 +5183,7 @@ 
  * @since 3.7.0
  */
 function reset_mbstring_encoding() {
-	mbstring_binary_safe_encoding( true );
+	mbstring_binary_safe_encoding(true);
 }
 
 /**
@@ -5196,12 +5196,12 @@ 
  * @param mixed $var Boolean value to validate.
  * @return bool Whether the value is validated.
  */
-function wp_validate_boolean( $var ) {
-	if ( is_bool( $var ) ) {
+function wp_validate_boolean($var) {
+	if (is_bool($var)) {
 		return $var;
 	}
 
-	if ( is_string( $var ) && 'false' === strtolower( $var ) ) {
+	if (is_string($var) && 'false' === strtolower($var)) {
 		return false;
 	}
 
@@ -5215,7 +5215,7 @@ 
  *
  * @param string $file The path to the file to delete.
  */
-function wp_delete_file( $file ) {
+function wp_delete_file($file) {
 	/**
 	 * Filter the path of the file to delete.
 	 *
@@ -5223,9 +5223,9 @@ 
 	 *
 	 * @param string $medium Path to the file to delete.
 	 */
-	$delete = apply_filters( 'wp_delete_file', $file );
-	if ( ! empty( $delete ) ) {
-		@unlink( $delete );
+	$delete = apply_filters('wp_delete_file', $file);
+	if ( ! empty($delete)) {
+		@unlink($delete);
 	}
 }
 
@@ -5239,12 +5239,12 @@ 
 function wp_post_preview_js() {
 	global $post;
 
-	if ( ! is_preview() || empty( $post ) ) {
+	if ( ! is_preview() || empty($post)) {
 		return;
 	}
 
 	// Has to match the window name used in post_submit_meta_box()
-	$name = 'wp-preview-' . (int) $post->ID;
+	$name = 'wp-preview-'.(int) $post->ID;
 
 	?>
 	<script>
@@ -5274,9 +5274,9 @@ 
  * @param string $date_string Date string to parse and format.
  * @return string Date formatted for ISO8601/RFC3339.
  */
-function mysql_to_rfc3339( $date_string ) {
-	$formatted = mysql2date( 'c', $date_string, false );
+function mysql_to_rfc3339($date_string) {
+	$formatted = mysql2date('c', $date_string, false);
 
 	// Strip timezone information
-	return preg_replace( '/(?:Z|[+-]\d{2}(?::\d{2})?)$/', '', $formatted );
+	return preg_replace('/(?:Z|[+-]\d{2}(?::\d{2})?)$/', '', $formatted);
 }

Braces +522 added lines, -369 removed lines

@@ -24,22 +24,26 @@ 
  * @return string|int|bool Formatted date string or Unix timestamp. False if $date is empty.
  */
 function mysql2date( $format, $date, $translate = true ) {
-	if ( empty( $date ) )
-		return false;
+	if ( empty( $date ) ) {
+			return false;
+	}
 
-	if ( 'G' == $format )
-		return strtotime( $date . ' +0000' );
+	if ( 'G' == $format ) {
+			return strtotime( $date . ' +0000' );
+	}
 
 	$i = strtotime( $date );
 
-	if ( 'U' == $format )
-		return $i;
+	if ( 'U' == $format ) {
+			return $i;
+	}
 
-	if ( $translate )
-		return date_i18n( $format, $i );
-	else
-		return date( $format, $i );
-}
+	if ( $translate ) {
+			return date_i18n( $format, $i );
+	} else {
+			return date( $format, $i );
+	}
+	}
 
 /**
  * Retrieve the current time based on specified type.
@@ -91,10 +95,11 @@ 
 	$i = $unixtimestamp;
 
 	if ( false === $i ) {
-		if ( ! $gmt )
-			$i = current_time( 'timestamp' );
-		else
-			$i = time();
+		if ( ! $gmt ) {
+					$i = current_time( 'timestamp' );
+		} else {
+					$i = time();
+		}
 		// we should not let date() interfere with our
 		// specially computed timestamp
 		$gmt = true;
@@ -297,11 +302,13 @@ 
 	// The day of the week from the timestamp.
 	$weekday = date( 'w', $day );
 
-	if ( !is_numeric($start_of_week) )
-		$start_of_week = get_option( 'start_of_week' );
+	if ( !is_numeric($start_of_week) ) {
+			$start_of_week = get_option( 'start_of_week' );
+	}
 
-	if ( $weekday < $start_of_week )
-		$weekday += 7;
+	if ( $weekday < $start_of_week ) {
+			$weekday += 7;
+	}
 
 	// The most recent week start day on or before $day.
 	$start = $day - DAY_IN_SECONDS * ( $weekday - $start_of_week );
@@ -320,8 +327,10 @@ 
  * @return mixed Unserialized data can be any type.
  */
 function maybe_unserialize( $original ) {
-	if ( is_serialized( $original ) ) // don't attempt to unserialize data that wasn't serialized going in
+	if ( is_serialized( $original ) ) {
+		// don't attempt to unserialize data that wasn't serialized going in
 		return @unserialize( $original );
+	}
 	return $original;
 }
 
@@ -361,13 +370,16 @@ 
 		$semicolon = strpos( $data, ';' );
 		$brace     = strpos( $data, '}' );
 		// Either ; or } must exist.
-		if ( false === $semicolon && false === $brace )
-			return false;
+		if ( false === $semicolon && false === $brace ) {
+					return false;
+		}
 		// But neither must be in the first X characters.
-		if ( false !== $semicolon && $semicolon < 3 )
-			return false;
-		if ( false !== $brace && $brace < 4 )
-			return false;
+		if ( false !== $semicolon && $semicolon < 3 ) {
+					return false;
+		}
+		if ( false !== $brace && $brace < 4 ) {
+					return false;
+		}
 	}
 	$token = $data[0];
 	switch ( $token ) {
@@ -430,14 +442,16 @@ 
  * @return mixed A scalar data
  */
 function maybe_serialize( $data ) {
-	if ( is_array( $data ) || is_object( $data ) )
-		return serialize( $data );
+	if ( is_array( $data ) || is_object( $data ) ) {
+			return serialize( $data );
+	}
 
 	// Double serialization is required for backward compatibility.
 	// See https://core.trac.wordpress.org/ticket/12930
 	// Also the world will end. See WP 3.6.1.
-	if ( is_serialized( $data, false ) )
-		return serialize( $data );
+	if ( is_serialized( $data, false ) ) {
+			return serialize( $data );
+	}
 
 	return $data;
 }
@@ -565,20 +579,23 @@ 
 	foreach ( $pung as $link_test ) {
 		if ( ! in_array( $link_test, $post_links_temp ) ) { // link no longer in post
 			$mids = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $link_test ) . '%') );
-			foreach ( $mids as $mid )
-				delete_metadata_by_mid( 'post', $mid );
+			foreach ( $mids as $mid ) {
+							delete_metadata_by_mid( 'post', $mid );
+			}
 		}
 	}
 
 	foreach ( (array) $post_links_temp as $link_test ) {
 		if ( !in_array( $link_test, $pung ) ) { // If we haven't pung it already
 			$test = @parse_url( $link_test );
-			if ( false === $test )
-				continue;
-			if ( isset( $test['query'] ) )
-				$post_links[] = $link_test;
-			elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) )
-				$post_links[] = $link_test;
+			if ( false === $test ) {
+							continue;
+			}
+			if ( isset( $test['query'] ) ) {
+							$post_links[] = $link_test;
+			} elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) ) {
+							$post_links[] = $link_test;
+			}
 		}
 	}
 
@@ -636,13 +653,15 @@ 
  * @return bool|string False on failure, headers on success.
  */
 function wp_get_http_headers( $url, $deprecated = false ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.7' );
+	}
 
 	$response = wp_safe_remote_head( $url );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	return wp_remote_retrieve_headers( $response );
 }
@@ -660,11 +679,12 @@ 
  */
 function is_new_day() {
 	global $currentday, $previousday;
-	if ( $currentday != $previousday )
-		return 1;
-	else
-		return 0;
-}
+	if ( $currentday != $previousday ) {
+			return 1;
+	} else {
+			return 0;
+	}
+	}
 
 /**
  * Build URL query based on an associative and, or indexed array.
@@ -707,27 +727,33 @@ 
 	$ret = array();
 
 	foreach ( (array) $data as $k => $v ) {
-		if ( $urlencode)
-			$k = urlencode($k);
-		if ( is_int($k) && $prefix != null )
-			$k = $prefix.$k;
-		if ( !empty($key) )
-			$k = $key . '%5B' . $k . '%5D';
-		if ( $v === null )
-			continue;
-		elseif ( $v === false )
-			$v = '0';
+		if ( $urlencode) {
+					$k = urlencode($k);
+		}
+		if ( is_int($k) && $prefix != null ) {
+					$k = $prefix.$k;
+		}
+		if ( !empty($key) ) {
+					$k = $key . '%5B' . $k . '%5D';
+		}
+		if ( $v === null ) {
+					continue;
+		} elseif ( $v === false ) {
+					$v = '0';
+		}
 
-		if ( is_array($v) || is_object($v) )
-			array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
-		elseif ( $urlencode )
-			array_push($ret, $k.'='.urlencode($v));
-		else
-			array_push($ret, $k.'='.$v);
+		if ( is_array($v) || is_object($v) ) {
+					array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
+		} elseif ( $urlencode ) {
+					array_push($ret, $k.'='.urlencode($v));
+		} else {
+					array_push($ret, $k.'='.$v);
+		}
 	}
 
-	if ( null === $sep )
-		$sep = ini_get('arg_separator.output');
+	if ( null === $sep ) {
+			$sep = ini_get('arg_separator.output');
+	}
 
 	return implode($sep, $ret);
 }
@@ -770,21 +796,24 @@ 
 function add_query_arg() {
 	$args = func_get_args();
 	if ( is_array( $args[0] ) ) {
-		if ( count( $args ) < 2 || false === $args[1] )
-			$uri = $_SERVER['REQUEST_URI'];
-		else
-			$uri = $args[1];
+		if ( count( $args ) < 2 || false === $args[1] ) {
+					$uri = $_SERVER['REQUEST_URI'];
+		} else {
+					$uri = $args[1];
+		}
 	} else {
-		if ( count( $args ) < 3 || false === $args[2] )
-			$uri = $_SERVER['REQUEST_URI'];
-		else
-			$uri = $args[2];
+		if ( count( $args ) < 3 || false === $args[2] ) {
+					$uri = $_SERVER['REQUEST_URI'];
+		} else {
+					$uri = $args[2];
+		}
 	}
 
-	if ( $frag = strstr( $uri, '#' ) )
-		$uri = substr( $uri, 0, -strlen( $frag ) );
-	else
-		$frag = '';
+	if ( $frag = strstr( $uri, '#' ) ) {
+			$uri = substr( $uri, 0, -strlen( $frag ) );
+	} else {
+			$frag = '';
+	}
 
 	if ( 0 === stripos( $uri, 'http://' ) ) {
 		$protocol = 'http://';
@@ -818,8 +847,9 @@ 
 	}
 
 	foreach ( $qs as $k => $v ) {
-		if ( $v === false )
-			unset( $qs[$k] );
+		if ( $v === false ) {
+					unset( $qs[$k] );
+		}
 	}
 
 	$ret = build_query( $qs );
@@ -841,8 +871,9 @@ 
  */
 function remove_query_arg( $key, $query = false ) {
 	if ( is_array( $key ) ) { // removing multiple keys
-		foreach ( $key as $k )
-			$query = add_query_arg( $k, false, $query );
+		foreach ( $key as $k ) {
+					$query = add_query_arg( $k, false, $query );
+		}
 		return $query;
 	}
 	return add_query_arg( $key, false, $query );
@@ -922,16 +953,18 @@ 
 function wp_remote_fopen( $uri ) {
 	$parsed_url = @parse_url( $uri );
 
-	if ( !$parsed_url || !is_array( $parsed_url ) )
-		return false;
+	if ( !$parsed_url || !is_array( $parsed_url ) ) {
+			return false;
+	}
 
 	$options = array();
 	$options['timeout'] = 10;
 
 	$response = wp_safe_remote_get( $uri, $options );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	return wp_remote_retrieve_body( $response );
 }
@@ -951,9 +984,10 @@ 
 	global $wp, $wp_query, $wp_the_query;
 	$wp->main( $query_vars );
 
-	if ( !isset($wp_the_query) )
-		$wp_the_query = $wp_query;
-}
+	if ( !isset($wp_the_query) ) {
+			$wp_the_query = $wp_query;
+	}
+	}
 
 /**
  * Retrieve the description for the HTTP status.
@@ -1038,11 +1072,12 @@ 
 		);
 	}
 
-	if ( isset( $wp_header_to_desc[$code] ) )
-		return $wp_header_to_desc[$code];
-	else
-		return '';
-}
+	if ( isset( $wp_header_to_desc[$code] ) ) {
+			return $wp_header_to_desc[$code];
+	} else {
+			return '';
+	}
+	}
 
 /**
  * Set HTTP status header.
@@ -1066,8 +1101,8 @@ 
 
 	$protocol = wp_get_server_protocol();
 	$status_header = "$protocol $code $description";
-	if ( function_exists( 'apply_filters' ) )
-
+	if ( function_exists( 'apply_filters' ) ) {
+	
 		/**
 		 * Filter an HTTP status header.
 		 *
@@ -1079,6 +1114,7 @@ 
 		 * @param string $protocol      Server protocol.
 		 */
 		$status_header = apply_filters( 'status_header', $status_header, $code, $description, $protocol );
+	}
 
 	@header( $status_header, true, $code );
 }
@@ -1152,9 +1188,10 @@ 
 		}
 	}
 
-	foreach ( $headers as $name => $field_value )
-		@header("{$name}: {$field_value}");
-}
+	foreach ( $headers as $name => $field_value ) {
+			@header("{$name}: {$field_value}");
+	}
+	}
 
 /**
  * Set the headers for caching for 10 days with JavaScript content type.
@@ -1217,8 +1254,9 @@ 
 	// Remove the pad, if present.
 	$feed = preg_replace( '/^_+/', '', $feed );
 
-	if ( $feed == '' || $feed == 'feed' )
-		$feed = get_default_feed();
+	if ( $feed == '' || $feed == 'feed' ) {
+			$feed = get_default_feed();
+	}
 
 	if ( ! has_action( "do_feed_{$feed}" ) ) {
 		wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
@@ -1271,11 +1309,12 @@ 
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
 function do_feed_rss2( $for_comments ) {
-	if ( $for_comments )
-		load_template( ABSPATH . WPINC . '/feed-rss2-comments.php' );
-	else
-		load_template( ABSPATH . WPINC . '/feed-rss2.php' );
-}
+	if ( $for_comments ) {
+			load_template( ABSPATH . WPINC . '/feed-rss2-comments.php' );
+	} else {
+			load_template( ABSPATH . WPINC . '/feed-rss2.php' );
+	}
+	}
 
 /**
  * Load either Atom comment feed or Atom posts feed.
@@ -1287,11 +1326,12 @@ 
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
 function do_feed_atom( $for_comments ) {
-	if ($for_comments)
-		load_template( ABSPATH . WPINC . '/feed-atom-comments.php');
-	else
-		load_template( ABSPATH . WPINC . '/feed-atom.php' );
-}
+	if ($for_comments) {
+			load_template( ABSPATH . WPINC . '/feed-atom-comments.php');
+	} else {
+			load_template( ABSPATH . WPINC . '/feed-atom.php' );
+	}
+	}
 
 /**
  * Display the robots.txt file content.
@@ -1355,29 +1395,33 @@ 
 	 * Check cache first. If options table goes away and we have true
 	 * cached, oh well.
 	 */
-	if ( wp_cache_get( 'is_blog_installed' ) )
-		return true;
+	if ( wp_cache_get( 'is_blog_installed' ) ) {
+			return true;
+	}
 
 	$suppress = $wpdb->suppress_errors();
 	if ( ! wp_installing() ) {
 		$alloptions = wp_load_alloptions();
 	}
 	// If siteurl is not set to autoload, check it specifically
-	if ( !isset( $alloptions['siteurl'] ) )
-		$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
-	else
-		$installed = $alloptions['siteurl'];
+	if ( !isset( $alloptions['siteurl'] ) ) {
+			$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
+	} else {
+			$installed = $alloptions['siteurl'];
+	}
 	$wpdb->suppress_errors( $suppress );
 
 	$installed = !empty( $installed );
 	wp_cache_set( 'is_blog_installed', $installed );
 
-	if ( $installed )
-		return true;
+	if ( $installed ) {
+			return true;
+	}
 
 	// If visiting repair.php, return true and let it take over.
-	if ( defined( 'WP_REPAIRING' ) )
-		return true;
+	if ( defined( 'WP_REPAIRING' ) ) {
+			return true;
+	}
 
 	$suppress = $wpdb->suppress_errors();
 
@@ -1389,13 +1433,16 @@ 
 	$wp_tables = $wpdb->tables();
 	foreach ( $wp_tables as $table ) {
 		// The existence of custom user tables shouldn't suggest an insane state or prevent a clean install.
-		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
-			continue;
-		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
-			continue;
+		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table ) {
+					continue;
+		}
+		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table ) {
+					continue;
+		}
 
-		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) )
-			continue;
+		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) ) {
+					continue;
+		}
 
 		// One or more tables exist. We are insane.
 
@@ -1458,11 +1505,13 @@ 
 	$name = esc_attr( $name );
 	$nonce_field = '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . wp_create_nonce( $action ) . '" />';
 
-	if ( $referer )
-		$nonce_field .= wp_referer_field( false );
+	if ( $referer ) {
+			$nonce_field .= wp_referer_field( false );
+	}
 
-	if ( $echo )
-		echo $nonce_field;
+	if ( $echo ) {
+			echo $nonce_field;
+	}
 
 	return $nonce_field;
 }
@@ -1481,8 +1530,9 @@ 
 function wp_referer_field( $echo = true ) {
 	$referer_field = '<input type="hidden" name="_wp_http_referer" value="'. esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
 
-	if ( $echo )
-		echo $referer_field;
+	if ( $echo ) {
+			echo $referer_field;
+	}
 	return $referer_field;
 }
 
@@ -1505,8 +1555,9 @@ 
 		$ref = 'previous' == $jump_back_to ? wp_get_referer() : wp_unslash( $_SERVER['REQUEST_URI'] );
 	}
 	$orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . esc_attr( $ref ) . '" />';
-	if ( $echo )
-		echo $orig_referer_field;
+	if ( $echo ) {
+			echo $orig_referer_field;
+	}
 	return $orig_referer_field;
 }
 
@@ -1560,8 +1611,9 @@ 
  * @return string|false False if no original referer or original referer if set.
  */
 function wp_get_original_referer() {
-	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) )
-		return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
+	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) ) {
+			return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
+	}
 	return false;
 }
 
@@ -1596,11 +1648,13 @@ 
 	 * Use rtrim() instead of untrailingslashit to avoid formatting.php dependency.
 	 */
 	$target = rtrim($target, '/');
-	if ( empty($target) )
-		$target = '/';
+	if ( empty($target) ) {
+			$target = '/';
+	}
 
-	if ( file_exists( $target ) )
-		return @is_dir( $target );
+	if ( file_exists( $target ) ) {
+			return @is_dir( $target );
+	}
 
 	// We need to find the permissions of the parent folder that exists and inherit that.
 	$target_parent = dirname( $target );
@@ -1649,15 +1703,18 @@ 
 	 * This is definitive if true but fails if $path does not exist or contains
 	 * a symbolic link.
 	 */
-	if ( realpath($path) == $path )
-		return true;
+	if ( realpath($path) == $path ) {
+			return true;
+	}
 
-	if ( strlen($path) == 0 || $path[0] == '.' )
-		return false;
+	if ( strlen($path) == 0 || $path[0] == '.' ) {
+			return false;
+	}
 
 	// Windows allows absolute paths like this.
-	if ( preg_match('#^[a-zA-Z]:\\\\#', $path) )
-		return true;
+	if ( preg_match('#^[a-zA-Z]:\\\\#', $path) ) {
+			return true;
+	}
 
 	// A path starting with / or \ is absolute; anything else is relative.
 	return ( $path[0] == '/' || $path[0] == '\\' );
@@ -1676,8 +1733,9 @@ 
  * @return string The path with the base or absolute path.
  */
 function path_join( $base, $path ) {
-	if ( path_is_absolute($path) )
-		return $path;
+	if ( path_is_absolute($path) ) {
+			return $path;
+	}
 
 	return rtrim($base, '/') . '/' . ltrim($path, '/');
 }
@@ -1724,25 +1782,30 @@ 
  */
 function get_temp_dir() {
 	static $temp = '';
-	if ( defined('WP_TEMP_DIR') )
-		return trailingslashit(WP_TEMP_DIR);
+	if ( defined('WP_TEMP_DIR') ) {
+			return trailingslashit(WP_TEMP_DIR);
+	}
 
-	if ( $temp )
-		return trailingslashit( $temp );
+	if ( $temp ) {
+			return trailingslashit( $temp );
+	}
 
 	if ( function_exists('sys_get_temp_dir') ) {
 		$temp = sys_get_temp_dir();
-		if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-			return trailingslashit( $temp );
+		if ( @is_dir( $temp ) && wp_is_writable( $temp ) ) {
+					return trailingslashit( $temp );
+		}
 	}
 
 	$temp = ini_get('upload_tmp_dir');
-	if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-		return trailingslashit( $temp );
+	if ( @is_dir( $temp ) && wp_is_writable( $temp ) ) {
+			return trailingslashit( $temp );
+	}
 
 	$temp = WP_CONTENT_DIR . '/';
-	if ( is_dir( $temp ) && wp_is_writable( $temp ) )
-		return $temp;
+	if ( is_dir( $temp ) && wp_is_writable( $temp ) ) {
+			return $temp;
+	}
 
 	return '/tmp/';
 }
@@ -1761,11 +1824,12 @@ 
  * @return bool Whether the path is writable.
  */
 function wp_is_writable( $path ) {
-	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) )
-		return win_is_writable( $path );
-	else
-		return @is_writable( $path );
-}
+	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) ) {
+			return win_is_writable( $path );
+	} else {
+			return @is_writable( $path );
+	}
+	}
 
 /**
  * Workaround for Windows bug in is_writable() function
@@ -1793,11 +1857,13 @@ 
 	// check tmp file for read/write capabilities
 	$should_delete_tmp_file = !file_exists( $path );
 	$f = @fopen( $path, 'a' );
-	if ( $f === false )
-		return false;
+	if ( $f === false ) {
+			return false;
+	}
 	fclose( $f );
-	if ( $should_delete_tmp_file )
-		unlink( $path );
+	if ( $should_delete_tmp_file ) {
+			unlink( $path );
+	}
 	return true;
 }
 
@@ -1921,10 +1987,11 @@ 
 	}
 
 	if ( !$url = get_option( 'upload_url_path' ) ) {
-		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
-			$url = WP_CONTENT_URL . '/uploads';
-		else
-			$url = trailingslashit( $siteurl ) . $upload_path;
+		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) ) {
+					$url = WP_CONTENT_URL . '/uploads';
+		} else {
+					$url = trailingslashit( $siteurl ) . $upload_path;
+		}
 	}
 
 	/*
@@ -1949,10 +2016,11 @@ 
 			 * had wp-content/uploads for the main site.)
 			 */
 
-			if ( defined( 'MULTISITE' ) )
-				$ms_dir = '/sites/' . get_current_blog_id();
-			else
-				$ms_dir = '/' . get_current_blog_id();
+			if ( defined( 'MULTISITE' ) ) {
+							$ms_dir = '/sites/' . get_current_blog_id();
+			} else {
+							$ms_dir = '/' . get_current_blog_id();
+			}
 
 			$dir .= $ms_dir;
 			$url .= $ms_dir;
@@ -1972,10 +2040,11 @@ 
 			 * rewriting in multisite, the resulting URL is /files. (#WP22702 for background.)
 			 */
 
-			if ( defined( 'BLOGUPLOADDIR' ) )
-				$dir = untrailingslashit( BLOGUPLOADDIR );
-			else
-				$dir = ABSPATH . UPLOADS;
+			if ( defined( 'BLOGUPLOADDIR' ) ) {
+							$dir = untrailingslashit( BLOGUPLOADDIR );
+			} else {
+							$dir = ABSPATH . UPLOADS;
+			}
 			$url = trailingslashit( $siteurl ) . 'files';
 		}
 	}
@@ -1986,8 +2055,9 @@ 
 	$subdir = '';
 	if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
 		// Generate the yearly and monthly dirs
-		if ( !$time )
-			$time = current_time( 'mysql' );
+		if ( !$time ) {
+					$time = current_time( 'mysql' );
+		}
 		$y = substr( $time, 0, 4 );
 		$m = substr( $time, 5, 2 );
 		$subdir = "/$y/$m";
@@ -2033,8 +2103,9 @@ 
 	$name = basename($filename, $ext);
 
 	// Edge case: if file is named '.ext', treat as an empty name.
-	if ( $name === $ext )
-		$name = '';
+	if ( $name === $ext ) {
+			$name = '';
+	}
 
 	/*
 	 * Increment the file number until we have a unique file to save in $dir.
@@ -2108,20 +2179,24 @@ 
  * @return array
  */
 function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.0' );
+	}
 
-	if ( empty( $name ) )
-		return array( 'error' => __( 'Empty filename' ) );
+	if ( empty( $name ) ) {
+			return array( 'error' => __( 'Empty filename' ) );
+	}
 
 	$wp_filetype = wp_check_filetype( $name );
-	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) )
-		return array( 'error' => __( 'Invalid file type' ) );
+	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) ) {
+			return array( 'error' => __( 'Invalid file type' ) );
+	}
 
 	$upload = wp_upload_dir( $time );
 
-	if ( $upload['error'] !== false )
-		return $upload;
+	if ( $upload['error'] !== false ) {
+			return $upload;
+	}
 
 	/**
 	 * Filter whether to treat the upload bits as an error.
@@ -2143,18 +2218,20 @@ 
 
 	$new_file = $upload['path'] . "/$filename";
 	if ( ! wp_mkdir_p( dirname( $new_file ) ) ) {
-		if ( 0 === strpos( $upload['basedir'], ABSPATH ) )
-			$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
-		else
-			$error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+		if ( 0 === strpos( $upload['basedir'], ABSPATH ) ) {
+					$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
+		} else {
+					$error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+		}
 
 		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
 		return array( 'error' => $message );
 	}
 
 	$ifp = @ fopen( $new_file, 'wb' );
-	if ( ! $ifp )
-		return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
+	if ( ! $ifp ) {
+			return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
+	}
 
 	@fwrite( $ifp, $bits );
 	fclose( $ifp );
@@ -2207,10 +2284,11 @@ 
 		'code'        => array( 'css', 'htm',  'html', 'php',  'js' ),
 	) );
 
-	foreach ( $ext2type as $type => $exts )
-		if ( in_array( $ext, $exts ) )
+	foreach ( $ext2type as $type => $exts ) {
+			if ( in_array( $ext, $exts ) )
 			return $type;
-}
+	}
+	}
 
 /**
  * Retrieve the file type from the file name.
@@ -2224,8 +2302,9 @@ 
  * @return array Values with extension first and mime type.
  */
 function wp_check_filetype( $filename, $mimes = null ) {
-	if ( empty($mimes) )
-		$mimes = get_allowed_mime_types();
+	if ( empty($mimes) ) {
+			$mimes = get_allowed_mime_types();
+	}
 	$type = false;
 	$ext = false;
 
@@ -2464,11 +2543,13 @@ 
 	$t = wp_get_mime_types();
 
 	unset( $t['swf'], $t['exe'] );
-	if ( function_exists( 'current_user_can' ) )
-		$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );
+	if ( function_exists( 'current_user_can' ) ) {
+			$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );
+	}
 
-	if ( empty( $unfiltered ) )
-		unset( $t['htm|html'] );
+	if ( empty( $unfiltered ) ) {
+			unset( $t['htm|html'] );
+	}
 
 	/**
 	 * Filter list of allowed mime types and file extensions.
@@ -2500,8 +2581,9 @@ 
 		$html .= sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url( $redirect_to ) );
 	} else {
 		$html = __( 'Are you sure you want to do this?' );
-		if ( wp_get_referer() )
-			$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+		if ( wp_get_referer() ) {
+					$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+		}
 	}
 
 	wp_die( $html, __( 'WordPress Failure Notice' ), 403 );
@@ -2603,8 +2685,9 @@ 
 	if ( function_exists( 'is_wp_error' ) && is_wp_error( $message ) ) {
 		if ( empty( $title ) ) {
 			$error_data = $message->get_error_data();
-			if ( is_array( $error_data ) && isset( $error_data['title'] ) )
-				$title = $error_data['title'];
+			if ( is_array( $error_data ) && isset( $error_data['title'] ) ) {
+							$title = $error_data['title'];
+			}
 		}
 		$errors = $message->get_error_messages();
 		switch ( count( $errors ) ) {
@@ -2634,19 +2717,26 @@ 
 			header( 'Content-Type: text/html; charset=utf-8' );
 		}
 
-		if ( empty($title) )
-			$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
+		if ( empty($title) ) {
+					$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
+		}
 
 		$text_direction = 'ltr';
-		if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
-			$text_direction = 'rtl';
-		elseif ( function_exists( 'is_rtl' ) && is_rtl() )
-			$text_direction = 'rtl';
-?>
+		if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] ) {
+					$text_direction = 'rtl';
+		} elseif ( function_exists( 'is_rtl' ) && is_rtl() ) {
+					$text_direction = 'rtl';
+		}
+		?>
 <!DOCTYPE html>
 <!-- Ticket #11289, IE bug fix: always pad the error page with enough characters such that it is greater than 512 bytes, even after gzip compression abcdefghijklmnopqrstuvwxyz1234567890aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz11223344556677889900abacbcbdcdcededfefegfgfhghgihihjijikjkjlklkmlmlnmnmononpopoqpqprqrqsrsrtstsubcbcdcdedefefgfabcadefbghicjkldmnoepqrfstugvwxhyz1i234j567k890laabmbccnddeoeffpgghqhiirjjksklltmmnunoovppqwqrrxsstytuuzvvw0wxx1yyz2z113223434455666777889890091abc2def3ghi4jkl5mno6pqr7stu8vwx9yz11aab2bcc3dd4ee5ff6gg7hh8ii9j0jk1kl2lmm3nnoo4p5pq6qrr7ss8tt9uuvv0wwx1x2yyzz13aba4cbcb5dcdc6dedfef8egf9gfh0ghg1ihi2hji3jik4jkj5lkl6kml7mln8mnm9ono
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) language_attributes(); else echo "dir='$text_direction'"; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) {
+	language_attributes();
+} else {
+	echo "dir='$text_direction'";
+}
+?>>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width">
@@ -2815,8 +2905,9 @@ 
  * @param string $message Optional. Response to print. Default empty.
  */
 function _ajax_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
+	if ( is_scalar( $message ) ) {
+			die( (string) $message );
+	}
 	die( '0' );
 }
 
@@ -2831,8 +2922,9 @@ 
  * @param string $message Optional. Response to print. Default empty.
  */
 function _scalar_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
+	if ( is_scalar( $message ) ) {
+			die( (string) $message );
+	}
 	die();
 }
 
@@ -3038,11 +3130,12 @@ 
 function wp_send_json( $response ) {
 	@header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
 	echo wp_json_encode( $response );
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
-		wp_die();
-	else
-		die;
-}
+	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+			wp_die();
+	} else {
+			die;
+	}
+	}
 
 /**
  * Send a JSON response back to an Ajax request, indicating success.
@@ -3054,8 +3147,9 @@ 
 function wp_send_json_success( $data = null ) {
 	$response = array( 'success' => true );
 
-	if ( isset( $data ) )
-		$response['data'] = $data;
+	if ( isset( $data ) ) {
+			$response['data'] = $data;
+	}
 
 	wp_send_json( $response );
 }
@@ -3111,8 +3205,9 @@ 
  * @return string Homepage location.
  */
 function _config_wp_home( $url = '' ) {
-	if ( defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+	if ( defined( 'WP_HOME' ) ) {
+			return untrailingslashit( WP_HOME );
+	}
 	return $url;
 }
 
@@ -3132,8 +3227,9 @@ 
  * @return string The WordPress Site URL.
  */
 function _config_wp_siteurl( $url = '' ) {
-	if ( defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+	if ( defined( 'WP_SITEURL' ) ) {
+			return untrailingslashit( WP_SITEURL );
+	}
 	return $url;
 }
 
@@ -3197,8 +3293,9 @@ 
 	global $wpsmiliestrans, $wp_smiliessearch;
 
 	// don't bother setting up smilies if they are disabled
-	if ( !get_option( 'use_smilies' ) )
-		return;
+	if ( !get_option( 'use_smilies' ) ) {
+			return;
+	}
 
 	if ( !isset( $wpsmiliestrans ) ) {
 		$wpsmiliestrans = array(
@@ -3302,15 +3399,17 @@ 
  * @return array Merged user defined values with defaults.
  */
 function wp_parse_args( $args, $defaults = '' ) {
-	if ( is_object( $args ) )
-		$r = get_object_vars( $args );
-	elseif ( is_array( $args ) )
-		$r =& $args;
-	else
-		wp_parse_str( $args, $r );
-
-	if ( is_array( $defaults ) )
-		return array_merge( $defaults, $r );
+	if ( is_object( $args ) ) {
+			$r = get_object_vars( $args );
+	} elseif ( is_array( $args ) ) {
+			$r =& $args;
+	} else {
+			wp_parse_str( $args, $r );
+	}
+
+	if ( is_array( $defaults ) ) {
+			return array_merge( $defaults, $r );
+	}
 	return $r;
 }
 
@@ -3323,8 +3422,9 @@ 
  * @return array Sanitized array of IDs.
  */
 function wp_parse_id_list( $list ) {
-	if ( !is_array($list) )
-		$list = preg_split('/[\s,]+/', $list);
+	if ( !is_array($list) ) {
+			$list = preg_split('/[\s,]+/', $list);
+	}
 
 	return array_unique(array_map('absint', $list));
 }
@@ -3340,9 +3440,10 @@ 
  */
 function wp_array_slice_assoc( $array, $keys ) {
 	$slice = array();
-	foreach ( $keys as $key )
-		if ( isset( $array[ $key ] ) )
+	foreach ( $keys as $key ) {
+			if ( isset( $array[ $key ] ) )
 			$slice[ $key ] = $array[ $key ];
+	}
 
 	return $slice;
 }
@@ -3382,13 +3483,15 @@ 
  * @return array A list of objects or object fields.
  */
 function wp_filter_object_list( $list, $args = array(), $operator = 'and', $field = false ) {
-	if ( ! is_array( $list ) )
-		return array();
+	if ( ! is_array( $list ) ) {
+			return array();
+	}
 
 	$list = wp_list_filter( $list, $args, $operator );
 
-	if ( $field )
-		$list = wp_list_pluck( $list, $field );
+	if ( $field ) {
+			$list = wp_list_pluck( $list, $field );
+	}
 
 	return $list;
 }
@@ -3408,11 +3511,13 @@ 
  * @return array Array of found values.
  */
 function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
-	if ( ! is_array( $list ) )
-		return array();
+	if ( ! is_array( $list ) ) {
+			return array();
+	}
 
-	if ( empty( $args ) )
-		return $list;
+	if ( empty( $args ) ) {
+			return $list;
+	}
 
 	$operator = strtoupper( $operator );
 	$count = count( $args );
@@ -3423,8 +3528,9 @@ 
 
 		$matched = 0;
 		foreach ( $args as $m_key => $m_value ) {
-			if ( array_key_exists( $m_key, $to_match ) && $m_value == $to_match[ $m_key ] )
-				$matched++;
+			if ( array_key_exists( $m_key, $to_match ) && $m_value == $to_match[ $m_key ] ) {
+							$matched++;
+			}
 		}
 
 		if ( ( 'AND' == $operator && $matched == $count )
@@ -3533,8 +3639,9 @@ 
 function wp_widgets_add_menu() {
 	global $submenu;
 
-	if ( ! current_theme_supports( 'widgets' ) )
-		return;
+	if ( ! current_theme_supports( 'widgets' ) ) {
+			return;
+	}
 
 	$submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_theme_options', 'widgets.php' );
 	ksort( $submenu['themes.php'], SORT_NUMERIC );
@@ -3549,9 +3656,10 @@ 
  */
 function wp_ob_end_flush_all() {
 	$levels = ob_get_level();
-	for ($i=0; $i<$levels; $i++)
-		ob_end_flush();
-}
+	for ($i=0; $i<$levels; $i++) {
+			ob_end_flush();
+	}
+	}
 
 /**
  * Load custom DB error or display WordPress DB error.
@@ -3583,8 +3691,9 @@ 
 	}
 
 	// If installing or in the admin, provide the verbose message.
-	if ( wp_installing() || defined( 'WP_ADMIN' ) )
-		wp_die($wpdb->error);
+	if ( wp_installing() || defined( 'WP_ADMIN' ) ) {
+			wp_die($wpdb->error);
+	}
 
 	// Otherwise, be terse.
 	status_header( 500 );
@@ -3592,7 +3701,10 @@ 
 	header( 'Content-Type: text/html; charset=utf-8' );
 ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) {
+	echo ' dir="rtl"';
+}
+?>>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title><?php _e( 'Database Error' ); ?></title>
@@ -3658,15 +3770,17 @@ 
 	 */
 	if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
 		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
-			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
+			} else {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			}
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
-			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
+			} else {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			}
 		}
 	}
 }
@@ -3782,15 +3896,17 @@ 
 	if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
 		$message = empty( $message ) ? '' : ' ' . $message;
 		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
-			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
+			} else {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+			}
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
-			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version ) . $message );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
+			} else {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version ) . $message );
+			}
 		}
 	}
 }
@@ -3842,15 +3958,17 @@ 
 	 */
 	if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
 		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
-			else
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			if ( ! is_null( $message ) ) {
+							trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
+			} else {
+							trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			}
 		} else {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
-			else
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			if ( ! is_null( $message ) ) {
+							trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
+			} else {
+							trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			}
 		}
 	}
 }
@@ -3936,19 +4054,22 @@ 
 function apache_mod_loaded($mod, $default = false) {
 	global $is_apache;
 
-	if ( !$is_apache )
-		return false;
+	if ( !$is_apache ) {
+			return false;
+	}
 
 	if ( function_exists( 'apache_get_modules' ) ) {
 		$mods = apache_get_modules();
-		if ( in_array($mod, $mods) )
-			return true;
+		if ( in_array($mod, $mods) ) {
+					return true;
+		}
 	} elseif ( function_exists( 'phpinfo' ) && false === strpos( ini_get( 'disable_functions' ), 'phpinfo' ) ) {
 			ob_start();
 			phpinfo(8);
 			$phpinfo = ob_get_clean();
-			if ( false !== strpos($phpinfo, $mod) )
-				return true;
+			if ( false !== strpos($phpinfo, $mod) ) {
+							return true;
+			}
 	}
 	return $default;
 }
@@ -4004,17 +4125,21 @@ 
  * @return int 0 means nothing is wrong, greater than 0 means something was wrong.
  */
 function validate_file( $file, $allowed_files = '' ) {
-	if ( false !== strpos( $file, '..' ) )
-		return 1;
+	if ( false !== strpos( $file, '..' ) ) {
+			return 1;
+	}
 
-	if ( false !== strpos( $file, './' ) )
-		return 1;
+	if ( false !== strpos( $file, './' ) ) {
+			return 1;
+	}
 
-	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) )
-		return 3;
+	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) ) {
+			return 3;
+	}
 
-	if (':' == substr( $file, 1, 1 ) )
-		return 2;
+	if (':' == substr( $file, 1, 1 ) ) {
+			return 2;
+	}
 
 	return 0;
 }
@@ -4028,10 +4153,12 @@ 
  */
 function is_ssl() {
 	if ( isset($_SERVER['HTTPS']) ) {
-		if ( 'on' == strtolower($_SERVER['HTTPS']) )
-			return true;
-		if ( '1' == $_SERVER['HTTPS'] )
-			return true;
+		if ( 'on' == strtolower($_SERVER['HTTPS']) ) {
+					return true;
+		}
+		if ( '1' == $_SERVER['HTTPS'] ) {
+					return true;
+		}
 	} elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
 		return true;
 	}
@@ -4129,8 +4256,9 @@ 
 function wp_suspend_cache_addition( $suspend = null ) {
 	static $_suspend = false;
 
-	if ( is_bool( $suspend ) )
-		$_suspend = $suspend;
+	if ( is_bool( $suspend ) ) {
+			$_suspend = $suspend;
+	}
 
 	return $_suspend;
 }
@@ -4173,11 +4301,13 @@ 
 	// This is the current network's information; 'site' is old terminology.
 	global $current_site;
 
-	if ( ! is_multisite() )
-		return true;
+	if ( ! is_multisite() ) {
+			return true;
+	}
 
-	if ( ! $site_id )
-		$site_id = get_current_blog_id();
+	if ( ! $site_id ) {
+			$site_id = get_current_blog_id();
+	}
 
 	return (int) $site_id === (int) $current_site->blog_id;
 }
@@ -4256,8 +4386,9 @@ 
  * @return bool True if multisite and global terms enabled.
  */
 function global_terms_enabled() {
-	if ( ! is_multisite() )
-		return false;
+	if ( ! is_multisite() ) {
+			return false;
+	}
 
 	static $global_terms = null;
 	if ( is_null( $global_terms ) ) {
@@ -4273,10 +4404,11 @@ 
 		 * @param null $enabled Whether global terms are enabled.
 		 */
 		$filter = apply_filters( 'global_terms_enabled', null );
-		if ( ! is_null( $filter ) )
-			$global_terms = (bool) $filter;
-		else
-			$global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+		if ( ! is_null( $filter ) ) {
+					$global_terms = (bool) $filter;
+		} else {
+					$global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+		}
 	}
 	return $global_terms;
 }
@@ -4452,8 +4584,9 @@ 
 	// Do UTC
 	$structure[] = '<optgroup label="'. esc_attr__( 'UTC' ) .'">';
 	$selected = '';
-	if ( 'UTC' === $selected_zone )
-		$selected = 'selected="selected" ';
+	if ( 'UTC' === $selected_zone ) {
+			$selected = 'selected="selected" ';
+	}
 	$structure[] = '<option ' . $selected . 'value="' . esc_attr( 'UTC' ) . '">' . __('UTC') . '</option>';
 	$structure[] = '</optgroup>';
 
@@ -4462,18 +4595,20 @@ 
 	$offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
 		0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
 	foreach ( $offset_range as $offset ) {
-		if ( 0 <= $offset )
-			$offset_name = '+' . $offset;
-		else
-			$offset_name = (string) $offset;
+		if ( 0 <= $offset ) {
+					$offset_name = '+' . $offset;
+		} else {
+					$offset_name = (string) $offset;
+		}
 
 		$offset_value = $offset_name;
 		$offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
 		$offset_name = 'UTC' . $offset_name;
 		$offset_value = 'UTC' . $offset_value;
 		$selected = '';
-		if ( $offset_value === $selected_zone )
-			$selected = 'selected="selected" ';
+		if ( $offset_value === $selected_zone ) {
+					$selected = 'selected="selected" ';
+		}
 		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
 
 	}
@@ -4516,8 +4651,9 @@ 
 
 	foreach ( (array) $posts_to_delete as $post ) {
 		$post_id = (int) $post['post_id'];
-		if ( !$post_id )
-			continue;
+		if ( !$post_id ) {
+					continue;
+		}
 
 		$del_post = get_post($post_id);
 
@@ -4533,8 +4669,9 @@ 
 
 	foreach ( (array) $comments_to_delete as $comment ) {
 		$comment_id = (int) $comment['comment_id'];
-		if ( !$comment_id )
-			continue;
+		if ( !$comment_id ) {
+					continue;
+		}
 
 		$del_comment = get_comment($comment_id);
 
@@ -4598,10 +4735,11 @@ 
 	}
 
 	foreach ( $all_headers as $field => $regex ) {
-		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] )
-			$all_headers[ $field ] = _cleanup_header_comment( $match[1] );
-		else
-			$all_headers[ $field ] = '';
+		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] ) {
+					$all_headers[ $field ] = _cleanup_header_comment( $match[1] );
+		} else {
+					$all_headers[ $field ] = '';
+		}
 	}
 
 	return $all_headers;
@@ -4744,8 +4882,9 @@ 
 function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {
 	$override = is_null( $start_parent ) ? array() : array( $start => $start_parent );
 
-	if ( !$arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) )
-		return array();
+	if ( !$arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) ) {
+			return array();
+	}
 
 	return wp_find_hierarchy_loop_tortoise_hare( $callback, $arbitrary_loop_member, $override, $callback_args, true );
 }
@@ -4783,12 +4922,14 @@ 
 	&&
 		( $hare = isset( $override[$evanescent_hare] ) ? $override[$evanescent_hare] : call_user_func_array( $callback, array_merge( array( $evanescent_hare ), $callback_args ) ) )
 	) {
-		if ( $_return_loop )
-			$return[$tortoise] = $return[$evanescent_hare] = $return[$hare] = true;
+		if ( $_return_loop ) {
+					$return[$tortoise] = $return[$evanescent_hare] = $return[$hare] = true;
+		}
 
 		// tortoise got lapped - must be a loop
-		if ( $tortoise == $evanescent_hare || $tortoise == $hare )
-			return $_return_loop ? $return : $tortoise;
+		if ( $tortoise == $evanescent_hare || $tortoise == $hare ) {
+					return $_return_loop ? $return : $tortoise;
+		}
 
 		// Increment tortoise by one step
 		$tortoise = isset( $override[$tortoise] ) ? $override[$tortoise] : call_user_func_array( $callback, array_merge( array( $tortoise ), $callback_args ) );
@@ -4860,10 +5001,11 @@ 
  *                      of individual calls.
  */
 function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pretty = true ) {
-	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) )
-		$trace = debug_backtrace( false );
-	else
-		$trace = debug_backtrace();
+	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) ) {
+			$trace = debug_backtrace( false );
+	} else {
+			$trace = debug_backtrace();
+	}
 
 	$caller = array();
 	$check_class = ! is_null( $ignore_class );
@@ -4873,8 +5015,10 @@ 
 		if ( $skip_frames > 0 ) {
 			$skip_frames--;
 		} elseif ( isset( $call['class'] ) ) {
-			if ( $check_class && $ignore_class == $call['class'] )
-				continue; // Filter out calls
+			if ( $check_class && $ignore_class == $call['class'] ) {
+							continue;
+			}
+			// Filter out calls
 
 			$caller[] = "{$call['class']}{$call['type']}{$call['function']}";
 		} else {
@@ -4887,11 +5031,12 @@ 
 			}
 		}
 	}
-	if ( $pretty )
-		return join( ', ', array_reverse( $caller ) );
-	else
-		return $caller;
-}
+	if ( $pretty ) {
+			return join( ', ', array_reverse( $caller ) );
+	} else {
+			return $caller;
+	}
+	}
 
 /**
  * Retrieve ids that are not already present in the cache.
@@ -4925,8 +5070,9 @@ 
  * @return bool Whether the device is able to upload files.
  */
 function _device_can_upload() {
-	if ( ! wp_is_mobile() )
-		return true;
+	if ( ! wp_is_mobile() ) {
+			return true;
+	}
 
 	$ua = $_SERVER['HTTP_USER_AGENT'];
 
@@ -4989,11 +5135,13 @@ 
  * @since 3.6.0
  */
 function wp_auth_check_load() {
-	if ( ! is_admin() && ! is_user_logged_in() )
-		return;
+	if ( ! is_admin() && ! is_user_logged_in() ) {
+			return;
+	}
 
-	if ( defined( 'IFRAME_REQUEST' ) )
-		return;
+	if ( defined( 'IFRAME_REQUEST' ) ) {
+			return;
+	}
 
 	$screen = get_current_screen();
 	$hidden = array( 'update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network' );
@@ -5098,8 +5246,9 @@ 
  * @return string Tag RegEx.
  */
 function get_tag_regex( $tag ) {
-	if ( empty( $tag ) )
-		return;
+	if ( empty( $tag ) ) {
+			return;
+	}
 	return sprintf( '<%1$s[^<]*(?:>[\s\S]*<\/%1$s>|\s*\/>)', tag_escape( $tag ) );
 }
 
@@ -5117,12 +5266,14 @@ 
  */
 function _canonical_charset( $charset ) {
 	if ( 'UTF-8' === $charset || 'utf-8' === $charset || 'utf8' === $charset ||
-		'UTF8' === $charset )
-		return 'UTF-8';
+		'UTF8' === $charset ) {
+			return 'UTF-8';
+	}
 
 	if ( 'ISO-8859-1' === $charset || 'iso-8859-1' === $charset ||
-		'iso8859-1' === $charset || 'ISO8859-1' === $charset )
-		return 'ISO-8859-1';
+		'iso8859-1' === $charset || 'ISO8859-1' === $charset ) {
+			return 'ISO-8859-1';
+	}
 
 	return $charset;
 }
@@ -5157,11 +5308,13 @@ 
 	static $encodings = array();
 	static $overloaded = null;
 
-	if ( is_null( $overloaded ) )
-		$overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 );
+	if ( is_null( $overloaded ) ) {
+			$overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 );
+	}
 
-	if ( false === $overloaded )
-		return;
+	if ( false === $overloaded ) {
+			return;
+	}
 
 	if ( ! $reset ) {
 		$encoding = mb_internal_encoding();

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

Indentation +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * WordPress Customize Widgets classes
- *
- * @package WordPress
- * @subpackage Customize
- * @since 3.9.0
- */
+	 * WordPress Customize Widgets classes
+	 *
+	 * @package WordPress
+	 * @subpackage Customize
+	 * @since 3.9.0
+	 */
 
 /**
  * Customize Widgets class.
@@ -1000,7 +1000,7 @@ 
 	 *
 	 * @since 3.9.0
 	 * @access public
-     *
+	 *
 	 * @global array $wp_registered_sidebars
 	 * @global array $wp_registered_widgets
 	 */

Doc Comments +1 added lines, -1 removed lines

@@ -193,7 +193,7 @@
 	 *
 	 * @param string $name    Post value.
 	 * @param mixed  $default Default post value.
-	 * @return mixed Unslashed post value or default value.
+	 * @return string Unslashed post value or default value.
 	 */
 	protected function get_post_value( $name, $default = null ) {
 		if ( ! isset( $_POST[ $name ] ) ) {

Spacing +404 added lines, -404 removed lines

@@ -81,34 +81,34 @@ 
 	 *
 	 * @param WP_Customize_Manager $manager Customize manager bootstrap instance.
 	 */
-	public function __construct( $manager ) {
+	public function __construct($manager) {
 		$this->manager = $manager;
 
 		// Skip useless hooks when the user can't manage widgets anyway.
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			return;
 		}
 
-		add_filter( 'customize_dynamic_setting_args',          array( $this, 'filter_customize_dynamic_setting_args' ), 10, 2 );
-		add_action( 'after_setup_theme',                       array( $this, 'register_settings' ) );
-		add_action( 'wp_loaded',                               array( $this, 'override_sidebars_widgets_for_theme_switch' ) );
-		add_action( 'customize_controls_init',                 array( $this, 'customize_controls_init' ) );
-		add_action( 'customize_register',                      array( $this, 'schedule_customize_register' ), 1 );
-		add_action( 'customize_controls_enqueue_scripts',      array( $this, 'enqueue_scripts' ) );
-		add_action( 'customize_controls_print_styles',         array( $this, 'print_styles' ) );
-		add_action( 'customize_controls_print_scripts',        array( $this, 'print_scripts' ) );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'print_footer_scripts' ) );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'output_widget_control_templates' ) );
-		add_action( 'customize_preview_init',                  array( $this, 'customize_preview_init' ) );
-		add_filter( 'customize_refresh_nonces',                array( $this, 'refresh_nonces' ) );
-
-		add_action( 'dynamic_sidebar',                         array( $this, 'tally_rendered_widgets' ) );
-		add_filter( 'is_active_sidebar',                       array( $this, 'tally_sidebars_via_is_active_sidebar_calls' ), 10, 2 );
-		add_filter( 'dynamic_sidebar_has_widgets',             array( $this, 'tally_sidebars_via_dynamic_sidebar_calls' ), 10, 2 );
+		add_filter('customize_dynamic_setting_args', array($this, 'filter_customize_dynamic_setting_args'), 10, 2);
+		add_action('after_setup_theme', array($this, 'register_settings'));
+		add_action('wp_loaded', array($this, 'override_sidebars_widgets_for_theme_switch'));
+		add_action('customize_controls_init', array($this, 'customize_controls_init'));
+		add_action('customize_register', array($this, 'schedule_customize_register'), 1);
+		add_action('customize_controls_enqueue_scripts', array($this, 'enqueue_scripts'));
+		add_action('customize_controls_print_styles', array($this, 'print_styles'));
+		add_action('customize_controls_print_scripts', array($this, 'print_scripts'));
+		add_action('customize_controls_print_footer_scripts', array($this, 'print_footer_scripts'));
+		add_action('customize_controls_print_footer_scripts', array($this, 'output_widget_control_templates'));
+		add_action('customize_preview_init', array($this, 'customize_preview_init'));
+		add_filter('customize_refresh_nonces', array($this, 'refresh_nonces'));
+
+		add_action('dynamic_sidebar', array($this, 'tally_rendered_widgets'));
+		add_filter('is_active_sidebar', array($this, 'tally_sidebars_via_is_active_sidebar_calls'), 10, 2);
+		add_filter('dynamic_sidebar_has_widgets', array($this, 'tally_sidebars_via_dynamic_sidebar_calls'), 10, 2);
 
 		// Selective Refresh.
-		add_filter( 'customize_dynamic_partial_args',          array( $this, 'customize_dynamic_partial_args' ), 10, 2 );
-		add_action( 'customize_preview_init',                  array( $this, 'selective_refresh_init' ) );
+		add_filter('customize_dynamic_partial_args', array($this, 'customize_dynamic_partial_args'), 10, 2);
+		add_action('customize_preview_init', array($this, 'selective_refresh_init'));
 	}
 
 	/**
@@ -122,14 +122,14 @@ 
 	 * @param $setting_id Setting ID.
 	 * @return string|void Setting type.
 	 */
-	protected function get_setting_type( $setting_id ) {
+	protected function get_setting_type($setting_id) {
 		static $cache = array();
-		if ( isset( $cache[ $setting_id ] ) ) {
-			return $cache[ $setting_id ];
+		if (isset($cache[$setting_id])) {
+			return $cache[$setting_id];
 		}
-		foreach ( $this->setting_id_patterns as $type => $pattern ) {
-			if ( preg_match( $pattern, $setting_id ) ) {
-				$cache[ $setting_id ] = $type;
+		foreach ($this->setting_id_patterns as $type => $pattern) {
+			if (preg_match($pattern, $setting_id)) {
+				$cache[$setting_id] = $type;
 				return $type;
 			}
 		}
@@ -144,25 +144,25 @@ 
 	 */
 	public function register_settings() {
 		$widget_setting_ids = array();
-		$incoming_setting_ids = array_keys( $this->manager->unsanitized_post_values() );
-		foreach ( $incoming_setting_ids as $setting_id ) {
-			if ( ! is_null( $this->get_setting_type( $setting_id ) ) ) {
+		$incoming_setting_ids = array_keys($this->manager->unsanitized_post_values());
+		foreach ($incoming_setting_ids as $setting_id) {
+			if ( ! is_null($this->get_setting_type($setting_id))) {
 				$widget_setting_ids[] = $setting_id;
 			}
 		}
-		if ( $this->manager->doing_ajax( 'update-widget' ) && isset( $_REQUEST['widget-id'] ) ) {
-			$widget_setting_ids[] = $this->get_setting_id( wp_unslash( $_REQUEST['widget-id'] ) );
+		if ($this->manager->doing_ajax('update-widget') && isset($_REQUEST['widget-id'])) {
+			$widget_setting_ids[] = $this->get_setting_id(wp_unslash($_REQUEST['widget-id']));
 		}
 
-		$settings = $this->manager->add_dynamic_settings( array_unique( $widget_setting_ids ) );
+		$settings = $this->manager->add_dynamic_settings(array_unique($widget_setting_ids));
 
 		/*
 		 * Preview settings right away so that widgets and sidebars will get registered properly.
 		 * But don't do this if a customize_save because this will cause WP to think there is nothing
 		 * changed that needs to be saved.
 		 */
-		if ( ! $this->manager->doing_ajax( 'customize_save' ) ) {
-			foreach ( $settings as $setting ) {
+		if ( ! $this->manager->doing_ajax('customize_save')) {
+			foreach ($settings as $setting) {
 				$setting->preview();
 			}
 		}
@@ -178,9 +178,9 @@ 
 	 * @param string      $setting_id ID for dynamic setting, usually coming from `$_POST['customized']`.
 	 * @return false|array Setting arguments, false otherwise.
 	 */
-	public function filter_customize_dynamic_setting_args( $args, $setting_id ) {
-		if ( $this->get_setting_type( $setting_id ) ) {
-			$args = $this->get_setting_args( $setting_id );
+	public function filter_customize_dynamic_setting_args($args, $setting_id) {
+		if ($this->get_setting_type($setting_id)) {
+			$args = $this->get_setting_args($setting_id);
 		}
 		return $args;
 	}
@@ -195,12 +195,12 @@ 
 	 * @param mixed  $default Default post value.
 	 * @return mixed Unslashed post value or default value.
 	 */
-	protected function get_post_value( $name, $default = null ) {
-		if ( ! isset( $_POST[ $name ] ) ) {
+	protected function get_post_value($name, $default = null) {
+		if ( ! isset($_POST[$name])) {
 			return $default;
 		}
 
-		return wp_unslash( $_POST[ $name ] );
+		return wp_unslash($_POST[$name]);
 	}
 
 	/**
@@ -221,19 +221,19 @@ 
 	public function override_sidebars_widgets_for_theme_switch() {
 		global $sidebars_widgets;
 
-		if ( $this->manager->doing_ajax() || $this->manager->is_theme_active() ) {
+		if ($this->manager->doing_ajax() || $this->manager->is_theme_active()) {
 			return;
 		}
 
 		$this->old_sidebars_widgets = wp_get_sidebars_widgets();
-		add_filter( 'customize_value_old_sidebars_widgets_data', array( $this, 'filter_customize_value_old_sidebars_widgets_data' ) );
+		add_filter('customize_value_old_sidebars_widgets_data', array($this, 'filter_customize_value_old_sidebars_widgets_data'));
 
 		// retrieve_widgets() looks at the global $sidebars_widgets
 		$sidebars_widgets = $this->old_sidebars_widgets;
-		$sidebars_widgets = retrieve_widgets( 'customize' );
-		add_filter( 'option_sidebars_widgets', array( $this, 'filter_option_sidebars_widgets_for_theme_switch' ), 1 );
+		$sidebars_widgets = retrieve_widgets('customize');
+		add_filter('option_sidebars_widgets', array($this, 'filter_option_sidebars_widgets_for_theme_switch'), 1);
 		// reset global cache var used by wp_get_sidebars_widgets()
-		unset( $GLOBALS['_wp_sidebars_widgets'] );
+		unset($GLOBALS['_wp_sidebars_widgets']);
 	}
 
 	/**
@@ -252,7 +252,7 @@ 
 	 * @param array $old_sidebars_widgets
 	 * @return array
 	 */
-	public function filter_customize_value_old_sidebars_widgets_data( $old_sidebars_widgets ) {
+	public function filter_customize_value_old_sidebars_widgets_data($old_sidebars_widgets) {
 		return $this->old_sidebars_widgets;
 	}
 
@@ -272,7 +272,7 @@ 
 	 * @param array $sidebars_widgets
 	 * @return array
 	 */
-	public function filter_option_sidebars_widgets_for_theme_switch( $sidebars_widgets ) {
+	public function filter_option_sidebars_widgets_for_theme_switch($sidebars_widgets) {
 		$sidebars_widgets = $GLOBALS['sidebars_widgets'];
 		$sidebars_widgets['array_version'] = 3;
 		return $sidebars_widgets;
@@ -288,13 +288,13 @@ 
 	 */
 	public function customize_controls_init() {
 		/** This action is documented in wp-admin/includes/ajax-actions.php */
-		do_action( 'load-widgets.php' );
+		do_action('load-widgets.php');
 
 		/** This action is documented in wp-admin/includes/ajax-actions.php */
-		do_action( 'widgets.php' );
+		do_action('widgets.php');
 
 		/** This action is documented in wp-admin/widgets.php */
-		do_action( 'sidebar_admin_setup' );
+		do_action('sidebar_admin_setup');
 	}
 
 	/**
@@ -307,10 +307,10 @@ 
 	 * @access public
 	 */
 	public function schedule_customize_register() {
-		if ( is_admin() ) {
+		if (is_admin()) {
 			$this->customize_register();
 		} else {
-			add_action( 'wp', array( $this, 'customize_register' ) );
+			add_action('wp', array($this, 'customize_register'));
 		}
 	}
 
@@ -328,8 +328,8 @@ 
 		global $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_sidebars;
 
 		$sidebars_widgets = array_merge(
-			array( 'wp_inactive_widgets' => array() ),
-			array_fill_keys( array_keys( $wp_registered_sidebars ), array() ),
+			array('wp_inactive_widgets' => array()),
+			array_fill_keys(array_keys($wp_registered_sidebars), array()),
 			wp_get_sidebars_widgets()
 		);
 
@@ -340,11 +340,11 @@ 
 		 * inactive, and orphaned since a widget may get suppressed from a sidebar
 		 * via a plugin (like Widget Visibility).
 		 */
-		foreach ( array_keys( $wp_registered_widgets ) as $widget_id ) {
-			$setting_id   = $this->get_setting_id( $widget_id );
-			$setting_args = $this->get_setting_args( $setting_id );
-			if ( ! $this->manager->get_setting( $setting_id ) ) {
-				$this->manager->add_setting( $setting_id, $setting_args );
+		foreach (array_keys($wp_registered_widgets) as $widget_id) {
+			$setting_id   = $this->get_setting_id($widget_id);
+			$setting_args = $this->get_setting_args($setting_id);
+			if ( ! $this->manager->get_setting($setting_id)) {
+				$this->manager->add_setting($setting_id, $setting_args);
 			}
 			$new_setting_ids[] = $setting_id;
 		}
@@ -353,52 +353,52 @@ 
 		 * Add a setting which will be supplied for the theme's sidebars_widgets
 		 * theme_mod when the theme is switched.
 		 */
-		if ( ! $this->manager->is_theme_active() ) {
+		if ( ! $this->manager->is_theme_active()) {
 			$setting_id = 'old_sidebars_widgets_data';
-			$setting_args = $this->get_setting_args( $setting_id, array(
+			$setting_args = $this->get_setting_args($setting_id, array(
 				'type' => 'global_variable',
 				'dirty' => true,
-			) );
-			$this->manager->add_setting( $setting_id, $setting_args );
+			));
+			$this->manager->add_setting($setting_id, $setting_args);
 		}
 
-		$this->manager->add_panel( 'widgets', array(
+		$this->manager->add_panel('widgets', array(
 			'type'            => 'widgets',
-			'title'           => __( 'Widgets' ),
-			'description'     => __( 'Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars).' ),
+			'title'           => __('Widgets'),
+			'description'     => __('Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars).'),
 			'priority'        => 110,
-			'active_callback' => array( $this, 'is_panel_active' ),
-		) );
+			'active_callback' => array($this, 'is_panel_active'),
+		));
 
-		foreach ( $sidebars_widgets as $sidebar_id => $sidebar_widget_ids ) {
-			if ( empty( $sidebar_widget_ids ) ) {
+		foreach ($sidebars_widgets as $sidebar_id => $sidebar_widget_ids) {
+			if (empty($sidebar_widget_ids)) {
 				$sidebar_widget_ids = array();
 			}
 
-			$is_registered_sidebar = is_registered_sidebar( $sidebar_id );
-			$is_inactive_widgets   = ( 'wp_inactive_widgets' === $sidebar_id );
-			$is_active_sidebar     = ( $is_registered_sidebar && ! $is_inactive_widgets );
+			$is_registered_sidebar = is_registered_sidebar($sidebar_id);
+			$is_inactive_widgets   = ('wp_inactive_widgets' === $sidebar_id);
+			$is_active_sidebar     = ($is_registered_sidebar && ! $is_inactive_widgets);
 
 			// Add setting for managing the sidebar's widgets.
-			if ( $is_registered_sidebar || $is_inactive_widgets ) {
-				$setting_id   = sprintf( 'sidebars_widgets[%s]', $sidebar_id );
-				$setting_args = $this->get_setting_args( $setting_id );
-				if ( ! $this->manager->get_setting( $setting_id ) ) {
-					if ( ! $this->manager->is_theme_active() ) {
+			if ($is_registered_sidebar || $is_inactive_widgets) {
+				$setting_id   = sprintf('sidebars_widgets[%s]', $sidebar_id);
+				$setting_args = $this->get_setting_args($setting_id);
+				if ( ! $this->manager->get_setting($setting_id)) {
+					if ( ! $this->manager->is_theme_active()) {
 						$setting_args['dirty'] = true;
 					}
-					$this->manager->add_setting( $setting_id, $setting_args );
+					$this->manager->add_setting($setting_id, $setting_args);
 				}
 				$new_setting_ids[] = $setting_id;
 
 				// Add section to contain controls.
-				$section_id = sprintf( 'sidebar-widgets-%s', $sidebar_id );
-				if ( $is_active_sidebar ) {
+				$section_id = sprintf('sidebar-widgets-%s', $sidebar_id);
+				if ($is_active_sidebar) {
 
 					$section_args = array(
-						'title' => $wp_registered_sidebars[ $sidebar_id ]['name'],
-						'description' => $wp_registered_sidebars[ $sidebar_id ]['description'],
-						'priority' => array_search( $sidebar_id, array_keys( $wp_registered_sidebars ) ),
+						'title' => $wp_registered_sidebars[$sidebar_id]['name'],
+						'description' => $wp_registered_sidebars[$sidebar_id]['description'],
+						'priority' => array_search($sidebar_id, array_keys($wp_registered_sidebars)),
 						'panel' => 'widgets',
 						'sidebar_id' => $sidebar_id,
 					);
@@ -412,35 +412,35 @@ 
 					 * @param string     $section_id   Customizer section ID.
 					 * @param int|string $sidebar_id   Sidebar ID.
 					 */
-					$section_args = apply_filters( 'customizer_widgets_section_args', $section_args, $section_id, $sidebar_id );
+					$section_args = apply_filters('customizer_widgets_section_args', $section_args, $section_id, $sidebar_id);
 
-					$section = new WP_Customize_Sidebar_Section( $this->manager, $section_id, $section_args );
-					$this->manager->add_section( $section );
+					$section = new WP_Customize_Sidebar_Section($this->manager, $section_id, $section_args);
+					$this->manager->add_section($section);
 
-					$control = new WP_Widget_Area_Customize_Control( $this->manager, $setting_id, array(
+					$control = new WP_Widget_Area_Customize_Control($this->manager, $setting_id, array(
 						'section'    => $section_id,
 						'sidebar_id' => $sidebar_id,
-						'priority'   => count( $sidebar_widget_ids ), // place 'Add Widget' and 'Reorder' buttons at end.
-					) );
+						'priority'   => count($sidebar_widget_ids), // place 'Add Widget' and 'Reorder' buttons at end.
+					));
 					$new_setting_ids[] = $setting_id;
 
-					$this->manager->add_control( $control );
+					$this->manager->add_control($control);
 				}
 			}
 
 			// Add a control for each active widget (located in a sidebar).
-			foreach ( $sidebar_widget_ids as $i => $widget_id ) {
+			foreach ($sidebar_widget_ids as $i => $widget_id) {
 
 				// Skip widgets that may have gone away due to a plugin being deactivated.
-				if ( ! $is_active_sidebar || ! isset( $wp_registered_widgets[$widget_id] ) ) {
+				if ( ! $is_active_sidebar || ! isset($wp_registered_widgets[$widget_id])) {
 					continue;
 				}
 
 				$registered_widget = $wp_registered_widgets[$widget_id];
-				$setting_id        = $this->get_setting_id( $widget_id );
+				$setting_id        = $this->get_setting_id($widget_id);
 				$id_base           = $wp_registered_widget_controls[$widget_id]['id_base'];
 
-				$control = new WP_Widget_Form_Customize_Control( $this->manager, $setting_id, array(
+				$control = new WP_Widget_Form_Customize_Control($this->manager, $setting_id, array(
 					'label'          => $registered_widget['name'],
 					'section'        => $section_id,
 					'sidebar_id'     => $sidebar_id,
@@ -449,19 +449,19 @@ 
 					'priority'       => $i,
 					'width'          => $wp_registered_widget_controls[$widget_id]['width'],
 					'height'         => $wp_registered_widget_controls[$widget_id]['height'],
-					'is_wide'        => $this->is_wide_widget( $widget_id ),
-				) );
-				$this->manager->add_control( $control );
+					'is_wide'        => $this->is_wide_widget($widget_id),
+				));
+				$this->manager->add_control($control);
 			}
 		}
 
-		if ( ! $this->manager->doing_ajax( 'customize_save' ) ) {
-			foreach ( $new_setting_ids as $new_setting_id ) {
-				$this->manager->get_setting( $new_setting_id )->preview();
+		if ( ! $this->manager->doing_ajax('customize_save')) {
+			foreach ($new_setting_ids as $new_setting_id) {
+				$this->manager->get_setting($new_setting_id)->preview();
 			}
 		}
 
-		add_filter( 'sidebars_widgets', array( $this, 'preview_sidebars_widgets' ), 1 );
+		add_filter('sidebars_widgets', array($this, 'preview_sidebars_widgets'), 1);
 	}
 
 	/**
@@ -477,7 +477,7 @@ 
 	 */
 	public function is_panel_active() {
 		global $wp_registered_sidebars;
-		return ! empty( $wp_registered_sidebars );
+		return ! empty($wp_registered_sidebars);
 	}
 
 	/**
@@ -489,12 +489,12 @@ 
 	 * @param string $widget_id Widget ID.
 	 * @return string Maybe-parsed widget ID.
 	 */
-	public function get_setting_id( $widget_id ) {
-		$parsed_widget_id = $this->parse_widget_id( $widget_id );
-		$setting_id       = sprintf( 'widget_%s', $parsed_widget_id['id_base'] );
+	public function get_setting_id($widget_id) {
+		$parsed_widget_id = $this->parse_widget_id($widget_id);
+		$setting_id       = sprintf('widget_%s', $parsed_widget_id['id_base']);
 
-		if ( ! is_null( $parsed_widget_id['number'] ) ) {
-			$setting_id .= sprintf( '[%d]', $parsed_widget_id['number'] );
+		if ( ! is_null($parsed_widget_id['number'])) {
+			$setting_id .= sprintf('[%d]', $parsed_widget_id['number']);
 		}
 		return $setting_id;
 	}
@@ -517,13 +517,13 @@ 
 	 * @param string $widget_id Widget ID.
 	 * @return bool Whether or not the widget is a "wide" widget.
 	 */
-	public function is_wide_widget( $widget_id ) {
+	public function is_wide_widget($widget_id) {
 		global $wp_registered_widget_controls;
 
-		$parsed_widget_id = $this->parse_widget_id( $widget_id );
+		$parsed_widget_id = $this->parse_widget_id($widget_id);
 		$width            = $wp_registered_widget_controls[$widget_id]['width'];
-		$is_core          = in_array( $parsed_widget_id['id_base'], $this->core_widget_id_bases );
-		$is_wide          = ( $width > 250 && ! $is_core );
+		$is_core          = in_array($parsed_widget_id['id_base'], $this->core_widget_id_bases);
+		$is_wide          = ($width > 250 && ! $is_core);
 
 		/**
 		 * Filter whether the given widget is considered "wide".
@@ -533,7 +533,7 @@ 
 		 * @param bool   $is_wide   Whether the widget is wide, Default false.
 		 * @param string $widget_id Widget ID.
 		 */
-		return apply_filters( 'is_wide_widget_in_customizer', $is_wide, $widget_id );
+		return apply_filters('is_wide_widget_in_customizer', $is_wide, $widget_id);
 	}
 
 	/**
@@ -545,15 +545,15 @@ 
 	 * @param string $widget_id Widget ID.
 	 * @return array Array containing a widget's id_base and number components.
 	 */
-	public function parse_widget_id( $widget_id ) {
+	public function parse_widget_id($widget_id) {
 		$parsed = array(
 			'number' => null,
 			'id_base' => null,
 		);
 
-		if ( preg_match( '/^(.+)-(\d+)$/', $widget_id, $matches ) ) {
+		if (preg_match('/^(.+)-(\d+)$/', $widget_id, $matches)) {
 			$parsed['id_base'] = $matches[1];
-			$parsed['number']  = intval( $matches[2] );
+			$parsed['number']  = intval($matches[2]);
 		} else {
 			// likely an old single widget
 			$parsed['id_base'] = $widget_id;
@@ -571,15 +571,15 @@ 
 	 * @return WP_Error|array Array containing a widget's id_base and number components,
 	 *                        or a WP_Error object.
 	 */
-	public function parse_widget_setting_id( $setting_id ) {
-		if ( ! preg_match( '/^(widget_(.+?))(?:\[(\d+)\])?$/', $setting_id, $matches ) ) {
-			return new WP_Error( 'widget_setting_invalid_id' );
+	public function parse_widget_setting_id($setting_id) {
+		if ( ! preg_match('/^(widget_(.+?))(?:\[(\d+)\])?$/', $setting_id, $matches)) {
+			return new WP_Error('widget_setting_invalid_id');
 		}
 
 		$id_base = $matches[2];
-		$number  = isset( $matches[3] ) ? intval( $matches[3] ) : null;
+		$number  = isset($matches[3]) ? intval($matches[3]) : null;
 
-		return compact( 'id_base', 'number' );
+		return compact('id_base', 'number');
 	}
 
 	/**
@@ -591,10 +591,10 @@ 
 	 */
 	public function print_styles() {
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_styles-widgets.php' );
+		do_action('admin_print_styles-widgets.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_styles' );
+		do_action('admin_print_styles');
 	}
 
 	/**
@@ -606,10 +606,10 @@ 
 	 */
 	public function print_scripts() {
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_scripts-widgets.php' );
+		do_action('admin_print_scripts-widgets.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_scripts' );
+		do_action('admin_print_scripts');
 	}
 
 	/**
@@ -625,11 +625,11 @@ 
 	public function enqueue_scripts() {
 		global $wp_scripts, $wp_registered_sidebars, $wp_registered_widgets;
 
-		wp_enqueue_style( 'customize-widgets' );
-		wp_enqueue_script( 'customize-widgets' );
+		wp_enqueue_style('customize-widgets');
+		wp_enqueue_script('customize-widgets');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_enqueue_scripts', 'widgets.php' );
+		do_action('admin_enqueue_scripts', 'widgets.php');
 
 		/*
 		 * Export available widgets with control_tpl removed from model
@@ -637,23 +637,23 @@ 
 		 */
 		$available_widgets = array();
 
-		foreach ( $this->get_available_widgets() as $available_widget ) {
-			unset( $available_widget['control_tpl'] );
+		foreach ($this->get_available_widgets() as $available_widget) {
+			unset($available_widget['control_tpl']);
 			$available_widgets[] = $available_widget;
 		}
 
 		$widget_reorder_nav_tpl = sprintf(
 			'<div class="widget-reorder-nav"><span class="move-widget" tabindex="0">%1$s</span><span class="move-widget-down" tabindex="0">%2$s</span><span class="move-widget-up" tabindex="0">%3$s</span></div>',
-			__( 'Move to another area&hellip;' ),
-			__( 'Move down' ),
-			__( 'Move up' )
+			__('Move to another area&hellip;'),
+			__('Move down'),
+			__('Move up')
 		);
 
 		$move_widget_area_tpl = str_replace(
-			array( '{description}', '{btn}' ),
+			array('{description}', '{btn}'),
 			array(
-				__( 'Select an area to move this widget into:' ),
-				_x( 'Move', 'Move widget' ),
+				__('Select an area to move this widget into:'),
+				_x('Move', 'Move widget'),
 			),
 			'<div class="move-widget-area">
 				<p class="description">{description}</p>
@@ -669,38 +669,38 @@ 
 		);
 
 		$settings = array(
-			'registeredSidebars'   => array_values( $wp_registered_sidebars ),
+			'registeredSidebars'   => array_values($wp_registered_sidebars),
 			'registeredWidgets'    => $wp_registered_widgets,
 			'availableWidgets'     => $available_widgets, // @todo Merge this with registered_widgets
 			'l10n' => array(
-				'saveBtnLabel'     => __( 'Apply' ),
-				'saveBtnTooltip'   => __( 'Save and preview changes before publishing them.' ),
-				'removeBtnLabel'   => __( 'Remove' ),
-				'removeBtnTooltip' => __( 'Trash widget by moving it to the inactive widgets sidebar.' ),
-				'error'            => __( 'An error has occurred. Please reload the page and try again.' ),
-				'widgetMovedUp'    => __( 'Widget moved up' ),
-				'widgetMovedDown'  => __( 'Widget moved down' ),
-				'noAreasRendered'  => __( 'There are no widget areas currently rendered in the preview. Navigate in the preview to a template that makes use of a widget area in order to access its widgets here.' ),
-				'reorderModeOn'    => __( 'Reorder mode enabled' ),
-				'reorderModeOff'   => __( 'Reorder mode closed' ),
-				'reorderLabelOn'   => esc_attr__( 'Reorder widgets' ),
-				'reorderLabelOff'  => esc_attr__( 'Close reorder mode' ),
+				'saveBtnLabel'     => __('Apply'),
+				'saveBtnTooltip'   => __('Save and preview changes before publishing them.'),
+				'removeBtnLabel'   => __('Remove'),
+				'removeBtnTooltip' => __('Trash widget by moving it to the inactive widgets sidebar.'),
+				'error'            => __('An error has occurred. Please reload the page and try again.'),
+				'widgetMovedUp'    => __('Widget moved up'),
+				'widgetMovedDown'  => __('Widget moved down'),
+				'noAreasRendered'  => __('There are no widget areas currently rendered in the preview. Navigate in the preview to a template that makes use of a widget area in order to access its widgets here.'),
+				'reorderModeOn'    => __('Reorder mode enabled'),
+				'reorderModeOff'   => __('Reorder mode closed'),
+				'reorderLabelOn'   => esc_attr__('Reorder widgets'),
+				'reorderLabelOff'  => esc_attr__('Close reorder mode'),
 			),
 			'tpl' => array(
 				'widgetReorderNav' => $widget_reorder_nav_tpl,
 				'moveWidgetArea'   => $move_widget_area_tpl,
 			),
-			'selectiveRefresh'     => isset( $this->manager->selective_refresh ),
+			'selectiveRefresh'     => isset($this->manager->selective_refresh),
 		);
 
-		foreach ( $settings['registeredWidgets'] as &$registered_widget ) {
-			unset( $registered_widget['callback'] ); // may not be JSON-serializeable
+		foreach ($settings['registeredWidgets'] as &$registered_widget) {
+			unset($registered_widget['callback']); // may not be JSON-serializeable
 		}
 
 		$wp_scripts->add_data(
 			'customize-widgets',
 			'data',
-			sprintf( 'var _wpCustomizeWidgetsSettings = %s;', wp_json_encode( $settings ) )
+			sprintf('var _wpCustomizeWidgetsSettings = %s;', wp_json_encode($settings))
 		);
 	}
 
@@ -716,23 +716,23 @@ 
 		<div id="available-widgets">
 			<div class="customize-section-title">
 				<button class="customize-section-back" tabindex="-1">
-					<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+					<span class="screen-reader-text"><?php _e('Back'); ?></span>
 				</button>
 				<h3>
 					<span class="customize-action"><?php
 						/* translators: &#9656; is the unicode right-pointing triangle, and %s is the section title in the Customizer */
-						echo sprintf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'widgets' )->title ) );
+						echo sprintf(__('Customizing &#9656; %s'), esc_html($this->manager->get_panel('widgets')->title));
 					?></span>
-					<?php _e( 'Add a Widget' ); ?>
+					<?php _e('Add a Widget'); ?>
 				</h3>
 			</div>
 			<div id="available-widgets-filter">
-				<label class="screen-reader-text" for="widgets-search"><?php _e( 'Search Widgets' ); ?></label>
-				<input type="search" id="widgets-search" placeholder="<?php esc_attr_e( 'Search widgets&hellip;' ) ?>" />
+				<label class="screen-reader-text" for="widgets-search"><?php _e('Search Widgets'); ?></label>
+				<input type="search" id="widgets-search" placeholder="<?php esc_attr_e('Search widgets&hellip;') ?>" />
 			</div>
 			<div id="available-widgets-list">
-			<?php foreach ( $this->get_available_widgets() as $available_widget ): ?>
-				<div id="widget-tpl-<?php echo esc_attr( $available_widget['id'] ) ?>" data-widget-id="<?php echo esc_attr( $available_widget['id'] ) ?>" class="widget-tpl <?php echo esc_attr( $available_widget['id'] ) ?>" tabindex="0">
+			<?php foreach ($this->get_available_widgets() as $available_widget): ?>
+				<div id="widget-tpl-<?php echo esc_attr($available_widget['id']) ?>" data-widget-id="<?php echo esc_attr($available_widget['id']) ?>" class="widget-tpl <?php echo esc_attr($available_widget['id']) ?>" tabindex="0">
 					<?php echo $available_widget['control_tpl']; ?>
 				</div>
 			<?php endforeach; ?>
@@ -751,10 +751,10 @@ 
 	 */
 	public function print_footer_scripts() {
 		/** This action is documented in wp-admin/admin-footer.php */
-		do_action( 'admin_print_footer_scripts' );
+		do_action('admin_print_footer_scripts');
 
 		/** This action is documented in wp-admin/admin-footer.php */
-		do_action( 'admin_footer-widgets.php' );
+		do_action('admin_footer-widgets.php');
 	}
 
 	/**
@@ -767,23 +767,23 @@ 
 	 * @param array  $overrides Array of setting overrides.
 	 * @return array Possibly modified setting arguments.
 	 */
-	public function get_setting_args( $id, $overrides = array() ) {
+	public function get_setting_args($id, $overrides = array()) {
 		$args = array(
 			'type'       => 'option',
 			'capability' => 'edit_theme_options',
-			'transport'  => isset( $this->manager->selective_refresh ) ? 'postMessage' : 'refresh',
+			'transport'  => isset($this->manager->selective_refresh) ? 'postMessage' : 'refresh',
 			'default'    => array(),
 		);
 
-		if ( preg_match( $this->setting_id_patterns['sidebar_widgets'], $id, $matches ) ) {
-			$args['sanitize_callback'] = array( $this, 'sanitize_sidebar_widgets' );
-			$args['sanitize_js_callback'] = array( $this, 'sanitize_sidebar_widgets_js_instance' );
-		} elseif ( preg_match( $this->setting_id_patterns['widget_instance'], $id, $matches ) ) {
-			$args['sanitize_callback'] = array( $this, 'sanitize_widget_instance' );
-			$args['sanitize_js_callback'] = array( $this, 'sanitize_widget_js_instance' );
+		if (preg_match($this->setting_id_patterns['sidebar_widgets'], $id, $matches)) {
+			$args['sanitize_callback'] = array($this, 'sanitize_sidebar_widgets');
+			$args['sanitize_js_callback'] = array($this, 'sanitize_sidebar_widgets_js_instance');
+		} elseif (preg_match($this->setting_id_patterns['widget_instance'], $id, $matches)) {
+			$args['sanitize_callback'] = array($this, 'sanitize_widget_instance');
+			$args['sanitize_js_callback'] = array($this, 'sanitize_widget_js_instance');
 		}
 
-		$args = array_merge( $args, $overrides );
+		$args = array_merge($args, $overrides);
 
 		/**
 		 * Filter the common arguments supplied when constructing a Customizer setting.
@@ -795,7 +795,7 @@ 
 		 * @param array  $args Array of Customizer setting arguments.
 		 * @param string $id   Widget setting ID.
 		 */
-		return apply_filters( 'widget_customizer_setting_args', $args, $id );
+		return apply_filters('widget_customizer_setting_args', $args, $id);
 	}
 
 	/**
@@ -809,11 +809,11 @@ 
 	 * @param array $widget_ids Array of widget IDs.
 	 * @return array Array of sanitized widget IDs.
 	 */
-	public function sanitize_sidebar_widgets( $widget_ids ) {
-		$widget_ids = array_map( 'strval', (array) $widget_ids );
+	public function sanitize_sidebar_widgets($widget_ids) {
+		$widget_ids = array_map('strval', (array) $widget_ids);
 		$sanitized_widget_ids = array();
-		foreach ( $widget_ids as $widget_id ) {
-			$sanitized_widget_ids[] = preg_replace( '/[^a-z0-9_\-]/', '', $widget_id );
+		foreach ($widget_ids as $widget_id) {
+			$sanitized_widget_ids[] = preg_replace('/[^a-z0-9_\-]/', '', $widget_id);
 		}
 		return $sanitized_widget_ids;
 	}
@@ -834,31 +834,31 @@ 
 	 */
 	public function get_available_widgets() {
 		static $available_widgets = array();
-		if ( ! empty( $available_widgets ) ) {
+		if ( ! empty($available_widgets)) {
 			return $available_widgets;
 		}
 
 		global $wp_registered_widgets, $wp_registered_widget_controls;
-		require_once ABSPATH . '/wp-admin/includes/widgets.php'; // for next_widget_id_number()
+		require_once ABSPATH.'/wp-admin/includes/widgets.php'; // for next_widget_id_number()
 
 		$sort = $wp_registered_widgets;
-		usort( $sort, array( $this, '_sort_name_callback' ) );
+		usort($sort, array($this, '_sort_name_callback'));
 		$done = array();
 
-		foreach ( $sort as $widget ) {
-			if ( in_array( $widget['callback'], $done, true ) ) { // We already showed this multi-widget
+		foreach ($sort as $widget) {
+			if (in_array($widget['callback'], $done, true)) { // We already showed this multi-widget
 				continue;
 			}
 
-			$sidebar = is_active_widget( $widget['callback'], $widget['id'], false, false );
+			$sidebar = is_active_widget($widget['callback'], $widget['id'], false, false);
 			$done[]  = $widget['callback'];
 
-			if ( ! isset( $widget['params'][0] ) ) {
+			if ( ! isset($widget['params'][0])) {
 				$widget['params'][0] = array();
 			}
 
 			$available_widget = $widget;
-			unset( $available_widget['callback'] ); // not serializable to JSON
+			unset($available_widget['callback']); // not serializable to JSON
 
 			$args = array(
 				'widget_id'   => $widget['id'],
@@ -867,37 +867,37 @@ 
 			);
 
 			$is_disabled     = false;
-			$is_multi_widget = ( isset( $wp_registered_widget_controls[$widget['id']]['id_base'] ) && isset( $widget['params'][0]['number'] ) );
-			if ( $is_multi_widget ) {
+			$is_multi_widget = (isset($wp_registered_widget_controls[$widget['id']]['id_base']) && isset($widget['params'][0]['number']));
+			if ($is_multi_widget) {
 				$id_base            = $wp_registered_widget_controls[$widget['id']]['id_base'];
 				$args['_temp_id']   = "$id_base-__i__";
-				$args['_multi_num'] = next_widget_id_number( $id_base );
+				$args['_multi_num'] = next_widget_id_number($id_base);
 				$args['_add']       = 'multi';
 			} else {
 				$args['_add'] = 'single';
 
-				if ( $sidebar && 'wp_inactive_widgets' !== $sidebar ) {
+				if ($sidebar && 'wp_inactive_widgets' !== $sidebar) {
 					$is_disabled = true;
 				}
 				$id_base = $widget['id'];
 			}
 
-			$list_widget_controls_args = wp_list_widget_controls_dynamic_sidebar( array( 0 => $args, 1 => $widget['params'][0] ) );
-			$control_tpl = $this->get_widget_control( $list_widget_controls_args );
+			$list_widget_controls_args = wp_list_widget_controls_dynamic_sidebar(array(0 => $args, 1 => $widget['params'][0]));
+			$control_tpl = $this->get_widget_control($list_widget_controls_args);
 
 			// The properties here are mapped to the Backbone Widget model.
-			$available_widget = array_merge( $available_widget, array(
-				'temp_id'      => isset( $args['_temp_id'] ) ? $args['_temp_id'] : null,
+			$available_widget = array_merge($available_widget, array(
+				'temp_id'      => isset($args['_temp_id']) ? $args['_temp_id'] : null,
 				'is_multi'     => $is_multi_widget,
 				'control_tpl'  => $control_tpl,
-				'multi_number' => ( $args['_add'] === 'multi' ) ? $args['_multi_num'] : false,
+				'multi_number' => ($args['_add'] === 'multi') ? $args['_multi_num'] : false,
 				'is_disabled'  => $is_disabled,
 				'id_base'      => $id_base,
-				'transport'    => isset( $this->manager->selective_refresh ) ? 'postMessage' : 'refresh',
+				'transport'    => isset($this->manager->selective_refresh) ? 'postMessage' : 'refresh',
 				'width'        => $wp_registered_widget_controls[$widget['id']]['width'],
 				'height'       => $wp_registered_widget_controls[$widget['id']]['height'],
-				'is_wide'      => $this->is_wide_widget( $widget['id'] ),
-			) );
+				'is_wide'      => $this->is_wide_widget($widget['id']),
+			));
 
 			$available_widgets[] = $available_widget;
 		}
@@ -915,8 +915,8 @@ 
 	 * @param array $widget_b The second widget to compare.
 	 * @return int Reorder position for the current widget comparison.
 	 */
-	protected function _sort_name_callback( $widget_a, $widget_b ) {
-		return strnatcasecmp( $widget_a['name'], $widget_b['name'] );
+	protected function _sort_name_callback($widget_a, $widget_b) {
+		return strnatcasecmp($widget_a['name'], $widget_b['name']);
 	}
 
 	/**
@@ -928,13 +928,13 @@ 
 	 * @param array $args Widget control arguments.
 	 * @return string Widget control form HTML markup.
 	 */
-	public function get_widget_control( $args ) {
+	public function get_widget_control($args) {
 		$args[0]['before_form'] = '<div class="form">';
 		$args[0]['after_form'] = '</div><!-- .form -->';
 		$args[0]['before_widget_content'] = '<div class="widget-content">';
 		$args[0]['after_widget_content'] = '</div><!-- .widget-content -->';
 		ob_start();
-		call_user_func_array( 'wp_widget_control', $args );
+		call_user_func_array('wp_widget_control', $args);
 		$control_tpl = ob_get_clean();
 		return $control_tpl;
 	}
@@ -951,23 +951,23 @@ 
 	 *     @type string $content The contents of the widget form itself.
 	 * }
 	 */
-	public function get_widget_control_parts( $args ) {
+	public function get_widget_control_parts($args) {
 		$args[0]['before_widget_content'] = '<div class="widget-content">';
 		$args[0]['after_widget_content'] = '</div><!-- .widget-content -->';
-		$control_markup = $this->get_widget_control( $args );
+		$control_markup = $this->get_widget_control($args);
 
-		$content_start_pos = strpos( $control_markup, $args[0]['before_widget_content'] );
-		$content_end_pos = strrpos( $control_markup, $args[0]['after_widget_content'] );
+		$content_start_pos = strpos($control_markup, $args[0]['before_widget_content']);
+		$content_end_pos = strrpos($control_markup, $args[0]['after_widget_content']);
 
-		$control = substr( $control_markup, 0, $content_start_pos + strlen( $args[0]['before_widget_content'] ) );
-		$control .= substr( $control_markup, $content_end_pos );
-		$content = trim( substr(
+		$control = substr($control_markup, 0, $content_start_pos + strlen($args[0]['before_widget_content']));
+		$control .= substr($control_markup, $content_end_pos);
+		$content = trim(substr(
 			$control_markup,
-			$content_start_pos + strlen( $args[0]['before_widget_content'] ),
-			$content_end_pos - $content_start_pos - strlen( $args[0]['before_widget_content'] )
-		) );
+			$content_start_pos + strlen($args[0]['before_widget_content']),
+			$content_end_pos - $content_start_pos - strlen($args[0]['before_widget_content'])
+		));
 
-		return compact( 'control', 'content' );
+		return compact('control', 'content');
 	}
 
 	/**
@@ -977,9 +977,9 @@ 
 	 * @access public
 	 */
 	public function customize_preview_init() {
-		add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue' ) );
-		add_action( 'wp_print_styles',    array( $this, 'print_preview_css' ), 1 );
-		add_action( 'wp_footer',          array( $this, 'export_preview_data' ), 20 );
+		add_action('wp_enqueue_scripts', array($this, 'customize_preview_enqueue'));
+		add_action('wp_print_styles', array($this, 'print_preview_css'), 1);
+		add_action('wp_footer', array($this, 'export_preview_data'), 20);
 	}
 
 	/**
@@ -991,8 +991,8 @@ 
 	 * @param  array $nonces Array of nonces.
 	 * @return array $nonces Array of nonces.
 	 */
-	public function refresh_nonces( $nonces ) {
-		$nonces['update-widget'] = wp_create_nonce( 'update-widget' );
+	public function refresh_nonces($nonces) {
+		$nonces['update-widget'] = wp_create_nonce('update-widget');
 		return $nonces;
 	}
 
@@ -1010,10 +1010,10 @@ 
 	 * @param array $sidebars_widgets List of widgets for the current sidebar.
 	 * @return array
 	 */
-	public function preview_sidebars_widgets( $sidebars_widgets ) {
-		$sidebars_widgets = get_option( 'sidebars_widgets' );
+	public function preview_sidebars_widgets($sidebars_widgets) {
+		$sidebars_widgets = get_option('sidebars_widgets');
 
-		unset( $sidebars_widgets['array_version'] );
+		unset($sidebars_widgets['array_version']);
 		return $sidebars_widgets;
 	}
 
@@ -1024,7 +1024,7 @@ 
 	 * @access public
 	 */
 	public function customize_preview_enqueue() {
-		wp_enqueue_script( 'customize-preview-widgets' );
+		wp_enqueue_script('customize-preview-widgets');
 	}
 
 	/**
@@ -1062,22 +1062,22 @@ 
 		global $wp_registered_sidebars, $wp_registered_widgets;
 		// Prepare Customizer settings to pass to JavaScript.
 		$settings = array(
-			'renderedSidebars'   => array_fill_keys( array_unique( $this->rendered_sidebars ), true ),
-			'renderedWidgets'    => array_fill_keys( array_keys( $this->rendered_widgets ), true ),
-			'registeredSidebars' => array_values( $wp_registered_sidebars ),
+			'renderedSidebars'   => array_fill_keys(array_unique($this->rendered_sidebars), true),
+			'renderedWidgets'    => array_fill_keys(array_keys($this->rendered_widgets), true),
+			'registeredSidebars' => array_values($wp_registered_sidebars),
 			'registeredWidgets'  => $wp_registered_widgets,
 			'l10n'               => array(
-				'widgetTooltip'  => __( 'Shift-click to edit this widget.' ),
+				'widgetTooltip'  => __('Shift-click to edit this widget.'),
 			),
-			'selectiveRefresh'   => isset( $this->manager->selective_refresh ),
+			'selectiveRefresh'   => isset($this->manager->selective_refresh),
 		);
-		foreach ( $settings['registeredWidgets'] as &$registered_widget ) {
-			unset( $registered_widget['callback'] ); // may not be JSON-serializeable
+		foreach ($settings['registeredWidgets'] as &$registered_widget) {
+			unset($registered_widget['callback']); // may not be JSON-serializeable
 		}
 
 		?>
 		<script type="text/javascript">
-			var _wpWidgetCustomizerPreviewSettings = <?php echo wp_json_encode( $settings ); ?>;
+			var _wpWidgetCustomizerPreviewSettings = <?php echo wp_json_encode($settings); ?>;
 		</script>
 		<?php
 	}
@@ -1090,8 +1090,8 @@ 
 	 *
 	 * @param array $widget Rendered widget to tally.
 	 */
-	public function tally_rendered_widgets( $widget ) {
-		$this->rendered_widgets[ $widget['id'] ] = true;
+	public function tally_rendered_widgets($widget) {
+		$this->rendered_widgets[$widget['id']] = true;
 	}
 
 	/**
@@ -1103,8 +1103,8 @@ 
 	 * @param string $widget_id Widget ID to check.
 	 * @return bool Whether the widget is rendered.
 	 */
-	public function is_widget_rendered( $widget_id ) {
-		return in_array( $widget_id, $this->rendered_widgets );
+	public function is_widget_rendered($widget_id) {
+		return in_array($widget_id, $this->rendered_widgets);
 	}
 
 	/**
@@ -1116,8 +1116,8 @@ 
 	 * @param string $sidebar_id Sidebar ID to check.
 	 * @return bool Whether the sidebar is rendered.
 	 */
-	public function is_sidebar_rendered( $sidebar_id ) {
-		return in_array( $sidebar_id, $this->rendered_sidebars );
+	public function is_sidebar_rendered($sidebar_id) {
+		return in_array($sidebar_id, $this->rendered_sidebars);
 	}
 
 	/**
@@ -1134,8 +1134,8 @@ 
 	 * @param string $sidebar_id Sidebar ID.
 	 * @return bool Whether the sidebar is active.
 	 */
-	public function tally_sidebars_via_is_active_sidebar_calls( $is_active, $sidebar_id ) {
-		if ( is_registered_sidebar( $sidebar_id ) ) {
+	public function tally_sidebars_via_is_active_sidebar_calls($is_active, $sidebar_id) {
+		if (is_registered_sidebar($sidebar_id)) {
 			$this->rendered_sidebars[] = $sidebar_id;
 		}
 		/*
@@ -1160,8 +1160,8 @@ 
 	 * @param string $sidebar_id  Sidebar ID.
 	 * @return bool Whether the current sidebar has widgets.
 	 */
-	public function tally_sidebars_via_dynamic_sidebar_calls( $has_widgets, $sidebar_id ) {
-		if ( is_registered_sidebar( $sidebar_id ) ) {
+	public function tally_sidebars_via_dynamic_sidebar_calls($has_widgets, $sidebar_id) {
+		if (is_registered_sidebar($sidebar_id)) {
 			$this->rendered_sidebars[] = $sidebar_id;
 		}
 
@@ -1185,8 +1185,8 @@ 
 	 * @param string $serialized_instance Widget instance.
 	 * @return string MAC for serialized widget instance.
 	 */
-	protected function get_instance_hash_key( $serialized_instance ) {
-		return wp_hash( $serialized_instance );
+	protected function get_instance_hash_key($serialized_instance) {
+		return wp_hash($serialized_instance);
 	}
 
 	/**
@@ -1201,29 +1201,29 @@ 
 	 * @param array $value Widget instance to sanitize.
 	 * @return array|void Sanitized widget instance.
 	 */
-	public function sanitize_widget_instance( $value ) {
-		if ( $value === array() ) {
+	public function sanitize_widget_instance($value) {
+		if ($value === array()) {
 			return $value;
 		}
 
-		if ( empty( $value['is_widget_customizer_js_value'] )
-			|| empty( $value['instance_hash_key'] )
-			|| empty( $value['encoded_serialized_instance'] ) )
+		if (empty($value['is_widget_customizer_js_value'])
+			|| empty($value['instance_hash_key'])
+			|| empty($value['encoded_serialized_instance']))
 		{
 			return;
 		}
 
-		$decoded = base64_decode( $value['encoded_serialized_instance'], true );
-		if ( false === $decoded ) {
+		$decoded = base64_decode($value['encoded_serialized_instance'], true);
+		if (false === $decoded) {
 			return;
 		}
 
-		if ( ! hash_equals( $this->get_instance_hash_key( $decoded ), $value['instance_hash_key'] ) ) {
+		if ( ! hash_equals($this->get_instance_hash_key($decoded), $value['instance_hash_key'])) {
 			return;
 		}
 
-		$instance = unserialize( $decoded );
-		if ( false === $instance ) {
+		$instance = unserialize($decoded);
+		if (false === $instance) {
 			return;
 		}
 
@@ -1239,15 +1239,15 @@ 
 	 * @param array $value Widget instance to convert to JSON.
 	 * @return array JSON-converted widget instance.
 	 */
-	public function sanitize_widget_js_instance( $value ) {
-		if ( empty( $value['is_widget_customizer_js_value'] ) ) {
-			$serialized = serialize( $value );
+	public function sanitize_widget_js_instance($value) {
+		if (empty($value['is_widget_customizer_js_value'])) {
+			$serialized = serialize($value);
 
 			$value = array(
-				'encoded_serialized_instance'   => base64_encode( $serialized ),
-				'title'                         => empty( $value['title'] ) ? '' : $value['title'],
+				'encoded_serialized_instance'   => base64_encode($serialized),
+				'title'                         => empty($value['title']) ? '' : $value['title'],
 				'is_widget_customizer_js_value' => true,
-				'instance_hash_key'             => $this->get_instance_hash_key( $serialized ),
+				'instance_hash_key'             => $this->get_instance_hash_key($serialized),
 			);
 		}
 		return $value;
@@ -1267,9 +1267,9 @@ 
 	 * @param array $widget_ids List of widget IDs.
 	 * @return array Parsed list of widget IDs.
 	 */
-	public function sanitize_sidebar_widgets_js_instance( $widget_ids ) {
+	public function sanitize_sidebar_widgets_js_instance($widget_ids) {
 		global $wp_registered_widgets;
-		$widget_ids = array_values( array_intersect( $widget_ids, array_keys( $wp_registered_widgets ) ) );
+		$widget_ids = array_values(array_intersect($widget_ids, array_keys($wp_registered_widgets)));
 		return $widget_ids;
 	}
 
@@ -1288,93 +1288,93 @@ 
 	 * @return WP_Error|array Array containing the updated widget information.
 	 *                        A WP_Error object, otherwise.
 	 */
-	public function call_widget_update( $widget_id ) {
+	public function call_widget_update($widget_id) {
 		global $wp_registered_widget_updates, $wp_registered_widget_controls;
 
-		$setting_id = $this->get_setting_id( $widget_id );
+		$setting_id = $this->get_setting_id($widget_id);
 
 		/*
 		 * Make sure that other setting changes have previewed since this widget
 		 * may depend on them (e.g. Menus being present for Custom Menu widget).
 		 */
-		if ( ! did_action( 'customize_preview_init' ) ) {
-			foreach ( $this->manager->settings() as $setting ) {
-				if ( $setting->id !== $setting_id ) {
+		if ( ! did_action('customize_preview_init')) {
+			foreach ($this->manager->settings() as $setting) {
+				if ($setting->id !== $setting_id) {
 					$setting->preview();
 				}
 			}
 		}
 
 		$this->start_capturing_option_updates();
-		$parsed_id   = $this->parse_widget_id( $widget_id );
-		$option_name = 'widget_' . $parsed_id['id_base'];
+		$parsed_id   = $this->parse_widget_id($widget_id);
+		$option_name = 'widget_'.$parsed_id['id_base'];
 
 		/*
 		 * If a previously-sanitized instance is provided, populate the input vars
 		 * with its values so that the widget update callback will read this instance
 		 */
 		$added_input_vars = array();
-		if ( ! empty( $_POST['sanitized_widget_setting'] ) ) {
-			$sanitized_widget_setting = json_decode( $this->get_post_value( 'sanitized_widget_setting' ), true );
-			if ( false === $sanitized_widget_setting ) {
+		if ( ! empty($_POST['sanitized_widget_setting'])) {
+			$sanitized_widget_setting = json_decode($this->get_post_value('sanitized_widget_setting'), true);
+			if (false === $sanitized_widget_setting) {
 				$this->stop_capturing_option_updates();
-				return new WP_Error( 'widget_setting_malformed' );
+				return new WP_Error('widget_setting_malformed');
 			}
 
-			$instance = $this->sanitize_widget_instance( $sanitized_widget_setting );
-			if ( is_null( $instance ) ) {
+			$instance = $this->sanitize_widget_instance($sanitized_widget_setting);
+			if (is_null($instance)) {
 				$this->stop_capturing_option_updates();
-				return new WP_Error( 'widget_setting_unsanitized' );
+				return new WP_Error('widget_setting_unsanitized');
 			}
 
-			if ( ! is_null( $parsed_id['number'] ) ) {
+			if ( ! is_null($parsed_id['number'])) {
 				$value = array();
 				$value[$parsed_id['number']] = $instance;
-				$key = 'widget-' . $parsed_id['id_base'];
-				$_REQUEST[$key] = $_POST[$key] = wp_slash( $value );
+				$key = 'widget-'.$parsed_id['id_base'];
+				$_REQUEST[$key] = $_POST[$key] = wp_slash($value);
 				$added_input_vars[] = $key;
 			} else {
-				foreach ( $instance as $key => $value ) {
-					$_REQUEST[$key] = $_POST[$key] = wp_slash( $value );
+				foreach ($instance as $key => $value) {
+					$_REQUEST[$key] = $_POST[$key] = wp_slash($value);
 					$added_input_vars[] = $key;
 				}
 			}
 		}
 
 		// Invoke the widget update callback.
-		foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
-			if ( $name === $parsed_id['id_base'] && is_callable( $control['callback'] ) ) {
+		foreach ((array) $wp_registered_widget_updates as $name => $control) {
+			if ($name === $parsed_id['id_base'] && is_callable($control['callback'])) {
 				ob_start();
-				call_user_func_array( $control['callback'], $control['params'] );
+				call_user_func_array($control['callback'], $control['params']);
 				ob_end_clean();
 				break;
 			}
 		}
 
 		// Clean up any input vars that were manually added
-		foreach ( $added_input_vars as $key ) {
-			unset( $_POST[ $key ] );
-			unset( $_REQUEST[ $key ] );
+		foreach ($added_input_vars as $key) {
+			unset($_POST[$key]);
+			unset($_REQUEST[$key]);
 		}
 
 		// Make sure the expected option was updated.
-		if ( 0 !== $this->count_captured_options() ) {
-			if ( $this->count_captured_options() > 1 ) {
+		if (0 !== $this->count_captured_options()) {
+			if ($this->count_captured_options() > 1) {
 				$this->stop_capturing_option_updates();
-				return new WP_Error( 'widget_setting_too_many_options' );
+				return new WP_Error('widget_setting_too_many_options');
 			}
 
-			$updated_option_name = key( $this->get_captured_options() );
-			if ( $updated_option_name !== $option_name ) {
+			$updated_option_name = key($this->get_captured_options());
+			if ($updated_option_name !== $option_name) {
 				$this->stop_capturing_option_updates();
-				return new WP_Error( 'widget_setting_unexpected_option' );
+				return new WP_Error('widget_setting_unexpected_option');
 			}
 		}
 
 		// Obtain the widget instance.
-		$option = $this->get_captured_option( $option_name );
-		if ( null !== $parsed_id['number'] ) {
-			$instance = $option[ $parsed_id['number'] ];
+		$option = $this->get_captured_option($option_name);
+		if (null !== $parsed_id['number']) {
+			$instance = $option[$parsed_id['number']];
 		} else {
 			$instance = $option;
 		}
@@ -1385,19 +1385,19 @@ 
 		 * in place from WP_Customize_Setting::preview() will use this value
 		 * instead of the default widget instance value (an empty array).
 		 */
-		$this->manager->set_post_value( $setting_id, $this->sanitize_widget_js_instance( $instance ) );
+		$this->manager->set_post_value($setting_id, $this->sanitize_widget_js_instance($instance));
 
 		// Obtain the widget control with the updated instance in place.
 		ob_start();
-		$form = $wp_registered_widget_controls[ $widget_id ];
-		if ( $form ) {
-			call_user_func_array( $form['callback'], $form['params'] );
+		$form = $wp_registered_widget_controls[$widget_id];
+		if ($form) {
+			call_user_func_array($form['callback'], $form['params']);
 		}
 		$form = ob_get_clean();
 
 		$this->stop_capturing_option_updates();
 
-		return compact( 'instance', 'form' );
+		return compact('instance', 'form');
 	}
 
 	/**
@@ -1415,53 +1415,53 @@ 
 	 */
 	public function wp_ajax_update_widget() {
 
-		if ( ! is_user_logged_in() ) {
-			wp_die( 0 );
+		if ( ! is_user_logged_in()) {
+			wp_die(0);
 		}
 
-		check_ajax_referer( 'update-widget', 'nonce' );
+		check_ajax_referer('update-widget', 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_die( -1 );
 		}
 
-		if ( empty( $_POST['widget-id'] ) ) {
-			wp_send_json_error( 'missing_widget-id' );
+		if (empty($_POST['widget-id'])) {
+			wp_send_json_error('missing_widget-id');
 		}
 
 		/** This action is documented in wp-admin/includes/ajax-actions.php */
-		do_action( 'load-widgets.php' );
+		do_action('load-widgets.php');
 
 		/** This action is documented in wp-admin/includes/ajax-actions.php */
-		do_action( 'widgets.php' );
+		do_action('widgets.php');
 
 		/** This action is documented in wp-admin/widgets.php */
-		do_action( 'sidebar_admin_setup' );
+		do_action('sidebar_admin_setup');
 
-		$widget_id = $this->get_post_value( 'widget-id' );
-		$parsed_id = $this->parse_widget_id( $widget_id );
+		$widget_id = $this->get_post_value('widget-id');
+		$parsed_id = $this->parse_widget_id($widget_id);
 		$id_base = $parsed_id['id_base'];
 
 		$is_updating_widget_template = (
-			isset( $_POST[ 'widget-' . $id_base ] )
+			isset($_POST['widget-'.$id_base])
 			&&
-			is_array( $_POST[ 'widget-' . $id_base ] )
+			is_array($_POST['widget-'.$id_base])
 			&&
-			preg_match( '/__i__|%i%/', key( $_POST[ 'widget-' . $id_base ] ) )
+			preg_match('/__i__|%i%/', key($_POST['widget-'.$id_base]))
 		);
-		if ( $is_updating_widget_template ) {
-			wp_send_json_error( 'template_widget_not_updatable' );
+		if ($is_updating_widget_template) {
+			wp_send_json_error('template_widget_not_updatable');
 		}
 
-		$updated_widget = $this->call_widget_update( $widget_id ); // => {instance,form}
-		if ( is_wp_error( $updated_widget ) ) {
-			wp_send_json_error( $updated_widget->get_error_code() );
+		$updated_widget = $this->call_widget_update($widget_id); // => {instance,form}
+		if (is_wp_error($updated_widget)) {
+			wp_send_json_error($updated_widget->get_error_code());
 		}
 
 		$form = $updated_widget['form'];
-		$instance = $this->sanitize_widget_js_instance( $updated_widget['instance'] );
+		$instance = $this->sanitize_widget_js_instance($updated_widget['instance']);
 
-		wp_send_json_success( compact( 'form', 'instance' ) );
+		wp_send_json_success(compact('form', 'instance'));
 	}
 
 	/*
@@ -1478,19 +1478,19 @@ 
 	 * @param string      $partial_id   Partial ID.
 	 * @return array (Maybe) modified partial arguments.
 	 */
-	public function customize_dynamic_partial_args( $partial_args, $partial_id ) {
+	public function customize_dynamic_partial_args($partial_args, $partial_id) {
 
-		if ( preg_match( '/^widget\[(?P<widget_id>.+)\]$/', $partial_id, $matches ) ) {
-			if ( false === $partial_args ) {
+		if (preg_match('/^widget\[(?P<widget_id>.+)\]$/', $partial_id, $matches)) {
+			if (false === $partial_args) {
 				$partial_args = array();
 			}
 			$partial_args = array_merge(
 				$partial_args,
 				array(
 					'type'                => 'widget',
-					'render_callback'     => array( $this, 'render_widget_partial' ),
+					'render_callback'     => array($this, 'render_widget_partial'),
 					'container_inclusive' => true,
-					'settings'            => array( $this->get_setting_id( $matches['widget_id'] ) ),
+					'settings'            => array($this->get_setting_id($matches['widget_id'])),
 					'capability'          => 'edit_theme_options',
 				)
 			);
@@ -1506,15 +1506,15 @@ 
 	 * @access public
 	 */
 	public function selective_refresh_init() {
-		if ( ! isset( $this->manager->selective_refresh ) ) {
+		if ( ! isset($this->manager->selective_refresh)) {
 			return;
 		}
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue_deps' ) );
-		add_filter( 'dynamic_sidebar_params', array( $this, 'filter_dynamic_sidebar_params' ) );
-		add_filter( 'wp_kses_allowed_html', array( $this, 'filter_wp_kses_allowed_data_attributes' ) );
-		add_action( 'dynamic_sidebar_before', array( $this, 'start_dynamic_sidebar' ) );
-		add_action( 'dynamic_sidebar_after', array( $this, 'end_dynamic_sidebar' ) );
+		add_action('wp_enqueue_scripts', array($this, 'customize_preview_enqueue_deps'));
+		add_filter('dynamic_sidebar_params', array($this, 'filter_dynamic_sidebar_params'));
+		add_filter('wp_kses_allowed_html', array($this, 'filter_wp_kses_allowed_data_attributes'));
+		add_action('dynamic_sidebar_before', array($this, 'start_dynamic_sidebar'));
+		add_action('dynamic_sidebar_after', array($this, 'end_dynamic_sidebar'));
 	}
 
 	/**
@@ -1524,13 +1524,13 @@ 
 	 * @access public
 	 */
 	public function customize_preview_enqueue_deps() {
-		if ( isset( $this->manager->selective_refresh ) ) {
+		if (isset($this->manager->selective_refresh)) {
 			$script = wp_scripts()->registered['customize-preview-widgets'];
 			$script->deps[] = 'customize-selective-refresh';
 		}
 
-		wp_enqueue_script( 'customize-preview-widgets' );
-		wp_enqueue_style( 'customize-preview' );
+		wp_enqueue_script('customize-preview-widgets');
+		wp_enqueue_style('customize-preview');
 	}
 
 	/**
@@ -1546,7 +1546,7 @@ 
 	 *
 	 * @return array Params.
 	 */
-	public function filter_dynamic_sidebar_params( $params ) {
+	public function filter_dynamic_sidebar_params($params) {
 		$sidebar_args = array_merge(
 			array(
 				'before_widget' => '',
@@ -1558,33 +1558,33 @@ 
 		// Skip widgets not in a registered sidebar or ones which lack a proper wrapper element to attach the data-* attributes to.
 		$matches = array();
 		$is_valid = (
-			isset( $sidebar_args['id'] )
+			isset($sidebar_args['id'])
 			&&
-			is_registered_sidebar( $sidebar_args['id'] )
+			is_registered_sidebar($sidebar_args['id'])
 			&&
-			( isset( $this->current_dynamic_sidebar_id_stack[0] ) && $this->current_dynamic_sidebar_id_stack[0] === $sidebar_args['id'] )
+			(isset($this->current_dynamic_sidebar_id_stack[0]) && $this->current_dynamic_sidebar_id_stack[0] === $sidebar_args['id'])
 			&&
-			preg_match( '#^<(?P<tag_name>\w+)#', $sidebar_args['before_widget'], $matches )
+			preg_match('#^<(?P<tag_name>\w+)#', $sidebar_args['before_widget'], $matches)
 		);
-		if ( ! $is_valid ) {
+		if ( ! $is_valid) {
 			return $params;
 		}
-		$this->before_widget_tags_seen[ $matches['tag_name'] ] = true;
+		$this->before_widget_tags_seen[$matches['tag_name']] = true;
 
 		$context = array(
 			'sidebar_id' => $sidebar_args['id'],
 		);
-		if ( isset( $this->context_sidebar_instance_number ) ) {
+		if (isset($this->context_sidebar_instance_number)) {
 			$context['sidebar_instance_number'] = $this->context_sidebar_instance_number;
-		} else if ( isset( $sidebar_args['id'] ) && isset( $this->sidebar_instance_count[ $sidebar_args['id'] ] ) ) {
-			$context['sidebar_instance_number'] = $this->sidebar_instance_count[ $sidebar_args['id'] ];
+		} else if (isset($sidebar_args['id']) && isset($this->sidebar_instance_count[$sidebar_args['id']])) {
+			$context['sidebar_instance_number'] = $this->sidebar_instance_count[$sidebar_args['id']];
 		}
 
-		$attributes = sprintf( ' data-customize-partial-id="%s"', esc_attr( 'widget[' . $sidebar_args['widget_id'] . ']' ) );
+		$attributes = sprintf(' data-customize-partial-id="%s"', esc_attr('widget['.$sidebar_args['widget_id'].']'));
 		$attributes .= ' data-customize-partial-type="widget"';
-		$attributes .= sprintf( ' data-customize-partial-placement-context="%s"', esc_attr( wp_json_encode( $context ) ) );
-		$attributes .= sprintf( ' data-customize-widget-id="%s"', esc_attr( $sidebar_args['widget_id'] ) );
-		$sidebar_args['before_widget'] = preg_replace( '#^(<\w+)#', '$1 ' . $attributes, $sidebar_args['before_widget'] );
+		$attributes .= sprintf(' data-customize-partial-placement-context="%s"', esc_attr(wp_json_encode($context)));
+		$attributes .= sprintf(' data-customize-widget-id="%s"', esc_attr($sidebar_args['widget_id']));
+		$sidebar_args['before_widget'] = preg_replace('#^(<\w+)#', '$1 '.$attributes, $sidebar_args['before_widget']);
 
 		$params[0] = $sidebar_args;
 		return $params;
@@ -1613,20 +1613,20 @@ 
 	 * @param array $allowed_html Allowed HTML.
 	 * @return array (Maybe) modified allowed HTML.
 	 */
-	public function filter_wp_kses_allowed_data_attributes( $allowed_html ) {
-		foreach ( array_keys( $this->before_widget_tags_seen ) as $tag_name ) {
-			if ( ! isset( $allowed_html[ $tag_name ] ) ) {
-				$allowed_html[ $tag_name ] = array();
+	public function filter_wp_kses_allowed_data_attributes($allowed_html) {
+		foreach (array_keys($this->before_widget_tags_seen) as $tag_name) {
+			if ( ! isset($allowed_html[$tag_name])) {
+				$allowed_html[$tag_name] = array();
 			}
-			$allowed_html[ $tag_name ] = array_merge(
-				$allowed_html[ $tag_name ],
-				array_fill_keys( array(
+			$allowed_html[$tag_name] = array_merge(
+				$allowed_html[$tag_name],
+				array_fill_keys(array(
 					'data-customize-partial-id',
 					'data-customize-partial-type',
 					'data-customize-partial-placement-context',
 					'data-customize-partial-widget-id',
 					'data-customize-partial-options',
-				), true )
+				), true)
 			);
 		}
 		return $allowed_html;
@@ -1671,14 +1671,14 @@ 
 	 *
 	 * @param int|string $index Index, name, or ID of the dynamic sidebar.
 	 */
-	public function start_dynamic_sidebar( $index ) {
-		array_unshift( $this->current_dynamic_sidebar_id_stack, $index );
-		if ( ! isset( $this->sidebar_instance_count[ $index ] ) ) {
-			$this->sidebar_instance_count[ $index ] = 0;
+	public function start_dynamic_sidebar($index) {
+		array_unshift($this->current_dynamic_sidebar_id_stack, $index);
+		if ( ! isset($this->sidebar_instance_count[$index])) {
+			$this->sidebar_instance_count[$index] = 0;
 		}
-		$this->sidebar_instance_count[ $index ] += 1;
-		if ( ! $this->manager->selective_refresh->is_render_partials_request() ) {
-			printf( "\n<!--dynamic_sidebar_before:%s:%d-->\n", esc_html( $index ), intval( $this->sidebar_instance_count[ $index ] ) );
+		$this->sidebar_instance_count[$index] += 1;
+		if ( ! $this->manager->selective_refresh->is_render_partials_request()) {
+			printf("\n<!--dynamic_sidebar_before:%s:%d-->\n", esc_html($index), intval($this->sidebar_instance_count[$index]));
 		}
 	}
 
@@ -1692,10 +1692,10 @@ 
 	 *
 	 * @param int|string $index Index, name, or ID of the dynamic sidebar.
 	 */
-	public function end_dynamic_sidebar( $index ) {
-		array_shift( $this->current_dynamic_sidebar_id_stack );
-		if ( ! $this->manager->selective_refresh->is_render_partials_request() ) {
-			printf( "\n<!--dynamic_sidebar_after:%s:%d-->\n", esc_html( $index ), intval( $this->sidebar_instance_count[ $index ] ) );
+	public function end_dynamic_sidebar($index) {
+		array_shift($this->current_dynamic_sidebar_id_stack);
+		if ( ! $this->manager->selective_refresh->is_render_partials_request()) {
+			printf("\n<!--dynamic_sidebar_after:%s:%d-->\n", esc_html($index), intval($this->sidebar_instance_count[$index]));
 		}
 	}
 
@@ -1726,8 +1726,8 @@ 
 	 * @param array $sidebars_widgets Sidebars widgets.
 	 * @return array Filtered sidebars widgets.
 	 */
-	public function filter_sidebars_widgets_for_rendering_widget( $sidebars_widgets ) {
-		$sidebars_widgets[ $this->rendering_sidebar_id ] = array( $this->rendering_widget_id );
+	public function filter_sidebars_widgets_for_rendering_widget($sidebars_widgets) {
+		$sidebars_widgets[$this->rendering_sidebar_id] = array($this->rendering_widget_id);
 		return $sidebars_widgets;
 	}
 
@@ -1748,36 +1748,36 @@ 
 	 * }
 	 * @return string|false
 	 */
-	public function render_widget_partial( $partial, $context ) {
+	public function render_widget_partial($partial, $context) {
 		$id_data   = $partial->id_data();
-		$widget_id = array_shift( $id_data['keys'] );
+		$widget_id = array_shift($id_data['keys']);
 
-		if ( ! is_array( $context )
-			|| empty( $context['sidebar_id'] )
-			|| ! is_registered_sidebar( $context['sidebar_id'] )
+		if ( ! is_array($context)
+			|| empty($context['sidebar_id'])
+			|| ! is_registered_sidebar($context['sidebar_id'])
 		) {
 			return false;
 		}
 
 		$this->rendering_sidebar_id = $context['sidebar_id'];
 
-		if ( isset( $context['sidebar_instance_number'] ) ) {
-			$this->context_sidebar_instance_number = intval( $context['sidebar_instance_number'] );
+		if (isset($context['sidebar_instance_number'])) {
+			$this->context_sidebar_instance_number = intval($context['sidebar_instance_number']);
 		}
 
 		// Filter sidebars_widgets so that only the queried widget is in the sidebar.
 		$this->rendering_widget_id = $widget_id;
 
-		$filter_callback = array( $this, 'filter_sidebars_widgets_for_rendering_widget' );
-		add_filter( 'sidebars_widgets', $filter_callback, 1000 );
+		$filter_callback = array($this, 'filter_sidebars_widgets_for_rendering_widget');
+		add_filter('sidebars_widgets', $filter_callback, 1000);
 
 		// Render the widget.
 		ob_start();
-		dynamic_sidebar( $this->rendering_sidebar_id = $context['sidebar_id'] );
+		dynamic_sidebar($this->rendering_sidebar_id = $context['sidebar_id']);
 		$container = ob_get_clean();
 
 		// Reset variables for next partial render.
-		remove_filter( 'sidebars_widgets', $filter_callback, 1000 );
+		remove_filter('sidebars_widgets', $filter_callback, 1000);
 
 		$this->context_sidebar_instance_number = null;
 		$this->rendering_sidebar_id = null;
@@ -1817,8 +1817,8 @@ 
 	 * @param string $option_name Option name.
 	 * @return bool Whether the option capture is ignored.
 	 */
-	protected function is_option_capture_ignored( $option_name ) {
-		return ( 0 === strpos( $option_name, '_transient_' ) );
+	protected function is_option_capture_ignored($option_name) {
+		return (0 === strpos($option_name, '_transient_'));
 	}
 
 	/**
@@ -1843,9 +1843,9 @@ 
 	 * @param mixed  $default     Optional. Default value to return if the option does not exist. Default false.
 	 * @return mixed Value set for the option.
 	 */
-	protected function get_captured_option( $option_name, $default = false ) {
-		if ( array_key_exists( $option_name, $this->_captured_options ) ) {
-			$value = $this->_captured_options[ $option_name ];
+	protected function get_captured_option($option_name, $default = false) {
+		if (array_key_exists($option_name, $this->_captured_options)) {
+			$value = $this->_captured_options[$option_name];
 		} else {
 			$value = $default;
 		}
@@ -1861,7 +1861,7 @@ 
 	 * @return int Number of updated options.
 	 */
 	protected function count_captured_options() {
-		return count( $this->_captured_options );
+		return count($this->_captured_options);
 	}
 
 	/**
@@ -1871,13 +1871,13 @@ 
 	 * @access protected
 	 */
 	protected function start_capturing_option_updates() {
-		if ( $this->_is_capturing_option_updates ) {
+		if ($this->_is_capturing_option_updates) {
 			return;
 		}
 
 		$this->_is_capturing_option_updates = true;
 
-		add_filter( 'pre_update_option', array( $this, 'capture_filter_pre_update_option' ), 10, 3 );
+		add_filter('pre_update_option', array($this, 'capture_filter_pre_update_option'), 10, 3);
 	}
 
 	/**
@@ -1891,16 +1891,16 @@ 
 	 * @param mixed  $old_value   The old option value.
 	 * @return mixed Filtered option value.
 	 */
-	public function capture_filter_pre_update_option( $new_value, $option_name, $old_value ) {
-		if ( $this->is_option_capture_ignored( $option_name ) ) {
+	public function capture_filter_pre_update_option($new_value, $option_name, $old_value) {
+		if ($this->is_option_capture_ignored($option_name)) {
 			return;
 		}
 
-		if ( ! isset( $this->_captured_options[ $option_name ] ) ) {
-			add_filter( "pre_option_{$option_name}", array( $this, 'capture_filter_pre_get_option' ) );
+		if ( ! isset($this->_captured_options[$option_name])) {
+			add_filter("pre_option_{$option_name}", array($this, 'capture_filter_pre_get_option'));
 		}
 
-		$this->_captured_options[ $option_name ] = $new_value;
+		$this->_captured_options[$option_name] = $new_value;
 
 		return $old_value;
 	}
@@ -1914,14 +1914,14 @@ 
 	 * @param mixed $value Value to return instead of the option value.
 	 * @return mixed Filtered option value.
 	 */
-	public function capture_filter_pre_get_option( $value ) {
-		$option_name = preg_replace( '/^pre_option_/', '', current_filter() );
+	public function capture_filter_pre_get_option($value) {
+		$option_name = preg_replace('/^pre_option_/', '', current_filter());
 
-		if ( isset( $this->_captured_options[ $option_name ] ) ) {
-			$value = $this->_captured_options[ $option_name ];
+		if (isset($this->_captured_options[$option_name])) {
+			$value = $this->_captured_options[$option_name];
 
 			/** This filter is documented in wp-includes/option.php */
-			$value = apply_filters( 'option_' . $option_name, $value );
+			$value = apply_filters('option_'.$option_name, $value);
 		}
 
 		return $value;
@@ -1934,14 +1934,14 @@ 
 	 * @access protected
 	 */
 	protected function stop_capturing_option_updates() {
-		if ( ! $this->_is_capturing_option_updates ) {
+		if ( ! $this->_is_capturing_option_updates) {
 			return;
 		}
 
-		remove_filter( 'pre_update_option', array( $this, 'capture_filter_pre_update_option' ), 10 );
+		remove_filter('pre_update_option', array($this, 'capture_filter_pre_update_option'), 10);
 
-		foreach ( array_keys( $this->_captured_options ) as $option_name ) {
-			remove_filter( "pre_option_{$option_name}", array( $this, 'capture_filter_pre_get_option' ) );
+		foreach (array_keys($this->_captured_options) as $option_name) {
+			remove_filter("pre_option_{$option_name}", array($this, 'capture_filter_pre_get_option'));
 		}
 
 		$this->_captured_options = array();
@@ -1953,7 +1953,7 @@ 
 	 * @deprecated 4.2.0 Deprecated in favor of customize_dynamic_setting_args filter.
 	 */
 	public function setup_widget_addition_previews() {
-		_deprecated_function( __METHOD__, '4.2.0' );
+		_deprecated_function(__METHOD__, '4.2.0');
 	}
 
 	/**
@@ -1961,7 +1961,7 @@ 
 	 * @deprecated 4.2.0 Deprecated in favor of customize_dynamic_setting_args filter.
 	 */
 	public function prepreview_added_sidebars_widgets() {
-		_deprecated_function( __METHOD__, '4.2.0' );
+		_deprecated_function(__METHOD__, '4.2.0');
 	}
 
 	/**
@@ -1969,7 +1969,7 @@ 
 	 * @deprecated 4.2.0 Deprecated in favor of customize_dynamic_setting_args filter.
 	 */
 	public function prepreview_added_widget_instance() {
-		_deprecated_function( __METHOD__, '4.2.0' );
+		_deprecated_function(__METHOD__, '4.2.0');
 	}
 
 	/**
@@ -1977,6 +1977,6 @@ 
 	 * @deprecated 4.2.0 Deprecated in favor of customize_dynamic_setting_args filter.
 	 */
 	public function remove_prepreview_filters() {
-		_deprecated_function( __METHOD__, '4.2.0' );
+		_deprecated_function(__METHOD__, '4.2.0');
 	}
 }

src/wp-includes/class-json.php

Spacing +47 added lines, -47 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! class_exists( 'Services_JSON' ) ) :
+if ( ! class_exists('Services_JSON')) :
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 /**
  * Converts to and from JSON format.
@@ -59,22 +59,22 @@ 
 /**
  * Marker constant for Services_JSON::decode(), used to flag stack state
  */
-define('SERVICES_JSON_SLICE',   1);
+define('SERVICES_JSON_SLICE', 1);
 
 /**
  * Marker constant for Services_JSON::decode(), used to flag stack state
  */
-define('SERVICES_JSON_IN_STR',  2);
+define('SERVICES_JSON_IN_STR', 2);
 
 /**
  * Marker constant for Services_JSON::decode(), used to flag stack state
  */
-define('SERVICES_JSON_IN_ARR',  3);
+define('SERVICES_JSON_IN_ARR', 3);
 
 /**
  * Marker constant for Services_JSON::decode(), used to flag stack state
  */
-define('SERVICES_JSON_IN_OBJ',  4);
+define('SERVICES_JSON_IN_OBJ', 4);
 
 /**
  * Marker constant for Services_JSON::decode(), used to flag stack state
@@ -140,7 +140,7 @@ 
     *                                   strings or numbers, if you return an object, make sure it does
     *                                   not have a toJSON method, otherwise an error will occur.
     */
-    function __construct( $use = 0 )
+    function __construct($use = 0)
     {
         $this->use = $use;
         $this->_mb_strlen            = function_exists('mb_strlen');
@@ -151,8 +151,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Services_JSON( $use = 0 ) {
-		self::__construct( $use );
+	public function Services_JSON($use = 0) {
+		self::__construct($use);
 	}
     // private - cache the mbstring lookup results..
     var $_mb_strlen = false;
@@ -173,13 +173,13 @@ 
     function utf162utf8($utf16)
     {
         // oh please oh please oh please oh please oh please
-        if($this->_mb_convert_encoding) {
+        if ($this->_mb_convert_encoding) {
             return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
         }
 
         $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
 
-        switch(true) {
+        switch (true) {
             case ((0x7F & $bytes) == $bytes):
                 // this case should never be reached, because we are in ASCII range
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -217,11 +217,11 @@ 
     function utf82utf16($utf8)
     {
         // oh please oh please oh please oh please oh please
-        if($this->_mb_convert_encoding) {
+        if ($this->_mb_convert_encoding) {
             return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
         }
 
-        switch($this->strlen8($utf8)) {
+        switch ($this->strlen8($utf8)) {
             case 1:
                 // this case should never be reached, because we are in ASCII range
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -357,7 +357,7 @@ 
                         case (($ord_var_c & 0xE0) == 0xC0):
                             // characters U-00000080 - U-000007FF, mask 110XXXXX
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c+1 >= $strlen_var) {
+                            if ($c + 1 >= $strlen_var) {
                                 $c += 1;
                                 $ascii .= '?';
                                 break;
@@ -370,7 +370,7 @@ 
                             break;
 
                         case (($ord_var_c & 0xF0) == 0xE0):
-                            if ($c+2 >= $strlen_var) {
+                            if ($c + 2 >= $strlen_var) {
                                 $c += 2;
                                 $ascii .= '?';
                                 break;
@@ -386,7 +386,7 @@ 
                             break;
 
                         case (($ord_var_c & 0xF8) == 0xF0):
-                            if ($c+3 >= $strlen_var) {
+                            if ($c + 3 >= $strlen_var) {
                                 $c += 3;
                                 $ascii .= '?';
                                 break;
@@ -405,7 +405,7 @@ 
                         case (($ord_var_c & 0xFC) == 0xF8):
                             // characters U-00200000 - U-03FFFFFF, mask 111110XX
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c+4 >= $strlen_var) {
+                            if ($c + 4 >= $strlen_var) {
                                 $c += 4;
                                 $ascii .= '?';
                                 break;
@@ -421,7 +421,7 @@ 
                             break;
 
                         case (($ord_var_c & 0xFE) == 0xFC):
-                        if ($c+5 >= $strlen_var) {
+                        if ($c + 5 >= $strlen_var) {
                                 $c += 5;
                                 $ascii .= '?';
                                 break;
@@ -467,25 +467,25 @@ 
                                             array_keys($var),
                                             array_values($var));
 
-                    foreach($properties as $property) {
-                        if(Services_JSON::isError($property)) {
+                    foreach ($properties as $property) {
+                        if (Services_JSON::isError($property)) {
                             return $property;
                         }
                     }
 
-                    return '{' . join(',', $properties) . '}';
+                    return '{'.join(',', $properties).'}';
                 }
 
                 // treat it like a regular array
                 $elements = array_map(array($this, '_encode'), $var);
 
-                foreach($elements as $element) {
-                    if(Services_JSON::isError($element)) {
+                foreach ($elements as $element) {
+                    if (Services_JSON::isError($element)) {
                         return $element;
                     }
                 }
 
-                return '[' . join(',', $elements) . ']';
+                return '['.join(',', $elements).']';
 
             case 'object':
             
@@ -504,7 +504,7 @@ 
                             
                     }
                     
-                    return $this->_encode( $recode );
+                    return $this->_encode($recode);
                 } 
                 
                 $vars = get_object_vars($var);
@@ -513,13 +513,13 @@ 
                                         array_keys($vars),
                                         array_values($vars));
 
-                foreach($properties as $property) {
-                    if(Services_JSON::isError($property)) {
+                foreach ($properties as $property) {
+                    if (Services_JSON::isError($property)) {
                         return $property;
                     }
                 }
 
-                return '{' . join(',', $properties) . '}';
+                return '{'.join(',', $properties).'}';
 
             default:
                 return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
@@ -541,11 +541,11 @@ 
     {
         $encoded_value = $this->_encode($value);
 
-        if(Services_JSON::isError($encoded_value)) {
+        if (Services_JSON::isError($encoded_value)) {
             return $encoded_value;
         }
 
-        return $this->_encode(strval($name)) . ':' . $encoded_value;
+        return $this->_encode(strval($name)).':'.$encoded_value;
     }
 
    /**
@@ -612,9 +612,9 @@ 
                     // return (float)$str;
 
                     // Return float or int, as appropriate
-                    return ((float)$str == (integer)$str)
-                        ? (integer)$str
-                        : (float)$str;
+                    return ((float) $str == (integer) $str)
+                        ? (integer) $str
+                        : (float) $str;
 
                 } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
                     // STRINGS RETURNED IN UTF-8 FORMAT
@@ -885,12 +885,12 @@ 
     * @param string 
     * @return integer length
     */
-    function strlen8( $str ) 
+    function strlen8($str) 
     {
-        if ( $this->_mb_strlen ) {
-            return mb_strlen( $str, "8bit" );
+        if ($this->_mb_strlen) {
+            return mb_strlen($str, "8bit");
         }
-        return strlen( $str );
+        return strlen($str);
     }
     
     /**
@@ -900,15 +900,15 @@ 
     * @param integer length 
     * @return integer length
     */
-    function substr8( $string, $start, $length=false ) 
+    function substr8($string, $start, $length = false) 
     {
-        if ( $length === false ) {
-            $length = $this->strlen8( $string ) - $start;
+        if ($length === false) {
+            $length = $this->strlen8($string) - $start;
         }
-        if ( $this->_mb_substr ) {
-            return mb_substr( $string, $start, $length, "8bit" );
+        if ($this->_mb_substr) {
+            return mb_substr($string, $start, $length, "8bit");
         }
-        return substr( $string, $start, $length );
+        return substr($string, $start, $length);
     }
 
 }
@@ -940,8 +940,8 @@ 
 	    /**
 	     * PHP5 constructor.
 	     */
-        function __construct( $message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null )
+        function __construct($message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null)
         {
 
         }
@@ -949,9 +949,9 @@ 
 	    /**
 	     * PHP4 constructor.
 	     */
-		public function Services_JSON_Error( $message = 'unknown error', $code = null,
-	                                     $mode = null, $options = null, $userinfo = null ) {
-			self::__construct( $message, $code, $mode, $options, $userinfo );
+		public function Services_JSON_Error($message = 'unknown error', $code = null,
+	                                     $mode = null, $options = null, $userinfo = null) {
+			self::__construct($message, $code, $mode, $options, $userinfo);
 		}
     }
     

Braces +3 added lines, -2 removed lines

@@ -844,8 +844,9 @@
                             array_pop($stk);
                             $c++;
 
-                            for ($i = $top['where']; $i <= $c; ++$i)
-                                $chrs = substr_replace($chrs, ' ', $i, 1);
+                            for ($i = $top['where']; $i <= $c; ++$i) {
+                                                            $chrs = substr_replace($chrs, ' ', $i, 1);
+                            }
 
                             //print("Found end of comment at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 

Doc Comments +2 added lines, -2 removed lines

@@ -551,7 +551,7 @@ 
    /**
     * reduce a string by removing leading and trailing comments and whitespace
     *
-    * @param    $str    string      string value to strip of comments and whitespace
+    * @param    string $str    string      string value to strip of comments and whitespace
     *
     * @return   string  string value stripped of comments and whitespace
     * @access   private
@@ -898,7 +898,7 @@ 
     * @param string 
     * @param integer start 
     * @param integer length 
-    * @return integer length
+    * @return string length
     */
     function substr8( $string, $start, $length=false ) 
     {

Indentation +726 added lines, -726 removed lines

@@ -2,59 +2,59 @@ 
 if ( ! class_exists( 'Services_JSON' ) ) :
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 /**
- * Converts to and from JSON format.
- *
- * JSON (JavaScript Object Notation) is a lightweight data-interchange
- * format. It is easy for humans to read and write. It is easy for machines
- * to parse and generate. It is based on a subset of the JavaScript
- * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
- * This feature can also be found in  Python. JSON is a text format that is
- * completely language independent but uses conventions that are familiar
- * to programmers of the C-family of languages, including C, C++, C#, Java,
- * JavaScript, Perl, TCL, and many others. These properties make JSON an
- * ideal data-interchange language.
- *
- * This package provides a simple encoder and decoder for JSON notation. It
- * is intended for use with client-side Javascript applications that make
- * use of HTTPRequest to perform server communication functions - data can
- * be encoded into JSON notation for use in a client-side javascript, or
- * decoded from incoming Javascript requests. JSON format is native to
- * Javascript, and can be directly eval()'ed with no further parsing
- * overhead
- *
- * All strings should be in ASCII or UTF-8 format!
- *
- * LICENSE: Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met: Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following
- * disclaimer. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * @category
- * @package     Services_JSON
- * @author      Michal Migurski <mike-json@teczno.com>
- * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
- * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
- * @copyright   2005 Michal Migurski
- * @version     CVS: $Id: JSON.php 305040 2010-11-02 23:19:03Z alan_k $
- * @license     http://www.opensource.org/licenses/bsd-license.php
- * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
- */
+	 * Converts to and from JSON format.
+	 *
+	 * JSON (JavaScript Object Notation) is a lightweight data-interchange
+	 * format. It is easy for humans to read and write. It is easy for machines
+	 * to parse and generate. It is based on a subset of the JavaScript
+	 * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
+	 * This feature can also be found in  Python. JSON is a text format that is
+	 * completely language independent but uses conventions that are familiar
+	 * to programmers of the C-family of languages, including C, C++, C#, Java,
+	 * JavaScript, Perl, TCL, and many others. These properties make JSON an
+	 * ideal data-interchange language.
+	 *
+	 * This package provides a simple encoder and decoder for JSON notation. It
+	 * is intended for use with client-side Javascript applications that make
+	 * use of HTTPRequest to perform server communication functions - data can
+	 * be encoded into JSON notation for use in a client-side javascript, or
+	 * decoded from incoming Javascript requests. JSON format is native to
+	 * Javascript, and can be directly eval()'ed with no further parsing
+	 * overhead
+	 *
+	 * All strings should be in ASCII or UTF-8 format!
+	 *
+	 * LICENSE: Redistribution and use in source and binary forms, with or
+	 * without modification, are permitted provided that the following
+	 * conditions are met: Redistributions of source code must retain the
+	 * above copyright notice, this list of conditions and the following
+	 * disclaimer. Redistributions in binary form must reproduce the above
+	 * copyright notice, this list of conditions and the following disclaimer
+	 * in the documentation and/or other materials provided with the
+	 * distribution.
+	 *
+	 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+	 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+	 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+	 * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+	 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+	 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+	 * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+	 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+	 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+	 * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+	 * DAMAGE.
+	 *
+	 * @category
+	 * @package     Services_JSON
+	 * @author      Michal Migurski <mike-json@teczno.com>
+	 * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
+	 * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
+	 * @copyright   2005 Michal Migurski
+	 * @version     CVS: $Id: JSON.php 305040 2010-11-02 23:19:03Z alan_k $
+	 * @license     http://www.opensource.org/licenses/bsd-license.php
+	 * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
+	 */
 
 /**
  * Marker constant for Services_JSON::decode(), used to flag stack state
@@ -140,13 +140,13 @@ 
     *                                   strings or numbers, if you return an object, make sure it does
     *                                   not have a toJSON method, otherwise an error will occur.
     */
-    function __construct( $use = 0 )
-    {
-        $this->use = $use;
-        $this->_mb_strlen            = function_exists('mb_strlen');
-        $this->_mb_convert_encoding  = function_exists('mb_convert_encoding');
-        $this->_mb_substr            = function_exists('mb_substr');
-    }
+	function __construct( $use = 0 )
+	{
+		$this->use = $use;
+		$this->_mb_strlen            = function_exists('mb_strlen');
+		$this->_mb_convert_encoding  = function_exists('mb_convert_encoding');
+		$this->_mb_substr            = function_exists('mb_substr');
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -154,10 +154,10 @@ 
 	public function Services_JSON( $use = 0 ) {
 		self::__construct( $use );
 	}
-    // private - cache the mbstring lookup results..
-    var $_mb_strlen = false;
-    var $_mb_substr = false;
-    var $_mb_convert_encoding = false;
+	// private - cache the mbstring lookup results..
+	var $_mb_strlen = false;
+	var $_mb_substr = false;
+	var $_mb_convert_encoding = false;
     
    /**
     * convert a string from one UTF-16 char to one UTF-8 char
@@ -170,38 +170,38 @@ 
     * @return   string  UTF-8 character
     * @access   private
     */
-    function utf162utf8($utf16)
-    {
-        // oh please oh please oh please oh please oh please
-        if($this->_mb_convert_encoding) {
-            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
-        }
-
-        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
-
-        switch(true) {
-            case ((0x7F & $bytes) == $bytes):
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x7F & $bytes);
-
-            case (0x07FF & $bytes) == $bytes:
-                // return a 2-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F))
-                     . chr(0x80 | ($bytes & 0x3F));
-
-            case (0xFFFF & $bytes) == $bytes:
-                // return a 3-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F))
-                     . chr(0x80 | (($bytes >> 6) & 0x3F))
-                     . chr(0x80 | ($bytes & 0x3F));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
+	function utf162utf8($utf16)
+	{
+		// oh please oh please oh please oh please oh please
+		if($this->_mb_convert_encoding) {
+			return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+		}
+
+		$bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+
+		switch(true) {
+			case ((0x7F & $bytes) == $bytes):
+				// this case should never be reached, because we are in ASCII range
+				// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0x7F & $bytes);
+
+			case (0x07FF & $bytes) == $bytes:
+				// return a 2-byte UTF-8 character
+				// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0xC0 | (($bytes >> 6) & 0x1F))
+					 . chr(0x80 | ($bytes & 0x3F));
+
+			case (0xFFFF & $bytes) == $bytes:
+				// return a 3-byte UTF-8 character
+				// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0xE0 | (($bytes >> 12) & 0x0F))
+					 . chr(0x80 | (($bytes >> 6) & 0x3F))
+					 . chr(0x80 | ($bytes & 0x3F));
+		}
+
+		// ignoring UTF-32 for now, sorry
+		return '';
+	}
 
    /**
     * convert a string from one UTF-8 char to one UTF-16 char
@@ -214,38 +214,38 @@ 
     * @return   string  UTF-16 character
     * @access   private
     */
-    function utf82utf16($utf8)
-    {
-        // oh please oh please oh please oh please oh please
-        if($this->_mb_convert_encoding) {
-            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-        }
-
-        switch($this->strlen8($utf8)) {
-            case 1:
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return $utf8;
-
-            case 2:
-                // return a UTF-16 character from a 2-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8{0}) >> 2))
-                     . chr((0xC0 & (ord($utf8{0}) << 6))
-                         | (0x3F & ord($utf8{1})));
-
-            case 3:
-                // return a UTF-16 character from a 3-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8{0}) << 4))
-                         | (0x0F & (ord($utf8{1}) >> 2)))
-                     . chr((0xC0 & (ord($utf8{1}) << 6))
-                         | (0x7F & ord($utf8{2})));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
+	function utf82utf16($utf8)
+	{
+		// oh please oh please oh please oh please oh please
+		if($this->_mb_convert_encoding) {
+			return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+		}
+
+		switch($this->strlen8($utf8)) {
+			case 1:
+				// this case should never be reached, because we are in ASCII range
+				// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return $utf8;
+
+			case 2:
+				// return a UTF-16 character from a 2-byte UTF-8 char
+				// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0x07 & (ord($utf8{0}) >> 2))
+					 . chr((0xC0 & (ord($utf8{0}) << 6))
+						 | (0x3F & ord($utf8{1})));
+
+			case 3:
+				// return a UTF-16 character from a 3-byte UTF-8 char
+				// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr((0xF0 & (ord($utf8{0}) << 4))
+						 | (0x0F & (ord($utf8{1}) >> 2)))
+					 . chr((0xC0 & (ord($utf8{1}) << 6))
+						 | (0x7F & ord($utf8{2})));
+		}
+
+		// ignoring UTF-32 for now, sorry
+		return '';
+	}
 
    /**
     * encodes an arbitrary variable into JSON format (and sends JSON Header)
@@ -258,192 +258,192 @@ 
     * @return   mixed   JSON string representation of input var or an error if a problem occurs
     * @access   public
     */
-    function encode($var)
-    {
-        header('Content-type: application/json');
-        return $this->encodeUnsafe($var);
-    }
-    /**
-    * encodes an arbitrary variable into JSON format without JSON Header - warning - may allow XSS!!!!)
-    *
-    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
-    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
-    *                           if var is a strng, note that encode() always expects it
-    *                           to be in ASCII or UTF-8 format!
-    *
-    * @return   mixed   JSON string representation of input var or an error if a problem occurs
-    * @access   public
-    */
-    function encodeUnsafe($var)
-    {
-        // see bug #16908 - regarding numeric locale printing
-        $lc = setlocale(LC_NUMERIC, 0);
-        setlocale(LC_NUMERIC, 'C');
-        $ret = $this->_encode($var);
-        setlocale(LC_NUMERIC, $lc);
-        return $ret;
+	function encode($var)
+	{
+		header('Content-type: application/json');
+		return $this->encodeUnsafe($var);
+	}
+	/**
+	 * encodes an arbitrary variable into JSON format without JSON Header - warning - may allow XSS!!!!)
+	 *
+	 * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
+	 *                           see argument 1 to Services_JSON() above for array-parsing behavior.
+	 *                           if var is a strng, note that encode() always expects it
+	 *                           to be in ASCII or UTF-8 format!
+	 *
+	 * @return   mixed   JSON string representation of input var or an error if a problem occurs
+	 * @access   public
+	 */
+	function encodeUnsafe($var)
+	{
+		// see bug #16908 - regarding numeric locale printing
+		$lc = setlocale(LC_NUMERIC, 0);
+		setlocale(LC_NUMERIC, 'C');
+		$ret = $this->_encode($var);
+		setlocale(LC_NUMERIC, $lc);
+		return $ret;
         
-    }
-    /**
-    * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format 
-    *
-    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
-    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
-    *                           if var is a strng, note that encode() always expects it
-    *                           to be in ASCII or UTF-8 format!
-    *
-    * @return   mixed   JSON string representation of input var or an error if a problem occurs
-    * @access   public
-    */
-    function _encode($var) 
-    {
+	}
+	/**
+	 * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format 
+	 *
+	 * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
+	 *                           see argument 1 to Services_JSON() above for array-parsing behavior.
+	 *                           if var is a strng, note that encode() always expects it
+	 *                           to be in ASCII or UTF-8 format!
+	 *
+	 * @return   mixed   JSON string representation of input var or an error if a problem occurs
+	 * @access   public
+	 */
+	function _encode($var) 
+	{
          
-        switch (gettype($var)) {
-            case 'boolean':
-                return $var ? 'true' : 'false';
+		switch (gettype($var)) {
+			case 'boolean':
+				return $var ? 'true' : 'false';
 
-            case 'NULL':
-                return 'null';
+			case 'NULL':
+				return 'null';
 
-            case 'integer':
-                return (int) $var;
+			case 'integer':
+				return (int) $var;
 
-            case 'double':
-            case 'float':
-                return  (float) $var;
+			case 'double':
+			case 'float':
+				return  (float) $var;
 
-            case 'string':
-                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-                $ascii = '';
-                $strlen_var = $this->strlen8($var);
+			case 'string':
+				// STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+				$ascii = '';
+				$strlen_var = $this->strlen8($var);
 
-               /*
+			   /*
                 * Iterate over every character in the string,
                 * escaping with a slash or encoding to UTF-8 where necessary
                 */
-                for ($c = 0; $c < $strlen_var; ++$c) {
-
-                    $ord_var_c = ord($var{$c});
-
-                    switch (true) {
-                        case $ord_var_c == 0x08:
-                            $ascii .= '\b';
-                            break;
-                        case $ord_var_c == 0x09:
-                            $ascii .= '\t';
-                            break;
-                        case $ord_var_c == 0x0A:
-                            $ascii .= '\n';
-                            break;
-                        case $ord_var_c == 0x0C:
-                            $ascii .= '\f';
-                            break;
-                        case $ord_var_c == 0x0D:
-                            $ascii .= '\r';
-                            break;
-
-                        case $ord_var_c == 0x22:
-                        case $ord_var_c == 0x2F:
-                        case $ord_var_c == 0x5C:
-                            // double quote, slash, slosh
-                            $ascii .= '\\'.$var{$c};
-                            break;
-
-                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                            // characters U-00000000 - U-0000007F (same as ASCII)
-                            $ascii .= $var{$c};
-                            break;
-
-                        case (($ord_var_c & 0xE0) == 0xC0):
-                            // characters U-00000080 - U-000007FF, mask 110XXXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c+1 >= $strlen_var) {
-                                $c += 1;
-                                $ascii .= '?';
-                                break;
-                            }
+				for ($c = 0; $c < $strlen_var; ++$c) {
+
+					$ord_var_c = ord($var{$c});
+
+					switch (true) {
+						case $ord_var_c == 0x08:
+							$ascii .= '\b';
+							break;
+						case $ord_var_c == 0x09:
+							$ascii .= '\t';
+							break;
+						case $ord_var_c == 0x0A:
+							$ascii .= '\n';
+							break;
+						case $ord_var_c == 0x0C:
+							$ascii .= '\f';
+							break;
+						case $ord_var_c == 0x0D:
+							$ascii .= '\r';
+							break;
+
+						case $ord_var_c == 0x22:
+						case $ord_var_c == 0x2F:
+						case $ord_var_c == 0x5C:
+							// double quote, slash, slosh
+							$ascii .= '\\'.$var{$c};
+							break;
+
+						case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+							// characters U-00000000 - U-0000007F (same as ASCII)
+							$ascii .= $var{$c};
+							break;
+
+						case (($ord_var_c & 0xE0) == 0xC0):
+							// characters U-00000080 - U-000007FF, mask 110XXXXX
+							// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							if ($c+1 >= $strlen_var) {
+								$c += 1;
+								$ascii .= '?';
+								break;
+							}
                             
-                            $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
-                            $c += 1;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF0) == 0xE0):
-                            if ($c+2 >= $strlen_var) {
-                                $c += 2;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         @ord($var{$c + 1}),
-                                         @ord($var{$c + 2}));
-                            $c += 2;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF8) == 0xF0):
-                            if ($c+3 >= $strlen_var) {
-                                $c += 3;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}));
-                            $c += 3;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFC) == 0xF8):
-                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c+4 >= $strlen_var) {
-                                $c += 4;
-                                $ascii .= '?';
-                                break;
-                            }
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}));
-                            $c += 4;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFE) == 0xFC):
-                        if ($c+5 >= $strlen_var) {
-                                $c += 5;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}),
-                                         ord($var{$c + 5}));
-                            $c += 5;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                    }
-                }
-                return  '"'.$ascii.'"';
-
-            case 'array':
-               /*
+							$char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+							$c += 1;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+
+						case (($ord_var_c & 0xF0) == 0xE0):
+							if ($c+2 >= $strlen_var) {
+								$c += 2;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-00000800 - U-0000FFFF, mask 1110XXXX
+							// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char = pack('C*', $ord_var_c,
+										 @ord($var{$c + 1}),
+										 @ord($var{$c + 2}));
+							$c += 2;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+
+						case (($ord_var_c & 0xF8) == 0xF0):
+							if ($c+3 >= $strlen_var) {
+								$c += 3;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-00010000 - U-001FFFFF, mask 11110XXX
+							// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char = pack('C*', $ord_var_c,
+										 ord($var{$c + 1}),
+										 ord($var{$c + 2}),
+										 ord($var{$c + 3}));
+							$c += 3;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+
+						case (($ord_var_c & 0xFC) == 0xF8):
+							// characters U-00200000 - U-03FFFFFF, mask 111110XX
+							// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							if ($c+4 >= $strlen_var) {
+								$c += 4;
+								$ascii .= '?';
+								break;
+							}
+							$char = pack('C*', $ord_var_c,
+										 ord($var{$c + 1}),
+										 ord($var{$c + 2}),
+										 ord($var{$c + 3}),
+										 ord($var{$c + 4}));
+							$c += 4;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+
+						case (($ord_var_c & 0xFE) == 0xFC):
+						if ($c+5 >= $strlen_var) {
+								$c += 5;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-04000000 - U-7FFFFFFF, mask 1111110X
+							// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char = pack('C*', $ord_var_c,
+										 ord($var{$c + 1}),
+										 ord($var{$c + 2}),
+										 ord($var{$c + 3}),
+										 ord($var{$c + 4}),
+										 ord($var{$c + 5}));
+							$c += 5;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+					}
+				}
+				return  '"'.$ascii.'"';
+
+			case 'array':
+			   /*
                 * As per JSON spec if any array key is not an integer
                 * we must treat the whole array as an object. We
                 * also try to catch a sparsely populated associative
@@ -461,72 +461,72 @@ 
                 * bracket notation.
                 */
 
-                // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
-                    $properties = array_map(array($this, 'name_value'),
-                                            array_keys($var),
-                                            array_values($var));
+				// treat as a JSON object
+				if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+					$properties = array_map(array($this, 'name_value'),
+											array_keys($var),
+											array_values($var));
 
-                    foreach($properties as $property) {
-                        if(Services_JSON::isError($property)) {
-                            return $property;
-                        }
-                    }
+					foreach($properties as $property) {
+						if(Services_JSON::isError($property)) {
+							return $property;
+						}
+					}
 
-                    return '{' . join(',', $properties) . '}';
-                }
+					return '{' . join(',', $properties) . '}';
+				}
 
-                // treat it like a regular array
-                $elements = array_map(array($this, '_encode'), $var);
+				// treat it like a regular array
+				$elements = array_map(array($this, '_encode'), $var);
 
-                foreach($elements as $element) {
-                    if(Services_JSON::isError($element)) {
-                        return $element;
-                    }
-                }
+				foreach($elements as $element) {
+					if(Services_JSON::isError($element)) {
+						return $element;
+					}
+				}
 
-                return '[' . join(',', $elements) . ']';
+				return '[' . join(',', $elements) . ']';
 
-            case 'object':
+			case 'object':
             
-                // support toJSON methods.
-                if (($this->use & SERVICES_JSON_USE_TO_JSON) && method_exists($var, 'toJSON')) {
-                    // this may end up allowing unlimited recursion
-                    // so we check the return value to make sure it's not got the same method.
-                    $recode = $var->toJSON();
+				// support toJSON methods.
+				if (($this->use & SERVICES_JSON_USE_TO_JSON) && method_exists($var, 'toJSON')) {
+					// this may end up allowing unlimited recursion
+					// so we check the return value to make sure it's not got the same method.
+					$recode = $var->toJSON();
                     
-                    if (method_exists($recode, 'toJSON')) {
+					if (method_exists($recode, 'toJSON')) {
                         
-                        return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
-                        ? 'null'
-                        : new Services_JSON_Error(get_class($var).
-                            " toJSON returned an object with a toJSON method.");
+						return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
+						? 'null'
+						: new Services_JSON_Error(get_class($var).
+							" toJSON returned an object with a toJSON method.");
                             
-                    }
+					}
                     
-                    return $this->_encode( $recode );
-                } 
+					return $this->_encode( $recode );
+				} 
                 
-                $vars = get_object_vars($var);
+				$vars = get_object_vars($var);
                 
-                $properties = array_map(array($this, 'name_value'),
-                                        array_keys($vars),
-                                        array_values($vars));
-
-                foreach($properties as $property) {
-                    if(Services_JSON::isError($property)) {
-                        return $property;
-                    }
-                }
-
-                return '{' . join(',', $properties) . '}';
-
-            default:
-                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
-                    ? 'null'
-                    : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
-        }
-    }
+				$properties = array_map(array($this, 'name_value'),
+										array_keys($vars),
+										array_values($vars));
+
+				foreach($properties as $property) {
+					if(Services_JSON::isError($property)) {
+						return $property;
+					}
+				}
+
+				return '{' . join(',', $properties) . '}';
+
+			default:
+				return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
+					? 'null'
+					: new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
+		}
+	}
 
    /**
     * array-walking function for use in generating JSON-formatted name-value pairs
@@ -537,16 +537,16 @@ 
     * @return   string  JSON-formatted name-value pair, like '"name":value'
     * @access   private
     */
-    function name_value($name, $value)
-    {
-        $encoded_value = $this->_encode($value);
+	function name_value($name, $value)
+	{
+		$encoded_value = $this->_encode($value);
 
-        if(Services_JSON::isError($encoded_value)) {
-            return $encoded_value;
-        }
+		if(Services_JSON::isError($encoded_value)) {
+			return $encoded_value;
+		}
 
-        return $this->_encode(strval($name)) . ':' . $encoded_value;
-    }
+		return $this->_encode(strval($name)) . ':' . $encoded_value;
+	}
 
    /**
     * reduce a string by removing leading and trailing comments and whitespace
@@ -556,24 +556,24 @@ 
     * @return   string  string value stripped of comments and whitespace
     * @access   private
     */
-    function reduce_string($str)
-    {
-        $str = preg_replace(array(
+	function reduce_string($str)
+	{
+		$str = preg_replace(array(
 
-                // eliminate single line comments in '// ...' form
-                '#^\s*//(.+)$#m',
+				// eliminate single line comments in '// ...' form
+				'#^\s*//(.+)$#m',
 
-                // eliminate multi-line comments in '/* ... */' form, at start of string
-                '#^\s*/\*(.+)\*/#Us',
+				// eliminate multi-line comments in '/* ... */' form, at start of string
+				'#^\s*/\*(.+)\*/#Us',
 
-                // eliminate multi-line comments in '/* ... */' form, at end of string
-                '#/\*(.+)\*/\s*$#Us'
+				// eliminate multi-line comments in '/* ... */' form, at end of string
+				'#/\*(.+)\*/\s*$#Us'
 
-            ), '', $str);
+			), '', $str);
 
-        // eliminate extraneous space
-        return trim($str);
-    }
+		// eliminate extraneous space
+		return trim($str);
+	}
 
    /**
     * decodes a JSON string into appropriate variable
@@ -587,373 +587,373 @@ 
     *                   in ASCII or UTF-8 format!
     * @access   public
     */
-    function decode($str)
-    {
-        $str = $this->reduce_string($str);
-
-        switch (strtolower($str)) {
-            case 'true':
-                return true;
-
-            case 'false':
-                return false;
-
-            case 'null':
-                return null;
-
-            default:
-                $m = array();
-
-                if (is_numeric($str)) {
-                    // Lookie-loo, it's a number
-
-                    // This would work on its own, but I'm trying to be
-                    // good about returning integers where appropriate:
-                    // return (float)$str;
-
-                    // Return float or int, as appropriate
-                    return ((float)$str == (integer)$str)
-                        ? (integer)$str
-                        : (float)$str;
-
-                } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
-                    // STRINGS RETURNED IN UTF-8 FORMAT
-                    $delim = $this->substr8($str, 0, 1);
-                    $chrs = $this->substr8($str, 1, -1);
-                    $utf8 = '';
-                    $strlen_chrs = $this->strlen8($chrs);
-
-                    for ($c = 0; $c < $strlen_chrs; ++$c) {
-
-                        $substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
-                        $ord_chrs_c = ord($chrs{$c});
-
-                        switch (true) {
-                            case $substr_chrs_c_2 == '\b':
-                                $utf8 .= chr(0x08);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\t':
-                                $utf8 .= chr(0x09);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\n':
-                                $utf8 .= chr(0x0A);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\f':
-                                $utf8 .= chr(0x0C);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\r':
-                                $utf8 .= chr(0x0D);
-                                ++$c;
-                                break;
-
-                            case $substr_chrs_c_2 == '\\"':
-                            case $substr_chrs_c_2 == '\\\'':
-                            case $substr_chrs_c_2 == '\\\\':
-                            case $substr_chrs_c_2 == '\\/':
-                                if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
-                                   ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
-                                    $utf8 .= $chrs{++$c};
-                                }
-                                break;
-
-                            case preg_match('/\\\u[0-9A-F]{4}/i', $this->substr8($chrs, $c, 6)):
-                                // single, escaped unicode character
-                                $utf16 = chr(hexdec($this->substr8($chrs, ($c + 2), 2)))
-                                       . chr(hexdec($this->substr8($chrs, ($c + 4), 2)));
-                                $utf8 .= $this->utf162utf8($utf16);
-                                $c += 5;
-                                break;
-
-                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                                $utf8 .= $chrs{$c};
-                                break;
-
-                            case ($ord_chrs_c & 0xE0) == 0xC0:
-                                // characters U-00000080 - U-000007FF, mask 110XXXXX
-                                //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= $this->substr8($chrs, $c, 2);
-                                ++$c;
-                                break;
-
-                            case ($ord_chrs_c & 0xF0) == 0xE0:
-                                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= $this->substr8($chrs, $c, 3);
-                                $c += 2;
-                                break;
-
-                            case ($ord_chrs_c & 0xF8) == 0xF0:
-                                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= $this->substr8($chrs, $c, 4);
-                                $c += 3;
-                                break;
-
-                            case ($ord_chrs_c & 0xFC) == 0xF8:
-                                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= $this->substr8($chrs, $c, 5);
-                                $c += 4;
-                                break;
-
-                            case ($ord_chrs_c & 0xFE) == 0xFC:
-                                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= $this->substr8($chrs, $c, 6);
-                                $c += 5;
-                                break;
-
-                        }
-
-                    }
-
-                    return $utf8;
-
-                } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
-                    // array, or object notation
-
-                    if ($str{0} == '[') {
-                        $stk = array(SERVICES_JSON_IN_ARR);
-                        $arr = array();
-                    } else {
-                        if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = array();
-                        } else {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = new stdClass();
-                        }
-                    }
-
-                    array_push($stk, array('what'  => SERVICES_JSON_SLICE,
-                                           'where' => 0,
-                                           'delim' => false));
-
-                    $chrs = $this->substr8($str, 1, -1);
-                    $chrs = $this->reduce_string($chrs);
-
-                    if ($chrs == '') {
-                        if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                            return $arr;
-
-                        } else {
-                            return $obj;
-
-                        }
-                    }
-
-                    //print("\nparsing {$chrs}\n");
-
-                    $strlen_chrs = $this->strlen8($chrs);
-
-                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
-
-                        $top = end($stk);
-                        $substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
-
-                        if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
-                            // found a comma that is not inside a string, array, etc.,
-                            // OR we've reached the end of the character list
-                            $slice = $this->substr8($chrs, $top['where'], ($c - $top['where']));
-                            array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
-                            //print("Found split at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                            if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                                // we are in an array, so just push an element onto the stack
-                                array_push($arr, $this->decode($slice));
-
-                            } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                                // we are in an object, so figure
-                                // out the property name and set an
-                                // element in an associative array,
-                                // for now
-                                $parts = array();
+	function decode($str)
+	{
+		$str = $this->reduce_string($str);
+
+		switch (strtolower($str)) {
+			case 'true':
+				return true;
+
+			case 'false':
+				return false;
+
+			case 'null':
+				return null;
+
+			default:
+				$m = array();
+
+				if (is_numeric($str)) {
+					// Lookie-loo, it's a number
+
+					// This would work on its own, but I'm trying to be
+					// good about returning integers where appropriate:
+					// return (float)$str;
+
+					// Return float or int, as appropriate
+					return ((float)$str == (integer)$str)
+						? (integer)$str
+						: (float)$str;
+
+				} elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
+					// STRINGS RETURNED IN UTF-8 FORMAT
+					$delim = $this->substr8($str, 0, 1);
+					$chrs = $this->substr8($str, 1, -1);
+					$utf8 = '';
+					$strlen_chrs = $this->strlen8($chrs);
+
+					for ($c = 0; $c < $strlen_chrs; ++$c) {
+
+						$substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
+						$ord_chrs_c = ord($chrs{$c});
+
+						switch (true) {
+							case $substr_chrs_c_2 == '\b':
+								$utf8 .= chr(0x08);
+								++$c;
+								break;
+							case $substr_chrs_c_2 == '\t':
+								$utf8 .= chr(0x09);
+								++$c;
+								break;
+							case $substr_chrs_c_2 == '\n':
+								$utf8 .= chr(0x0A);
+								++$c;
+								break;
+							case $substr_chrs_c_2 == '\f':
+								$utf8 .= chr(0x0C);
+								++$c;
+								break;
+							case $substr_chrs_c_2 == '\r':
+								$utf8 .= chr(0x0D);
+								++$c;
+								break;
+
+							case $substr_chrs_c_2 == '\\"':
+							case $substr_chrs_c_2 == '\\\'':
+							case $substr_chrs_c_2 == '\\\\':
+							case $substr_chrs_c_2 == '\\/':
+								if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
+								   ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
+									$utf8 .= $chrs{++$c};
+								}
+								break;
+
+							case preg_match('/\\\u[0-9A-F]{4}/i', $this->substr8($chrs, $c, 6)):
+								// single, escaped unicode character
+								$utf16 = chr(hexdec($this->substr8($chrs, ($c + 2), 2)))
+									   . chr(hexdec($this->substr8($chrs, ($c + 4), 2)));
+								$utf8 .= $this->utf162utf8($utf16);
+								$c += 5;
+								break;
+
+							case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+								$utf8 .= $chrs{$c};
+								break;
+
+							case ($ord_chrs_c & 0xE0) == 0xC0:
+								// characters U-00000080 - U-000007FF, mask 110XXXXX
+								//see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= $this->substr8($chrs, $c, 2);
+								++$c;
+								break;
+
+							case ($ord_chrs_c & 0xF0) == 0xE0:
+								// characters U-00000800 - U-0000FFFF, mask 1110XXXX
+								// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= $this->substr8($chrs, $c, 3);
+								$c += 2;
+								break;
+
+							case ($ord_chrs_c & 0xF8) == 0xF0:
+								// characters U-00010000 - U-001FFFFF, mask 11110XXX
+								// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= $this->substr8($chrs, $c, 4);
+								$c += 3;
+								break;
+
+							case ($ord_chrs_c & 0xFC) == 0xF8:
+								// characters U-00200000 - U-03FFFFFF, mask 111110XX
+								// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= $this->substr8($chrs, $c, 5);
+								$c += 4;
+								break;
+
+							case ($ord_chrs_c & 0xFE) == 0xFC:
+								// characters U-04000000 - U-7FFFFFFF, mask 1111110X
+								// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= $this->substr8($chrs, $c, 6);
+								$c += 5;
+								break;
+
+						}
+
+					}
+
+					return $utf8;
+
+				} elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
+					// array, or object notation
+
+					if ($str{0} == '[') {
+						$stk = array(SERVICES_JSON_IN_ARR);
+						$arr = array();
+					} else {
+						if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+							$stk = array(SERVICES_JSON_IN_OBJ);
+							$obj = array();
+						} else {
+							$stk = array(SERVICES_JSON_IN_OBJ);
+							$obj = new stdClass();
+						}
+					}
+
+					array_push($stk, array('what'  => SERVICES_JSON_SLICE,
+										   'where' => 0,
+										   'delim' => false));
+
+					$chrs = $this->substr8($str, 1, -1);
+					$chrs = $this->reduce_string($chrs);
+
+					if ($chrs == '') {
+						if (reset($stk) == SERVICES_JSON_IN_ARR) {
+							return $arr;
+
+						} else {
+							return $obj;
+
+						}
+					}
+
+					//print("\nparsing {$chrs}\n");
+
+					$strlen_chrs = $this->strlen8($chrs);
+
+					for ($c = 0; $c <= $strlen_chrs; ++$c) {
+
+						$top = end($stk);
+						$substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
+
+						if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
+							// found a comma that is not inside a string, array, etc.,
+							// OR we've reached the end of the character list
+							$slice = $this->substr8($chrs, $top['where'], ($c - $top['where']));
+							array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
+							//print("Found split at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+							if (reset($stk) == SERVICES_JSON_IN_ARR) {
+								// we are in an array, so just push an element onto the stack
+								array_push($arr, $this->decode($slice));
+
+							} elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+								// we are in an object, so figure
+								// out the property name and set an
+								// element in an associative array,
+								// for now
+								$parts = array();
                                 
-                               if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:/Uis', $slice, $parts)) {
- 	                              // "name":value pair
-                                    $key = $this->decode($parts[1]);
-                                    $val = $this->decode(trim(substr($slice, strlen($parts[0])), ", \t\n\r\0\x0B"));
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                } elseif (preg_match('/^\s*(\w+)\s*:/Uis', $slice, $parts)) {
-                                    // name:value pair, where name is unquoted
-                                    $key = $parts[1];
-                                    $val = $this->decode(trim(substr($slice, strlen($parts[0])), ", \t\n\r\0\x0B"));
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                }
-
-                            }
-
-                        } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
-                            // found a quote, and we are not inside a string
-                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
-                            //print("Found start of string at {$c}\n");
-
-                        } elseif (($chrs{$c} == $top['delim']) &&
-                                 ($top['what'] == SERVICES_JSON_IN_STR) &&
-                                 (($this->strlen8($this->substr8($chrs, 0, $c)) - $this->strlen8(rtrim($this->substr8($chrs, 0, $c), '\\'))) % 2 != 1)) {
-                            // found a quote, we're in a string, and it's not escaped
-                            // we know that it's not escaped becase there is _not_ an
-                            // odd number of backslashes at the end of the string so far
-                            array_pop($stk);
-                            //print("Found end of string at {$c}: ".$this->substr8($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '[') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-bracket, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
-                            //print("Found start of array at {$c}\n");
-
-                        } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
-                            // found a right-bracket, and we're in an array
-                            array_pop($stk);
-                            //print("Found end of array at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '{') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-brace, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
-                            //print("Found start of object at {$c}\n");
-
-                        } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
-                            // found a right-brace, and we're in an object
-                            array_pop($stk);
-                            //print("Found end of object at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($substr_chrs_c_2 == '/*') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a comment start, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
-                            $c++;
-                            //print("Found start of comment at {$c}\n");
-
-                        } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
-                            // found a comment end, and we're in one now
-                            array_pop($stk);
-                            $c++;
-
-                            for ($i = $top['where']; $i <= $c; ++$i)
-                                $chrs = substr_replace($chrs, ' ', $i, 1);
-
-                            //print("Found end of comment at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        }
-
-                    }
-
-                    if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                        return $arr;
-
-                    } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                        return $obj;
-
-                    }
-
-                }
-        }
-    }
-
-    /**
-     * @todo Ultimately, this should just call PEAR::isError()
-     */
-    function isError($data, $code = null)
-    {
-        if (class_exists('pear')) {
-            return PEAR::isError($data, $code);
-        } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
-                                 is_subclass_of($data, 'services_json_error'))) {
-            return true;
-        }
-
-        return false;
-    }
+							   if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:/Uis', $slice, $parts)) {
+ 								  // "name":value pair
+									$key = $this->decode($parts[1]);
+									$val = $this->decode(trim(substr($slice, strlen($parts[0])), ", \t\n\r\0\x0B"));
+									if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+										$obj[$key] = $val;
+									} else {
+										$obj->$key = $val;
+									}
+								} elseif (preg_match('/^\s*(\w+)\s*:/Uis', $slice, $parts)) {
+									// name:value pair, where name is unquoted
+									$key = $parts[1];
+									$val = $this->decode(trim(substr($slice, strlen($parts[0])), ", \t\n\r\0\x0B"));
+
+									if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+										$obj[$key] = $val;
+									} else {
+										$obj->$key = $val;
+									}
+								}
+
+							}
+
+						} elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
+							// found a quote, and we are not inside a string
+							array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
+							//print("Found start of string at {$c}\n");
+
+						} elseif (($chrs{$c} == $top['delim']) &&
+								 ($top['what'] == SERVICES_JSON_IN_STR) &&
+								 (($this->strlen8($this->substr8($chrs, 0, $c)) - $this->strlen8(rtrim($this->substr8($chrs, 0, $c), '\\'))) % 2 != 1)) {
+							// found a quote, we're in a string, and it's not escaped
+							// we know that it's not escaped becase there is _not_ an
+							// odd number of backslashes at the end of the string so far
+							array_pop($stk);
+							//print("Found end of string at {$c}: ".$this->substr8($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
+
+						} elseif (($chrs{$c} == '[') &&
+								 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+							// found a left-bracket, and we are in an array, object, or slice
+							array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
+							//print("Found start of array at {$c}\n");
+
+						} elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
+							// found a right-bracket, and we're in an array
+							array_pop($stk);
+							//print("Found end of array at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+						} elseif (($chrs{$c} == '{') &&
+								 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+							// found a left-brace, and we are in an array, object, or slice
+							array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
+							//print("Found start of object at {$c}\n");
+
+						} elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
+							// found a right-brace, and we're in an object
+							array_pop($stk);
+							//print("Found end of object at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+						} elseif (($substr_chrs_c_2 == '/*') &&
+								 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+							// found a comment start, and we are in an array, object, or slice
+							array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
+							$c++;
+							//print("Found start of comment at {$c}\n");
+
+						} elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
+							// found a comment end, and we're in one now
+							array_pop($stk);
+							$c++;
+
+							for ($i = $top['where']; $i <= $c; ++$i)
+								$chrs = substr_replace($chrs, ' ', $i, 1);
+
+							//print("Found end of comment at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+						}
+
+					}
+
+					if (reset($stk) == SERVICES_JSON_IN_ARR) {
+						return $arr;
+
+					} elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+						return $obj;
+
+					}
+
+				}
+		}
+	}
+
+	/**
+	 * @todo Ultimately, this should just call PEAR::isError()
+	 */
+	function isError($data, $code = null)
+	{
+		if (class_exists('pear')) {
+			return PEAR::isError($data, $code);
+		} elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
+								 is_subclass_of($data, 'services_json_error'))) {
+			return true;
+		}
+
+		return false;
+	}
     
-    /**
-    * Calculates length of string in bytes
-    * @param string 
-    * @return integer length
-    */
-    function strlen8( $str ) 
-    {
-        if ( $this->_mb_strlen ) {
-            return mb_strlen( $str, "8bit" );
-        }
-        return strlen( $str );
-    }
+	/**
+	 * Calculates length of string in bytes
+	 * @param string 
+	 * @return integer length
+	 */
+	function strlen8( $str ) 
+	{
+		if ( $this->_mb_strlen ) {
+			return mb_strlen( $str, "8bit" );
+		}
+		return strlen( $str );
+	}
     
-    /**
-    * Returns part of a string, interpreting $start and $length as number of bytes.
-    * @param string 
-    * @param integer start 
-    * @param integer length 
-    * @return integer length
-    */
-    function substr8( $string, $start, $length=false ) 
-    {
-        if ( $length === false ) {
-            $length = $this->strlen8( $string ) - $start;
-        }
-        if ( $this->_mb_substr ) {
-            return mb_substr( $string, $start, $length, "8bit" );
-        }
-        return substr( $string, $start, $length );
-    }
+	/**
+	 * Returns part of a string, interpreting $start and $length as number of bytes.
+	 * @param string 
+	 * @param integer start 
+	 * @param integer length 
+	 * @return integer length
+	 */
+	function substr8( $string, $start, $length=false ) 
+	{
+		if ( $length === false ) {
+			$length = $this->strlen8( $string ) - $start;
+		}
+		if ( $this->_mb_substr ) {
+			return mb_substr( $string, $start, $length, "8bit" );
+		}
+		return substr( $string, $start, $length );
+	}
 
 }
 
 if (class_exists('PEAR_Error')) {
 
-    class Services_JSON_Error extends PEAR_Error
-    {
-        function __construct($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
-        {
-            parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
-        }
+	class Services_JSON_Error extends PEAR_Error
+	{
+		function __construct($message = 'unknown error', $code = null,
+									 $mode = null, $options = null, $userinfo = null)
+		{
+			parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
+		}
 
 	public function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null) {
+									 $mode = null, $options = null, $userinfo = null) {
 		self::__construct($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null);
+									 $mode = null, $options = null, $userinfo = null);
+	}
 	}
-    }
 
 } else {
 
-    /**
-     * @todo Ultimately, this class shall be descended from PEAR_Error
-     */
-    class Services_JSON_Error
-    {
-	    /**
-	     * PHP5 constructor.
-	     */
-        function __construct( $message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null )
-        {
-
-        }
-
-	    /**
-	     * PHP4 constructor.
-	     */
+	/**
+	 * @todo Ultimately, this class shall be descended from PEAR_Error
+	 */
+	class Services_JSON_Error
+	{
+		/**
+		 * PHP5 constructor.
+		 */
+		function __construct( $message = 'unknown error', $code = null,
+									 $mode = null, $options = null, $userinfo = null )
+		{
+
+		}
+
+		/**
+		 * PHP4 constructor.
+		 */
 		public function Services_JSON_Error( $message = 'unknown error', $code = null,
-	                                     $mode = null, $options = null, $userinfo = null ) {
+										 $mode = null, $options = null, $userinfo = null ) {
 			self::__construct( $message, $code, $mode, $options, $userinfo );
 		}
-    }
+	}
     
 }
 

src/wp-includes/cache.php

Braces +83 added lines, -56 removed lines

@@ -388,18 +388,22 @@ 
 	 * @return bool False if cache key and group already exist, true on success
 	 */
 	public function add( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( wp_suspend_cache_addition() )
-			return false;
+		if ( wp_suspend_cache_addition() ) {
+					return false;
+		}
 
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$id = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$id = $this->blog_prefix . $key;
+		}
 
-		if ( $this->_exists( $id, $group ) )
-			return false;
+		if ( $this->_exists( $id, $group ) ) {
+					return false;
+		}
 
 		return $this->set( $key, $data, $group, (int) $expire );
 	}
@@ -429,24 +433,29 @@ 
 	 * @return false|int False on failure, the item's new value on success.
 	 */
 	public function decr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $key, $group ) )
-			return false;
+		if ( ! $this->_exists( $key, $group ) ) {
+					return false;
+		}
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) ) {
+					$this->cache[ $group ][ $key ] = 0;
+		}
 
 		$offset = (int) $offset;
 
 		$this->cache[ $group ][ $key ] -= $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( $this->cache[ $group ][ $key ] < 0 ) {
+					$this->cache[ $group ][ $key ] = 0;
+		}
 
 		return $this->cache[ $group ][ $key ];
 	}
@@ -465,14 +474,17 @@ 
 	 * @return bool False if the contents weren't deleted and true on success
 	 */
 	public function delete( $key, $group = 'default', $deprecated = false ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $key, $group ) )
-			return false;
+		if ( ! $this->_exists( $key, $group ) ) {
+					return false;
+		}
 
 		unset( $this->cache[$group][$key] );
 		return true;
@@ -509,19 +521,22 @@ 
 	 *		               contents on success
 	 */
 	public function get( $key, $group = 'default', $force = false, &$found = null ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
 		if ( $this->_exists( $key, $group ) ) {
 			$found = true;
 			$this->cache_hits += 1;
-			if ( is_object($this->cache[$group][$key]) )
-				return clone $this->cache[$group][$key];
-			else
-				return $this->cache[$group][$key];
+			if ( is_object($this->cache[$group][$key]) ) {
+							return clone $this->cache[$group][$key];
+			} else {
+							return $this->cache[$group][$key];
+			}
 		}
 
 		$found = false;
@@ -540,24 +555,29 @@ 
 	 * @return false|int False on failure, the item's new value on success.
 	 */
 	public function incr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $key, $group ) )
-			return false;
+		if ( ! $this->_exists( $key, $group ) ) {
+					return false;
+		}
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) ) {
+					$this->cache[ $group ][ $key ] = 0;
+		}
 
 		$offset = (int) $offset;
 
 		$this->cache[ $group ][ $key ] += $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( $this->cache[ $group ][ $key ] < 0 ) {
+					$this->cache[ $group ][ $key ] = 0;
+		}
 
 		return $this->cache[ $group ][ $key ];
 	}
@@ -575,15 +595,18 @@ 
 	 * @return bool False if not exists, true if contents were replaced
 	 */
 	public function replace( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$id = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$id = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $id, $group ) )
-			return false;
+		if ( ! $this->_exists( $id, $group ) ) {
+					return false;
+		}
 
 		return $this->set( $key, $data, $group, (int) $expire );
 	}
@@ -600,8 +623,9 @@ 
 
 		// Clear out non-global caches since the blog ID has changed.
 		foreach ( array_keys( $this->cache ) as $group ) {
-			if ( ! isset( $this->global_groups[ $group ] ) )
-				unset( $this->cache[ $group ] );
+			if ( ! isset( $this->global_groups[ $group ] ) ) {
+							unset( $this->cache[ $group ] );
+			}
 		}
 	}
 
@@ -626,14 +650,17 @@ 
 	 * @return true Always returns true
 	 */
 	public function set( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
-		if ( is_object( $data ) )
-			$data = clone $data;
+		if ( is_object( $data ) ) {
+					$data = clone $data;
+		}
 
 		$this->cache[$group][$key] = $data;
 		return true;

Doc Comments +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
  *
  * @since 2.0.0
  *
- * @return true Always returns true.
+ * @return boolean Always returns true.
  */
 function wp_cache_close() {
 	return true;
@@ -510,7 +510,7 @@ 
 	 * @since 2.0.0
 	 * @access public
 	 *
-	 * @return true Always returns true.
+	 * @return boolean Always returns true.
 	 */
 	public function flush() {
 		$this->cache = array();
@@ -659,7 +659,7 @@ 
 	 * @param mixed      $data   The contents to store in the cache.
 	 * @param string     $group  Optional. Where to group the cache contents. Default 'default'.
 	 * @param int        $expire Not Used.
-	 * @return true Always returns true.
+	 * @return boolean Always returns true.
 	 */
 	public function set( $key, $data, $group = 'default', $expire = 0 ) {
 		if ( empty( $group ) )
@@ -753,7 +753,7 @@ 
 	 *
 	 * @since 2.0.8
 	 *
-	 * @return true Always returns true.
+	 * @return boolean Always returns true.
 	 */
 	public function __destruct() {
 		return true;

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * Object Cache API
- *
- * @link https://codex.wordpress.org/Function_Reference/WP_Cache
- *
- * @package WordPress
- * @subpackage Cache
- */
+	 * Object Cache API
+	 *
+	 * @link https://codex.wordpress.org/Function_Reference/WP_Cache
+	 *
+	 * @package WordPress
+	 * @subpackage Cache
+	 */
 
 /**
  * Adds data to the cache, if the cache key doesn't already exist.
@@ -730,7 +730,7 @@ 
 	 *
 	 * @since 2.0.8
 	 *
-     * @global int $blog_id Global blog ID.
+	 * @global int $blog_id Global blog ID.
 	 */
 	public function __construct() {
 		global $blog_id;

Spacing +91 added lines, -91 removed lines

@@ -24,10 +24,10 @@ 
  *                           Default 0 (no expiration).
  * @return bool False if cache key and group already exist, true on success.
  */
-function wp_cache_add( $key, $data, $group = '', $expire = 0 ) {
+function wp_cache_add($key, $data, $group = '', $expire = 0) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->add( $key, $data, $group, (int) $expire );
+	return $wp_object_cache->add($key, $data, $group, (int) $expire);
 }
 
 /**
@@ -60,10 +60,10 @@ 
  * @param string     $group  Optional. The group the key is in. Default empty.
  * @return false|int False on failure, the item's new value on success.
  */
-function wp_cache_decr( $key, $offset = 1, $group = '' ) {
+function wp_cache_decr($key, $offset = 1, $group = '') {
 	global $wp_object_cache;
 
-	return $wp_object_cache->decr( $key, $offset, $group );
+	return $wp_object_cache->decr($key, $offset, $group);
 }
 
 /**
@@ -78,7 +78,7 @@ 
  * @param string     $group Optional. Where the cache contents are grouped. Default empty.
  * @return bool True on successful removal, false on failure.
  */
-function wp_cache_delete( $key, $group = '' ) {
+function wp_cache_delete($key, $group = '') {
 	global $wp_object_cache;
 
 	return $wp_object_cache->delete($key, $group);
@@ -117,10 +117,10 @@ 
  * @return bool|mixed False on failure to retrieve contents or the cache
  *		              contents on success
  */
-function wp_cache_get( $key, $group = '', $force = false, &$found = null ) {
+function wp_cache_get($key, $group = '', $force = false, &$found = null) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->get( $key, $group, $force, $found );
+	return $wp_object_cache->get($key, $group, $force, $found);
 }
 
 /**
@@ -136,10 +136,10 @@ 
  * @param string     $group  Optional. The group the key is in. Default empty.
  * @return false|int False on failure, the item's new value on success.
  */
-function wp_cache_incr( $key, $offset = 1, $group = '' ) {
+function wp_cache_incr($key, $offset = 1, $group = '') {
 	global $wp_object_cache;
 
-	return $wp_object_cache->incr( $key, $offset, $group );
+	return $wp_object_cache->incr($key, $offset, $group);
 }
 
 /**
@@ -169,10 +169,10 @@ 
  *                           Default 0 (no expiration).
  * @return bool False if original value does not exist, true if contents were replaced
  */
-function wp_cache_replace( $key, $data, $group = '', $expire = 0 ) {
+function wp_cache_replace($key, $data, $group = '', $expire = 0) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->replace( $key, $data, $group, (int) $expire );
+	return $wp_object_cache->replace($key, $data, $group, (int) $expire);
 }
 
 /**
@@ -193,10 +193,10 @@ 
  *                           Default 0 (no expiration).
  * @return bool False on failure, true on success
  */
-function wp_cache_set( $key, $data, $group = '', $expire = 0 ) {
+function wp_cache_set($key, $data, $group = '', $expire = 0) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->set( $key, $data, $group, (int) $expire );
+	return $wp_object_cache->set($key, $data, $group, (int) $expire);
 }
 
 /**
@@ -211,10 +211,10 @@ 
  *
  * @param int $blog_id Site ID.
  */
-function wp_cache_switch_to_blog( $blog_id ) {
+function wp_cache_switch_to_blog($blog_id) {
 	global $wp_object_cache;
 
-	$wp_object_cache->switch_to_blog( $blog_id );
+	$wp_object_cache->switch_to_blog($blog_id);
 }
 
 /**
@@ -227,10 +227,10 @@ 
  *
  * @param string|array $groups A group or an array of groups to add.
  */
-function wp_cache_add_global_groups( $groups ) {
+function wp_cache_add_global_groups($groups) {
 	global $wp_object_cache;
 
-	$wp_object_cache->add_global_groups( $groups );
+	$wp_object_cache->add_global_groups($groups);
 }
 
 /**
@@ -240,7 +240,7 @@ 
  *
  * @param string|array $groups A group or an array of groups to add.
  */
-function wp_cache_add_non_persistent_groups( $groups ) {
+function wp_cache_add_non_persistent_groups($groups) {
 	// Default cache doesn't persist so nothing to do here.
 }
 
@@ -264,7 +264,7 @@ 
  * @global WP_Object_Cache $wp_object_cache Object cache global instance.
  */
 function wp_cache_reset() {
-	_deprecated_function( __FUNCTION__, '3.5' );
+	_deprecated_function(__FUNCTION__, '3.5');
 
 	global $wp_object_cache;
 
@@ -352,7 +352,7 @@ 
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 	 */
-	public function __get( $name ) {
+	public function __get($name) {
 		return $this->$name;
 	}
 
@@ -366,7 +366,7 @@ 
 	 * @param mixed  $value Property value.
 	 * @return mixed Newly-set property.
 	 */
-	public function __set( $name, $value ) {
+	public function __set($name, $value) {
 		return $this->$name = $value;
 	}
 
@@ -379,8 +379,8 @@ 
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $name ) {
-		return isset( $this->$name );
+	public function __isset($name) {
+		return isset($this->$name);
 	}
 
 	/**
@@ -391,8 +391,8 @@ 
 	 *
 	 * @param string $name Property to unset.
 	 */
-	public function __unset( $name ) {
-		unset( $this->$name );
+	public function __unset($name) {
+		unset($this->$name);
 	}
 
 	/**
@@ -411,21 +411,21 @@ 
 	 * @param int        $expire Optional. When to expire the cache contents. Default 0 (no expiration).
 	 * @return bool False if cache key and group already exist, true on success
 	 */
-	public function add( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( wp_suspend_cache_addition() )
+	public function add($key, $data, $group = 'default', $expire = 0) {
+		if (wp_suspend_cache_addition())
 			return false;
 
-		if ( empty( $group ) )
+		if (empty($group))
 			$group = 'default';
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$id = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$id = $this->blog_prefix.$key;
 
-		if ( $this->_exists( $id, $group ) )
+		if ($this->_exists($id, $group))
 			return false;
 
-		return $this->set( $key, $data, $group, (int) $expire );
+		return $this->set($key, $data, $group, (int) $expire);
 	}
 
 	/**
@@ -436,11 +436,11 @@ 
 	 *
 	 * @param array $groups List of groups that are global.
 	 */
-	public function add_global_groups( $groups ) {
+	public function add_global_groups($groups) {
 		$groups = (array) $groups;
 
-		$groups = array_fill_keys( $groups, true );
-		$this->global_groups = array_merge( $this->global_groups, $groups );
+		$groups = array_fill_keys($groups, true);
+		$this->global_groups = array_merge($this->global_groups, $groups);
 	}
 
 	/**
@@ -454,27 +454,27 @@ 
 	 * @param string     $group  Optional. The group the key is in. Default 'default'.
 	 * @return false|int False on failure, the item's new value on success.
 	 */
-	public function decr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
+	public function decr($key, $offset = 1, $group = 'default') {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( ! $this->_exists( $key, $group ) )
+		if ( ! $this->_exists($key, $group))
 			return false;
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( ! is_numeric($this->cache[$group][$key]))
+			$this->cache[$group][$key] = 0;
 
 		$offset = (int) $offset;
 
-		$this->cache[ $group ][ $key ] -= $offset;
+		$this->cache[$group][$key] -= $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
-			$this->cache[ $group ][ $key ] = 0;
+		if ($this->cache[$group][$key] < 0)
+			$this->cache[$group][$key] = 0;
 
-		return $this->cache[ $group ][ $key ];
+		return $this->cache[$group][$key];
 	}
 
 	/**
@@ -490,17 +490,17 @@ 
 	 * @param bool       $deprecated Optional. Unused. Default false.
 	 * @return bool False if the contents weren't deleted and true on success.
 	 */
-	public function delete( $key, $group = 'default', $deprecated = false ) {
-		if ( empty( $group ) )
+	public function delete($key, $group = 'default', $deprecated = false) {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( ! $this->_exists( $key, $group ) )
+		if ( ! $this->_exists($key, $group))
 			return false;
 
-		unset( $this->cache[$group][$key] );
+		unset($this->cache[$group][$key]);
 		return true;
 	}
 
@@ -538,17 +538,17 @@ 
 	 *                           false, a storable value. Passed by reference. Default null.
 	 * @return false|mixed False on failure to retrieve contents or the cache contents on success.
 	 */
-	public function get( $key, $group = 'default', $force = false, &$found = null ) {
-		if ( empty( $group ) )
+	public function get($key, $group = 'default', $force = false, &$found = null) {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( $this->_exists( $key, $group ) ) {
+		if ($this->_exists($key, $group)) {
 			$found = true;
 			$this->cache_hits += 1;
-			if ( is_object($this->cache[$group][$key]) )
+			if (is_object($this->cache[$group][$key]))
 				return clone $this->cache[$group][$key];
 			else
 				return $this->cache[$group][$key];
@@ -570,27 +570,27 @@ 
 	 * @param string     $group  Optional. The group the key is in. Default 'default'.
 	 * @return false|int False on failure, the item's new value on success.
 	 */
-	public function incr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
+	public function incr($key, $offset = 1, $group = 'default') {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( ! $this->_exists( $key, $group ) )
+		if ( ! $this->_exists($key, $group))
 			return false;
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( ! is_numeric($this->cache[$group][$key]))
+			$this->cache[$group][$key] = 0;
 
 		$offset = (int) $offset;
 
-		$this->cache[ $group ][ $key ] += $offset;
+		$this->cache[$group][$key] += $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
-			$this->cache[ $group ][ $key ] = 0;
+		if ($this->cache[$group][$key] < 0)
+			$this->cache[$group][$key] = 0;
 
-		return $this->cache[ $group ][ $key ];
+		return $this->cache[$group][$key];
 	}
 
 	/**
@@ -607,18 +607,18 @@ 
 	 * @param int        $expire Optional. When to expire the cache contents. Default 0 (no expiration).
 	 * @return bool False if not exists, true if contents were replaced.
 	 */
-	public function replace( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
+	public function replace($key, $data, $group = 'default', $expire = 0) {
+		if (empty($group))
 			$group = 'default';
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$id = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$id = $this->blog_prefix.$key;
 
-		if ( ! $this->_exists( $id, $group ) )
+		if ( ! $this->_exists($id, $group))
 			return false;
 
-		return $this->set( $key, $data, $group, (int) $expire );
+		return $this->set($key, $data, $group, (int) $expire);
 	}
 
 	/**
@@ -631,12 +631,12 @@ 
 	 * @see switch_to_blog()
 	 */
 	public function reset() {
-		_deprecated_function( __FUNCTION__, '3.5', 'switch_to_blog()' );
+		_deprecated_function(__FUNCTION__, '3.5', 'switch_to_blog()');
 
 		// Clear out non-global caches since the blog ID has changed.
-		foreach ( array_keys( $this->cache ) as $group ) {
-			if ( ! isset( $this->global_groups[ $group ] ) )
-				unset( $this->cache[ $group ] );
+		foreach (array_keys($this->cache) as $group) {
+			if ( ! isset($this->global_groups[$group]))
+				unset($this->cache[$group]);
 		}
 	}
 
@@ -661,14 +661,14 @@ 
 	 * @param int        $expire Not Used.
 	 * @return true Always returns true.
 	 */
-	public function set( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
+	public function set($key, $data, $group = 'default', $expire = 0) {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( is_object( $data ) )
+		if (is_object($data))
 			$data = clone $data;
 
 		$this->cache[$group][$key] = $data;
@@ -691,7 +691,7 @@ 
 		echo "</p>";
 		echo '<ul>';
 		foreach ($this->cache as $group => $cache) {
-			echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( serialize( $cache ) ) / KB_IN_BYTES, 2 ) . 'k )</li>';
+			echo "<li><strong>Group:</strong> $group - ( ".number_format(strlen(serialize($cache)) / KB_IN_BYTES, 2).'k )</li>';
 		}
 		echo '</ul>';
 	}
@@ -706,9 +706,9 @@ 
 	 *
 	 * @param int $blog_id Blog ID.
 	 */
-	public function switch_to_blog( $blog_id ) {
+	public function switch_to_blog($blog_id) {
 		$blog_id = (int) $blog_id;
-		$this->blog_prefix = $this->multisite ? $blog_id . ':' : '';
+		$this->blog_prefix = $this->multisite ? $blog_id.':' : '';
 	}
 
 	/**
@@ -721,8 +721,8 @@ 
 	 * @param string     $group Cache group for the key existence check.
 	 * @return bool Whether the key exists in the cache for the given group.
 	 */
-	protected function _exists( $key, $group ) {
-		return isset( $this->cache[ $group ] ) && ( isset( $this->cache[ $group ][ $key ] ) || array_key_exists( $key, $this->cache[ $group ] ) );
+	protected function _exists($key, $group) {
+		return isset($this->cache[$group]) && (isset($this->cache[$group][$key]) || array_key_exists($key, $this->cache[$group]));
 	}
 
 	/**
@@ -736,14 +736,14 @@ 
 		global $blog_id;
 
 		$this->multisite = is_multisite();
-		$this->blog_prefix =  $this->multisite ? $blog_id . ':' : '';
+		$this->blog_prefix = $this->multisite ? $blog_id.':' : '';
 
 
 		/**
 		 * @todo This should be moved to the PHP4 style constructor, PHP5
 		 * already calls __destruct()
 		 */
-		register_shutdown_function( array( $this, '__destruct' ) );
+		register_shutdown_function(array($this, '__destruct'));
 	}
 
 	/**