ntwb / wordpress

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

Doc Comments +9 added lines

@@ -1072,6 +1072,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param boolean $ScanAsCBR
+	 */
 	public function RecursiveFrameScanning(&$offset, &$nextframetestoffset, $ScanAsCBR) {
 		$info = &$this->getid3->info;
 		$firstframetestarray = array('error'=>'', 'warning'=>'', 'avdataend'=>$info['avdataend'], 'avdataoffset'=>$info['avdataoffset']);
@@ -1686,6 +1689,9 @@ 
 		return $MPEGaudioEmphasis;
 	}
 
+	/**
+	 * @param string $head4
+	 */
 	public static function MPEGaudioHeaderBytesValid($head4, $allowBitrate15=false) {
 		return self::MPEGaudioHeaderValid(self::MPEGaudioHeaderDecode($head4), false, $allowBitrate15);
 	}
@@ -1936,6 +1942,9 @@ 
 		return (isset($LAMEmiscStereoModeLookup[$StereoModeID]) ? $LAMEmiscStereoModeLookup[$StereoModeID] : '');
 	}
 
+	/**
+	 * @param integer $SourceSampleFrequencyID
+	 */
 	public static function LAMEmiscSourceSampleFrequencyLookup($SourceSampleFrequencyID) {
 		static $LAMEmiscSourceSampleFrequencyLookup = array(
 			0 => '<= 32 kHz',

Spacing +161 added lines, -167 removed lines

@@ -32,7 +32,7 @@ 
 
 		$initialOffset = $info['avdataoffset'];
 
-		if (!$this->getOnlyMPEGaudioInfo($info['avdataoffset'])) {
+		if ( ! $this->getOnlyMPEGaudioInfo($info['avdataoffset'])) {
 			if ($this->allow_bruteforce) {
 				$info['error'][] = 'Rescanning file in BruteForce mode';
 				$this->getOnlyMPEGaudioInfoBruteForce($this->getid3->fp, $info);
@@ -44,7 +44,7 @@ 
 			$info['audio']['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']);
 		}
 
-		if (((isset($info['id3v2']['headerlength']) && ($info['avdataoffset'] > $info['id3v2']['headerlength'])) || (!isset($info['id3v2']) && ($info['avdataoffset'] > 0) && ($info['avdataoffset'] != $initialOffset)))) {
+		if (((isset($info['id3v2']['headerlength']) && ($info['avdataoffset'] > $info['id3v2']['headerlength'])) || ( ! isset($info['id3v2']) && ($info['avdataoffset'] > 0) && ($info['avdataoffset'] != $initialOffset)))) {
 
 			$synchoffsetwarning = 'Unknown data before synch ';
 			if (isset($info['id3v2']['headerlength'])) {
@@ -57,7 +57,7 @@ 
 			$synchoffsetwarning .= 'synch detected at '.$info['avdataoffset'].')';
 			if (isset($info['audio']['bitrate_mode']) && ($info['audio']['bitrate_mode'] == 'cbr')) {
 
-				if (!empty($info['id3v2']['headerlength']) && (($info['avdataoffset'] - $info['id3v2']['headerlength']) == $info['mpeg']['audio']['framelength'])) {
+				if ( ! empty($info['id3v2']['headerlength']) && (($info['avdataoffset'] - $info['id3v2']['headerlength']) == $info['mpeg']['audio']['framelength'])) {
 
 					$synchoffsetwarning .= '. This is a known problem with some versions of LAME (3.90-3.92) DLL in CBR mode.';
 					$info['audio']['codec'] = 'LAME';
@@ -78,15 +78,15 @@ 
 
 		if (isset($info['mpeg']['audio']['LAME'])) {
 			$info['audio']['codec'] = 'LAME';
-			if (!empty($info['mpeg']['audio']['LAME']['long_version'])) {
+			if ( ! empty($info['mpeg']['audio']['LAME']['long_version'])) {
 				$info['audio']['encoder'] = rtrim($info['mpeg']['audio']['LAME']['long_version'], "\x00");
-			} elseif (!empty($info['mpeg']['audio']['LAME']['short_version'])) {
+			} elseif ( ! empty($info['mpeg']['audio']['LAME']['short_version'])) {
 				$info['audio']['encoder'] = rtrim($info['mpeg']['audio']['LAME']['short_version'], "\x00");
 			}
 		}
 
-		$CurrentDataLAMEversionString = (!empty($CurrentDataLAMEversionString) ? $CurrentDataLAMEversionString : (isset($info['audio']['encoder']) ? $info['audio']['encoder'] : ''));
-		if (!empty($CurrentDataLAMEversionString) && (substr($CurrentDataLAMEversionString, 0, 6) == 'LAME3.') && !preg_match('[0-9\)]', substr($CurrentDataLAMEversionString, -1))) {
+		$CurrentDataLAMEversionString = ( ! empty($CurrentDataLAMEversionString) ? $CurrentDataLAMEversionString : (isset($info['audio']['encoder']) ? $info['audio']['encoder'] : ''));
+		if ( ! empty($CurrentDataLAMEversionString) && (substr($CurrentDataLAMEversionString, 0, 6) == 'LAME3.') && ! preg_match('[0-9\)]', substr($CurrentDataLAMEversionString, -1))) {
 			// a version number of LAME that does not end with a number like "LAME3.92"
 			// or with a closing parenthesis like "LAME3.88 (alpha)"
 			// or a version of LAME with the LAMEtag-not-filled-in-DLL-mode bug (3.90-3.92)
@@ -115,14 +115,12 @@ 
 				}
 			}
 		}
-		if (!empty($info['audio']['encoder'])) {
+		if ( ! empty($info['audio']['encoder'])) {
 			$info['audio']['encoder'] = rtrim($info['audio']['encoder'], "\x00 ");
 		}
 
 		switch (isset($info['mpeg']['audio']['layer']) ? $info['mpeg']['audio']['layer'] : '') {
-			case 1:
-			case 2:
-				$info['audio']['dataformat'] = 'mp'.$info['mpeg']['audio']['layer'];
+			case 1 : case 2 : $info['audio']['dataformat'] = 'mp'.$info['mpeg']['audio']['layer'];
 				break;
 		}
 		if (isset($info['fileformat']) && ($info['fileformat'] == 'mp3')) {
@@ -151,7 +149,7 @@ 
 		$info['audio']['lossless'] = false;
 
 		// Calculate playtime
-		if (!isset($info['playtime_seconds']) && isset($info['audio']['bitrate']) && ($info['audio']['bitrate'] > 0)) {
+		if ( ! isset($info['playtime_seconds']) && isset($info['audio']['bitrate']) && ($info['audio']['bitrate'] > 0)) {
 			$info['playtime_seconds'] = ($info['avdataend'] - $info['avdataoffset']) * 8 / $info['audio']['bitrate'];
 		}
 
@@ -164,9 +162,9 @@ 
 	public function GuessEncoderOptions() {
 		// shortcuts
 		$info = &$this->getid3->info;
-		if (!empty($info['mpeg']['audio'])) {
+		if ( ! empty($info['mpeg']['audio'])) {
 			$thisfile_mpeg_audio = &$info['mpeg']['audio'];
-			if (!empty($thisfile_mpeg_audio['LAME'])) {
+			if ( ! empty($thisfile_mpeg_audio['LAME'])) {
 				$thisfile_mpeg_audio_lame = &$thisfile_mpeg_audio['LAME'];
 			}
 		}
@@ -174,71 +172,71 @@ 
 		$encoder_options = '';
 		static $NamedPresetBitrates = array(16, 24, 40, 56, 112, 128, 160, 192, 256);
 
-		if (isset($thisfile_mpeg_audio['VBR_method']) && ($thisfile_mpeg_audio['VBR_method'] == 'Fraunhofer') && !empty($thisfile_mpeg_audio['VBR_quality'])) {
+		if (isset($thisfile_mpeg_audio['VBR_method']) && ($thisfile_mpeg_audio['VBR_method'] == 'Fraunhofer') && ! empty($thisfile_mpeg_audio['VBR_quality'])) {
 
 			$encoder_options = 'VBR q'.$thisfile_mpeg_audio['VBR_quality'];
 
-		} elseif (!empty($thisfile_mpeg_audio_lame['preset_used']) && (!in_array($thisfile_mpeg_audio_lame['preset_used_id'], $NamedPresetBitrates))) {
+		} elseif ( ! empty($thisfile_mpeg_audio_lame['preset_used']) && ( ! in_array($thisfile_mpeg_audio_lame['preset_used_id'], $NamedPresetBitrates))) {
 
 			$encoder_options = $thisfile_mpeg_audio_lame['preset_used'];
 
-		} elseif (!empty($thisfile_mpeg_audio_lame['vbr_quality'])) {
+		} elseif ( ! empty($thisfile_mpeg_audio_lame['vbr_quality'])) {
 
 			static $KnownEncoderValues = array();
 			if (empty($KnownEncoderValues)) {
 
 				//$KnownEncoderValues[abrbitrate_minbitrate][vbr_quality][raw_vbr_method][raw_noise_shaping][raw_stereo_mode][ath_type][lowpass_frequency] = 'preset name';
-				$KnownEncoderValues[0xFF][58][1][1][3][2][20500] = '--alt-preset insane';        // 3.90,   3.90.1, 3.92
-				$KnownEncoderValues[0xFF][58][1][1][3][2][20600] = '--alt-preset insane';        // 3.90.2, 3.90.3, 3.91
-				$KnownEncoderValues[0xFF][57][1][1][3][4][20500] = '--alt-preset insane';        // 3.94,   3.95
-				$KnownEncoderValues['**'][78][3][2][3][2][19500] = '--alt-preset extreme';       // 3.90,   3.90.1, 3.92
-				$KnownEncoderValues['**'][78][3][2][3][2][19600] = '--alt-preset extreme';       // 3.90.2, 3.91
-				$KnownEncoderValues['**'][78][3][1][3][2][19600] = '--alt-preset extreme';       // 3.90.3
-				$KnownEncoderValues['**'][78][4][2][3][2][19500] = '--alt-preset fast extreme';  // 3.90,   3.90.1, 3.92
-				$KnownEncoderValues['**'][78][4][2][3][2][19600] = '--alt-preset fast extreme';  // 3.90.2, 3.90.3, 3.91
-				$KnownEncoderValues['**'][78][3][2][3][4][19000] = '--alt-preset standard';      // 3.90,   3.90.1, 3.90.2, 3.91, 3.92
-				$KnownEncoderValues['**'][78][3][1][3][4][19000] = '--alt-preset standard';      // 3.90.3
+				$KnownEncoderValues[0xFF][58][1][1][3][2][20500] = '--alt-preset insane'; // 3.90,   3.90.1, 3.92
+				$KnownEncoderValues[0xFF][58][1][1][3][2][20600] = '--alt-preset insane'; // 3.90.2, 3.90.3, 3.91
+				$KnownEncoderValues[0xFF][57][1][1][3][4][20500] = '--alt-preset insane'; // 3.94,   3.95
+				$KnownEncoderValues['**'][78][3][2][3][2][19500] = '--alt-preset extreme'; // 3.90,   3.90.1, 3.92
+				$KnownEncoderValues['**'][78][3][2][3][2][19600] = '--alt-preset extreme'; // 3.90.2, 3.91
+				$KnownEncoderValues['**'][78][3][1][3][2][19600] = '--alt-preset extreme'; // 3.90.3
+				$KnownEncoderValues['**'][78][4][2][3][2][19500] = '--alt-preset fast extreme'; // 3.90,   3.90.1, 3.92
+				$KnownEncoderValues['**'][78][4][2][3][2][19600] = '--alt-preset fast extreme'; // 3.90.2, 3.90.3, 3.91
+				$KnownEncoderValues['**'][78][3][2][3][4][19000] = '--alt-preset standard'; // 3.90,   3.90.1, 3.90.2, 3.91, 3.92
+				$KnownEncoderValues['**'][78][3][1][3][4][19000] = '--alt-preset standard'; // 3.90.3
 				$KnownEncoderValues['**'][78][4][2][3][4][19000] = '--alt-preset fast standard'; // 3.90,   3.90.1, 3.90.2, 3.91, 3.92
 				$KnownEncoderValues['**'][78][4][1][3][4][19000] = '--alt-preset fast standard'; // 3.90.3
-				$KnownEncoderValues['**'][88][4][1][3][3][19500] = '--r3mix';                    // 3.90,   3.90.1, 3.92
-				$KnownEncoderValues['**'][88][4][1][3][3][19600] = '--r3mix';                    // 3.90.2, 3.90.3, 3.91
-				$KnownEncoderValues['**'][67][4][1][3][4][18000] = '--r3mix';                    // 3.94,   3.95
-				$KnownEncoderValues['**'][68][3][2][3][4][18000] = '--alt-preset medium';        // 3.90.3
-				$KnownEncoderValues['**'][68][4][2][3][4][18000] = '--alt-preset fast medium';   // 3.90.3
-
-				$KnownEncoderValues[0xFF][99][1][1][1][2][0]     = '--preset studio';            // 3.90,   3.90.1, 3.90.2, 3.91, 3.92
-				$KnownEncoderValues[0xFF][58][2][1][3][2][20600] = '--preset studio';            // 3.90.3, 3.93.1
-				$KnownEncoderValues[0xFF][58][2][1][3][2][20500] = '--preset studio';            // 3.93
-				$KnownEncoderValues[0xFF][57][2][1][3][4][20500] = '--preset studio';            // 3.94,   3.95
-				$KnownEncoderValues[0xC0][88][1][1][1][2][0]     = '--preset cd';                // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
-				$KnownEncoderValues[0xC0][58][2][2][3][2][19600] = '--preset cd';                // 3.90.3, 3.93.1
-				$KnownEncoderValues[0xC0][58][2][2][3][2][19500] = '--preset cd';                // 3.93
-				$KnownEncoderValues[0xC0][57][2][1][3][4][19500] = '--preset cd';                // 3.94,   3.95
-				$KnownEncoderValues[0xA0][78][1][1][3][2][18000] = '--preset hifi';              // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
-				$KnownEncoderValues[0xA0][58][2][2][3][2][18000] = '--preset hifi';              // 3.90.3, 3.93,   3.93.1
-				$KnownEncoderValues[0xA0][57][2][1][3][4][18000] = '--preset hifi';              // 3.94,   3.95
-				$KnownEncoderValues[0x80][67][1][1][3][2][18000] = '--preset tape';              // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
-				$KnownEncoderValues[0x80][67][1][1][3][2][15000] = '--preset radio';             // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
-				$KnownEncoderValues[0x70][67][1][1][3][2][15000] = '--preset fm';                // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
-				$KnownEncoderValues[0x70][58][2][2][3][2][16000] = '--preset tape/radio/fm';     // 3.90.3, 3.93,   3.93.1
-				$KnownEncoderValues[0x70][57][2][1][3][4][16000] = '--preset tape/radio/fm';     // 3.94,   3.95
-				$KnownEncoderValues[0x38][58][2][2][0][2][10000] = '--preset voice';             // 3.90.3, 3.93,   3.93.1
-				$KnownEncoderValues[0x38][57][2][1][0][4][15000] = '--preset voice';             // 3.94,   3.95
-				$KnownEncoderValues[0x38][57][2][1][0][4][16000] = '--preset voice';             // 3.94a14
-				$KnownEncoderValues[0x28][65][1][1][0][2][7500]  = '--preset mw-us';             // 3.90,   3.90.1, 3.92
-				$KnownEncoderValues[0x28][65][1][1][0][2][7600]  = '--preset mw-us';             // 3.90.2, 3.91
-				$KnownEncoderValues[0x28][58][2][2][0][2][7000]  = '--preset mw-us';             // 3.90.3, 3.93,   3.93.1
-				$KnownEncoderValues[0x28][57][2][1][0][4][10500] = '--preset mw-us';             // 3.94,   3.95
-				$KnownEncoderValues[0x28][57][2][1][0][4][11200] = '--preset mw-us';             // 3.94a14
-				$KnownEncoderValues[0x28][57][2][1][0][4][8800]  = '--preset mw-us';             // 3.94a15
+				$KnownEncoderValues['**'][88][4][1][3][3][19500] = '--r3mix'; // 3.90,   3.90.1, 3.92
+				$KnownEncoderValues['**'][88][4][1][3][3][19600] = '--r3mix'; // 3.90.2, 3.90.3, 3.91
+				$KnownEncoderValues['**'][67][4][1][3][4][18000] = '--r3mix'; // 3.94,   3.95
+				$KnownEncoderValues['**'][68][3][2][3][4][18000] = '--alt-preset medium'; // 3.90.3
+				$KnownEncoderValues['**'][68][4][2][3][4][18000] = '--alt-preset fast medium'; // 3.90.3
+
+				$KnownEncoderValues[0xFF][99][1][1][1][2][0]     = '--preset studio'; // 3.90,   3.90.1, 3.90.2, 3.91, 3.92
+				$KnownEncoderValues[0xFF][58][2][1][3][2][20600] = '--preset studio'; // 3.90.3, 3.93.1
+				$KnownEncoderValues[0xFF][58][2][1][3][2][20500] = '--preset studio'; // 3.93
+				$KnownEncoderValues[0xFF][57][2][1][3][4][20500] = '--preset studio'; // 3.94,   3.95
+				$KnownEncoderValues[0xC0][88][1][1][1][2][0]     = '--preset cd'; // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
+				$KnownEncoderValues[0xC0][58][2][2][3][2][19600] = '--preset cd'; // 3.90.3, 3.93.1
+				$KnownEncoderValues[0xC0][58][2][2][3][2][19500] = '--preset cd'; // 3.93
+				$KnownEncoderValues[0xC0][57][2][1][3][4][19500] = '--preset cd'; // 3.94,   3.95
+				$KnownEncoderValues[0xA0][78][1][1][3][2][18000] = '--preset hifi'; // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
+				$KnownEncoderValues[0xA0][58][2][2][3][2][18000] = '--preset hifi'; // 3.90.3, 3.93,   3.93.1
+				$KnownEncoderValues[0xA0][57][2][1][3][4][18000] = '--preset hifi'; // 3.94,   3.95
+				$KnownEncoderValues[0x80][67][1][1][3][2][18000] = '--preset tape'; // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
+				$KnownEncoderValues[0x80][67][1][1][3][2][15000] = '--preset radio'; // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
+				$KnownEncoderValues[0x70][67][1][1][3][2][15000] = '--preset fm'; // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
+				$KnownEncoderValues[0x70][58][2][2][3][2][16000] = '--preset tape/radio/fm'; // 3.90.3, 3.93,   3.93.1
+				$KnownEncoderValues[0x70][57][2][1][3][4][16000] = '--preset tape/radio/fm'; // 3.94,   3.95
+				$KnownEncoderValues[0x38][58][2][2][0][2][10000] = '--preset voice'; // 3.90.3, 3.93,   3.93.1
+				$KnownEncoderValues[0x38][57][2][1][0][4][15000] = '--preset voice'; // 3.94,   3.95
+				$KnownEncoderValues[0x38][57][2][1][0][4][16000] = '--preset voice'; // 3.94a14
+				$KnownEncoderValues[0x28][65][1][1][0][2][7500]  = '--preset mw-us'; // 3.90,   3.90.1, 3.92
+				$KnownEncoderValues[0x28][65][1][1][0][2][7600]  = '--preset mw-us'; // 3.90.2, 3.91
+				$KnownEncoderValues[0x28][58][2][2][0][2][7000]  = '--preset mw-us'; // 3.90.3, 3.93,   3.93.1
+				$KnownEncoderValues[0x28][57][2][1][0][4][10500] = '--preset mw-us'; // 3.94,   3.95
+				$KnownEncoderValues[0x28][57][2][1][0][4][11200] = '--preset mw-us'; // 3.94a14
+				$KnownEncoderValues[0x28][57][2][1][0][4][8800]  = '--preset mw-us'; // 3.94a15
 				$KnownEncoderValues[0x18][58][2][2][0][2][4000]  = '--preset phon+/lw/mw-eu/sw'; // 3.90.3, 3.93.1
 				$KnownEncoderValues[0x18][58][2][2][0][2][3900]  = '--preset phon+/lw/mw-eu/sw'; // 3.93
 				$KnownEncoderValues[0x18][57][2][1][0][4][5900]  = '--preset phon+/lw/mw-eu/sw'; // 3.94,   3.95
 				$KnownEncoderValues[0x18][57][2][1][0][4][6200]  = '--preset phon+/lw/mw-eu/sw'; // 3.94a14
 				$KnownEncoderValues[0x18][57][2][1][0][4][3200]  = '--preset phon+/lw/mw-eu/sw'; // 3.94a15
-				$KnownEncoderValues[0x10][58][2][2][0][2][3800]  = '--preset phone';             // 3.90.3, 3.93.1
-				$KnownEncoderValues[0x10][58][2][2][0][2][3700]  = '--preset phone';             // 3.93
-				$KnownEncoderValues[0x10][57][2][1][0][4][5600]  = '--preset phone';             // 3.94,   3.95
+				$KnownEncoderValues[0x10][58][2][2][0][2][3800]  = '--preset phone'; // 3.90.3, 3.93.1
+				$KnownEncoderValues[0x10][58][2][2][0][2][3700]  = '--preset phone'; // 3.93
+				$KnownEncoderValues[0x10][57][2][1][0][4][5600]  = '--preset phone'; // 3.94,   3.95
 			}
 
 			if (isset($KnownEncoderValues[$thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate']][$thisfile_mpeg_audio_lame['vbr_quality']][$thisfile_mpeg_audio_lame['raw']['vbr_method']][$thisfile_mpeg_audio_lame['raw']['noise_shaping']][$thisfile_mpeg_audio_lame['raw']['stereo_mode']][$thisfile_mpeg_audio_lame['ath_type']][$thisfile_mpeg_audio_lame['lowpass_frequency']])) {
@@ -269,11 +267,11 @@ 
 
 			}
 
-		} elseif (!empty($thisfile_mpeg_audio_lame['bitrate_abr'])) {
+		} elseif ( ! empty($thisfile_mpeg_audio_lame['bitrate_abr'])) {
 
 			$encoder_options = 'ABR'.$thisfile_mpeg_audio_lame['bitrate_abr'];
 
-		} elseif (!empty($info['audio']['bitrate'])) {
+		} elseif ( ! empty($info['audio']['bitrate'])) {
 
 			if ($info['audio']['bitrate_mode'] == 'cbr') {
 				$encoder_options = strtoupper($info['audio']['bitrate_mode']).ceil($info['audio']['bitrate'] / 1000);
@@ -282,15 +280,15 @@ 
 			}
 
 		}
-		if (!empty($thisfile_mpeg_audio_lame['bitrate_min'])) {
+		if ( ! empty($thisfile_mpeg_audio_lame['bitrate_min'])) {
 			$encoder_options .= ' -b'.$thisfile_mpeg_audio_lame['bitrate_min'];
 		}
 
-		if (!empty($thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev']) || !empty($thisfile_mpeg_audio_lame['encoding_flags']['nogap_next'])) {
+		if ( ! empty($thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev']) || ! empty($thisfile_mpeg_audio_lame['encoding_flags']['nogap_next'])) {
 			$encoder_options .= ' --nogap';
 		}
 
-		if (!empty($thisfile_mpeg_audio_lame['lowpass_frequency'])) {
+		if ( ! empty($thisfile_mpeg_audio_lame['lowpass_frequency'])) {
 			$ExplodedOptions = explode(' ', $encoder_options, 4);
 			if ($ExplodedOptions[0] == '--r3mix') {
 				$ExplodedOptions[1] = 'r3mix';
@@ -316,20 +314,20 @@ 
 						case 'r3mix':
 							static $ExpectedLowpass = array(
 									'insane|20500'        => 20500,
-									'insane|20600'        => 20600,  // 3.90.2, 3.90.3, 3.91
+									'insane|20600'        => 20600, // 3.90.2, 3.90.3, 3.91
 									'medium|18000'        => 18000,
 									'fast medium|18000'   => 18000,
-									'extreme|19500'       => 19500,  // 3.90,   3.90.1, 3.92, 3.95
-									'extreme|19600'       => 19600,  // 3.90.2, 3.90.3, 3.91, 3.93.1
-									'fast extreme|19500'  => 19500,  // 3.90,   3.90.1, 3.92, 3.95
-									'fast extreme|19600'  => 19600,  // 3.90.2, 3.90.3, 3.91, 3.93.1
+									'extreme|19500'       => 19500, // 3.90,   3.90.1, 3.92, 3.95
+									'extreme|19600'       => 19600, // 3.90.2, 3.90.3, 3.91, 3.93.1
+									'fast extreme|19500'  => 19500, // 3.90,   3.90.1, 3.92, 3.95
+									'fast extreme|19600'  => 19600, // 3.90.2, 3.90.3, 3.91, 3.93.1
 									'standard|19000'      => 19000,
 									'fast standard|19000' => 19000,
-									'r3mix|19500'         => 19500,  // 3.90,   3.90.1, 3.92
-									'r3mix|19600'         => 19600,  // 3.90.2, 3.90.3, 3.91
-									'r3mix|18000'         => 18000,  // 3.94,   3.95
+									'r3mix|19500'         => 19500, // 3.90,   3.90.1, 3.92
+									'r3mix|19600'         => 19600, // 3.90.2, 3.90.3, 3.91
+									'r3mix|18000'         => 18000, // 3.94,   3.95
 								);
-							if (!isset($ExpectedLowpass[$ExplodedOptions[1].'|'.$thisfile_mpeg_audio_lame['lowpass_frequency']]) && ($thisfile_mpeg_audio_lame['lowpass_frequency'] < 22050) && (round($thisfile_mpeg_audio_lame['lowpass_frequency'] / 1000) < round($thisfile_mpeg_audio['sample_rate'] / 2000))) {
+							if ( ! isset($ExpectedLowpass[$ExplodedOptions[1].'|'.$thisfile_mpeg_audio_lame['lowpass_frequency']]) && ($thisfile_mpeg_audio_lame['lowpass_frequency'] < 22050) && (round($thisfile_mpeg_audio_lame['lowpass_frequency'] / 1000) < round($thisfile_mpeg_audio['sample_rate'] / 2000))) {
 								$encoder_options .= ' --lowpass '.$thisfile_mpeg_audio_lame['lowpass_frequency'];
 							}
 							break;
@@ -380,7 +378,7 @@ 
 												'fm/radio|32000'          => 32000, // 3.92
 												'fm|32000'                => 32000, // 3.90
 												'voice|32000'             => 32000);
-										if (!isset($ExpectedResampledRate[$ExplodedOptions[1].'|'.$thisfile_mpeg_audio['sample_rate']])) {
+										if ( ! isset($ExpectedResampledRate[$ExplodedOptions[1].'|'.$thisfile_mpeg_audio['sample_rate']])) {
 											$encoder_options .= ' --resample '.$thisfile_mpeg_audio['sample_rate'];
 										}
 										break;
@@ -396,7 +394,7 @@ 
 				}
 			}
 		}
-		if (empty($encoder_options) && !empty($info['audio']['bitrate']) && !empty($info['audio']['bitrate_mode'])) {
+		if (empty($encoder_options) && ! empty($info['audio']['bitrate']) && ! empty($info['audio']['bitrate_mode'])) {
 			//$encoder_options = strtoupper($info['audio']['bitrate_mode']).ceil($info['audio']['bitrate'] / 1000);
 			$encoder_options = strtoupper($info['audio']['bitrate_mode']);
 		}
@@ -405,7 +403,7 @@ 
 	}
 
 
-	public function decodeMPEGaudioHeader($offset, &$info, $recursivesearch=true, $ScanAsCBR=false, $FastMPEGheaderScan=false) {
+	public function decodeMPEGaudioHeader($offset, &$info, $recursivesearch = true, $ScanAsCBR = false, $FastMPEGheaderScan = false) {
 		static $MPEGaudioVersionLookup;
 		static $MPEGaudioLayerLookup;
 		static $MPEGaudioBitrateLookup;
@@ -447,13 +445,13 @@ 
 		}
 
 		static $MPEGaudioHeaderValidCache = array();
-		if (!isset($MPEGaudioHeaderValidCache[$head4])) { // Not in cache
+		if ( ! isset($MPEGaudioHeaderValidCache[$head4])) { // Not in cache
 			//$MPEGaudioHeaderValidCache[$head4] = self::MPEGaudioHeaderValid($MPEGheaderRawArray, false, true);  // allow badly-formatted freeformat (from LAME 3.90 - 3.93.1)
 			$MPEGaudioHeaderValidCache[$head4] = self::MPEGaudioHeaderValid($MPEGheaderRawArray, false, false);
 		}
 
 		// shortcut
-		if (!isset($info['mpeg']['audio'])) {
+		if ( ! isset($info['mpeg']['audio'])) {
 			$info['mpeg']['audio'] = array();
 		}
 		$thisfile_mpeg_audio = &$info['mpeg']['audio'];
@@ -466,14 +464,14 @@ 
 			return false;
 		}
 
-		if (!$FastMPEGheaderScan) {
+		if ( ! $FastMPEGheaderScan) {
 			$thisfile_mpeg_audio['version']       = $MPEGaudioVersionLookup[$thisfile_mpeg_audio['raw']['version']];
 			$thisfile_mpeg_audio['layer']         = $MPEGaudioLayerLookup[$thisfile_mpeg_audio['raw']['layer']];
 
 			$thisfile_mpeg_audio['channelmode']   = $MPEGaudioChannelModeLookup[$thisfile_mpeg_audio['raw']['channelmode']];
 			$thisfile_mpeg_audio['channels']      = (($thisfile_mpeg_audio['channelmode'] == 'mono') ? 1 : 2);
 			$thisfile_mpeg_audio['sample_rate']   = $MPEGaudioFrequencyLookup[$thisfile_mpeg_audio['version']][$thisfile_mpeg_audio['raw']['sample_rate']];
-			$thisfile_mpeg_audio['protection']    = !$thisfile_mpeg_audio['raw']['protection'];
+			$thisfile_mpeg_audio['protection']    = ! $thisfile_mpeg_audio['raw']['protection'];
 			$thisfile_mpeg_audio['private']       = (bool) $thisfile_mpeg_audio['raw']['private'];
 			$thisfile_mpeg_audio['modeextension'] = $MPEGaudioModeExtensionLookup[$thisfile_mpeg_audio['layer']][$thisfile_mpeg_audio['raw']['modeextension']];
 			$thisfile_mpeg_audio['copyright']     = (bool) $thisfile_mpeg_audio['raw']['copyright'];
@@ -503,7 +501,7 @@ 
 		}
 
 		// For Layer 2 there are some combinations of bitrate and mode which are not allowed.
-		if (!$FastMPEGheaderScan && ($thisfile_mpeg_audio['layer'] == '2')) {
+		if ( ! $FastMPEGheaderScan && ($thisfile_mpeg_audio['layer'] == '2')) {
 
 			$info['audio']['dataformat'] = 'mp2';
 			switch ($thisfile_mpeg_audio['channelmode']) {
@@ -562,15 +560,15 @@ 
 
 			$thisfile_mpeg_audio['bitrate_mode'] = 'vbr';
 			$thisfile_mpeg_audio['VBR_method']   = 'Fraunhofer';
-			$info['audio']['codec']                = 'Fraunhofer';
+			$info['audio']['codec'] = 'Fraunhofer';
 
 			$SideInfoData = substr($headerstring, 4 + 2, 32);
 
 			$FraunhoferVBROffset = 36;
 
-			$thisfile_mpeg_audio['VBR_encoder_version']     = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset +  4, 2)); // VbriVersion
-			$thisfile_mpeg_audio['VBR_encoder_delay']       = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset +  6, 2)); // VbriDelay
-			$thisfile_mpeg_audio['VBR_quality']             = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset +  8, 2)); // VbriQuality
+			$thisfile_mpeg_audio['VBR_encoder_version']     = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 4, 2)); // VbriVersion
+			$thisfile_mpeg_audio['VBR_encoder_delay']       = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 6, 2)); // VbriDelay
+			$thisfile_mpeg_audio['VBR_quality']             = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 8, 2)); // VbriQuality
 			$thisfile_mpeg_audio['VBR_bytes']               = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 10, 4)); // VbriStreamBytes
 			$thisfile_mpeg_audio['VBR_frames']              = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 14, 4)); // VbriStreamFrames
 			$thisfile_mpeg_audio['VBR_seek_offsets']        = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 18, 2)); // VbriTableSize
@@ -640,15 +638,15 @@ 
 				$thisfile_mpeg_audio['xing_flags']['vbr_scale'] = (bool) ($thisfile_mpeg_audio['xing_flags_raw'] & 0x00000008);
 
 				if ($thisfile_mpeg_audio['xing_flags']['frames']) {
-					$thisfile_mpeg_audio['VBR_frames'] = getid3_lib::BigEndian2Int(substr($headerstring, $VBRidOffset +  8, 4));
+					$thisfile_mpeg_audio['VBR_frames'] = getid3_lib::BigEndian2Int(substr($headerstring, $VBRidOffset + 8, 4));
 					//$thisfile_mpeg_audio['VBR_frames']--; // don't count header Xing/Info frame
 				}
 				if ($thisfile_mpeg_audio['xing_flags']['bytes']) {
-					$thisfile_mpeg_audio['VBR_bytes']  = getid3_lib::BigEndian2Int(substr($headerstring, $VBRidOffset + 12, 4));
+					$thisfile_mpeg_audio['VBR_bytes'] = getid3_lib::BigEndian2Int(substr($headerstring, $VBRidOffset + 12, 4));
 				}
 
 				//if (($thisfile_mpeg_audio['bitrate'] == 'free') && !empty($thisfile_mpeg_audio['VBR_frames']) && !empty($thisfile_mpeg_audio['VBR_bytes'])) {
-				if (!empty($thisfile_mpeg_audio['VBR_frames']) && !empty($thisfile_mpeg_audio['VBR_bytes'])) {
+				if ( ! empty($thisfile_mpeg_audio['VBR_frames']) && ! empty($thisfile_mpeg_audio['VBR_bytes'])) {
 
 					$framelengthfloat = $thisfile_mpeg_audio['VBR_bytes'] / $thisfile_mpeg_audio['VBR_frames'];
 
@@ -720,7 +718,7 @@ 
 						$LAMEtagRevisionVBRmethod = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA5, 1));
 
 						$thisfile_mpeg_audio_lame['tag_revision']   = ($LAMEtagRevisionVBRmethod & 0xF0) >> 4;
-						$thisfile_mpeg_audio_lame_raw['vbr_method'] =  $LAMEtagRevisionVBRmethod & 0x0F;
+						$thisfile_mpeg_audio_lame_raw['vbr_method'] = $LAMEtagRevisionVBRmethod & 0x0F;
 						$thisfile_mpeg_audio_lame['vbr_method']     = self::LAMEvbrMethodLookup($thisfile_mpeg_audio_lame_raw['vbr_method']);
 						$thisfile_mpeg_audio['bitrate_mode']        = substr($thisfile_mpeg_audio_lame['vbr_method'], 0, 3); // usually either 'cbr' or 'vbr', but truncates 'vbr-old / vbr-rh' to 'vbr'
 
@@ -745,8 +743,8 @@ 
 							$thisfile_mpeg_audio_lame_RGAD['peak_db'] = getid3_lib::RGADamplitude2dB($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']);
 						}
 
-						$thisfile_mpeg_audio_lame_raw['RGAD_track']      =   getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAB, 2));
-						$thisfile_mpeg_audio_lame_raw['RGAD_album']      =   getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAD, 2));
+						$thisfile_mpeg_audio_lame_raw['RGAD_track']      = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAB, 2));
+						$thisfile_mpeg_audio_lame_raw['RGAD_album']      = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAD, 2));
 
 
 						if ($thisfile_mpeg_audio_lame_raw['RGAD_track'] != 0) {
@@ -754,13 +752,13 @@ 
 							$thisfile_mpeg_audio_lame_RGAD_track['raw']['name']        = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0xE000) >> 13;
 							$thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']  = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x1C00) >> 10;
 							$thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']    = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x0200) >> 9;
-							$thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'] =  $thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x01FF;
+							$thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'] = $thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x01FF;
 							$thisfile_mpeg_audio_lame_RGAD_track['name']       = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['name']);
 							$thisfile_mpeg_audio_lame_RGAD_track['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']);
 							$thisfile_mpeg_audio_lame_RGAD_track['gain_db']    = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']);
 
-							if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
-								$info['replay_gain']['track']['peak']   = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
+							if ( ! empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
+								$info['replay_gain']['track']['peak'] = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
 							}
 							$info['replay_gain']['track']['originator'] = $thisfile_mpeg_audio_lame_RGAD_track['originator'];
 							$info['replay_gain']['track']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_track['gain_db'];
@@ -777,8 +775,8 @@ 
 							$thisfile_mpeg_audio_lame_RGAD_album['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['originator']);
 							$thisfile_mpeg_audio_lame_RGAD_album['gain_db']    = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']);
 
-							if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
-								$info['replay_gain']['album']['peak']   = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
+							if ( ! empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
+								$info['replay_gain']['album']['peak'] = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
 							}
 							$info['replay_gain']['album']['originator'] = $thisfile_mpeg_audio_lame_RGAD_album['originator'];
 							$info['replay_gain']['album']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_album['gain_db'];
@@ -796,7 +794,7 @@ 
 						$thisfile_mpeg_audio_lame['encoding_flags']['nssafejoint'] = (bool) ($EncodingFlagsATHtype & 0x20);
 						$thisfile_mpeg_audio_lame['encoding_flags']['nogap_next']  = (bool) ($EncodingFlagsATHtype & 0x40);
 						$thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev']  = (bool) ($EncodingFlagsATHtype & 0x80);
-						$thisfile_mpeg_audio_lame['ath_type']                      =         $EncodingFlagsATHtype & 0x0F;
+						$thisfile_mpeg_audio_lame['ath_type']                      = $EncodingFlagsATHtype & 0x0F;
 
 						// byte $B0  if ABR {specified bitrate} else {minimal bitrate}
 						$thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB0, 1));
@@ -811,7 +809,7 @@ 
 						// bytes $B1-$B3  Encoder delays
 						$EncoderDelays = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB1, 3));
 						$thisfile_mpeg_audio_lame['encoder_delay'] = ($EncoderDelays & 0xFFF000) >> 12;
-						$thisfile_mpeg_audio_lame['end_padding']   =  $EncoderDelays & 0x000FFF;
+						$thisfile_mpeg_audio_lame['end_padding']   = $EncoderDelays & 0x000FFF;
 
 						// byte $B4  Misc
 						$MiscByte = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB4, 1));
@@ -836,10 +834,10 @@ 
 						$thisfile_mpeg_audio_lame['surround_info']     = self::LAMEsurroundInfoLookup($thisfile_mpeg_audio_lame_raw['surround_info']);
 						$thisfile_mpeg_audio_lame['preset_used_id']    = ($PresetSurroundBytes & 0x07FF);
 						$thisfile_mpeg_audio_lame['preset_used']       = self::LAMEpresetUsedLookup($thisfile_mpeg_audio_lame);
-						if (!empty($thisfile_mpeg_audio_lame['preset_used_id']) && empty($thisfile_mpeg_audio_lame['preset_used'])) {
+						if ( ! empty($thisfile_mpeg_audio_lame['preset_used_id']) && empty($thisfile_mpeg_audio_lame['preset_used'])) {
 							$info['warning'][] = 'Unknown LAME preset used ('.$thisfile_mpeg_audio_lame['preset_used_id'].') - please report to info@getid3.org';
 						}
-						if (($thisfile_mpeg_audio_lame['short_version'] == 'LAME3.90.') && !empty($thisfile_mpeg_audio_lame['preset_used_id'])) {
+						if (($thisfile_mpeg_audio_lame['short_version'] == 'LAME3.90.') && ! empty($thisfile_mpeg_audio_lame['preset_used_id'])) {
 							// this may change if 3.90.4 ever comes out
 							$thisfile_mpeg_audio_lame['short_version'] = 'LAME3.90.3';
 						}
@@ -948,7 +946,7 @@ 
 					}
 					$thisfile_mpeg_audio['VBR_bitrate'] = (isset($thisfile_mpeg_audio['VBR_bytes']) ? (($thisfile_mpeg_audio['VBR_bytes'] / $thisfile_mpeg_audio['VBR_frames']) * 8) * ($info['audio']['sample_rate'] / $bytes_per_frame) : 0);
 					if ($thisfile_mpeg_audio['VBR_bitrate'] > 0) {
-						$info['audio']['bitrate']         = $thisfile_mpeg_audio['VBR_bitrate'];
+						$info['audio']['bitrate'] = $thisfile_mpeg_audio['VBR_bitrate'];
 						$thisfile_mpeg_audio['bitrate'] = $thisfile_mpeg_audio['VBR_bitrate']; // to avoid confusion
 					}
 					break;
@@ -960,7 +958,7 @@ 
 
 		if ($recursivesearch) {
 
-			if (!$this->RecursiveFrameScanning($offset, $nextframetestoffset, $ScanAsCBR)) {
+			if ( ! $this->RecursiveFrameScanning($offset, $nextframetestoffset, $ScanAsCBR)) {
 				return false;
 			}
 
@@ -1088,7 +1086,7 @@ 
 			if ($this->decodeMPEGaudioHeader($nextframetestoffset, $nextframetestarray, false)) {
 				if ($ScanAsCBR) {
 					// force CBR mode, used for trying to pick out invalid audio streams with valid(?) VBR headers, or VBR streams with no VBR header
-					if (!isset($nextframetestarray['mpeg']['audio']['bitrate']) || !isset($firstframetestarray['mpeg']['audio']['bitrate']) || ($nextframetestarray['mpeg']['audio']['bitrate'] != $firstframetestarray['mpeg']['audio']['bitrate'])) {
+					if ( ! isset($nextframetestarray['mpeg']['audio']['bitrate']) || ! isset($firstframetestarray['mpeg']['audio']['bitrate']) || ($nextframetestarray['mpeg']['audio']['bitrate'] != $firstframetestarray['mpeg']['audio']['bitrate'])) {
 						return false;
 					}
 				}
@@ -1102,7 +1100,7 @@ 
 					return false;
 				}
 
-			} elseif (!empty($firstframetestarray['mpeg']['audio']['framelength']) && (($nextframetestoffset + $firstframetestarray['mpeg']['audio']['framelength']) > $info['avdataend'])) {
+			} elseif ( ! empty($firstframetestarray['mpeg']['audio']['framelength']) && (($nextframetestoffset + $firstframetestarray['mpeg']['audio']['framelength']) > $info['avdataend'])) {
 
 				// it's not the end of the file, but there's not enough data left for another frame, so assume it's garbage/padding and return OK
 				return true;
@@ -1118,7 +1116,7 @@ 
 		return true;
 	}
 
-	public function FreeFormatFrameLength($offset, $deepscan=false) {
+	public function FreeFormatFrameLength($offset, $deepscan = false) {
 		$info = &$this->getid3->info;
 
 		$this->fseek($offset);
@@ -1140,7 +1138,7 @@ 
 		if (($framelength2 > 4) && ($framelength2 < $framelength1)) {
 			$framelength = $framelength2;
 		}
-		if (!$framelength) {
+		if ( ! $framelength) {
 
 			// LAME 3.88 has a different value for modeextension on the first frame vs the rest
 			$framelength1 = strpos($MPEGaudioData, substr($SyncPattern1, 0, 3), 4);
@@ -1152,7 +1150,7 @@ 
 			if (($framelength2 > 4) && ($framelength2 < $framelength1)) {
 				$framelength = $framelength2;
 			}
-			if (!$framelength) {
+			if ( ! $framelength) {
 				$info['error'][] = 'Cannot find next free-format synch pattern ('.getid3_lib::PrintHexBytes($SyncPattern1).' or '.getid3_lib::PrintHexBytes($SyncPattern2).') after offset '.$offset;
 				return false;
 			} else {
@@ -1239,15 +1237,15 @@ 
 				}
 				continue;
 			}
-			if (!isset($MPEGaudioHeaderDecodeCache[$head4])) {
+			if ( ! isset($MPEGaudioHeaderDecodeCache[$head4])) {
 				$MPEGaudioHeaderDecodeCache[$head4] = self::MPEGaudioHeaderDecode($head4);
 			}
-			if (!isset($MPEGaudioHeaderValidCache[$head4])) {
+			if ( ! isset($MPEGaudioHeaderValidCache[$head4])) {
 				$MPEGaudioHeaderValidCache[$head4] = self::MPEGaudioHeaderValid($MPEGaudioHeaderDecodeCache[$head4], false, false);
 			}
 			if ($MPEGaudioHeaderValidCache[$head4]) {
 
-				if (!isset($MPEGaudioHeaderLengthCache[$head4])) {
+				if ( ! isset($MPEGaudioHeaderLengthCache[$head4])) {
 					$LongMPEGversionLookup[$head4]   = $MPEGaudioVersionLookup[$MPEGaudioHeaderDecodeCache[$head4]['version']];
 					$LongMPEGlayerLookup[$head4]     = $MPEGaudioLayerLookup[$MPEGaudioHeaderDecodeCache[$head4]['layer']];
 					$LongMPEGbitrateLookup[$head4]   = $MPEGaudioBitrateLookup[$LongMPEGversionLookup[$head4]][$LongMPEGlayerLookup[$head4]][$MPEGaudioHeaderDecodeCache[$head4]['bitrate']];
@@ -1265,10 +1263,10 @@ 
 					$this->fseek($MPEGaudioHeaderLengthCache[$head4] - 4, SEEK_CUR);
 					$next4 = $this->fread(4);
 					if ($next4{0} == "\xFF") {
-						if (!isset($MPEGaudioHeaderDecodeCache[$next4])) {
+						if ( ! isset($MPEGaudioHeaderDecodeCache[$next4])) {
 							$MPEGaudioHeaderDecodeCache[$next4] = self::MPEGaudioHeaderDecode($next4);
 						}
-						if (!isset($MPEGaudioHeaderValidCache[$next4])) {
+						if ( ! isset($MPEGaudioHeaderValidCache[$next4])) {
 							$MPEGaudioHeaderValidCache[$next4] = self::MPEGaudioHeaderValid($MPEGaudioHeaderDecodeCache[$next4], false, false);
 						}
 						if ($MPEGaudioHeaderValidCache[$next4]) {
@@ -1324,7 +1322,7 @@ 
 				$bittotal += ($bitratevalue * $bitratecount);
 			}
 		}
-		$info['mpeg']['audio']['frame_count']  = array_sum($Distribution['bitrate']);
+		$info['mpeg']['audio']['frame_count'] = array_sum($Distribution['bitrate']);
 		if ($info['mpeg']['audio']['frame_count'] == 0) {
 			$info['error'][] = 'no MPEG audio frames found';
 			return false;
@@ -1343,7 +1341,7 @@ 
 	}
 
 
-	public function getOnlyMPEGaudioInfo($avdataoffset, $BitrateHistogram=false) {
+	public function getOnlyMPEGaudioInfo($avdataoffset, $BitrateHistogram = false) {
 		// looks for synch, decodes MPEG audio header
 
 		$info = &$this->getid3->info;
@@ -1368,7 +1366,7 @@ 
 		$sync_seek_buffer_size = strlen($header);
 		$SynchSeekOffset = 0;
 		while ($SynchSeekOffset < $sync_seek_buffer_size) {
-			if ((($avdataoffset + $SynchSeekOffset)  < $info['avdataend']) && !feof($this->getid3->fp)) {
+			if ((($avdataoffset + $SynchSeekOffset) < $info['avdataend']) && ! feof($this->getid3->fp)) {
 
 				if ($SynchSeekOffset > $sync_seek_buffer_size) {
 					// if a synch's not found within the first 128k bytes, then give up
@@ -1393,7 +1391,7 @@ 
 					if (isset($info['mpeg']['audio'])) {
 						unset($info['mpeg']['audio']);
 					}
-					if (isset($info['mpeg']) && (!is_array($info['mpeg']) || (count($info['mpeg']) == 0))) {
+					if (isset($info['mpeg']) && ( ! is_array($info['mpeg']) || (count($info['mpeg']) == 0))) {
 						unset($info['mpeg']);
 					}
 					return false;
@@ -1406,10 +1404,10 @@ 
 			}
 
 			if (($header{$SynchSeekOffset} == "\xFF") && ($header{($SynchSeekOffset + 1)} > "\xE0")) { // synch detected
-				if (!isset($FirstFrameThisfileInfo) && !isset($info['mpeg']['audio'])) {
+				if ( ! isset($FirstFrameThisfileInfo) && ! isset($info['mpeg']['audio'])) {
 					$FirstFrameThisfileInfo = $info;
 					$FirstFrameAVDataOffset = $avdataoffset + $SynchSeekOffset;
-					if (!$this->decodeMPEGaudioHeader($FirstFrameAVDataOffset, $FirstFrameThisfileInfo, false)) {
+					if ( ! $this->decodeMPEGaudioHeader($FirstFrameAVDataOffset, $FirstFrameThisfileInfo, false)) {
 						// if this is the first valid MPEG-audio frame, save it in case it's a VBR header frame and there's
 						// garbage between this frame and a valid sequence of MPEG-audio frames, to be restored below
 						unset($FirstFrameThisfileInfo);
@@ -1421,16 +1419,12 @@ 
 					$info = $dummy;
 					$info['avdataoffset'] = $avdataoffset + $SynchSeekOffset;
 					switch (isset($info['fileformat']) ? $info['fileformat'] : '') {
-						case '':
-						case 'id3':
-						case 'ape':
-						case 'mp3':
-							$info['fileformat']          = 'mp3';
+						case '' : case 'id3' : case 'ape' : case 'mp3' : $info['fileformat']          = 'mp3';
 							$info['audio']['dataformat'] = 'mp3';
 							break;
 					}
 					if (isset($FirstFrameThisfileInfo['mpeg']['audio']['bitrate_mode']) && ($FirstFrameThisfileInfo['mpeg']['audio']['bitrate_mode'] == 'vbr')) {
-						if (!(abs($info['audio']['bitrate'] - $FirstFrameThisfileInfo['audio']['bitrate']) <= 1)) {
+						if ( ! (abs($info['audio']['bitrate'] - $FirstFrameThisfileInfo['audio']['bitrate']) <= 1)) {
 							// If there is garbage data between a valid VBR header frame and a sequence
 							// of valid MPEG-audio frames the VBR data is no longer discarded.
 							$info = $FirstFrameThisfileInfo;
@@ -1450,7 +1444,7 @@ 
 							}
 						}
 					}
-					if (isset($info['mpeg']['audio']['bitrate_mode']) && ($info['mpeg']['audio']['bitrate_mode'] == 'vbr') && !isset($info['mpeg']['audio']['VBR_method'])) {
+					if (isset($info['mpeg']['audio']['bitrate_mode']) && ($info['mpeg']['audio']['bitrate_mode'] == 'vbr') && ! isset($info['mpeg']['audio']['VBR_method'])) {
 						// VBR file with no VBR header
 						$BitrateHistogram = true;
 					}
@@ -1479,7 +1473,7 @@ 
 						$this->fseek($info['avdataoffset']);
 
 						// you can play with these numbers:
-						$max_frames_scan  = 50000;
+						$max_frames_scan = 50000;
 						$max_scan_segments = 10;
 
 						// don't play with these numbers:
@@ -1541,7 +1535,7 @@ 
 						if ($pct_data_scanned > 0) {
 							$info['warning'][] = 'too many MPEG audio frames to scan, only scanned '.$frames_scanned.' frames in '.$max_scan_segments.' segments ('.number_format($pct_data_scanned * 100, 1).'% of file) and extrapolated distribution, playtime and bitrate may be incorrect.';
 							foreach ($info['mpeg']['audio'] as $key1 => $value1) {
-								if (!preg_match('#_distribution$#i', $key1)) {
+								if ( ! preg_match('#_distribution$#i', $key1)) {
 									continue;
 								}
 								foreach ($value1 as $key2 => $value2) {
@@ -1606,7 +1600,7 @@ 
 					if (isset($info['mpeg']['audio'])) {
 						unset($info['mpeg']['audio']);
 					}
-					if (isset($info['mpeg']) && (!is_array($info['mpeg']) || empty($info['mpeg']))) {
+					if (isset($info['mpeg']) && ( ! is_array($info['mpeg']) || empty($info['mpeg']))) {
 						unset($info['mpeg']);
 					}
 					return false;
@@ -1636,14 +1630,14 @@ 
 	public static function MPEGaudioBitrateArray() {
 		static $MPEGaudioBitrate;
 		if (empty($MPEGaudioBitrate)) {
-			$MPEGaudioBitrate = array (
-				'1'  =>  array (1 => array('free', 32000, 64000, 96000, 128000, 160000, 192000, 224000, 256000, 288000, 320000, 352000, 384000, 416000, 448000),
-								2 => array('free', 32000, 48000, 56000,  64000,  80000,  96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000),
-								3 => array('free', 32000, 40000, 48000,  56000,  64000,  80000,  96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000)
+			$MPEGaudioBitrate = array(
+				'1'  =>  array(1 => array('free', 32000, 64000, 96000, 128000, 160000, 192000, 224000, 256000, 288000, 320000, 352000, 384000, 416000, 448000),
+								2 => array('free', 32000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000),
+								3 => array('free', 32000, 40000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000)
 							   ),
 
-				'2'  =>  array (1 => array('free', 32000, 48000, 56000,  64000,  80000,  96000, 112000, 128000, 144000, 160000, 176000, 192000, 224000, 256000),
-								2 => array('free',  8000, 16000, 24000,  32000,  40000,  48000,  56000,  64000,  80000,  96000, 112000, 128000, 144000, 160000),
+				'2'  =>  array(1 => array('free', 32000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 144000, 160000, 176000, 192000, 224000, 256000),
+								2 => array('free', 8000, 16000, 24000, 32000, 40000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 144000, 160000),
 							   )
 			);
 			$MPEGaudioBitrate['2'][3] = $MPEGaudioBitrate['2'][2];
@@ -1655,10 +1649,10 @@ 
 	public static function MPEGaudioFrequencyArray() {
 		static $MPEGaudioFrequency;
 		if (empty($MPEGaudioFrequency)) {
-			$MPEGaudioFrequency = array (
+			$MPEGaudioFrequency = array(
 				'1'   => array(44100, 48000, 32000),
 				'2'   => array(22050, 24000, 16000),
-				'2.5' => array(11025, 12000,  8000)
+				'2.5' => array(11025, 12000, 8000)
 			);
 		}
 		return $MPEGaudioFrequency;
@@ -1672,7 +1666,7 @@ 
 	public static function MPEGaudioModeExtensionArray() {
 		static $MPEGaudioModeExtension;
 		if (empty($MPEGaudioModeExtension)) {
-			$MPEGaudioModeExtension = array (
+			$MPEGaudioModeExtension = array(
 				1 => array('4-31', '8-31', '12-31', '16-31'),
 				2 => array('4-31', '8-31', '12-31', '16-31'),
 				3 => array('', 'IS', 'MS', 'IS+MS')
@@ -1686,11 +1680,11 @@ 
 		return $MPEGaudioEmphasis;
 	}
 
-	public static function MPEGaudioHeaderBytesValid($head4, $allowBitrate15=false) {
+	public static function MPEGaudioHeaderBytesValid($head4, $allowBitrate15 = false) {
 		return self::MPEGaudioHeaderValid(self::MPEGaudioHeaderDecode($head4), false, $allowBitrate15);
 	}
 
-	public static function MPEGaudioHeaderValid($rawarray, $echoerrors=false, $allowBitrate15=false) {
+	public static function MPEGaudioHeaderValid($rawarray, $echoerrors = false, $allowBitrate15 = false) {
 		if (($rawarray['synch'] & 0x0FFE) != 0x0FFE) {
 			return false;
 		}
@@ -1724,31 +1718,31 @@ 
 			echo ($echoerrors ? "\n".'invalid Layer ('.$rawarray['layer'].')' : '');
 			return false;
 		}
-		if (!isset($MPEGaudioBitrateLookup[$decodedVersion][$decodedLayer][$rawarray['bitrate']])) {
+		if ( ! isset($MPEGaudioBitrateLookup[$decodedVersion][$decodedLayer][$rawarray['bitrate']])) {
 			echo ($echoerrors ? "\n".'invalid Bitrate ('.$rawarray['bitrate'].')' : '');
 			if ($rawarray['bitrate'] == 15) {
 				// known issue in LAME 3.90 - 3.93.1 where free-format has bitrate ID of 15 instead of 0
 				// let it go through here otherwise file will not be identified
-				if (!$allowBitrate15) {
+				if ( ! $allowBitrate15) {
 					return false;
 				}
 			} else {
 				return false;
 			}
 		}
-		if (!isset($MPEGaudioFrequencyLookup[$decodedVersion][$rawarray['sample_rate']])) {
+		if ( ! isset($MPEGaudioFrequencyLookup[$decodedVersion][$rawarray['sample_rate']])) {
 			echo ($echoerrors ? "\n".'invalid Frequency ('.$rawarray['sample_rate'].')' : '');
 			return false;
 		}
-		if (!isset($MPEGaudioChannelModeLookup[$rawarray['channelmode']])) {
+		if ( ! isset($MPEGaudioChannelModeLookup[$rawarray['channelmode']])) {
 			echo ($echoerrors ? "\n".'invalid ChannelMode ('.$rawarray['channelmode'].')' : '');
 			return false;
 		}
-		if (!isset($MPEGaudioModeExtensionLookup[$decodedLayer][$rawarray['modeextension']])) {
+		if ( ! isset($MPEGaudioModeExtensionLookup[$decodedLayer][$rawarray['modeextension']])) {
 			echo ($echoerrors ? "\n".'invalid Mode Extension ('.$rawarray['modeextension'].')' : '');
 			return false;
 		}
-		if (!isset($MPEGaudioEmphasisLookup[$rawarray['emphasis']])) {
+		if ( ! isset($MPEGaudioEmphasisLookup[$rawarray['emphasis']])) {
 			echo ($echoerrors ? "\n".'invalid Emphasis ('.$rawarray['emphasis'].')' : '');
 			return false;
 		}
@@ -1785,16 +1779,16 @@ 
 		$MPEGrawHeader['synch']         = (getid3_lib::BigEndian2Int(substr($Header4Bytes, 0, 2)) & 0xFFE0) >> 4;
 		$MPEGrawHeader['version']       = (ord($Header4Bytes{1}) & 0x18) >> 3; //    BB
 		$MPEGrawHeader['layer']         = (ord($Header4Bytes{1}) & 0x06) >> 1; //      CC
-		$MPEGrawHeader['protection']    = (ord($Header4Bytes{1}) & 0x01);      //        D
+		$MPEGrawHeader['protection']    = (ord($Header4Bytes{1}) & 0x01); //        D
 		$MPEGrawHeader['bitrate']       = (ord($Header4Bytes{2}) & 0xF0) >> 4; // EEEE
 		$MPEGrawHeader['sample_rate']   = (ord($Header4Bytes{2}) & 0x0C) >> 2; //     FF
 		$MPEGrawHeader['padding']       = (ord($Header4Bytes{2}) & 0x02) >> 1; //       G
-		$MPEGrawHeader['private']       = (ord($Header4Bytes{2}) & 0x01);      //        H
+		$MPEGrawHeader['private']       = (ord($Header4Bytes{2}) & 0x01); //        H
 		$MPEGrawHeader['channelmode']   = (ord($Header4Bytes{3}) & 0xC0) >> 6; // II
 		$MPEGrawHeader['modeextension'] = (ord($Header4Bytes{3}) & 0x30) >> 4; //   JJ
 		$MPEGrawHeader['copyright']     = (ord($Header4Bytes{3}) & 0x08) >> 3; //     K
 		$MPEGrawHeader['original']      = (ord($Header4Bytes{3}) & 0x04) >> 2; //      L
-		$MPEGrawHeader['emphasis']      = (ord($Header4Bytes{3}) & 0x03);      //       MM
+		$MPEGrawHeader['emphasis']      = (ord($Header4Bytes{3}) & 0x03); //       MM
 
 		return $MPEGrawHeader;
 	}
@@ -1802,7 +1796,7 @@ 
 	public static function MPEGaudioFrameLength(&$bitrate, &$version, &$layer, $padding, &$samplerate) {
 		static $AudioFrameLengthCache = array();
 
-		if (!isset($AudioFrameLengthCache[$bitrate][$version][$layer][$padding][$samplerate])) {
+		if ( ! isset($AudioFrameLengthCache[$bitrate][$version][$layer][$padding][$samplerate])) {
 			$AudioFrameLengthCache[$bitrate][$version][$layer][$padding][$samplerate] = false;
 			if ($bitrate != 'free') {
 
@@ -1861,10 +1855,10 @@ 
 	}
 
 	public static function ClosestStandardMP3Bitrate($bit_rate) {
-		static $standard_bit_rates = array (320000, 256000, 224000, 192000, 160000, 128000, 112000, 96000, 80000, 64000, 56000, 48000, 40000, 32000, 24000, 16000, 8000);
-		static $bit_rate_table = array (0=>'-');
+		static $standard_bit_rates = array(320000, 256000, 224000, 192000, 160000, 128000, 112000, 96000, 80000, 64000, 56000, 48000, 40000, 32000, 24000, 16000, 8000);
+		static $bit_rate_table = array(0=>'-');
 		$round_bit_rate = intval(round($bit_rate, -3));
-		if (!isset($bit_rate_table[$round_bit_rate])) {
+		if ( ! isset($bit_rate_table[$round_bit_rate])) {
 			if ($round_bit_rate > max($standard_bit_rates)) {
 				$bit_rate_table[$round_bit_rate] = round($bit_rate, 2 - strlen($bit_rate));
 			} else {
@@ -1883,20 +1877,20 @@ 
 	public static function XingVBRidOffset($version, $channelmode) {
 		static $XingVBRidOffsetCache = array();
 		if (empty($XingVBRidOffset)) {
-			$XingVBRidOffset = array (
-				'1'   => array ('mono'          => 0x15, // 4 + 17 = 21
+			$XingVBRidOffset = array(
+				'1'   => array('mono'          => 0x15, // 4 + 17 = 21
 								'stereo'        => 0x24, // 4 + 32 = 36
 								'joint stereo'  => 0x24,
 								'dual channel'  => 0x24
 							   ),
 
-				'2'   => array ('mono'          => 0x0D, // 4 +  9 = 13
+				'2'   => array('mono'          => 0x0D, // 4 +  9 = 13
 								'stereo'        => 0x15, // 4 + 17 = 21
 								'joint stereo'  => 0x15,
 								'dual channel'  => 0x15
 							   ),
 
-				'2.5' => array ('mono'          => 0x15,
+				'2.5' => array('mono'          => 0x15,
 								'stereo'        => 0x15,
 								'joint stereo'  => 0x15,
 								'dual channel'  => 0x15
@@ -1991,20 +1985,20 @@ 
 		$LAMEpresetUsedLookup[1007] = '--alt-preset fast medium';
 
 		// LAME 3.94 additions/changes
-		$LAMEpresetUsedLookup[1010] = '--preset portable';                                                           // 3.94a15 Oct 21 2003
-		$LAMEpresetUsedLookup[1015] = '--preset radio';                                                              // 3.94a15 Oct 21 2003
+		$LAMEpresetUsedLookup[1010] = '--preset portable'; // 3.94a15 Oct 21 2003
+		$LAMEpresetUsedLookup[1015] = '--preset radio'; // 3.94a15 Oct 21 2003
 
-		$LAMEpresetUsedLookup[320]  = '--preset insane';                                                             // 3.94a15 Nov 12 2003
+		$LAMEpresetUsedLookup[320]  = '--preset insane'; // 3.94a15 Nov 12 2003
 		$LAMEpresetUsedLookup[410]  = '-V9';
 		$LAMEpresetUsedLookup[420]  = '-V8';
 		$LAMEpresetUsedLookup[440]  = '-V6';
-		$LAMEpresetUsedLookup[430]  = '--preset radio';                                                              // 3.94a15 Nov 12 2003
-		$LAMEpresetUsedLookup[450]  = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'portable';  // 3.94a15 Nov 12 2003
-		$LAMEpresetUsedLookup[460]  = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'medium';    // 3.94a15 Nov 12 2003
-		$LAMEpresetUsedLookup[470]  = '--r3mix';                                                                     // 3.94b1  Dec 18 2003
-		$LAMEpresetUsedLookup[480]  = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'standard';  // 3.94a15 Nov 12 2003
+		$LAMEpresetUsedLookup[430]  = '--preset radio'; // 3.94a15 Nov 12 2003
+		$LAMEpresetUsedLookup[450]  = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'portable'; // 3.94a15 Nov 12 2003
+		$LAMEpresetUsedLookup[460]  = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'medium'; // 3.94a15 Nov 12 2003
+		$LAMEpresetUsedLookup[470]  = '--r3mix'; // 3.94b1  Dec 18 2003
+		$LAMEpresetUsedLookup[480]  = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'standard'; // 3.94a15 Nov 12 2003
 		$LAMEpresetUsedLookup[490]  = '-V1';
-		$LAMEpresetUsedLookup[500]  = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'extreme';   // 3.94a15 Nov 12 2003
+		$LAMEpresetUsedLookup[500]  = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'extreme'; // 3.94a15 Nov 12 2003
 
 		return (isset($LAMEpresetUsedLookup[$LAMEtag['preset_used_id']]) ? $LAMEpresetUsedLookup[$LAMEtag['preset_used_id']] : 'new/unknown preset: '.$LAMEtag['preset_used_id'].' - report to info@getid3.org');
 	}

Braces +2 added lines, -4 removed lines

@@ -893,11 +893,9 @@
 			if ($ExpectedNumberOfAudioBytes > ($info['avdataend'] - $info['avdataoffset'])) {
 				if ($this->isDependencyFor('matroska') || $this->isDependencyFor('riff')) {
 					// ignore, audio data is broken into chunks so will always be data "missing"
-				}
-				elseif (($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])) == 1) {
+				} elseif (($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])) == 1) {
 					$this->warning('Last byte of data truncated (this is a known bug in Meracl ID3 Tag Writer before v1.3.5)');
-				}
-				else {
+				} else {
 					$this->warning('Probable truncated file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, only found '.($info['avdataend'] - $info['avdataoffset']).' (short by '.($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])).' bytes)');
 				}
 			} else {

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

Doc Comments +5 added lines

@@ -427,6 +427,11 @@
 	}
 
 	// http://tools.ietf.org/html/draft-ietf-codec-oggopus-03
+
+	/**
+	 * @param string $filedata
+	 * @param integer $filedataoffset
+	 */
 	public function ParseOpusPageHeader(&$filedata, &$filedataoffset, &$oggpageinfo) {
 		$info = &$this->getid3->info;
 		$info['audio']['dataformat']   = 'opus';

Indentation +1 added lines, -1 removed lines

@@ -528,7 +528,7 @@
 		return $oggheader;
 	}
 
-    // http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810005
+	// http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810005
 	public function ParseVorbisComments() {
 		$info = &$this->getid3->info;
 

Spacing +61 added lines, -61 removed lines

@@ -65,7 +65,7 @@ 
 
 		} elseif (substr($filedata, 0, 8) == 'OpusHead') {
 
-			if( $this->ParseOpusPageHeader($filedata, $filedataoffset, $oggpageinfo) == false ) {
+			if ($this->ParseOpusPageHeader($filedata, $filedataoffset, $oggpageinfo) == false) {
 				return false;
 			}
 
@@ -78,9 +78,9 @@ 
 			$info['audio']['bitrate_mode'] = 'abr';
 			$info['audio']['lossless']     = false;
 
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_string']           =                              substr($filedata, $filedataoffset, 8); // hard-coded to 'Speex   '
+			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_string']           = substr($filedata, $filedataoffset, 8); // hard-coded to 'Speex   '
 			$filedataoffset += 8;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version']          =                              substr($filedata, $filedataoffset, 20);
+			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version']          = substr($filedata, $filedataoffset, 20);
 			$filedataoffset += 20;
 			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version_id']       = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 			$filedataoffset += 4;
@@ -125,45 +125,45 @@ 
 
 			// http://www.theora.org/doc/Theora.pdf (section 6.2)
 
-			$info['ogg']['pageheader']['theora']['theora_magic']             =                           substr($filedata, $filedataoffset,  7); // hard-coded to "\x80.'theora'
+			$info['ogg']['pageheader']['theora']['theora_magic']             = substr($filedata, $filedataoffset, 7); // hard-coded to "\x80.'theora'
 			$filedataoffset += 7;
-			$info['ogg']['pageheader']['theora']['version_major']            = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  1));
+			$info['ogg']['pageheader']['theora']['version_major']            = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
 			$filedataoffset += 1;
-			$info['ogg']['pageheader']['theora']['version_minor']            = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  1));
+			$info['ogg']['pageheader']['theora']['version_minor']            = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
 			$filedataoffset += 1;
-			$info['ogg']['pageheader']['theora']['version_revision']         = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  1));
+			$info['ogg']['pageheader']['theora']['version_revision']         = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
 			$filedataoffset += 1;
-			$info['ogg']['pageheader']['theora']['frame_width_macroblocks']  = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  2));
+			$info['ogg']['pageheader']['theora']['frame_width_macroblocks']  = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 2));
 			$filedataoffset += 2;
-			$info['ogg']['pageheader']['theora']['frame_height_macroblocks'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  2));
+			$info['ogg']['pageheader']['theora']['frame_height_macroblocks'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 2));
 			$filedataoffset += 2;
-			$info['ogg']['pageheader']['theora']['resolution_x']             = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  3));
+			$info['ogg']['pageheader']['theora']['resolution_x']             = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
 			$filedataoffset += 3;
-			$info['ogg']['pageheader']['theora']['resolution_y']             = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  3));
+			$info['ogg']['pageheader']['theora']['resolution_y']             = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
 			$filedataoffset += 3;
-			$info['ogg']['pageheader']['theora']['picture_offset_x']         = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  1));
+			$info['ogg']['pageheader']['theora']['picture_offset_x']         = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
 			$filedataoffset += 1;
-			$info['ogg']['pageheader']['theora']['picture_offset_y']         = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  1));
+			$info['ogg']['pageheader']['theora']['picture_offset_y']         = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
 			$filedataoffset += 1;
-			$info['ogg']['pageheader']['theora']['frame_rate_numerator']     = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  4));
+			$info['ogg']['pageheader']['theora']['frame_rate_numerator']     = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 4));
 			$filedataoffset += 4;
-			$info['ogg']['pageheader']['theora']['frame_rate_denominator']   = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  4));
+			$info['ogg']['pageheader']['theora']['frame_rate_denominator']   = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 4));
 			$filedataoffset += 4;
-			$info['ogg']['pageheader']['theora']['pixel_aspect_numerator']   = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  3));
+			$info['ogg']['pageheader']['theora']['pixel_aspect_numerator']   = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
 			$filedataoffset += 3;
-			$info['ogg']['pageheader']['theora']['pixel_aspect_denominator'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  3));
+			$info['ogg']['pageheader']['theora']['pixel_aspect_denominator'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
 			$filedataoffset += 3;
-			$info['ogg']['pageheader']['theora']['color_space_id']           = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  1));
+			$info['ogg']['pageheader']['theora']['color_space_id']           = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
 			$filedataoffset += 1;
-			$info['ogg']['pageheader']['theora']['nominal_bitrate']          = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  3));
+			$info['ogg']['pageheader']['theora']['nominal_bitrate']          = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
 			$filedataoffset += 3;
-			$info['ogg']['pageheader']['theora']['flags']                    = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  2));
+			$info['ogg']['pageheader']['theora']['flags']                    = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 2));
 			$filedataoffset += 2;
 
 			$info['ogg']['pageheader']['theora']['quality']         = ($info['ogg']['pageheader']['theora']['flags'] & 0xFC00) >> 10;
-			$info['ogg']['pageheader']['theora']['kfg_shift']       = ($info['ogg']['pageheader']['theora']['flags'] & 0x03E0) >>  5;
-			$info['ogg']['pageheader']['theora']['pixel_format_id'] = ($info['ogg']['pageheader']['theora']['flags'] & 0x0018) >>  3;
-			$info['ogg']['pageheader']['theora']['reserved']        = ($info['ogg']['pageheader']['theora']['flags'] & 0x0007) >>  0; // should be 0
+			$info['ogg']['pageheader']['theora']['kfg_shift']       = ($info['ogg']['pageheader']['theora']['flags'] & 0x03E0) >> 5;
+			$info['ogg']['pageheader']['theora']['pixel_format_id'] = ($info['ogg']['pageheader']['theora']['flags'] & 0x0018) >> 3;
+			$info['ogg']['pageheader']['theora']['reserved']        = ($info['ogg']['pageheader']['theora']['flags'] & 0x0007) >> 0; // should be 0
 			$info['ogg']['pageheader']['theora']['color_space']     = self::TheoraColorSpace($info['ogg']['pageheader']['theora']['color_space_id']);
 			$info['ogg']['pageheader']['theora']['pixel_format']    = self::TheoraPixelFormat($info['ogg']['pageheader']['theora']['pixel_format_id']);
 
@@ -187,24 +187,24 @@ 
 			// Ogg Skeleton version 3.0 Format Specification
 			// http://xiph.org/ogg/doc/skeleton.html
 			$filedataoffset += 8;
-			$info['ogg']['skeleton']['fishead']['raw']['version_major']                = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  2));
+			$info['ogg']['skeleton']['fishead']['raw']['version_major']                = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2));
 			$filedataoffset += 2;
-			$info['ogg']['skeleton']['fishead']['raw']['version_minor']                = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  2));
+			$info['ogg']['skeleton']['fishead']['raw']['version_minor']                = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2));
 			$filedataoffset += 2;
-			$info['ogg']['skeleton']['fishead']['raw']['presentationtime_numerator']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+			$info['ogg']['skeleton']['fishead']['raw']['presentationtime_numerator']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 			$filedataoffset += 8;
-			$info['ogg']['skeleton']['fishead']['raw']['presentationtime_denominator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+			$info['ogg']['skeleton']['fishead']['raw']['presentationtime_denominator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 			$filedataoffset += 8;
-			$info['ogg']['skeleton']['fishead']['raw']['basetime_numerator']           = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+			$info['ogg']['skeleton']['fishead']['raw']['basetime_numerator']           = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 			$filedataoffset += 8;
-			$info['ogg']['skeleton']['fishead']['raw']['basetime_denominator']         = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+			$info['ogg']['skeleton']['fishead']['raw']['basetime_denominator']         = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 			$filedataoffset += 8;
 			$info['ogg']['skeleton']['fishead']['raw']['utc']                          = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 20));
 			$filedataoffset += 20;
 
 			$info['ogg']['skeleton']['fishead']['version']          = $info['ogg']['skeleton']['fishead']['raw']['version_major'].'.'.$info['ogg']['skeleton']['fishead']['raw']['version_minor'];
 			$info['ogg']['skeleton']['fishead']['presentationtime'] = $info['ogg']['skeleton']['fishead']['raw']['presentationtime_numerator'] / $info['ogg']['skeleton']['fishead']['raw']['presentationtime_denominator'];
-			$info['ogg']['skeleton']['fishead']['basetime']         = $info['ogg']['skeleton']['fishead']['raw']['basetime_numerator']         / $info['ogg']['skeleton']['fishead']['raw']['basetime_denominator'];
+			$info['ogg']['skeleton']['fishead']['basetime']         = $info['ogg']['skeleton']['fishead']['raw']['basetime_numerator'] / $info['ogg']['skeleton']['fishead']['raw']['basetime_denominator'];
 			$info['ogg']['skeleton']['fishead']['utc']              = $info['ogg']['skeleton']['fishead']['raw']['utc'];
 
 
@@ -218,23 +218,23 @@ 
 				if (substr($filedata, 0, 8) == "fisbone\x00") {
 
 					$filedataoffset = 8;
-					$info['ogg']['skeleton']['fisbone']['raw']['message_header_offset']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
+					$info['ogg']['skeleton']['fisbone']['raw']['message_header_offset']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 					$filedataoffset += 4;
-					$info['ogg']['skeleton']['fisbone']['raw']['serial_number']           = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
+					$info['ogg']['skeleton']['fisbone']['raw']['serial_number']           = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 					$filedataoffset += 4;
-					$info['ogg']['skeleton']['fisbone']['raw']['number_header_packets']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
+					$info['ogg']['skeleton']['fisbone']['raw']['number_header_packets']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 					$filedataoffset += 4;
-					$info['ogg']['skeleton']['fisbone']['raw']['granulerate_numerator']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+					$info['ogg']['skeleton']['fisbone']['raw']['granulerate_numerator']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 					$filedataoffset += 8;
-					$info['ogg']['skeleton']['fisbone']['raw']['granulerate_denominator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+					$info['ogg']['skeleton']['fisbone']['raw']['granulerate_denominator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 					$filedataoffset += 8;
-					$info['ogg']['skeleton']['fisbone']['raw']['basegranule']             = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+					$info['ogg']['skeleton']['fisbone']['raw']['basegranule']             = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 					$filedataoffset += 8;
-					$info['ogg']['skeleton']['fisbone']['raw']['preroll']                 = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
+					$info['ogg']['skeleton']['fisbone']['raw']['preroll']                 = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 					$filedataoffset += 4;
-					$info['ogg']['skeleton']['fisbone']['raw']['granuleshift']            = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  1));
+					$info['ogg']['skeleton']['fisbone']['raw']['granuleshift']            = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
 					$filedataoffset += 1;
-					$info['ogg']['skeleton']['fisbone']['raw']['padding']                 =                              substr($filedata, $filedataoffset,  3);
+					$info['ogg']['skeleton']['fisbone']['raw']['padding']                 = substr($filedata, $filedataoffset, 3);
 					$filedataoffset += 3;
 
 				} elseif (substr($filedata, 1, 6) == 'theora') {
@@ -276,14 +276,14 @@ 
 			case 'vorbis':
 				$filedata = $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
 				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['packet_type'] = getid3_lib::LittleEndian2Int(substr($filedata, 0, 1));
-				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] =                              substr($filedata, 1, 6); // hard-coded to 'vorbis'
+				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, 1, 6); // hard-coded to 'vorbis'
 
 				$this->ParseVorbisComments();
 				break;
 
 			case 'flac':
 				$flac = new getid3_flac($this->getid3);
-				if (!$flac->parseMETAdata()) {
+				if ( ! $flac->parseMETAdata()) {
 					$info['error'][] = 'Failed to parse FLAC headers';
 					return false;
 				}
@@ -298,7 +298,7 @@ 
 			case 'opus':
 				$filedata = $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
 				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, 0, 8); // hard-coded to 'OpusTags'
-				if(substr($filedata, 0, 8)  != 'OpusTags') {
+				if (substr($filedata, 0, 8) != 'OpusTags') {
 					$info['error'][] = 'Expected "OpusTags" as header but got "'.substr($filedata, 0, 8).'"';
 					return false;
 				}
@@ -309,7 +309,7 @@ 
 		}
 
 		// Last Page - Number of Samples
-		if (!getid3_lib::intValueSupported($info['avdataend'])) {
+		if ( ! getid3_lib::intValueSupported($info['avdataend'])) {
 
 			$info['warning'][] = 'Unable to parse Ogg end chunk file (PHP does not support file operations beyond '.round(PHP_INT_MAX / 1073741824).'GB)';
 
@@ -321,26 +321,26 @@ 
 				$this->fseek($info['avdataend'] - ($LastOggSpostion + strlen('SggO')));
 				$info['avdataend'] = $this->ftell();
 				$info['ogg']['pageheader']['eos'] = $this->ParseOggPageHeader();
-				$info['ogg']['samples']   = $info['ogg']['pageheader']['eos']['pcm_abs_position'];
+				$info['ogg']['samples'] = $info['ogg']['pageheader']['eos']['pcm_abs_position'];
 				if ($info['ogg']['samples'] == 0) {
 					$info['error'][] = 'Corrupt Ogg file: eos.number of samples == zero';
 					return false;
 				}
-				if (!empty($info['audio']['sample_rate'])) {
+				if ( ! empty($info['audio']['sample_rate'])) {
 					$info['ogg']['bitrate_average'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / ($info['ogg']['samples'] / $info['audio']['sample_rate']);
 				}
 			}
 
 		}
 
-		if (!empty($info['ogg']['bitrate_average'])) {
+		if ( ! empty($info['ogg']['bitrate_average'])) {
 			$info['audio']['bitrate'] = $info['ogg']['bitrate_average'];
-		} elseif (!empty($info['ogg']['bitrate_nominal'])) {
+		} elseif ( ! empty($info['ogg']['bitrate_nominal'])) {
 			$info['audio']['bitrate'] = $info['ogg']['bitrate_nominal'];
-		} elseif (!empty($info['ogg']['bitrate_min']) && !empty($info['ogg']['bitrate_max'])) {
+		} elseif ( ! empty($info['ogg']['bitrate_min']) && ! empty($info['ogg']['bitrate_max'])) {
 			$info['audio']['bitrate'] = ($info['ogg']['bitrate_min'] + $info['ogg']['bitrate_max']) / 2;
 		}
-		if (isset($info['audio']['bitrate']) && !isset($info['playtime_seconds'])) {
+		if (isset($info['audio']['bitrate']) && ! isset($info['playtime_seconds'])) {
 			if ($info['audio']['bitrate'] == 0) {
 				$info['error'][] = 'Corrupt Ogg file: bitrate_audio == zero';
 				return false;
@@ -355,7 +355,7 @@ 
 			if ($info['audio']['dataformat'] == 'vorbis') {
 
 				// Vorbis 1.0 starts with Xiph.Org
-				if  (preg_match('/^Xiph.Org/', $info['audio']['encoder'])) {
+				if (preg_match('/^Xiph.Org/', $info['audio']['encoder'])) {
 
 					if ($info['audio']['bitrate_mode'] == 'abr') {
 
@@ -369,7 +369,7 @@ 
 					}
 				}
 
-				if (empty($info['audio']['encoder_options']) && !empty($info['ogg']['bitrate_nominal'])) {
+				if (empty($info['audio']['encoder_options']) && ! empty($info['ogg']['bitrate_nominal'])) {
 					$info['audio']['encoder_options'] = 'Nominal bitrate: '.intval(round($info['ogg']['bitrate_nominal'] / 1000)).'kbps';
 				}
 			}
@@ -407,7 +407,7 @@ 
 		$filedataoffset += 4;
 		$info['ogg']['bitrate_min']      = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 		$filedataoffset += 4;
-		$info['ogg']['blocksize_small']  = pow(2,  getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)) & 0x0F);
+		$info['ogg']['blocksize_small']  = pow(2, getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)) & 0x0F);
 		$info['ogg']['blocksize_large']  = pow(2, (getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)) & 0xF0) >> 4);
 		$info['ogg']['stop_bit']         = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)); // must be 1, marks end of packet
 
@@ -439,7 +439,7 @@ 
 
 		$info['ogg']['pageheader']['opus']['opus_magic'] = substr($filedata, $filedataoffset, 8); // hard-coded to 'OpusHead'
 		$filedataoffset += 8;
-		$info['ogg']['pageheader']['opus']['version']    = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  1));
+		$info['ogg']['pageheader']['opus']['version']    = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
 		$filedataoffset += 1;
 
 		if ($info['ogg']['pageheader']['opus']['version'] < 1 || $info['ogg']['pageheader']['opus']['version'] > 15) {
@@ -447,7 +447,7 @@ 
 			return false;
 		}
 
-		$info['ogg']['pageheader']['opus']['out_channel_count'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  1));
+		$info['ogg']['pageheader']['opus']['out_channel_count'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
 		$filedataoffset += 1;
 
 		if ($info['ogg']['pageheader']['opus']['out_channel_count'] == 0) {
@@ -455,10 +455,10 @@ 
 			return false;
 		}
 
-		$info['ogg']['pageheader']['opus']['pre_skip'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  2));
+		$info['ogg']['pageheader']['opus']['pre_skip'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2));
 		$filedataoffset += 2;
 
-		$info['ogg']['pageheader']['opus']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
+		$info['ogg']['pageheader']['opus']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 		$filedataoffset += 4;
 
 		//$info['ogg']['pageheader']['opus']['output_gain'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  2));
@@ -540,7 +540,7 @@ 
 			case 'vorbis':
 			case 'speex':
 			case 'opus':
-				$CommentStartOffset = $info['ogg']['pageheader'][$VorbisCommentPage]['page_start_offset'];  // Second Ogg page, after header block
+				$CommentStartOffset = $info['ogg']['pageheader'][$VorbisCommentPage]['page_start_offset']; // Second Ogg page, after header block
 				$this->fseek($CommentStartOffset);
 				$commentdataoffset = 27 + $info['ogg']['pageheader'][$VorbisCommentPage]['page_segments'];
 				$commentdata = $this->fread(self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1) + $commentdataoffset);
@@ -641,7 +641,7 @@ 
 				$commentdata .= $AsYetUnusedData;
 
 				//$commentdata .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
-				if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
+				if ( ! isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
 					$info['warning'][] = 'undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell();
 					break;
 				}
@@ -658,7 +658,7 @@ 
 			$commentstring = substr($commentdata, $commentdataoffset, $ThisFileInfo_ogg_comments_raw[$i]['size']);
 			$commentdataoffset += $ThisFileInfo_ogg_comments_raw[$i]['size'];
 
-			if (!$commentstring) {
+			if ( ! $commentstring) {
 
 				// no comment?
 				$info['warning'][] = 'Blank Ogg comment ['.$i.']';
@@ -686,7 +686,7 @@ 
 					$this->notice('Found deprecated COVERART tag, it should be replaced in honor of METADATA_BLOCK_PICTURE structure');
 					/** @todo use 'coverartmime' where available */
 					$imageinfo = getid3_lib::GetDataImageSize($data);
-					if ($imageinfo === false || !isset($imageinfo['mime'])) {
+					if ($imageinfo === false || ! isset($imageinfo['mime'])) {
 						$this->warning('COVERART vorbiscomment tag contains invalid image');
 						continue;
 					}
@@ -775,7 +775,7 @@ 
 	}
 
 
-	public static function OggPageSegmentLength($OggInfoArray, $SegmentNumber=1) {
+	public static function OggPageSegmentLength($OggInfoArray, $SegmentNumber = 1) {
 		for ($i = 0; $i < $SegmentNumber; $i++) {
 			$segmentlength = 0;
 			foreach ($OggInfoArray['segment_table'] as $key => $value) {

Braces +1 added lines, -2 removed lines

@@ -547,8 +547,7 @@
 
 				if ($info['audio']['dataformat'] == 'vorbis') {
 					$commentdataoffset += (strlen('vorbis') + 1);
-				}
-				else if ($info['audio']['dataformat'] == 'opus') {
+				} else if ($info['audio']['dataformat'] == 'opus') {
 					$commentdataoffset += strlen('OpusTags');
 				}
 

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

Doc Comments +3 added lines

@@ -331,6 +331,9 @@
 		return true;
 	}
 
+	/**
+	 * @param string $APEheaderFooterData
+	 */
 	public function parseAPEheaderFooter($APEheaderFooterData) {
 		// http://www.uni-jena.de/~pfk/mpp/sv8/apeheader.html
 

Spacing +11 added lines, -11 removed lines

@@ -22,7 +22,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 APEtags because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
 			return false;
 		}
@@ -58,7 +58,7 @@ 
 			}
 
 		}
-		if (!isset($info['ape']['tag_offset_end'])) {
+		if ( ! isset($info['ape']['tag_offset_end'])) {
 
 			// APE tag not found
 			unset($info['ape']);
@@ -71,7 +71,7 @@ 
 
 		$this->fseek($thisfile_ape['tag_offset_end'] - $apetagheadersize);
 		$APEfooterData = $this->fread(32);
-		if (!($thisfile_ape['footer'] = $this->parseAPEheaderFooter($APEfooterData))) {
+		if ( ! ($thisfile_ape['footer'] = $this->parseAPEheaderFooter($APEfooterData))) {
 			$info['error'][] = 'Error parsing APE footer at offset '.$thisfile_ape['tag_offset_end'];
 			return false;
 		}
@@ -282,7 +282,7 @@ 
 							}
 						} elseif (is_string($this->inline_attachments)) {
 							$this->inline_attachments = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->inline_attachments), DIRECTORY_SEPARATOR);
-							if (!is_dir($this->inline_attachments) || !is_writable($this->inline_attachments)) {
+							if ( ! is_dir($this->inline_attachments) || ! is_writable($this->inline_attachments)) {
 								// cannot write, skip
 								$info['warning'][] = 'attachment at '.$thisfile_ape_items_current['offset'].' cannot be saved to "'.$this->inline_attachments.'" (not writable)';
 								unset($thisfile_ape_items_current['data']);
@@ -292,7 +292,7 @@ 
 						// if we get this far, must be OK
 						if (is_string($this->inline_attachments)) {
 							$destination_filename = $this->inline_attachments.DIRECTORY_SEPARATOR.md5($info['filenamepath']).'_'.$thisfile_ape_items_current['data_offset'];
-							if (!file_exists($destination_filename) || is_writable($destination_filename)) {
+							if ( ! file_exists($destination_filename) || is_writable($destination_filename)) {
 								file_put_contents($destination_filename, $thisfile_ape_items_current['data']);
 							} else {
 								$info['warning'][] = 'attachment at '.$thisfile_ape_items_current['offset'].' cannot be saved to "'.$destination_filename.'" (not writable)';
@@ -300,7 +300,7 @@ 
 							$thisfile_ape_items_current['data_filename'] = $destination_filename;
 							unset($thisfile_ape_items_current['data']);
 						} else {
-							if (!isset($info['ape']['comments']['picture'])) {
+							if ( ! isset($info['ape']['comments']['picture'])) {
 								$info['ape']['comments']['picture'] = array();
 							}
 							$comments_picture_data = array();
@@ -338,17 +338,17 @@ 
 		$headerfooterinfo['raw'] = array();
 		$headerfooterinfo_raw = &$headerfooterinfo['raw'];
 
-		$headerfooterinfo_raw['footer_tag']   =                  substr($APEheaderFooterData,  0, 8);
+		$headerfooterinfo_raw['footer_tag'] = substr($APEheaderFooterData, 0, 8);
 		if ($headerfooterinfo_raw['footer_tag'] != 'APETAGEX') {
 			return false;
 		}
-		$headerfooterinfo_raw['version']      = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData,  8, 4));
+		$headerfooterinfo_raw['version']      = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData, 8, 4));
 		$headerfooterinfo_raw['tagsize']      = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData, 12, 4));
 		$headerfooterinfo_raw['tag_items']    = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData, 16, 4));
 		$headerfooterinfo_raw['global_flags'] = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData, 20, 4));
-		$headerfooterinfo_raw['reserved']     =                              substr($APEheaderFooterData, 24, 8);
+		$headerfooterinfo_raw['reserved']     = substr($APEheaderFooterData, 24, 8);
 
-		$headerfooterinfo['tag_version']         = $headerfooterinfo_raw['version'] / 1000;
+		$headerfooterinfo['tag_version'] = $headerfooterinfo_raw['version'] / 1000;
 		if ($headerfooterinfo['tag_version'] >= 2) {
 			$headerfooterinfo['flags'] = $this->parseAPEtagFlags($headerfooterinfo_raw['global_flags']);
 		}
@@ -362,7 +362,7 @@ 
 		$flags['header']            = (bool) ($rawflagint & 0x80000000);
 		$flags['footer']            = (bool) ($rawflagint & 0x40000000);
 		$flags['this_is_header']    = (bool) ($rawflagint & 0x20000000);
-		$flags['item_contents_raw'] =        ($rawflagint & 0x00000006) >> 1;
+		$flags['item_contents_raw'] = ($rawflagint & 0x00000006) >> 1;
 		$flags['read_only']         = (bool) ($rawflagint & 0x00000001);
 
 		$flags['item_contents']     = $this->APEcontentTypeFlagLookup($flags['item_contents_raw']);

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

Doc Comments +27 added lines

@@ -2596,6 +2596,9 @@ 
 
 
 
+	/**
+	 * @param string $languagecode
+	 */
 	public static function LanguageLookup($languagecode, $casesensitive=false) {
 
 		if (!$casesensitive) {
@@ -3052,6 +3055,9 @@ 
 	}
 
 
+	/**
+	 * @param string $index
+	 */
 	public static function ETCOEventLookup($index) {
 		if (($index >= 0x17) && ($index <= 0xDF)) {
 			return 'reserved for future use';
@@ -3095,6 +3101,9 @@ 
 		return (isset($EventLookup[$index]) ? $EventLookup[$index] : '');
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	public static function SYTLContentTypeLookup($index) {
 		static $SYTLContentTypeLookup = array(
 			0x00 => 'other',
@@ -3111,6 +3120,9 @@ 
 		return (isset($SYTLContentTypeLookup[$index]) ? $SYTLContentTypeLookup[$index] : '');
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	public static function APICPictureTypeLookup($index, $returnarray=false) {
 		static $APICPictureTypeLookup = array(
 			0x00 => 'Other',
@@ -3141,6 +3153,9 @@ 
 		return (isset($APICPictureTypeLookup[$index]) ? $APICPictureTypeLookup[$index] : '');
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	public static function COMRReceivedAsLookup($index) {
 		static $COMRReceivedAsLookup = array(
 			0x00 => 'Other',
@@ -3157,6 +3172,9 @@ 
 		return (isset($COMRReceivedAsLookup[$index]) ? $COMRReceivedAsLookup[$index] : '');
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	public static function RVA2ChannelTypeLookup($index) {
 		static $RVA2ChannelTypeLookup = array(
 			0x00 => 'Other',
@@ -3536,6 +3554,9 @@ 
 		return getid3_lib::EmbeddedLookup($framename, $begin, __LINE__, __FILE__, 'id3v2-framename_short');
 	}
 
+	/**
+	 * @param integer $encoding
+	 */
 	public static function TextEncodingTerminatorLookup($encoding) {
 		// http://www.id3.org/id3v2.4.0-structure.txt
 		// Frames that allow different types of text encoding contains a text encoding description byte. Possible encodings:
@@ -3562,6 +3583,9 @@ 
 		return (isset($TextEncodingNameLookup[$encoding]) ? $TextEncodingNameLookup[$encoding] : 'ISO-8859-1');
 	}
 
+	/**
+	 * @param string $framename
+	 */
 	public static function IsValidID3v2FrameName($framename, $id3v2majorversion) {
 		switch ($id3v2majorversion) {
 			case 2:
@@ -3591,6 +3615,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $datestamp
+	 */
 	public static function IsValidDateStampString($datestamp) {
 		if (strlen($datestamp) != 8) {
 			return false;

Indentation +9 added lines, -14 removed lines

@@ -1972,9 +1972,9 @@ 
 			// Element ID      <text string> $00
 			// Start time      $xx xx xx xx
 			// End time        $xx xx xx xx
-            // Start offset    $xx xx xx xx
-            // End offset      $xx xx xx xx
-            // <Optional embedded sub-frames>
+			// Start offset    $xx xx xx xx
+			// End offset      $xx xx xx xx
+			// <Optional embedded sub-frames>
 
 			$frame_offset = 0;
 			@list($parsedFrame['element_id']) = explode("\x00", $parsedFrame['data'], 2);
@@ -2069,7 +2069,7 @@ 
 			// CTOC flags        %xx
 			// Entry count       $xx
 			// Child Element ID  <string>$00   /* zero or more child CHAP or CTOC entries */
-            // <Optional embedded sub-frames>
+			// <Optional embedded sub-frames>
 
 			$frame_offset = 0;
 			@list($parsedFrame['element_id']) = explode("\x00", $parsedFrame['data'], 2);
@@ -2392,8 +2392,7 @@ 
 			ZAR	Rand
 			ZMK	Kwacha
 			ZWD	Zimbabwe Dollars
-
-		*/
+		 */
 
 		return getid3_lib::EmbeddedLookup($currencyid, $begin, __LINE__, __FILE__, 'id3v2-currency-units');
 	}
@@ -2588,8 +2587,7 @@ 
 			ZAR	South Africa
 			ZMK	Zambia
 			ZWD	Zimbabwe
-
-		*/
+		 */
 
 		return getid3_lib::EmbeddedLookup($currencyid, $begin, __LINE__, __FILE__, 'id3v2-currency-country');
 	}
@@ -3045,8 +3043,7 @@ 
 			zho	Chinese
 			zul	Zulu
 			zun	Zuni
-
-		*/
+		 */
 
 		return getid3_lib::EmbeddedLookup($languagecode, $begin, __LINE__, __FILE__, 'id3v2-languagecode');
 	}
@@ -3346,8 +3343,7 @@ 
 			TFEA	Featured Artist
 			TSTU	Recording Studio
 			rgad	Replay Gain Adjustment
-
-		*/
+		 */
 
 		return getid3_lib::EmbeddedLookup($framename, $begin, __LINE__, __FILE__, 'id3v2-framename_long');
 
@@ -3530,8 +3526,7 @@ 
 			TFEA	featured_artist
 			TSTU	recording_studio
 			rgad	replay_gain_adjustment
-
-		*/
+		 */
 
 		return getid3_lib::EmbeddedLookup($framename, $begin, __LINE__, __FILE__, 'id3v2-framename_short');
 	}

Spacing +63 added lines, -63 removed lines

@@ -48,13 +48,13 @@ 
 		// shortcuts
 		$info['id3v2']['header'] = true;
 		$thisfile_id3v2                  = &$info['id3v2'];
-		$thisfile_id3v2['flags']         =  array();
+		$thisfile_id3v2['flags']         = array();
 		$thisfile_id3v2_flags            = &$thisfile_id3v2['flags'];
 
 
 		$this->fseek($this->StartingOffset);
 		$header = $this->fread(10);
-		if (substr($header, 0, 3) == 'ID3'  &&  strlen($header) == 10) {
+		if (substr($header, 0, 3) == 'ID3' && strlen($header) == 10) {
 
 			$thisfile_id3v2['majorversion'] = ord($header{3});
 			$thisfile_id3v2['minorversion'] = ord($header{4});
@@ -124,10 +124,10 @@ 
 	//        Flags         $xx xx
 
 		$sizeofframes = $thisfile_id3v2['headerlength'] - 10; // not including 10-byte initial header
-		if (!empty($thisfile_id3v2['exthead']['length'])) {
+		if ( ! empty($thisfile_id3v2['exthead']['length'])) {
 			$sizeofframes -= ($thisfile_id3v2['exthead']['length'] + 4);
 		}
-		if (!empty($thisfile_id3v2_flags['isfooter'])) {
+		if ( ! empty($thisfile_id3v2_flags['isfooter'])) {
 			$sizeofframes -= 10; // footer takes last 10 bytes of ID3v2 header, after frame data, before audio
 		}
 		if ($sizeofframes > 0) {
@@ -135,7 +135,7 @@ 
 			$framedata = $this->fread($sizeofframes); // read all frames from file into $framedata variable
 
 			//    if entire frame data is unsynched, de-unsynch it now (ID3v2.3.x)
-			if (!empty($thisfile_id3v2_flags['unsynch']) && ($id3v2_majorversion <= 3)) {
+			if ( ! empty($thisfile_id3v2_flags['unsynch']) && ($id3v2_majorversion <= 3)) {
 				$framedata = $this->DeUnsynchronise($framedata);
 			}
 			//        [in ID3v2.4.0] Unsynchronisation [S:6.1] is done on frame level, instead
@@ -150,7 +150,7 @@ 
 
 
 			//    Extended Header
-			if (!empty($thisfile_id3v2_flags['exthead'])) {
+			if ( ! empty($thisfile_id3v2_flags['exthead'])) {
 				$extended_header_offset = 0;
 
 				if ($id3v2_majorversion == 3) {
@@ -272,7 +272,7 @@ 
 					// Flags     $xx xx
 
 					$frame_header = substr($framedata, 0, 6); // take next 6 bytes for header
-					$framedata    = substr($framedata, 6);    // and leave the rest in $framedata
+					$framedata    = substr($framedata, 6); // and leave the rest in $framedata
 					$frame_name   = substr($frame_header, 0, 3);
 					$frame_size   = getid3_lib::BigEndian2Int(substr($frame_header, 3, 3), 0);
 					$frame_flags  = 0; // not used for anything in ID3v2.2, just set to avoid E_NOTICEs
@@ -284,7 +284,7 @@ 
 					// Flags     $xx xx
 
 					$frame_header = substr($framedata, 0, 10); // take next 10 bytes for header
-					$framedata    = substr($framedata, 10);    // and leave the rest in $framedata
+					$framedata    = substr($framedata, 10); // and leave the rest in $framedata
 
 					$frame_name = substr($frame_header, 0, 4);
 					if ($id3v2_majorversion == 3) {
@@ -379,7 +379,7 @@ 
 						$info['warning'][] = 'Invalid ID3v2 frame size, aborting.';
 
 					}
-					if (!$this->IsValidID3v2FrameName($frame_name, $id3v2_majorversion)) {
+					if ( ! $this->IsValidID3v2FrameName($frame_name, $id3v2_majorversion)) {
 
 						switch ($frame_name) {
 							case "\x00\x00".'MP':
@@ -397,7 +397,7 @@ 
 								break;
 						}
 
-					} elseif (!isset($framedata) || ($frame_size > strlen($framedata))) {
+					} elseif ( ! isset($framedata) || ($frame_size > strlen($framedata))) {
 
 						$info['error'][] = 'error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: $frame_size ('.$frame_size.') > strlen($framedata) ('.(isset($framedata) ? strlen($framedata) : 'null').')).';
 
@@ -456,27 +456,27 @@ 
 			}
 		}
 
-		if (!isset($thisfile_id3v2['comments']['year']) && !empty($thisfile_id3v2['comments']['recording_time'][0]) && preg_match('#^([0-9]{4})#', trim($thisfile_id3v2['comments']['recording_time'][0]), $matches)) {
+		if ( ! isset($thisfile_id3v2['comments']['year']) && ! empty($thisfile_id3v2['comments']['recording_time'][0]) && preg_match('#^([0-9]{4})#', trim($thisfile_id3v2['comments']['recording_time'][0]), $matches)) {
 			$thisfile_id3v2['comments']['year'] = array($matches[1]);
 		}
 
 
-		if (!empty($thisfile_id3v2['TXXX'])) {
+		if ( ! empty($thisfile_id3v2['TXXX'])) {
 			// MediaMonkey does this, maybe others: write a blank RGAD frame, but put replay-gain adjustment values in TXXX frames
 			foreach ($thisfile_id3v2['TXXX'] as $txxx_array) {
 				switch ($txxx_array['description']) {
 					case 'replaygain_track_gain':
-						if (empty($info['replay_gain']['track']['adjustment']) && !empty($txxx_array['data'])) {
+						if (empty($info['replay_gain']['track']['adjustment']) && ! empty($txxx_array['data'])) {
 							$info['replay_gain']['track']['adjustment'] = floatval(trim(str_replace('dB', '', $txxx_array['data'])));
 						}
 						break;
 					case 'replaygain_track_peak':
-						if (empty($info['replay_gain']['track']['peak']) && !empty($txxx_array['data'])) {
+						if (empty($info['replay_gain']['track']['peak']) && ! empty($txxx_array['data'])) {
 							$info['replay_gain']['track']['peak'] = floatval($txxx_array['data']);
 						}
 						break;
 					case 'replaygain_album_gain':
-						if (empty($info['replay_gain']['album']['adjustment']) && !empty($txxx_array['data'])) {
+						if (empty($info['replay_gain']['album']['adjustment']) && ! empty($txxx_array['data'])) {
 							$info['replay_gain']['album']['adjustment'] = floatval(trim(str_replace('dB', '', $txxx_array['data'])));
 						}
 						break;
@@ -524,7 +524,7 @@ 
 		$info = &$this->getid3->info;
 		$id3v2_majorversion = $info['id3v2']['majorversion'];
 
-		$parsedFrame['framenamelong']  = $this->FrameNameLongLookup($parsedFrame['frame_name']);
+		$parsedFrame['framenamelong'] = $this->FrameNameLongLookup($parsedFrame['frame_name']);
 		if (empty($parsedFrame['framenamelong'])) {
 			unset($parsedFrame['framenamelong']);
 		}
@@ -563,14 +563,14 @@ 
 
 				if ($parsedFrame['flags']['DataLengthIndicator']) {
 					$parsedFrame['data_length_indicator'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 0, 4), 1);
-					$parsedFrame['data']                  =                           substr($parsedFrame['data'], 4);
+					$parsedFrame['data']                  = substr($parsedFrame['data'], 4);
 				}
 			}
 
 			//    Frame-level de-compression
 			if ($parsedFrame['flags']['compression']) {
 				$parsedFrame['decompressed_size'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 0, 4));
-				if (!function_exists('gzuncompress')) {
+				if ( ! function_exists('gzuncompress')) {
 					$info['warning'][] = 'gzuncompress() support required to decompress ID3v2 frame "'.$parsedFrame['frame_name'].'"';
 				} else {
 					if ($decompresseddata = @gzuncompress(substr($parsedFrame['data'], 4))) {
@@ -584,7 +584,7 @@ 
 			}
 		}
 
-		if (!empty($parsedFrame['flags']['DataLengthIndicator'])) {
+		if ( ! empty($parsedFrame['flags']['DataLengthIndicator'])) {
 			if ($parsedFrame['data_length_indicator'] != strlen($parsedFrame['data'])) {
 				$info['warning'][] = 'ID3v2 frame "'.$parsedFrame['frame_name'].'" should be '.$parsedFrame['data_length_indicator'].' bytes long according to DataLengthIndicator, but found '.strlen($parsedFrame['data']).' bytes of data';
 			}
@@ -643,9 +643,9 @@ 
 
 			$parsedFrame['description'] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $frame_description));
 			$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+			if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
 				$commentkey = ($parsedFrame['description'] ? $parsedFrame['description'] : (isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) ? count($info['id3v2']['comments'][$parsedFrame['framenameshort']]) : 0));
-				if (!isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || !array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) {
+				if ( ! isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || ! array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) {
 					$info['id3v2']['comments'][$parsedFrame['framenameshort']][$commentkey] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']));
 				} else {
 					$info['id3v2']['comments'][$parsedFrame['framenameshort']][]            = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']));
@@ -672,7 +672,7 @@ 
 			$parsedFrame['encodingid'] = $frame_textencoding;
 			$parsedFrame['encoding']   = $this->TextEncodingNameLookup($frame_textencoding);
 
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+			if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
 				// ID3v2.3 specs say that TPE1 (and others) can contain multiple artist values separated with /
 				// This of course breaks when an artist name contains slash character, e.g. "AC/DC"
 				// MP3tag (maybe others) implement alternative system where multiple artists are null-separated, which makes more sense
@@ -700,7 +700,7 @@ 
 				$Txxx_elements[] = substr($parsedFrame['data'], $Txxx_elements_start_offset, $i - $Txxx_elements_start_offset);
 				foreach ($Txxx_elements as $Txxx_element) {
 					$string = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $Txxx_element);
-					if (!empty($string)) {
+					if ( ! empty($string)) {
 						$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $string;
 					}
 				}
@@ -752,7 +752,7 @@ 
 
 			$parsedFrame['url']         = $frame_urldata;
 			$parsedFrame['description'] = $frame_description;
-			if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
+			if ( ! empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['url']);
 			}
 			unset($parsedFrame['data']);
@@ -766,7 +766,7 @@ 
 			// URL              <text string>
 
 			$parsedFrame['url'] = trim($parsedFrame['data']);
-			if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
+			if ( ! empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $parsedFrame['url'];
 			}
 			unset($parsedFrame['data']);
@@ -847,7 +847,7 @@ 
 			}
 			$parsedFrame['data'] = $IPLS_parts;
 
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+			if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $parsedFrame['data'];
 			}
 
@@ -858,7 +858,7 @@ 
 			// <Header for 'Music CD identifier', ID: 'MCDI'>
 			// CD TOC                <binary data>
 
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+			if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $parsedFrame['data'];
 			}
 
@@ -983,7 +983,7 @@ 
 			$parsedFrame['language']     = $frame_language;
 			$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
 			$parsedFrame['description']  = $frame_description;
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+			if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
 			}
 			unset($parsedFrame['data']);
@@ -1091,9 +1091,9 @@ 
 				$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
 				$parsedFrame['description']  = $frame_description;
 				$parsedFrame['data']         = $frame_text;
-				if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-					$commentkey = ($parsedFrame['description'] ? $parsedFrame['description'] : (!empty($info['id3v2']['comments'][$parsedFrame['framenameshort']]) ? count($info['id3v2']['comments'][$parsedFrame['framenameshort']]) : 0));
-					if (!isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || !array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) {
+				if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
+					$commentkey = ($parsedFrame['description'] ? $parsedFrame['description'] : ( ! empty($info['id3v2']['comments'][$parsedFrame['framenameshort']]) ? count($info['id3v2']['comments'][$parsedFrame['framenameshort']]) : 0));
+					if ( ! isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || ! array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) {
 						$info['id3v2']['comments'][$parsedFrame['framenameshort']][$commentkey] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
 					} else {
 						$info['id3v2']['comments'][$parsedFrame['framenameshort']][]            = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
@@ -1136,7 +1136,7 @@ 
 					break;
 				}
 				$frame_bytespeakvolume = ceil($parsedFrame[$RVA2channelcounter]['bitspeakvolume'] / 8);
-				$parsedFrame[$RVA2channelcounter]['peakvolume']     = getid3_lib::BigEndian2Int(substr($frame_remainingdata, $frame_offset, $frame_bytespeakvolume));
+				$parsedFrame[$RVA2channelcounter]['peakvolume'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, $frame_offset, $frame_bytespeakvolume));
 				$frame_remainingdata = substr($frame_remainingdata, $frame_offset + $frame_bytespeakvolume);
 				$RVA2channelcounter++;
 			}
@@ -1404,7 +1404,7 @@ 
 				$imageinfo = array();
 				$imagechunkcheck = getid3_lib::GetDataImageSize($parsedFrame['data'], $imageinfo);
 				if (($imagechunkcheck[2] >= 1) && ($imagechunkcheck[2] <= 3)) {
-					$parsedFrame['image_mime']       = 'image/'.getid3_lib::ImageTypesLookup($imagechunkcheck[2]);
+					$parsedFrame['image_mime'] = 'image/'.getid3_lib::ImageTypesLookup($imagechunkcheck[2]);
 					if ($imagechunkcheck[0]) {
 						$parsedFrame['image_width']  = $imagechunkcheck[0];
 					}
@@ -1432,7 +1432,7 @@ 
 */
 					} elseif (is_string($this->getid3->option_save_attachments)) {
 						$dir = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->getid3->option_save_attachments), DIRECTORY_SEPARATOR);
-						if (!is_dir($dir) || !is_writable($dir)) {
+						if ( ! is_dir($dir) || ! is_writable($dir)) {
 							// cannot write, skip
 							$info['warning'][] = 'attachment at '.$frame_offset.' cannot be saved to "'.$dir.'" (not writable)';
 							unset($parsedFrame['data']);
@@ -1442,7 +1442,7 @@ 
 					// if we get this far, must be OK
 					if (is_string($this->getid3->option_save_attachments)) {
 						$destination_filename = $dir.DIRECTORY_SEPARATOR.md5($info['filenamepath']).'_'.$frame_offset;
-						if (!file_exists($destination_filename) || is_writable($destination_filename)) {
+						if ( ! file_exists($destination_filename) || is_writable($destination_filename)) {
 							file_put_contents($destination_filename, $parsedFrame['data']);
 						} else {
 							$info['warning'][] = 'attachment at '.$frame_offset.' cannot be saved to "'.$destination_filename.'" (not writable)';
@@ -1450,8 +1450,8 @@ 
 						$parsedFrame['data_filename'] = $destination_filename;
 						unset($parsedFrame['data']);
 					} else {
-						if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-							if (!isset($info['id3v2']['comments']['picture'])) {
+						if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
+							if ( ! isset($info['id3v2']['comments']['picture'])) {
 								$info['id3v2']['comments']['picture'] = array();
 							}
 							$comments_picture_data = array();
@@ -1530,7 +1530,7 @@ 
 			// <Header for 'Play counter', ID: 'PCNT'>
 			// Counter        $xx xx xx xx (xx ...)
 
-			$parsedFrame['data']          = getid3_lib::BigEndian2Int($parsedFrame['data']);
+			$parsedFrame['data'] = getid3_lib::BigEndian2Int($parsedFrame['data']);
 
 
 		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'POPM')) || // 4.17  POPM Popularimeter
@@ -1654,7 +1654,7 @@ 
 			$parsedFrame['url'] = $frame_url;
 
 			$parsedFrame['additionaldata'] = (string) substr($parsedFrame['data'], $frame_offset);
-			if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
+			if ( ! empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback_iso88591_utf8($parsedFrame['url']);
 			}
 			unset($parsedFrame['data']);
@@ -1693,7 +1693,7 @@ 
 			$parsedFrame['encoding']     = $this->TextEncodingNameLookup($frame_textencoding);
 
 			$parsedFrame['data']         = (string) substr($parsedFrame['data'], $frame_offset);
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+			if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
 			}
 			unset($parsedFrame['data']);
@@ -1724,8 +1724,8 @@ 
 			$parsedFrame['pricepaid']['value']      = substr($frame_pricepaid, 3);
 
 			$parsedFrame['purchasedate'] = substr($parsedFrame['data'], $frame_offset, 8);
-			if (!$this->IsValidDateStampString($parsedFrame['purchasedate'])) {
-				$parsedFrame['purchasedateunix'] = mktime (0, 0, 0, substr($parsedFrame['purchasedate'], 4, 2), substr($parsedFrame['purchasedate'], 6, 2), substr($parsedFrame['purchasedate'], 0, 4));
+			if ( ! $this->IsValidDateStampString($parsedFrame['purchasedate'])) {
+				$parsedFrame['purchasedateunix'] = mktime(0, 0, 0, substr($parsedFrame['purchasedate'], 4, 2), substr($parsedFrame['purchasedate'], 6, 2), substr($parsedFrame['purchasedate'], 0, 4));
 			}
 			$frame_offset += 8;
 
@@ -1896,7 +1896,7 @@ 
 			// Minimum offset to next tag       $xx xx xx xx
 
 			$frame_offset = 0;
-			$parsedFrame['data']          = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+			$parsedFrame['data'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
 
 
 		} elseif (($id3v2_majorversion >= 4) && ($parsedFrame['frame_name'] == 'ASPI')) { // 4.30  ASPI Audio seek point index (ID3v2.4+ only)
@@ -1990,7 +1990,7 @@ 
 			$frame_offset += 4;
 			if (substr($parsedFrame['data'], $frame_offset, 4) != "\xFF\xFF\xFF\xFF") {
 				// "If these bytes are all set to 0xFF then the value should be ignored and the start time value should be utilized."
-				$parsedFrame['offset_end']   = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+				$parsedFrame['offset_end'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
 			}
 			$frame_offset += 4;
 
@@ -1999,7 +1999,7 @@ 
 				while ($frame_offset < strlen($parsedFrame['data'])) {
 					// <Optional embedded sub-frames>
 					$subframe = array();
-					$subframe['name']      =                           substr($parsedFrame['data'], $frame_offset, 4);
+					$subframe['name']      = substr($parsedFrame['data'], $frame_offset, 4);
 					$frame_offset += 4;
 					$subframe['size']      = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
 					$frame_offset += 4;
@@ -2013,9 +2013,9 @@ 
 					$frame_offset += $subframe['size'];
 
 					$subframe['encodingid'] = ord(substr($subframe_rawdata, 0, 1));
-					$subframe['text']       =     substr($subframe_rawdata, 1);
+					$subframe['text']       = substr($subframe_rawdata, 1);
 					$subframe['encoding']   = $this->TextEncodingNameLookup($subframe['encodingid']);
-					$encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text']));;
+					$encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text'])); ;
 					switch (substr($encoding_converted_text, 0, 2)) {
 						case "\xFF\xFE":
 						case "\xFE\xFF":
@@ -2055,7 +2055,7 @@ 
 					$id3v2_chapter_entry[$id3v2_chapter_key] = $parsedFrame[$id3v2_chapter_key];
 				}
 			}
-			if (!isset($info['id3v2']['chapters'])) {
+			if ( ! isset($info['id3v2']['chapters'])) {
 				$info['id3v2']['chapters'] = array();
 			}
 			$info['id3v2']['chapters'][] = $id3v2_chapter_entry;
@@ -2096,7 +2096,7 @@ 
 				while ($frame_offset < strlen($parsedFrame['data'])) {
 					// <Optional embedded sub-frames>
 					$subframe = array();
-					$subframe['name']      =                           substr($parsedFrame['data'], $frame_offset, 4);
+					$subframe['name']      = substr($parsedFrame['data'], $frame_offset, 4);
 					$frame_offset += 4;
 					$subframe['size']      = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
 					$frame_offset += 4;
@@ -2110,9 +2110,9 @@ 
 					$frame_offset += $subframe['size'];
 
 					$subframe['encodingid'] = ord(substr($subframe_rawdata, 0, 1));
-					$subframe['text']       =     substr($subframe_rawdata, 1);
+					$subframe['text']       = substr($subframe_rawdata, 1);
 					$subframe['encoding']   = $this->TextEncodingNameLookup($subframe['encodingid']);
-					$encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text']));;
+					$encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text'])); ;
 					switch (substr($encoding_converted_text, 0, 2)) {
 						case "\xFF\xFE":
 						case "\xFE\xFF":
@@ -2596,9 +2596,9 @@ 
 
 
 
-	public static function LanguageLookup($languagecode, $casesensitive=false) {
+	public static function LanguageLookup($languagecode, $casesensitive = false) {
 
-		if (!$casesensitive) {
+		if ( ! $casesensitive) {
 			$languagecode = strtolower($languagecode);
 		}
 
@@ -3101,8 +3101,8 @@ 
 			0x01 => 'lyrics',
 			0x02 => 'text transcription',
 			0x03 => 'movement/part name', // (e.g. 'Adagio')
-			0x04 => 'events',             // (e.g. 'Don Quijote enters the stage')
-			0x05 => 'chord',              // (e.g. 'Bb F Fsus')
+			0x04 => 'events', // (e.g. 'Don Quijote enters the stage')
+			0x05 => 'chord', // (e.g. 'Bb F Fsus')
 			0x06 => 'trivia/\'pop up\' information',
 			0x07 => 'URLs to webpages',
 			0x08 => 'URLs to images'
@@ -3111,7 +3111,7 @@ 
 		return (isset($SYTLContentTypeLookup[$index]) ? $SYTLContentTypeLookup[$index] : '');
 	}
 
-	public static function APICPictureTypeLookup($index, $returnarray=false) {
+	public static function APICPictureTypeLookup($index, $returnarray = false) {
 		static $APICPictureTypeLookup = array(
 			0x00 => 'Other',
 			0x01 => '32x32 pixels \'file icon\' (PNG only)',
@@ -3540,10 +3540,10 @@ 
 		// http://www.id3.org/id3v2.4.0-structure.txt
 		// Frames that allow different types of text encoding contains a text encoding description byte. Possible encodings:
 		static $TextEncodingTerminatorLookup = array(
-			0   => "\x00",     // $00  ISO-8859-1. Terminated with $00.
+			0   => "\x00", // $00  ISO-8859-1. Terminated with $00.
 			1   => "\x00\x00", // $01  UTF-16 encoded Unicode with BOM. All strings in the same frame SHALL have the same byteorder. Terminated with $00 00.
 			2   => "\x00\x00", // $02  UTF-16BE encoded Unicode without BOM. Terminated with $00 00.
-			3   => "\x00",     // $03  UTF-8 encoded Unicode. Terminated with $00.
+			3   => "\x00", // $03  UTF-8 encoded Unicode. Terminated with $00.
 			255 => "\x00\x00"
 		);
 		return (isset($TextEncodingTerminatorLookup[$encoding]) ? $TextEncodingTerminatorLookup[$encoding] : "\x00");
@@ -3554,9 +3554,9 @@ 
 		// Frames that allow different types of text encoding contains a text encoding description byte. Possible encodings:
 		static $TextEncodingNameLookup = array(
 			0   => 'ISO-8859-1', // $00  ISO-8859-1. Terminated with $00.
-			1   => 'UTF-16',     // $01  UTF-16 encoded Unicode with BOM. All strings in the same frame SHALL have the same byteorder. Terminated with $00 00.
-			2   => 'UTF-16BE',   // $02  UTF-16BE encoded Unicode without BOM. Terminated with $00 00.
-			3   => 'UTF-8',      // $03  UTF-8 encoded Unicode. Terminated with $00.
+			1   => 'UTF-16', // $01  UTF-16 encoded Unicode with BOM. All strings in the same frame SHALL have the same byteorder. Terminated with $00 00.
+			2   => 'UTF-16BE', // $02  UTF-16BE encoded Unicode without BOM. Terminated with $00 00.
+			3   => 'UTF-8', // $03  UTF-8 encoded Unicode. Terminated with $00.
 			255 => 'UTF-16BE'
 		);
 		return (isset($TextEncodingNameLookup[$encoding]) ? $TextEncodingNameLookup[$encoding] : 'ISO-8859-1');
@@ -3576,7 +3576,7 @@ 
 		return false;
 	}
 
-	public static function IsANumber($numberstring, $allowdecimal=false, $allownegative=false) {
+	public static function IsANumber($numberstring, $allowdecimal = false, $allownegative = false) {
 		for ($i = 0; $i < strlen($numberstring); $i++) {
 			if ((chr($numberstring{$i}) < chr('0')) || (chr($numberstring{$i}) > chr('9'))) {
 				if (($numberstring{$i} == '.') && $allowdecimal) {
@@ -3595,7 +3595,7 @@ 
 		if (strlen($datestamp) != 8) {
 			return false;
 		}
-		if (!self::IsANumber($datestamp, false)) {
+		if ( ! self::IsANumber($datestamp, false)) {
 			return false;
 		}
 		$year  = substr($datestamp, 0, 4);

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

Doc Comments +6 added lines

@@ -126,6 +126,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param integer $version
+	 */
 	public function getLyrics3Data($endoffset, $version, $length) {
 		// http://www.volweb.cz/str/tags.htm
 
@@ -287,6 +290,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $char
+	 */
 	public function IntString2Bool($char) {
 		if ($char == '1') {
 			return true;

Spacing +10 added lines, -10 removed lines

@@ -23,15 +23,15 @@ 
 
 		// http://www.volweb.cz/str/tags.htm
 
-		if (!getid3_lib::intValueSupported($info['filesize'])) {
+		if ( ! getid3_lib::intValueSupported($info['filesize'])) {
 			$info['warning'][] = 'Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
 			return false;
 		}
 
-		$this->fseek((0 - 128 - 9 - 6), SEEK_END);          // end - ID3v1 - "LYRICSEND" - [Lyrics3size]
+		$this->fseek((0 - 128 - 9 - 6), SEEK_END); // end - ID3v1 - "LYRICSEND" - [Lyrics3size]
 		$lyrics3_id3v1 = $this->fread(128 + 9 + 6);
-		$lyrics3lsz    = substr($lyrics3_id3v1,  0,   6); // Lyrics3size
-		$lyrics3end    = substr($lyrics3_id3v1,  6,   9); // LYRICSEND or LYRICS200
+		$lyrics3lsz    = substr($lyrics3_id3v1, 0, 6); // Lyrics3size
+		$lyrics3end    = substr($lyrics3_id3v1, 6, 9); // LYRICSEND or LYRICS200
 		$id3v1tag      = substr($lyrics3_id3v1, 15, 128); // ID3v1
 
 		if ($lyrics3end == 'LYRICSEND') {
@@ -100,7 +100,7 @@ 
 			$info['avdataend'] = $lyrics3offset;
 			$this->getLyrics3Data($lyrics3offset, $lyrics3version, $lyrics3size);
 
-			if (!isset($info['ape'])) {
+			if ( ! isset($info['ape'])) {
 				if (isset($info['lyrics3']['tag_offset_start'])) {
 					$GETID3_ERRORARRAY = &$info['warning'];
 					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, true);
@@ -109,10 +109,10 @@ 
 					$getid3_apetag = new getid3_apetag($getid3_temp);
 					$getid3_apetag->overrideendoffset = $info['lyrics3']['tag_offset_start'];
 					$getid3_apetag->Analyze();
-					if (!empty($getid3_temp->info['ape'])) {
+					if ( ! empty($getid3_temp->info['ape'])) {
 						$info['ape'] = $getid3_temp->info['ape'];
 					}
-					if (!empty($getid3_temp->info['replay_gain'])) {
+					if ( ! empty($getid3_temp->info['replay_gain'])) {
 						$info['replay_gain'] = $getid3_temp->info['replay_gain'];
 					}
 					unset($getid3_temp, $getid3_apetag);
@@ -131,7 +131,7 @@ 
 
 		$info = &$this->getid3->info;
 
-		if (!getid3_lib::intValueSupported($endoffset)) {
+		if ( ! getid3_lib::intValueSupported($endoffset)) {
 			$info['warning'][] = 'Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
 			return false;
 		}
@@ -211,8 +211,8 @@ 
 						foreach ($imagestrings as $key => $imagestring) {
 							if (strpos($imagestring, '||') !== false) {
 								$imagearray = explode('||', $imagestring);
-								$ParsedLyrics3['images'][$key]['filename']     =                                (isset($imagearray[0]) ? $imagearray[0] : '');
-								$ParsedLyrics3['images'][$key]['description']  =                                (isset($imagearray[1]) ? $imagearray[1] : '');
+								$ParsedLyrics3['images'][$key]['filename']     = (isset($imagearray[0]) ? $imagearray[0] : '');
+								$ParsedLyrics3['images'][$key]['description']  = (isset($imagearray[1]) ? $imagearray[1] : '');
 								$ParsedLyrics3['images'][$key]['timestamp']    = $this->Lyrics3Timestamp2Seconds(isset($imagearray[2]) ? $imagearray[2] : '');
 							}
 						}

src/wp-includes/kses.php

Doc Comments +1 added lines

@@ -1667,6 +1667,7 @@
  * Inline CSS filter
  *
  * @since 2.8.1
+ * @param string $css
  */
 function safecss_filter_attr( $css, $deprecated = '' ) {
 	if ( !empty( $deprecated ) )

Indentation +30 added lines, -30 removed lines

@@ -1,35 +1,35 @@
 <?php
 /**
- * kses 0.2.2 - HTML/XHTML filter that only allows some elements and attributes
- * Copyright (C) 2002, 2003, 2005  Ulf Harnhammar
- *
- * This program is free software and open source software; you can redistribute
- * it and/or modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- * http://www.gnu.org/licenses/gpl.html
- *
- * [kses strips evil scripts!]
- *
- * Added wp_ prefix to avoid conflicts with existing kses users
- *
- * @version 0.2.2
- * @copyright (C) 2002, 2003, 2005
- * @author Ulf Harnhammar <http://advogato.org/person/metaur/>
- *
- * @package External
- * @subpackage KSES
- *
- */
+	 * kses 0.2.2 - HTML/XHTML filter that only allows some elements and attributes
+	 * Copyright (C) 2002, 2003, 2005  Ulf Harnhammar
+	 *
+	 * This program is free software and open source software; you can redistribute
+	 * it and/or modify it under the terms of the GNU General Public License as
+	 * published by the Free Software Foundation; either version 2 of the License,
+	 * or (at your option) any later version.
+	 *
+	 * This program is distributed in the hope that it will be useful, but WITHOUT
+	 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+	 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+	 * more details.
+	 *
+	 * You should have received a copy of the GNU General Public License along
+	 * with this program; if not, write to the Free Software Foundation, Inc.,
+	 * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+	 * http://www.gnu.org/licenses/gpl.html
+	 *
+	 * [kses strips evil scripts!]
+	 *
+	 * Added wp_ prefix to avoid conflicts with existing kses users
+	 *
+	 * @version 0.2.2
+	 * @copyright (C) 2002, 2003, 2005
+	 * @author Ulf Harnhammar <http://advogato.org/person/metaur/>
+	 *
+	 * @package External
+	 * @subpackage KSES
+	 *
+	 */
 
 /**
  * You can override this in a plugin.

Spacing +217 added lines, -217 removed lines

@@ -41,14 +41,14 @@ 
  *
  * @since 1.2.0
  */
-if ( ! defined( 'CUSTOM_TAGS' ) )
-	define( 'CUSTOM_TAGS', false );
+if ( ! defined('CUSTOM_TAGS'))
+	define('CUSTOM_TAGS', false);
 
 // Ensure that these variables are added to the global namespace
 // (e.g. if using namespaces / autoload in the current PHP environment).
 global $allowedposttags, $allowedtags, $allowedentitynames;
 
-if ( ! CUSTOM_TAGS ) {
+if ( ! CUSTOM_TAGS) {
 	/**
 	 * Kses global for default allowable HTML tags.
 	 *
@@ -447,55 +447,55 @@ 
 	);
 
 	$allowedentitynames = array(
-		'nbsp',    'iexcl',  'cent',    'pound',  'curren', 'yen',
-		'brvbar',  'sect',   'uml',     'copy',   'ordf',   'laquo',
-		'not',     'shy',    'reg',     'macr',   'deg',    'plusmn',
-		'acute',   'micro',  'para',    'middot', 'cedil',  'ordm',
-		'raquo',   'iquest', 'Agrave',  'Aacute', 'Acirc',  'Atilde',
-		'Auml',    'Aring',  'AElig',   'Ccedil', 'Egrave', 'Eacute',
-		'Ecirc',   'Euml',   'Igrave',  'Iacute', 'Icirc',  'Iuml',
-		'ETH',     'Ntilde', 'Ograve',  'Oacute', 'Ocirc',  'Otilde',
-		'Ouml',    'times',  'Oslash',  'Ugrave', 'Uacute', 'Ucirc',
-		'Uuml',    'Yacute', 'THORN',   'szlig',  'agrave', 'aacute',
-		'acirc',   'atilde', 'auml',    'aring',  'aelig',  'ccedil',
-		'egrave',  'eacute', 'ecirc',   'euml',   'igrave', 'iacute',
-		'icirc',   'iuml',   'eth',     'ntilde', 'ograve', 'oacute',
-		'ocirc',   'otilde', 'ouml',    'divide', 'oslash', 'ugrave',
-		'uacute',  'ucirc',  'uuml',    'yacute', 'thorn',  'yuml',
-		'quot',    'amp',    'lt',      'gt',     'apos',   'OElig',
-		'oelig',   'Scaron', 'scaron',  'Yuml',   'circ',   'tilde',
-		'ensp',    'emsp',   'thinsp',  'zwnj',   'zwj',    'lrm',
-		'rlm',     'ndash',  'mdash',   'lsquo',  'rsquo',  'sbquo',
-		'ldquo',   'rdquo',  'bdquo',   'dagger', 'Dagger', 'permil',
-		'lsaquo',  'rsaquo', 'euro',    'fnof',   'Alpha',  'Beta',
-		'Gamma',   'Delta',  'Epsilon', 'Zeta',   'Eta',    'Theta',
-		'Iota',    'Kappa',  'Lambda',  'Mu',     'Nu',     'Xi',
-		'Omicron', 'Pi',     'Rho',     'Sigma',  'Tau',    'Upsilon',
-		'Phi',     'Chi',    'Psi',     'Omega',  'alpha',  'beta',
-		'gamma',   'delta',  'epsilon', 'zeta',   'eta',    'theta',
-		'iota',    'kappa',  'lambda',  'mu',     'nu',     'xi',
-		'omicron', 'pi',     'rho',     'sigmaf', 'sigma',  'tau',
-		'upsilon', 'phi',    'chi',     'psi',    'omega',  'thetasym',
-		'upsih',   'piv',    'bull',    'hellip', 'prime',  'Prime',
-		'oline',   'frasl',  'weierp',  'image',  'real',   'trade',
-		'alefsym', 'larr',   'uarr',    'rarr',   'darr',   'harr',
-		'crarr',   'lArr',   'uArr',    'rArr',   'dArr',   'hArr',
-		'forall',  'part',   'exist',   'empty',  'nabla',  'isin',
-		'notin',   'ni',     'prod',    'sum',    'minus',  'lowast',
-		'radic',   'prop',   'infin',   'ang',    'and',    'or',
-		'cap',     'cup',    'int',     'sim',    'cong',   'asymp',
-		'ne',      'equiv',  'le',      'ge',     'sub',    'sup',
-		'nsub',    'sube',   'supe',    'oplus',  'otimes', 'perp',
-		'sdot',    'lceil',  'rceil',   'lfloor', 'rfloor', 'lang',
-		'rang',    'loz',    'spades',  'clubs',  'hearts', 'diams',
-		'sup1',    'sup2',   'sup3',    'frac14', 'frac12', 'frac34',
+		'nbsp', 'iexcl', 'cent', 'pound', 'curren', 'yen',
+		'brvbar', 'sect', 'uml', 'copy', 'ordf', 'laquo',
+		'not', 'shy', 'reg', 'macr', 'deg', 'plusmn',
+		'acute', 'micro', 'para', 'middot', 'cedil', 'ordm',
+		'raquo', 'iquest', 'Agrave', 'Aacute', 'Acirc', 'Atilde',
+		'Auml', 'Aring', 'AElig', 'Ccedil', 'Egrave', 'Eacute',
+		'Ecirc', 'Euml', 'Igrave', 'Iacute', 'Icirc', 'Iuml',
+		'ETH', 'Ntilde', 'Ograve', 'Oacute', 'Ocirc', 'Otilde',
+		'Ouml', 'times', 'Oslash', 'Ugrave', 'Uacute', 'Ucirc',
+		'Uuml', 'Yacute', 'THORN', 'szlig', 'agrave', 'aacute',
+		'acirc', 'atilde', 'auml', 'aring', 'aelig', 'ccedil',
+		'egrave', 'eacute', 'ecirc', 'euml', 'igrave', 'iacute',
+		'icirc', 'iuml', 'eth', 'ntilde', 'ograve', 'oacute',
+		'ocirc', 'otilde', 'ouml', 'divide', 'oslash', 'ugrave',
+		'uacute', 'ucirc', 'uuml', 'yacute', 'thorn', 'yuml',
+		'quot', 'amp', 'lt', 'gt', 'apos', 'OElig',
+		'oelig', 'Scaron', 'scaron', 'Yuml', 'circ', 'tilde',
+		'ensp', 'emsp', 'thinsp', 'zwnj', 'zwj', 'lrm',
+		'rlm', 'ndash', 'mdash', 'lsquo', 'rsquo', 'sbquo',
+		'ldquo', 'rdquo', 'bdquo', 'dagger', 'Dagger', 'permil',
+		'lsaquo', 'rsaquo', 'euro', 'fnof', 'Alpha', 'Beta',
+		'Gamma', 'Delta', 'Epsilon', 'Zeta', 'Eta', 'Theta',
+		'Iota', 'Kappa', 'Lambda', 'Mu', 'Nu', 'Xi',
+		'Omicron', 'Pi', 'Rho', 'Sigma', 'Tau', 'Upsilon',
+		'Phi', 'Chi', 'Psi', 'Omega', 'alpha', 'beta',
+		'gamma', 'delta', 'epsilon', 'zeta', 'eta', 'theta',
+		'iota', 'kappa', 'lambda', 'mu', 'nu', 'xi',
+		'omicron', 'pi', 'rho', 'sigmaf', 'sigma', 'tau',
+		'upsilon', 'phi', 'chi', 'psi', 'omega', 'thetasym',
+		'upsih', 'piv', 'bull', 'hellip', 'prime', 'Prime',
+		'oline', 'frasl', 'weierp', 'image', 'real', 'trade',
+		'alefsym', 'larr', 'uarr', 'rarr', 'darr', 'harr',
+		'crarr', 'lArr', 'uArr', 'rArr', 'dArr', 'hArr',
+		'forall', 'part', 'exist', 'empty', 'nabla', 'isin',
+		'notin', 'ni', 'prod', 'sum', 'minus', 'lowast',
+		'radic', 'prop', 'infin', 'ang', 'and', 'or',
+		'cap', 'cup', 'int', 'sim', 'cong', 'asymp',
+		'ne', 'equiv', 'le', 'ge', 'sub', 'sup',
+		'nsub', 'sube', 'supe', 'oplus', 'otimes', 'perp',
+		'sdot', 'lceil', 'rceil', 'lfloor', 'rfloor', 'lang',
+		'rang', 'loz', 'spades', 'clubs', 'hearts', 'diams',
+		'sup1', 'sup2', 'sup3', 'frac14', 'frac12', 'frac34',
 		'there4',
 	);
 
-	$allowedposttags = array_map( '_wp_add_global_attributes', $allowedposttags );
+	$allowedposttags = array_map('_wp_add_global_attributes', $allowedposttags);
 } else {
-	$allowedtags = wp_kses_array_lc( $allowedtags );
-	$allowedposttags = wp_kses_array_lc( $allowedposttags );
+	$allowedtags = wp_kses_array_lc($allowedtags);
+	$allowedposttags = wp_kses_array_lc($allowedposttags);
 }
 
 /**
@@ -518,10 +518,10 @@ 
  * @param array  $allowed_protocols Optional. Allowed protocol in links.
  * @return string Filtered content with only allowed HTML elements
  */
-function wp_kses( $string, $allowed_html, $allowed_protocols = array() ) {
-	if ( empty( $allowed_protocols ) )
+function wp_kses($string, $allowed_html, $allowed_protocols = array()) {
+	if (empty($allowed_protocols))
 		$allowed_protocols = wp_allowed_protocols();
-	$string = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) );
+	$string = wp_kses_no_null($string, array('slash_zero' => 'keep'));
 	$string = wp_kses_js_entities($string);
 	$string = wp_kses_normalize_entities($string);
 	$string = wp_kses_hook($string, $allowed_html, $allowed_protocols); // WP changed the order of these funcs and added args to wp_kses_hook
@@ -540,12 +540,12 @@ 
  * @param string $element The element name to which the attribute belongs.
  * @return string Filtered attribute.
  */
-function wp_kses_one_attr( $string, $element ) {
+function wp_kses_one_attr($string, $element) {
 	$uris = array('xmlns', 'profile', 'href', 'src', 'cite', 'classid', 'codebase', 'data', 'usemap', 'longdesc', 'action');
-	$allowed_html = wp_kses_allowed_html( 'post' );
+	$allowed_html = wp_kses_allowed_html('post');
 	$allowed_protocols = wp_allowed_protocols();
-	$string = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) );
-	$string = wp_kses_js_entities( $string );
+	$string = wp_kses_no_null($string, array('slash_zero' => 'keep'));
+	$string = wp_kses_js_entities($string);
 	
 	// Preserve leading and trailing whitespace.
 	$matches = array();
@@ -553,40 +553,40 @@ 
 	$lead = $matches[0];
 	preg_match('/\s*$/', $string, $matches);
 	$trail = $matches[0];
-	if ( empty( $trail ) ) {
-		$string = substr( $string, strlen( $lead ) );
+	if (empty($trail)) {
+		$string = substr($string, strlen($lead));
 	} else {
-		$string = substr( $string, strlen( $lead ), -strlen( $trail ) );
+		$string = substr($string, strlen($lead), -strlen($trail));
 	}
 	
 	// Parse attribute name and value from input.
-	$split = preg_split( '/\s*=\s*/', $string, 2 );
+	$split = preg_split('/\s*=\s*/', $string, 2);
 	$name = $split[0];
-	if ( count( $split ) == 2 ) {
+	if (count($split) == 2) {
 		$value = $split[1];
 
 		// Remove quotes surrounding $value.
 		// Also guarantee correct quoting in $string for this one attribute.
-		if ( '' == $value ) {
+		if ('' == $value) {
 			$quote = '';
 		} else {
 			$quote = $value[0];
 		}
-		if ( '"' == $quote || "'" == $quote ) {
-			if ( substr( $value, -1 ) != $quote ) {
+		if ('"' == $quote || "'" == $quote) {
+			if (substr($value, -1) != $quote) {
 				return '';
 			}
-			$value = substr( $value, 1, -1 );
+			$value = substr($value, 1, -1);
 		} else {
 			$quote = '"';
 		}
 
 		// Sanitize quotes, angle braces, and entities.
-		$value = esc_attr( $value );
+		$value = esc_attr($value);
 
 		// Sanitize URI values.
-		if ( in_array( strtolower( $name ), $uris ) ) {
-			$value = wp_kses_bad_protocol( $value, $allowed_protocols );
+		if (in_array(strtolower($name), $uris)) {
+			$value = wp_kses_bad_protocol($value, $allowed_protocols);
 		}
 
 		$string = "$name=$quote$value$quote";
@@ -597,10 +597,10 @@ 
 	}
 	
 	// Sanitize attribute by name.
-	wp_kses_attr_check( $name, $value, $string, $vless, $element, $allowed_html );
+	wp_kses_attr_check($name, $value, $string, $vless, $element, $allowed_html);
 
 	// Restore whitespace.
-	return $lead . $string . $trail;
+	return $lead.$string.$trail;
 }
 
 /**
@@ -617,10 +617,10 @@ 
  *                        the name of a field filter such as pre_user_description.
  * @return array List of allowed tags and their allowed attributes.
  */
-function wp_kses_allowed_html( $context = '' ) {
+function wp_kses_allowed_html($context = '') {
 	global $allowedposttags, $allowedtags, $allowedentitynames;
 
-	if ( is_array( $context ) ) {
+	if (is_array($context)) {
 		/**
 		 * Filter HTML elements allowed for a given context.
 		 *
@@ -630,33 +630,33 @@ 
 		 * @param string $context Context to judge allowed tags by. Allowed values are 'post',
 		 *                        'data', 'strip', 'entities', 'explicit', or the name of a filter.
 		 */
-		return apply_filters( 'wp_kses_allowed_html', $context, 'explicit' );
+		return apply_filters('wp_kses_allowed_html', $context, 'explicit');
 	}
 
-	switch ( $context ) {
+	switch ($context) {
 		case 'post':
 			/** This filter is documented in wp-includes/kses.php */
-			return apply_filters( 'wp_kses_allowed_html', $allowedposttags, $context );
+			return apply_filters('wp_kses_allowed_html', $allowedposttags, $context);
 
 		case 'user_description':
 		case 'pre_user_description':
 			$tags = $allowedtags;
 			$tags['a']['rel'] = true;
 			/** This filter is documented in wp-includes/kses.php */
-			return apply_filters( 'wp_kses_allowed_html', $tags, $context );
+			return apply_filters('wp_kses_allowed_html', $tags, $context);
 
 		case 'strip':
 			/** This filter is documented in wp-includes/kses.php */
-			return apply_filters( 'wp_kses_allowed_html', array(), $context );
+			return apply_filters('wp_kses_allowed_html', array(), $context);
 
 		case 'entities':
 			/** This filter is documented in wp-includes/kses.php */
-			return apply_filters( 'wp_kses_allowed_html', $allowedentitynames, $context);
+			return apply_filters('wp_kses_allowed_html', $allowedentitynames, $context);
 
 		case 'data':
 		default:
 			/** This filter is documented in wp-includes/kses.php */
-			return apply_filters( 'wp_kses_allowed_html', $allowedtags, $context );
+			return apply_filters('wp_kses_allowed_html', $allowedtags, $context);
 	}
 }
 
@@ -673,7 +673,7 @@ 
  * @param array  $allowed_protocols Allowed protocol in links
  * @return string Filtered content through 'pre_kses' hook
  */
-function wp_kses_hook( $string, $allowed_html, $allowed_protocols ) {
+function wp_kses_hook($string, $allowed_html, $allowed_protocols) {
 	/**
 	 * Filter content to be run through kses.
 	 *
@@ -683,7 +683,7 @@ 
 	 * @param array  $allowed_html      Allowed HTML elements.
 	 * @param array  $allowed_protocols Allowed protocol in links.
 	 */
-	return apply_filters( 'pre_kses', $string, $allowed_html, $allowed_protocols );
+	return apply_filters('pre_kses', $string, $allowed_html, $allowed_protocols);
 }
 
 /**
@@ -712,11 +712,11 @@ 
  * @param array  $allowed_protocols Allowed protocols to keep
  * @return string Content with fixed HTML tags
  */
-function wp_kses_split( $string, $allowed_html, $allowed_protocols ) {
+function wp_kses_split($string, $allowed_html, $allowed_protocols) {
 	global $pass_allowed_html, $pass_allowed_protocols;
 	$pass_allowed_html = $allowed_html;
 	$pass_allowed_protocols = $allowed_protocols;
-	return preg_replace_callback( '%(<!--.*?(-->|$))|(<[^>]*(>|$)|>)%', '_wp_kses_split_callback', $string );
+	return preg_replace_callback('%(<!--.*?(-->|$))|(<[^>]*(>|$)|>)%', '_wp_kses_split_callback', $string);
 }
 
 /**
@@ -730,9 +730,9 @@ 
  *
  * @return string
  */
-function _wp_kses_split_callback( $match ) {
+function _wp_kses_split_callback($match) {
 	global $pass_allowed_html, $pass_allowed_protocols;
-	return wp_kses_split2( $match[0], $pass_allowed_html, $pass_allowed_protocols );
+	return wp_kses_split2($match[0], $pass_allowed_html, $pass_allowed_protocols);
 }
 
 /**
@@ -762,11 +762,11 @@ 
 		return '&gt;';
 	// It matched a ">" character
 
-	if ( '<!--' == substr( $string, 0, 4 ) ) {
-		$string = str_replace( array('<!--', '-->'), '', $string );
-		while ( $string != ($newstring = wp_kses($string, $allowed_html, $allowed_protocols)) )
+	if ('<!--' == substr($string, 0, 4)) {
+		$string = str_replace(array('<!--', '-->'), '', $string);
+		while ($string != ($newstring = wp_kses($string, $allowed_html, $allowed_protocols)))
 			$string = $newstring;
-		if ( $string == '' )
+		if ($string == '')
 			return '';
 		// prevent multiple dashes in comments
 		$string = preg_replace('/--+/', '-', $string);
@@ -776,7 +776,7 @@ 
 	}
 	// Allow HTML comments
 
-	if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
+	if ( ! preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
 		return '';
 	// It's seriously malformed
 
@@ -784,10 +784,10 @@ 
 	$elem = $matches[2];
 	$attrlist = $matches[3];
 
-	if ( ! is_array( $allowed_html ) )
-		$allowed_html = wp_kses_allowed_html( $allowed_html );
+	if ( ! is_array($allowed_html))
+		$allowed_html = wp_kses_allowed_html($allowed_html);
 
-	if ( ! isset($allowed_html[strtolower($elem)]) )
+	if ( ! isset($allowed_html[strtolower($elem)]))
 		return '';
 	// They are using a not allowed HTML element
 
@@ -795,7 +795,7 @@ 
 		return "</$elem>";
 	// No attributes are allowed for closing elements
 
-	return wp_kses_attr( $elem, $attrlist, $allowed_html, $allowed_protocols );
+	return wp_kses_attr($elem, $attrlist, $allowed_html, $allowed_protocols);
 }
 
 /**
@@ -816,8 +816,8 @@ 
  * @return string Sanitized HTML element
  */
 function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
-	if ( ! is_array( $allowed_html ) )
-		$allowed_html = wp_kses_allowed_html( $allowed_html );
+	if ( ! is_array($allowed_html))
+		$allowed_html = wp_kses_allowed_html($allowed_html);
 
 	// Is there a closing XHTML slash at the end of the attributes?
 	$xhtml_slash = '';
@@ -825,7 +825,7 @@ 
 		$xhtml_slash = ' /';
 
 	// Are any attributes allowed at all for this element?
-	if ( ! isset($allowed_html[strtolower($element)]) || count($allowed_html[strtolower($element)]) == 0 )
+	if ( ! isset($allowed_html[strtolower($element)]) || count($allowed_html[strtolower($element)]) == 0)
 		return "<$element$xhtml_slash>";
 
 	// Split it
@@ -834,8 +834,8 @@ 
 	// Go through $attrarr, and save the allowed attributes for this element
 	// in $attr2
 	$attr2 = '';
-	foreach ( $attrarr as $arreach ) {
-		if ( wp_kses_attr_check( $arreach['name'], $arreach['value'], $arreach['whole'], $arreach['vless'], $element, $allowed_html ) ) {
+	foreach ($attrarr as $arreach) {
+		if (wp_kses_attr_check($arreach['name'], $arreach['value'], $arreach['whole'], $arreach['vless'], $element, $allowed_html)) {
 			$attr2 .= ' '.$arreach['whole'];
 		}
 	}
@@ -859,31 +859,31 @@ 
  * @param array $allowed_html The full list of allowed elements and attributes.
  * @return bool Is the attribute allowed?
  */
-function wp_kses_attr_check( &$name, &$value, &$whole, $vless, $element, $allowed_html ) {
-	$allowed_attr = $allowed_html[strtolower( $element )];
+function wp_kses_attr_check(&$name, &$value, &$whole, $vless, $element, $allowed_html) {
+	$allowed_attr = $allowed_html[strtolower($element)];
 
-	$name_low = strtolower( $name );
-	if ( ! isset( $allowed_attr[$name_low] ) || '' == $allowed_attr[$name_low] ) {
+	$name_low = strtolower($name);
+	if ( ! isset($allowed_attr[$name_low]) || '' == $allowed_attr[$name_low]) {
 		$name = $value = $whole = '';
 		return false;
 	}
 
-	if ( 'style' == $name_low ) {
-		$new_value = safecss_filter_attr( $value );
+	if ('style' == $name_low) {
+		$new_value = safecss_filter_attr($value);
 
-		if ( empty( $new_value ) ) {
+		if (empty($new_value)) {
 			$name = $value = $whole = '';
 			return false;
 		}
 
-		$whole = str_replace( $value, $new_value, $whole );
+		$whole = str_replace($value, $new_value, $whole);
 		$value = $new_value;
 	}
 
-	if ( is_array( $allowed_attr[$name_low] ) ) {
+	if (is_array($allowed_attr[$name_low])) {
 		// there are some checks
-		foreach ( $allowed_attr[$name_low] as $currkey => $currval ) {
-			if ( ! wp_kses_check_attr_val( $value, $vless, $currkey, $currval ) ) {
+		foreach ($allowed_attr[$name_low] as $currkey => $currval) {
+			if ( ! wp_kses_check_attr_val($value, $vless, $currkey, $currval)) {
 				$name = $value = $whole = '';
 				return false;
 			}
@@ -924,10 +924,10 @@ 
 		switch ($mode) {
 			case 0 : // attribute name, href for instance
 
-				if ( preg_match('/^([-a-zA-Z:]+)/', $attr, $match ) ) {
+				if (preg_match('/^([-a-zA-Z:]+)/', $attr, $match)) {
 					$attrname = $match[1];
 					$working = $mode = 1;
-					$attr = preg_replace( '/^[-a-zA-Z:]+/', '', $attr );
+					$attr = preg_replace('/^[-a-zA-Z:]+/', '', $attr);
 				}
 
 				break;
@@ -946,8 +946,8 @@ 
 					{
 					$working = 1;
 					$mode = 0;
-					if(false === array_key_exists($attrname, $attrarr)) {
-						$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+					if (false === array_key_exists($attrname, $attrarr)) {
+						$attrarr[$attrname] = array('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
 					}
 					$attr = preg_replace('/^\s+/', '', $attr);
 				}
@@ -960,11 +960,11 @@ 
 					// "value"
 					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
+					if (in_array(strtolower($attrname), $uris))
 						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-					if(false === array_key_exists($attrname, $attrarr)) {
-						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+					if (false === array_key_exists($attrname, $attrarr)) {
+						$attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
 					}
 					$working = 1;
 					$mode = 0;
@@ -976,11 +976,11 @@ 
 					// 'value'
 					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
+					if (in_array(strtolower($attrname), $uris))
 						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-					if(false === array_key_exists($attrname, $attrarr)) {
-						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
+					if (false === array_key_exists($attrname, $attrarr)) {
+						$attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
 					}
 					$working = 1;
 					$mode = 0;
@@ -992,11 +992,11 @@ 
 					// value
 					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
+					if (in_array(strtolower($attrname), $uris))
 						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-					if(false === array_key_exists($attrname, $attrarr)) {
-						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+					if (false === array_key_exists($attrname, $attrarr)) {
+						$attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
 					}
 					// We add quotes to conform to W3C's HTML spec.
 					$working = 1;
@@ -1017,7 +1017,7 @@ 
 	if ($mode == 1 && false === array_key_exists($attrname, $attrarr))
 		// special case, for when the attribute list ends with a valueless
 		// attribute like "selected"
-		$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+		$attrarr[$attrname] = array('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
 
 	return $attrarr;
 }
@@ -1034,40 +1034,40 @@ 
  * @param string $element HTML element/tag
  * @return array|bool List of attributes found in $element. Returns false on failure.
  */
-function wp_kses_attr_parse( $element ) {
+function wp_kses_attr_parse($element) {
 	$valid = preg_match('%^(<\s*)(/\s*)?([a-zA-Z0-9]+\s*)([^>]*)(>?)$%', $element, $matches);
-	if ( 1 !== $valid ) {
+	if (1 !== $valid) {
 		return false;
 	}
 
-	$begin =  $matches[1];
-	$slash =  $matches[2];
+	$begin = $matches[1];
+	$slash = $matches[2];
 	$elname = $matches[3];
-	$attr =   $matches[4];
-	$end =    $matches[5];
+	$attr = $matches[4];
+	$end = $matches[5];
 
-	if ( '' !== $slash ) {
+	if ('' !== $slash) {
 		// Closing elements do not get parsed.
 		return false;
 	}
 
 	// Is there a closing XHTML slash at the end of the attributes?
-	if ( 1 === preg_match( '%\s*/\s*$%', $attr, $matches ) ) {
+	if (1 === preg_match('%\s*/\s*$%', $attr, $matches)) {
 		$xhtml_slash = $matches[0];
-		$attr = substr( $attr, 0, -strlen( $xhtml_slash ) );
+		$attr = substr($attr, 0, -strlen($xhtml_slash));
 	} else {
 		$xhtml_slash = '';
 	}
 	
 	// Split it
-	$attrarr = wp_kses_hair_parse( $attr );
-	if ( false === $attrarr ) {
+	$attrarr = wp_kses_hair_parse($attr);
+	if (false === $attrarr) {
 		return false;
 	}
 
 	// Make sure all input is returned by adding front and back matter.
-	array_unshift( $attrarr, $begin . $slash . $elname );
-	array_push( $attrarr, $xhtml_slash . $end );
+	array_unshift($attrarr, $begin.$slash.$elname);
+	array_push($attrarr, $xhtml_slash.$end);
 	
 	return $attrarr;
 }
@@ -1085,8 +1085,8 @@ 
  * @param string $attr Attribute list from HTML element to closing HTML element tag
  * @return array|bool List of attributes found in $attr. Returns false on failure.
  */
-function wp_kses_hair_parse( $attr ) {
-	if ( '' === $attr ) {
+function wp_kses_hair_parse($attr) {
+	if ('' === $attr) {
 		return array();
 	}
 
@@ -1109,7 +1109,7 @@ 
 	. '|'
 	.     '(?:\s|$)'      // If attribute has no value, space is required.
 	. ')'
-	. '\s*';              // Trailing space is optional except as mentioned above.
+	. '\s*'; // Trailing space is optional except as mentioned above.
 
 	// Although it is possible to reduce this procedure to a single regexp,
 	// we must run that regexp twice to get exactly the expected result.
@@ -1117,8 +1117,8 @@ 
 	$validation = "%^($regex)+$%";
 	$extraction = "%$regex%";
 
-	if ( 1 === preg_match( $validation, $attr ) ) {
-		preg_match_all( $extraction, $attr, $attrarr );
+	if (1 === preg_match($validation, $attr)) {
+		preg_match_all($extraction, $attr, $attrarr);
 		return $attrarr[0];
 	} else {
 		return false;
@@ -1167,7 +1167,7 @@ 
 			// value is not greater than the given value.
 			// This check can be used to avoid Denial of Service attacks.
 
-			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
+			if ( ! preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
 				$ok = false;
 			if ($value > $checkvalue)
 				$ok = false;
@@ -1177,7 +1177,7 @@ 
 			// The minval check makes sure that the attribute value is a positive integer,
 			// and that it is not smaller than the given value.
 
-			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
+			if ( ! preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
 				$ok = false;
 			if ($value < $checkvalue)
 				$ok = false;
@@ -1218,9 +1218,9 @@ 
 	do {
 		$original_string = $string;
 		$string = wp_kses_bad_protocol_once($string, $allowed_protocols);
-	} while ( $original_string != $string && ++$iterations < 6 );
+	} while ($original_string != $string && ++$iterations < 6);
 
-	if ( $original_string != $string )
+	if ($original_string != $string)
 		return '';
 
 	return $string;
@@ -1237,14 +1237,14 @@ 
  * @param array $options Set 'slash_zero' => 'keep' when '\0' is allowed. Default is 'remove'.
  * @return string
  */
-function wp_kses_no_null( $string, $options = null ) {
-	if ( ! isset( $options['slash_zero'] ) ) {
-		$options = array( 'slash_zero' => 'remove' );
+function wp_kses_no_null($string, $options = null) {
+	if ( ! isset($options['slash_zero'])) {
+		$options = array('slash_zero' => 'remove');
 	}
 
-	$string = preg_replace( '/[\x00-\x08\x0B\x0C\x0E-\x1F]/', '', $string );
-	if ( 'remove' == $options['slash_zero'] ) {
-		$string = preg_replace( '/\\\\+0+/', '', $string );
+	$string = preg_replace('/[\x00-\x08\x0B\x0C\x0E-\x1F]/', '', $string);
+	if ('remove' == $options['slash_zero']) {
+		$string = preg_replace('/\\\\+0+/', '', $string);
 	}
 
 	return $string;
@@ -1275,13 +1275,13 @@ 
  * @return array Fixed array with all lowercase keys
  */
 function wp_kses_array_lc($inarray) {
-	$outarray = array ();
+	$outarray = array();
 
-	foreach ( (array) $inarray as $inkey => $inval) {
+	foreach ((array) $inarray as $inkey => $inval) {
 		$outkey = strtolower($inkey);
-		$outarray[$outkey] = array ();
+		$outarray[$outkey] = array();
 
-		foreach ( (array) $inval as $inkey2 => $inval2) {
+		foreach ((array) $inval as $inkey2 => $inval2) {
 			$outkey2 = strtolower($inkey2);
 			$outarray[$outkey][$outkey2] = $inval2;
 		} // foreach $inval
@@ -1329,19 +1329,19 @@ 
  * @param string $allowed_protocols Allowed protocols
  * @return string Sanitized content
  */
-function wp_kses_bad_protocol_once($string, $allowed_protocols, $count = 1 ) {
-	$string2 = preg_split( '/:|&#0*58;|&#x0*3a;/i', $string, 2 );
-	if ( isset($string2[1]) && ! preg_match('%/\?%', $string2[0]) ) {
-		$string = trim( $string2[1] );
-		$protocol = wp_kses_bad_protocol_once2( $string2[0], $allowed_protocols );
-		if ( 'feed:' == $protocol ) {
-			if ( $count > 2 )
+function wp_kses_bad_protocol_once($string, $allowed_protocols, $count = 1) {
+	$string2 = preg_split('/:|&#0*58;|&#x0*3a;/i', $string, 2);
+	if (isset($string2[1]) && ! preg_match('%/\?%', $string2[0])) {
+		$string = trim($string2[1]);
+		$protocol = wp_kses_bad_protocol_once2($string2[0], $allowed_protocols);
+		if ('feed:' == $protocol) {
+			if ($count > 2)
 				return '';
-			$string = wp_kses_bad_protocol_once( $string, $allowed_protocols, ++$count );
-			if ( empty( $string ) )
+			$string = wp_kses_bad_protocol_once($string, $allowed_protocols, ++$count);
+			if (empty($string))
 				return $string;
 		}
-		$string = $protocol . $string;
+		$string = $protocol.$string;
 	}
 
 	return $string;
@@ -1360,15 +1360,15 @@ 
  * @param string $allowed_protocols Allowed protocols
  * @return string Sanitized content
  */
-function wp_kses_bad_protocol_once2( $string, $allowed_protocols ) {
+function wp_kses_bad_protocol_once2($string, $allowed_protocols) {
 	$string2 = wp_kses_decode_entities($string);
 	$string2 = preg_replace('/\s/', '', $string2);
 	$string2 = wp_kses_no_null($string2);
 	$string2 = strtolower($string2);
 
 	$allowed = false;
-	foreach ( (array) $allowed_protocols as $one_protocol )
-		if ( strtolower($one_protocol) == $string2 ) {
+	foreach ((array) $allowed_protocols as $one_protocol)
+		if (strtolower($one_protocol) == $string2) {
 			$allowed = true;
 			break;
 		}
@@ -1418,11 +1418,11 @@ 
 function wp_kses_named_entities($matches) {
 	global $allowedentitynames;
 
-	if ( empty($matches[1]) )
+	if (empty($matches[1]))
 		return '';
 
 	$i = $matches[1];
-	return ( ! in_array( $i, $allowedentitynames ) ) ? "&amp;$i;" : "&$i;";
+	return ( ! in_array($i, $allowedentitynames)) ? "&amp;$i;" : "&$i;";
 }
 
 /**
@@ -1438,12 +1438,12 @@ 
  * @return string Correctly encoded entity
  */
 function wp_kses_normalize_entities2($matches) {
-	if ( empty($matches[1]) )
+	if (empty($matches[1]))
 		return '';
 
 	$i = $matches[1];
 	if (valid_unicode($i)) {
-		$i = str_pad(ltrim($i,'0'), 3, '0', STR_PAD_LEFT);
+		$i = str_pad(ltrim($i, '0'), 3, '0', STR_PAD_LEFT);
 		$i = "&#$i;";
 	} else {
 		$i = "&amp;#$i;";
@@ -1464,11 +1464,11 @@ 
  * @return string Correctly encoded entity
  */
 function wp_kses_normalize_entities3($matches) {
-	if ( empty($matches[1]) )
+	if (empty($matches[1]))
 		return '';
 
 	$hexchars = $matches[1];
-	return ( ! valid_unicode( hexdec( $hexchars ) ) ) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';';
+	return ( ! valid_unicode(hexdec($hexchars))) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars, '0').';';
 }
 
 /**
@@ -1478,10 +1478,10 @@ 
  * @return bool True if the value was a valid Unicode number
  */
 function valid_unicode($i) {
-	return ( $i == 0x9 || $i == 0xa || $i == 0xd ||
+	return ($i == 0x9 || $i == 0xa || $i == 0xd ||
 			($i >= 0x20 && $i <= 0xd7ff) ||
 			($i >= 0xe000 && $i <= 0xfffd) ||
-			($i >= 0x10000 && $i <= 0x10ffff) );
+			($i >= 0x10000 && $i <= 0x10ffff));
 }
 
 /**
@@ -1509,8 +1509,8 @@ 
  * @param array $match preg match
  * @return string
  */
-function _wp_kses_decode_entities_chr( $match ) {
-	return chr( $match[1] );
+function _wp_kses_decode_entities_chr($match) {
+	return chr($match[1]);
 }
 
 /**
@@ -1519,8 +1519,8 @@ 
  * @param array $match preg match
  * @return string
  */
-function _wp_kses_decode_entities_chr_hexdec( $match ) {
-	return chr( hexdec( $match[1] ) );
+function _wp_kses_decode_entities_chr_hexdec($match) {
+	return chr(hexdec($match[1]));
 }
 
 /**
@@ -1531,8 +1531,8 @@ 
  * @param string $data Content to filter, expected to be escaped with slashes
  * @return string Filtered content
  */
-function wp_filter_kses( $data ) {
-	return addslashes( wp_kses( stripslashes( $data ), current_filter() ) );
+function wp_filter_kses($data) {
+	return addslashes(wp_kses(stripslashes($data), current_filter()));
 }
 
 /**
@@ -1543,8 +1543,8 @@ 
  * @param string $data Content to filter, expected to not be escaped
  * @return string Filtered content
  */
-function wp_kses_data( $data ) {
-	return wp_kses( $data, current_filter() );
+function wp_kses_data($data) {
+	return wp_kses($data, current_filter());
 }
 
 /**
@@ -1558,8 +1558,8 @@ 
  * @param string $data Post content to filter, expected to be escaped with slashes
  * @return string Filtered post content with allowed HTML tags and attributes intact.
  */
-function wp_filter_post_kses( $data ) {
-	return addslashes( wp_kses( stripslashes( $data ), 'post' ) );
+function wp_filter_post_kses($data) {
+	return addslashes(wp_kses(stripslashes($data), 'post'));
 }
 
 /**
@@ -1573,8 +1573,8 @@ 
  * @param string $data Post content to filter
  * @return string Filtered post content with allowed HTML tags and attributes intact.
  */
-function wp_kses_post( $data ) {
-	return wp_kses( $data, 'post' );
+function wp_kses_post($data) {
+	return wp_kses($data, 'post');
 }
 
 /**
@@ -1585,8 +1585,8 @@ 
  * @param string $data Content to strip all HTML from
  * @return string Filtered content without any HTML
  */
-function wp_filter_nohtml_kses( $data ) {
-	return addslashes( wp_kses( stripslashes( $data ), 'strip' ) );
+function wp_filter_nohtml_kses($data) {
+	return addslashes(wp_kses(stripslashes($data), 'strip'));
 }
 
 /**
@@ -1605,10 +1605,10 @@ 
 	add_filter('title_save_pre', 'wp_filter_kses');
 
 	// Comment filtering
-	if ( current_user_can( 'unfiltered_html' ) )
-		add_filter( 'pre_comment_content', 'wp_filter_post_kses' );
+	if (current_user_can('unfiltered_html'))
+		add_filter('pre_comment_content', 'wp_filter_post_kses');
 	else
-		add_filter( 'pre_comment_content', 'wp_filter_kses' );
+		add_filter('pre_comment_content', 'wp_filter_kses');
 
 	// Post filtering
 	add_filter('content_save_pre', 'wp_filter_post_kses');
@@ -1633,8 +1633,8 @@ 
 	remove_filter('title_save_pre', 'wp_filter_kses');
 
 	// Comment filtering
-	remove_filter( 'pre_comment_content', 'wp_filter_post_kses' );
-	remove_filter( 'pre_comment_content', 'wp_filter_kses' );
+	remove_filter('pre_comment_content', 'wp_filter_post_kses');
+	remove_filter('pre_comment_content', 'wp_filter_kses');
 
 	// Post filtering
 	remove_filter('content_save_pre', 'wp_filter_post_kses');
@@ -1658,7 +1658,7 @@ 
 function kses_init() {
 	kses_remove_filters();
 
-	if ( ! current_user_can( 'unfiltered_html' ) ) {
+	if ( ! current_user_can('unfiltered_html')) {
 		kses_init_filters();
 	}
 }
@@ -1668,17 +1668,17 @@ 
  *
  * @since 2.8.1
  */
-function safecss_filter_attr( $css, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.8.1' ); // Never implemented
+function safecss_filter_attr($css, $deprecated = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.8.1'); // Never implemented
 
 	$css = wp_kses_no_null($css);
-	$css = str_replace(array("\n","\r","\t"), '', $css);
+	$css = str_replace(array("\n", "\r", "\t"), '', $css);
 
-	if ( preg_match( '%[\\\\(&=}]|/\*%', $css ) ) // remove any inline css containing \ ( & } = or comments
+	if (preg_match('%[\\\\(&=}]|/\*%', $css)) // remove any inline css containing \ ( & } = or comments
 		return '';
 
-	$css_array = explode( ';', trim( $css ) );
+	$css_array = explode(';', trim($css));
 
 	/**
 	 * Filter list of allowed CSS attributes.
@@ -1687,7 +1687,7 @@ 
 	 *
 	 * @param array $attr List of allowed CSS attributes.
 	 */
-	$allowed_attr = apply_filters( 'safe_style_css', array( 'text-align', 'margin', 'color', 'float',
+	$allowed_attr = apply_filters('safe_style_css', array('text-align', 'margin', 'color', 'float',
 	'border', 'background', 'background-color', 'border-bottom', 'border-bottom-color',
 	'border-bottom-style', 'border-bottom-width', 'border-collapse', 'border-color', 'border-left',
 	'border-left-color', 'border-left-style', 'border-left-width', 'border-right', 'border-right-color',
@@ -1697,26 +1697,26 @@ 
 	'font-variant', 'font-weight', 'height', 'letter-spacing', 'line-height', 'margin-bottom',
 	'margin-left', 'margin-right', 'margin-top', 'overflow', 'padding', 'padding-bottom',
 	'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
-	'width' ) );
+	'width'));
 
-	if ( empty($allowed_attr) )
+	if (empty($allowed_attr))
 		return $css;
 
 	$css = '';
-	foreach ( $css_array as $css_item ) {
-		if ( $css_item == '' )
+	foreach ($css_array as $css_item) {
+		if ($css_item == '')
 			continue;
-		$css_item = trim( $css_item );
+		$css_item = trim($css_item);
 		$found = false;
-		if ( strpos( $css_item, ':' ) === false ) {
+		if (strpos($css_item, ':') === false) {
 			$found = true;
 		} else {
-			$parts = explode( ':', $css_item );
-			if ( in_array( trim( $parts[0] ), $allowed_attr ) )
+			$parts = explode(':', $css_item);
+			if (in_array(trim($parts[0]), $allowed_attr))
 				$found = true;
 		}
-		if ( $found ) {
-			if( $css != '' )
+		if ($found) {
+			if ($css != '')
 				$css .= ';';
 			$css .= $css_item;
 		}
@@ -1734,7 +1734,7 @@ 
  * @param array $value An array of attributes.
  * @return array The array of attributes with global attributes added.
  */
-function _wp_add_global_attributes( $value ) {
+function _wp_add_global_attributes($value) {
 	$global_attributes = array(
 		'class' => true,
 		'id' => true,
@@ -1743,11 +1743,11 @@ 
 		'role' => true,
 	);
 
-	if ( true === $value )
+	if (true === $value)
 		$value = array();
 
-	if ( is_array( $value ) )
-		return array_merge( $value, $global_attributes );
+	if (is_array($value))
+		return array_merge($value, $global_attributes);
 
 	return $value;
 }

Braces +143 added lines, -92 removed lines

@@ -41,8 +41,9 @@ 
  *
  * @since 1.2.0
  */
-if ( ! defined( 'CUSTOM_TAGS' ) )
+if ( ! defined( 'CUSTOM_TAGS' ) ) {
 	define( 'CUSTOM_TAGS', false );
+}
 
 // Ensure that these variables are added to the global namespace
 // (e.g. if using namespaces / autoload in the current PHP environment).
@@ -519,8 +520,9 @@ 
  * @return string Filtered content with only allowed HTML elements
  */
 function wp_kses( $string, $allowed_html, $allowed_protocols = array() ) {
-	if ( empty( $allowed_protocols ) )
-		$allowed_protocols = wp_allowed_protocols();
+	if ( empty( $allowed_protocols ) ) {
+			$allowed_protocols = wp_allowed_protocols();
+	}
 	$string = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) );
 	$string = wp_kses_js_entities($string);
 	$string = wp_kses_normalize_entities($string);
@@ -758,16 +760,19 @@ 
 function wp_kses_split2($string, $allowed_html, $allowed_protocols) {
 	$string = wp_kses_stripslashes($string);
 
-	if (substr($string, 0, 1) != '<')
-		return '&gt;';
+	if (substr($string, 0, 1) != '<') {
+			return '&gt;';
+	}
 	// It matched a ">" character
 
 	if ( '<!--' == substr( $string, 0, 4 ) ) {
 		$string = str_replace( array('<!--', '-->'), '', $string );
-		while ( $string != ($newstring = wp_kses($string, $allowed_html, $allowed_protocols)) )
-			$string = $newstring;
-		if ( $string == '' )
-			return '';
+		while ( $string != ($newstring = wp_kses($string, $allowed_html, $allowed_protocols)) ) {
+					$string = $newstring;
+		}
+		if ( $string == '' ) {
+					return '';
+		}
 		// prevent multiple dashes in comments
 		$string = preg_replace('/--+/', '-', $string);
 		// prevent three dashes closing a comment
@@ -776,23 +781,27 @@ 
 	}
 	// Allow HTML comments
 
-	if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
-		return '';
+	if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches)) {
+			return '';
+	}
 	// It's seriously malformed
 
 	$slash = trim($matches[1]);
 	$elem = $matches[2];
 	$attrlist = $matches[3];
 
-	if ( ! is_array( $allowed_html ) )
-		$allowed_html = wp_kses_allowed_html( $allowed_html );
+	if ( ! is_array( $allowed_html ) ) {
+			$allowed_html = wp_kses_allowed_html( $allowed_html );
+	}
 
-	if ( ! isset($allowed_html[strtolower($elem)]) )
-		return '';
+	if ( ! isset($allowed_html[strtolower($elem)]) ) {
+			return '';
+	}
 	// They are using a not allowed HTML element
 
-	if ($slash != '')
-		return "</$elem>";
+	if ($slash != '') {
+			return "</$elem>";
+	}
 	// No attributes are allowed for closing elements
 
 	return wp_kses_attr( $elem, $attrlist, $allowed_html, $allowed_protocols );
@@ -816,17 +825,20 @@ 
  * @return string Sanitized HTML element
  */
 function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
-	if ( ! is_array( $allowed_html ) )
-		$allowed_html = wp_kses_allowed_html( $allowed_html );
+	if ( ! is_array( $allowed_html ) ) {
+			$allowed_html = wp_kses_allowed_html( $allowed_html );
+	}
 
 	// Is there a closing XHTML slash at the end of the attributes?
 	$xhtml_slash = '';
-	if (preg_match('%\s*/\s*$%', $attr))
-		$xhtml_slash = ' /';
+	if (preg_match('%\s*/\s*$%', $attr)) {
+			$xhtml_slash = ' /';
+	}
 
 	// Are any attributes allowed at all for this element?
-	if ( ! isset($allowed_html[strtolower($element)]) || count($allowed_html[strtolower($element)]) == 0 )
-		return "<$element$xhtml_slash>";
+	if ( ! isset($allowed_html[strtolower($element)]) || count($allowed_html[strtolower($element)]) == 0 ) {
+			return "<$element$xhtml_slash>";
+	}
 
 	// Split it
 	$attrarr = wp_kses_hair($attr, $allowed_protocols);
@@ -934,17 +946,21 @@ 
 
 			case 1 : // equals sign or valueless ("selected")
 
-				if (preg_match('/^\s*=\s*/', $attr)) // equals sign
+				if (preg_match('/^\s*=\s*/', $attr)) {
+					// equals sign
 					{
 					$working = 1;
+				}
 					$mode = 2;
 					$attr = preg_replace('/^\s*=\s*/', '', $attr);
 					break;
 				}
 
-				if (preg_match('/^\s+/', $attr)) // valueless
+				if (preg_match('/^\s+/', $attr)) {
+					// valueless
 					{
 					$working = 1;
+				}
 					$mode = 0;
 					if(false === array_key_exists($attrname, $attrarr)) {
 						$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
@@ -956,12 +972,14 @@ 
 
 			case 2 : // attribute value, a URL after href= for instance
 
-				if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match))
-					// "value"
+				if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match)) {
+									// "value"
 					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
-						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+				}
+					if ( in_array(strtolower($attrname), $uris) ) {
+											$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+					}
 
 					if(false === array_key_exists($attrname, $attrarr)) {
 						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
@@ -972,12 +990,14 @@ 
 					break;
 				}
 
-				if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match))
-					// 'value'
+				if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match)) {
+									// 'value'
 					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
-						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+				}
+					if ( in_array(strtolower($attrname), $uris) ) {
+											$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+					}
 
 					if(false === array_key_exists($attrname, $attrarr)) {
 						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
@@ -988,12 +1008,14 @@ 
 					break;
 				}
 
-				if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match))
-					// value
+				if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match)) {
+									// value
 					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
-						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+				}
+					if ( in_array(strtolower($attrname), $uris) ) {
+											$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+					}
 
 					if(false === array_key_exists($attrname, $attrarr)) {
 						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
@@ -1007,17 +1029,20 @@ 
 				break;
 		} // switch
 
-		if ($working == 0) // not well formed, remove and try again
+		if ($working == 0) {
+			// not well formed, remove and try again
 		{
 			$attr = wp_kses_html_error($attr);
+		}
 			$mode = 0;
 		}
 	} // while
 
-	if ($mode == 1 && false === array_key_exists($attrname, $attrarr))
-		// special case, for when the attribute list ends with a valueless
+	if ($mode == 1 && false === array_key_exists($attrname, $attrarr)) {
+			// special case, for when the attribute list ends with a valueless
 		// attribute like "selected"
 		$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+	}
 
 	return $attrarr;
 }
@@ -1148,16 +1173,18 @@ 
 			// greater than the given value. This can be used to avoid Buffer Overflows
 			// in WWW clients and various Internet servers.
 
-			if (strlen($value) > $checkvalue)
-				$ok = false;
+			if (strlen($value) > $checkvalue) {
+							$ok = false;
+			}
 			break;
 
 		case 'minlen' :
 			// The minlen check makes sure that the attribute value has a length not
 			// smaller than the given value.
 
-			if (strlen($value) < $checkvalue)
-				$ok = false;
+			if (strlen($value) < $checkvalue) {
+							$ok = false;
+			}
 			break;
 
 		case 'maxval' :
@@ -1167,20 +1194,24 @@ 
 			// value is not greater than the given value.
 			// This check can be used to avoid Denial of Service attacks.
 
-			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-				$ok = false;
-			if ($value > $checkvalue)
-				$ok = false;
+			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+							$ok = false;
+			}
+			if ($value > $checkvalue) {
+							$ok = false;
+			}
 			break;
 
 		case 'minval' :
 			// The minval check makes sure that the attribute value is a positive integer,
 			// and that it is not smaller than the given value.
 
-			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-				$ok = false;
-			if ($value < $checkvalue)
-				$ok = false;
+			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+							$ok = false;
+			}
+			if ($value < $checkvalue) {
+							$ok = false;
+			}
 			break;
 
 		case 'valueless' :
@@ -1189,8 +1220,9 @@ 
 			// is a "y" or a "Y", the attribute must not have a value.
 			// If the given value is an "n" or an "N", the attribute must have one.
 
-			if (strtolower($checkvalue) != $vless)
-				$ok = false;
+			if (strtolower($checkvalue) != $vless) {
+							$ok = false;
+			}
 			break;
 	} // switch
 
@@ -1220,8 +1252,9 @@ 
 		$string = wp_kses_bad_protocol_once($string, $allowed_protocols);
 	} while ( $original_string != $string && ++$iterations < 6 );
 
-	if ( $original_string != $string )
-		return '';
+	if ( $original_string != $string ) {
+			return '';
+	}
 
 	return $string;
 }
@@ -1335,11 +1368,13 @@ 
 		$string = trim( $string2[1] );
 		$protocol = wp_kses_bad_protocol_once2( $string2[0], $allowed_protocols );
 		if ( 'feed:' == $protocol ) {
-			if ( $count > 2 )
-				return '';
+			if ( $count > 2 ) {
+							return '';
+			}
 			$string = wp_kses_bad_protocol_once( $string, $allowed_protocols, ++$count );
-			if ( empty( $string ) )
-				return $string;
+			if ( empty( $string ) ) {
+							return $string;
+			}
 		}
 		$string = $protocol . $string;
 	}
@@ -1367,17 +1402,19 @@ 
 	$string2 = strtolower($string2);
 
 	$allowed = false;
-	foreach ( (array) $allowed_protocols as $one_protocol )
-		if ( strtolower($one_protocol) == $string2 ) {
+	foreach ( (array) $allowed_protocols as $one_protocol ) {
+			if ( strtolower($one_protocol) == $string2 ) {
 			$allowed = true;
+	}
 			break;
 		}
 
-	if ($allowed)
-		return "$string2:";
-	else
-		return '';
-}
+	if ($allowed) {
+			return "$string2:";
+	} else {
+			return '';
+	}
+	}
 
 /**
  * Converts and fixes HTML entities.
@@ -1418,8 +1455,9 @@ 
 function wp_kses_named_entities($matches) {
 	global $allowedentitynames;
 
-	if ( empty($matches[1]) )
-		return '';
+	if ( empty($matches[1]) ) {
+			return '';
+	}
 
 	$i = $matches[1];
 	return ( ! in_array( $i, $allowedentitynames ) ) ? "&amp;$i;" : "&$i;";
@@ -1438,8 +1476,9 @@ 
  * @return string Correctly encoded entity
  */
 function wp_kses_normalize_entities2($matches) {
-	if ( empty($matches[1]) )
-		return '';
+	if ( empty($matches[1]) ) {
+			return '';
+	}
 
 	$i = $matches[1];
 	if (valid_unicode($i)) {
@@ -1464,8 +1503,9 @@ 
  * @return string Correctly encoded entity
  */
 function wp_kses_normalize_entities3($matches) {
-	if ( empty($matches[1]) )
-		return '';
+	if ( empty($matches[1]) ) {
+			return '';
+	}
 
 	$hexchars = $matches[1];
 	return ( ! valid_unicode( hexdec( $hexchars ) ) ) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';';
@@ -1605,10 +1645,11 @@ 
 	add_filter('title_save_pre', 'wp_filter_kses');
 
 	// Comment filtering
-	if ( current_user_can( 'unfiltered_html' ) )
-		add_filter( 'pre_comment_content', 'wp_filter_post_kses' );
-	else
-		add_filter( 'pre_comment_content', 'wp_filter_kses' );
+	if ( current_user_can( 'unfiltered_html' ) ) {
+			add_filter( 'pre_comment_content', 'wp_filter_post_kses' );
+	} else {
+			add_filter( 'pre_comment_content', 'wp_filter_kses' );
+	}
 
 	// Post filtering
 	add_filter('content_save_pre', 'wp_filter_post_kses');
@@ -1669,14 +1710,18 @@ 
  * @since 2.8.1
  */
 function safecss_filter_attr( $css, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.8.1' ); // Never implemented
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.8.1' );
+	}
+	// Never implemented
 
 	$css = wp_kses_no_null($css);
 	$css = str_replace(array("\n","\r","\t"), '', $css);
 
-	if ( preg_match( '%[\\\\(&=}]|/\*%', $css ) ) // remove any inline css containing \ ( & } = or comments
+	if ( preg_match( '%[\\\\(&=}]|/\*%', $css ) ) {
+		// remove any inline css containing \ ( & } = or comments
 		return '';
+	}
 
 	$css_array = explode( ';', trim( $css ) );
 
@@ -1699,25 +1744,29 @@ 
 	'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
 	'width' ) );
 
-	if ( empty($allowed_attr) )
-		return $css;
+	if ( empty($allowed_attr) ) {
+			return $css;
+	}
 
 	$css = '';
 	foreach ( $css_array as $css_item ) {
-		if ( $css_item == '' )
-			continue;
+		if ( $css_item == '' ) {
+					continue;
+		}
 		$css_item = trim( $css_item );
 		$found = false;
 		if ( strpos( $css_item, ':' ) === false ) {
 			$found = true;
 		} else {
 			$parts = explode( ':', $css_item );
-			if ( in_array( trim( $parts[0] ), $allowed_attr ) )
-				$found = true;
+			if ( in_array( trim( $parts[0] ), $allowed_attr ) ) {
+							$found = true;
+			}
 		}
 		if ( $found ) {
-			if( $css != '' )
-				$css .= ';';
+			if( $css != '' ) {
+							$css .= ';';
+			}
 			$css .= $css_item;
 		}
 	}
@@ -1743,11 +1792,13 @@ 
 		'role' => true,
 	);
 
-	if ( true === $value )
-		$value = array();
+	if ( true === $value ) {
+			$value = array();
+	}
 
-	if ( is_array( $value ) )
-		return array_merge( $value, $global_attributes );
+	if ( is_array( $value ) ) {
+			return array_merge( $value, $global_attributes );
+	}
 
 	return $value;
 }

src/wp-includes/link-template.php

Doc Comments +8 added lines, -8 removed lines

@@ -91,7 +91,7 @@ 
  *
  * @see get_permalink()
  *
- * @param int|WP_Post $id        Optional. Post ID or post object. Default is the current post.
+ * @param integer $id        Optional. Post ID or post object. Default is the current post.
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  * @return string|false The permalink URL or false if post does not exist.
  */
@@ -104,7 +104,7 @@ 
  *
  * @since 1.0.0
  *
- * @param int|WP_Post $id        Optional. Post ID or post object. Default current post.
+ * @param integer $id        Optional. Post ID or post object. Default current post.
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  * @return string|false The permalink URL or false if post does not exist.
  */
@@ -1347,7 +1347,7 @@ 
  *
  * @since 2.7.0
  *
- * @param int|stdClass $link Optional. Bookmark ID.
+ * @param integer $link Optional. Bookmark ID.
  * @return string|void The edit bookmark link URL.
  */
 function get_edit_bookmark_link( $link = 0 ) {
@@ -1445,7 +1445,7 @@ 
  * @since 1.5.0
  *
  * @param bool         $in_same_term   Optional. Whether post should be in a same taxonomy term.
- * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ * @param string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
  */
@@ -1459,7 +1459,7 @@ 
  * @since 1.5.0
  *
  * @param bool         $in_same_term   Optional. Whether post should be in a same taxonomy term.
- * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ * @param string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
  */
@@ -1480,7 +1480,7 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param bool         $previous       Optional. Whether to retrieve previous post.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
- * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
+ * @return integer Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
  */
 function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
 	global $wpdb;
@@ -1742,7 +1742,7 @@ 
  * @since 2.8.0
  *
  * @param bool         $in_same_term   Optional. Whether returned post should be in a same taxonomy term.
- * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ * @param string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param bool         $start          Optional. Whether to retrieve first or last post.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|array Array containing the boundary post object if successful, null otherwise.
@@ -2707,7 +2707,7 @@ 
  *
  * @param  int         $blog_id     Optional. Blog ID. Default null (current blog).
  * @param  string      $path        Optional. Path relative to the home URL. Default empty.
- * @param  string|null $orig_scheme Optional. Scheme to give the home URL context. Accepts
+ * @param  string $scheme Optional. Scheme to give the home URL context. Accepts
  *                                  'http', 'https', 'relative', or null. Default null.
  * @return string Home URL link with optional path appended.
 */

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Link Template Functions
- *
- * @package WordPress
- * @subpackage Template
- */
+	 * WordPress Link Template Functions
+	 *
+	 * @package WordPress
+	 * @subpackage Template
+	 */
 
 /**
  * Display the permalink for the current post.

Spacing +718 added lines, -718 removed lines

@@ -19,7 +19,7 @@ 
 	 *
 	 * @param string $permalink The permalink for the current post.
 	 */
-	echo esc_url( apply_filters( 'the_permalink', get_permalink() ) );
+	echo esc_url(apply_filters('the_permalink', get_permalink()));
 }
 
 /**
@@ -39,7 +39,7 @@ 
  */
 function user_trailingslashit($string, $type_of_url = '') {
 	global $wp_rewrite;
-	if ( $wp_rewrite->use_trailing_slashes )
+	if ($wp_rewrite->use_trailing_slashes)
 		$string = trailingslashit($string);
 	else
 		$string = untrailingslashit($string);
@@ -55,7 +55,7 @@ 
 	 *                            'single_feed', 'single_paged', 'feed', 'category', 'page', 'year',
 	 *                            'month', 'day', 'paged', 'post_type_archive'.
 	 */
-	return apply_filters( 'user_trailingslashit', $string, $type_of_url );
+	return apply_filters('user_trailingslashit', $string, $type_of_url);
 }
 
 /**
@@ -68,16 +68,16 @@ 
  *
  * @param string $mode Permalink mode can be either 'title', 'id', or default, which is 'id'.
  */
-function permalink_anchor( $mode = 'id' ) {
+function permalink_anchor($mode = 'id') {
 	$post = get_post();
-	switch ( strtolower( $mode ) ) {
+	switch (strtolower($mode)) {
 		case 'title':
-			$title = sanitize_title( $post->post_title ) . '-' . $post->ID;
+			$title = sanitize_title($post->post_title).'-'.$post->ID;
 			echo '<a id="'.$title.'"></a>';
 			break;
 		case 'id':
 		default:
-			echo '<a id="post-' . $post->ID . '"></a>';
+			echo '<a id="post-'.$post->ID.'"></a>';
 			break;
 	}
 }
@@ -95,8 +95,8 @@ 
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  * @return string|false The permalink URL or false if post does not exist.
  */
-function get_the_permalink( $id = 0, $leavename = false ) {
-	return get_permalink( $id, $leavename );
+function get_the_permalink($id = 0, $leavename = false) {
+	return get_permalink($id, $leavename);
 }
 
 /**
@@ -108,7 +108,7 @@ 
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  * @return string|false The permalink URL or false if post does not exist.
  */
-function get_permalink( $id = 0, $leavename = false ) {
+function get_permalink($id = 0, $leavename = false) {
 	$rewritecode = array(
 		'%year%',
 		'%monthnum%',
@@ -116,14 +116,14 @@ 
 		'%hour%',
 		'%minute%',
 		'%second%',
-		$leavename? '' : '%postname%',
+		$leavename ? '' : '%postname%',
 		'%post_id%',
 		'%category%',
 		'%author%',
-		$leavename? '' : '%pagename%',
+		$leavename ? '' : '%pagename%',
 	);
 
-	if ( is_object($id) && isset($id->filter) && 'sample' == $id->filter ) {
+	if (is_object($id) && isset($id->filter) && 'sample' == $id->filter) {
 		$post = $id;
 		$sample = true;
 	} else {
@@ -131,14 +131,14 @@ 
 		$sample = false;
 	}
 
-	if ( empty($post->ID) )
+	if (empty($post->ID))
 		return false;
 
-	if ( $post->post_type == 'page' )
+	if ($post->post_type == 'page')
 		return get_page_link($post, $leavename, $sample);
-	elseif ( $post->post_type == 'attachment' )
-		return get_attachment_link( $post, $leavename );
-	elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) )
+	elseif ($post->post_type == 'attachment')
+		return get_attachment_link($post, $leavename);
+	elseif (in_array($post->post_type, get_post_types(array('_builtin' => false))))
 		return get_post_permalink($post, $leavename, $sample);
 
 	$permalink = get_option('permalink_structure');
@@ -154,15 +154,15 @@ 
 	 * @param WP_Post $post      The post in question.
 	 * @param bool    $leavename Whether to keep the post name.
 	 */
-	$permalink = apply_filters( 'pre_post_link', $permalink, $post, $leavename );
+	$permalink = apply_filters('pre_post_link', $permalink, $post, $leavename);
 
-	if ( '' != $permalink && !in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft', 'future' ) ) ) {
+	if ('' != $permalink && ! in_array($post->post_status, array('draft', 'pending', 'auto-draft', 'future'))) {
 		$unixtime = strtotime($post->post_date);
 
 		$category = '';
-		if ( strpos($permalink, '%category%') !== false ) {
+		if (strpos($permalink, '%category%') !== false) {
 			$cats = get_the_category($post->ID);
-			if ( $cats ) {
+			if ($cats) {
 				usort($cats, '_usort_terms_by_ID'); // order by ID
 
 				/**
@@ -174,28 +174,28 @@ 
 				 * @param array    $cats Array of all categories associated with the post.
 				 * @param WP_Post  $post The post in question.
 				 */
-				$category_object = apply_filters( 'post_link_category', $cats[0], $cats, $post );
+				$category_object = apply_filters('post_link_category', $cats[0], $cats, $post);
 
-				$category_object = get_term( $category_object, 'category' );
+				$category_object = get_term($category_object, 'category');
 				$category = $category_object->slug;
-				if ( $parent = $category_object->parent )
-					$category = get_category_parents($parent, false, '/', true) . $category;
+				if ($parent = $category_object->parent)
+					$category = get_category_parents($parent, false, '/', true).$category;
 			}
 			// show default category in permalinks, without
 			// having to assign it explicitly
-			if ( empty($category) ) {
-				$default_category = get_term( get_option( 'default_category' ), 'category' );
-				$category = is_wp_error( $default_category ) ? '' : $default_category->slug;
+			if (empty($category)) {
+				$default_category = get_term(get_option('default_category'), 'category');
+				$category = is_wp_error($default_category) ? '' : $default_category->slug;
 			}
 		}
 
 		$author = '';
-		if ( strpos($permalink, '%author%') !== false ) {
+		if (strpos($permalink, '%author%') !== false) {
 			$authordata = get_userdata($post->post_author);
 			$author = $authordata->user_nicename;
 		}
 
-		$date = explode(" ",date('Y m d H i s', $unixtime));
+		$date = explode(" ", date('Y m d H i s', $unixtime));
 		$rewritereplace =
 		array(
 			$date[0],
@@ -210,10 +210,10 @@ 
 			$author,
 			$post->post_name,
 		);
-		$permalink = home_url( str_replace($rewritecode, $rewritereplace, $permalink) );
+		$permalink = home_url(str_replace($rewritecode, $rewritereplace, $permalink));
 		$permalink = user_trailingslashit($permalink, 'single');
 	} else { // if they're not using the fancy permalink option
-		$permalink = home_url('?p=' . $post->ID);
+		$permalink = home_url('?p='.$post->ID);
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 * @param WP_Post $post      The post in question.
 	 * @param bool    $leavename Whether to keep the post name.
 	 */
-	return apply_filters( 'post_link', $permalink, $post, $leavename );
+	return apply_filters('post_link', $permalink, $post, $leavename);
 }
 
 /**
@@ -242,33 +242,33 @@ 
  * @param bool $sample    Optional, defaults to false. Is it a sample permalink.
  * @return string|WP_Error The post permalink.
  */
-function get_post_permalink( $id = 0, $leavename = false, $sample = false ) {
+function get_post_permalink($id = 0, $leavename = false, $sample = false) {
 	global $wp_rewrite;
 
 	$post = get_post($id);
 
-	if ( is_wp_error( $post ) )
+	if (is_wp_error($post))
 		return $post;
 
 	$post_link = $wp_rewrite->get_extra_permastruct($post->post_type);
 
 	$slug = $post->post_name;
 
-	$draft_or_pending = isset( $post->post_status ) && in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft', 'future' ) );
+	$draft_or_pending = isset($post->post_status) && in_array($post->post_status, array('draft', 'pending', 'auto-draft', 'future'));
 
 	$post_type = get_post_type_object($post->post_type);
 
-	if ( $post_type->hierarchical ) {
-		$slug = get_page_uri( $id );
+	if ($post_type->hierarchical) {
+		$slug = get_page_uri($id);
 	}
 
-	if ( !empty($post_link) && ( !$draft_or_pending || $sample ) ) {
-		if ( ! $leavename ) {
+	if ( ! empty($post_link) && ( ! $draft_or_pending || $sample)) {
+		if ( ! $leavename) {
 			$post_link = str_replace("%$post->post_type%", $slug, $post_link);
 		}
-		$post_link = home_url( user_trailingslashit($post_link) );
+		$post_link = home_url(user_trailingslashit($post_link));
 	} else {
-		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
+		if ($post_type->query_var && (isset($post->post_status) && ! $draft_or_pending))
 			$post_link = add_query_arg($post_type->query_var, $slug, '');
 		else
 			$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
@@ -285,7 +285,7 @@ 
 	 * @param bool    $leavename Whether to keep the post name.
 	 * @param bool    $sample    Is it a sample permalink.
 	 */
-	return apply_filters( 'post_type_link', $post_link, $post, $leavename, $sample );
+	return apply_filters('post_type_link', $post_link, $post, $leavename, $sample);
 }
 
 /**
@@ -300,13 +300,13 @@ 
  * @param bool       $sample    Optional, defaults to false. Is it a sample permalink.
  * @return string The page permalink.
  */
-function get_page_link( $post = false, $leavename = false, $sample = false ) {
-	$post = get_post( $post );
+function get_page_link($post = false, $leavename = false, $sample = false) {
+	$post = get_post($post);
 
-	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) )
+	if ('page' == get_option('show_on_front') && $post->ID == get_option('page_on_front'))
 		$link = home_url('/');
 	else
-		$link = _get_page_link( $post, $leavename, $sample );
+		$link = _get_page_link($post, $leavename, $sample);
 
 	/**
 	 * Filter the permalink for a page.
@@ -317,7 +317,7 @@ 
 	 * @param int    $post_id The ID of the page.
 	 * @param bool   $sample  Is it a sample permalink.
 	 */
-	return apply_filters( 'page_link', $link, $post->ID, $sample );
+	return apply_filters('page_link', $link, $post->ID, $sample);
 }
 
 /**
@@ -335,24 +335,24 @@ 
  * @param bool       $sample    Optional. Sample permalink.
  * @return string The page permalink.
  */
-function _get_page_link( $post = false, $leavename = false, $sample = false ) {
+function _get_page_link($post = false, $leavename = false, $sample = false) {
 	global $wp_rewrite;
 
-	$post = get_post( $post );
+	$post = get_post($post);
 
-	$draft_or_pending = in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft' ) );
+	$draft_or_pending = in_array($post->post_status, array('draft', 'pending', 'auto-draft'));
 
 	$link = $wp_rewrite->get_page_permastruct();
 
-	if ( !empty($link) && ( ( isset($post->post_status) && !$draft_or_pending ) || $sample ) ) {
-		if ( ! $leavename ) {
-			$link = str_replace('%pagename%', get_page_uri( $post ), $link);
+	if ( ! empty($link) && ((isset($post->post_status) && ! $draft_or_pending) || $sample)) {
+		if ( ! $leavename) {
+			$link = str_replace('%pagename%', get_page_uri($post), $link);
 		}
 
 		$link = home_url($link);
 		$link = user_trailingslashit($link, 'page');
 	} else {
-		$link = home_url( '?page_id=' . $post->ID );
+		$link = home_url('?page_id='.$post->ID);
 	}
 
 	/**
@@ -363,7 +363,7 @@ 
 	 * @param string $link    The page's permalink.
 	 * @param int    $post_id The ID of the page.
 	 */
-	return apply_filters( '_get_page_link', $link, $post->ID );
+	return apply_filters('_get_page_link', $link, $post->ID);
 }
 
 /**
@@ -379,34 +379,34 @@ 
  * @param bool       $leavename Optional. Leave name.
  * @return string The attachment permalink.
  */
-function get_attachment_link( $post = null, $leavename = false ) {
+function get_attachment_link($post = null, $leavename = false) {
 	global $wp_rewrite;
 
 	$link = false;
 
-	$post = get_post( $post );
-	$parent = ( $post->post_parent > 0 && $post->post_parent != $post->ID ) ? get_post( $post->post_parent ) : false;
+	$post = get_post($post);
+	$parent = ($post->post_parent > 0 && $post->post_parent != $post->ID) ? get_post($post->post_parent) : false;
 
-	if ( $wp_rewrite->using_permalinks() && $parent ) {
-		if ( 'page' == $parent->post_type )
-			$parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front
+	if ($wp_rewrite->using_permalinks() && $parent) {
+		if ('page' == $parent->post_type)
+			$parentlink = _get_page_link($post->post_parent); // Ignores page_on_front
 		else
-			$parentlink = get_permalink( $post->post_parent );
+			$parentlink = get_permalink($post->post_parent);
 
-		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') )
-			$name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
+		if (is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%'))
+			$name = 'attachment/'.$post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
 		else
 			$name = $post->post_name;
 
-		if ( strpos($parentlink, '?') === false )
-			$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		if (strpos($parentlink, '?') === false)
+			$link = user_trailingslashit(trailingslashit($parentlink).'%postname%');
 
-		if ( ! $leavename )
-			$link = str_replace( '%postname%', $name, $link );
+		if ( ! $leavename)
+			$link = str_replace('%postname%', $name, $link);
 	}
 
-	if ( ! $link )
-		$link = home_url( '/?attachment_id=' . $post->ID );
+	if ( ! $link)
+		$link = home_url('/?attachment_id='.$post->ID);
 
 	/**
 	 * Filter the permalink for an attachment.
@@ -416,7 +416,7 @@ 
 	 * @param string $link    The attachment's permalink.
 	 * @param int    $post_id Attachment ID.
 	 */
-	return apply_filters( 'attachment_link', $link, $post->ID );
+	return apply_filters('attachment_link', $link, $post->ID);
 }
 
 /**
@@ -431,14 +431,14 @@ 
  */
 function get_year_link($year) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
 	$yearlink = $wp_rewrite->get_year_permastruct();
-	if ( !empty($yearlink) ) {
+	if ( ! empty($yearlink)) {
 		$yearlink = str_replace('%year%', $year, $yearlink);
-		$yearlink = home_url( user_trailingslashit( $yearlink, 'year' ) );
+		$yearlink = home_url(user_trailingslashit($yearlink, 'year'));
 	} else {
-		$yearlink = home_url( '?m=' . $year );
+		$yearlink = home_url('?m='.$year);
 	}
 
 	/**
@@ -449,7 +449,7 @@ 
 	 * @param string $yearlink Permalink for the year archive.
 	 * @param int    $year     Year for the archive.
 	 */
-	return apply_filters( 'year_link', $yearlink, $year );
+	return apply_filters('year_link', $yearlink, $year);
 }
 
 /**
@@ -465,17 +465,17 @@ 
  */
 function get_month_link($year, $month) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
+	if ( ! $month)
 		$month = gmdate('m', current_time('timestamp'));
 	$monthlink = $wp_rewrite->get_month_permastruct();
-	if ( !empty($monthlink) ) {
+	if ( ! empty($monthlink)) {
 		$monthlink = str_replace('%year%', $year, $monthlink);
 		$monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
-		$monthlink = home_url( user_trailingslashit( $monthlink, 'month' ) );
+		$monthlink = home_url(user_trailingslashit($monthlink, 'month'));
 	} else {
-		$monthlink = home_url( '?m=' . $year . zeroise( $month, 2 ) );
+		$monthlink = home_url('?m='.$year.zeroise($month, 2));
 	}
 
 	/**
@@ -487,7 +487,7 @@ 
 	 * @param int    $year      Year for the archive.
 	 * @param int    $month     The month for the archive.
 	 */
-	return apply_filters( 'month_link', $monthlink, $year, $month );
+	return apply_filters('month_link', $monthlink, $year, $month);
 }
 
 /**
@@ -504,21 +504,21 @@ 
  */
 function get_day_link($year, $month, $day) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
+	if ( ! $month)
 		$month = gmdate('m', current_time('timestamp'));
-	if ( !$day )
+	if ( ! $day)
 		$day = gmdate('j', current_time('timestamp'));
 
 	$daylink = $wp_rewrite->get_day_permastruct();
-	if ( !empty($daylink) ) {
+	if ( ! empty($daylink)) {
 		$daylink = str_replace('%year%', $year, $daylink);
 		$daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
 		$daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
-		$daylink = home_url( user_trailingslashit( $daylink, 'day' ) );
+		$daylink = home_url(user_trailingslashit($daylink, 'day'));
 	} else {
-		$daylink = home_url( '?m=' . $year . zeroise( $month, 2 ) . zeroise( $day, 2 ) );
+		$daylink = home_url('?m='.$year.zeroise($month, 2).zeroise($day, 2));
 	}
 
 	/**
@@ -531,7 +531,7 @@ 
 	 * @param int    $month   Month for the archive.
 	 * @param int    $day     The day for the archive.
 	 */
-	return apply_filters( 'day_link', $daylink, $year, $month, $day );
+	return apply_filters('day_link', $daylink, $year, $month, $day);
 }
 
 /**
@@ -542,8 +542,8 @@ 
  * @param string $anchor The link's anchor text.
  * @param string $feed   Optional, defaults to default feed. Feed type.
  */
-function the_feed_link( $anchor, $feed = '' ) {
-	$link = '<a href="' . esc_url( get_feed_link( $feed ) ) . '">' . $anchor . '</a>';
+function the_feed_link($anchor, $feed = '') {
+	$link = '<a href="'.esc_url(get_feed_link($feed)).'">'.$anchor.'</a>';
 
 	/**
 	 * Filter the feed link anchor tag.
@@ -554,7 +554,7 @@ 
 	 * @param string $feed The feed type, or an empty string for the
 	 *                     default feed type.
 	 */
-	echo apply_filters( 'the_feed_link', $link, $feed );
+	echo apply_filters('the_feed_link', $link, $feed);
 }
 
 /**
@@ -571,23 +571,23 @@ 
 	global $wp_rewrite;
 
 	$permalink = $wp_rewrite->get_feed_permastruct();
-	if ( '' != $permalink ) {
-		if ( false !== strpos($feed, 'comments_') ) {
+	if ('' != $permalink) {
+		if (false !== strpos($feed, 'comments_')) {
 			$feed = str_replace('comments_', '', $feed);
 			$permalink = $wp_rewrite->get_comment_feed_permastruct();
 		}
 
-		if ( get_default_feed() == $feed )
+		if (get_default_feed() == $feed)
 			$feed = '';
 
 		$permalink = str_replace('%feed%', $feed, $permalink);
 		$permalink = preg_replace('#/+#', '/', "/$permalink");
-		$output =  home_url( user_trailingslashit($permalink, 'feed') );
+		$output = home_url(user_trailingslashit($permalink, 'feed'));
 	} else {
-		if ( empty($feed) )
+		if (empty($feed))
 			$feed = get_default_feed();
 
-		if ( false !== strpos($feed, 'comments_') )
+		if (false !== strpos($feed, 'comments_'))
 			$feed = str_replace('comments_', 'comments-', $feed);
 
 		$output = home_url("?feed={$feed}");
@@ -601,7 +601,7 @@ 
 	 * @param string $output The feed permalink.
 	 * @param string $feed   Feed type.
 	 */
-	return apply_filters( 'feed_link', $output, $feed );
+	return apply_filters('feed_link', $output, $feed);
 }
 
 /**
@@ -614,30 +614,30 @@ 
  * @return string The permalink for the comments feed for the given post.
  */
 function get_post_comments_feed_link($post_id = 0, $feed = '') {
-	$post_id = absint( $post_id );
+	$post_id = absint($post_id);
 
-	if ( ! $post_id )
+	if ( ! $post_id)
 		$post_id = get_the_ID();
 
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	if ( '' != get_option('permalink_structure') ) {
-		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
-			$url = _get_page_link( $post_id );
+	if ('' != get_option('permalink_structure')) {
+		if ('page' == get_option('show_on_front') && $post_id == get_option('page_on_front'))
+			$url = _get_page_link($post_id);
 		else
 			$url = get_permalink($post_id);
 
-		$url = trailingslashit($url) . 'feed';
-		if ( $feed != get_default_feed() )
+		$url = trailingslashit($url).'feed';
+		if ($feed != get_default_feed())
 			$url .= "/$feed";
 		$url = user_trailingslashit($url, 'single_feed');
 	} else {
 		$type = get_post_field('post_type', $post_id);
-		if ( 'page' == $type )
-			$url = add_query_arg( array( 'feed' => $feed, 'page_id' => $post_id ), home_url( '/' ) );
+		if ('page' == $type)
+			$url = add_query_arg(array('feed' => $feed, 'page_id' => $post_id), home_url('/'));
 		else
-			$url = add_query_arg( array( 'feed' => $feed, 'p' => $post_id ), home_url( '/' ) );
+			$url = add_query_arg(array('feed' => $feed, 'p' => $post_id), home_url('/'));
 	}
 
 	/**
@@ -647,7 +647,7 @@ 
 	 *
 	 * @param string $url Post comments feed permalink.
 	 */
-	return apply_filters( 'post_comments_feed_link', $url );
+	return apply_filters('post_comments_feed_link', $url);
 }
 
 /**
@@ -663,9 +663,9 @@ 
  * @param int    $post_id   Optional post ID. Default to current post.
  * @param string $feed      Optional. Feed format.
 */
-function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) {
-	$url = esc_url( get_post_comments_feed_link( $post_id, $feed ) );
-	if ( empty($link_text) )
+function post_comments_feed_link($link_text = '', $post_id = '', $feed = '') {
+	$url = esc_url(get_post_comments_feed_link($post_id, $feed));
+	if (empty($link_text))
 		$link_text = __('Comments Feed');
 
 	/**
@@ -677,7 +677,7 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $feed    The feed type, or an empty string for the default feed type.
 	 */
-	echo apply_filters( 'post_comments_feed_link_html', "<a href='$url'>$link_text</a>", $post_id, $feed );
+	echo apply_filters('post_comments_feed_link_html', "<a href='$url'>$link_text</a>", $post_id, $feed);
 }
 
 /**
@@ -692,23 +692,23 @@ 
  * @param string $feed      Optional. Feed type.
  * @return string Link to the feed for the author specified by $author_id.
 */
-function get_author_feed_link( $author_id, $feed = '' ) {
+function get_author_feed_link($author_id, $feed = '') {
 	$author_id = (int) $author_id;
 	$permalink_structure = get_option('permalink_structure');
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	if ( '' == $permalink_structure ) {
-		$link = home_url("?feed=$feed&amp;author=" . $author_id);
+	if ('' == $permalink_structure) {
+		$link = home_url("?feed=$feed&amp;author=".$author_id);
 	} else {
 		$link = get_author_posts_url($author_id);
-		if ( $feed == get_default_feed() )
+		if ($feed == get_default_feed())
 			$feed_link = 'feed';
 		else
 			$feed_link = "feed/$feed";
 
-		$link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
+		$link = trailingslashit($link).user_trailingslashit($feed_link, 'feed');
 	}
 
 	/**
@@ -719,7 +719,7 @@ 
 	 * @param string $link The author feed link.
 	 * @param string $feed Feed type.
 	 */
-	$link = apply_filters( 'author_feed_link', $link, $feed );
+	$link = apply_filters('author_feed_link', $link, $feed);
 
 	return $link;
 }
@@ -736,8 +736,8 @@ 
  * @param string $feed   Optional. Feed type.
  * @return string Link to the feed for the category specified by $cat_id.
 */
-function get_category_feed_link( $cat_id, $feed = '' ) {
-	return get_term_feed_link( $cat_id, 'category', $feed );
+function get_category_feed_link($cat_id, $feed = '') {
+	return get_term_feed_link($cat_id, 'category', $feed);
 }
 
 /**
@@ -753,40 +753,40 @@ 
  * @param string $feed     Optional. Feed type.
  * @return string|false Link to the feed for the term specified by $term_id and $taxonomy.
 */
-function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) {
-	$term_id = ( int ) $term_id;
+function get_term_feed_link($term_id, $taxonomy = 'category', $feed = '') {
+	$term_id = (int) $term_id;
 
-	$term = get_term( $term_id, $taxonomy  );
+	$term = get_term($term_id, $taxonomy);
 
-	if ( empty( $term ) || is_wp_error( $term ) )
+	if (empty($term) || is_wp_error($term))
 		return false;
 
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	$permalink_structure = get_option( 'permalink_structure' );
+	$permalink_structure = get_option('permalink_structure');
 
-	if ( '' == $permalink_structure ) {
-		if ( 'category' == $taxonomy ) {
+	if ('' == $permalink_structure) {
+		if ('category' == $taxonomy) {
 			$link = home_url("?feed=$feed&amp;cat=$term_id");
 		}
-		elseif ( 'post_tag' == $taxonomy ) {
+		elseif ('post_tag' == $taxonomy) {
 			$link = home_url("?feed=$feed&amp;tag=$term->slug");
 		} else {
-			$t = get_taxonomy( $taxonomy );
+			$t = get_taxonomy($taxonomy);
 			$link = home_url("?feed=$feed&amp;$t->query_var=$term->slug");
 		}
 	} else {
-		$link = get_term_link( $term_id, $term->taxonomy );
-		if ( $feed == get_default_feed() )
+		$link = get_term_link($term_id, $term->taxonomy);
+		if ($feed == get_default_feed())
 			$feed_link = 'feed';
 		else
 			$feed_link = "feed/$feed";
 
-		$link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
+		$link = trailingslashit($link).user_trailingslashit($feed_link, 'feed');
 	}
 
-	if ( 'category' == $taxonomy ) {
+	if ('category' == $taxonomy) {
 		/**
 		 * Filter the category feed link.
 		 *
@@ -795,8 +795,8 @@ 
 		 * @param string $link The category feed link.
 		 * @param string $feed Feed type.
 		 */
-		$link = apply_filters( 'category_feed_link', $link, $feed );
-	} elseif ( 'post_tag' == $taxonomy ) {
+		$link = apply_filters('category_feed_link', $link, $feed);
+	} elseif ('post_tag' == $taxonomy) {
 		/**
 		 * Filter the post tag feed link.
 		 *
@@ -805,7 +805,7 @@ 
 		 * @param string $link The tag feed link.
 		 * @param string $feed Feed type.
 		 */
-		$link = apply_filters( 'tag_feed_link', $link, $feed );
+		$link = apply_filters('tag_feed_link', $link, $feed);
 	} else {
 		/**
 		 * Filter the feed link for a taxonomy other than 'category' or 'post_tag'.
@@ -816,7 +816,7 @@ 
 		 * @param string $feed Feed type.
 		 * @param string $feed The taxonomy name.
 		 */
-		$link = apply_filters( 'taxonomy_feed_link', $link, $feed, $taxonomy );
+		$link = apply_filters('taxonomy_feed_link', $link, $feed, $taxonomy);
 	}
 
 	return $link;
@@ -831,8 +831,8 @@ 
  * @param string $feed   Optional. Feed type.
  * @return string The feed permalink for the given tag.
  */
-function get_tag_feed_link( $tag_id, $feed = '' ) {
-	return get_term_feed_link( $tag_id, 'post_tag', $feed );
+function get_tag_feed_link($tag_id, $feed = '') {
+	return get_term_feed_link($tag_id, 'post_tag', $feed);
 }
 
 /**
@@ -844,7 +844,7 @@ 
  * @param string $taxonomy Taxonomy
  * @return string The edit tag link URL for the given tag.
  */
-function get_edit_tag_link( $tag_id, $taxonomy = 'post_tag' ) {
+function get_edit_tag_link($tag_id, $taxonomy = 'post_tag') {
 	/**
 	 * Filter the edit link for a tag (or term in another taxonomy).
 	 *
@@ -852,7 +852,7 @@ 
 	 *
 	 * @param string $link The term edit link.
 	 */
-	return apply_filters( 'get_edit_tag_link', get_edit_term_link( $tag_id, $taxonomy ) );
+	return apply_filters('get_edit_tag_link', get_edit_term_link($tag_id, $taxonomy));
 }
 
 /**
@@ -865,8 +865,8 @@ 
  * @param string $after  Optional. Display after edit link.
  * @param object $tag    Tag object.
  */
-function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) {
-	$link = edit_term_link( $link, '', '', $tag, false );
+function edit_tag_link($link = '', $before = '', $after = '', $tag = null) {
+	$link = edit_term_link($link, '', '', $tag, false);
 
 	/**
 	 * Filter the anchor tag for the edit link for a tag (or term in another taxonomy).
@@ -875,7 +875,7 @@ 
 	 *
 	 * @param string $link The anchor tag for the edit link.
 	 */
-	echo $before . apply_filters( 'edit_tag_link', $link ) . $after;
+	echo $before.apply_filters('edit_tag_link', $link).$after;
 }
 
 /**
@@ -889,14 +889,14 @@ 
  *                            Defaults to the first object_type associated with the taxonomy.
  * @return string|null The edit term link URL for the given term, or null on failure.
  */
-function get_edit_term_link( $term_id, $taxonomy, $object_type = '' ) {
-	$tax = get_taxonomy( $taxonomy );
-	if ( ! $tax || ! current_user_can( $tax->cap->edit_terms ) ) {
+function get_edit_term_link($term_id, $taxonomy, $object_type = '') {
+	$tax = get_taxonomy($taxonomy);
+	if ( ! $tax || ! current_user_can($tax->cap->edit_terms)) {
 		return;
 	}
 
-	$term = get_term( $term_id, $taxonomy );
-	if ( ! $term || is_wp_error( $term ) ) {
+	$term = get_term($term_id, $taxonomy);
+	if ( ! $term || is_wp_error($term)) {
 		return;
 	}
 
@@ -906,13 +906,13 @@ 
 		'tag_ID' => $term->term_id,
 	);
 
-	if ( $object_type ) {
+	if ($object_type) {
 		$args['post_type'] = $object_type;
-	} elseif ( ! empty( $tax->object_type ) ) {
-		$args['post_type'] = reset( $tax->object_type );
+	} elseif ( ! empty($tax->object_type)) {
+		$args['post_type'] = reset($tax->object_type);
 	}
 
-	$location = add_query_arg( $args, admin_url( 'edit-tags.php' ) );
+	$location = add_query_arg($args, admin_url('edit-tags.php'));
 
 	/**
 	 * Filter the edit link for a term.
@@ -924,7 +924,7 @@ 
 	 * @param string $taxonomy    Taxonomy name.
 	 * @param string $object_type The object type (eg. the post type).
 	 */
-	return apply_filters( 'get_edit_term_link', $location, $term_id, $taxonomy, $object_type );
+	return apply_filters('get_edit_term_link', $location, $term_id, $taxonomy, $object_type);
 }
 
 /**
@@ -939,21 +939,21 @@ 
  * @param bool   $echo   Optional. Whether or not to echo the return. Default true.
  * @return string|void HTML content.
  */
-function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-	if ( is_null( $term ) )
+function edit_term_link($link = '', $before = '', $after = '', $term = null, $echo = true) {
+	if (is_null($term))
 		$term = get_queried_object();
 
-	if ( ! $term )
+	if ( ! $term)
 		return;
 
-	$tax = get_taxonomy( $term->taxonomy );
-	if ( ! current_user_can( $tax->cap->edit_terms ) )
+	$tax = get_taxonomy($term->taxonomy);
+	if ( ! current_user_can($tax->cap->edit_terms))
 		return;
 
-	if ( empty( $link ) )
+	if (empty($link))
 		$link = __('Edit This');
 
-	$link = '<a href="' . get_edit_term_link( $term->term_id, $term->taxonomy ) . '">' . $link . '</a>';
+	$link = '<a href="'.get_edit_term_link($term->term_id, $term->taxonomy).'">'.$link.'</a>';
 
 	/**
 	 * Filter the anchor tag for the edit link of a term.
@@ -963,9 +963,9 @@ 
 	 * @param string $link    The anchor tag for the edit link.
 	 * @param int    $term_id Term ID.
 	 */
-	$link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
+	$link = $before.apply_filters('edit_term_link', $link, $term->term_id).$after;
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	else
 		return $link;
@@ -981,23 +981,23 @@ 
  * @param string $query Optional. The query string to use. If empty the current query is used.
  * @return string The search permalink.
  */
-function get_search_link( $query = '' ) {
+function get_search_link($query = '') {
 	global $wp_rewrite;
 
-	if ( empty($query) )
-		$search = get_search_query( false );
+	if (empty($query))
+		$search = get_search_query(false);
 	else
 		$search = stripslashes($query);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty( $permastruct ) ) {
-		$link = home_url('?s=' . urlencode($search) );
+	if (empty($permastruct)) {
+		$link = home_url('?s='.urlencode($search));
 	} else {
 		$search = urlencode($search);
 		$search = str_replace('%2F', '/', $search); // %2F(/) is not valid within a URL, send it unencoded.
-		$link = str_replace( '%search%', $search, $permastruct );
-		$link = home_url( user_trailingslashit( $link, 'search' ) );
+		$link = str_replace('%search%', $search, $permastruct);
+		$link = home_url(user_trailingslashit($link, 'search'));
 	}
 
 	/**
@@ -1008,7 +1008,7 @@ 
 	 * @param string $link   Search permalink.
 	 * @param string $search The URL-encoded search term.
 	 */
-	return apply_filters( 'search_link', $link, $search );
+	return apply_filters('search_link', $link, $search);
 }
 
 /**
@@ -1026,12 +1026,12 @@ 
 	global $wp_rewrite;
 	$link = get_search_link($search_query);
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) ) {
+	if (empty($permastruct)) {
 		$link = add_query_arg('feed', $feed, $link);
 	} else {
 		$link = trailingslashit($link);
@@ -1047,7 +1047,7 @@ 
 	 * @param string $feed Feed type.
 	 * @param string $type The search type. One of 'posts' or 'comments'.
 	 */
-	return apply_filters( 'search_feed_link', $link, $feed, 'posts' );
+	return apply_filters('search_feed_link', $link, $feed, 'posts');
 }
 
 /**
@@ -1064,20 +1064,20 @@ 
 function get_search_comments_feed_link($search_query = '', $feed = '') {
 	global $wp_rewrite;
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
 	$link = get_search_feed_link($search_query, $feed);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) )
-		$link = add_query_arg('feed', 'comments-' . $feed, $link);
+	if (empty($permastruct))
+		$link = add_query_arg('feed', 'comments-'.$feed, $link);
 	else
 		$link = add_query_arg('withcomments', 1, $link);
 
 	/** This filter is documented in wp-includes/link-template.php */
-	return apply_filters( 'search_feed_link', $link, $feed, 'comments' );
+	return apply_filters('search_feed_link', $link, $feed, 'comments');
 }
 
 /**
@@ -1090,23 +1090,23 @@ 
  * @param string $post_type Post type
  * @return string|false The post type archive permalink.
  */
-function get_post_type_archive_link( $post_type ) {
+function get_post_type_archive_link($post_type) {
 	global $wp_rewrite;
-	if ( ! $post_type_obj = get_post_type_object( $post_type ) )
+	if ( ! $post_type_obj = get_post_type_object($post_type))
 		return false;
 
-	if ( ! $post_type_obj->has_archive )
+	if ( ! $post_type_obj->has_archive)
 		return false;
 
-	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) ) {
-		$struct = ( true === $post_type_obj->has_archive ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
-		if ( $post_type_obj->rewrite['with_front'] )
-			$struct = $wp_rewrite->front . $struct;
+	if (get_option('permalink_structure') && is_array($post_type_obj->rewrite)) {
+		$struct = (true === $post_type_obj->has_archive) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
+		if ($post_type_obj->rewrite['with_front'])
+			$struct = $wp_rewrite->front.$struct;
 		else
-			$struct = $wp_rewrite->root . $struct;
-		$link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );
+			$struct = $wp_rewrite->root.$struct;
+		$link = home_url(user_trailingslashit($struct, 'post_type_archive'));
 	} else {
-		$link = home_url( '?post_type=' . $post_type );
+		$link = home_url('?post_type='.$post_type);
 	}
 
 	/**
@@ -1117,7 +1117,7 @@ 
 	 * @param string $link      The post type archive permalink.
 	 * @param string $post_type Post type name.
 	 */
-	return apply_filters( 'post_type_archive_link', $link, $post_type );
+	return apply_filters('post_type_archive_link', $link, $post_type);
 }
 
 /**
@@ -1129,22 +1129,22 @@ 
  * @param string $feed      Optional. Feed type
  * @return string|false The post type feed permalink.
  */
-function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
+function get_post_type_archive_feed_link($post_type, $feed = '') {
 	$default_feed = get_default_feed();
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = $default_feed;
 
-	if ( ! $link = get_post_type_archive_link( $post_type ) )
+	if ( ! $link = get_post_type_archive_link($post_type))
 		return false;
 
-	$post_type_obj = get_post_type_object( $post_type );
-	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['feeds'] ) {
-		$link = trailingslashit( $link );
+	$post_type_obj = get_post_type_object($post_type);
+	if (get_option('permalink_structure') && is_array($post_type_obj->rewrite) && $post_type_obj->rewrite['feeds']) {
+		$link = trailingslashit($link);
 		$link .= 'feed/';
-		if ( $feed != $default_feed )
+		if ($feed != $default_feed)
 			$link .= "$feed/";
 	} else {
-		$link = add_query_arg( 'feed', $feed, $link );
+		$link = add_query_arg('feed', $feed, $link);
 	}
 
 	/**
@@ -1155,7 +1155,7 @@ 
 	 * @param string $link The post type archive feed link.
 	 * @param string $feed Feed type.
 	 */
-	return apply_filters( 'post_type_archive_feed_link', $link, $feed );
+	return apply_filters('post_type_archive_feed_link', $link, $feed);
 }
 
 /**
@@ -1170,22 +1170,22 @@ 
  * @param string $context Optional, defaults to display. How to write the '&', defaults to '&amp;'.
  * @return string|void The edit post link for the given post.
  */
-function get_edit_post_link( $id = 0, $context = 'display' ) {
-	if ( ! $post = get_post( $id ) )
+function get_edit_post_link($id = 0, $context = 'display') {
+	if ( ! $post = get_post($id))
 		return;
 
-	if ( 'revision' === $post->post_type )
+	if ('revision' === $post->post_type)
 		$action = '';
-	elseif ( 'display' == $context )
+	elseif ('display' == $context)
 		$action = '&amp;action=edit';
 	else
 		$action = '&action=edit';
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
+	$post_type_object = get_post_type_object($post->post_type);
+	if ( ! $post_type_object)
 		return;
 
-	if ( !current_user_can( 'edit_post', $post->ID ) )
+	if ( ! current_user_can('edit_post', $post->ID))
 		return;
 
 	/**
@@ -1198,7 +1198,7 @@ 
 	 * @param string $context The link context. If set to 'display' then ampersands
 	 *                        are encoded.
 	 */
-	return apply_filters( 'get_edit_post_link', admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) ), $post->ID, $context );
+	return apply_filters('get_edit_post_link', admin_url(sprintf($post_type_object->_edit_link.$action, $post->ID)), $post->ID, $context);
 }
 
 /**
@@ -1211,20 +1211,20 @@ 
  * @param string $after  Optional. Display after edit link.
  * @param int    $id     Optional. Post ID.
  */
-function edit_post_link( $text = null, $before = '', $after = '', $id = 0 ) {
-	if ( ! $post = get_post( $id ) ) {
+function edit_post_link($text = null, $before = '', $after = '', $id = 0) {
+	if ( ! $post = get_post($id)) {
 		return;
 	}
 
-	if ( ! $url = get_edit_post_link( $post->ID ) ) {
+	if ( ! $url = get_edit_post_link($post->ID)) {
 		return;
 	}
 
-	if ( null === $text ) {
-		$text = __( 'Edit This' );
+	if (null === $text) {
+		$text = __('Edit This');
 	}
 
-	$link = '<a class="post-edit-link" href="' . $url . '">' . $text . '</a>';
+	$link = '<a class="post-edit-link" href="'.$url.'">'.$text.'</a>';
 
 	/**
 	 * Filter the post edit link anchor tag.
@@ -1235,7 +1235,7 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $text    Anchor text.
 	 */
-	echo $before . apply_filters( 'edit_post_link', $link, $post->ID, $text ) . $after;
+	echo $before.apply_filters('edit_post_link', $link, $post->ID, $text).$after;
 }
 
 /**
@@ -1250,23 +1250,23 @@ 
  * @param bool   $force_delete Whether to bypass trash and force deletion. Default is false.
  * @return string|void The delete post link URL for the given post.
  */
-function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0' );
+function get_delete_post_link($id = 0, $deprecated = '', $force_delete = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '3.0');
 
-	if ( !$post = get_post( $id ) )
+	if ( ! $post = get_post($id))
 		return;
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
+	$post_type_object = get_post_type_object($post->post_type);
+	if ( ! $post_type_object)
 		return;
 
-	if ( !current_user_can( 'delete_post', $post->ID ) )
+	if ( ! current_user_can('delete_post', $post->ID))
 		return;
 
-	$action = ( $force_delete || !EMPTY_TRASH_DAYS ) ? 'delete' : 'trash';
+	$action = ($force_delete || ! EMPTY_TRASH_DAYS) ? 'delete' : 'trash';
 
-	$delete_link = add_query_arg( 'action', $action, admin_url( sprintf( $post_type_object->_edit_link, $post->ID ) ) );
+	$delete_link = add_query_arg('action', $action, admin_url(sprintf($post_type_object->_edit_link, $post->ID)));
 
 	/**
 	 * Filter the post delete link.
@@ -1277,7 +1277,7 @@ 
 	 * @param int    $post_id      Post ID.
 	 * @param bool   $force_delete Whether to bypass the trash and force deletion. Default false.
 	 */
-	return apply_filters( 'get_delete_post_link', wp_nonce_url( $delete_link, "$action-post_{$post->ID}" ), $post->ID, $force_delete );
+	return apply_filters('get_delete_post_link', wp_nonce_url($delete_link, "$action-post_{$post->ID}"), $post->ID, $force_delete);
 }
 
 /**
@@ -1288,13 +1288,13 @@ 
  * @param int $comment_id Optional. Comment ID.
  * @return string|void The edit comment link URL for the given comment.
  */
-function get_edit_comment_link( $comment_id = 0 ) {
-	$comment = get_comment( $comment_id );
+function get_edit_comment_link($comment_id = 0) {
+	$comment = get_comment($comment_id);
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
+	if ( ! current_user_can('edit_comment', $comment->comment_ID))
 		return;
 
-	$location = admin_url('comment.php?action=editcomment&amp;c=') . $comment->comment_ID;
+	$location = admin_url('comment.php?action=editcomment&amp;c=').$comment->comment_ID;
 
 	/**
 	 * Filter the comment edit link.
@@ -1303,7 +1303,7 @@ 
 	 *
 	 * @param string $location The edit link.
 	 */
-	return apply_filters( 'get_edit_comment_link', $location );
+	return apply_filters('get_edit_comment_link', $location);
 }
 
 /**
@@ -1317,18 +1317,18 @@ 
  * @param string $before Optional. Display before edit link.
  * @param string $after  Optional. Display after edit link.
  */
-function edit_comment_link( $text = null, $before = '', $after = '' ) {
+function edit_comment_link($text = null, $before = '', $after = '') {
 	global $comment;
 
-	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+	if ( ! current_user_can('edit_comment', $comment->comment_ID)) {
 		return;
 	}
 
-	if ( null === $text ) {
-		$text = __( 'Edit This' );
+	if (null === $text) {
+		$text = __('Edit This');
 	}
 
-	$link = '<a class="comment-edit-link" href="' . get_edit_comment_link( $comment->comment_ID ) . '">' . $text . '</a>';
+	$link = '<a class="comment-edit-link" href="'.get_edit_comment_link($comment->comment_ID).'">'.$text.'</a>';
 
 	/**
 	 * Filter the comment edit link anchor tag.
@@ -1339,7 +1339,7 @@ 
 	 * @param int    $comment_id Comment ID.
 	 * @param string $text       Anchor text.
 	 */
-	echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID, $text ) . $after;
+	echo $before.apply_filters('edit_comment_link', $link, $comment->comment_ID, $text).$after;
 }
 
 /**
@@ -1350,13 +1350,13 @@ 
  * @param int|stdClass $link Optional. Bookmark ID.
  * @return string|void The edit bookmark link URL.
  */
-function get_edit_bookmark_link( $link = 0 ) {
-	$link = get_bookmark( $link );
+function get_edit_bookmark_link($link = 0) {
+	$link = get_bookmark($link);
 
-	if ( !current_user_can('manage_links') )
+	if ( ! current_user_can('manage_links'))
 		return;
 
-	$location = admin_url('link.php?action=edit&amp;link_id=') . $link->link_id;
+	$location = admin_url('link.php?action=edit&amp;link_id=').$link->link_id;
 
 	/**
 	 * Filter the bookmark (link) edit link.
@@ -1366,7 +1366,7 @@ 
 	 * @param string $location The edit link.
 	 * @param int    $link_id  Bookmark ID.
 	 */
-	return apply_filters( 'get_edit_bookmark_link', $location, $link->link_id );
+	return apply_filters('get_edit_bookmark_link', $location, $link->link_id);
 }
 
 /**
@@ -1379,16 +1379,16 @@ 
  * @param string $after    Optional. Display after edit link.
  * @param int    $bookmark Optional. Bookmark ID.
  */
-function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) {
+function edit_bookmark_link($link = '', $before = '', $after = '', $bookmark = null) {
 	$bookmark = get_bookmark($bookmark);
 
-	if ( !current_user_can('manage_links') )
+	if ( ! current_user_can('manage_links'))
 		return;
 
-	if ( empty($link) )
+	if (empty($link))
 		$link = __('Edit This');
 
-	$link = '<a href="' . get_edit_bookmark_link( $bookmark ) . '">' . $link . '</a>';
+	$link = '<a href="'.get_edit_bookmark_link($bookmark).'">'.$link.'</a>';
 
 	/**
 	 * Filter the bookmark edit link anchor tag.
@@ -1398,7 +1398,7 @@ 
 	 * @param string $link    Anchor tag for the edit link.
 	 * @param int    $link_id Bookmark ID.
 	 */
-	echo $before . apply_filters( 'edit_bookmark_link', $link, $bookmark->link_id ) . $after;
+	echo $before.apply_filters('edit_bookmark_link', $link, $bookmark->link_id).$after;
 }
 
 /**
@@ -1409,22 +1409,22 @@ 
  * @param int $user_id Optional. User ID. Defaults to the current user.
  * @return string URL to edit user page or empty string.
  */
-function get_edit_user_link( $user_id = null ) {
-	if ( ! $user_id )
+function get_edit_user_link($user_id = null) {
+	if ( ! $user_id)
 		$user_id = get_current_user_id();
 
-	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) )
+	if (empty($user_id) || ! current_user_can('edit_user', $user_id))
 		return '';
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	if ( ! $user )
+	if ( ! $user)
 		return '';
 
-	if ( get_current_user_id() == $user->ID )
-		$link = get_edit_profile_url( $user->ID );
+	if (get_current_user_id() == $user->ID)
+		$link = get_edit_profile_url($user->ID);
 	else
-		$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+		$link = add_query_arg('user_id', $user->ID, self_admin_url('user-edit.php'));
 
 	/**
 	 * Filter the user edit link.
@@ -1434,7 +1434,7 @@ 
 	 * @param string $link    The edit link.
 	 * @param int    $user_id User ID.
 	 */
-	return apply_filters( 'get_edit_user_link', $link, $user->ID );
+	return apply_filters('get_edit_user_link', $link, $user->ID);
 }
 
 // Navigation links
@@ -1449,8 +1449,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
  */
-function get_previous_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post( $in_same_term, $excluded_terms, true, $taxonomy );
+function get_previous_post($in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post($in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1463,8 +1463,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
  */
-function get_next_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post( $in_same_term, $excluded_terms, false, $taxonomy );
+function get_next_post($in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post($in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1482,10 +1482,10 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
  */
-function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
+function get_adjacent_post($in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
 	global $wpdb;
 
-	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) )
+	if (( ! $post = get_post()) || ! taxonomy_exists($taxonomy))
 		return null;
 
 	$current_post_date = $post->post_date;
@@ -1493,50 +1493,50 @@ 
 	$join = '';
 	$where = '';
 
-	if ( $in_same_term || ! empty( $excluded_terms ) ) {
+	if ($in_same_term || ! empty($excluded_terms)) {
 		$join = " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
-		$where = $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
+		$where = $wpdb->prepare("AND tt.taxonomy = %s", $taxonomy);
 
-		if ( ! empty( $excluded_terms ) && ! is_array( $excluded_terms ) ) {
+		if ( ! empty($excluded_terms) && ! is_array($excluded_terms)) {
 			// back-compat, $excluded_terms used to be $excluded_terms with IDs separated by " and "
-			if ( false !== strpos( $excluded_terms, ' and ' ) ) {
-				_deprecated_argument( __FUNCTION__, '3.3', sprintf( __( 'Use commas instead of %s to separate excluded terms.' ), "'and'" ) );
-				$excluded_terms = explode( ' and ', $excluded_terms );
+			if (false !== strpos($excluded_terms, ' and ')) {
+				_deprecated_argument(__FUNCTION__, '3.3', sprintf(__('Use commas instead of %s to separate excluded terms.'), "'and'"));
+				$excluded_terms = explode(' and ', $excluded_terms);
 			} else {
-				$excluded_terms = explode( ',', $excluded_terms );
+				$excluded_terms = explode(',', $excluded_terms);
 			}
 
-			$excluded_terms = array_map( 'intval', $excluded_terms );
+			$excluded_terms = array_map('intval', $excluded_terms);
 		}
 
-		if ( $in_same_term ) {
-			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
+		if ($in_same_term) {
+			if ( ! is_object_in_taxonomy($post->post_type, $taxonomy))
 				return '';
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+			$term_array = wp_get_object_terms($post->ID, $taxonomy, array('fields' => 'ids'));
 
 			// Remove any exclusions from the term array to include.
-			$term_array = array_diff( $term_array, (array) $excluded_terms );
-			$term_array = array_map( 'intval', $term_array );
+			$term_array = array_diff($term_array, (array) $excluded_terms);
+			$term_array = array_map('intval', $term_array);
 
-			if ( ! $term_array || is_wp_error( $term_array ) )
+			if ( ! $term_array || is_wp_error($term_array))
 				return '';
 
-			$where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
+			$where .= " AND tt.term_id IN (".implode(',', $term_array).")";
 		}
 
-		if ( ! empty( $excluded_terms ) ) {
-			$where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (" . implode( $excluded_terms, ',' ) . ') )';
+		if ( ! empty($excluded_terms)) {
+			$where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (".implode($excluded_terms, ',').') )';
 		}
 	}
 
 	// 'post_status' clause depends on the current user.
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		$user_id = get_current_user_id();
 
-		$post_type_object = get_post_type_object( $post->post_type );
-		if ( empty( $post_type_object ) ) {
+		$post_type_object = get_post_type_object($post->post_type);
+		if (empty($post_type_object)) {
 			$post_type_cap    = $post->post_type;
-			$read_private_cap = 'read_private_' . $post_type_cap . 's';
+			$read_private_cap = 'read_private_'.$post_type_cap.'s';
 		} else {
 			$read_private_cap = $post_type_object->cap->read_private_posts;
 		}
@@ -1545,13 +1545,13 @@ 
 		 * Results should include private posts belonging to the current user, or private posts where the
 		 * current user has the 'read_private_posts' cap.
 		 */
-		$private_states = get_post_stati( array( 'private' => true ) );
+		$private_states = get_post_stati(array('private' => true));
 		$where .= " AND ( p.post_status = 'publish'";
-		foreach ( (array) $private_states as $state ) {
-			if ( current_user_can( $read_private_cap ) ) {
-				$where .= $wpdb->prepare( " OR p.post_status = %s", $state );
+		foreach ((array) $private_states as $state) {
+			if (current_user_can($read_private_cap)) {
+				$where .= $wpdb->prepare(" OR p.post_status = %s", $state);
 			} else {
-				$where .= $wpdb->prepare( " OR (p.post_author = %d AND p.post_status = %s)", $user_id, $state );
+				$where .= $wpdb->prepare(" OR (p.post_author = %d AND p.post_status = %s)", $user_id, $state);
 			}
 		}
 		$where .= " )";
@@ -1575,7 +1575,7 @@ 
 	 * @param bool   $in_same_term   Whether post should be in a same taxonomy term.
 	 * @param array  $excluded_terms Array of excluded term IDs.
 	 */
-	$join  = apply_filters( "get_{$adjacent}_post_join", $join, $in_same_term, $excluded_terms );
+	$join = apply_filters("get_{$adjacent}_post_join", $join, $in_same_term, $excluded_terms);
 
 	/**
 	 * Filter the WHERE clause in the SQL for an adjacent post query.
@@ -1589,7 +1589,7 @@ 
 	 * @param bool   $in_same_term   Whether post should be in a same taxonomy term.
 	 * @param array  $excluded_terms Array of excluded term IDs.
 	 */
-	$where = apply_filters( "get_{$adjacent}_post_where", $wpdb->prepare( "WHERE p.post_date $op %s AND p.post_type = %s $where", $current_post_date, $post->post_type ), $in_same_term, $excluded_terms );
+	$where = apply_filters("get_{$adjacent}_post_where", $wpdb->prepare("WHERE p.post_date $op %s AND p.post_type = %s $where", $current_post_date, $post->post_type), $in_same_term, $excluded_terms);
 
 	/**
 	 * Filter the ORDER BY clause in the SQL for an adjacent post query.
@@ -1601,25 +1601,25 @@ 
 	 *
 	 * @param string $order_by The `ORDER BY` clause in the SQL.
 	 */
-	$sort  = apply_filters( "get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1" );
+	$sort  = apply_filters("get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1");
 
 	$query = "SELECT p.ID FROM $wpdb->posts AS p $join $where $sort";
-	$query_key = 'adjacent_post_' . md5( $query );
-	$result = wp_cache_get( $query_key, 'counts' );
-	if ( false !== $result ) {
-		if ( $result )
-			$result = get_post( $result );
+	$query_key = 'adjacent_post_'.md5($query);
+	$result = wp_cache_get($query_key, 'counts');
+	if (false !== $result) {
+		if ($result)
+			$result = get_post($result);
 		return $result;
 	}
 
-	$result = $wpdb->get_var( $query );
-	if ( null === $result )
+	$result = $wpdb->get_var($query);
+	if (null === $result)
 		$result = '';
 
-	wp_cache_set( $query_key, $result, 'counts' );
+	wp_cache_set($query_key, $result, 'counts');
 
-	if ( $result )
-		$result = get_post( $result );
+	if ($result)
+		$result = get_post($result);
 
 	return $result;
 }
@@ -1638,28 +1638,28 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string|void The adjacent post relational link URL.
  */
-function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() && $post = get_post() )
-		$post = get_post( $post->post_parent );
+function get_adjacent_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	if ($previous && is_attachment() && $post = get_post())
+		$post = get_post($post->post_parent);
 	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+		$post = get_adjacent_post($in_same_term, $excluded_terms, $previous, $taxonomy);
 
-	if ( empty( $post ) )
+	if (empty($post))
 		return;
 
-	$post_title = the_title_attribute( array( 'echo' => false, 'post' => $post ) );
+	$post_title = the_title_attribute(array('echo' => false, 'post' => $post));
 
-	if ( empty( $post_title ) )
-		$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	if (empty($post_title))
+		$post_title = $previous ? __('Previous Post') : __('Next Post');
 
-	$date = mysql2date( get_option( 'date_format' ), $post->post_date );
+	$date = mysql2date(get_option('date_format'), $post->post_date);
 
-	$title = str_replace( '%title', $post_title, $title );
-	$title = str_replace( '%date', $date, $title );
+	$title = str_replace('%title', $post_title, $title);
+	$title = str_replace('%date', $date, $title);
 
 	$link = $previous ? "<link rel='prev' title='" : "<link rel='next' title='";
-	$link .= esc_attr( $title );
-	$link .= "' href='" . get_permalink( $post ) . "' />\n";
+	$link .= esc_attr($title);
+	$link .= "' href='".get_permalink($post)."' />\n";
 
 	$adjacent = $previous ? 'previous' : 'next';
 
@@ -1673,7 +1673,7 @@ 
 	 *
 	 * @param string $link The relational link.
 	 */
-	return apply_filters( "{$adjacent}_post_rel_link", $link );
+	return apply_filters("{$adjacent}_post_rel_link", $link);
 }
 
 /**
@@ -1686,9 +1686,9 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function adjacent_posts_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, true, $taxonomy );
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, false, $taxonomy );
+function adjacent_posts_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, true, $taxonomy);
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1699,7 +1699,7 @@ 
  *
  */
 function adjacent_posts_rel_link_wp_head() {
-	if ( ! is_single() || is_attachment() ) {
+	if ( ! is_single() || is_attachment()) {
 		return;
 	}
 	adjacent_posts_rel_link();
@@ -1715,8 +1715,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function next_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, false, $taxonomy );
+function next_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1729,8 +1729,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default true.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function prev_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, true, $taxonomy );
+function prev_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1747,9 +1747,9 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|array Array containing the boundary post object if successful, null otherwise.
  */
-function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category' ) {
+function get_boundary_post($in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category') {
 	$post = get_post();
-	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) )
+	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists($taxonomy))
 		return null;
 
 	$query_args = array(
@@ -1761,34 +1761,34 @@ 
 
 	$term_array = array();
 
-	if ( ! is_array( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) )
-			$excluded_terms = explode( ',', $excluded_terms );
+	if ( ! is_array($excluded_terms)) {
+		if ( ! empty($excluded_terms))
+			$excluded_terms = explode(',', $excluded_terms);
 		else
 			$excluded_terms = array();
 	}
 
-	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( $in_same_term )
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+	if ($in_same_term || ! empty($excluded_terms)) {
+		if ($in_same_term)
+			$term_array = wp_get_object_terms($post->ID, $taxonomy, array('fields' => 'ids'));
 
-		if ( ! empty( $excluded_terms ) ) {
-			$excluded_terms = array_map( 'intval', $excluded_terms );
-			$excluded_terms = array_diff( $excluded_terms, $term_array );
+		if ( ! empty($excluded_terms)) {
+			$excluded_terms = array_map('intval', $excluded_terms);
+			$excluded_terms = array_diff($excluded_terms, $term_array);
 
 			$inverse_terms = array();
-			foreach ( $excluded_terms as $excluded_term )
+			foreach ($excluded_terms as $excluded_term)
 				$inverse_terms[] = $excluded_term * -1;
 			$excluded_terms = $inverse_terms;
 		}
 
-		$query_args[ 'tax_query' ] = array( array(
+		$query_args['tax_query'] = array(array(
 			'taxonomy' => $taxonomy,
-			'terms' => array_merge( $term_array, $excluded_terms )
-		) );
+			'terms' => array_merge($term_array, $excluded_terms)
+		));
 	}
 
-	return get_posts( $query_args );
+	return get_posts($query_args);
 }
 
 /*
@@ -1803,8 +1803,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the previous post in relation to the current post.
  */
-function get_previous_post_link( $format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, true, $taxonomy );
+function get_previous_post_link($format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1819,8 +1819,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function previous_post_link( $format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_previous_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
+function previous_post_link($format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_previous_post_link($format, $link, $in_same_term, $excluded_terms, $taxonomy);
 }
 
 /**
@@ -1835,8 +1835,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the next post in relation to the current post.
  */
-function get_next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, false, $taxonomy );
+function get_next_post_link($format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1851,8 +1851,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	 echo get_next_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
+function next_post_link($format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	 echo get_next_post_link($format, $link, $in_same_term, $excluded_terms, $taxonomy);
 }
 
 /**
@@ -1870,32 +1870,32 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the previous or next post in relation to the current post.
  */
-function get_adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() )
-		$post = get_post( get_post()->post_parent );
+function get_adjacent_post_link($format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	if ($previous && is_attachment())
+		$post = get_post(get_post()->post_parent);
 	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+		$post = get_adjacent_post($in_same_term, $excluded_terms, $previous, $taxonomy);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		$output = '';
 	} else {
 		$title = $post->post_title;
 
-		if ( empty( $post->post_title ) )
-			$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		if (empty($post->post_title))
+			$title = $previous ? __('Previous Post') : __('Next Post');
 
 		/** This filter is documented in wp-includes/post-template.php */
-		$title = apply_filters( 'the_title', $title, $post->ID );
+		$title = apply_filters('the_title', $title, $post->ID);
 
-		$date = mysql2date( get_option( 'date_format' ), $post->post_date );
+		$date = mysql2date(get_option('date_format'), $post->post_date);
 		$rel = $previous ? 'prev' : 'next';
 
-		$string = '<a href="' . get_permalink( $post ) . '" rel="'.$rel.'">';
-		$inlink = str_replace( '%title', $title, $link );
-		$inlink = str_replace( '%date', $date, $inlink );
-		$inlink = $string . $inlink . '</a>';
+		$string = '<a href="'.get_permalink($post).'" rel="'.$rel.'">';
+		$inlink = str_replace('%title', $title, $link);
+		$inlink = str_replace('%date', $date, $inlink);
+		$inlink = $string.$inlink.'</a>';
 
-		$output = str_replace( '%link', $inlink, $format );
+		$output = str_replace('%link', $inlink, $format);
 	}
 
 	$adjacent = $previous ? 'previous' : 'next';
@@ -1915,7 +1915,7 @@ 
 	 * @param WP_Post $post     The adjacent post.
 	 * @param string  $adjacent Whether the post is previous or next.
 	 */
-	return apply_filters( "{$adjacent}_post_link", $output, $format, $link, $post, $adjacent );
+	return apply_filters("{$adjacent}_post_link", $output, $format, $link, $post, $adjacent);
 }
 
 /**
@@ -1932,8 +1932,8 @@ 
  * @param bool         $previous       Optional. Whether to display link to previous or next post. Default true.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	echo get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, $previous, $taxonomy );
+function adjacent_post_link($format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	echo get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, $previous, $taxonomy);
 }
 
 /**
@@ -1948,53 +1948,53 @@ 
 * 	                    Otherwise, prepares the URL with esc_url_raw().
  * @return string The link URL for the given page number.
  */
-function get_pagenum_link($pagenum = 1, $escape = true ) {
+function get_pagenum_link($pagenum = 1, $escape = true) {
 	global $wp_rewrite;
 
 	$pagenum = (int) $pagenum;
 
-	$request = remove_query_arg( 'paged' );
+	$request = remove_query_arg('paged');
 
 	$home_root = parse_url(home_url());
-	$home_root = ( isset($home_root['path']) ) ? $home_root['path'] : '';
-	$home_root = preg_quote( $home_root, '|' );
+	$home_root = (isset($home_root['path'])) ? $home_root['path'] : '';
+	$home_root = preg_quote($home_root, '|');
 
-	$request = preg_replace('|^'. $home_root . '|i', '', $request);
+	$request = preg_replace('|^'.$home_root.'|i', '', $request);
 	$request = preg_replace('|^/+|', '', $request);
 
-	if ( !$wp_rewrite->using_permalinks() || is_admin() ) {
-		$base = trailingslashit( get_bloginfo( 'url' ) );
+	if ( ! $wp_rewrite->using_permalinks() || is_admin()) {
+		$base = trailingslashit(get_bloginfo('url'));
 
-		if ( $pagenum > 1 ) {
-			$result = add_query_arg( 'paged', $pagenum, $base . $request );
+		if ($pagenum > 1) {
+			$result = add_query_arg('paged', $pagenum, $base.$request);
 		} else {
-			$result = $base . $request;
+			$result = $base.$request;
 		}
 	} else {
 		$qs_regex = '|\?.*?$|';
-		preg_match( $qs_regex, $request, $qs_match );
+		preg_match($qs_regex, $request, $qs_match);
 
-		if ( !empty( $qs_match[0] ) ) {
+		if ( ! empty($qs_match[0])) {
 			$query_string = $qs_match[0];
-			$request = preg_replace( $qs_regex, '', $request );
+			$request = preg_replace($qs_regex, '', $request);
 		} else {
 			$query_string = '';
 		}
 
-		$request = preg_replace( "|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
-		$request = preg_replace( '|^' . preg_quote( $wp_rewrite->index, '|' ) . '|i', '', $request);
+		$request = preg_replace("|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
+		$request = preg_replace('|^'.preg_quote($wp_rewrite->index, '|').'|i', '', $request);
 		$request = ltrim($request, '/');
 
-		$base = trailingslashit( get_bloginfo( 'url' ) );
+		$base = trailingslashit(get_bloginfo('url'));
 
-		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
-			$base .= $wp_rewrite->index . '/';
+		if ($wp_rewrite->using_index_permalinks() && ($pagenum > 1 || '' != $request))
+			$base .= $wp_rewrite->index.'/';
 
-		if ( $pagenum > 1 ) {
-			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
+		if ($pagenum > 1) {
+			$request = (( ! empty($request)) ? trailingslashit($request) : $request).user_trailingslashit($wp_rewrite->pagination_base."/".$pagenum, 'paged');
 		}
 
-		$result = $base . $request . $query_string;
+		$result = $base.$request.$query_string;
 	}
 
 	/**
@@ -2004,12 +2004,12 @@ 
 	 *
 	 * @param string $result The page number link.
 	 */
-	$result = apply_filters( 'get_pagenum_link', $result );
+	$result = apply_filters('get_pagenum_link', $result);
 
-	if ( $escape )
-		return esc_url( $result );
+	if ($escape)
+		return esc_url($result);
 	else
-		return esc_url_raw( $result );
+		return esc_url_raw($result);
 }
 
 /**
@@ -2027,11 +2027,11 @@ 
 function get_next_posts_page_link($max_page = 0) {
 	global $paged;
 
-	if ( !is_single() ) {
-		if ( !$paged )
+	if ( ! is_single()) {
+		if ( ! $paged)
 			$paged = 1;
 		$nextpage = intval($paged) + 1;
-		if ( !$max_page || $max_page >= $nextpage )
+		if ( ! $max_page || $max_page >= $nextpage)
 			return get_pagenum_link($nextpage);
 	}
 }
@@ -2045,10 +2045,10 @@ 
  * @param bool  $echo     Optional. Echo or return;
  * @return string|void The link URL for next posts page if `$echo = false`.
  */
-function next_posts( $max_page = 0, $echo = true ) {
-	$output = esc_url( get_next_posts_page_link( $max_page ) );
+function next_posts($max_page = 0, $echo = true) {
+	$output = esc_url(get_next_posts_page_link($max_page));
 
-	if ( $echo )
+	if ($echo)
 		echo $output;
 	else
 		return $output;
@@ -2066,21 +2066,21 @@ 
  * @param int    $max_page Optional. Max pages.
  * @return string|void HTML-formatted next posts page link.
  */
-function get_next_posts_link( $label = null, $max_page = 0 ) {
+function get_next_posts_link($label = null, $max_page = 0) {
 	global $paged, $wp_query;
 
-	if ( !$max_page )
+	if ( ! $max_page)
 		$max_page = $wp_query->max_num_pages;
 
-	if ( !$paged )
+	if ( ! $paged)
 		$paged = 1;
 
 	$nextpage = intval($paged) + 1;
 
-	if ( null === $label )
-		$label = __( 'Next Page &raquo;' );
+	if (null === $label)
+		$label = __('Next Page &raquo;');
 
-	if ( !is_single() && ( $nextpage <= $max_page ) ) {
+	if ( ! is_single() && ($nextpage <= $max_page)) {
 		/**
 		 * Filter the anchor tag attributes for the next posts page link.
 		 *
@@ -2088,9 +2088,9 @@ 
 		 *
 		 * @param string $attributes Attributes for the anchor tag.
 		 */
-		$attr = apply_filters( 'next_posts_link_attributes', '' );
+		$attr = apply_filters('next_posts_link_attributes', '');
 
-		return '<a href="' . next_posts( $max_page, false ) . "\" $attr>" . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) . '</a>';
+		return '<a href="'.next_posts($max_page, false)."\" $attr>".preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 	}
 }
 
@@ -2102,8 +2102,8 @@ 
  * @param string $label    Content for link text.
  * @param int    $max_page Optional. Max pages.
  */
-function next_posts_link( $label = null, $max_page = 0 ) {
-	echo get_next_posts_link( $label, $max_page );
+function next_posts_link($label = null, $max_page = 0) {
+	echo get_next_posts_link($label, $max_page);
 }
 
 /**
@@ -2122,9 +2122,9 @@ 
 function get_previous_posts_page_link() {
 	global $paged;
 
-	if ( !is_single() ) {
+	if ( ! is_single()) {
 		$nextpage = intval($paged) - 1;
-		if ( $nextpage < 1 )
+		if ($nextpage < 1)
 			$nextpage = 1;
 		return get_pagenum_link($nextpage);
 	}
@@ -2138,10 +2138,10 @@ 
  * @param bool $echo Optional. Echo or return;
  * @return string|void The previous posts page link if `$echo = false`.
  */
-function previous_posts( $echo = true ) {
-	$output = esc_url( get_previous_posts_page_link() );
+function previous_posts($echo = true) {
+	$output = esc_url(get_previous_posts_page_link());
 
-	if ( $echo )
+	if ($echo)
 		echo $output;
 	else
 		return $output;
@@ -2157,13 +2157,13 @@ 
  * @param string $label Optional. Previous page link text.
  * @return string|void HTML-formatted previous page link.
  */
-function get_previous_posts_link( $label = null ) {
+function get_previous_posts_link($label = null) {
 	global $paged;
 
-	if ( null === $label )
-		$label = __( '&laquo; Previous Page' );
+	if (null === $label)
+		$label = __('&laquo; Previous Page');
 
-	if ( !is_single() && $paged > 1 ) {
+	if ( ! is_single() && $paged > 1) {
 		/**
 		 * Filter the anchor tag attributes for the previous posts page link.
 		 *
@@ -2171,8 +2171,8 @@ 
 		 *
 		 * @param string $attributes Attributes for the anchor tag.
 		 */
-		$attr = apply_filters( 'previous_posts_link_attributes', '' );
-		return '<a href="' . previous_posts( false ) . "\" $attr>". preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) .'</a>';
+		$attr = apply_filters('previous_posts_link_attributes', '');
+		return '<a href="'.previous_posts(false)."\" $attr>".preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 	}
 }
 
@@ -2183,8 +2183,8 @@ 
  *
  * @param string $label Optional. Previous page link text.
  */
-function previous_posts_link( $label = null ) {
-	echo get_previous_posts_link( $label );
+function previous_posts_link($label = null) {
+	echo get_previous_posts_link($label);
 }
 
 /**
@@ -2197,18 +2197,18 @@ 
  * @param string|array $args Optional args.
  * @return string The posts link navigation.
  */
-function get_posts_nav_link( $args = array() ) {
+function get_posts_nav_link($args = array()) {
 	global $wp_query;
 
 	$return = '';
 
-	if ( !is_singular() ) {
+	if ( ! is_singular()) {
 		$defaults = array(
 			'sep' => ' &#8212; ',
 			'prelabel' => __('&laquo; Previous Page'),
 			'nxtlabel' => __('Next Page &raquo;'),
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$max_num_pages = $wp_query->max_num_pages;
 		$paged = get_query_var('paged');
@@ -2218,7 +2218,7 @@ 
 			$args['sep'] = '';
 		}
 
-		if ( $max_num_pages > 1 ) {
+		if ($max_num_pages > 1) {
 			$return = get_previous_posts_link($args['prelabel']);
 			$return .= preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $args['sep']);
 			$return .= get_next_posts_link($args['nxtlabel']);
@@ -2237,8 +2237,8 @@ 
  * @param string $prelabel Optional. Label for previous pages.
  * @param string $nxtlabel Optional Label for next pages.
  */
-function posts_nav_link( $sep = '', $prelabel = '', $nxtlabel = '' ) {
-	$args = array_filter( compact('sep', 'prelabel', 'nxtlabel') );
+function posts_nav_link($sep = '', $prelabel = '', $nxtlabel = '') {
+	$args = array_filter(compact('sep', 'prelabel', 'nxtlabel'));
 	echo get_posts_nav_link($args);
 }
 
@@ -2256,20 +2256,20 @@ 
  * }
  * @return string Markup for post links.
  */
-function get_the_post_navigation( $args = array() ) {
-	$args = wp_parse_args( $args, array(
+function get_the_post_navigation($args = array()) {
+	$args = wp_parse_args($args, array(
 		'prev_text'          => '%title',
 		'next_text'          => '%title',
-		'screen_reader_text' => __( 'Post navigation' ),
-	) );
+		'screen_reader_text' => __('Post navigation'),
+	));
 
 	$navigation = '';
-	$previous   = get_previous_post_link( '<div class="nav-previous">%link</div>', $args['prev_text'] );
-	$next       = get_next_post_link( '<div class="nav-next">%link</div>', $args['next_text'] );
+	$previous   = get_previous_post_link('<div class="nav-previous">%link</div>', $args['prev_text']);
+	$next       = get_next_post_link('<div class="nav-next">%link</div>', $args['next_text']);
 
 	// Only add markup if there's somewhere to navigate to.
-	if ( $previous || $next ) {
-		$navigation = _navigation_markup( $previous . $next, 'post-navigation', $args['screen_reader_text'] );
+	if ($previous || $next) {
+		$navigation = _navigation_markup($previous.$next, 'post-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2283,8 +2283,8 @@ 
  * @param array $args Optional. See {@see get_the_post_navigation()} for available
  *                    arguments. Default empty array.
  */
-function the_post_navigation( $args = array() ) {
-	echo get_the_post_navigation( $args );
+function the_post_navigation($args = array()) {
+	echo get_the_post_navigation($args);
 }
 
 /**
@@ -2306,29 +2306,29 @@ 
  * }
  * @return string Markup for posts links.
  */
-function get_the_posts_navigation( $args = array() ) {
+function get_the_posts_navigation($args = array()) {
 	$navigation = '';
 
 	// Don't print empty markup if there's only one page.
-	if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
-		$args = wp_parse_args( $args, array(
-			'prev_text'          => __( 'Older posts' ),
-			'next_text'          => __( 'Newer posts' ),
-			'screen_reader_text' => __( 'Posts navigation' ),
-		) );
-
-		$next_link = get_previous_posts_link( $args['next_text'] );
-		$prev_link = get_next_posts_link( $args['prev_text'] );
-
-		if ( $prev_link ) {
-			$navigation .= '<div class="nav-previous">' . $prev_link . '</div>';
+	if ($GLOBALS['wp_query']->max_num_pages > 1) {
+		$args = wp_parse_args($args, array(
+			'prev_text'          => __('Older posts'),
+			'next_text'          => __('Newer posts'),
+			'screen_reader_text' => __('Posts navigation'),
+		));
+
+		$next_link = get_previous_posts_link($args['next_text']);
+		$prev_link = get_next_posts_link($args['prev_text']);
+
+		if ($prev_link) {
+			$navigation .= '<div class="nav-previous">'.$prev_link.'</div>';
 		}
 
-		if ( $next_link ) {
-			$navigation .= '<div class="nav-next">' . $next_link . '</div>';
+		if ($next_link) {
+			$navigation .= '<div class="nav-next">'.$next_link.'</div>';
 		}
 
-		$navigation = _navigation_markup( $navigation, 'posts-navigation', $args['screen_reader_text'] );
+		$navigation = _navigation_markup($navigation, 'posts-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2342,8 +2342,8 @@ 
  * @param array $args Optional. See {@see get_the_posts_navigation()} for available
  *                    arguments. Default empty array.
  */
-function the_posts_navigation( $args = array() ) {
-	echo get_the_posts_navigation( $args );
+function the_posts_navigation($args = array()) {
+	echo get_the_posts_navigation($args);
 }
 
 /**
@@ -2360,28 +2360,28 @@ 
  * }
  * @return string Markup for pagination links.
  */
-function get_the_posts_pagination( $args = array() ) {
+function get_the_posts_pagination($args = array()) {
 	$navigation = '';
 
 	// Don't print empty markup if there's only one page.
-	if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
-		$args = wp_parse_args( $args, array(
+	if ($GLOBALS['wp_query']->max_num_pages > 1) {
+		$args = wp_parse_args($args, array(
 			'mid_size'           => 1,
-			'prev_text'          => _x( 'Previous', 'previous post' ),
-			'next_text'          => _x( 'Next', 'next post' ),
-			'screen_reader_text' => __( 'Posts navigation' ),
-		) );
+			'prev_text'          => _x('Previous', 'previous post'),
+			'next_text'          => _x('Next', 'next post'),
+			'screen_reader_text' => __('Posts navigation'),
+		));
 
 		// Make sure we get a string back. Plain is the next best thing.
-		if ( isset( $args['type'] ) && 'array' == $args['type'] ) {
+		if (isset($args['type']) && 'array' == $args['type']) {
 			$args['type'] = 'plain';
 		}
 
 		// Set up paginated links.
-		$links = paginate_links( $args );
+		$links = paginate_links($args);
 
-		if ( $links ) {
-			$navigation = _navigation_markup( $links, 'pagination', $args['screen_reader_text'] );
+		if ($links) {
+			$navigation = _navigation_markup($links, 'pagination', $args['screen_reader_text']);
 		}
 	}
 
@@ -2397,8 +2397,8 @@ 
  * @param array $args Optional. See {@see get_the_posts_pagination()} for available arguments.
  *                    Default empty array.
  */
-function the_posts_pagination( $args = array() ) {
-	echo get_the_posts_pagination( $args );
+function the_posts_pagination($args = array()) {
+	echo get_the_posts_pagination($args);
 }
 
 /**
@@ -2412,9 +2412,9 @@ 
  * @param string $screen_reader_text Optional. Screen reader text for nav element. Default: 'Posts navigation'.
  * @return string Navigation template tag.
  */
-function _navigation_markup( $links, $class = 'posts-navigation', $screen_reader_text = '' ) {
-	if ( empty( $screen_reader_text ) ) {
-		$screen_reader_text = __( 'Posts navigation' );
+function _navigation_markup($links, $class = 'posts-navigation', $screen_reader_text = '') {
+	if (empty($screen_reader_text)) {
+		$screen_reader_text = __('Posts navigation');
 	}
 
 	$template = '
@@ -2423,7 +2423,7 @@ 
 		<div class="nav-links">%3$s</div>
 	</nav>';
 
-	return sprintf( $template, sanitize_html_class( $class ), esc_html( $screen_reader_text ), $links );
+	return sprintf($template, sanitize_html_class($class), esc_html($screen_reader_text), $links);
 }
 
 /**
@@ -2437,25 +2437,25 @@ 
  * @param int $max_page Optional. The maximum number of comment pages.
  * @return string The comments page number link URL.
  */
-function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) {
+function get_comments_pagenum_link($pagenum = 1, $max_page = 0) {
 	global $wp_rewrite;
 
 	$pagenum = (int) $pagenum;
 
 	$result = get_permalink();
 
-	if ( 'newest' == get_option('default_comments_page') ) {
-		if ( $pagenum != $max_page ) {
-			if ( $wp_rewrite->using_permalinks() )
-				$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+	if ('newest' == get_option('default_comments_page')) {
+		if ($pagenum != $max_page) {
+			if ($wp_rewrite->using_permalinks())
+				$result = user_trailingslashit(trailingslashit($result).$wp_rewrite->comments_pagination_base.'-'.$pagenum, 'commentpaged');
 			else
-				$result = add_query_arg( 'cpage', $pagenum, $result );
+				$result = add_query_arg('cpage', $pagenum, $result);
 		}
-	} elseif ( $pagenum > 1 ) {
-		if ( $wp_rewrite->using_permalinks() )
-			$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+	} elseif ($pagenum > 1) {
+		if ($wp_rewrite->using_permalinks())
+			$result = user_trailingslashit(trailingslashit($result).$wp_rewrite->comments_pagination_base.'-'.$pagenum, 'commentpaged');
 		else
-			$result = add_query_arg( 'cpage', $pagenum, $result );
+			$result = add_query_arg('cpage', $pagenum, $result);
 	}
 
 	$result .= '#comments';
@@ -2467,7 +2467,7 @@ 
 	 *
 	 * @param string $result The comments page number link.
 	 */
-	return apply_filters( 'get_comments_pagenum_link', $result );
+	return apply_filters('get_comments_pagenum_link', $result);
 }
 
 /**
@@ -2481,30 +2481,30 @@ 
  * @param int    $max_page Optional. Max page.
  * @return string|void HTML-formatted link for the next page of comments.
  */
-function get_next_comments_link( $label = '', $max_page = 0 ) {
+function get_next_comments_link($label = '', $max_page = 0) {
 	global $wp_query;
 
-	if ( !is_singular() || !get_option('page_comments') )
+	if ( ! is_singular() || ! get_option('page_comments'))
 		return;
 
 	$page = get_query_var('cpage');
 
-	if ( ! $page ) {
+	if ( ! $page) {
 		$page = 1;
 	}
 
 	$nextpage = intval($page) + 1;
 
-	if ( empty($max_page) )
+	if (empty($max_page))
 		$max_page = $wp_query->max_num_comment_pages;
 
-	if ( empty($max_page) )
+	if (empty($max_page))
 		$max_page = get_comment_pages_count();
 
-	if ( $nextpage > $max_page )
+	if ($nextpage > $max_page)
 		return;
 
-	if ( empty($label) )
+	if (empty($label))
 		$label = __('Newer Comments &raquo;');
 
 	/**
@@ -2514,7 +2514,7 @@ 
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>'. preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
+	return '<a href="'.esc_url(get_comments_pagenum_link($nextpage, $max_page)).'" '.apply_filters('next_comments_link_attributes', '').'>'.preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 }
 
 /**
@@ -2525,8 +2525,8 @@ 
  * @param string $label    Optional. Label for link text.
  * @param int    $max_page Optional. Max page.
  */
-function next_comments_link( $label = '', $max_page = 0 ) {
-	echo get_next_comments_link( $label, $max_page );
+function next_comments_link($label = '', $max_page = 0) {
+	echo get_next_comments_link($label, $max_page);
 }
 
 /**
@@ -2537,18 +2537,18 @@ 
  * @param string $label Optional. Label for comments link text.
  * @return string|void HTML-formatted link for the previous page of comments.
  */
-function get_previous_comments_link( $label = '' ) {
-	if ( !is_singular() || !get_option('page_comments') )
+function get_previous_comments_link($label = '') {
+	if ( ! is_singular() || ! get_option('page_comments'))
 		return;
 
 	$page = get_query_var('cpage');
 
-	if ( intval($page) <= 1 )
+	if (intval($page) <= 1)
 		return;
 
 	$prevpage = intval($page) - 1;
 
-	if ( empty($label) )
+	if (empty($label))
 		$label = __('&laquo; Older Comments');
 
 	/**
@@ -2558,7 +2558,7 @@ 
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
+	return '<a href="'.esc_url(get_comments_pagenum_link($prevpage)).'" '.apply_filters('previous_comments_link_attributes', '').'>'.preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 }
 
 /**
@@ -2568,8 +2568,8 @@ 
  *
  * @param string $label Optional. Label for comments link text.
  */
-function previous_comments_link( $label = '' ) {
-	echo get_previous_comments_link( $label );
+function previous_comments_link($label = '') {
+	echo get_previous_comments_link($label);
 }
 
 /**
@@ -2586,28 +2586,28 @@ 
 function paginate_comments_links($args = array()) {
 	global $wp_rewrite;
 
-	if ( !is_singular() || !get_option('page_comments') )
+	if ( ! is_singular() || ! get_option('page_comments'))
 		return;
 
 	$page = get_query_var('cpage');
-	if ( !$page )
+	if ( ! $page)
 		$page = 1;
 	$max_page = get_comment_pages_count();
 	$defaults = array(
-		'base' => add_query_arg( 'cpage', '%#%' ),
+		'base' => add_query_arg('cpage', '%#%'),
 		'format' => '',
 		'total' => $max_page,
 		'current' => $page,
 		'echo' => true,
 		'add_fragment' => '#comments'
 	);
-	if ( $wp_rewrite->using_permalinks() )
-		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	if ($wp_rewrite->using_permalinks())
+		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()).$wp_rewrite->comments_pagination_base.'-%#%', 'commentpaged');
 
-	$args = wp_parse_args( $args, $defaults );
-	$page_links = paginate_links( $args );
+	$args = wp_parse_args($args, $defaults);
+	$page_links = paginate_links($args);
 
-	if ( $args['echo'] )
+	if ($args['echo'])
 		echo $page_links;
 	else
 		return $page_links;
@@ -2629,11 +2629,11 @@ 
 function get_shortcut_link() {
 	global $is_IE, $wp_version;
 
-	include_once( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+	include_once(ABSPATH.'wp-admin/includes/class-wp-press-this.php');
 	$bookmarklet_version = $GLOBALS['wp_press_this']->version;
 	$link = '';
 
-	if ( $is_IE ) {
+	if ($is_IE) {
 		/**
 		 * Return the old/shorter bookmarklet code for MSIE 8 and lower,
 		 * since they only support a max length of ~2000 characters for
@@ -2643,27 +2643,27 @@ 
 		 */
 		$ua = $_SERVER['HTTP_USER_AGENT'];
 
-		if ( ! empty( $ua ) && preg_match( '/\bMSIE (\d)/', $ua, $matches ) && (int) $matches[1] <= 8 ) {
-			$url = wp_json_encode( admin_url( 'press-this.php' ) );
+		if ( ! empty($ua) && preg_match('/\bMSIE (\d)/', $ua, $matches) && (int) $matches[1] <= 8) {
+			$url = wp_json_encode(admin_url('press-this.php'));
 
-			$link = 'javascript:var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,' .
-				's=(e?e():(k)?k():(x?x.createRange().text:0)),f=' . $url . ',l=d.location,e=encodeURIComponent,' .
-				'u=f+"?u="+e(l.href)+"&t="+e(d.title)+"&s="+e(s)+"&v=' . $bookmarklet_version . '";' .
-				'a=function(){if(!w.open(u,"t","toolbar=0,resizable=1,scrollbars=1,status=1,width=600,height=700"))l.href=u;};' .
+			$link = 'javascript:var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,'.
+				's=(e?e():(k)?k():(x?x.createRange().text:0)),f='.$url.',l=d.location,e=encodeURIComponent,'.
+				'u=f+"?u="+e(l.href)+"&t="+e(d.title)+"&s="+e(s)+"&v='.$bookmarklet_version.'";'.
+				'a=function(){if(!w.open(u,"t","toolbar=0,resizable=1,scrollbars=1,status=1,width=600,height=700"))l.href=u;};'.
 				'if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else a();void(0)';
 		}
 	}
 
-	if ( empty( $link ) ) {
-		$src = @file_get_contents( ABSPATH . 'wp-admin/js/bookmarklet.min.js' );
+	if (empty($link)) {
+		$src = @file_get_contents(ABSPATH.'wp-admin/js/bookmarklet.min.js');
 
-		if ( $src ) {
-			$url = wp_json_encode( admin_url( 'press-this.php' ) . '?v=' . $bookmarklet_version );
-			$link = 'javascript:' . str_replace( 'window.pt_url', $url, $src );
+		if ($src) {
+			$url = wp_json_encode(admin_url('press-this.php').'?v='.$bookmarklet_version);
+			$link = 'javascript:'.str_replace('window.pt_url', $url, $src);
 		}
 	}
 
-	$link = str_replace( array( "\r", "\n", "\t" ),  '', $link );
+	$link = str_replace(array("\r", "\n", "\t"), '', $link);
 
 	/**
 	 * Filter the Press This bookmarklet link.
@@ -2672,7 +2672,7 @@ 
 	 *
 	 * @param string $link The Press This bookmarklet link.
 	 */
-	return apply_filters( 'shortcut_link', $link );
+	return apply_filters('shortcut_link', $link);
 }
 
 /**
@@ -2689,8 +2689,8 @@ 
  *                        'http', 'https', or 'relative'. Default null.
  * @return string Home url link with optional path appended.
 */
-function home_url( $path = '', $scheme = null ) {
-	return get_home_url( null, $path, $scheme );
+function home_url($path = '', $scheme = null) {
+	return get_home_url(null, $path, $scheme);
 }
 
 /**
@@ -2711,28 +2711,28 @@ 
  *                                  'http', 'https', 'relative', or null. Default null.
  * @return string Home URL link with optional path appended.
 */
-function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
+function get_home_url($blog_id = null, $path = '', $scheme = null) {
 	$orig_scheme = $scheme;
 
-	if ( empty( $blog_id ) || !is_multisite() ) {
-		$url = get_option( 'home' );
+	if (empty($blog_id) || ! is_multisite()) {
+		$url = get_option('home');
 	} else {
-		switch_to_blog( $blog_id );
-		$url = get_option( 'home' );
+		switch_to_blog($blog_id);
+		$url = get_option('home');
 		restore_current_blog();
 	}
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] )
+	if ( ! in_array($scheme, array('http', 'https', 'relative'))) {
+		if (is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'])
 			$scheme = 'https';
 		else
-			$scheme = parse_url( $url, PHP_URL_SCHEME );
+			$scheme = parse_url($url, PHP_URL_SCHEME);
 	}
 
-	$url = set_url_scheme( $url, $scheme );
+	$url = set_url_scheme($url, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filter the home URL.
@@ -2744,7 +2744,7 @@ 
 	 * @param string|null $orig_scheme Scheme to give the home URL context. Accepts 'http', 'https', 'relative' or null.
 	 * @param int|null    $blog_id     Blog ID, or null for the current blog.
 	 */
-	return apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
+	return apply_filters('home_url', $url, $path, $orig_scheme, $blog_id);
 }
 
 /**
@@ -2760,8 +2760,8 @@ 
  * @param string $scheme Optional. Scheme to give the site url context. See set_url_scheme().
  * @return string Site url link with optional path appended.
 */
-function site_url( $path = '', $scheme = null ) {
-	return get_site_url( null, $path, $scheme );
+function site_url($path = '', $scheme = null) {
+	return get_site_url(null, $path, $scheme);
 }
 
 /**
@@ -2780,19 +2780,19 @@ 
  *                        'relative'. Default null.
  * @return string Site url link with optional path appended.
 */
-function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
-	if ( empty( $blog_id ) || !is_multisite() ) {
-		$url = get_option( 'siteurl' );
+function get_site_url($blog_id = null, $path = '', $scheme = null) {
+	if (empty($blog_id) || ! is_multisite()) {
+		$url = get_option('siteurl');
 	} else {
-		switch_to_blog( $blog_id );
-		$url = get_option( 'siteurl' );
+		switch_to_blog($blog_id);
+		$url = get_option('siteurl');
 		restore_current_blog();
 	}
 
-	$url = set_url_scheme( $url, $scheme );
+	$url = set_url_scheme($url, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filter the site URL.
@@ -2805,7 +2805,7 @@ 
 	 *                             'login_post', 'admin', 'relative' or null.
 	 * @param int|null    $blog_id Blog ID, or null for the current blog.
 	 */
-	return apply_filters( 'site_url', $url, $path, $scheme, $blog_id );
+	return apply_filters('site_url', $url, $path, $scheme, $blog_id);
 }
 
 /**
@@ -2817,8 +2817,8 @@ 
  * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin url link with optional path appended.
 */
-function admin_url( $path = '', $scheme = 'admin' ) {
-	return get_admin_url( null, $path, $scheme );
+function admin_url($path = '', $scheme = 'admin') {
+	return get_admin_url(null, $path, $scheme);
 }
 
 /**
@@ -2833,11 +2833,11 @@ 
  *                        {@see force_ssl_admin()} and {@see is_ssl()}.
  * @return string Admin url link with optional path appended.
 */
-function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
+function get_admin_url($blog_id = null, $path = '', $scheme = 'admin') {
 	$url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filter the admin area URL.
@@ -2848,7 +2848,7 @@ 
 	 * @param string   $path    Path relative to the admin area URL. Blank string if no path is specified.
 	 * @param int|null $blog_id Blog ID, or null for the current blog.
 	 */
-	return apply_filters( 'admin_url', $url, $path, $blog_id );
+	return apply_filters('admin_url', $url, $path, $blog_id);
 }
 
 /**
@@ -2860,10 +2860,10 @@ 
  * @param string $scheme Optional. Scheme to give the includes url context.
  * @return string Includes url link with optional path appended.
 */
-function includes_url( $path = '', $scheme = null ) {
-	$url = site_url( '/' . WPINC . '/', $scheme );
+function includes_url($path = '', $scheme = null) {
+	$url = site_url('/'.WPINC.'/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -2875,7 +2875,7 @@ 
 	 * @param string $path Path relative to the URL to the wp-includes directory. Blank string
 	 *                     if no path is specified.
 	 */
-	return apply_filters( 'includes_url', $url, $path );
+	return apply_filters('includes_url', $url, $path);
 }
 
 /**
@@ -2887,10 +2887,10 @@ 
  * @return string Content url link with optional path appended.
 */
 function content_url($path = '') {
-	$url = set_url_scheme( WP_CONTENT_URL );
+	$url = set_url_scheme(WP_CONTENT_URL);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filter the URL to the content directory.
@@ -2901,7 +2901,7 @@ 
 	 * @param string $path Path relative to the URL to the content directory. Blank string
 	 *                     if no path is specified.
 	 */
-	return apply_filters( 'content_url', $url, $path);
+	return apply_filters('content_url', $url, $path);
 }
 
 /**
@@ -2918,28 +2918,28 @@ 
  *                        Typically this is done by passing `__FILE__` as the argument.
  * @return string Plugins URL link with optional paths appended.
 */
-function plugins_url( $path = '', $plugin = '' ) {
+function plugins_url($path = '', $plugin = '') {
 
-	$path = wp_normalize_path( $path );
-	$plugin = wp_normalize_path( $plugin );
-	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
+	$path = wp_normalize_path($path);
+	$plugin = wp_normalize_path($plugin);
+	$mu_plugin_dir = wp_normalize_path(WPMU_PLUGIN_DIR);
 
-	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
+	if ( ! empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir))
 		$url = WPMU_PLUGIN_URL;
 	else
 		$url = WP_PLUGIN_URL;
 
 
-	$url = set_url_scheme( $url );
+	$url = set_url_scheme($url);
 
-	if ( !empty($plugin) && is_string($plugin) ) {
+	if ( ! empty($plugin) && is_string($plugin)) {
 		$folder = dirname(plugin_basename($plugin));
-		if ( '.' != $folder )
-			$url .= '/' . ltrim($folder, '/');
+		if ('.' != $folder)
+			$url .= '/'.ltrim($folder, '/');
 	}
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filter the URL to the plugins directory.
@@ -2952,7 +2952,7 @@ 
 	 * @param string $plugin The plugin file path to be relative to. Blank string if no plugin
 	 *                       is specified.
 	 */
-	return apply_filters( 'plugins_url', $url, $path, $plugin );
+	return apply_filters('plugins_url', $url, $path, $plugin);
 }
 
 /**
@@ -2968,19 +2968,19 @@ 
  * @param string $scheme Optional. Scheme to give the site url context. See set_url_scheme().
  * @return string Site url link with optional path appended.
 */
-function network_site_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
+function network_site_url($path = '', $scheme = null) {
+	if ( ! is_multisite())
 		return site_url($path, $scheme);
 
 	$current_site = get_current_site();
 
-	if ( 'relative' == $scheme )
+	if ('relative' == $scheme)
 		$url = $current_site->path;
 	else
-		$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+		$url = set_url_scheme('http://'.$current_site->domain.$current_site->path, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filter the network site URL.
@@ -2993,7 +2993,7 @@ 
 	 * @param string|null $scheme Scheme to give the URL context. Accepts 'http', 'https',
 	 *                            'relative' or null.
 	 */
-	return apply_filters( 'network_site_url', $url, $path, $scheme );
+	return apply_filters('network_site_url', $url, $path, $scheme);
 }
 
 /**
@@ -3010,23 +3010,23 @@ 
  *                        'http', 'https', or 'relative'. Default null.
  * @return string Home url link with optional path appended.
 */
-function network_home_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
+function network_home_url($path = '', $scheme = null) {
+	if ( ! is_multisite())
 		return home_url($path, $scheme);
 
 	$current_site = get_current_site();
 	$orig_scheme = $scheme;
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
+	if ( ! in_array($scheme, array('http', 'https', 'relative')))
 		$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
 
-	if ( 'relative' == $scheme )
+	if ('relative' == $scheme)
 		$url = $current_site->path;
 	else
-		$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+		$url = set_url_scheme('http://'.$current_site->domain.$current_site->path, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filter the network home URL.
@@ -3039,7 +3039,7 @@ 
 	 * @param string|null $orig_scheme Scheme to give the URL context. Accepts 'http', 'https',
 	 *                                 'relative' or null.
 	 */
-	return apply_filters( 'network_home_url', $url, $path, $orig_scheme);
+	return apply_filters('network_home_url', $url, $path, $orig_scheme);
 }
 
 /**
@@ -3051,13 +3051,13 @@ 
  * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin url link with optional path appended.
 */
-function network_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( ! is_multisite() )
-		return admin_url( $path, $scheme );
+function network_admin_url($path = '', $scheme = 'admin') {
+	if ( ! is_multisite())
+		return admin_url($path, $scheme);
 
 	$url = network_site_url('wp-admin/network/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3069,7 +3069,7 @@ 
 	 * @param string $path Path relative to the network admin URL. Blank string if
 	 *                     no path is specified.
 	 */
-	return apply_filters( 'network_admin_url', $url, $path );
+	return apply_filters('network_admin_url', $url, $path);
 }
 
 /**
@@ -3081,10 +3081,10 @@ 
  * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin url link with optional path appended.
 */
-function user_admin_url( $path = '', $scheme = 'admin' ) {
+function user_admin_url($path = '', $scheme = 'admin') {
 	$url = network_site_url('wp-admin/user/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3096,7 +3096,7 @@ 
 	 * @param string $path Path relative to the URL. Blank string if
 	 *                     no path is specified.
 	 */
-	return apply_filters( 'user_admin_url', $url, $path );
+	return apply_filters('user_admin_url', $url, $path);
 }
 
 /**
@@ -3109,9 +3109,9 @@ 
  * @return string Admin url link with optional path appended.
 */
 function self_admin_url($path = '', $scheme = 'admin') {
-	if ( is_network_admin() )
+	if (is_network_admin())
 		return network_admin_url($path, $scheme);
-	elseif ( is_user_admin() )
+	elseif (is_user_admin())
 		return user_admin_url($path, $scheme);
 	else
 		return admin_url($path, $scheme);
@@ -3126,27 +3126,27 @@ 
  * @param string $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
  * @return string $url URL with chosen scheme.
  */
-function set_url_scheme( $url, $scheme = null ) {
+function set_url_scheme($url, $scheme = null) {
 	$orig_scheme = $scheme;
 
-	if ( ! $scheme ) {
+	if ( ! $scheme) {
 		$scheme = is_ssl() ? 'https' : 'http';
-	} elseif ( $scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc' ) {
+	} elseif ($scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc') {
 		$scheme = is_ssl() || force_ssl_admin() ? 'https' : 'http';
-	} elseif ( $scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative' ) {
+	} elseif ($scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative') {
 		$scheme = is_ssl() ? 'https' : 'http';
 	}
 
-	$url = trim( $url );
-	if ( substr( $url, 0, 2 ) === '//' )
-		$url = 'http:' . $url;
+	$url = trim($url);
+	if (substr($url, 0, 2) === '//')
+		$url = 'http:'.$url;
 
-	if ( 'relative' == $scheme ) {
-		$url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
-		if ( $url !== '' && $url[0] === '/' )
-			$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+	if ('relative' == $scheme) {
+		$url = ltrim(preg_replace('#^\w+://[^/]*#', '', $url));
+		if ($url !== '' && $url[0] === '/')
+			$url = '/'.ltrim($url, "/ \t\n\r\0\x0B");
 	} else {
-		$url = preg_replace( '#^\w+://#', $scheme . '://', $url );
+		$url = preg_replace('#^\w+://#', $scheme.'://', $url);
 	}
 
 	/**
@@ -3159,7 +3159,7 @@ 
 	 * @param string $orig_scheme Scheme requested for the URL. One of 'http', 'https', 'login',
 	 *                            'login_post', 'admin', 'rpc', or 'relative'.
 	 */
-	return apply_filters( 'set_url_scheme', $url, $scheme, $orig_scheme );
+	return apply_filters('set_url_scheme', $url, $scheme, $orig_scheme);
 }
 
 /**
@@ -3176,24 +3176,24 @@ 
  * @param string $scheme  The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Dashboard url link with optional path appended.
  */
-function get_dashboard_url( $user_id = 0, $path = '', $scheme = 'admin' ) {
+function get_dashboard_url($user_id = 0, $path = '', $scheme = 'admin') {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	$blogs = get_blogs_of_user( $user_id );
-	if ( ! is_super_admin() && empty($blogs) ) {
-		$url = user_admin_url( $path, $scheme );
-	} elseif ( ! is_multisite() ) {
-		$url = admin_url( $path, $scheme );
+	$blogs = get_blogs_of_user($user_id);
+	if ( ! is_super_admin() && empty($blogs)) {
+		$url = user_admin_url($path, $scheme);
+	} elseif ( ! is_multisite()) {
+		$url = admin_url($path, $scheme);
 	} else {
 		$current_blog = get_current_blog_id();
-		if ( $current_blog  && ( is_super_admin( $user_id ) || in_array( $current_blog, array_keys( $blogs ) ) ) ) {
-			$url = admin_url( $path, $scheme );
+		if ($current_blog && (is_super_admin($user_id) || in_array($current_blog, array_keys($blogs)))) {
+			$url = admin_url($path, $scheme);
 		} else {
-			$active = get_active_blog_for_user( $user_id );
-			if ( $active )
-				$url = get_admin_url( $active->blog_id, $path, $scheme );
+			$active = get_active_blog_for_user($user_id);
+			if ($active)
+				$url = get_admin_url($active->blog_id, $path, $scheme);
 			else
-				$url = user_admin_url( $path, $scheme );
+				$url = user_admin_url($path, $scheme);
 		}
 	}
 
@@ -3208,7 +3208,7 @@ 
 	 * @param string $scheme  Scheme to give the URL context. Accepts 'http', 'https', 'login',
 	 *                        'login_post', 'admin', 'relative' or null.
 	 */
-	return apply_filters( 'user_dashboard_url', $url, $user_id, $path, $scheme);
+	return apply_filters('user_dashboard_url', $url, $user_id, $path, $scheme);
 }
 
 /**
@@ -3221,15 +3221,15 @@ 
  *                        'http' or 'https' can be passed to force those schemes.
  * @return string Dashboard url link with optional path appended.
  */
-function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
+function get_edit_profile_url($user_id = 0, $scheme = 'admin') {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	if ( is_user_admin() )
-		$url = user_admin_url( 'profile.php', $scheme );
-	elseif ( is_network_admin() )
-		$url = network_admin_url( 'profile.php', $scheme );
+	if (is_user_admin())
+		$url = user_admin_url('profile.php', $scheme);
+	elseif (is_network_admin())
+		$url = network_admin_url('profile.php', $scheme);
 	else
-		$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+		$url = get_dashboard_url($user_id, 'profile.php', $scheme);
 
 	/**
 	 * Filter the URL for a user's profile editor.
@@ -3241,7 +3241,7 @@ 
 	 * @param string $scheme  Scheme to give the URL context. Accepts 'http', 'https', 'login',
 	 *                        'login_post', 'admin', 'relative' or null.
 	 */
-	return apply_filters( 'edit_profile_url', $url, $user_id, $scheme);
+	return apply_filters('edit_profile_url', $url, $user_id, $scheme);
 }
 
 /**
@@ -3252,17 +3252,17 @@ 
  * @global WP_Query $wp_the_query
 */
 function rel_canonical() {
-	if ( !is_singular() )
+	if ( ! is_singular())
 		return;
 
 	global $wp_the_query;
-	if ( !$id = $wp_the_query->get_queried_object_id() )
+	if ( ! $id = $wp_the_query->get_queried_object_id())
 		return;
 
-	$link = get_permalink( $id );
+	$link = get_permalink($id);
 
-	if ( $page = get_query_var('cpage') )
-		$link = get_comments_pagenum_link( $page );
+	if ($page = get_query_var('cpage'))
+		$link = get_comments_pagenum_link($page);
 
 	echo "<link rel='canonical' href='$link' />\n";
 }
@@ -3301,32 +3301,32 @@ 
 	 * @param string      $context     The context for the link. One of 'post' or 'query',
 	 * @param bool        $allow_slugs Whether to allow post slugs in the shortlink.
 	 */
-	$shortlink = apply_filters( 'pre_get_shortlink', false, $id, $context, $allow_slugs );
+	$shortlink = apply_filters('pre_get_shortlink', false, $id, $context, $allow_slugs);
 
-	if ( false !== $shortlink )
+	if (false !== $shortlink)
 		return $shortlink;
 
 	global $wp_query;
 	$post_id = 0;
-	if ( 'query' == $context && is_singular() ) {
+	if ('query' == $context && is_singular()) {
 		$post_id = $wp_query->get_queried_object_id();
-		$post = get_post( $post_id );
-	} elseif ( 'post' == $context ) {
-		$post = get_post( $id );
-		if ( ! empty( $post->ID ) )
+		$post = get_post($post_id);
+	} elseif ('post' == $context) {
+		$post = get_post($id);
+		if ( ! empty($post->ID))
 			$post_id = $post->ID;
 	}
 
 	$shortlink = '';
 
 	// Return p= link for all public post types.
-	if ( ! empty( $post_id ) ) {
-		$post_type = get_post_type_object( $post->post_type );
+	if ( ! empty($post_id)) {
+		$post_type = get_post_type_object($post->post_type);
 
-		if ( 'page' === $post->post_type && $post->ID == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) ) {
-			$shortlink = home_url( '/' );
-		} elseif ( $post_type->public ) {
-			$shortlink = home_url( '?p=' . $post_id );
+		if ('page' === $post->post_type && $post->ID == get_option('page_on_front') && 'page' == get_option('show_on_front')) {
+			$shortlink = home_url('/');
+		} elseif ($post_type->public) {
+			$shortlink = home_url('?p='.$post_id);
 		}
 	}
 
@@ -3340,7 +3340,7 @@ 
 	 * @param string $context     The context for the link. One of 'post' or 'query',
 	 * @param bool   $allow_slugs Whether to allow post slugs in the shortlink. Not used by default.
 	 */
-	return apply_filters( 'get_shortlink', $shortlink, $id, $context, $allow_slugs );
+	return apply_filters('get_shortlink', $shortlink, $id, $context, $allow_slugs);
 }
 
 /**
@@ -3351,12 +3351,12 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_wp_head() {
-	$shortlink = wp_get_shortlink( 0, 'query' );
+	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty( $shortlink ) )
+	if (empty($shortlink))
 		return;
 
-	echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
+	echo "<link rel='shortlink' href='".esc_url($shortlink)."' />\n";
 }
 
 /**
@@ -3367,15 +3367,15 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_header() {
-	if ( headers_sent() )
+	if (headers_sent())
 		return;
 
 	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty($shortlink) )
+	if (empty($shortlink))
 		return;
 
-	header('Link: <' . $shortlink . '>; rel=shortlink', false);
+	header('Link: <'.$shortlink.'>; rel=shortlink', false);
 }
 
 /**
@@ -3392,19 +3392,19 @@ 
  * @param string $before Optional HTML to display before the link.
  * @param string $after  Optional HTML to display after the link.
  */
-function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
+function the_shortlink($text = '', $title = '', $before = '', $after = '') {
 	$post = get_post();
 
-	if ( empty( $text ) )
+	if (empty($text))
 		$text = __('This is the short link.');
 
-	if ( empty( $title ) )
-		$title = the_title_attribute( array( 'echo' => false ) );
+	if (empty($title))
+		$title = the_title_attribute(array('echo' => false));
 
-	$shortlink = wp_get_shortlink( $post->ID );
+	$shortlink = wp_get_shortlink($post->ID);
 
-	if ( !empty( $shortlink ) ) {
-		$link = '<a rel="shortlink" href="' . esc_url( $shortlink ) . '" title="' . $title . '">' . $text . '</a>';
+	if ( ! empty($shortlink)) {
+		$link = '<a rel="shortlink" href="'.esc_url($shortlink).'" title="'.$title.'">'.$text.'</a>';
 
 		/**
 		 * Filter the shortlink anchor tag for a post.
@@ -3416,7 +3416,7 @@ 
 		 * @param string $text      Shortlink's text.
 		 * @param string $title     Shortlink's title attribute.
 		 */
-		$link = apply_filters( 'the_shortlink', $link, $shortlink, $text, $title );
+		$link = apply_filters('the_shortlink', $link, $shortlink, $text, $title);
 		echo $before, $link, $after;
 	}
 }
@@ -3449,8 +3449,8 @@ 
  * }
  * @return false|string The URL of the avatar we found, or false if we couldn't find an avatar.
  */
-function get_avatar_url( $id_or_email, $args = null ) {
-	$args = get_avatar_data( $id_or_email, $args );
+function get_avatar_url($id_or_email, $args = null) {
+	$args = get_avatar_data($id_or_email, $args);
 	return $args['url'];
 }
 
@@ -3490,51 +3490,51 @@ 
  *     @type string $url          The URL of the avatar we found.
  * }
  */
-function get_avatar_data( $id_or_email, $args = null ) {
-	$args = wp_parse_args( $args, array(
+function get_avatar_data($id_or_email, $args = null) {
+	$args = wp_parse_args($args, array(
 		'size'           => 96,
 		'height'         => null,
 		'width'          => null,
-		'default'        => get_option( 'avatar_default', 'mystery' ),
+		'default'        => get_option('avatar_default', 'mystery'),
 		'force_default'  => false,
-		'rating'         => get_option( 'avatar_rating' ),
+		'rating'         => get_option('avatar_rating'),
 		'scheme'         => null,
 		'processed_args' => null, // if used, should be a reference
 		'extra_attr'     => '',
-	) );
+	));
 
-	if ( is_numeric( $args['size'] ) ) {
-		$args['size'] = absint( $args['size'] );
-		if ( ! $args['size'] ) {
+	if (is_numeric($args['size'])) {
+		$args['size'] = absint($args['size']);
+		if ( ! $args['size']) {
 			$args['size'] = 96;
 		}
 	} else {
 		$args['size'] = 96;
 	}
 
-	if ( is_numeric( $args['height'] ) ) {
-		$args['height'] = absint( $args['height'] );
-		if ( ! $args['height'] ) {
+	if (is_numeric($args['height'])) {
+		$args['height'] = absint($args['height']);
+		if ( ! $args['height']) {
 			$args['height'] = $args['size'];
 		}
 	} else {
 		$args['height'] = $args['size'];
 	}
 
-	if ( is_numeric( $args['width'] ) ) {
-		$args['width'] = absint( $args['width'] );
-		if ( ! $args['width'] ) {
+	if (is_numeric($args['width'])) {
+		$args['width'] = absint($args['width']);
+		if ( ! $args['width']) {
 			$args['width'] = $args['size'];
 		}
 	} else {
 		$args['width'] = $args['size'];
 	}
 
-	if ( empty( $args['default'] ) ) {
-		$args['default'] = get_option( 'avatar_default', 'mystery' );
+	if (empty($args['default'])) {
+		$args['default'] = get_option('avatar_default', 'mystery');
 	}
 
-	switch ( $args['default'] ) {
+	switch ($args['default']) {
 		case 'mm' :
 		case 'mystery' :
 		case 'mysteryman' :
@@ -3547,7 +3547,7 @@ 
 
 	$args['force_default'] = (bool) $args['force_default'];
 
-	$args['rating'] = strtolower( $args['rating'] );
+	$args['rating'] = strtolower($args['rating']);
 
 	$args['found_avatar'] = false;
 
@@ -3563,34 +3563,34 @@ 
 	 * @param array             $args          Arguments passed to get_avatar_data(), after processing.
 	 * @param int|object|string $id_or_email   A user ID, email address, or comment object.
 	 */
-	$args = apply_filters( 'pre_get_avatar_data', $args, $id_or_email );
+	$args = apply_filters('pre_get_avatar_data', $args, $id_or_email);
 
-	if ( isset( $args['url'] ) && ! is_null( $args['url'] ) ) {
+	if (isset($args['url']) && ! is_null($args['url'])) {
 		/** This filter is documented in wp-includes/link-template.php */
-		return apply_filters( 'get_avatar_data', $args, $id_or_email );
+		return apply_filters('get_avatar_data', $args, $id_or_email);
 	}
 
 	$email_hash = '';
 	$user = $email = false;
 
 	// Process the user identifier.
-	if ( is_numeric( $id_or_email ) ) {
-		$user = get_user_by( 'id', absint( $id_or_email ) );
-	} elseif ( is_string( $id_or_email ) ) {
-		if ( strpos( $id_or_email, '@md5.gravatar.com' ) ) {
+	if (is_numeric($id_or_email)) {
+		$user = get_user_by('id', absint($id_or_email));
+	} elseif (is_string($id_or_email)) {
+		if (strpos($id_or_email, '@md5.gravatar.com')) {
 			// md5 hash
-			list( $email_hash ) = explode( '@', $id_or_email );
+			list($email_hash) = explode('@', $id_or_email);
 		} else {
 			// email address
 			$email = $id_or_email;
 		}
-	} elseif ( $id_or_email instanceof WP_User ) {
+	} elseif ($id_or_email instanceof WP_User) {
 		// User Object
 		$user = $id_or_email;
-	} elseif ( $id_or_email instanceof WP_Post ) {
+	} elseif ($id_or_email instanceof WP_Post) {
 		// Post Object
-		$user = get_user_by( 'id', (int) $id_or_email->post_author );
-	} elseif ( is_object( $id_or_email ) && isset( $id_or_email->comment_ID ) ) {
+		$user = get_user_by('id', (int) $id_or_email->post_author);
+	} elseif (is_object($id_or_email) && isset($id_or_email->comment_ID)) {
 		// Comment Object
 
 		/**
@@ -3600,36 +3600,36 @@ 
 		 *
 		 * @param array $types An array of content types. Default only contains 'comment'.
 		 */
-		$allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
-		if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) {
+		$allowed_comment_types = apply_filters('get_avatar_comment_types', array('comment'));
+		if ( ! empty($id_or_email->comment_type) && ! in_array($id_or_email->comment_type, (array) $allowed_comment_types)) {
 			$args['url'] = false;
 			/** This filter is documented in wp-includes/link-template.php */
-			return apply_filters( 'get_avatar_data', $args, $id_or_email );
+			return apply_filters('get_avatar_data', $args, $id_or_email);
 		}
 
-		if ( ! empty( $id_or_email->user_id ) ) {
-			$user = get_user_by( 'id', (int) $id_or_email->user_id );
+		if ( ! empty($id_or_email->user_id)) {
+			$user = get_user_by('id', (int) $id_or_email->user_id);
 		}
-		if ( ( ! $user || is_wp_error( $user ) ) && ! empty( $id_or_email->comment_author_email ) ) {
+		if (( ! $user || is_wp_error($user)) && ! empty($id_or_email->comment_author_email)) {
 			$email = $id_or_email->comment_author_email;
 		}
 	}
 
-	if ( ! $email_hash ) {
-		if ( $user ) {
+	if ( ! $email_hash) {
+		if ($user) {
 			$email = $user->user_email;
 		}
 
-		if ( $email ) {
-			$email_hash = md5( strtolower( trim( $email ) ) );
+		if ($email) {
+			$email_hash = md5(strtolower(trim($email)));
 		}
 	}
 
-	if ( $email_hash ) {
+	if ($email_hash) {
 		$args['found_avatar'] = true;
-		$gravatar_server = hexdec( $email_hash[0] ) % 3;
+		$gravatar_server = hexdec($email_hash[0]) % 3;
 	} else {
-		$gravatar_server = rand( 0, 2 );
+		$gravatar_server = rand(0, 2);
 	}
 
 	$url_args = array(
@@ -3639,15 +3639,15 @@ 
 		'r' => $args['rating'],
 	);
 
-	if ( is_ssl() ) {
-		$url = 'https://secure.gravatar.com/avatar/' . $email_hash;
+	if (is_ssl()) {
+		$url = 'https://secure.gravatar.com/avatar/'.$email_hash;
 	} else {
-		$url = sprintf( 'http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash );
+		$url = sprintf('http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash);
 	}
 
 	$url = add_query_arg(
-		rawurlencode_deep( array_filter( $url_args ) ),
-		set_url_scheme( $url, $args['scheme'] )
+		rawurlencode_deep(array_filter($url_args)),
+		set_url_scheme($url, $args['scheme'])
 	);
 
 	/**
@@ -3659,7 +3659,7 @@ 
 	 * @param int|object|string $id_or_email A user ID, email address, or comment object.
 	 * @param array             $args        Arguments passed to get_avatar_data(), after processing.
 	 */
-	$args['url'] = apply_filters( 'get_avatar_url', $url, $id_or_email, $args );
+	$args['url'] = apply_filters('get_avatar_url', $url, $id_or_email, $args);
 
 	/**
 	 * Filter the avatar data.
@@ -3669,5 +3669,5 @@ 
 	 * @param array             $args        Arguments passed to get_avatar_data(), after processing.
 	 * @param int|object|string $id_or_email A user ID, email address, or comment object.
 	 */
-	return apply_filters( 'get_avatar_data', $args, $id_or_email );
+	return apply_filters('get_avatar_data', $args, $id_or_email);
 }

Braces +494 added lines, -354 removed lines

@@ -39,10 +39,11 @@ 
  */
 function user_trailingslashit($string, $type_of_url = '') {
 	global $wp_rewrite;
-	if ( $wp_rewrite->use_trailing_slashes )
-		$string = trailingslashit($string);
-	else
-		$string = untrailingslashit($string);
+	if ( $wp_rewrite->use_trailing_slashes ) {
+			$string = trailingslashit($string);
+	} else {
+			$string = untrailingslashit($string);
+	}
 
 	/**
 	 * Filter the trailing slashed string, depending on whether the site is set
@@ -131,15 +132,17 @@ 
 		$sample = false;
 	}
 
-	if ( empty($post->ID) )
-		return false;
+	if ( empty($post->ID) ) {
+			return false;
+	}
 
-	if ( $post->post_type == 'page' )
-		return get_page_link($post, $leavename, $sample);
-	elseif ( $post->post_type == 'attachment' )
-		return get_attachment_link( $post, $leavename );
-	elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) )
-		return get_post_permalink($post, $leavename, $sample);
+	if ( $post->post_type == 'page' ) {
+			return get_page_link($post, $leavename, $sample);
+	} elseif ( $post->post_type == 'attachment' ) {
+			return get_attachment_link( $post, $leavename );
+	} elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) ) {
+			return get_post_permalink($post, $leavename, $sample);
+	}
 
 	$permalink = get_option('permalink_structure');
 
@@ -178,8 +181,9 @@ 
 
 				$category_object = get_term( $category_object, 'category' );
 				$category = $category_object->slug;
-				if ( $parent = $category_object->parent )
-					$category = get_category_parents($parent, false, '/', true) . $category;
+				if ( $parent = $category_object->parent ) {
+									$category = get_category_parents($parent, false, '/', true) . $category;
+				}
 			}
 			// show default category in permalinks, without
 			// having to assign it explicitly
@@ -247,8 +251,9 @@ 
 
 	$post = get_post($id);
 
-	if ( is_wp_error( $post ) )
-		return $post;
+	if ( is_wp_error( $post ) ) {
+			return $post;
+	}
 
 	$post_link = $wp_rewrite->get_extra_permastruct($post->post_type);
 
@@ -268,10 +273,11 @@ 
 		}
 		$post_link = home_url( user_trailingslashit($post_link) );
 	} else {
-		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
-			$post_link = add_query_arg($post_type->query_var, $slug, '');
-		else
-			$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
+		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) ) {
+					$post_link = add_query_arg($post_type->query_var, $slug, '');
+		} else {
+					$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
+		}
 		$post_link = home_url($post_link);
 	}
 
@@ -303,10 +309,11 @@ 
 function get_page_link( $post = false, $leavename = false, $sample = false ) {
 	$post = get_post( $post );
 
-	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) )
-		$link = home_url('/');
-	else
-		$link = _get_page_link( $post, $leavename, $sample );
+	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) ) {
+			$link = home_url('/');
+	} else {
+			$link = _get_page_link( $post, $leavename, $sample );
+	}
 
 	/**
 	 * Filter the permalink for a page.
@@ -388,25 +395,34 @@ 
 	$parent = ( $post->post_parent > 0 && $post->post_parent != $post->ID ) ? get_post( $post->post_parent ) : false;
 
 	if ( $wp_rewrite->using_permalinks() && $parent ) {
-		if ( 'page' == $parent->post_type )
-			$parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front
-		else
-			$parentlink = get_permalink( $post->post_parent );
+		if ( 'page' == $parent->post_type ) {
+					$parentlink = _get_page_link( $post->post_parent );
+		}
+		// Ignores page_on_front
+		else {
+					$parentlink = get_permalink( $post->post_parent );
+		}
 
-		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') )
-			$name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
-		else
-			$name = $post->post_name;
+		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') ) {
+					$name = 'attachment/' . $post->post_name;
+		}
+		// <permalink>/<int>/ is paged so we use the explicit attachment marker
+		else {
+					$name = $post->post_name;
+		}
 
-		if ( strpos($parentlink, '?') === false )
-			$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		if ( strpos($parentlink, '?') === false ) {
+					$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		}
 
-		if ( ! $leavename )
-			$link = str_replace( '%postname%', $name, $link );
+		if ( ! $leavename ) {
+					$link = str_replace( '%postname%', $name, $link );
+		}
 	}
 
-	if ( ! $link )
-		$link = home_url( '/?attachment_id=' . $post->ID );
+	if ( ! $link ) {
+			$link = home_url( '/?attachment_id=' . $post->ID );
+	}
 
 	/**
 	 * Filter the permalink for an attachment.
@@ -431,8 +447,9 @@ 
  */
 function get_year_link($year) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
 	$yearlink = $wp_rewrite->get_year_permastruct();
 	if ( !empty($yearlink) ) {
 		$yearlink = str_replace('%year%', $year, $yearlink);
@@ -465,10 +482,12 @@ 
  */
 function get_month_link($year, $month) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
-		$month = gmdate('m', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
+	if ( !$month ) {
+			$month = gmdate('m', current_time('timestamp'));
+	}
 	$monthlink = $wp_rewrite->get_month_permastruct();
 	if ( !empty($monthlink) ) {
 		$monthlink = str_replace('%year%', $year, $monthlink);
@@ -504,12 +523,15 @@ 
  */
 function get_day_link($year, $month, $day) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
-		$month = gmdate('m', current_time('timestamp'));
-	if ( !$day )
-		$day = gmdate('j', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
+	if ( !$month ) {
+			$month = gmdate('m', current_time('timestamp'));
+	}
+	if ( !$day ) {
+			$day = gmdate('j', current_time('timestamp'));
+	}
 
 	$daylink = $wp_rewrite->get_day_permastruct();
 	if ( !empty($daylink) ) {
@@ -577,18 +599,21 @@ 
 			$permalink = $wp_rewrite->get_comment_feed_permastruct();
 		}
 
-		if ( get_default_feed() == $feed )
-			$feed = '';
+		if ( get_default_feed() == $feed ) {
+					$feed = '';
+		}
 
 		$permalink = str_replace('%feed%', $feed, $permalink);
 		$permalink = preg_replace('#/+#', '/', "/$permalink");
 		$output =  home_url( user_trailingslashit($permalink, 'feed') );
 	} else {
-		if ( empty($feed) )
-			$feed = get_default_feed();
+		if ( empty($feed) ) {
+					$feed = get_default_feed();
+		}
 
-		if ( false !== strpos($feed, 'comments_') )
-			$feed = str_replace('comments_', 'comments-', $feed);
+		if ( false !== strpos($feed, 'comments_') ) {
+					$feed = str_replace('comments_', 'comments-', $feed);
+		}
 
 		$output = home_url("?feed={$feed}");
 	}
@@ -616,28 +641,33 @@ 
 function get_post_comments_feed_link($post_id = 0, $feed = '') {
 	$post_id = absint( $post_id );
 
-	if ( ! $post_id )
-		$post_id = get_the_ID();
+	if ( ! $post_id ) {
+			$post_id = get_the_ID();
+	}
 
-	if ( empty( $feed ) )
-		$feed = get_default_feed();
+	if ( empty( $feed ) ) {
+			$feed = get_default_feed();
+	}
 
 	if ( '' != get_option('permalink_structure') ) {
-		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
-			$url = _get_page_link( $post_id );
-		else
-			$url = get_permalink($post_id);
+		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') ) {
+					$url = _get_page_link( $post_id );
+		} else {
+					$url = get_permalink($post_id);
+		}
 
 		$url = trailingslashit($url) . 'feed';
-		if ( $feed != get_default_feed() )
-			$url .= "/$feed";
+		if ( $feed != get_default_feed() ) {
+					$url .= "/$feed";
+		}
 		$url = user_trailingslashit($url, 'single_feed');
 	} else {
 		$type = get_post_field('post_type', $post_id);
-		if ( 'page' == $type )
-			$url = add_query_arg( array( 'feed' => $feed, 'page_id' => $post_id ), home_url( '/' ) );
-		else
-			$url = add_query_arg( array( 'feed' => $feed, 'p' => $post_id ), home_url( '/' ) );
+		if ( 'page' == $type ) {
+					$url = add_query_arg( array( 'feed' => $feed, 'page_id' => $post_id ), home_url( '/' ) );
+		} else {
+					$url = add_query_arg( array( 'feed' => $feed, 'p' => $post_id ), home_url( '/' ) );
+		}
 	}
 
 	/**
@@ -665,8 +695,9 @@ 
 */
 function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) {
 	$url = esc_url( get_post_comments_feed_link( $post_id, $feed ) );
-	if ( empty($link_text) )
-		$link_text = __('Comments Feed');
+	if ( empty($link_text) ) {
+			$link_text = __('Comments Feed');
+	}
 
 	/**
 	 * Filter the post comment feed link anchor tag.
@@ -696,17 +727,19 @@ 
 	$author_id = (int) $author_id;
 	$permalink_structure = get_option('permalink_structure');
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	if ( '' == $permalink_structure ) {
 		$link = home_url("?feed=$feed&amp;author=" . $author_id);
 	} else {
 		$link = get_author_posts_url($author_id);
-		if ( $feed == get_default_feed() )
-			$feed_link = 'feed';
-		else
-			$feed_link = "feed/$feed";
+		if ( $feed == get_default_feed() ) {
+					$feed_link = 'feed';
+		} else {
+					$feed_link = "feed/$feed";
+		}
 
 		$link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
 	}
@@ -758,19 +791,20 @@ 
 
 	$term = get_term( $term_id, $taxonomy  );
 
-	if ( empty( $term ) || is_wp_error( $term ) )
-		return false;
+	if ( empty( $term ) || is_wp_error( $term ) ) {
+			return false;
+	}
 
-	if ( empty( $feed ) )
-		$feed = get_default_feed();
+	if ( empty( $feed ) ) {
+			$feed = get_default_feed();
+	}
 
 	$permalink_structure = get_option( 'permalink_structure' );
 
 	if ( '' == $permalink_structure ) {
 		if ( 'category' == $taxonomy ) {
 			$link = home_url("?feed=$feed&amp;cat=$term_id");
-		}
-		elseif ( 'post_tag' == $taxonomy ) {
+		} elseif ( 'post_tag' == $taxonomy ) {
 			$link = home_url("?feed=$feed&amp;tag=$term->slug");
 		} else {
 			$t = get_taxonomy( $taxonomy );
@@ -778,10 +812,11 @@ 
 		}
 	} else {
 		$link = get_term_link( $term_id, $term->taxonomy );
-		if ( $feed == get_default_feed() )
-			$feed_link = 'feed';
-		else
-			$feed_link = "feed/$feed";
+		if ( $feed == get_default_feed() ) {
+					$feed_link = 'feed';
+		} else {
+					$feed_link = "feed/$feed";
+		}
 
 		$link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
 	}
@@ -940,18 +975,22 @@ 
  * @return string|void HTML content.
  */
 function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-	if ( is_null( $term ) )
-		$term = get_queried_object();
+	if ( is_null( $term ) ) {
+			$term = get_queried_object();
+	}
 
-	if ( ! $term )
-		return;
+	if ( ! $term ) {
+			return;
+	}
 
 	$tax = get_taxonomy( $term->taxonomy );
-	if ( ! current_user_can( $tax->cap->edit_terms ) )
-		return;
+	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+			return;
+	}
 
-	if ( empty( $link ) )
-		$link = __('Edit This');
+	if ( empty( $link ) ) {
+			$link = __('Edit This');
+	}
 
 	$link = '<a href="' . get_edit_term_link( $term->term_id, $term->taxonomy ) . '">' . $link . '</a>';
 
@@ -965,11 +1004,12 @@ 
 	 */
 	$link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
 
-	if ( $echo )
-		echo $link;
-	else
-		return $link;
-}
+	if ( $echo ) {
+			echo $link;
+	} else {
+			return $link;
+	}
+	}
 
 /**
  * Retrieve permalink for search.
@@ -984,10 +1024,11 @@ 
 function get_search_link( $query = '' ) {
 	global $wp_rewrite;
 
-	if ( empty($query) )
-		$search = get_search_query( false );
-	else
-		$search = stripslashes($query);
+	if ( empty($query) ) {
+			$search = get_search_query( false );
+	} else {
+			$search = stripslashes($query);
+	}
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
@@ -1026,8 +1067,9 @@ 
 	global $wp_rewrite;
 	$link = get_search_link($search_query);
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
@@ -1064,17 +1106,19 @@ 
 function get_search_comments_feed_link($search_query = '', $feed = '') {
 	global $wp_rewrite;
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	$link = get_search_feed_link($search_query, $feed);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) )
-		$link = add_query_arg('feed', 'comments-' . $feed, $link);
-	else
-		$link = add_query_arg('withcomments', 1, $link);
+	if ( empty($permastruct) ) {
+			$link = add_query_arg('feed', 'comments-' . $feed, $link);
+	} else {
+			$link = add_query_arg('withcomments', 1, $link);
+	}
 
 	/** This filter is documented in wp-includes/link-template.php */
 	return apply_filters( 'search_feed_link', $link, $feed, 'comments' );
@@ -1092,18 +1136,21 @@ 
  */
 function get_post_type_archive_link( $post_type ) {
 	global $wp_rewrite;
-	if ( ! $post_type_obj = get_post_type_object( $post_type ) )
-		return false;
+	if ( ! $post_type_obj = get_post_type_object( $post_type ) ) {
+			return false;
+	}
 
-	if ( ! $post_type_obj->has_archive )
-		return false;
+	if ( ! $post_type_obj->has_archive ) {
+			return false;
+	}
 
 	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) ) {
 		$struct = ( true === $post_type_obj->has_archive ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
-		if ( $post_type_obj->rewrite['with_front'] )
-			$struct = $wp_rewrite->front . $struct;
-		else
-			$struct = $wp_rewrite->root . $struct;
+		if ( $post_type_obj->rewrite['with_front'] ) {
+					$struct = $wp_rewrite->front . $struct;
+		} else {
+					$struct = $wp_rewrite->root . $struct;
+		}
 		$link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );
 	} else {
 		$link = home_url( '?post_type=' . $post_type );
@@ -1131,18 +1178,21 @@ 
  */
 function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
 	$default_feed = get_default_feed();
-	if ( empty( $feed ) )
-		$feed = $default_feed;
+	if ( empty( $feed ) ) {
+			$feed = $default_feed;
+	}
 
-	if ( ! $link = get_post_type_archive_link( $post_type ) )
-		return false;
+	if ( ! $link = get_post_type_archive_link( $post_type ) ) {
+			return false;
+	}
 
 	$post_type_obj = get_post_type_object( $post_type );
 	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['feeds'] ) {
 		$link = trailingslashit( $link );
 		$link .= 'feed/';
-		if ( $feed != $default_feed )
-			$link .= "$feed/";
+		if ( $feed != $default_feed ) {
+					$link .= "$feed/";
+		}
 	} else {
 		$link = add_query_arg( 'feed', $feed, $link );
 	}
@@ -1171,22 +1221,26 @@ 
  * @return string|void The edit post link for the given post.
  */
 function get_edit_post_link( $id = 0, $context = 'display' ) {
-	if ( ! $post = get_post( $id ) )
-		return;
+	if ( ! $post = get_post( $id ) ) {
+			return;
+	}
 
-	if ( 'revision' === $post->post_type )
-		$action = '';
-	elseif ( 'display' == $context )
-		$action = '&amp;action=edit';
-	else
-		$action = '&action=edit';
+	if ( 'revision' === $post->post_type ) {
+			$action = '';
+	} elseif ( 'display' == $context ) {
+			$action = '&amp;action=edit';
+	} else {
+			$action = '&action=edit';
+	}
 
 	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
-		return;
+	if ( !$post_type_object ) {
+			return;
+	}
 
-	if ( !current_user_can( 'edit_post', $post->ID ) )
-		return;
+	if ( !current_user_can( 'edit_post', $post->ID ) ) {
+			return;
+	}
 
 	/**
 	 * Filter the post edit link.
@@ -1251,18 +1305,22 @@ 
  * @return string|void The delete post link URL for the given post.
  */
 function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0' );
+	if ( ! empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '3.0' );
+	}
 
-	if ( !$post = get_post( $id ) )
-		return;
+	if ( !$post = get_post( $id ) ) {
+			return;
+	}
 
 	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
-		return;
+	if ( !$post_type_object ) {
+			return;
+	}
 
-	if ( !current_user_can( 'delete_post', $post->ID ) )
-		return;
+	if ( !current_user_can( 'delete_post', $post->ID ) ) {
+			return;
+	}
 
 	$action = ( $force_delete || !EMPTY_TRASH_DAYS ) ? 'delete' : 'trash';
 
@@ -1291,8 +1349,9 @@ 
 function get_edit_comment_link( $comment_id = 0 ) {
 	$comment = get_comment( $comment_id );
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		return;
+	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			return;
+	}
 
 	$location = admin_url('comment.php?action=editcomment&amp;c=') . $comment->comment_ID;
 
@@ -1353,8 +1412,9 @@ 
 function get_edit_bookmark_link( $link = 0 ) {
 	$link = get_bookmark( $link );
 
-	if ( !current_user_can('manage_links') )
-		return;
+	if ( !current_user_can('manage_links') ) {
+			return;
+	}
 
 	$location = admin_url('link.php?action=edit&amp;link_id=') . $link->link_id;
 
@@ -1382,11 +1442,13 @@ 
 function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) {
 	$bookmark = get_bookmark($bookmark);
 
-	if ( !current_user_can('manage_links') )
-		return;
+	if ( !current_user_can('manage_links') ) {
+			return;
+	}
 
-	if ( empty($link) )
-		$link = __('Edit This');
+	if ( empty($link) ) {
+			$link = __('Edit This');
+	}
 
 	$link = '<a href="' . get_edit_bookmark_link( $bookmark ) . '">' . $link . '</a>';
 
@@ -1410,21 +1472,25 @@ 
  * @return string URL to edit user page or empty string.
  */
 function get_edit_user_link( $user_id = null ) {
-	if ( ! $user_id )
-		$user_id = get_current_user_id();
+	if ( ! $user_id ) {
+			$user_id = get_current_user_id();
+	}
 
-	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) )
-		return '';
+	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) ) {
+			return '';
+	}
 
 	$user = get_userdata( $user_id );
 
-	if ( ! $user )
-		return '';
+	if ( ! $user ) {
+			return '';
+	}
 
-	if ( get_current_user_id() == $user->ID )
-		$link = get_edit_profile_url( $user->ID );
-	else
-		$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+	if ( get_current_user_id() == $user->ID ) {
+			$link = get_edit_profile_url( $user->ID );
+	} else {
+			$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+	}
 
 	/**
 	 * Filter the user edit link.
@@ -1485,8 +1551,9 @@ 
 function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
 	global $wpdb;
 
-	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) )
-		return null;
+	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) ) {
+			return null;
+	}
 
 	$current_post_date = $post->post_date;
 
@@ -1510,16 +1577,18 @@ 
 		}
 
 		if ( $in_same_term ) {
-			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
-				return '';
+			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) ) {
+							return '';
+			}
 			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
 
 			// Remove any exclusions from the term array to include.
 			$term_array = array_diff( $term_array, (array) $excluded_terms );
 			$term_array = array_map( 'intval', $term_array );
 
-			if ( ! $term_array || is_wp_error( $term_array ) )
-				return '';
+			if ( ! $term_array || is_wp_error( $term_array ) ) {
+							return '';
+			}
 
 			$where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
 		}
@@ -1607,19 +1676,22 @@ 
 	$query_key = 'adjacent_post_' . md5( $query );
 	$result = wp_cache_get( $query_key, 'counts' );
 	if ( false !== $result ) {
-		if ( $result )
-			$result = get_post( $result );
+		if ( $result ) {
+					$result = get_post( $result );
+		}
 		return $result;
 	}
 
 	$result = $wpdb->get_var( $query );
-	if ( null === $result )
-		$result = '';
+	if ( null === $result ) {
+			$result = '';
+	}
 
 	wp_cache_set( $query_key, $result, 'counts' );
 
-	if ( $result )
-		$result = get_post( $result );
+	if ( $result ) {
+			$result = get_post( $result );
+	}
 
 	return $result;
 }
@@ -1639,18 +1711,21 @@ 
  * @return string|void The adjacent post relational link URL.
  */
 function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() && $post = get_post() )
-		$post = get_post( $post->post_parent );
-	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	if ( $previous && is_attachment() && $post = get_post() ) {
+			$post = get_post( $post->post_parent );
+	} else {
+			$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	}
 
-	if ( empty( $post ) )
-		return;
+	if ( empty( $post ) ) {
+			return;
+	}
 
 	$post_title = the_title_attribute( array( 'echo' => false, 'post' => $post ) );
 
-	if ( empty( $post_title ) )
-		$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	if ( empty( $post_title ) ) {
+			$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	}
 
 	$date = mysql2date( get_option( 'date_format' ), $post->post_date );
 
@@ -1749,8 +1824,9 @@ 
  */
 function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category' ) {
 	$post = get_post();
-	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) )
-		return null;
+	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) ) {
+			return null;
+	}
 
 	$query_args = array(
 		'posts_per_page' => 1,
@@ -1762,23 +1838,26 @@ 
 	$term_array = array();
 
 	if ( ! is_array( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) )
-			$excluded_terms = explode( ',', $excluded_terms );
-		else
-			$excluded_terms = array();
+		if ( ! empty( $excluded_terms ) ) {
+					$excluded_terms = explode( ',', $excluded_terms );
+		} else {
+					$excluded_terms = array();
+		}
 	}
 
 	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( $in_same_term )
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+		if ( $in_same_term ) {
+					$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+		}
 
 		if ( ! empty( $excluded_terms ) ) {
 			$excluded_terms = array_map( 'intval', $excluded_terms );
 			$excluded_terms = array_diff( $excluded_terms, $term_array );
 
 			$inverse_terms = array();
-			foreach ( $excluded_terms as $excluded_term )
-				$inverse_terms[] = $excluded_term * -1;
+			foreach ( $excluded_terms as $excluded_term ) {
+							$inverse_terms[] = $excluded_term * -1;
+			}
 			$excluded_terms = $inverse_terms;
 		}
 
@@ -1871,18 +1950,20 @@ 
  * @return string The link URL of the previous or next post in relation to the current post.
  */
 function get_adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() )
-		$post = get_post( get_post()->post_parent );
-	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	if ( $previous && is_attachment() ) {
+			$post = get_post( get_post()->post_parent );
+	} else {
+			$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	}
 
 	if ( ! $post ) {
 		$output = '';
 	} else {
 		$title = $post->post_title;
 
-		if ( empty( $post->post_title ) )
-			$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		if ( empty( $post->post_title ) ) {
+					$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		}
 
 		/** This filter is documented in wp-includes/post-template.php */
 		$title = apply_filters( 'the_title', $title, $post->ID );
@@ -1987,8 +2068,9 @@ 
 
 		$base = trailingslashit( get_bloginfo( 'url' ) );
 
-		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
-			$base .= $wp_rewrite->index . '/';
+		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) ) {
+					$base .= $wp_rewrite->index . '/';
+		}
 
 		if ( $pagenum > 1 ) {
 			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
@@ -2006,11 +2088,12 @@ 
 	 */
 	$result = apply_filters( 'get_pagenum_link', $result );
 
-	if ( $escape )
-		return esc_url( $result );
-	else
-		return esc_url_raw( $result );
-}
+	if ( $escape ) {
+			return esc_url( $result );
+	} else {
+			return esc_url_raw( $result );
+	}
+	}
 
 /**
  * Retrieve next posts page link.
@@ -2028,11 +2111,13 @@ 
 	global $paged;
 
 	if ( !is_single() ) {
-		if ( !$paged )
-			$paged = 1;
+		if ( !$paged ) {
+					$paged = 1;
+		}
 		$nextpage = intval($paged) + 1;
-		if ( !$max_page || $max_page >= $nextpage )
-			return get_pagenum_link($nextpage);
+		if ( !$max_page || $max_page >= $nextpage ) {
+					return get_pagenum_link($nextpage);
+		}
 	}
 }
 
@@ -2048,11 +2133,12 @@ 
 function next_posts( $max_page = 0, $echo = true ) {
 	$output = esc_url( get_next_posts_page_link( $max_page ) );
 
-	if ( $echo )
-		echo $output;
-	else
-		return $output;
-}
+	if ( $echo ) {
+			echo $output;
+	} else {
+			return $output;
+	}
+	}
 
 /**
  * Return the next posts page link.
@@ -2069,16 +2155,19 @@ 
 function get_next_posts_link( $label = null, $max_page = 0 ) {
 	global $paged, $wp_query;
 
-	if ( !$max_page )
-		$max_page = $wp_query->max_num_pages;
+	if ( !$max_page ) {
+			$max_page = $wp_query->max_num_pages;
+	}
 
-	if ( !$paged )
-		$paged = 1;
+	if ( !$paged ) {
+			$paged = 1;
+	}
 
 	$nextpage = intval($paged) + 1;
 
-	if ( null === $label )
-		$label = __( 'Next Page &raquo;' );
+	if ( null === $label ) {
+			$label = __( 'Next Page &raquo;' );
+	}
 
 	if ( !is_single() && ( $nextpage <= $max_page ) ) {
 		/**
@@ -2124,8 +2213,9 @@ 
 
 	if ( !is_single() ) {
 		$nextpage = intval($paged) - 1;
-		if ( $nextpage < 1 )
-			$nextpage = 1;
+		if ( $nextpage < 1 ) {
+					$nextpage = 1;
+		}
 		return get_pagenum_link($nextpage);
 	}
 }
@@ -2141,11 +2231,12 @@ 
 function previous_posts( $echo = true ) {
 	$output = esc_url( get_previous_posts_page_link() );
 
-	if ( $echo )
-		echo $output;
-	else
-		return $output;
-}
+	if ( $echo ) {
+			echo $output;
+	} else {
+			return $output;
+	}
+	}
 
 /**
  * Return the previous posts page link.
@@ -2160,8 +2251,9 @@ 
 function get_previous_posts_link( $label = null ) {
 	global $paged;
 
-	if ( null === $label )
-		$label = __( '&laquo; Previous Page' );
+	if ( null === $label ) {
+			$label = __( '&laquo; Previous Page' );
+	}
 
 	if ( !is_single() && $paged > 1 ) {
 		/**
@@ -2446,16 +2538,18 @@ 
 
 	if ( 'newest' == get_option('default_comments_page') ) {
 		if ( $pagenum != $max_page ) {
-			if ( $wp_rewrite->using_permalinks() )
-				$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
-			else
-				$result = add_query_arg( 'cpage', $pagenum, $result );
+			if ( $wp_rewrite->using_permalinks() ) {
+							$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+			} else {
+							$result = add_query_arg( 'cpage', $pagenum, $result );
+			}
 		}
 	} elseif ( $pagenum > 1 ) {
-		if ( $wp_rewrite->using_permalinks() )
-			$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
-		else
-			$result = add_query_arg( 'cpage', $pagenum, $result );
+		if ( $wp_rewrite->using_permalinks() ) {
+					$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+		} else {
+					$result = add_query_arg( 'cpage', $pagenum, $result );
+		}
 	}
 
 	$result .= '#comments';
@@ -2484,8 +2578,9 @@ 
 function get_next_comments_link( $label = '', $max_page = 0 ) {
 	global $wp_query;
 
-	if ( !is_singular() || !get_option('page_comments') )
-		return;
+	if ( !is_singular() || !get_option('page_comments') ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
 
@@ -2495,17 +2590,21 @@ 
 
 	$nextpage = intval($page) + 1;
 
-	if ( empty($max_page) )
-		$max_page = $wp_query->max_num_comment_pages;
+	if ( empty($max_page) ) {
+			$max_page = $wp_query->max_num_comment_pages;
+	}
 
-	if ( empty($max_page) )
-		$max_page = get_comment_pages_count();
+	if ( empty($max_page) ) {
+			$max_page = get_comment_pages_count();
+	}
 
-	if ( $nextpage > $max_page )
-		return;
+	if ( $nextpage > $max_page ) {
+			return;
+	}
 
-	if ( empty($label) )
-		$label = __('Newer Comments &raquo;');
+	if ( empty($label) ) {
+			$label = __('Newer Comments &raquo;');
+	}
 
 	/**
 	 * Filter the anchor tag attributes for the next comments page link.
@@ -2538,18 +2637,21 @@ 
  * @return string|void HTML-formatted link for the previous page of comments.
  */
 function get_previous_comments_link( $label = '' ) {
-	if ( !is_singular() || !get_option('page_comments') )
-		return;
+	if ( !is_singular() || !get_option('page_comments') ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
 
-	if ( intval($page) <= 1 )
-		return;
+	if ( intval($page) <= 1 ) {
+			return;
+	}
 
 	$prevpage = intval($page) - 1;
 
-	if ( empty($label) )
-		$label = __('&laquo; Older Comments');
+	if ( empty($label) ) {
+			$label = __('&laquo; Older Comments');
+	}
 
 	/**
 	 * Filter the anchor tag attributes for the previous comments page link.
@@ -2586,12 +2688,14 @@ 
 function paginate_comments_links($args = array()) {
 	global $wp_rewrite;
 
-	if ( !is_singular() || !get_option('page_comments') )
-		return;
+	if ( !is_singular() || !get_option('page_comments') ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
-	if ( !$page )
-		$page = 1;
+	if ( !$page ) {
+			$page = 1;
+	}
 	$max_page = get_comment_pages_count();
 	$defaults = array(
 		'base' => add_query_arg( 'cpage', '%#%' ),
@@ -2601,17 +2705,19 @@ 
 		'echo' => true,
 		'add_fragment' => '#comments'
 	);
-	if ( $wp_rewrite->using_permalinks() )
-		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	if ( $wp_rewrite->using_permalinks() ) {
+			$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	}
 
 	$args = wp_parse_args( $args, $defaults );
 	$page_links = paginate_links( $args );
 
-	if ( $args['echo'] )
-		echo $page_links;
-	else
-		return $page_links;
-}
+	if ( $args['echo'] ) {
+			echo $page_links;
+	} else {
+			return $page_links;
+	}
+	}
 
 /**
  * Retrieve the Press This bookmarklet link.
@@ -2723,16 +2829,18 @@ 
 	}
 
 	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] )
-			$scheme = 'https';
-		else
-			$scheme = parse_url( $url, PHP_URL_SCHEME );
+		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] ) {
+					$scheme = 'https';
+		} else {
+					$scheme = parse_url( $url, PHP_URL_SCHEME );
+		}
 	}
 
 	$url = set_url_scheme( $url, $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filter the home URL.
@@ -2791,8 +2899,9 @@ 
 
 	$url = set_url_scheme( $url, $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filter the site URL.
@@ -2836,8 +2945,9 @@ 
 function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
 	$url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filter the admin area URL.
@@ -2863,8 +2973,9 @@ 
 function includes_url( $path = '', $scheme = null ) {
 	$url = site_url( '/' . WPINC . '/', $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filter the URL to the includes directory.
@@ -2889,8 +3000,9 @@ 
 function content_url($path = '') {
 	$url = set_url_scheme( WP_CONTENT_URL );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim($path, '/');
+	}
 
 	/**
 	 * Filter the URL to the content directory.
@@ -2924,22 +3036,25 @@ 
 	$plugin = wp_normalize_path( $plugin );
 	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
 
-	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
-		$url = WPMU_PLUGIN_URL;
-	else
-		$url = WP_PLUGIN_URL;
+	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) ) {
+			$url = WPMU_PLUGIN_URL;
+	} else {
+			$url = WP_PLUGIN_URL;
+	}
 
 
 	$url = set_url_scheme( $url );
 
 	if ( !empty($plugin) && is_string($plugin) ) {
 		$folder = dirname(plugin_basename($plugin));
-		if ( '.' != $folder )
-			$url .= '/' . ltrim($folder, '/');
+		if ( '.' != $folder ) {
+					$url .= '/' . ltrim($folder, '/');
+		}
 	}
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim($path, '/');
+	}
 
 	/**
 	 * Filter the URL to the plugins directory.
@@ -2969,18 +3084,21 @@ 
  * @return string Site url link with optional path appended.
 */
 function network_site_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
-		return site_url($path, $scheme);
+	if ( ! is_multisite() ) {
+			return site_url($path, $scheme);
+	}
 
 	$current_site = get_current_site();
 
-	if ( 'relative' == $scheme )
-		$url = $current_site->path;
-	else
-		$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+	if ( 'relative' == $scheme ) {
+			$url = $current_site->path;
+	} else {
+			$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+	}
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filter the network site URL.
@@ -3011,22 +3129,26 @@ 
  * @return string Home url link with optional path appended.
 */
 function network_home_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
-		return home_url($path, $scheme);
+	if ( ! is_multisite() ) {
+			return home_url($path, $scheme);
+	}
 
 	$current_site = get_current_site();
 	$orig_scheme = $scheme;
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
-		$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
+	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
+			$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
+	}
 
-	if ( 'relative' == $scheme )
-		$url = $current_site->path;
-	else
-		$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+	if ( 'relative' == $scheme ) {
+			$url = $current_site->path;
+	} else {
+			$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+	}
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filter the network home URL.
@@ -3052,13 +3174,15 @@ 
  * @return string Admin url link with optional path appended.
 */
 function network_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( ! is_multisite() )
-		return admin_url( $path, $scheme );
+	if ( ! is_multisite() ) {
+			return admin_url( $path, $scheme );
+	}
 
 	$url = network_site_url('wp-admin/network/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filter the network admin URL.
@@ -3084,8 +3208,9 @@ 
 function user_admin_url( $path = '', $scheme = 'admin' ) {
 	$url = network_site_url('wp-admin/user/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filter the user admin URL for the current user.
@@ -3109,13 +3234,14 @@ 
  * @return string Admin url link with optional path appended.
 */
 function self_admin_url($path = '', $scheme = 'admin') {
-	if ( is_network_admin() )
-		return network_admin_url($path, $scheme);
-	elseif ( is_user_admin() )
-		return user_admin_url($path, $scheme);
-	else
-		return admin_url($path, $scheme);
-}
+	if ( is_network_admin() ) {
+			return network_admin_url($path, $scheme);
+	} elseif ( is_user_admin() ) {
+			return user_admin_url($path, $scheme);
+	} else {
+			return admin_url($path, $scheme);
+	}
+	}
 
 /**
  * Set the scheme for a URL
@@ -3138,13 +3264,15 @@ 
 	}
 
 	$url = trim( $url );
-	if ( substr( $url, 0, 2 ) === '//' )
-		$url = 'http:' . $url;
+	if ( substr( $url, 0, 2 ) === '//' ) {
+			$url = 'http:' . $url;
+	}
 
 	if ( 'relative' == $scheme ) {
 		$url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
-		if ( $url !== '' && $url[0] === '/' )
-			$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+		if ( $url !== '' && $url[0] === '/' ) {
+					$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+		}
 	} else {
 		$url = preg_replace( '#^\w+://#', $scheme . '://', $url );
 	}
@@ -3190,10 +3318,11 @@ 
 			$url = admin_url( $path, $scheme );
 		} else {
 			$active = get_active_blog_for_user( $user_id );
-			if ( $active )
-				$url = get_admin_url( $active->blog_id, $path, $scheme );
-			else
-				$url = user_admin_url( $path, $scheme );
+			if ( $active ) {
+							$url = get_admin_url( $active->blog_id, $path, $scheme );
+			} else {
+							$url = user_admin_url( $path, $scheme );
+			}
 		}
 	}
 
@@ -3224,12 +3353,13 @@ 
 function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	if ( is_user_admin() )
-		$url = user_admin_url( 'profile.php', $scheme );
-	elseif ( is_network_admin() )
-		$url = network_admin_url( 'profile.php', $scheme );
-	else
-		$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+	if ( is_user_admin() ) {
+			$url = user_admin_url( 'profile.php', $scheme );
+	} elseif ( is_network_admin() ) {
+			$url = network_admin_url( 'profile.php', $scheme );
+	} else {
+			$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+	}
 
 	/**
 	 * Filter the URL for a user's profile editor.
@@ -3252,17 +3382,20 @@ 
  * @global WP_Query $wp_the_query
 */
 function rel_canonical() {
-	if ( !is_singular() )
-		return;
+	if ( !is_singular() ) {
+			return;
+	}
 
 	global $wp_the_query;
-	if ( !$id = $wp_the_query->get_queried_object_id() )
-		return;
+	if ( !$id = $wp_the_query->get_queried_object_id() ) {
+			return;
+	}
 
 	$link = get_permalink( $id );
 
-	if ( $page = get_query_var('cpage') )
-		$link = get_comments_pagenum_link( $page );
+	if ( $page = get_query_var('cpage') ) {
+			$link = get_comments_pagenum_link( $page );
+	}
 
 	echo "<link rel='canonical' href='$link' />\n";
 }
@@ -3303,8 +3436,9 @@ 
 	 */
 	$shortlink = apply_filters( 'pre_get_shortlink', false, $id, $context, $allow_slugs );
 
-	if ( false !== $shortlink )
-		return $shortlink;
+	if ( false !== $shortlink ) {
+			return $shortlink;
+	}
 
 	global $wp_query;
 	$post_id = 0;
@@ -3313,8 +3447,9 @@ 
 		$post = get_post( $post_id );
 	} elseif ( 'post' == $context ) {
 		$post = get_post( $id );
-		if ( ! empty( $post->ID ) )
-			$post_id = $post->ID;
+		if ( ! empty( $post->ID ) ) {
+					$post_id = $post->ID;
+		}
 	}
 
 	$shortlink = '';
@@ -3353,8 +3488,9 @@ 
 function wp_shortlink_wp_head() {
 	$shortlink = wp_get_shortlink( 0, 'query' );
 
-	if ( empty( $shortlink ) )
-		return;
+	if ( empty( $shortlink ) ) {
+			return;
+	}
 
 	echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
 }
@@ -3367,13 +3503,15 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_header() {
-	if ( headers_sent() )
-		return;
+	if ( headers_sent() ) {
+			return;
+	}
 
 	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty($shortlink) )
-		return;
+	if ( empty($shortlink) ) {
+			return;
+	}
 
 	header('Link: <' . $shortlink . '>; rel=shortlink', false);
 }
@@ -3395,11 +3533,13 @@ 
 function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
 	$post = get_post();
 
-	if ( empty( $text ) )
-		$text = __('This is the short link.');
+	if ( empty( $text ) ) {
+			$text = __('This is the short link.');
+	}
 
-	if ( empty( $title ) )
-		$title = the_title_attribute( array( 'echo' => false ) );
+	if ( empty( $title ) ) {
+			$title = the_title_attribute( array( 'echo' => false ) );
+	}
 
 	$shortlink = wp_get_shortlink( $post->ID );
 

src/wp-includes/load.php

Doc Comments +1 added lines, -1 removed lines

@@ -218,7 +218,7 @@
  * @global float   $timestart Seconds from when timer_start() is called.
  * @global float   $timeend   Seconds from when function is called.
  *
- * @param int|bool $display   Whether to echo or return the results. Accepts 0|false for return,
+ * @param integer $display   Whether to echo or return the results. Accepts 0|false for return,
  *                            1|true for echo. Default 0|false.
  * @param int      $precision The number of digits from the right of the decimal to display.
  *                            Default 3.

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * These functions are needed to load WordPress.
- *
- * @internal This file must be parsable by PHP4.
- *
- * @package WordPress
- */
+	 * These functions are needed to load WordPress.
+	 *
+	 * @internal This file must be parsable by PHP4.
+	 *
+	 * @package WordPress
+	 */
 
 /**
  * Turn register globals off.

Spacing +178 added lines, -178 removed lines

@@ -14,19 +14,19 @@ 
  * @access private
  */
 function wp_unregister_GLOBALS() {
-	if ( !ini_get( 'register_globals' ) )
+	if ( ! ini_get('register_globals'))
 		return;
 
-	if ( isset( $_REQUEST['GLOBALS'] ) )
-		die( 'GLOBALS overwrite attempt detected' );
+	if (isset($_REQUEST['GLOBALS']))
+		die('GLOBALS overwrite attempt detected');
 
 	// Variables that shouldn't be unset
-	$no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
+	$no_unset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix');
 
-	$input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset( $_SESSION ) && is_array( $_SESSION ) ? $_SESSION : array() );
-	foreach ( $input as $k => $v )
-		if ( !in_array( $k, $no_unset ) && isset( $GLOBALS[$k] ) ) {
-			unset( $GLOBALS[$k] );
+	$input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
+	foreach ($input as $k => $v)
+		if ( ! in_array($k, $no_unset) && isset($GLOBALS[$k])) {
+			unset($GLOBALS[$k]);
 		}
 }
 
@@ -47,50 +47,50 @@ 
 		'REQUEST_URI' => '',
 	);
 
-	$_SERVER = array_merge( $default_server_values, $_SERVER );
+	$_SERVER = array_merge($default_server_values, $_SERVER);
 
 	// Fix for IIS when running with PHP ISAPI
-	if ( empty( $_SERVER['REQUEST_URI'] ) || ( PHP_SAPI != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
+	if (empty($_SERVER['REQUEST_URI']) || (PHP_SAPI != 'cgi-fcgi' && preg_match('/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE']))) {
 
 		// IIS Mod-Rewrite
-		if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
+		if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
 			$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
 		}
 		// IIS Isapi_Rewrite
-		elseif ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
+		elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
 			$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
 		} else {
 			// Use ORIG_PATH_INFO if there is no PATH_INFO
-			if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) )
+			if ( ! isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO']))
 				$_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
 
 			// Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
-			if ( isset( $_SERVER['PATH_INFO'] ) ) {
-				if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
+			if (isset($_SERVER['PATH_INFO'])) {
+				if ($_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'])
 					$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
 				else
-					$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
+					$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'].$_SERVER['PATH_INFO'];
 			}
 
 			// Append the query string if it exists and isn't null
-			if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
-				$_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
+			if ( ! empty($_SERVER['QUERY_STRING'])) {
+				$_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING'];
 			}
 		}
 	}
 
 	// Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
-	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) )
+	if (isset($_SERVER['SCRIPT_FILENAME']) && (strpos($_SERVER['SCRIPT_FILENAME'], 'php.cgi') == strlen($_SERVER['SCRIPT_FILENAME']) - 7))
 		$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
 
 	// Fix for Dreamhost and other PHP as CGI hosts
-	if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false )
-		unset( $_SERVER['PATH_INFO'] );
+	if (strpos($_SERVER['SCRIPT_NAME'], 'php.cgi') !== false)
+		unset($_SERVER['PATH_INFO']);
 
 	// Fix empty PHP_SELF
 	$PHP_SELF = $_SERVER['PHP_SELF'];
-	if ( empty( $PHP_SELF ) )
-		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
+	if (empty($PHP_SELF))
+		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace('/(\?.*)?$/', '', $_SERVER["REQUEST_URI"]);
 }
 
 /**
@@ -109,16 +109,16 @@ 
 	global $required_php_version, $wp_version;
 	$php_version = phpversion();
 
-	if ( version_compare( $required_php_version, $php_version, '>' ) ) {
+	if (version_compare($required_php_version, $php_version, '>')) {
 		wp_load_translations_early();
-		header( 'Content-Type: text/html; charset=utf-8' );
-		die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
+		header('Content-Type: text/html; charset=utf-8');
+		die(sprintf(__('Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.'), $php_version, $wp_version, $required_php_version));
 	}
 
-	if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
+	if ( ! extension_loaded('mysql') && ! extension_loaded('mysqli') && ! file_exists(WP_CONTENT_DIR.'/db.php')) {
 		wp_load_translations_early();
-		 header( 'Content-Type: text/html; charset=utf-8' );
-		die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );
+		 header('Content-Type: text/html; charset=utf-8');
+		die(__('Your PHP installation appears to be missing the MySQL extension which is required by WordPress.'));
 	}
 }
 
@@ -130,7 +130,7 @@ 
  * @since 3.0.0
  */
 function wp_favicon_request() {
-	if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) {
+	if ('/favicon.ico' == $_SERVER['REQUEST_URI']) {
 		header('Content-Type: image/vnd.microsoft.icon');
 		header('Content-Length: 0');
 		exit;
@@ -154,39 +154,39 @@ 
  * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
  */
 function wp_maintenance() {
-	if ( !file_exists( ABSPATH . '.maintenance' ) || defined( 'WP_INSTALLING' ) )
+	if ( ! file_exists(ABSPATH.'.maintenance') || defined('WP_INSTALLING'))
 		return;
 
 	global $upgrading;
 
-	include( ABSPATH . '.maintenance' );
+	include(ABSPATH.'.maintenance');
 	// If the $upgrading timestamp is older than 10 minutes, don't die.
-	if ( ( time() - $upgrading ) >= 600 )
+	if ((time() - $upgrading) >= 600)
 		return;
 
-	if ( file_exists( WP_CONTENT_DIR . '/maintenance.php' ) ) {
-		require_once( WP_CONTENT_DIR . '/maintenance.php' );
+	if (file_exists(WP_CONTENT_DIR.'/maintenance.php')) {
+		require_once(WP_CONTENT_DIR.'/maintenance.php');
 		die();
 	}
 
 	wp_load_translations_early();
 
 	$protocol = $_SERVER["SERVER_PROTOCOL"];
-	if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol )
+	if ('HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol)
 		$protocol = 'HTTP/1.0';
-	header( "$protocol 503 Service Unavailable", true, 503 );
-	header( 'Content-Type: text/html; charset=utf-8' );
-	header( 'Retry-After: 600' );
+	header("$protocol 503 Service Unavailable", true, 503);
+	header('Content-Type: text/html; charset=utf-8');
+	header('Retry-After: 600');
 ?>
 	<!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( 'Maintenance' ); ?></title>
+		<title><?php _e('Maintenance'); ?></title>
 
 	</head>
 	<body>
-		<h1><?php _e( 'Briefly unavailable for scheduled maintenance. Check back in a minute.' ); ?></h1>
+		<h1><?php _e('Briefly unavailable for scheduled maintenance. Check back in a minute.'); ?></h1>
 	</body>
 	</html>
 <?php
@@ -206,7 +206,7 @@ 
  */
 function timer_start() {
 	global $timestart;
-	$timestart = microtime( true );
+	$timestart = microtime(true);
 	return true;
 }
 
@@ -225,12 +225,12 @@ 
  * @return string The "second.microsecond" finished time calculation. The number is formatted
  *                for human consumption, both localized and rounded.
  */
-function timer_stop( $display = 0, $precision = 3 ) {
+function timer_stop($display = 0, $precision = 3) {
 	global $timestart, $timeend;
-	$timeend = microtime( true );
+	$timeend = microtime(true);
 	$timetotal = $timeend - $timestart;
-	$r = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );
-	if ( $display )
+	$r = (function_exists('number_format_i18n')) ? number_format_i18n($timetotal, $precision) : number_format($timetotal, $precision);
+	if ($display)
 		echo $r;
 	return $r;
 }
@@ -266,23 +266,23 @@ 
  * @access private
  */
 function wp_debug_mode() {
-	if ( WP_DEBUG ) {
-		error_reporting( E_ALL );
+	if (WP_DEBUG) {
+		error_reporting(E_ALL);
 
-		if ( WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 1 );
-		elseif ( null !== WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 0 );
+		if (WP_DEBUG_DISPLAY)
+			ini_set('display_errors', 1);
+		elseif (null !== WP_DEBUG_DISPLAY)
+			ini_set('display_errors', 0);
 
-		if ( WP_DEBUG_LOG ) {
-			ini_set( 'log_errors', 1 );
-			ini_set( 'error_log', WP_CONTENT_DIR . '/debug.log' );
+		if (WP_DEBUG_LOG) {
+			ini_set('log_errors', 1);
+			ini_set('error_log', WP_CONTENT_DIR.'/debug.log');
 		}
 	} else {
-		error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
+		error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
 	}
-	if ( defined( 'XMLRPC_REQUEST' ) )
-		ini_set( 'display_errors', 0 );
+	if (defined('XMLRPC_REQUEST'))
+		ini_set('display_errors', 0);
 }
 
 /**
@@ -299,8 +299,8 @@ 
  * @access private
  */
 function wp_set_lang_dir() {
-	if ( !defined( 'WP_LANG_DIR' ) ) {
-		if ( file_exists( WP_CONTENT_DIR . '/languages' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) || !@is_dir(ABSPATH . WPINC . '/languages') ) {
+	if ( ! defined('WP_LANG_DIR')) {
+		if (file_exists(WP_CONTENT_DIR.'/languages') && @is_dir(WP_CONTENT_DIR.'/languages') || ! @is_dir(ABSPATH.WPINC.'/languages')) {
 			/**
 			 * Server path of the language directory.
 			 *
@@ -308,10 +308,10 @@ 
 			 *
 			 * @since 2.1.0
 			 */
-			define( 'WP_LANG_DIR', WP_CONTENT_DIR . '/languages' );
-			if ( !defined( 'LANGDIR' ) ) {
+			define('WP_LANG_DIR', WP_CONTENT_DIR.'/languages');
+			if ( ! defined('LANGDIR')) {
 				// Old static relative path maintained for limited backwards compatibility - won't work in some cases
-				define( 'LANGDIR', 'wp-content/languages' );
+				define('LANGDIR', 'wp-content/languages');
 			}
 		} else {
 			/**
@@ -321,10 +321,10 @@ 
 			 *
 			 * @since 2.1.0
 			 */
-			define( 'WP_LANG_DIR', ABSPATH . WPINC . '/languages' );
-			if ( !defined( 'LANGDIR' ) ) {
+			define('WP_LANG_DIR', ABSPATH.WPINC.'/languages');
+			if ( ! defined('LANGDIR')) {
 				// Old relative path maintained for backwards compatibility
-				define( 'LANGDIR', WPINC . '/languages' );
+				define('LANGDIR', WPINC.'/languages');
 			}
 		}
 	}
@@ -340,14 +340,14 @@ 
 function require_wp_db() {
 	global $wpdb;
 
-	require_once( ABSPATH . WPINC . '/wp-db.php' );
-	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
-		require_once( WP_CONTENT_DIR . '/db.php' );
+	require_once(ABSPATH.WPINC.'/wp-db.php');
+	if (file_exists(WP_CONTENT_DIR.'/db.php'))
+		require_once(WP_CONTENT_DIR.'/db.php');
 
-	if ( isset( $wpdb ) )
+	if (isset($wpdb))
 		return;
 
-	$wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
+	$wpdb = new wpdb(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST);
 }
 
 /**
@@ -364,22 +364,22 @@ 
  */
 function wp_set_wpdb_vars() {
 	global $wpdb, $table_prefix;
-	if ( !empty( $wpdb->error ) )
+	if ( ! empty($wpdb->error))
 		dead_db();
 
-	$wpdb->field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
-		'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'comment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
+	$wpdb->field_types = array('post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
+		'parent' => '%d', 'count' => '%d', 'object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'comment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
 		'user_id' => '%d', 'link_id' => '%d', 'link_owner' => '%d', 'link_rating' => '%d', 'option_id' => '%d', 'blog_id' => '%d', 'meta_id' => '%d', 'post_id' => '%d',
 		'user_status' => '%d', 'umeta_id' => '%d', 'comment_karma' => '%d', 'comment_count' => '%d',
 		// multisite:
 		'active' => '%d', 'cat_id' => '%d', 'deleted' => '%d', 'lang_id' => '%d', 'mature' => '%d', 'public' => '%d', 'site_id' => '%d', 'spam' => '%d',
 	);
 
-	$prefix = $wpdb->set_prefix( $table_prefix );
+	$prefix = $wpdb->set_prefix($table_prefix);
 
-	if ( is_wp_error( $prefix ) ) {
+	if (is_wp_error($prefix)) {
 		wp_load_translations_early();
-		wp_die( __( '<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.' ) );
+		wp_die(__('<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.'));
 	}
 }
 
@@ -394,10 +394,10 @@ 
  * @param bool $using Whether external object cache is being used.
  * @return bool The current 'using' setting.
  */
-function wp_using_ext_object_cache( $using = null ) {
+function wp_using_ext_object_cache($using = null) {
 	global $_wp_using_ext_object_cache;
 	$current_using = $_wp_using_ext_object_cache;
-	if ( null !== $using )
+	if (null !== $using)
 		$_wp_using_ext_object_cache = $using;
 	return $current_using;
 }
@@ -417,40 +417,40 @@ 
 	global $blog_id;
 
 	$first_init = false;
- 	if ( ! function_exists( 'wp_cache_init' ) ) {
-		if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
-			require_once ( WP_CONTENT_DIR . '/object-cache.php' );
-			if ( function_exists( 'wp_cache_init' ) )
-				wp_using_ext_object_cache( true );
+ 	if ( ! function_exists('wp_cache_init')) {
+		if (file_exists(WP_CONTENT_DIR.'/object-cache.php')) {
+			require_once (WP_CONTENT_DIR.'/object-cache.php');
+			if (function_exists('wp_cache_init'))
+				wp_using_ext_object_cache(true);
 		}
 
 		$first_init = true;
-	} elseif ( ! wp_using_ext_object_cache() && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
+	} elseif ( ! wp_using_ext_object_cache() && file_exists(WP_CONTENT_DIR.'/object-cache.php')) {
 		/*
 		 * Sometimes advanced-cache.php can load object-cache.php before
 		 * it is loaded here. This breaks the function_exists check above
 		 * and can result in `$_wp_using_ext_object_cache` being set
 		 * incorrectly. Double check if an external cache exists.
 		 */
-		wp_using_ext_object_cache( true );
+		wp_using_ext_object_cache(true);
 	}
 
-	if ( ! wp_using_ext_object_cache() )
-		require_once ( ABSPATH . WPINC . '/cache.php' );
+	if ( ! wp_using_ext_object_cache())
+		require_once (ABSPATH.WPINC.'/cache.php');
 
 	/*
 	 * If cache supports reset, reset instead of init if already
 	 * initialized. Reset signals to the cache that global IDs
 	 * have changed and it may need to update keys and cleanup caches.
 	 */
-	if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
-		wp_cache_switch_to_blog( $blog_id );
-	elseif ( function_exists( 'wp_cache_init' ) )
+	if ( ! $first_init && function_exists('wp_cache_switch_to_blog'))
+		wp_cache_switch_to_blog($blog_id);
+	elseif (function_exists('wp_cache_init'))
 		wp_cache_init();
 
-	if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-		wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
-		wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
+	if (function_exists('wp_cache_add_global_groups')) {
+		wp_cache_add_global_groups(array('users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache'));
+		wp_cache_add_non_persistent_groups(array('comment', 'counts', 'plugins'));
 	}
 }
 
@@ -463,22 +463,22 @@ 
  * @access private
  */
 function wp_not_installed() {
-	if ( is_multisite() ) {
-		if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) {
+	if (is_multisite()) {
+		if ( ! is_blog_installed() && ! defined('WP_INSTALLING')) {
 			nocache_headers();
 
-			wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
+			wp_die(__('The site you have requested is not installed properly. Please contact the system administrator.'));
 		}
-	} elseif ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) {
+	} elseif ( ! is_blog_installed() && ! defined('WP_INSTALLING')) {
 		nocache_headers();
 
-		require( ABSPATH . WPINC . '/kses.php' );
-		require( ABSPATH . WPINC . '/pluggable.php' );
-		require( ABSPATH . WPINC . '/formatting.php' );
+		require(ABSPATH.WPINC.'/kses.php');
+		require(ABSPATH.WPINC.'/pluggable.php');
+		require(ABSPATH.WPINC.'/formatting.php');
 
-		$link = wp_guess_url() . '/wp-admin/install.php';
+		$link = wp_guess_url().'/wp-admin/install.php';
 
-		wp_redirect( $link );
+		wp_redirect($link);
 		die();
 	}
 }
@@ -497,16 +497,16 @@ 
  */
 function wp_get_mu_plugins() {
 	$mu_plugins = array();
-	if ( !is_dir( WPMU_PLUGIN_DIR ) )
+	if ( ! is_dir(WPMU_PLUGIN_DIR))
 		return $mu_plugins;
-	if ( ! $dh = opendir( WPMU_PLUGIN_DIR ) )
+	if ( ! $dh = opendir(WPMU_PLUGIN_DIR))
 		return $mu_plugins;
-	while ( ( $plugin = readdir( $dh ) ) !== false ) {
-		if ( substr( $plugin, -4 ) == '.php' )
-			$mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
+	while (($plugin = readdir($dh)) !== false) {
+		if (substr($plugin, -4) == '.php')
+			$mu_plugins[] = WPMU_PLUGIN_DIR.'/'.$plugin;
 	}
-	closedir( $dh );
-	sort( $mu_plugins );
+	closedir($dh);
+	sort($mu_plugins);
 
 	return $mu_plugins;
 }
@@ -527,27 +527,27 @@ 
  */
 function wp_get_active_and_valid_plugins() {
 	$plugins = array();
-	$active_plugins = (array) get_option( 'active_plugins', array() );
+	$active_plugins = (array) get_option('active_plugins', array());
 
 	// Check for hacks file if the option is enabled
-	if ( get_option( 'hack_file' ) && file_exists( ABSPATH . 'my-hacks.php' ) ) {
-		_deprecated_file( 'my-hacks.php', '1.5' );
-		array_unshift( $plugins, ABSPATH . 'my-hacks.php' );
+	if (get_option('hack_file') && file_exists(ABSPATH.'my-hacks.php')) {
+		_deprecated_file('my-hacks.php', '1.5');
+		array_unshift($plugins, ABSPATH.'my-hacks.php');
 	}
 
-	if ( empty( $active_plugins ) || defined( 'WP_INSTALLING' ) )
+	if (empty($active_plugins) || defined('WP_INSTALLING'))
 		return $plugins;
 
 	$network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
 
-	foreach ( $active_plugins as $plugin ) {
-		if ( ! validate_file( $plugin ) // $plugin must validate as file
-			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
-			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
+	foreach ($active_plugins as $plugin) {
+		if ( ! validate_file($plugin) // $plugin must validate as file
+			&& '.php' == substr($plugin, -4) // $plugin must end with '.php'
+			&& file_exists(WP_PLUGIN_DIR.'/'.$plugin) // $plugin must exist
 			// not already included as a network plugin
-			&& ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins ) )
+			&& ( ! $network_plugins || ! in_array(WP_PLUGIN_DIR.'/'.$plugin, $network_plugins))
 			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		$plugins[] = WP_PLUGIN_DIR.'/'.$plugin;
 	}
 	return $plugins;
 }
@@ -562,10 +562,10 @@ 
  * @access private
  */
 function wp_set_internal_encoding() {
-	if ( function_exists( 'mb_internal_encoding' ) ) {
-		$charset = get_option( 'blog_charset' );
-		if ( ! $charset || ! @mb_internal_encoding( $charset ) )
-			mb_internal_encoding( 'UTF-8' );
+	if (function_exists('mb_internal_encoding')) {
+		$charset = get_option('blog_charset');
+		if ( ! $charset || ! @mb_internal_encoding($charset))
+			mb_internal_encoding('UTF-8');
 	}
 }
 
@@ -580,20 +580,20 @@ 
  */
 function wp_magic_quotes() {
 	// If already slashed, strip.
-	if ( get_magic_quotes_gpc() ) {
-		$_GET    = stripslashes_deep( $_GET    );
-		$_POST   = stripslashes_deep( $_POST   );
-		$_COOKIE = stripslashes_deep( $_COOKIE );
+	if (get_magic_quotes_gpc()) {
+		$_GET    = stripslashes_deep($_GET);
+		$_POST   = stripslashes_deep($_POST);
+		$_COOKIE = stripslashes_deep($_COOKIE);
 	}
 
 	// Escape with wpdb.
-	$_GET    = add_magic_quotes( $_GET    );
-	$_POST   = add_magic_quotes( $_POST   );
-	$_COOKIE = add_magic_quotes( $_COOKIE );
-	$_SERVER = add_magic_quotes( $_SERVER );
+	$_GET    = add_magic_quotes($_GET);
+	$_POST   = add_magic_quotes($_POST);
+	$_COOKIE = add_magic_quotes($_COOKIE);
+	$_SERVER = add_magic_quotes($_SERVER);
 
 	// Force REQUEST to be GET + POST.
-	$_REQUEST = array_merge( $_GET, $_POST );
+	$_REQUEST = array_merge($_GET, $_POST);
 }
 
 /**
@@ -608,7 +608,7 @@ 
 	 *
 	 * @since 1.2.0
 	 */
-	do_action( 'shutdown' );
+	do_action('shutdown');
 
 	wp_cache_close();
 }
@@ -622,9 +622,9 @@ 
  * @param object $object The object to clone.
  * @return object The cloned object.
  */
-function wp_clone( $object ) {
+function wp_clone($object) {
 	// Use parens for clone to accommodate PHP 4. See #17880
-	return clone( $object );
+	return clone($object);
 }
 
 /**
@@ -640,9 +640,9 @@ 
  * @return bool True if inside WordPress administration interface, false otherwise.
  */
 function is_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
+	if (isset($GLOBALS['current_screen']))
 		return $GLOBALS['current_screen']->in_admin();
-	elseif ( defined( 'WP_ADMIN' ) )
+	elseif (defined('WP_ADMIN'))
 		return WP_ADMIN;
 
 	return false;
@@ -663,9 +663,9 @@ 
  * @return bool True if inside WordPress blog administration pages.
  */
 function is_blog_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'site' );
-	elseif ( defined( 'WP_BLOG_ADMIN' ) )
+	if (isset($GLOBALS['current_screen']))
+		return $GLOBALS['current_screen']->in_admin('site');
+	elseif (defined('WP_BLOG_ADMIN'))
 		return WP_BLOG_ADMIN;
 
 	return false;
@@ -686,9 +686,9 @@ 
  * @return bool True if inside WordPress network administration pages.
  */
 function is_network_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'network' );
-	elseif ( defined( 'WP_NETWORK_ADMIN' ) )
+	if (isset($GLOBALS['current_screen']))
+		return $GLOBALS['current_screen']->in_admin('network');
+	elseif (defined('WP_NETWORK_ADMIN'))
 		return WP_NETWORK_ADMIN;
 
 	return false;
@@ -710,9 +710,9 @@ 
  * @return bool True if inside WordPress user administration pages.
  */
 function is_user_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'user' );
-	elseif ( defined( 'WP_USER_ADMIN' ) )
+	if (isset($GLOBALS['current_screen']))
+		return $GLOBALS['current_screen']->in_admin('user');
+	elseif (defined('WP_USER_ADMIN'))
 		return WP_USER_ADMIN;
 
 	return false;
@@ -726,10 +726,10 @@ 
  * @return bool True if Multisite is enabled, false otherwise.
  */
 function is_multisite() {
-	if ( defined( 'MULTISITE' ) )
+	if (defined('MULTISITE'))
 		return MULTISITE;
 
-	if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
+	if (defined('SUBDOMAIN_INSTALL') || defined('VHOST') || defined('SUNRISE'))
 		return true;
 
 	return false;
@@ -771,62 +771,62 @@ 
 	global $text_direction, $wp_locale;
 
 	static $loaded = false;
-	if ( $loaded )
+	if ($loaded)
 		return;
 	$loaded = true;
 
-	if ( function_exists( 'did_action' ) && did_action( 'init' ) )
+	if (function_exists('did_action') && did_action('init'))
 		return;
 
 	// We need $wp_local_package
-	require ABSPATH . WPINC . '/version.php';
+	require ABSPATH.WPINC.'/version.php';
 
 	// Translation and localization
-	require_once ABSPATH . WPINC . '/pomo/mo.php';
-	require_once ABSPATH . WPINC . '/l10n.php';
-	require_once ABSPATH . WPINC . '/locale.php';
+	require_once ABSPATH.WPINC.'/pomo/mo.php';
+	require_once ABSPATH.WPINC.'/l10n.php';
+	require_once ABSPATH.WPINC.'/locale.php';
 
 	// General libraries
-	require_once ABSPATH . WPINC . '/plugin.php';
+	require_once ABSPATH.WPINC.'/plugin.php';
 
 	$locales = $locations = array();
 
-	while ( true ) {
-		if ( defined( 'WPLANG' ) ) {
-			if ( '' == WPLANG )
+	while (true) {
+		if (defined('WPLANG')) {
+			if ('' == WPLANG)
 				break;
 			$locales[] = WPLANG;
 		}
 
-		if ( isset( $wp_local_package ) )
+		if (isset($wp_local_package))
 			$locales[] = $wp_local_package;
 
-		if ( ! $locales )
+		if ( ! $locales)
 			break;
 
-		if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) )
+		if (defined('WP_LANG_DIR') && @is_dir(WP_LANG_DIR))
 			$locations[] = WP_LANG_DIR;
 
-		if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) )
-			$locations[] = WP_CONTENT_DIR . '/languages';
+		if (defined('WP_CONTENT_DIR') && @is_dir(WP_CONTENT_DIR.'/languages'))
+			$locations[] = WP_CONTENT_DIR.'/languages';
 
-		if ( @is_dir( ABSPATH . 'wp-content/languages' ) )
-			$locations[] = ABSPATH . 'wp-content/languages';
+		if (@is_dir(ABSPATH.'wp-content/languages'))
+			$locations[] = ABSPATH.'wp-content/languages';
 
-		if ( @is_dir( ABSPATH . WPINC . '/languages' ) )
-			$locations[] = ABSPATH . WPINC . '/languages';
+		if (@is_dir(ABSPATH.WPINC.'/languages'))
+			$locations[] = ABSPATH.WPINC.'/languages';
 
-		if ( ! $locations )
+		if ( ! $locations)
 			break;
 
-		$locations = array_unique( $locations );
+		$locations = array_unique($locations);
 
-		foreach ( $locales as $locale ) {
-			foreach ( $locations as $location ) {
-				if ( file_exists( $location . '/' . $locale . '.mo' ) ) {
-					load_textdomain( 'default', $location . '/' . $locale . '.mo' );
-					if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) )
-						load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+		foreach ($locales as $locale) {
+			foreach ($locations as $location) {
+				if (file_exists($location.'/'.$locale.'.mo')) {
+					load_textdomain('default', $location.'/'.$locale.'.mo');
+					if (defined('WP_SETUP_CONFIG') && file_exists($location.'/admin-'.$locale.'.mo'))
+						load_textdomain('default', $location.'/admin-'.$locale.'.mo');
 					break 2;
 				}
 			}

Braces +152 added lines, -105 removed lines

@@ -14,19 +14,22 @@ 
  * @access private
  */
 function wp_unregister_GLOBALS() {
-	if ( !ini_get( 'register_globals' ) )
-		return;
+	if ( !ini_get( 'register_globals' ) ) {
+			return;
+	}
 
-	if ( isset( $_REQUEST['GLOBALS'] ) )
-		die( 'GLOBALS overwrite attempt detected' );
+	if ( isset( $_REQUEST['GLOBALS'] ) ) {
+			die( 'GLOBALS overwrite attempt detected' );
+	}
 
 	// Variables that shouldn't be unset
 	$no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
 
 	$input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset( $_SESSION ) && is_array( $_SESSION ) ? $_SESSION : array() );
-	foreach ( $input as $k => $v )
-		if ( !in_array( $k, $no_unset ) && isset( $GLOBALS[$k] ) ) {
+	foreach ( $input as $k => $v ) {
+			if ( !in_array( $k, $no_unset ) && isset( $GLOBALS[$k] ) ) {
 			unset( $GLOBALS[$k] );
+	}
 		}
 }
 
@@ -61,15 +64,17 @@ 
 			$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
 		} else {
 			// Use ORIG_PATH_INFO if there is no PATH_INFO
-			if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) )
-				$_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
+			if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) ) {
+							$_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
+			}
 
 			// Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
 			if ( isset( $_SERVER['PATH_INFO'] ) ) {
-				if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
-					$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
-				else
-					$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
+				if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] ) {
+									$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
+				} else {
+									$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
+				}
 			}
 
 			// Append the query string if it exists and isn't null
@@ -80,18 +85,21 @@ 
 	}
 
 	// Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
-	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) )
-		$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
+	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) ) {
+			$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
+	}
 
 	// Fix for Dreamhost and other PHP as CGI hosts
-	if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false )
-		unset( $_SERVER['PATH_INFO'] );
+	if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false ) {
+			unset( $_SERVER['PATH_INFO'] );
+	}
 
 	// Fix empty PHP_SELF
 	$PHP_SELF = $_SERVER['PHP_SELF'];
-	if ( empty( $PHP_SELF ) )
-		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
-}
+	if ( empty( $PHP_SELF ) ) {
+			$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
+	}
+	}
 
 /**
  * Check for the required PHP version, and the MySQL extension or
@@ -154,15 +162,17 @@ 
  * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
  */
 function wp_maintenance() {
-	if ( !file_exists( ABSPATH . '.maintenance' ) || defined( 'WP_INSTALLING' ) )
-		return;
+	if ( !file_exists( ABSPATH . '.maintenance' ) || defined( 'WP_INSTALLING' ) ) {
+			return;
+	}
 
 	global $upgrading;
 
 	include( ABSPATH . '.maintenance' );
 	// If the $upgrading timestamp is older than 10 minutes, don't die.
-	if ( ( time() - $upgrading ) >= 600 )
-		return;
+	if ( ( time() - $upgrading ) >= 600 ) {
+			return;
+	}
 
 	if ( file_exists( WP_CONTENT_DIR . '/maintenance.php' ) ) {
 		require_once( WP_CONTENT_DIR . '/maintenance.php' );
@@ -172,14 +182,18 @@ 
 	wp_load_translations_early();
 
 	$protocol = $_SERVER["SERVER_PROTOCOL"];
-	if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol )
-		$protocol = 'HTTP/1.0';
+	if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol ) {
+			$protocol = 'HTTP/1.0';
+	}
 	header( "$protocol 503 Service Unavailable", true, 503 );
 	header( 'Content-Type: text/html; charset=utf-8' );
 	header( 'Retry-After: 600' );
 ?>
 	<!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( 'Maintenance' ); ?></title>
@@ -230,8 +244,9 @@ 
 	$timeend = microtime( true );
 	$timetotal = $timeend - $timestart;
 	$r = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );
-	if ( $display )
-		echo $r;
+	if ( $display ) {
+			echo $r;
+	}
 	return $r;
 }
 
@@ -269,10 +284,11 @@ 
 	if ( WP_DEBUG ) {
 		error_reporting( E_ALL );
 
-		if ( WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 1 );
-		elseif ( null !== WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 0 );
+		if ( WP_DEBUG_DISPLAY ) {
+					ini_set( 'display_errors', 1 );
+		} elseif ( null !== WP_DEBUG_DISPLAY ) {
+					ini_set( 'display_errors', 0 );
+		}
 
 		if ( WP_DEBUG_LOG ) {
 			ini_set( 'log_errors', 1 );
@@ -281,9 +297,10 @@ 
 	} else {
 		error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
 	}
-	if ( defined( 'XMLRPC_REQUEST' ) )
-		ini_set( 'display_errors', 0 );
-}
+	if ( defined( 'XMLRPC_REQUEST' ) ) {
+			ini_set( 'display_errors', 0 );
+	}
+	}
 
 /**
  * Set the location of the language directory.
@@ -341,11 +358,13 @@ 
 	global $wpdb;
 
 	require_once( ABSPATH . WPINC . '/wp-db.php' );
-	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
-		require_once( WP_CONTENT_DIR . '/db.php' );
+	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
+			require_once( WP_CONTENT_DIR . '/db.php' );
+	}
 
-	if ( isset( $wpdb ) )
-		return;
+	if ( isset( $wpdb ) ) {
+			return;
+	}
 
 	$wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
 }
@@ -364,8 +383,9 @@ 
  */
 function wp_set_wpdb_vars() {
 	global $wpdb, $table_prefix;
-	if ( !empty( $wpdb->error ) )
-		dead_db();
+	if ( !empty( $wpdb->error ) ) {
+			dead_db();
+	}
 
 	$wpdb->field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
 		'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'comment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
@@ -397,8 +417,9 @@ 
 function wp_using_ext_object_cache( $using = null ) {
 	global $_wp_using_ext_object_cache;
 	$current_using = $_wp_using_ext_object_cache;
-	if ( null !== $using )
-		$_wp_using_ext_object_cache = $using;
+	if ( null !== $using ) {
+			$_wp_using_ext_object_cache = $using;
+	}
 	return $current_using;
 }
 
@@ -420,8 +441,9 @@ 
  	if ( ! function_exists( 'wp_cache_init' ) ) {
 		if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
 			require_once ( WP_CONTENT_DIR . '/object-cache.php' );
-			if ( function_exists( 'wp_cache_init' ) )
-				wp_using_ext_object_cache( true );
+			if ( function_exists( 'wp_cache_init' ) ) {
+							wp_using_ext_object_cache( true );
+			}
 		}
 
 		$first_init = true;
@@ -435,18 +457,20 @@ 
 		wp_using_ext_object_cache( true );
 	}
 
-	if ( ! wp_using_ext_object_cache() )
-		require_once ( ABSPATH . WPINC . '/cache.php' );
+	if ( ! wp_using_ext_object_cache() ) {
+			require_once ( ABSPATH . WPINC . '/cache.php' );
+	}
 
 	/*
 	 * If cache supports reset, reset instead of init if already
 	 * initialized. Reset signals to the cache that global IDs
 	 * have changed and it may need to update keys and cleanup caches.
 	 */
-	if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
-		wp_cache_switch_to_blog( $blog_id );
-	elseif ( function_exists( 'wp_cache_init' ) )
-		wp_cache_init();
+	if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) ) {
+			wp_cache_switch_to_blog( $blog_id );
+	} elseif ( function_exists( 'wp_cache_init' ) ) {
+			wp_cache_init();
+	}
 
 	if ( function_exists( 'wp_cache_add_global_groups' ) ) {
 		wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
@@ -497,13 +521,16 @@ 
  */
 function wp_get_mu_plugins() {
 	$mu_plugins = array();
-	if ( !is_dir( WPMU_PLUGIN_DIR ) )
-		return $mu_plugins;
-	if ( ! $dh = opendir( WPMU_PLUGIN_DIR ) )
-		return $mu_plugins;
+	if ( !is_dir( WPMU_PLUGIN_DIR ) ) {
+			return $mu_plugins;
+	}
+	if ( ! $dh = opendir( WPMU_PLUGIN_DIR ) ) {
+			return $mu_plugins;
+	}
 	while ( ( $plugin = readdir( $dh ) ) !== false ) {
-		if ( substr( $plugin, -4 ) == '.php' )
-			$mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
+		if ( substr( $plugin, -4 ) == '.php' ) {
+					$mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
+		}
 	}
 	closedir( $dh );
 	sort( $mu_plugins );
@@ -535,8 +562,9 @@ 
 		array_unshift( $plugins, ABSPATH . 'my-hacks.php' );
 	}
 
-	if ( empty( $active_plugins ) || defined( 'WP_INSTALLING' ) )
-		return $plugins;
+	if ( empty( $active_plugins ) || defined( 'WP_INSTALLING' ) ) {
+			return $plugins;
+	}
 
 	$network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
 
@@ -546,8 +574,9 @@ 
 			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
 			// not already included as a network plugin
 			&& ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins ) )
-			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+			) {
+				$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		}
 	}
 	return $plugins;
 }
@@ -564,8 +593,9 @@ 
 function wp_set_internal_encoding() {
 	if ( function_exists( 'mb_internal_encoding' ) ) {
 		$charset = get_option( 'blog_charset' );
-		if ( ! $charset || ! @mb_internal_encoding( $charset ) )
-			mb_internal_encoding( 'UTF-8' );
+		if ( ! $charset || ! @mb_internal_encoding( $charset ) ) {
+					mb_internal_encoding( 'UTF-8' );
+		}
 	}
 }
 
@@ -640,10 +670,11 @@ 
  * @return bool True if inside WordPress administration interface, false otherwise.
  */
 function is_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin();
-	elseif ( defined( 'WP_ADMIN' ) )
-		return WP_ADMIN;
+	if ( isset( $GLOBALS['current_screen'] ) ) {
+			return $GLOBALS['current_screen']->in_admin();
+	} elseif ( defined( 'WP_ADMIN' ) ) {
+			return WP_ADMIN;
+	}
 
 	return false;
 }
@@ -663,10 +694,11 @@ 
  * @return bool True if inside WordPress blog administration pages.
  */
 function is_blog_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'site' );
-	elseif ( defined( 'WP_BLOG_ADMIN' ) )
-		return WP_BLOG_ADMIN;
+	if ( isset( $GLOBALS['current_screen'] ) ) {
+			return $GLOBALS['current_screen']->in_admin( 'site' );
+	} elseif ( defined( 'WP_BLOG_ADMIN' ) ) {
+			return WP_BLOG_ADMIN;
+	}
 
 	return false;
 }
@@ -686,10 +718,11 @@ 
  * @return bool True if inside WordPress network administration pages.
  */
 function is_network_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'network' );
-	elseif ( defined( 'WP_NETWORK_ADMIN' ) )
-		return WP_NETWORK_ADMIN;
+	if ( isset( $GLOBALS['current_screen'] ) ) {
+			return $GLOBALS['current_screen']->in_admin( 'network' );
+	} elseif ( defined( 'WP_NETWORK_ADMIN' ) ) {
+			return WP_NETWORK_ADMIN;
+	}
 
 	return false;
 }
@@ -710,10 +743,11 @@ 
  * @return bool True if inside WordPress user administration pages.
  */
 function is_user_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'user' );
-	elseif ( defined( 'WP_USER_ADMIN' ) )
-		return WP_USER_ADMIN;
+	if ( isset( $GLOBALS['current_screen'] ) ) {
+			return $GLOBALS['current_screen']->in_admin( 'user' );
+	} elseif ( defined( 'WP_USER_ADMIN' ) ) {
+			return WP_USER_ADMIN;
+	}
 
 	return false;
 }
@@ -726,11 +760,13 @@ 
  * @return bool True if Multisite is enabled, false otherwise.
  */
 function is_multisite() {
-	if ( defined( 'MULTISITE' ) )
-		return MULTISITE;
+	if ( defined( 'MULTISITE' ) ) {
+			return MULTISITE;
+	}
 
-	if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
-		return true;
+	if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -771,12 +807,14 @@ 
 	global $text_direction, $wp_locale;
 
 	static $loaded = false;
-	if ( $loaded )
-		return;
+	if ( $loaded ) {
+			return;
+	}
 	$loaded = true;
 
-	if ( function_exists( 'did_action' ) && did_action( 'init' ) )
-		return;
+	if ( function_exists( 'did_action' ) && did_action( 'init' ) ) {
+			return;
+	}
 
 	// We need $wp_local_package
 	require ABSPATH . WPINC . '/version.php';
@@ -793,31 +831,39 @@ 
 
 	while ( true ) {
 		if ( defined( 'WPLANG' ) ) {
-			if ( '' == WPLANG )
-				break;
+			if ( '' == WPLANG ) {
+							break;
+			}
 			$locales[] = WPLANG;
 		}
 
-		if ( isset( $wp_local_package ) )
-			$locales[] = $wp_local_package;
+		if ( isset( $wp_local_package ) ) {
+					$locales[] = $wp_local_package;
+		}
 
-		if ( ! $locales )
-			break;
+		if ( ! $locales ) {
+					break;
+		}
 
-		if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) )
-			$locations[] = WP_LANG_DIR;
+		if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) ) {
+					$locations[] = WP_LANG_DIR;
+		}
 
-		if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) )
-			$locations[] = WP_CONTENT_DIR . '/languages';
+		if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) ) {
+					$locations[] = WP_CONTENT_DIR . '/languages';
+		}
 
-		if ( @is_dir( ABSPATH . 'wp-content/languages' ) )
-			$locations[] = ABSPATH . 'wp-content/languages';
+		if ( @is_dir( ABSPATH . 'wp-content/languages' ) ) {
+					$locations[] = ABSPATH . 'wp-content/languages';
+		}
 
-		if ( @is_dir( ABSPATH . WPINC . '/languages' ) )
-			$locations[] = ABSPATH . WPINC . '/languages';
+		if ( @is_dir( ABSPATH . WPINC . '/languages' ) ) {
+					$locations[] = ABSPATH . WPINC . '/languages';
+		}
 
-		if ( ! $locations )
-			break;
+		if ( ! $locations ) {
+					break;
+		}
 
 		$locations = array_unique( $locations );
 
@@ -825,8 +871,9 @@ 
 			foreach ( $locations as $location ) {
 				if ( file_exists( $location . '/' . $locale . '.mo' ) ) {
 					load_textdomain( 'default', $location . '/' . $locale . '.mo' );
-					if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) )
-						load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+					if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) ) {
+											load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+					}
 					break 2;
 				}
 			}

src/wp-includes/media.php

Doc Comments +7 added lines, -7 removed lines

@@ -286,7 +286,7 @@ 
  *
  * @param int        $width  Image width in pixels.
  * @param int        $height Image height in pixels.
- * @param bool|array $crop   Optional. Whether to crop images to specified height and width or resize.
+ * @param boolean $crop   Optional. Whether to crop images to specified height and width or resize.
  *                           An array can specify positioning of the crop area. Default false.
  */
 function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
@@ -311,7 +311,7 @@ 
  * @param string       $alt   Image Description for the alt attribute.
  * @param string       $title Image Description for the title attribute.
  * @param string       $align Part of the class name for aligning the image.
- * @param string|array $size  Optional. Registered image size to retrieve a tag for, or flat array
+ * @param string $size  Optional. Registered image size to retrieve a tag for, or flat array
  *                            of height and width values. Default 'medium'.
  * @return string HTML IMG element for given image attachment
  */
@@ -3200,7 +3200,7 @@ 
  * @since 3.6.0
  *
  * @param string      $type Mime type.
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return array Found attachments.
  */
 function get_attached_media( $type, $post = 0 ) {
@@ -3339,7 +3339,7 @@ 
  *
  * @since 3.6.0
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @param bool        $html Optional. Whether to return HTML or data. Default is true.
  * @return string|array Gallery data and srcs parsed from the expanded shortcode.
  */
@@ -3366,7 +3366,7 @@ 
  *
  * @see get_post_galleries()
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return array A list of lists, each containing image srcs parsed.
  *               from an expanded shortcode
  */
@@ -3382,7 +3382,7 @@ 
  *
  * @see get_post_gallery()
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return array A list of a gallery's image srcs in order.
  */
 function get_post_gallery_images( $post = 0 ) {
@@ -3461,7 +3461,7 @@ 
  *
  * @global string $wp_version
  *
- * @return array The relevant CSS file URLs.
+ * @return string[] The relevant CSS file URLs.
  */
 function wpview_media_sandbox_styles() {
  	$version = 'ver=' . $GLOBALS['wp_version'];

Indentation +27 added lines, -27 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * WordPress API for media display.
- *
- * @package WordPress
- * @subpackage Media
- */
+	 * WordPress API for media display.
+	 *
+	 * @package WordPress
+	 * @subpackage Media
+	 */
 
 /**
  * Scale down the default size of an image.
@@ -1533,28 +1533,28 @@ 
 	return apply_filters( 'wp_get_attachment_id3_keys', $fields, $attachment, $context );
 }
 /**
- * Builds the Audio shortcode output.
- *
- * This implements the functionality of the Audio Shortcode for displaying
- * WordPress mp3s in a post.
- *
- * @since 3.6.0
- *
- * @staticvar int $instance
- *
- * @param array  $attr {
- *     Attributes of the audio shortcode.
- *
- *     @type string $src      URL to the source of the audio file. Default empty.
- *     @type string $loop     The 'loop' attribute for the `<audio>` element. Default empty.
- *     @type string $autoplay The 'autoplay' attribute for the `<audio>` element. Default empty.
- *     @type string $preload  The 'preload' attribute for the `<audio>` element. Default empty.
- *     @type string $class    The 'class' attribute for the `<audio>` element. Default 'wp-audio-shortcode'.
- *     @type string $style    The 'style' attribute for the `<audio>` element. Default 'width: 100%'.
- * }
- * @param string $content Shortcode content.
- * @return string|void HTML content to display audio.
- */
+	 * Builds the Audio shortcode output.
+	 *
+	 * This implements the functionality of the Audio Shortcode for displaying
+	 * WordPress mp3s in a post.
+	 *
+	 * @since 3.6.0
+	 *
+	 * @staticvar int $instance
+	 *
+	 * @param array  $attr {
+	 *     Attributes of the audio shortcode.
+	 *
+	 *     @type string $src      URL to the source of the audio file. Default empty.
+	 *     @type string $loop     The 'loop' attribute for the `<audio>` element. Default empty.
+	 *     @type string $autoplay The 'autoplay' attribute for the `<audio>` element. Default empty.
+	 *     @type string $preload  The 'preload' attribute for the `<audio>` element. Default empty.
+	 *     @type string $class    The 'class' attribute for the `<audio>` element. Default 'wp-audio-shortcode'.
+	 *     @type string $style    The 'style' attribute for the `<audio>` element. Default 'width: 100%'.
+	 * }
+	 * @param string $content Shortcode content.
+	 * @return string|void HTML content to display audio.
+	 */
 function wp_audio_shortcode( $attr, $content = '' ) {
 	$post_id = get_post() ? get_the_ID() : 0;
 

Spacing +793 added lines, -793 removed lines

@@ -37,31 +37,31 @@ 
  *                              (like inserting into an editor). Default null.
  * @return array Width and height of what the result image should resize to.
  */
-function image_constrain_size_for_editor( $width, $height, $size = 'medium', $context = null ) {
+function image_constrain_size_for_editor($width, $height, $size = 'medium', $context = null) {
 	global $content_width, $_wp_additional_image_sizes;
 
-	if ( ! $context )
+	if ( ! $context)
 		$context = is_admin() ? 'edit' : 'display';
 
-	if ( is_array($size) ) {
+	if (is_array($size)) {
 		$max_width = $size[0];
 		$max_height = $size[1];
 	}
-	elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
+	elseif ($size == 'thumb' || $size == 'thumbnail') {
 		$max_width = intval(get_option('thumbnail_size_w'));
 		$max_height = intval(get_option('thumbnail_size_h'));
 		// last chance thumbnail size defaults
-		if ( !$max_width && !$max_height ) {
+		if ( ! $max_width && ! $max_height) {
 			$max_width = 128;
 			$max_height = 96;
 		}
 	}
-	elseif ( $size == 'medium' ) {
+	elseif ($size == 'medium') {
 		$max_width = intval(get_option('medium_size_w'));
 		$max_height = intval(get_option('medium_size_h'));
 		// if no width is set, default to the theme content width if available
 	}
-	elseif ( $size == 'large' ) {
+	elseif ($size == 'large') {
 		/*
 		 * We're inserting a large size image into the editor. If it's a really
 		 * big image we'll scale it down to fit reasonably within the editor
@@ -70,13 +70,13 @@ 
 		 */
 		$max_width = intval(get_option('large_size_w'));
 		$max_height = intval(get_option('large_size_h'));
-		if ( intval($content_width) > 0 )
-			$max_width = min( intval($content_width), $max_width );
-	} elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
-		$max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
-		$max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
-		if ( intval($content_width) > 0 && 'edit' == $context ) // Only in admin. Assume that theme authors know what they're doing.
-			$max_width = min( intval($content_width), $max_width );
+		if (intval($content_width) > 0)
+			$max_width = min(intval($content_width), $max_width);
+	} elseif (isset($_wp_additional_image_sizes) && count($_wp_additional_image_sizes) && in_array($size, array_keys($_wp_additional_image_sizes))) {
+		$max_width = intval($_wp_additional_image_sizes[$size]['width']);
+		$max_height = intval($_wp_additional_image_sizes[$size]['height']);
+		if (intval($content_width) > 0 && 'edit' == $context) // Only in admin. Assume that theme authors know what they're doing.
+			$max_width = min(intval($content_width), $max_width);
 	}
 	// $size == 'full' has no constraint
 	else {
@@ -96,9 +96,9 @@ 
 	 *                                     Possible values are 'display' (like in a theme)
 	 *                                     or 'edit' (like inserting into an editor).
 	 */
-	list( $max_width, $max_height ) = apply_filters( 'editor_max_image_size', array( $max_width, $max_height ), $size, $context );
+	list($max_width, $max_height) = apply_filters('editor_max_image_size', array($max_width, $max_height), $size, $context);
 
-	return wp_constrain_dimensions( $width, $height, $max_width, $max_height );
+	return wp_constrain_dimensions($width, $height, $max_width, $max_height);
 }
 
 /**
@@ -118,7 +118,7 @@ 
  * @param int|string $height Image height in pixels.
  * @return string HTML attributes for width and, or height.
  */
-function image_hwstring( $width, $height ) {
+function image_hwstring($width, $height) {
 	$out = '';
 	if ($width)
 		$out .= 'width="'.intval($width).'" ';
@@ -150,9 +150,9 @@ 
  *                           or flat array of height and width values. Default 'medium'.
  * @return false|array False on failure, array on success.
  */
-function image_downsize( $id, $size = 'medium' ) {
+function image_downsize($id, $size = 'medium') {
 
-	if ( !wp_attachment_is_image($id) )
+	if ( ! wp_attachment_is_image($id))
 		return false;
 
 	/**
@@ -167,7 +167,7 @@ 
 	 * @param int          $id       Attachment ID for image.
 	 * @param array|string $size     Size of image, either array or string. Default 'medium'.
 	 */
-	if ( $out = apply_filters( 'image_downsize', false, $id, $size ) ) {
+	if ($out = apply_filters('image_downsize', false, $id, $size)) {
 		return $out;
 	}
 
@@ -178,32 +178,32 @@ 
 	$img_url_basename = wp_basename($img_url);
 
 	// try for a new style intermediate size
-	if ( $intermediate = image_get_intermediate_size($id, $size) ) {
+	if ($intermediate = image_get_intermediate_size($id, $size)) {
 		$img_url = str_replace($img_url_basename, $intermediate['file'], $img_url);
 		$width = $intermediate['width'];
 		$height = $intermediate['height'];
 		$is_intermediate = true;
 	}
-	elseif ( $size == 'thumbnail' ) {
+	elseif ($size == 'thumbnail') {
 		// fall back to the old thumbnail
-		if ( ($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file) ) {
+		if (($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file)) {
 			$img_url = str_replace($img_url_basename, wp_basename($thumb_file), $img_url);
 			$width = $info[0];
 			$height = $info[1];
 			$is_intermediate = true;
 		}
 	}
-	if ( !$width && !$height && isset( $meta['width'], $meta['height'] ) ) {
+	if ( ! $width && ! $height && isset($meta['width'], $meta['height'])) {
 		// any other type: use the real image
 		$width = $meta['width'];
 		$height = $meta['height'];
 	}
 
-	if ( $img_url) {
+	if ($img_url) {
 		// we have the actual image size, but might need to further constrain it if content_width is narrower
-		list( $width, $height ) = image_constrain_size_for_editor( $width, $height, $size );
+		list($width, $height) = image_constrain_size_for_editor($width, $height, $size);
 
-		return array( $img_url, $width, $height, $is_intermediate );
+		return array($img_url, $width, $height, $is_intermediate);
 	}
 	return false;
 
@@ -230,12 +230,12 @@ 
  * @param bool|array $crop   Optional. Whether to crop images to specified height and width or resize.
  *                           An array can specify positioning of the crop area. Default false.
  */
-function add_image_size( $name, $width = 0, $height = 0, $crop = false ) {
+function add_image_size($name, $width = 0, $height = 0, $crop = false) {
 	global $_wp_additional_image_sizes;
 
-	$_wp_additional_image_sizes[ $name ] = array(
-		'width'  => absint( $width ),
-		'height' => absint( $height ),
+	$_wp_additional_image_sizes[$name] = array(
+		'width'  => absint($width),
+		'height' => absint($height),
 		'crop'   => $crop,
 	);
 }
@@ -250,10 +250,10 @@ 
  * @param string $name The image size to check.
  * @return bool True if the image size exists, false if not.
  */
-function has_image_size( $name ) {
+function has_image_size($name) {
 	global $_wp_additional_image_sizes;
 
-	return isset( $_wp_additional_image_sizes[ $name ] );
+	return isset($_wp_additional_image_sizes[$name]);
 }
 
 /**
@@ -266,11 +266,11 @@ 
  * @param string $name The image size to remove.
  * @return bool True if the image size was successfully removed, false on failure.
  */
-function remove_image_size( $name ) {
+function remove_image_size($name) {
 	global $_wp_additional_image_sizes;
 
-	if ( isset( $_wp_additional_image_sizes[ $name ] ) ) {
-		unset( $_wp_additional_image_sizes[ $name ] );
+	if (isset($_wp_additional_image_sizes[$name])) {
+		unset($_wp_additional_image_sizes[$name]);
 		return true;
 	}
 
@@ -289,8 +289,8 @@ 
  * @param bool|array $crop   Optional. Whether to crop images to specified height and width or resize.
  *                           An array can specify positioning of the crop area. Default false.
  */
-function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
-	add_image_size( 'post-thumbnail', $width, $height, $crop );
+function set_post_thumbnail_size($width = 0, $height = 0, $crop = false) {
+	add_image_size('post-thumbnail', $width, $height, $crop);
 }
 
 /**
@@ -315,14 +315,14 @@ 
  *                            of height and width values. Default 'medium'.
  * @return string HTML IMG element for given image attachment
  */
-function get_image_tag( $id, $alt, $title, $align, $size = 'medium' ) {
+function get_image_tag($id, $alt, $title, $align, $size = 'medium') {
 
-	list( $img_src, $width, $height ) = image_downsize($id, $size);
+	list($img_src, $width, $height) = image_downsize($id, $size);
 	$hwstring = image_hwstring($width, $height);
 
-	$title = $title ? 'title="' . esc_attr( $title ) . '" ' : '';
+	$title = $title ? 'title="'.esc_attr($title).'" ' : '';
 
-	$class = 'align' . esc_attr($align) .' size-' . esc_attr($size) . ' wp-image-' . $id;
+	$class = 'align'.esc_attr($align).' size-'.esc_attr($size).' wp-image-'.$id;
 
 	/**
 	 * Filter the value of the attachment's image tag class attribute.
@@ -334,9 +334,9 @@ 
 	 * @param string $align Part of the class name for aligning the image.
 	 * @param string $size  Optional. Default is 'medium'.
 	 */
-	$class = apply_filters( 'get_image_tag_class', $class, $id, $align, $size );
+	$class = apply_filters('get_image_tag_class', $class, $id, $align, $size);
 
-	$html = '<img src="' . esc_attr($img_src) . '" alt="' . esc_attr($alt) . '" ' . $title . $hwstring . 'class="' . $class . '" />';
+	$html = '<img src="'.esc_attr($img_src).'" alt="'.esc_attr($alt).'" '.$title.$hwstring.'class="'.$class.'" />';
 
 	/**
 	 * Filter the HTML content for the image tag.
@@ -350,7 +350,7 @@ 
 	 * @param string $align Part of the class name for aligning the image.
 	 * @param string $size  Optional. Default is 'medium'.
 	 */
-	return apply_filters( 'get_image_tag', $html, $id, $alt, $title, $align, $size );
+	return apply_filters('get_image_tag', $html, $id, $alt, $title, $align, $size);
 }
 
 /**
@@ -367,28 +367,28 @@ 
  * @param int $max_height     Optional. Max height in pixels to constrain to. Default 0.
  * @return array First item is the width, the second item is the height.
  */
-function wp_constrain_dimensions( $current_width, $current_height, $max_width = 0, $max_height = 0 ) {
-	if ( !$max_width && !$max_height )
-		return array( $current_width, $current_height );
+function wp_constrain_dimensions($current_width, $current_height, $max_width = 0, $max_height = 0) {
+	if ( ! $max_width && ! $max_height)
+		return array($current_width, $current_height);
 
 	$width_ratio = $height_ratio = 1.0;
 	$did_width = $did_height = false;
 
-	if ( $max_width > 0 && $current_width > 0 && $current_width > $max_width ) {
+	if ($max_width > 0 && $current_width > 0 && $current_width > $max_width) {
 		$width_ratio = $max_width / $current_width;
 		$did_width = true;
 	}
 
-	if ( $max_height > 0 && $current_height > 0 && $current_height > $max_height ) {
+	if ($max_height > 0 && $current_height > 0 && $current_height > $max_height) {
 		$height_ratio = $max_height / $current_height;
 		$did_height = true;
 	}
 
 	// Calculate the larger/smaller ratios
-	$smaller_ratio = min( $width_ratio, $height_ratio );
-	$larger_ratio  = max( $width_ratio, $height_ratio );
+	$smaller_ratio = min($width_ratio, $height_ratio);
+	$larger_ratio  = max($width_ratio, $height_ratio);
 
-	if ( (int) round( $current_width * $larger_ratio ) > $max_width || (int) round( $current_height * $larger_ratio ) > $max_height ) {
+	if ((int) round($current_width * $larger_ratio) > $max_width || (int) round($current_height * $larger_ratio) > $max_height) {
  		// The larger ratio is too big. It would result in an overflow.
 		$ratio = $smaller_ratio;
 	} else {
@@ -397,20 +397,20 @@ 
 	}
 
 	// Very small dimensions may result in 0, 1 should be the minimum.
-	$w = max ( 1, (int) round( $current_width  * $ratio ) );
-	$h = max ( 1, (int) round( $current_height * $ratio ) );
+	$w = max(1, (int) round($current_width * $ratio));
+	$h = max(1, (int) round($current_height * $ratio));
 
 	// Sometimes, due to rounding, we'll end up with a result like this: 465x700 in a 177x177 box is 117x176... a pixel short
 	// We also have issues with recursive calls resulting in an ever-changing result. Constraining to the result of a constraint should yield the original result.
 	// Thus we look for dimensions that are one pixel shy of the max value and bump them up
 
 	// Note: $did_width means it is possible $smaller_ratio == $width_ratio.
-	if ( $did_width && $w == $max_width - 1 ) {
+	if ($did_width && $w == $max_width - 1) {
 		$w = $max_width; // Round it up
 	}
 
 	// Note: $did_height means it is possible $smaller_ratio == $height_ratio.
-	if ( $did_height && $h == $max_height - 1 ) {
+	if ($did_height && $h == $max_height - 1) {
 		$h = $max_height; // Round it up
 	}
 
@@ -425,7 +425,7 @@ 
 	 * @param int 	$max_width      The maximum width permitted.
 	 * @param int 	$max_height     The maximum height permitted.
 	 */
-	return apply_filters( 'wp_constrain_dimensions', array( $w, $h ), $current_width, $current_height, $max_width, $max_height );
+	return apply_filters('wp_constrain_dimensions', array($w, $h), $current_width, $current_height, $max_width, $max_height);
 }
 
 /**
@@ -476,22 +476,22 @@ 
 	 * @param bool|array $crop   Whether to crop image to specified height and width or resize.
 	 *                           An array can specify positioning of the crop area. Default false.
 	 */
-	$output = apply_filters( 'image_resize_dimensions', null, $orig_w, $orig_h, $dest_w, $dest_h, $crop );
-	if ( null !== $output )
+	$output = apply_filters('image_resize_dimensions', null, $orig_w, $orig_h, $dest_w, $dest_h, $crop);
+	if (null !== $output)
 		return $output;
 
-	if ( $crop ) {
+	if ($crop) {
 		// crop the largest possible portion of the original image that we can size to $dest_w x $dest_h
 		$aspect_ratio = $orig_w / $orig_h;
 		$new_w = min($dest_w, $orig_w);
 		$new_h = min($dest_h, $orig_h);
 
-		if ( ! $new_w ) {
-			$new_w = (int) round( $new_h * $aspect_ratio );
+		if ( ! $new_w) {
+			$new_w = (int) round($new_h * $aspect_ratio);
 		}
 
-		if ( ! $new_h ) {
-			$new_h = (int) round( $new_w / $aspect_ratio );
+		if ( ! $new_h) {
+			$new_h = (int) round($new_w / $aspect_ratio);
 		}
 
 		$size_ratio = max($new_w / $orig_w, $new_h / $orig_h);
@@ -499,26 +499,26 @@ 
 		$crop_w = round($new_w / $size_ratio);
 		$crop_h = round($new_h / $size_ratio);
 
-		if ( ! is_array( $crop ) || count( $crop ) !== 2 ) {
-			$crop = array( 'center', 'center' );
+		if ( ! is_array($crop) || count($crop) !== 2) {
+			$crop = array('center', 'center');
 		}
 
-		list( $x, $y ) = $crop;
+		list($x, $y) = $crop;
 
-		if ( 'left' === $x ) {
+		if ('left' === $x) {
 			$s_x = 0;
-		} elseif ( 'right' === $x ) {
+		} elseif ('right' === $x) {
 			$s_x = $orig_w - $crop_w;
 		} else {
-			$s_x = floor( ( $orig_w - $crop_w ) / 2 );
+			$s_x = floor(($orig_w - $crop_w) / 2);
 		}
 
-		if ( 'top' === $y ) {
+		if ('top' === $y) {
 			$s_y = 0;
-		} elseif ( 'bottom' === $y ) {
+		} elseif ('bottom' === $y) {
 			$s_y = $orig_h - $crop_h;
 		} else {
-			$s_y = floor( ( $orig_h - $crop_h ) / 2 );
+			$s_y = floor(($orig_h - $crop_h) / 2);
 		}
 	} else {
 		// don't crop, just resize using $dest_w x $dest_h as a maximum bounding box
@@ -528,17 +528,17 @@ 
 		$s_x = 0;
 		$s_y = 0;
 
-		list( $new_w, $new_h ) = wp_constrain_dimensions( $orig_w, $orig_h, $dest_w, $dest_h );
+		list($new_w, $new_h) = wp_constrain_dimensions($orig_w, $orig_h, $dest_w, $dest_h);
 	}
 
 	// if the resulting image would be the same size or larger we don't want to resize it
-	if ( $new_w >= $orig_w && $new_h >= $orig_h && $dest_w != $orig_w && $dest_h != $orig_h ) {
+	if ($new_w >= $orig_w && $new_h >= $orig_h && $dest_w != $orig_w && $dest_h != $orig_h) {
 		return false;
 	}
 
 	// the return array matches the parameters to imagecopyresampled()
 	// int dst_x, int dst_y, int src_x, int src_y, int dst_w, int dst_h, int src_w, int src_h
-	return array( 0, 0, (int) $s_x, (int) $s_y, (int) $new_w, (int) $new_h, (int) $crop_w, (int) $crop_h );
+	return array(0, 0, (int) $s_x, (int) $s_y, (int) $new_w, (int) $new_h, (int) $crop_w, (int) $crop_h);
 
 }
 
@@ -558,17 +558,17 @@ 
  *                       Default false.
  * @return false|array False, if no image was created. Metadata array on success.
  */
-function image_make_intermediate_size( $file, $width, $height, $crop = false ) {
-	if ( $width || $height ) {
-		$editor = wp_get_image_editor( $file );
+function image_make_intermediate_size($file, $width, $height, $crop = false) {
+	if ($width || $height) {
+		$editor = wp_get_image_editor($file);
 
-		if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) )
+		if (is_wp_error($editor) || is_wp_error($editor->resize($width, $height, $crop)))
 			return false;
 
 		$resized_file = $editor->save();
 
-		if ( ! is_wp_error( $resized_file ) && $resized_file ) {
-			unset( $resized_file['path'] );
+		if ( ! is_wp_error($resized_file) && $resized_file) {
+			unset($resized_file['path']);
 			return $resized_file;
 		}
 	}
@@ -601,54 +601,54 @@ 
  *                              and width dimensions. Default 'thumbnail'.
  * @return false|array False on failure or array of file path, width, and height on success.
  */
-function image_get_intermediate_size( $post_id, $size = 'thumbnail' ) {
-	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) )
+function image_get_intermediate_size($post_id, $size = 'thumbnail') {
+	if ( ! is_array($imagedata = wp_get_attachment_metadata($post_id)))
 		return false;
 
 	// get the best one for a specified set of dimensions
-	if ( is_array($size) && !empty($imagedata['sizes']) ) {
+	if (is_array($size) && ! empty($imagedata['sizes'])) {
 		$areas = array();
 
-		foreach ( $imagedata['sizes'] as $_size => $data ) {
+		foreach ($imagedata['sizes'] as $_size => $data) {
 			// already cropped to width or height; so use this size
-			if ( ( $data['width'] == $size[0] && $data['height'] <= $size[1] ) || ( $data['height'] == $size[1] && $data['width'] <= $size[0] ) ) {
+			if (($data['width'] == $size[0] && $data['height'] <= $size[1]) || ($data['height'] == $size[1] && $data['width'] <= $size[0])) {
 				$file = $data['file'];
-				list($width, $height) = image_constrain_size_for_editor( $data['width'], $data['height'], $size );
-				return compact( 'file', 'width', 'height' );
+				list($width, $height) = image_constrain_size_for_editor($data['width'], $data['height'], $size);
+				return compact('file', 'width', 'height');
 			}
 			// add to lookup table: area => size
 			$areas[$data['width'] * $data['height']] = $_size;
 		}
-		if ( !$size || !empty($areas) ) {
+		if ( ! $size || ! empty($areas)) {
 			// find for the smallest image not smaller than the desired size
 			ksort($areas);
-			foreach ( $areas as $_size ) {
+			foreach ($areas as $_size) {
 				$data = $imagedata['sizes'][$_size];
-				if ( $data['width'] >= $size[0] || $data['height'] >= $size[1] ) {
+				if ($data['width'] >= $size[0] || $data['height'] >= $size[1]) {
 					// Skip images with unexpectedly divergent aspect ratios (crops)
 					// First, we calculate what size the original image would be if constrained to a box the size of the current image in the loop
-					$maybe_cropped = image_resize_dimensions($imagedata['width'], $imagedata['height'], $data['width'], $data['height'], false );
+					$maybe_cropped = image_resize_dimensions($imagedata['width'], $imagedata['height'], $data['width'], $data['height'], false);
 					// If the size doesn't match within one pixel, then it is of a different aspect ratio, so we skip it, unless it's the thumbnail size
-					if ( 'thumbnail' != $_size && ( !$maybe_cropped || ( $maybe_cropped[4] != $data['width'] && $maybe_cropped[4] + 1 != $data['width'] ) || ( $maybe_cropped[5] != $data['height'] && $maybe_cropped[5] + 1 != $data['height'] ) ) )
+					if ('thumbnail' != $_size && ( ! $maybe_cropped || ($maybe_cropped[4] != $data['width'] && $maybe_cropped[4] + 1 != $data['width']) || ($maybe_cropped[5] != $data['height'] && $maybe_cropped[5] + 1 != $data['height'])))
 						continue;
 					// If we're still here, then we're going to use this size
 					$file = $data['file'];
-					list($width, $height) = image_constrain_size_for_editor( $data['width'], $data['height'], $size );
-					return compact( 'file', 'width', 'height' );
+					list($width, $height) = image_constrain_size_for_editor($data['width'], $data['height'], $size);
+					return compact('file', 'width', 'height');
 				}
 			}
 		}
 	}
 
-	if ( is_array($size) || empty($size) || empty($imagedata['sizes'][$size]) )
+	if (is_array($size) || empty($size) || empty($imagedata['sizes'][$size]))
 		return false;
 
 	$data = $imagedata['sizes'][$size];
 	// include the full filesystem path of the intermediate file
-	if ( empty($data['path']) && !empty($data['file']) ) {
+	if (empty($data['path']) && ! empty($data['file'])) {
 		$file_url = wp_get_attachment_url($post_id);
-		$data['path'] = path_join( dirname($imagedata['file']), $data['file'] );
-		$data['url'] = path_join( dirname($file_url), $data['file'] );
+		$data['path'] = path_join(dirname($imagedata['file']), $data['file']);
+		$data['url'] = path_join(dirname($file_url), $data['file']);
 	}
 	return $data;
 }
@@ -665,8 +665,8 @@ 
 function get_intermediate_image_sizes() {
 	global $_wp_additional_image_sizes;
 	$image_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes
-	if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
-		$image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+	if (isset($_wp_additional_image_sizes) && count($_wp_additional_image_sizes))
+		$image_sizes = array_merge($image_sizes, array_keys($_wp_additional_image_sizes));
 
 	/**
 	 * Filter the list of intermediate image sizes.
@@ -676,7 +676,7 @@ 
 	 * @param array $image_sizes An array of intermediate image sizes. Defaults
 	 *                           are 'thumbnail', 'medium', 'large'.
 	 */
-	return apply_filters( 'intermediate_image_sizes', $image_sizes );
+	return apply_filters('intermediate_image_sizes', $image_sizes);
 }
 
 /**
@@ -692,22 +692,22 @@ 
  * @param bool         $icon          Optional. Whether the image should be treated as an icon. Default false.
  * @return false|array Returns an array (url, width, height), or false, if no image is available.
  */
-function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon = false ) {
+function wp_get_attachment_image_src($attachment_id, $size = 'thumbnail', $icon = false) {
 	// get a thumbnail or intermediate image if there is one
-	$image = image_downsize( $attachment_id, $size );
-	if ( ! $image ) {
+	$image = image_downsize($attachment_id, $size);
+	if ( ! $image) {
 		$src = false;
 
-		if ( $icon && $src = wp_mime_type_icon( $attachment_id ) ) {
+		if ($icon && $src = wp_mime_type_icon($attachment_id)) {
 			/** This filter is documented in wp-includes/post.php */
-			$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
+			$icon_dir = apply_filters('icon_dir', ABSPATH.WPINC.'/images/media');
 
-			$src_file = $icon_dir . '/' . wp_basename( $src );
-			@list( $width, $height ) = getimagesize( $src_file );
+			$src_file = $icon_dir.'/'.wp_basename($src);
+			@list($width, $height) = getimagesize($src_file);
 		}
 
-		if ( $src && $width && $height ) {
-			$image = array( $src, $width, $height );
+		if ($src && $width && $height) {
+			$image = array($src, $width, $height);
 		}
 	}
 	/**
@@ -721,7 +721,7 @@ 
 	 *                                    array of height and width dimensions. Default 'thumbnail'.
 	 * @param bool         $icon          Whether the image should be treated as an icon. Default false.
 	 */
-	return apply_filters( 'wp_get_attachment_image_src', $image, $attachment_id, $size, $icon );
+	return apply_filters('wp_get_attachment_image_src', $image, $attachment_id, $size, $icon);
 }
 
 /**
@@ -744,23 +744,23 @@ 
 function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false, $attr = '') {
 	$html = '';
 	$image = wp_get_attachment_image_src($attachment_id, $size, $icon);
-	if ( $image ) {
+	if ($image) {
 		list($src, $width, $height) = $image;
 		$hwstring = image_hwstring($width, $height);
 		$size_class = $size;
-		if ( is_array( $size_class ) ) {
-			$size_class = join( 'x', $size_class );
+		if (is_array($size_class)) {
+			$size_class = join('x', $size_class);
 		}
 		$attachment = get_post($attachment_id);
 		$default_attr = array(
 			'src'	=> $src,
 			'class'	=> "attachment-$size_class",
-			'alt'	=> trim(strip_tags( get_post_meta($attachment_id, '_wp_attachment_image_alt', true) )), // Use Alt field first
+			'alt'	=> trim(strip_tags(get_post_meta($attachment_id, '_wp_attachment_image_alt', true))), // Use Alt field first
 		);
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_excerpt )); // If not, Use the Caption
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_title )); // Finally, use the title
+		if (empty($default_attr['alt']))
+			$default_attr['alt'] = trim(strip_tags($attachment->post_excerpt)); // If not, Use the Caption
+		if (empty($default_attr['alt']))
+			$default_attr['alt'] = trim(strip_tags($attachment->post_title)); // Finally, use the title
 
 		$attr = wp_parse_args($attr, $default_attr);
 
@@ -773,11 +773,11 @@ 
 		 * @param WP_Post      $attachment Image attachment post.
 		 * @param string|array $size       Requested size.
 		 */
-		$attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment, $size );
-		$attr = array_map( 'esc_attr', $attr );
+		$attr = apply_filters('wp_get_attachment_image_attributes', $attr, $attachment, $size);
+		$attr = array_map('esc_attr', $attr);
 		$html = rtrim("<img $hwstring");
-		foreach ( $attr as $name => $value ) {
-			$html .= " $name=" . '"' . $value . '"';
+		foreach ($attr as $name => $value) {
+			$html .= " $name=".'"'.$value.'"';
 		}
 		$html .= ' />';
 	}
@@ -797,7 +797,7 @@ 
  * @param array $attr Thumbnail attributes including src, class, alt, title.
  * @return array Modified array of attributes including the new 'wp-post-image' class.
  */
-function _wp_post_thumbnail_class_filter( $attr ) {
+function _wp_post_thumbnail_class_filter($attr) {
 	$attr['class'] .= ' wp-post-image';
 	return $attr;
 }
@@ -811,8 +811,8 @@ 
  *
  * @param array $attr Thumbnail attributes including src, class, alt, title.
  */
-function _wp_post_thumbnail_class_filter_add( $attr ) {
-	add_filter( 'wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter' );
+function _wp_post_thumbnail_class_filter_add($attr) {
+	add_filter('wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter');
 }
 
 /**
@@ -824,8 +824,8 @@ 
  *
  * @param array $attr Thumbnail attributes including src, class, alt, title.
  */
-function _wp_post_thumbnail_class_filter_remove( $attr ) {
-	remove_filter( 'wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter' );
+function _wp_post_thumbnail_class_filter_remove($attr) {
+	remove_filter('wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter');
 }
 
 add_shortcode('wp_caption', 'img_caption_shortcode');
@@ -856,12 +856,12 @@ 
  * @param string $content Shortcode content.
  * @return string HTML content to display the caption.
  */
-function img_caption_shortcode( $attr, $content = null ) {
+function img_caption_shortcode($attr, $content = null) {
 	// New-style shortcode with the caption inside the shortcode with the link and image tags.
-	if ( ! isset( $attr['caption'] ) ) {
-		if ( preg_match( '#((?:<a [^>]+>\s*)?<img [^>]+>(?:\s*</a>)?)(.*)#is', $content, $matches ) ) {
+	if ( ! isset($attr['caption'])) {
+		if (preg_match('#((?:<a [^>]+>\s*)?<img [^>]+>(?:\s*</a>)?)(.*)#is', $content, $matches)) {
 			$content = $matches[1];
-			$attr['caption'] = trim( $matches[2] );
+			$attr['caption'] = trim($matches[2]);
 		}
 	}
 
@@ -879,30 +879,30 @@ 
 	 * @param array  $attr    Attributes of the caption shortcode.
 	 * @param string $content The image element, possibly wrapped in a hyperlink.
 	 */
-	$output = apply_filters( 'img_caption_shortcode', '', $attr, $content );
-	if ( $output != '' )
+	$output = apply_filters('img_caption_shortcode', '', $attr, $content);
+	if ($output != '')
 		return $output;
 
-	$atts = shortcode_atts( array(
+	$atts = shortcode_atts(array(
 		'id'	  => '',
 		'align'	  => 'alignnone',
 		'width'	  => '',
 		'caption' => '',
 		'class'   => '',
-	), $attr, 'caption' );
+	), $attr, 'caption');
 
 	$atts['width'] = (int) $atts['width'];
-	if ( $atts['width'] < 1 || empty( $atts['caption'] ) )
+	if ($atts['width'] < 1 || empty($atts['caption']))
 		return $content;
 
-	if ( ! empty( $atts['id'] ) )
-		$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
+	if ( ! empty($atts['id']))
+		$atts['id'] = 'id="'.esc_attr(sanitize_html_class($atts['id'])).'" ';
 
-	$class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
+	$class = trim('wp-caption '.$atts['align'].' '.$atts['class']);
 
-	if ( current_theme_supports( 'html5', 'caption' ) ) {
-		return '<figure ' . $atts['id'] . 'style="width: ' . (int) $atts['width'] . 'px;" class="' . esc_attr( $class ) . '">'
-		. do_shortcode( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>';
+	if (current_theme_supports('html5', 'caption')) {
+		return '<figure '.$atts['id'].'style="width: '.(int) $atts['width'].'px;" class="'.esc_attr($class).'">'
+		. do_shortcode($content).'<figcaption class="wp-caption-text">'.$atts['caption'].'</figcaption></figure>';
 	}
 
 	$caption_width = 10 + $atts['width'];
@@ -922,14 +922,14 @@ 
 	 * @param array  $atts          Attributes of the caption shortcode.
 	 * @param string $content       The image element, possibly wrapped in a hyperlink.
 	 */
-	$caption_width = apply_filters( 'img_caption_shortcode_width', $caption_width, $atts, $content );
+	$caption_width = apply_filters('img_caption_shortcode_width', $caption_width, $atts, $content);
 
 	$style = '';
-	if ( $caption_width )
-		$style = 'style="width: ' . (int) $caption_width . 'px" ';
+	if ($caption_width)
+		$style = 'style="width: '.(int) $caption_width.'px" ';
 
-	return '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
-	. do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>';
+	return '<div '.$atts['id'].$style.'class="'.esc_attr($class).'">'
+	. do_shortcode($content).'<p class="wp-caption-text">'.$atts['caption'].'</p></div>';
 }
 
 add_shortcode('gallery', 'gallery_shortcode');
@@ -967,15 +967,15 @@ 
  * }
  * @return string HTML content to display gallery.
  */
-function gallery_shortcode( $attr ) {
+function gallery_shortcode($attr) {
 	$post = get_post();
 
 	static $instance = 0;
 	$instance++;
 
-	if ( ! empty( $attr['ids'] ) ) {
+	if ( ! empty($attr['ids'])) {
 		// 'ids' is explicitly ordered, unless you specify otherwise.
-		if ( empty( $attr['orderby'] ) ) {
+		if (empty($attr['orderby'])) {
 			$attr['orderby'] = 'post__in';
 		}
 		$attr['include'] = $attr['ids'];
@@ -996,69 +996,69 @@ 
 	 * @param array  $attr     Attributes of the gallery shortcode.
 	 * @param int    $instance Unique numeric ID of this gallery shortcode instance.
 	 */
-	$output = apply_filters( 'post_gallery', '', $attr, $instance );
-	if ( $output != '' ) {
+	$output = apply_filters('post_gallery', '', $attr, $instance);
+	if ($output != '') {
 		return $output;
 	}
 
-	$html5 = current_theme_supports( 'html5', 'gallery' );
-	$atts = shortcode_atts( array(
+	$html5 = current_theme_supports('html5', 'gallery');
+	$atts = shortcode_atts(array(
 		'order'      => 'ASC',
 		'orderby'    => 'menu_order ID',
 		'id'         => $post ? $post->ID : 0,
-		'itemtag'    => $html5 ? 'figure'     : 'dl',
-		'icontag'    => $html5 ? 'div'        : 'dt',
+		'itemtag'    => $html5 ? 'figure' : 'dl',
+		'icontag'    => $html5 ? 'div' : 'dt',
 		'captiontag' => $html5 ? 'figcaption' : 'dd',
 		'columns'    => 3,
 		'size'       => 'thumbnail',
 		'include'    => '',
 		'exclude'    => '',
 		'link'       => ''
-	), $attr, 'gallery' );
+	), $attr, 'gallery');
 
-	$id = intval( $atts['id'] );
+	$id = intval($atts['id']);
 
-	if ( ! empty( $atts['include'] ) ) {
-		$_attachments = get_posts( array( 'include' => $atts['include'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+	if ( ! empty($atts['include'])) {
+		$_attachments = get_posts(array('include' => $atts['include'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby']));
 
 		$attachments = array();
-		foreach ( $_attachments as $key => $val ) {
+		foreach ($_attachments as $key => $val) {
 			$attachments[$val->ID] = $_attachments[$key];
 		}
-	} elseif ( ! empty( $atts['exclude'] ) ) {
-		$attachments = get_children( array( 'post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+	} elseif ( ! empty($atts['exclude'])) {
+		$attachments = get_children(array('post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby']));
 	} else {
-		$attachments = get_children( array( 'post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+		$attachments = get_children(array('post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby']));
 	}
 
-	if ( empty( $attachments ) ) {
+	if (empty($attachments)) {
 		return '';
 	}
 
-	if ( is_feed() ) {
+	if (is_feed()) {
 		$output = "\n";
-		foreach ( $attachments as $att_id => $attachment ) {
-			$output .= wp_get_attachment_link( $att_id, $atts['size'], true ) . "\n";
+		foreach ($attachments as $att_id => $attachment) {
+			$output .= wp_get_attachment_link($att_id, $atts['size'], true)."\n";
 		}
 		return $output;
 	}
 
-	$itemtag = tag_escape( $atts['itemtag'] );
-	$captiontag = tag_escape( $atts['captiontag'] );
-	$icontag = tag_escape( $atts['icontag'] );
-	$valid_tags = wp_kses_allowed_html( 'post' );
-	if ( ! isset( $valid_tags[ $itemtag ] ) ) {
+	$itemtag = tag_escape($atts['itemtag']);
+	$captiontag = tag_escape($atts['captiontag']);
+	$icontag = tag_escape($atts['icontag']);
+	$valid_tags = wp_kses_allowed_html('post');
+	if ( ! isset($valid_tags[$itemtag])) {
 		$itemtag = 'dl';
 	}
-	if ( ! isset( $valid_tags[ $captiontag ] ) ) {
+	if ( ! isset($valid_tags[$captiontag])) {
 		$captiontag = 'dd';
 	}
-	if ( ! isset( $valid_tags[ $icontag ] ) ) {
+	if ( ! isset($valid_tags[$icontag])) {
 		$icontag = 'dt';
 	}
 
-	$columns = intval( $atts['columns'] );
-	$itemwidth = $columns > 0 ? floor(100/$columns) : 100;
+	$columns = intval($atts['columns']);
+	$itemwidth = $columns > 0 ? floor(100 / $columns) : 100;
 	$float = is_rtl() ? 'right' : 'left';
 
 	$selector = "gallery-{$instance}";
@@ -1074,7 +1074,7 @@ 
 	 *                    Defaults to false if the theme supports HTML5 galleries.
 	 *                    Otherwise, defaults to true.
 	 */
-	if ( apply_filters( 'use_default_gallery_style', ! $html5 ) ) {
+	if (apply_filters('use_default_gallery_style', ! $html5)) {
 		$gallery_style = "
 		<style type='text/css'>
 			#{$selector} {
@@ -1096,7 +1096,7 @@ 
 		</style>\n\t\t";
 	}
 
-	$size_class = sanitize_html_class( $atts['size'] );
+	$size_class = sanitize_html_class($atts['size']);
 	$gallery_div = "<div id='$selector' class='gallery galleryid-{$id} gallery-columns-{$columns} gallery-size-{$size_class}'>";
 
 	/**
@@ -1107,43 +1107,43 @@ 
 	 * @param string $gallery_style Default CSS styles and opening HTML div container
 	 *                              for the gallery shortcode output.
 	 */
-	$output = apply_filters( 'gallery_style', $gallery_style . $gallery_div );
+	$output = apply_filters('gallery_style', $gallery_style.$gallery_div);
 
 	$i = 0;
-	foreach ( $attachments as $id => $attachment ) {
+	foreach ($attachments as $id => $attachment) {
 
-		$attr = ( trim( $attachment->post_excerpt ) ) ? array( 'aria-describedby' => "$selector-$id" ) : '';
-		if ( ! empty( $atts['link'] ) && 'file' === $atts['link'] ) {
-			$image_output = wp_get_attachment_link( $id, $atts['size'], false, false, false, $attr );
-		} elseif ( ! empty( $atts['link'] ) && 'none' === $atts['link'] ) {
-			$image_output = wp_get_attachment_image( $id, $atts['size'], false, $attr );
+		$attr = (trim($attachment->post_excerpt)) ? array('aria-describedby' => "$selector-$id") : '';
+		if ( ! empty($atts['link']) && 'file' === $atts['link']) {
+			$image_output = wp_get_attachment_link($id, $atts['size'], false, false, false, $attr);
+		} elseif ( ! empty($atts['link']) && 'none' === $atts['link']) {
+			$image_output = wp_get_attachment_image($id, $atts['size'], false, $attr);
 		} else {
-			$image_output = wp_get_attachment_link( $id, $atts['size'], true, false, false, $attr );
+			$image_output = wp_get_attachment_link($id, $atts['size'], true, false, false, $attr);
 		}
-		$image_meta  = wp_get_attachment_metadata( $id );
+		$image_meta  = wp_get_attachment_metadata($id);
 
 		$orientation = '';
-		if ( isset( $image_meta['height'], $image_meta['width'] ) ) {
-			$orientation = ( $image_meta['height'] > $image_meta['width'] ) ? 'portrait' : 'landscape';
+		if (isset($image_meta['height'], $image_meta['width'])) {
+			$orientation = ($image_meta['height'] > $image_meta['width']) ? 'portrait' : 'landscape';
 		}
 		$output .= "<{$itemtag} class='gallery-item'>";
 		$output .= "
 			<{$icontag} class='gallery-icon {$orientation}'>
 				$image_output
 			</{$icontag}>";
-		if ( $captiontag && trim($attachment->post_excerpt) ) {
+		if ($captiontag && trim($attachment->post_excerpt)) {
 			$output .= "
 				<{$captiontag} class='wp-caption-text gallery-caption' id='$selector-$id'>
-				" . wptexturize($attachment->post_excerpt) . "
+				".wptexturize($attachment->post_excerpt)."
 				</{$captiontag}>";
 		}
 		$output .= "</{$itemtag}>";
-		if ( ! $html5 && $columns > 0 && ++$i % $columns == 0 ) {
+		if ( ! $html5 && $columns > 0 && ++$i % $columns == 0) {
 			$output .= '<br style="clear: both" />';
 		}
 	}
 
-	if ( ! $html5 && $columns > 0 && $i % $columns !== 0 ) {
+	if ( ! $html5 && $columns > 0 && $i % $columns !== 0) {
 		$output .= "
 			<br style='clear: both' />";
 	}
@@ -1199,14 +1199,14 @@ 
  *
  * @param string $type Type of playlist. Accepts 'audio' or 'video'.
  */
-function wp_playlist_scripts( $type ) {
-	wp_enqueue_style( 'wp-mediaelement' );
-	wp_enqueue_script( 'wp-playlist' );
+function wp_playlist_scripts($type) {
+	wp_enqueue_style('wp-mediaelement');
+	wp_enqueue_script('wp-playlist');
 ?>
-<!--[if lt IE 9]><script>document.createElement('<?php echo esc_js( $type ) ?>');</script><![endif]-->
+<!--[if lt IE 9]><script>document.createElement('<?php echo esc_js($type) ?>');</script><![endif]-->
 <?php
-	add_action( 'wp_footer', 'wp_underscore_playlist_templates', 0 );
-	add_action( 'admin_footer', 'wp_underscore_playlist_templates', 0 );
+	add_action('wp_footer', 'wp_underscore_playlist_templates', 0);
+	add_action('admin_footer', 'wp_underscore_playlist_templates', 0);
 }
 
 /**
@@ -1246,16 +1246,16 @@ 
  *
  * @return string Playlist output. Empty string if the passed type is unsupported.
  */
-function wp_playlist_shortcode( $attr ) {
+function wp_playlist_shortcode($attr) {
 	global $content_width;
 	$post = get_post();
 
 	static $instance = 0;
 	$instance++;
 
-	if ( ! empty( $attr['ids'] ) ) {
+	if ( ! empty($attr['ids'])) {
 		// 'ids' is explicitly ordered, unless you specify otherwise.
-		if ( empty( $attr['orderby'] ) ) {
+		if (empty($attr['orderby'])) {
 			$attr['orderby'] = 'post__in';
 		}
 		$attr['include'] = $attr['ids'];
@@ -1274,12 +1274,12 @@ 
 	 * @param array  $attr     An array of shortcode attributes.
 	 * @param int    $instance Unique numeric ID of this playlist shortcode instance.
 	 */
-	$output = apply_filters( 'post_playlist', '', $attr, $instance );
-	if ( $output != '' ) {
+	$output = apply_filters('post_playlist', '', $attr, $instance);
+	if ($output != '') {
 		return $output;
 	}
 
-	$atts = shortcode_atts( array(
+	$atts = shortcode_atts(array(
 		'type'		=> 'audio',
 		'order'		=> 'ASC',
 		'orderby'	=> 'menu_order ID',
@@ -1291,11 +1291,11 @@ 
 		'tracknumbers' => true,
 		'images'	=> true,
 		'artists'	=> true
-	), $attr, 'playlist' );
+	), $attr, 'playlist');
 
-	$id = intval( $atts['id'] );
+	$id = intval($atts['id']);
 
-	if ( $atts['type'] !== 'audio' ) {
+	if ($atts['type'] !== 'audio') {
 		$atts['type'] = 'video';
 	}
 
@@ -1307,31 +1307,31 @@ 
 		'orderby' => $atts['orderby']
 	);
 
-	if ( ! empty( $atts['include'] ) ) {
+	if ( ! empty($atts['include'])) {
 		$args['include'] = $atts['include'];
-		$_attachments = get_posts( $args );
+		$_attachments = get_posts($args);
 
 		$attachments = array();
-		foreach ( $_attachments as $key => $val ) {
+		foreach ($_attachments as $key => $val) {
 			$attachments[$val->ID] = $_attachments[$key];
 		}
-	} elseif ( ! empty( $atts['exclude'] ) ) {
+	} elseif ( ! empty($atts['exclude'])) {
 		$args['post_parent'] = $id;
 		$args['exclude'] = $atts['exclude'];
-		$attachments = get_children( $args );
+		$attachments = get_children($args);
 	} else {
 		$args['post_parent'] = $id;
-		$attachments = get_children( $args );
+		$attachments = get_children($args);
 	}
 
-	if ( empty( $attachments ) ) {
+	if (empty($attachments)) {
 		return '';
 	}
 
-	if ( is_feed() ) {
+	if (is_feed()) {
 		$output = "\n";
-		foreach ( $attachments as $att_id => $attachment ) {
-			$output .= wp_get_attachment_link( $att_id ) . "\n";
+		foreach ($attachments as $att_id => $attachment) {
+			$output .= wp_get_attachment_link($att_id)."\n";
 		}
 		return $output;
 	}
@@ -1341,22 +1341,22 @@ 
 	$default_width = 640;
 	$default_height = 360;
 
-	$theme_width = empty( $content_width ) ? $default_width : ( $content_width - $outer );
-	$theme_height = empty( $content_width ) ? $default_height : round( ( $default_height * $theme_width ) / $default_width );
+	$theme_width = empty($content_width) ? $default_width : ($content_width - $outer);
+	$theme_height = empty($content_width) ? $default_height : round(($default_height * $theme_width) / $default_width);
 
 	$data = array(
 		'type' => $atts['type'],
 		// don't pass strings to JSON, will be truthy in JS
-		'tracklist' => wp_validate_boolean( $atts['tracklist'] ),
-		'tracknumbers' => wp_validate_boolean( $atts['tracknumbers'] ),
-		'images' => wp_validate_boolean( $atts['images'] ),
-		'artists' => wp_validate_boolean( $atts['artists'] ),
+		'tracklist' => wp_validate_boolean($atts['tracklist']),
+		'tracknumbers' => wp_validate_boolean($atts['tracknumbers']),
+		'images' => wp_validate_boolean($atts['images']),
+		'artists' => wp_validate_boolean($atts['artists']),
 	);
 
 	$tracks = array();
-	foreach ( $attachments as $attachment ) {
-		$url = wp_get_attachment_url( $attachment->ID );
-		$ftype = wp_check_filetype( $url, wp_get_mime_types() );
+	foreach ($attachments as $attachment) {
+		$url = wp_get_attachment_url($attachment->ID);
+		$ftype = wp_check_filetype($url, wp_get_mime_types());
 		$track = array(
 			'src' => $url,
 			'type' => $ftype['type'],
@@ -1366,27 +1366,27 @@ 
 		);
 
 		$track['meta'] = array();
-		$meta = wp_get_attachment_metadata( $attachment->ID );
-		if ( ! empty( $meta ) ) {
+		$meta = wp_get_attachment_metadata($attachment->ID);
+		if ( ! empty($meta)) {
 
-			foreach ( wp_get_attachment_id3_keys( $attachment ) as $key => $label ) {
-				if ( ! empty( $meta[ $key ] ) ) {
-					$track['meta'][ $key ] = $meta[ $key ];
+			foreach (wp_get_attachment_id3_keys($attachment) as $key => $label) {
+				if ( ! empty($meta[$key])) {
+					$track['meta'][$key] = $meta[$key];
 				}
 			}
 
-			if ( 'video' === $atts['type'] ) {
-				if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
+			if ('video' === $atts['type']) {
+				if ( ! empty($meta['width']) && ! empty($meta['height'])) {
 					$width = $meta['width'];
 					$height = $meta['height'];
-					$theme_height = round( ( $height * $theme_width ) / $width );
+					$theme_height = round(($height * $theme_width) / $width);
 				} else {
 					$width = $default_width;
 					$height = $default_height;
 				}
 
 				$track['dimensions'] = array(
-					'original' => compact( 'width', 'height' ),
+					'original' => compact('width', 'height'),
 					'resized' => array(
 						'width' => $theme_width,
 						'height' => $theme_height
@@ -1395,19 +1395,19 @@ 
 			}
 		}
 
-		if ( $atts['images'] ) {
-			$thumb_id = get_post_thumbnail_id( $attachment->ID );
-			if ( ! empty( $thumb_id ) ) {
-				list( $src, $width, $height ) = wp_get_attachment_image_src( $thumb_id, 'full' );
-				$track['image'] = compact( 'src', 'width', 'height' );
-				list( $src, $width, $height ) = wp_get_attachment_image_src( $thumb_id, 'thumbnail' );
-				$track['thumb'] = compact( 'src', 'width', 'height' );
+		if ($atts['images']) {
+			$thumb_id = get_post_thumbnail_id($attachment->ID);
+			if ( ! empty($thumb_id)) {
+				list($src, $width, $height) = wp_get_attachment_image_src($thumb_id, 'full');
+				$track['image'] = compact('src', 'width', 'height');
+				list($src, $width, $height) = wp_get_attachment_image_src($thumb_id, 'thumbnail');
+				$track['thumb'] = compact('src', 'width', 'height');
 			} else {
-				$src = wp_mime_type_icon( $attachment->ID );
+				$src = wp_mime_type_icon($attachment->ID);
 				$width = 48;
 				$height = 64;
-				$track['image'] = compact( 'src', 'width', 'height' );
-				$track['thumb'] = compact( 'src', 'width', 'height' );
+				$track['image'] = compact('src', 'width', 'height');
+				$track['thumb'] = compact('src', 'width', 'height');
 			}
 		}
 
@@ -1415,12 +1415,12 @@ 
 	}
 	$data['tracks'] = $tracks;
 
-	$safe_type = esc_attr( $atts['type'] );
-	$safe_style = esc_attr( $atts['style'] );
+	$safe_type = esc_attr($atts['type']);
+	$safe_style = esc_attr($atts['style']);
 
 	ob_start();
 
-	if ( 1 === $instance ) {
+	if (1 === $instance) {
 		/**
 		 * Print and enqueue playlist scripts, styles, and JavaScript templates.
 		 *
@@ -1429,15 +1429,15 @@ 
 		 * @param string $type  Type of playlist. Possible values are 'audio' or 'video'.
 		 * @param string $style The 'theme' for the playlist. Core provides 'light' and 'dark'.
 		 */
-		do_action( 'wp_playlist_scripts', $atts['type'], $atts['style'] );
+		do_action('wp_playlist_scripts', $atts['type'], $atts['style']);
 	} ?>
 <div class="wp-playlist wp-<?php echo $safe_type ?>-playlist wp-playlist-<?php echo $safe_style ?>">
-	<?php if ( 'audio' === $atts['type'] ): ?>
+	<?php if ('audio' === $atts['type']): ?>
 	<div class="wp-playlist-current-item"></div>
 	<?php endif ?>
 	<<?php echo $safe_type ?> controls="controls" preload="none" width="<?php
 		echo (int) $theme_width;
-	?>"<?php if ( 'video' === $safe_type ):
+	?>"<?php if ('video' === $safe_type):
 		echo ' height="', (int) $theme_height, '"';
 	else:
 		echo ' style="visibility: hidden"';
@@ -1446,17 +1446,17 @@ 
 	<div class="wp-playlist-prev"></div>
 	<noscript>
 	<ol><?php
-	foreach ( $attachments as $att_id => $attachment ) {
-		printf( '<li>%s</li>', wp_get_attachment_link( $att_id ) );
+	foreach ($attachments as $att_id => $attachment) {
+		printf('<li>%s</li>', wp_get_attachment_link($att_id));
 	}
 	?></ol>
 	</noscript>
-	<script type="application/json" class="wp-playlist-script"><?php echo wp_json_encode( $data ) ?></script>
+	<script type="application/json" class="wp-playlist-script"><?php echo wp_json_encode($data) ?></script>
 </div>
 	<?php
 	return ob_get_clean();
 }
-add_shortcode( 'playlist', 'wp_playlist_shortcode' );
+add_shortcode('playlist', 'wp_playlist_shortcode');
 
 /**
  * Provides a No-JS Flash fallback as a last resort for audio / video.
@@ -1466,7 +1466,7 @@ 
  * @param string $url The media element URL.
  * @return string Fallback HTML.
  */
-function wp_mediaelement_fallback( $url ) {
+function wp_mediaelement_fallback($url) {
 	/**
 	 * Filter the Mediaelement fallback output for no-JS.
 	 *
@@ -1475,7 +1475,7 @@ 
 	 * @param string $output Fallback output for no-JS.
 	 * @param string $url    Media file URL.
 	 */
-	return apply_filters( 'wp_mediaelement_fallback', sprintf( '<a href="%1$s">%1$s</a>', esc_url( $url ) ), $url );
+	return apply_filters('wp_mediaelement_fallback', sprintf('<a href="%1$s">%1$s</a>', esc_url($url)), $url);
 }
 
 /**
@@ -1494,7 +1494,7 @@ 
 	 * @param array $extensions An array of support audio formats. Defaults are
 	 *                          'mp3', 'ogg', 'wma', 'm4a', 'wav'.
 	 */
-	return apply_filters( 'wp_audio_extensions', array( 'mp3', 'ogg', 'wma', 'm4a', 'wav' ) );
+	return apply_filters('wp_audio_extensions', array('mp3', 'ogg', 'wma', 'm4a', 'wav'));
 }
 
 /**
@@ -1506,19 +1506,19 @@ 
  * @param string  $context    Optional. The context. Accepts 'edit', 'display'. Default 'display'.
  * @return array Key/value pairs of field keys to labels.
  */
-function wp_get_attachment_id3_keys( $attachment, $context = 'display' ) {
+function wp_get_attachment_id3_keys($attachment, $context = 'display') {
 	$fields = array(
-		'artist' => __( 'Artist' ),
-		'album' => __( 'Album' ),
+		'artist' => __('Artist'),
+		'album' => __('Album'),
 	);
 
-	if ( 'display' === $context ) {
-		$fields['genre']            = __( 'Genre' );
-		$fields['year']             = __( 'Year' );
-		$fields['length_formatted'] = _x( 'Length', 'video or audio' );
-	} elseif ( 'js' === $context ) {
-		$fields['bitrate']          = __( 'Bitrate' );
-		$fields['bitrate_mode']     = __( 'Bitrate Mode' );
+	if ('display' === $context) {
+		$fields['genre']            = __('Genre');
+		$fields['year']             = __('Year');
+		$fields['length_formatted'] = _x('Length', 'video or audio');
+	} elseif ('js' === $context) {
+		$fields['bitrate']          = __('Bitrate');
+		$fields['bitrate_mode']     = __('Bitrate Mode');
 	}
 
 	/**
@@ -1530,7 +1530,7 @@ 
 	 * @param WP_Post $attachment Attachment object.
 	 * @param string  $context    The context. Accepts 'edit', 'display'. Default 'display'.
 	 */
-	return apply_filters( 'wp_get_attachment_id3_keys', $fields, $attachment, $context );
+	return apply_filters('wp_get_attachment_id3_keys', $fields, $attachment, $context);
 }
 /**
  * Builds the Audio shortcode output.
@@ -1555,7 +1555,7 @@ 
  * @param string $content Shortcode content.
  * @return string|void HTML content to display audio.
  */
-function wp_audio_shortcode( $attr, $content = '' ) {
+function wp_audio_shortcode($attr, $content = '') {
 	$post_id = get_post() ? get_the_ID() : 0;
 
 	static $instance = 0;
@@ -1573,8 +1573,8 @@ 
 	 * @param string $content  Shortcode content.
 	 * @param int    $instance Unique numeric ID of this audio shortcode instance.
 	 */
-	$override = apply_filters( 'wp_audio_shortcode_override', '', $attr, $content, $instance );
-	if ( '' !== $override ) {
+	$override = apply_filters('wp_audio_shortcode_override', '', $attr, $content, $instance);
+	if ('' !== $override) {
 		return $override;
 	}
 
@@ -1587,44 +1587,44 @@ 
 		'autoplay' => '',
 		'preload'  => 'none'
 	);
-	foreach ( $default_types as $type ) {
+	foreach ($default_types as $type) {
 		$defaults_atts[$type] = '';
 	}
 
-	$atts = shortcode_atts( $defaults_atts, $attr, 'audio' );
+	$atts = shortcode_atts($defaults_atts, $attr, 'audio');
 
 	$primary = false;
-	if ( ! empty( $atts['src'] ) ) {
-		$type = wp_check_filetype( $atts['src'], wp_get_mime_types() );
-		if ( ! in_array( strtolower( $type['ext'] ), $default_types ) ) {
-			return sprintf( '<a class="wp-embedded-audio" href="%s">%s</a>', esc_url( $atts['src'] ), esc_html( $atts['src'] ) );
+	if ( ! empty($atts['src'])) {
+		$type = wp_check_filetype($atts['src'], wp_get_mime_types());
+		if ( ! in_array(strtolower($type['ext']), $default_types)) {
+			return sprintf('<a class="wp-embedded-audio" href="%s">%s</a>', esc_url($atts['src']), esc_html($atts['src']));
 		}
 		$primary = true;
-		array_unshift( $default_types, 'src' );
+		array_unshift($default_types, 'src');
 	} else {
-		foreach ( $default_types as $ext ) {
-			if ( ! empty( $atts[ $ext ] ) ) {
-				$type = wp_check_filetype( $atts[ $ext ], wp_get_mime_types() );
-				if ( strtolower( $type['ext'] ) === $ext ) {
+		foreach ($default_types as $ext) {
+			if ( ! empty($atts[$ext])) {
+				$type = wp_check_filetype($atts[$ext], wp_get_mime_types());
+				if (strtolower($type['ext']) === $ext) {
 					$primary = true;
 				}
 			}
 		}
 	}
 
-	if ( ! $primary ) {
-		$audios = get_attached_media( 'audio', $post_id );
-		if ( empty( $audios ) ) {
+	if ( ! $primary) {
+		$audios = get_attached_media('audio', $post_id);
+		if (empty($audios)) {
 			return;
 		}
 
-		$audio = reset( $audios );
-		$atts['src'] = wp_get_attachment_url( $audio->ID );
-		if ( empty( $atts['src'] ) ) {
+		$audio = reset($audios);
+		$atts['src'] = wp_get_attachment_url($audio->ID);
+		if (empty($atts['src'])) {
 			return;
 		}
 
-		array_unshift( $default_types, 'src' );
+		array_unshift($default_types, 'src');
 	}
 
 	/**
@@ -1634,10 +1634,10 @@ 
 	 *
 	 * @param string $library Media library used for the audio shortcode.
 	 */
-	$library = apply_filters( 'wp_audio_shortcode_library', 'mediaelement' );
-	if ( 'mediaelement' === $library && did_action( 'init' ) ) {
-		wp_enqueue_style( 'wp-mediaelement' );
-		wp_enqueue_script( 'wp-mediaelement' );
+	$library = apply_filters('wp_audio_shortcode_library', 'mediaelement');
+	if ('mediaelement' === $library && did_action('init')) {
+		wp_enqueue_style('wp-mediaelement');
+		wp_enqueue_script('wp-mediaelement');
 	}
 
 	/**
@@ -1648,47 +1648,47 @@ 
 	 * @param string $class CSS class or list of space-separated classes.
 	 */
 	$html_atts = array(
-		'class'    => apply_filters( 'wp_audio_shortcode_class', 'wp-audio-shortcode' ),
-		'id'       => sprintf( 'audio-%d-%d', $post_id, $instance ),
-		'loop'     => wp_validate_boolean( $atts['loop'] ),
-		'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
+		'class'    => apply_filters('wp_audio_shortcode_class', 'wp-audio-shortcode'),
+		'id'       => sprintf('audio-%d-%d', $post_id, $instance),
+		'loop'     => wp_validate_boolean($atts['loop']),
+		'autoplay' => wp_validate_boolean($atts['autoplay']),
 		'preload'  => $atts['preload'],
 		'style'    => 'width: 100%; visibility: hidden;',
 	);
 
 	// These ones should just be omitted altogether if they are blank
-	foreach ( array( 'loop', 'autoplay', 'preload' ) as $a ) {
-		if ( empty( $html_atts[$a] ) ) {
-			unset( $html_atts[$a] );
+	foreach (array('loop', 'autoplay', 'preload') as $a) {
+		if (empty($html_atts[$a])) {
+			unset($html_atts[$a]);
 		}
 	}
 
 	$attr_strings = array();
-	foreach ( $html_atts as $k => $v ) {
-		$attr_strings[] = $k . '="' . esc_attr( $v ) . '"';
+	foreach ($html_atts as $k => $v) {
+		$attr_strings[] = $k.'="'.esc_attr($v).'"';
 	}
 
 	$html = '';
-	if ( 'mediaelement' === $library && 1 === $instance ) {
+	if ('mediaelement' === $library && 1 === $instance) {
 		$html .= "<!--[if lt IE 9]><script>document.createElement('audio');</script><![endif]-->\n";
 	}
-	$html .= sprintf( '<audio %s controls="controls">', join( ' ', $attr_strings ) );
+	$html .= sprintf('<audio %s controls="controls">', join(' ', $attr_strings));
 
 	$fileurl = '';
 	$source = '<source type="%s" src="%s" />';
-	foreach ( $default_types as $fallback ) {
-		if ( ! empty( $atts[ $fallback ] ) ) {
-			if ( empty( $fileurl ) ) {
-				$fileurl = $atts[ $fallback ];
+	foreach ($default_types as $fallback) {
+		if ( ! empty($atts[$fallback])) {
+			if (empty($fileurl)) {
+				$fileurl = $atts[$fallback];
 			}
-			$type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() );
-			$url = add_query_arg( '_', $instance, $atts[ $fallback ] );
-			$html .= sprintf( $source, $type['type'], esc_url( $url ) );
+			$type = wp_check_filetype($atts[$fallback], wp_get_mime_types());
+			$url = add_query_arg('_', $instance, $atts[$fallback]);
+			$html .= sprintf($source, $type['type'], esc_url($url));
 		}
 	}
 
-	if ( 'mediaelement' === $library ) {
-		$html .= wp_mediaelement_fallback( $fileurl );
+	if ('mediaelement' === $library) {
+		$html .= wp_mediaelement_fallback($fileurl);
 	}
 	$html .= '</audio>';
 
@@ -1703,9 +1703,9 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $library Media library used for the audio shortcode.
 	 */
-	return apply_filters( 'wp_audio_shortcode', $html, $atts, $audio, $post_id, $library );
+	return apply_filters('wp_audio_shortcode', $html, $atts, $audio, $post_id, $library);
 }
-add_shortcode( 'audio', 'wp_audio_shortcode' );
+add_shortcode('audio', 'wp_audio_shortcode');
 
 /**
  * Returns a filtered list of WP-supported video formats.
@@ -1723,7 +1723,7 @@ 
 	 * @param array $extensions An array of support video formats. Defaults are
 	 *                          'mp4', 'm4v', 'webm', 'ogv', 'wmv', 'flv'.
 	 */
-	return apply_filters( 'wp_video_extensions', array( 'mp4', 'm4v', 'webm', 'ogv', 'wmv', 'flv' ) );
+	return apply_filters('wp_video_extensions', array('mp4', 'm4v', 'webm', 'ogv', 'wmv', 'flv'));
 }
 
 /**
@@ -1754,7 +1754,7 @@ 
  * @param string $content Shortcode content.
  * @return string|void HTML content to display video.
  */
-function wp_video_shortcode( $attr, $content = '' ) {
+function wp_video_shortcode($attr, $content = '') {
 	global $content_width;
 	$post_id = get_post() ? get_the_ID() : 0;
 
@@ -1776,8 +1776,8 @@ 
 	 * @param string $content  Video shortcode content.
 	 * @param int    $instance Unique numeric ID of this video shortcode instance.
 	 */
-	$override = apply_filters( 'wp_video_shortcode_override', '', $attr, $content, $instance );
-	if ( '' !== $override ) {
+	$override = apply_filters('wp_video_shortcode_override', '', $attr, $content, $instance);
+	if ('' !== $override) {
 		return $override;
 	}
 
@@ -1794,22 +1794,22 @@ 
 		'height'   => 360,
 	);
 
-	foreach ( $default_types as $type ) {
+	foreach ($default_types as $type) {
 		$defaults_atts[$type] = '';
 	}
 
-	$atts = shortcode_atts( $defaults_atts, $attr, 'video' );
+	$atts = shortcode_atts($defaults_atts, $attr, 'video');
 
-	if ( is_admin() ) {
+	if (is_admin()) {
 		// shrink the video so it isn't huge in the admin
-		if ( $atts['width'] > $defaults_atts['width'] ) {
-			$atts['height'] = round( ( $atts['height'] * $defaults_atts['width'] ) / $atts['width'] );
+		if ($atts['width'] > $defaults_atts['width']) {
+			$atts['height'] = round(($atts['height'] * $defaults_atts['width']) / $atts['width']);
 			$atts['width'] = $defaults_atts['width'];
 		}
 	} else {
 		// if the video is bigger than the theme
-		if ( ! empty( $content_width ) && $atts['width'] > $content_width ) {
-			$atts['height'] = round( ( $atts['height'] * $content_width ) / $atts['width'] );
+		if ( ! empty($content_width) && $atts['width'] > $content_width) {
+			$atts['height'] = round(($atts['height'] * $content_width) / $atts['width']);
 			$atts['width'] = $content_width;
 		}
 	}
@@ -1819,46 +1819,46 @@ 
 	$vimeo_pattern = '#^https?://(.+\.)?vimeo\.com/.*#';
 
 	$primary = false;
-	if ( ! empty( $atts['src'] ) ) {
-		$is_vimeo = ( preg_match( $vimeo_pattern, $atts['src'] ) );
-		$is_youtube = (  preg_match( $yt_pattern, $atts['src'] ) );
-		if ( ! $is_youtube && ! $is_vimeo ) {
-			$type = wp_check_filetype( $atts['src'], wp_get_mime_types() );
-			if ( ! in_array( strtolower( $type['ext'] ), $default_types ) ) {
-				return sprintf( '<a class="wp-embedded-video" href="%s">%s</a>', esc_url( $atts['src'] ), esc_html( $atts['src'] ) );
+	if ( ! empty($atts['src'])) {
+		$is_vimeo = (preg_match($vimeo_pattern, $atts['src']));
+		$is_youtube = (preg_match($yt_pattern, $atts['src']));
+		if ( ! $is_youtube && ! $is_vimeo) {
+			$type = wp_check_filetype($atts['src'], wp_get_mime_types());
+			if ( ! in_array(strtolower($type['ext']), $default_types)) {
+				return sprintf('<a class="wp-embedded-video" href="%s">%s</a>', esc_url($atts['src']), esc_html($atts['src']));
 			}
 		}
 
-		if ( $is_vimeo ) {
-			wp_enqueue_script( 'froogaloop' );
+		if ($is_vimeo) {
+			wp_enqueue_script('froogaloop');
 		}
 
 		$primary = true;
-		array_unshift( $default_types, 'src' );
+		array_unshift($default_types, 'src');
 	} else {
-		foreach ( $default_types as $ext ) {
-			if ( ! empty( $atts[ $ext ] ) ) {
-				$type = wp_check_filetype( $atts[ $ext ], wp_get_mime_types() );
-				if ( strtolower( $type['ext'] ) === $ext ) {
+		foreach ($default_types as $ext) {
+			if ( ! empty($atts[$ext])) {
+				$type = wp_check_filetype($atts[$ext], wp_get_mime_types());
+				if (strtolower($type['ext']) === $ext) {
 					$primary = true;
 				}
 			}
 		}
 	}
 
-	if ( ! $primary ) {
-		$videos = get_attached_media( 'video', $post_id );
-		if ( empty( $videos ) ) {
+	if ( ! $primary) {
+		$videos = get_attached_media('video', $post_id);
+		if (empty($videos)) {
 			return;
 		}
 
-		$video = reset( $videos );
-		$atts['src'] = wp_get_attachment_url( $video->ID );
-		if ( empty( $atts['src'] ) ) {
+		$video = reset($videos);
+		$atts['src'] = wp_get_attachment_url($video->ID);
+		if (empty($atts['src'])) {
 			return;
 		}
 
-		array_unshift( $default_types, 'src' );
+		array_unshift($default_types, 'src');
 	}
 
 	/**
@@ -1868,10 +1868,10 @@ 
 	 *
 	 * @param string $library Media library used for the video shortcode.
 	 */
-	$library = apply_filters( 'wp_video_shortcode_library', 'mediaelement' );
-	if ( 'mediaelement' === $library && did_action( 'init' ) ) {
-		wp_enqueue_style( 'wp-mediaelement' );
-		wp_enqueue_script( 'wp-mediaelement' );
+	$library = apply_filters('wp_video_shortcode_library', 'mediaelement');
+	if ('mediaelement' === $library && did_action('init')) {
+		wp_enqueue_style('wp-mediaelement');
+		wp_enqueue_script('wp-mediaelement');
 	}
 
 	/**
@@ -1882,70 +1882,70 @@ 
 	 * @param string $class CSS class or list of space-separated classes.
 	 */
 	$html_atts = array(
-		'class'    => apply_filters( 'wp_video_shortcode_class', 'wp-video-shortcode' ),
-		'id'       => sprintf( 'video-%d-%d', $post_id, $instance ),
-		'width'    => absint( $atts['width'] ),
-		'height'   => absint( $atts['height'] ),
-		'poster'   => esc_url( $atts['poster'] ),
-		'loop'     => wp_validate_boolean( $atts['loop'] ),
-		'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
+		'class'    => apply_filters('wp_video_shortcode_class', 'wp-video-shortcode'),
+		'id'       => sprintf('video-%d-%d', $post_id, $instance),
+		'width'    => absint($atts['width']),
+		'height'   => absint($atts['height']),
+		'poster'   => esc_url($atts['poster']),
+		'loop'     => wp_validate_boolean($atts['loop']),
+		'autoplay' => wp_validate_boolean($atts['autoplay']),
 		'preload'  => $atts['preload'],
 	);
 
 	// These ones should just be omitted altogether if they are blank
-	foreach ( array( 'poster', 'loop', 'autoplay', 'preload' ) as $a ) {
-		if ( empty( $html_atts[$a] ) ) {
-			unset( $html_atts[$a] );
+	foreach (array('poster', 'loop', 'autoplay', 'preload') as $a) {
+		if (empty($html_atts[$a])) {
+			unset($html_atts[$a]);
 		}
 	}
 
 	$attr_strings = array();
-	foreach ( $html_atts as $k => $v ) {
-		$attr_strings[] = $k . '="' . esc_attr( $v ) . '"';
+	foreach ($html_atts as $k => $v) {
+		$attr_strings[] = $k.'="'.esc_attr($v).'"';
 	}
 
 	$html = '';
-	if ( 'mediaelement' === $library && 1 === $instance ) {
+	if ('mediaelement' === $library && 1 === $instance) {
 		$html .= "<!--[if lt IE 9]><script>document.createElement('video');</script><![endif]-->\n";
 	}
-	$html .= sprintf( '<video %s controls="controls">', join( ' ', $attr_strings ) );
+	$html .= sprintf('<video %s controls="controls">', join(' ', $attr_strings));
 
 	$fileurl = '';
 	$source = '<source type="%s" src="%s" />';
-	foreach ( $default_types as $fallback ) {
-		if ( ! empty( $atts[ $fallback ] ) ) {
-			if ( empty( $fileurl ) ) {
-				$fileurl = $atts[ $fallback ];
+	foreach ($default_types as $fallback) {
+		if ( ! empty($atts[$fallback])) {
+			if (empty($fileurl)) {
+				$fileurl = $atts[$fallback];
 			}
-			if ( 'src' === $fallback && $is_youtube ) {
-				$type = array( 'type' => 'video/youtube' );
-			} elseif ( 'src' === $fallback && $is_vimeo ) {
-				$type = array( 'type' => 'video/vimeo' );
+			if ('src' === $fallback && $is_youtube) {
+				$type = array('type' => 'video/youtube');
+			} elseif ('src' === $fallback && $is_vimeo) {
+				$type = array('type' => 'video/vimeo');
 			} else {
-				$type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() );
+				$type = wp_check_filetype($atts[$fallback], wp_get_mime_types());
 			}
-			$url = add_query_arg( '_', $instance, $atts[ $fallback ] );
-			$html .= sprintf( $source, $type['type'], esc_url( $url ) );
+			$url = add_query_arg('_', $instance, $atts[$fallback]);
+			$html .= sprintf($source, $type['type'], esc_url($url));
 		}
 	}
 
-	if ( ! empty( $content ) ) {
-		if ( false !== strpos( $content, "\n" ) ) {
-			$content = str_replace( array( "\r\n", "\n", "\t" ), '', $content );
+	if ( ! empty($content)) {
+		if (false !== strpos($content, "\n")) {
+			$content = str_replace(array("\r\n", "\n", "\t"), '', $content);
 		}
-		$html .= trim( $content );
+		$html .= trim($content);
 	}
 
-	if ( 'mediaelement' === $library ) {
-		$html .= wp_mediaelement_fallback( $fileurl );
+	if ('mediaelement' === $library) {
+		$html .= wp_mediaelement_fallback($fileurl);
 	}
 	$html .= '</video>';
 
 	$width_rule = '';
-	if ( ! empty( $atts['width'] ) ) {
-		$width_rule = sprintf( 'width: %dpx; ', $atts['width'] );
+	if ( ! empty($atts['width'])) {
+		$width_rule = sprintf('width: %dpx; ', $atts['width']);
 	}
-	$output = sprintf( '<div style="%s" class="wp-video">%s</div>', $width_rule, $html );
+	$output = sprintf('<div style="%s" class="wp-video">%s</div>', $width_rule, $html);
 
 	/**
 	 * Filter the output of the video shortcode.
@@ -1958,9 +1958,9 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $library Media library used for the video shortcode.
 	 */
-	return apply_filters( 'wp_video_shortcode', $output, $atts, $video, $post_id, $library );
+	return apply_filters('wp_video_shortcode', $output, $atts, $video, $post_id, $library);
 }
-add_shortcode( 'video', 'wp_video_shortcode' );
+add_shortcode('video', 'wp_video_shortcode');
 
 /**
  * Displays previous image link that has the same post parent.
@@ -1973,7 +1973,7 @@ 
  *                           0 or 'none' will default to 'post_title' or `$text`. Default 'thumbnail'.
  * @param string       $text Optional. Link text. Default false.
  */
-function previous_image_link( $size = 'thumbnail', $text = false ) {
+function previous_image_link($size = 'thumbnail', $text = false) {
 	adjacent_image_link(true, $size, $text);
 }
 
@@ -2004,12 +2004,12 @@ 
  *                                     Default 'thumbnail'.
  * @param bool         $text Optional. Link text. Default false.
  */
-function adjacent_image_link( $prev = true, $size = 'thumbnail', $text = false ) {
+function adjacent_image_link($prev = true, $size = 'thumbnail', $text = false) {
 	$post = get_post();
-	$attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
+	$attachments = array_values(get_children(array('post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID')));
 
-	foreach ( $attachments as $k => $attachment ) {
-		if ( $attachment->ID == $post->ID ) {
+	foreach ($attachments as $k => $attachment) {
+		if ($attachment->ID == $post->ID) {
 			break;
 		}
 	}
@@ -2017,12 +2017,12 @@ 
 	$output = '';
 	$attachment_id = 0;
 
-	if ( $attachments ) {
+	if ($attachments) {
 		$k = $prev ? $k - 1 : $k + 1;
 
-		if ( isset( $attachments[ $k ] ) ) {
-			$attachment_id = $attachments[ $k ]->ID;
-			$output = wp_get_attachment_link( $attachment_id, $size, true, false, $text );
+		if (isset($attachments[$k])) {
+			$attachment_id = $attachments[$k]->ID;
+			$output = wp_get_attachment_link($attachment_id, $size, true, false, $text);
 		}
 	}
 
@@ -2041,7 +2041,7 @@ 
 	 * @param string $size          Image size.
 	 * @param string $text          Link text.
 	 */
-	echo apply_filters( "{$adjacent}_image_link", $output, $attachment_id, $size, $text );
+	echo apply_filters("{$adjacent}_image_link", $output, $attachment_id, $size, $text);
 }
 
 /**
@@ -2052,32 +2052,32 @@ 
  * @param int|array|object $attachment Attachment ID, data array, or data object.
  * @return array Empty array on failure. List of taxonomies on success.
  */
-function get_attachment_taxonomies( $attachment ) {
-	if ( is_int( $attachment ) ) {
-		$attachment = get_post( $attachment );
-	} elseif ( is_array( $attachment ) ) {
+function get_attachment_taxonomies($attachment) {
+	if (is_int($attachment)) {
+		$attachment = get_post($attachment);
+	} elseif (is_array($attachment)) {
 		$attachment = (object) $attachment;
 	}
-	if ( ! is_object($attachment) )
+	if ( ! is_object($attachment))
 		return array();
 
 	$filename = basename($attachment->guid);
 
 	$objects = array('attachment');
 
-	if ( false !== strpos($filename, '.') )
-		$objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
-	if ( !empty($attachment->post_mime_type) ) {
-		$objects[] = 'attachment:' . $attachment->post_mime_type;
-		if ( false !== strpos($attachment->post_mime_type, '/') )
-			foreach ( explode('/', $attachment->post_mime_type) as $token )
-				if ( !empty($token) )
+	if (false !== strpos($filename, '.'))
+		$objects[] = 'attachment:'.substr($filename, strrpos($filename, '.') + 1);
+	if ( ! empty($attachment->post_mime_type)) {
+		$objects[] = 'attachment:'.$attachment->post_mime_type;
+		if (false !== strpos($attachment->post_mime_type, '/'))
+			foreach (explode('/', $attachment->post_mime_type) as $token)
+				if ( ! empty($token))
 					$objects[] = "attachment:$token";
 	}
 
 	$taxonomies = array();
-	foreach ( $objects as $object )
-		if ( $taxes = get_object_taxonomies($object) )
+	foreach ($objects as $object)
+		if ($taxes = get_object_taxonomies($object))
 			$taxonomies = array_merge($taxonomies, $taxes);
 
 	return array_unique($taxonomies);
@@ -2096,15 +2096,15 @@ 
  *                       Default 'names'.
  * @return array The names of all taxonomy of $object_type.
  */
-function get_taxonomies_for_attachments( $output = 'names' ) {
+function get_taxonomies_for_attachments($output = 'names') {
 	$taxonomies = array();
-	foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy ) {
-		foreach ( $taxonomy->object_type as $object_type ) {
-			if ( 'attachment' == $object_type || 0 === strpos( $object_type, 'attachment:' ) ) {
-				if ( 'names' == $output )
+	foreach (get_taxonomies(array(), 'objects') as $taxonomy) {
+		foreach ($taxonomy->object_type as $object_type) {
+			if ('attachment' == $object_type || 0 === strpos($object_type, 'attachment:')) {
+				if ('names' == $output)
 					$taxonomies[] = $taxonomy->name;
 				else
-					$taxonomies[ $taxonomy->name ] = $taxonomy;
+					$taxonomies[$taxonomy->name] = $taxonomy;
 				break;
 			}
 		}
@@ -2126,7 +2126,7 @@ 
  */
 function wp_imagecreatetruecolor($width, $height) {
 	$img = imagecreatetruecolor($width, $height);
-	if ( is_resource($img) && function_exists('imagealphablending') && function_exists('imagesavealpha') ) {
+	if (is_resource($img) && function_exists('imagealphablending') && function_exists('imagesavealpha')) {
 		imagealphablending($img, false);
 		imagesavealpha($img, true);
 	}
@@ -2148,9 +2148,9 @@ 
  * @param int      $priority Optional. Used to specify the order in which the registered handlers will
  *                           be tested. Default 10.
  */
-function wp_embed_register_handler( $id, $regex, $callback, $priority = 10 ) {
+function wp_embed_register_handler($id, $regex, $callback, $priority = 10) {
 	global $wp_embed;
-	$wp_embed->register_handler( $id, $regex, $callback, $priority );
+	$wp_embed->register_handler($id, $regex, $callback, $priority);
 }
 
 /**
@@ -2163,9 +2163,9 @@ 
  * @param string $id       The handler ID that should be removed.
  * @param int    $priority Optional. The priority of the handler to be removed. Default 10.
  */
-function wp_embed_unregister_handler( $id, $priority = 10 ) {
+function wp_embed_unregister_handler($id, $priority = 10) {
 	global $wp_embed;
-	$wp_embed->unregister_handler( $id, $priority );
+	$wp_embed->unregister_handler($id, $priority);
 }
 
 /**
@@ -2186,14 +2186,14 @@ 
  *
  * @return array Default embed parameters.
  */
-function wp_embed_defaults( $url = '' ) {
-	if ( ! empty( $GLOBALS['content_width'] ) )
+function wp_embed_defaults($url = '') {
+	if ( ! empty($GLOBALS['content_width']))
 		$width = (int) $GLOBALS['content_width'];
 
-	if ( empty( $width ) )
+	if (empty($width))
 		$width = 500;
 
-	$height = min( ceil( $width * 1.5 ), 1000 );
+	$height = min(ceil($width * 1.5), 1000);
 
 	/**
 	 * Filter the default array of embed dimensions.
@@ -2204,7 +2204,7 @@ 
 	 * @param int    $height Height of the embed in pixels.
 	 * @param string $url    The URL that should be embedded.
 	 */
-	return apply_filters( 'embed_defaults', compact( 'width', 'height' ), $url );
+	return apply_filters('embed_defaults', compact('width', 'height'), $url);
 }
 
 /**
@@ -2220,13 +2220,13 @@ 
  * @param int $max_height     The maximum allowed height.
  * @return array The maximum possible width and height based on the example ratio.
  */
-function wp_expand_dimensions( $example_width, $example_height, $max_width, $max_height ) {
+function wp_expand_dimensions($example_width, $example_height, $max_width, $max_height) {
 	$example_width  = (int) $example_width;
 	$example_height = (int) $example_height;
 	$max_width      = (int) $max_width;
 	$max_height     = (int) $max_height;
 
-	return wp_constrain_dimensions( $example_width * 1000000, $example_height * 1000000, $max_width, $max_height );
+	return wp_constrain_dimensions($example_width * 1000000, $example_height * 1000000, $max_width, $max_height);
 }
 
 /**
@@ -2241,10 +2241,10 @@ 
  *                     Default empty.
  * @return false|string False on failure or the embed HTML on success.
  */
-function wp_oembed_get( $url, $args = '' ) {
-	require_once( ABSPATH . WPINC . '/class-oembed.php' );
+function wp_oembed_get($url, $args = '') {
+	require_once(ABSPATH.WPINC.'/class-oembed.php');
 	$oembed = _wp_oembed_get_object();
-	return $oembed->get_html( $url, $args );
+	return $oembed->get_html($url, $args);
 }
 
 /**
@@ -2259,14 +2259,14 @@ 
  * @param string  $provider The URL to the oEmbed provider.
  * @param boolean $regex    Optional. Whether the `$format` parameter is in a RegEx format. Default false.
  */
-function wp_oembed_add_provider( $format, $provider, $regex = false ) {
-	require_once( ABSPATH . WPINC . '/class-oembed.php' );
+function wp_oembed_add_provider($format, $provider, $regex = false) {
+	require_once(ABSPATH.WPINC.'/class-oembed.php');
 
-	if ( did_action( 'plugins_loaded' ) ) {
+	if (did_action('plugins_loaded')) {
 		$oembed = _wp_oembed_get_object();
-		$oembed->providers[$format] = array( $provider, $regex );
+		$oembed->providers[$format] = array($provider, $regex);
 	} else {
-		WP_oEmbed::_add_provider_early( $format, $provider, $regex );
+		WP_oEmbed::_add_provider_early($format, $provider, $regex);
 	}
 }
 
@@ -2280,18 +2280,18 @@ 
  * @param string $format The URL format for the oEmbed provider to remove.
  * @return bool Was the provider removed successfully?
  */
-function wp_oembed_remove_provider( $format ) {
-	require_once( ABSPATH . WPINC . '/class-oembed.php' );
+function wp_oembed_remove_provider($format) {
+	require_once(ABSPATH.WPINC.'/class-oembed.php');
 
-	if ( did_action( 'plugins_loaded' ) ) {
+	if (did_action('plugins_loaded')) {
 		$oembed = _wp_oembed_get_object();
 
-		if ( isset( $oembed->providers[ $format ] ) ) {
-			unset( $oembed->providers[ $format ] );
+		if (isset($oembed->providers[$format])) {
+			unset($oembed->providers[$format]);
 			return true;
 		}
 	} else {
-		WP_oEmbed::_remove_provider_early( $format );
+		WP_oEmbed::_remove_provider_early($format);
 	}
 
 	return false;
@@ -2317,13 +2317,13 @@ 
 	 *
 	 * @param bool $maybe_load_embeds Whether to load the embeds library. Default true.
 	 */
-	if ( ! apply_filters( 'load_default_embeds', true ) ) {
+	if ( ! apply_filters('load_default_embeds', true)) {
 		return;
 	}
 
-	wp_embed_register_handler( 'youtube_embed_url', '#https?://(www.)?youtube\.com/(?:v|embed)/([^/]+)#i', 'wp_embed_handler_youtube' );
+	wp_embed_register_handler('youtube_embed_url', '#https?://(www.)?youtube\.com/(?:v|embed)/([^/]+)#i', 'wp_embed_handler_youtube');
 
-	wp_embed_register_handler( 'googlevideo', '#http://video\.google\.([A-Za-z.]{2,5})/videoplay\?docid=([\d-]+)(.*?)#i', 'wp_embed_handler_googlevideo' );
+	wp_embed_register_handler('googlevideo', '#http://video\.google\.([A-Za-z.]{2,5})/videoplay\?docid=([\d-]+)(.*?)#i', 'wp_embed_handler_googlevideo');
 
 	/**
 	 * Filter the audio embed handler callback.
@@ -2332,7 +2332,7 @@ 
 	 *
 	 * @param callback $handler Audio embed handler callback function.
 	 */
-	wp_embed_register_handler( 'audio', '#^https?://.+?\.(' . join( '|', wp_get_audio_extensions() ) . ')$#i', apply_filters( 'wp_audio_embed_handler', 'wp_embed_handler_audio' ), 9999 );
+	wp_embed_register_handler('audio', '#^https?://.+?\.('.join('|', wp_get_audio_extensions()).')$#i', apply_filters('wp_audio_embed_handler', 'wp_embed_handler_audio'), 9999);
 
 	/**
 	 * Filter the video embed handler callback.
@@ -2341,7 +2341,7 @@ 
 	 *
 	 * @param callback $handler Video embed handler callback function.
 	 */
-	wp_embed_register_handler( 'video', '#^https?://.+?\.(' . join( '|', wp_get_video_extensions() ) . ')$#i', apply_filters( 'wp_video_embed_handler', 'wp_embed_handler_video' ), 9999 );
+	wp_embed_register_handler('video', '#^https?://.+?\.('.join('|', wp_get_video_extensions()).')$#i', apply_filters('wp_video_embed_handler', 'wp_embed_handler_video'), 9999);
 }
 
 /**
@@ -2358,13 +2358,13 @@ 
  * @param array  $rawattr The original unmodified attributes.
  * @return string The embed HTML.
  */
-function wp_embed_handler_googlevideo( $matches, $attr, $url, $rawattr ) {
+function wp_embed_handler_googlevideo($matches, $attr, $url, $rawattr) {
 	// If the user supplied a fixed width AND height, use it
-	if ( !empty($rawattr['width']) && !empty($rawattr['height']) ) {
+	if ( ! empty($rawattr['width']) && ! empty($rawattr['height'])) {
 		$width  = (int) $rawattr['width'];
 		$height = (int) $rawattr['height'];
 	} else {
-		list( $width, $height ) = wp_expand_dimensions( 425, 344, $attr['width'], $attr['height'] );
+		list($width, $height) = wp_expand_dimensions(425, 344, $attr['width'], $attr['height']);
 	}
 
 	/**
@@ -2378,7 +2378,7 @@ 
 	 * @param string $url     The original URL that was matched by the regex.
 	 * @param array  $rawattr The original unmodified attributes.
 	 */
-	return apply_filters( 'embed_googlevideo', '<embed type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docid=' . esc_attr($matches[2]) . '&amp;hl=en&amp;fs=true" style="width:' . esc_attr($width) . 'px;height:' . esc_attr($height) . 'px" allowFullScreen="true" allowScriptAccess="always" />', $matches, $attr, $url, $rawattr );
+	return apply_filters('embed_googlevideo', '<embed type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docid='.esc_attr($matches[2]).'&amp;hl=en&amp;fs=true" style="width:'.esc_attr($width).'px;height:'.esc_attr($height).'px" allowFullScreen="true" allowScriptAccess="always" />', $matches, $attr, $url, $rawattr);
 }
 
 /**
@@ -2397,9 +2397,9 @@ 
  * @param array  $rawattr The original unmodified attributes.
  * @return string The embed HTML.
  */
-function wp_embed_handler_youtube( $matches, $attr, $url, $rawattr ) {
+function wp_embed_handler_youtube($matches, $attr, $url, $rawattr) {
 	global $wp_embed;
-	$embed = $wp_embed->autoembed( "https://youtube.com/watch?v={$matches[2]}" );
+	$embed = $wp_embed->autoembed("https://youtube.com/watch?v={$matches[2]}");
 
 	/**
 	 * Filter the YoutTube embed output.
@@ -2413,7 +2413,7 @@ 
 	 * @param string $url     The original URL that was matched by the regex.
 	 * @param array  $rawattr The original unmodified attributes.
 	 */
-	return apply_filters( 'wp_embed_handler_youtube', $embed, $attr, $url, $rawattr );
+	return apply_filters('wp_embed_handler_youtube', $embed, $attr, $url, $rawattr);
 }
 
 /**
@@ -2427,8 +2427,8 @@ 
  * @param array  $rawattr The original unmodified attributes.
  * @return string The embed HTML.
  */
-function wp_embed_handler_audio( $matches, $attr, $url, $rawattr ) {
-	$audio = sprintf( '[audio src="%s" /]', esc_url( $url ) );
+function wp_embed_handler_audio($matches, $attr, $url, $rawattr) {
+	$audio = sprintf('[audio src="%s" /]', esc_url($url));
 
 	/**
 	 * Filter the audio embed output.
@@ -2440,7 +2440,7 @@ 
 	 * @param string $url     The original URL that was matched by the regex.
 	 * @param array  $rawattr The original unmodified attributes.
 	 */
-	return apply_filters( 'wp_embed_handler_audio', $audio, $attr, $url, $rawattr );
+	return apply_filters('wp_embed_handler_audio', $audio, $attr, $url, $rawattr);
 }
 
 /**
@@ -2454,13 +2454,13 @@ 
  * @param array  $rawattr The original unmodified attributes.
  * @return string The embed HTML.
  */
-function wp_embed_handler_video( $matches, $attr, $url, $rawattr ) {
+function wp_embed_handler_video($matches, $attr, $url, $rawattr) {
 	$dimensions = '';
-	if ( ! empty( $rawattr['width'] ) && ! empty( $rawattr['height'] ) ) {
-		$dimensions .= sprintf( 'width="%d" ', (int) $rawattr['width'] );
-		$dimensions .= sprintf( 'height="%d" ', (int) $rawattr['height'] );
+	if ( ! empty($rawattr['width']) && ! empty($rawattr['height'])) {
+		$dimensions .= sprintf('width="%d" ', (int) $rawattr['width']);
+		$dimensions .= sprintf('height="%d" ', (int) $rawattr['height']);
 	}
-	$video = sprintf( '[video %s src="%s" /]', $dimensions, esc_url( $url ) );
+	$video = sprintf('[video %s src="%s" /]', $dimensions, esc_url($url));
 
 	/**
 	 * Filter the video embed output.
@@ -2472,7 +2472,7 @@ 
 	 * @param string $url     The original URL that was matched by the regex.
 	 * @param array  $rawattr The original unmodified attributes.
 	 */
-	return apply_filters( 'wp_embed_handler_video', $video, $attr, $url, $rawattr );
+	return apply_filters('wp_embed_handler_video', $video, $attr, $url, $rawattr);
 }
 
 /**
@@ -2483,15 +2483,15 @@ 
  * @param string $size A shorthand byte value.
  * @return int An integer byte value.
  */
-function wp_convert_hr_to_bytes( $size ) {
-	$size  = strtolower( $size );
+function wp_convert_hr_to_bytes($size) {
+	$size  = strtolower($size);
 	$bytes = (int) $size;
-	if ( strpos( $size, 'k' ) !== false )
-		$bytes = intval( $size ) * 1024;
-	elseif ( strpos( $size, 'm' ) !== false )
+	if (strpos($size, 'k') !== false)
+		$bytes = intval($size) * 1024;
+	elseif (strpos($size, 'm') !== false)
 		$bytes = intval($size) * 1024 * 1024;
-	elseif ( strpos( $size, 'g' ) !== false )
-		$bytes = intval( $size ) * 1024 * 1024 * 1024;
+	elseif (strpos($size, 'g') !== false)
+		$bytes = intval($size) * 1024 * 1024 * 1024;
 	return $bytes;
 }
 
@@ -2503,8 +2503,8 @@ 
  * @return int Allowed upload size.
  */
 function wp_max_upload_size() {
-	$u_bytes = wp_convert_hr_to_bytes( ini_get( 'upload_max_filesize' ) );
-	$p_bytes = wp_convert_hr_to_bytes( ini_get( 'post_max_size' ) );
+	$u_bytes = wp_convert_hr_to_bytes(ini_get('upload_max_filesize'));
+	$p_bytes = wp_convert_hr_to_bytes(ini_get('post_max_size'));
 
 	/**
 	 * Filter the maximum upload size allowed in php.ini.
@@ -2515,7 +2515,7 @@ 
 	 * @param int $u_bytes Maximum upload filesize in bytes.
 	 * @param int $p_bytes Maximum size of POST data in bytes.
 	 */
-	return apply_filters( 'upload_size_limit', min( $u_bytes, $p_bytes ), $u_bytes, $p_bytes );
+	return apply_filters('upload_size_limit', min($u_bytes, $p_bytes), $u_bytes, $p_bytes);
 }
 
 /**
@@ -2529,31 +2529,31 @@ 
  * @return WP_Image_Editor|WP_Error The WP_Image_Editor object if successful, an WP_Error
  *                                  object otherwise.
  */
-function wp_get_image_editor( $path, $args = array() ) {
+function wp_get_image_editor($path, $args = array()) {
 	$args['path'] = $path;
 
-	if ( ! isset( $args['mime_type'] ) ) {
-		$file_info = wp_check_filetype( $args['path'] );
+	if ( ! isset($args['mime_type'])) {
+		$file_info = wp_check_filetype($args['path']);
 
 		// If $file_info['type'] is false, then we let the editor attempt to
 		// figure out the file type, rather than forcing a failure based on extension.
-		if ( isset( $file_info ) && $file_info['type'] )
+		if (isset($file_info) && $file_info['type'])
 			$args['mime_type'] = $file_info['type'];
 	}
 
-	$implementation = _wp_image_editor_choose( $args );
+	$implementation = _wp_image_editor_choose($args);
 
-	if ( $implementation ) {
-		$editor = new $implementation( $path );
+	if ($implementation) {
+		$editor = new $implementation($path);
 		$loaded = $editor->load();
 
-		if ( is_wp_error( $loaded ) )
+		if (is_wp_error($loaded))
 			return $loaded;
 
 		return $editor;
 	}
 
-	return new WP_Error( 'image_no_editor', __('No editor could be selected.') );
+	return new WP_Error('image_no_editor', __('No editor could be selected.'));
 }
 
 /**
@@ -2565,8 +2565,8 @@ 
  *                           Default empty array.
  * @return bool True if an eligible editor is found; false otherwise.
  */
-function wp_image_editor_supports( $args = array() ) {
-	return (bool) _wp_image_editor_choose( $args );
+function wp_image_editor_supports($args = array()) {
+	return (bool) _wp_image_editor_choose($args);
 }
 
 /**
@@ -2579,10 +2579,10 @@ 
  * @return string|false Class name for the first editor that claims to support the request. False if no
  *                     editor claims to support the request.
  */
-function _wp_image_editor_choose( $args = array() ) {
-	require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
-	require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
-	require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
+function _wp_image_editor_choose($args = array()) {
+	require_once ABSPATH.WPINC.'/class-wp-image-editor.php';
+	require_once ABSPATH.WPINC.'/class-wp-image-editor-gd.php';
+	require_once ABSPATH.WPINC.'/class-wp-image-editor-imagick.php';
 
 	/**
 	 * Filter the list of image editing library classes.
@@ -2592,21 +2592,21 @@ 
 	 * @param array $image_editors List of available image editors. Defaults are
 	 *                             'WP_Image_Editor_Imagick', 'WP_Image_Editor_GD'.
 	 */
-	$implementations = apply_filters( 'wp_image_editors', array( 'WP_Image_Editor_Imagick', 'WP_Image_Editor_GD' ) );
+	$implementations = apply_filters('wp_image_editors', array('WP_Image_Editor_Imagick', 'WP_Image_Editor_GD'));
 
-	foreach ( $implementations as $implementation ) {
-		if ( ! call_user_func( array( $implementation, 'test' ), $args ) )
+	foreach ($implementations as $implementation) {
+		if ( ! call_user_func(array($implementation, 'test'), $args))
 			continue;
 
-		if ( isset( $args['mime_type'] ) &&
+		if (isset($args['mime_type']) &&
 			! call_user_func(
-				array( $implementation, 'supports_mime_type' ),
-				$args['mime_type'] ) ) {
+				array($implementation, 'supports_mime_type'),
+				$args['mime_type'] )) {
 			continue;
 		}
 
-		if ( isset( $args['methods'] ) &&
-			 array_diff( $args['methods'], get_class_methods( $implementation ) ) ) {
+		if (isset($args['methods']) &&
+			 array_diff($args['methods'], get_class_methods($implementation))) {
 			continue;
 		}
 
@@ -2624,8 +2624,8 @@ 
 function wp_plupload_default_settings() {
 	$wp_scripts = wp_scripts();
 
-	$data = $wp_scripts->get_data( 'wp-plupload', 'data' );
-	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) )
+	$data = $wp_scripts->get_data('wp-plupload', 'data');
+	if ($data && false !== strpos($data, '_wpPluploadSettings'))
 		return;
 
 	$max_upload_size = wp_max_upload_size();
@@ -2633,18 +2633,18 @@ 
 	$defaults = array(
 		'runtimes'            => 'html5,flash,silverlight,html4',
 		'file_data_name'      => 'async-upload', // key passed to $_FILE.
-		'url'                 => admin_url( 'async-upload.php', 'relative' ),
-		'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
-		'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
+		'url'                 => admin_url('async-upload.php', 'relative'),
+		'flash_swf_url'       => includes_url('js/plupload/plupload.flash.swf'),
+		'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
 		'filters' => array(
-			'max_file_size'   => $max_upload_size . 'b',
+			'max_file_size'   => $max_upload_size.'b',
 		),
 	);
 
 	// Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
 	// when enabled. See #29602.
-	if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
-		strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
+	if (wp_is_mobile() && strpos($_SERVER['HTTP_USER_AGENT'], 'OS 7_') !== false &&
+		strpos($_SERVER['HTTP_USER_AGENT'], 'like Mac OS X') !== false) {
 
 		$defaults['multi_selection'] = false;
 	}
@@ -2656,7 +2656,7 @@ 
 	 *
 	 * @param array $defaults Default Plupload settings array.
 	 */
-	$defaults = apply_filters( 'plupload_default_settings', $defaults );
+	$defaults = apply_filters('plupload_default_settings', $defaults);
 
 	$params = array(
 		'action' => 'upload-attachment',
@@ -2669,8 +2669,8 @@ 
 	 *
 	 * @param array $params Default Plupload parameters array.
 	 */
-	$params = apply_filters( 'plupload_default_params', $params );
-	$params['_wpnonce'] = wp_create_nonce( 'media-form' );
+	$params = apply_filters('plupload_default_params', $params);
+	$params['_wpnonce'] = wp_create_nonce('media-form');
 	$defaults['multipart_params'] = $params;
 
 	$settings = array(
@@ -2682,12 +2682,12 @@ 
 		'limitExceeded' => is_multisite() && ! is_upload_space_available()
 	);
 
-	$script = 'var _wpPluploadSettings = ' . wp_json_encode( $settings ) . ';';
+	$script = 'var _wpPluploadSettings = '.wp_json_encode($settings).';';
 
-	if ( $data )
+	if ($data)
 		$script = "$data\n$script";
 
-	$wp_scripts->add_data( 'wp-plupload', 'data', $script );
+	$wp_scripts->add_data('wp-plupload', 'data', $script);
 }
 
 /**
@@ -2699,42 +2699,42 @@ 
  * @param mixed $attachment Attachment ID or object.
  * @return array|void Array of attachment details.
  */
-function wp_prepare_attachment_for_js( $attachment ) {
-	if ( ! $attachment = get_post( $attachment ) )
+function wp_prepare_attachment_for_js($attachment) {
+	if ( ! $attachment = get_post($attachment))
 		return;
 
-	if ( 'attachment' != $attachment->post_type )
+	if ('attachment' != $attachment->post_type)
 		return;
 
-	$meta = wp_get_attachment_metadata( $attachment->ID );
-	if ( false !== strpos( $attachment->post_mime_type, '/' ) )
-		list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+	$meta = wp_get_attachment_metadata($attachment->ID);
+	if (false !== strpos($attachment->post_mime_type, '/'))
+		list($type, $subtype) = explode('/', $attachment->post_mime_type);
 	else
-		list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+		list($type, $subtype) = array($attachment->post_mime_type, '');
 
-	$attachment_url = wp_get_attachment_url( $attachment->ID );
+	$attachment_url = wp_get_attachment_url($attachment->ID);
 
 	$response = array(
 		'id'          => $attachment->ID,
 		'title'       => $attachment->post_title,
-		'filename'    => wp_basename( get_attached_file( $attachment->ID ) ),
+		'filename'    => wp_basename(get_attached_file($attachment->ID)),
 		'url'         => $attachment_url,
-		'link'        => get_attachment_link( $attachment->ID ),
-		'alt'         => get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ),
+		'link'        => get_attachment_link($attachment->ID),
+		'alt'         => get_post_meta($attachment->ID, '_wp_attachment_image_alt', true),
 		'author'      => $attachment->post_author,
 		'description' => $attachment->post_content,
 		'caption'     => $attachment->post_excerpt,
 		'name'        => $attachment->post_name,
 		'status'      => $attachment->post_status,
 		'uploadedTo'  => $attachment->post_parent,
-		'date'        => strtotime( $attachment->post_date_gmt ) * 1000,
-		'modified'    => strtotime( $attachment->post_modified_gmt ) * 1000,
+		'date'        => strtotime($attachment->post_date_gmt) * 1000,
+		'modified'    => strtotime($attachment->post_modified_gmt) * 1000,
 		'menuOrder'   => $attachment->menu_order,
 		'mime'        => $attachment->post_mime_type,
 		'type'        => $type,
 		'subtype'     => $subtype,
-		'icon'        => wp_mime_type_icon( $attachment->ID ),
-		'dateFormatted' => mysql2date( get_option('date_format'), $attachment->post_date ),
+		'icon'        => wp_mime_type_icon($attachment->ID),
+		'dateFormatted' => mysql2date(get_option('date_format'), $attachment->post_date),
 		'nonces'      => array(
 			'update' => false,
 			'delete' => false,
@@ -2744,133 +2744,133 @@ 
 		'meta'       => false,
 	);
 
-	$author = new WP_User( $attachment->post_author );
+	$author = new WP_User($attachment->post_author);
 	$response['authorName'] = $author->display_name;
 
-	if ( $attachment->post_parent ) {
-		$post_parent = get_post( $attachment->post_parent );
+	if ($attachment->post_parent) {
+		$post_parent = get_post($attachment->post_parent);
 	} else {
 		$post_parent = false;
 	}
 
-	if ( $post_parent ) {
-		$parent_type = get_post_type_object( $post_parent->post_type );
-		if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $attachment->post_parent ) ) {
-			$response['uploadedToLink'] = get_edit_post_link( $attachment->post_parent, 'raw' );
+	if ($post_parent) {
+		$parent_type = get_post_type_object($post_parent->post_type);
+		if ($parent_type && $parent_type->show_ui && current_user_can('edit_post', $attachment->post_parent)) {
+			$response['uploadedToLink'] = get_edit_post_link($attachment->post_parent, 'raw');
 		}
-		$response['uploadedToTitle'] = $post_parent->post_title ? $post_parent->post_title : __( '(no title)' );
+		$response['uploadedToTitle'] = $post_parent->post_title ? $post_parent->post_title : __('(no title)');
 	}
 
-	$attached_file = get_attached_file( $attachment->ID );
-	if ( file_exists( $attached_file ) ) {
-		$bytes = filesize( $attached_file );
+	$attached_file = get_attached_file($attachment->ID);
+	if (file_exists($attached_file)) {
+		$bytes = filesize($attached_file);
 		$response['filesizeInBytes'] = $bytes;
-		$response['filesizeHumanReadable'] = size_format( $bytes );
+		$response['filesizeHumanReadable'] = size_format($bytes);
 	}
 
-	if ( current_user_can( 'edit_post', $attachment->ID ) ) {
-		$response['nonces']['update'] = wp_create_nonce( 'update-post_' . $attachment->ID );
-		$response['nonces']['edit'] = wp_create_nonce( 'image_editor-' . $attachment->ID );
-		$response['editLink'] = get_edit_post_link( $attachment->ID, 'raw' );
+	if (current_user_can('edit_post', $attachment->ID)) {
+		$response['nonces']['update'] = wp_create_nonce('update-post_'.$attachment->ID);
+		$response['nonces']['edit'] = wp_create_nonce('image_editor-'.$attachment->ID);
+		$response['editLink'] = get_edit_post_link($attachment->ID, 'raw');
 	}
 
-	if ( current_user_can( 'delete_post', $attachment->ID ) )
-		$response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
+	if (current_user_can('delete_post', $attachment->ID))
+		$response['nonces']['delete'] = wp_create_nonce('delete-post_'.$attachment->ID);
 
-	if ( $meta && 'image' === $type ) {
+	if ($meta && 'image' === $type) {
 		$sizes = array();
 
 		/** This filter is documented in wp-admin/includes/media.php */
-		$possible_sizes = apply_filters( 'image_size_names_choose', array(
+		$possible_sizes = apply_filters('image_size_names_choose', array(
 			'thumbnail' => __('Thumbnail'),
 			'medium'    => __('Medium'),
 			'large'     => __('Large'),
 			'full'      => __('Full Size'),
-		) );
-		unset( $possible_sizes['full'] );
+		));
+		unset($possible_sizes['full']);
 
 		// Loop through all potential sizes that may be chosen. Try to do this with some efficiency.
 		// First: run the image_downsize filter. If it returns something, we can use its data.
 		// If the filter does not return something, then image_downsize() is just an expensive
 		// way to check the image metadata, which we do second.
-		foreach ( $possible_sizes as $size => $label ) {
+		foreach ($possible_sizes as $size => $label) {
 
 			/** This filter is documented in wp-includes/media.php */
-			if ( $downsize = apply_filters( 'image_downsize', false, $attachment->ID, $size ) ) {
-				if ( ! $downsize[3] )
+			if ($downsize = apply_filters('image_downsize', false, $attachment->ID, $size)) {
+				if ( ! $downsize[3])
 					continue;
-				$sizes[ $size ] = array(
+				$sizes[$size] = array(
 					'height'      => $downsize[2],
 					'width'       => $downsize[1],
 					'url'         => $downsize[0],
 					'orientation' => $downsize[2] > $downsize[1] ? 'portrait' : 'landscape',
 				);
-			} elseif ( isset( $meta['sizes'][ $size ] ) ) {
-				if ( ! isset( $base_url ) )
-					$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
+			} elseif (isset($meta['sizes'][$size])) {
+				if ( ! isset($base_url))
+					$base_url = str_replace(wp_basename($attachment_url), '', $attachment_url);
 
 				// Nothing from the filter, so consult image metadata if we have it.
-				$size_meta = $meta['sizes'][ $size ];
+				$size_meta = $meta['sizes'][$size];
 
 				// We have the actual image size, but might need to further constrain it if content_width is narrower.
 				// Thumbnail, medium, and full sizes are also checked against the site's height/width options.
-				list( $width, $height ) = image_constrain_size_for_editor( $size_meta['width'], $size_meta['height'], $size, 'edit' );
+				list($width, $height) = image_constrain_size_for_editor($size_meta['width'], $size_meta['height'], $size, 'edit');
 
-				$sizes[ $size ] = array(
+				$sizes[$size] = array(
 					'height'      => $height,
 					'width'       => $width,
-					'url'         => $base_url . $size_meta['file'],
+					'url'         => $base_url.$size_meta['file'],
 					'orientation' => $height > $width ? 'portrait' : 'landscape',
 				);
 			}
 		}
 
-		$sizes['full'] = array( 'url' => $attachment_url );
+		$sizes['full'] = array('url' => $attachment_url);
 
-		if ( isset( $meta['height'], $meta['width'] ) ) {
+		if (isset($meta['height'], $meta['width'])) {
 			$sizes['full']['height'] = $meta['height'];
 			$sizes['full']['width'] = $meta['width'];
 			$sizes['full']['orientation'] = $meta['height'] > $meta['width'] ? 'portrait' : 'landscape';
 		}
 
-		$response = array_merge( $response, array( 'sizes' => $sizes ), $sizes['full'] );
-	} elseif ( $meta && 'video' === $type ) {
-		if ( isset( $meta['width'] ) )
+		$response = array_merge($response, array('sizes' => $sizes), $sizes['full']);
+	} elseif ($meta && 'video' === $type) {
+		if (isset($meta['width']))
 			$response['width'] = (int) $meta['width'];
-		if ( isset( $meta['height'] ) )
+		if (isset($meta['height']))
 			$response['height'] = (int) $meta['height'];
 	}
 
-	if ( $meta && ( 'audio' === $type || 'video' === $type ) ) {
-		if ( isset( $meta['length_formatted'] ) )
+	if ($meta && ('audio' === $type || 'video' === $type)) {
+		if (isset($meta['length_formatted']))
 			$response['fileLength'] = $meta['length_formatted'];
 
 		$response['meta'] = array();
-		foreach ( wp_get_attachment_id3_keys( $attachment, 'js' ) as $key => $label ) {
-			$response['meta'][ $key ] = false;
+		foreach (wp_get_attachment_id3_keys($attachment, 'js') as $key => $label) {
+			$response['meta'][$key] = false;
 
-			if ( ! empty( $meta[ $key ] ) ) {
-				$response['meta'][ $key ] = $meta[ $key ];
+			if ( ! empty($meta[$key])) {
+				$response['meta'][$key] = $meta[$key];
 			}
 		}
 
-		$id = get_post_thumbnail_id( $attachment->ID );
-		if ( ! empty( $id ) ) {
-			list( $src, $width, $height ) = wp_get_attachment_image_src( $id, 'full' );
-			$response['image'] = compact( 'src', 'width', 'height' );
-			list( $src, $width, $height ) = wp_get_attachment_image_src( $id, 'thumbnail' );
-			$response['thumb'] = compact( 'src', 'width', 'height' );
+		$id = get_post_thumbnail_id($attachment->ID);
+		if ( ! empty($id)) {
+			list($src, $width, $height) = wp_get_attachment_image_src($id, 'full');
+			$response['image'] = compact('src', 'width', 'height');
+			list($src, $width, $height) = wp_get_attachment_image_src($id, 'thumbnail');
+			$response['thumb'] = compact('src', 'width', 'height');
 		} else {
-			$src = wp_mime_type_icon( $attachment->ID );
+			$src = wp_mime_type_icon($attachment->ID);
 			$width = 48;
 			$height = 64;
-			$response['image'] = compact( 'src', 'width', 'height' );
-			$response['thumb'] = compact( 'src', 'width', 'height' );
+			$response['image'] = compact('src', 'width', 'height');
+			$response['thumb'] = compact('src', 'width', 'height');
 		}
 	}
 
-	if ( function_exists('get_compat_media_markup') )
-		$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
+	if (function_exists('get_compat_media_markup'))
+		$response['compat'] = get_compat_media_markup($attachment->ID, array('in_modal' => true));
 
 	/**
 	 * Filter the attachment data prepared for JavaScript.
@@ -2881,7 +2881,7 @@ 
 	 * @param int|object $attachment Attachment ID or object.
 	 * @param array      $meta       Array of attachment meta data.
 	 */
-	return apply_filters( 'wp_prepare_attachment_for_js', $response, $attachment, $meta );
+	return apply_filters('wp_prepare_attachment_for_js', $response, $attachment, $meta);
 }
 
 /**
@@ -2900,9 +2900,9 @@ 
  *     @type int|WP_Post A post object or ID.
  * }
  */
-function wp_enqueue_media( $args = array() ) {
+function wp_enqueue_media($args = array()) {
 	// Enqueue me just once per page, please.
-	if ( did_action( 'wp_enqueue_media' ) )
+	if (did_action('wp_enqueue_media'))
 		return;
 
 	global $content_width, $wpdb, $wp_locale;
@@ -2910,7 +2910,7 @@ 
 	$defaults = array(
 		'post' => null,
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	// We're going to pass the old thickbox media tabs to `media_upload_tabs`
 	// to ensure plugins will work. We will then unset those tabs.
@@ -2923,67 +2923,67 @@ 
 	);
 
 	/** This filter is documented in wp-admin/includes/media.php */
-	$tabs = apply_filters( 'media_upload_tabs', $tabs );
-	unset( $tabs['type'], $tabs['type_url'], $tabs['gallery'], $tabs['library'] );
+	$tabs = apply_filters('media_upload_tabs', $tabs);
+	unset($tabs['type'], $tabs['type_url'], $tabs['gallery'], $tabs['library']);
 
 	$props = array(
-		'link'  => get_option( 'image_default_link_type' ), // db default is 'file'
-		'align' => get_option( 'image_default_align' ), // empty default
-		'size'  => get_option( 'image_default_size' ),  // empty default
+		'link'  => get_option('image_default_link_type'), // db default is 'file'
+		'align' => get_option('image_default_align'), // empty default
+		'size'  => get_option('image_default_size'), // empty default
 	);
 
-	$exts = array_merge( wp_get_audio_extensions(), wp_get_video_extensions() );
+	$exts = array_merge(wp_get_audio_extensions(), wp_get_video_extensions());
 	$mimes = get_allowed_mime_types();
 	$ext_mimes = array();
-	foreach ( $exts as $ext ) {
-		foreach ( $mimes as $ext_preg => $mime_match ) {
-			if ( preg_match( '#' . $ext . '#i', $ext_preg ) ) {
-				$ext_mimes[ $ext ] = $mime_match;
+	foreach ($exts as $ext) {
+		foreach ($mimes as $ext_preg => $mime_match) {
+			if (preg_match('#'.$ext.'#i', $ext_preg)) {
+				$ext_mimes[$ext] = $mime_match;
 				break;
 			}
 		}
 	}
 
-	$has_audio = $wpdb->get_var( "
+	$has_audio = $wpdb->get_var("
 		SELECT ID
 		FROM $wpdb->posts
 		WHERE post_type = 'attachment'
 		AND post_mime_type LIKE 'audio%'
 		LIMIT 1
-	" );
-	$has_video = $wpdb->get_var( "
+	");
+	$has_video = $wpdb->get_var("
 		SELECT ID
 		FROM $wpdb->posts
 		WHERE post_type = 'attachment'
 		AND post_mime_type LIKE 'video%'
 		LIMIT 1
-	" );
-	$months = $wpdb->get_results( $wpdb->prepare( "
+	");
+	$months = $wpdb->get_results($wpdb->prepare("
 		SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
 		FROM $wpdb->posts
 		WHERE post_type = %s
 		ORDER BY post_date DESC
-	", 'attachment' ) );
-	foreach ( $months as $month_year ) {
-		$month_year->text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month_year->month ), $month_year->year );
+	", 'attachment'));
+	foreach ($months as $month_year) {
+		$month_year->text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($month_year->month), $month_year->year);
 	}
 
 	$settings = array(
 		'tabs'      => $tabs,
-		'tabUrl'    => add_query_arg( array( 'chromeless' => true ), admin_url('media-upload.php') ),
-		'mimeTypes' => wp_list_pluck( get_post_mime_types(), 0 ),
+		'tabUrl'    => add_query_arg(array('chromeless' => true), admin_url('media-upload.php')),
+		'mimeTypes' => wp_list_pluck(get_post_mime_types(), 0),
 		/** This filter is documented in wp-admin/includes/media.php */
-		'captions'  => ! apply_filters( 'disable_captions', '' ),
+		'captions'  => ! apply_filters('disable_captions', ''),
 		'nonce'     => array(
-			'sendToEditor' => wp_create_nonce( 'media-send-to-editor' ),
+			'sendToEditor' => wp_create_nonce('media-send-to-editor'),
 		),
 		'post'    => array(
 			'id' => 0,
 		),
 		'defaultProps' => $props,
 		'attachmentCounts' => array(
-			'audio' => ( $has_audio ) ? 1 : 0,
-			'video' => ( $has_video ) ? 1 : 0
+			'audio' => ($has_audio) ? 1 : 0,
+			'video' => ($has_video) ? 1 : 0
 		),
 		'embedExts'    => $exts,
 		'embedMimes'   => $ext_mimes,
@@ -2993,156 +2993,156 @@ 
 	);
 
 	$post = null;
-	if ( isset( $args['post'] ) ) {
-		$post = get_post( $args['post'] );
+	if (isset($args['post'])) {
+		$post = get_post($args['post']);
 		$settings['post'] = array(
 			'id' => $post->ID,
-			'nonce' => wp_create_nonce( 'update-post_' . $post->ID ),
+			'nonce' => wp_create_nonce('update-post_'.$post->ID),
 		);
 
-		$thumbnail_support = current_theme_supports( 'post-thumbnails', $post->post_type ) && post_type_supports( $post->post_type, 'thumbnail' );
-		if ( ! $thumbnail_support && 'attachment' === $post->post_type && $post->post_mime_type ) {
-			if ( wp_attachment_is( 'audio', $post ) ) {
-				$thumbnail_support = post_type_supports( 'attachment:audio', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:audio' );
-			} elseif ( wp_attachment_is( 'video', $post ) ) {
-				$thumbnail_support = post_type_supports( 'attachment:video', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:video' );
+		$thumbnail_support = current_theme_supports('post-thumbnails', $post->post_type) && post_type_supports($post->post_type, 'thumbnail');
+		if ( ! $thumbnail_support && 'attachment' === $post->post_type && $post->post_mime_type) {
+			if (wp_attachment_is('audio', $post)) {
+				$thumbnail_support = post_type_supports('attachment:audio', 'thumbnail') || current_theme_supports('post-thumbnails', 'attachment:audio');
+			} elseif (wp_attachment_is('video', $post)) {
+				$thumbnail_support = post_type_supports('attachment:video', 'thumbnail') || current_theme_supports('post-thumbnails', 'attachment:video');
 			}
 		}
 
-		if ( $thumbnail_support ) {
-			$featured_image_id = get_post_meta( $post->ID, '_thumbnail_id', true );
+		if ($thumbnail_support) {
+			$featured_image_id = get_post_meta($post->ID, '_thumbnail_id', true);
 			$settings['post']['featuredImageId'] = $featured_image_id ? $featured_image_id : -1;
 		}
 	}
 
-	$hier = $post && is_post_type_hierarchical( $post->post_type );
+	$hier = $post && is_post_type_hierarchical($post->post_type);
 
-	if ( $post ) {
-		$post_type_object = get_post_type_object( $post->post_type );
+	if ($post) {
+		$post_type_object = get_post_type_object($post->post_type);
 	} else {
-		$post_type_object = get_post_type_object( 'post' );
+		$post_type_object = get_post_type_object('post');
 	}
 
 	$strings = array(
 		// Generic
-		'url'         => __( 'URL' ),
-		'addMedia'    => __( 'Add Media' ),
-		'search'      => __( 'Search' ),
-		'select'      => __( 'Select' ),
-		'cancel'      => __( 'Cancel' ),
-		'update'      => __( 'Update' ),
-		'replace'     => __( 'Replace' ),
-		'remove'      => __( 'Remove' ),
-		'back'        => __( 'Back' ),
+		'url'         => __('URL'),
+		'addMedia'    => __('Add Media'),
+		'search'      => __('Search'),
+		'select'      => __('Select'),
+		'cancel'      => __('Cancel'),
+		'update'      => __('Update'),
+		'replace'     => __('Replace'),
+		'remove'      => __('Remove'),
+		'back'        => __('Back'),
 		/* translators: This is a would-be plural string used in the media manager.
 		   If there is not a word you can use in your language to avoid issues with the
 		   lack of plural support here, turn it into "selected: %d" then translate it.
 		 */
-		'selected'    => __( '%d selected' ),
-		'dragInfo'    => __( 'Drag and drop to reorder media files.' ),
+		'selected'    => __('%d selected'),
+		'dragInfo'    => __('Drag and drop to reorder media files.'),
 
 		// Upload
-		'uploadFilesTitle'  => __( 'Upload Files' ),
-		'uploadImagesTitle' => __( 'Upload Images' ),
+		'uploadFilesTitle'  => __('Upload Files'),
+		'uploadImagesTitle' => __('Upload Images'),
 
 		// Library
-		'mediaLibraryTitle'      => __( 'Media Library' ),
-		'insertMediaTitle'       => __( 'Insert Media' ),
-		'createNewGallery'       => __( 'Create a new gallery' ),
-		'createNewPlaylist'      => __( 'Create a new playlist' ),
-		'createNewVideoPlaylist' => __( 'Create a new video playlist' ),
-		'returnToLibrary'        => __( '&#8592; Return to library' ),
-		'allMediaItems'          => __( 'All media items' ),
-		'allDates'               => __( 'All dates' ),
-		'noItemsFound'           => __( 'No items found.' ),
-		'insertIntoPost'         => $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),
-		'unattached'             => __( 'Unattached' ),
-		'trash'                  => _x( 'Trash', 'noun' ),
-		'uploadedToThisPost'     => $hier ? __( 'Uploaded to this page' ) : __( 'Uploaded to this post' ),
-		'warnDelete'             => __( "You are about to permanently delete this item.\n  'Cancel' to stop, 'OK' to delete." ),
-		'warnBulkDelete'         => __( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." ),
-		'warnBulkTrash'          => __( "You are about to trash these items.\n  'Cancel' to stop, 'OK' to delete." ),
-		'bulkSelect'             => __( 'Bulk Select' ),
-		'cancelSelection'        => __( 'Cancel Selection' ),
-		'trashSelected'          => __( 'Trash Selected' ),
-		'untrashSelected'        => __( 'Untrash Selected' ),
-		'deleteSelected'         => __( 'Delete Selected' ),
-		'deletePermanently'      => __( 'Delete Permanently' ),
-		'apply'                  => __( 'Apply' ),
-		'filterByDate'           => __( 'Filter by date' ),
-		'filterByType'           => __( 'Filter by type' ),
-		'searchMediaLabel'       => __( 'Search Media' ),
-		'noMedia'                => __( 'No media attachments found.' ),
+		'mediaLibraryTitle'      => __('Media Library'),
+		'insertMediaTitle'       => __('Insert Media'),
+		'createNewGallery'       => __('Create a new gallery'),
+		'createNewPlaylist'      => __('Create a new playlist'),
+		'createNewVideoPlaylist' => __('Create a new video playlist'),
+		'returnToLibrary'        => __('&#8592; Return to library'),
+		'allMediaItems'          => __('All media items'),
+		'allDates'               => __('All dates'),
+		'noItemsFound'           => __('No items found.'),
+		'insertIntoPost'         => $hier ? __('Insert into page') : __('Insert into post'),
+		'unattached'             => __('Unattached'),
+		'trash'                  => _x('Trash', 'noun'),
+		'uploadedToThisPost'     => $hier ? __('Uploaded to this page') : __('Uploaded to this post'),
+		'warnDelete'             => __("You are about to permanently delete this item.\n  'Cancel' to stop, 'OK' to delete."),
+		'warnBulkDelete'         => __("You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete."),
+		'warnBulkTrash'          => __("You are about to trash these items.\n  'Cancel' to stop, 'OK' to delete."),
+		'bulkSelect'             => __('Bulk Select'),
+		'cancelSelection'        => __('Cancel Selection'),
+		'trashSelected'          => __('Trash Selected'),
+		'untrashSelected'        => __('Untrash Selected'),
+		'deleteSelected'         => __('Delete Selected'),
+		'deletePermanently'      => __('Delete Permanently'),
+		'apply'                  => __('Apply'),
+		'filterByDate'           => __('Filter by date'),
+		'filterByType'           => __('Filter by type'),
+		'searchMediaLabel'       => __('Search Media'),
+		'noMedia'                => __('No media attachments found.'),
 
 		// Library Details
-		'attachmentDetails'  => __( 'Attachment Details' ),
+		'attachmentDetails'  => __('Attachment Details'),
 
 		// From URL
-		'insertFromUrlTitle' => __( 'Insert from URL' ),
+		'insertFromUrlTitle' => __('Insert from URL'),
 
 		// Featured Images
 		'setFeaturedImageTitle' => $post_type_object->labels->featured_image,
 		'setFeaturedImage'      => $post_type_object->labels->set_featured_image,
 
 		// Gallery
-		'createGalleryTitle' => __( 'Create Gallery' ),
-		'editGalleryTitle'   => __( 'Edit Gallery' ),
-		'cancelGalleryTitle' => __( '&#8592; Cancel Gallery' ),
-		'insertGallery'      => __( 'Insert gallery' ),
-		'updateGallery'      => __( 'Update gallery' ),
-		'addToGallery'       => __( 'Add to gallery' ),
-		'addToGalleryTitle'  => __( 'Add to Gallery' ),
-		'reverseOrder'       => __( 'Reverse order' ),
+		'createGalleryTitle' => __('Create Gallery'),
+		'editGalleryTitle'   => __('Edit Gallery'),
+		'cancelGalleryTitle' => __('&#8592; Cancel Gallery'),
+		'insertGallery'      => __('Insert gallery'),
+		'updateGallery'      => __('Update gallery'),
+		'addToGallery'       => __('Add to gallery'),
+		'addToGalleryTitle'  => __('Add to Gallery'),
+		'reverseOrder'       => __('Reverse order'),
 
 		// Edit Image
-		'imageDetailsTitle'     => __( 'Image Details' ),
-		'imageReplaceTitle'     => __( 'Replace Image' ),
-		'imageDetailsCancel'    => __( 'Cancel Edit' ),
-		'editImage'             => __( 'Edit Image' ),
+		'imageDetailsTitle'     => __('Image Details'),
+		'imageReplaceTitle'     => __('Replace Image'),
+		'imageDetailsCancel'    => __('Cancel Edit'),
+		'editImage'             => __('Edit Image'),
 
 		// Crop Image
-		'chooseImage' => __( 'Choose Image' ),
-		'selectAndCrop' => __( 'Select and Crop' ),
-		'skipCropping' => __( 'Skip Cropping' ),
-		'cropImage' => __( 'Crop Image' ),
-		'cropYourImage' => __( 'Crop your image' ),
-		'cropping' => __( 'Cropping&hellip;' ),
-		'suggestedDimensions' => __( 'Suggested image dimensions:' ),
-		'cropError' => __( 'There has been an error cropping your image.' ),
+		'chooseImage' => __('Choose Image'),
+		'selectAndCrop' => __('Select and Crop'),
+		'skipCropping' => __('Skip Cropping'),
+		'cropImage' => __('Crop Image'),
+		'cropYourImage' => __('Crop your image'),
+		'cropping' => __('Cropping&hellip;'),
+		'suggestedDimensions' => __('Suggested image dimensions:'),
+		'cropError' => __('There has been an error cropping your image.'),
 
 		// Edit Audio
-		'audioDetailsTitle'     => __( 'Audio Details' ),
-		'audioReplaceTitle'     => __( 'Replace Audio' ),
-		'audioAddSourceTitle'   => __( 'Add Audio Source' ),
-		'audioDetailsCancel'    => __( 'Cancel Edit' ),
+		'audioDetailsTitle'     => __('Audio Details'),
+		'audioReplaceTitle'     => __('Replace Audio'),
+		'audioAddSourceTitle'   => __('Add Audio Source'),
+		'audioDetailsCancel'    => __('Cancel Edit'),
 
 		// Edit Video
-		'videoDetailsTitle'     => __( 'Video Details' ),
-		'videoReplaceTitle'     => __( 'Replace Video' ),
-		'videoAddSourceTitle'   => __( 'Add Video Source' ),
-		'videoDetailsCancel'    => __( 'Cancel Edit' ),
-		'videoSelectPosterImageTitle' => __( 'Select Poster Image' ),
-		'videoAddTrackTitle'	=> __( 'Add Subtitles' ),
+		'videoDetailsTitle'     => __('Video Details'),
+		'videoReplaceTitle'     => __('Replace Video'),
+		'videoAddSourceTitle'   => __('Add Video Source'),
+		'videoDetailsCancel'    => __('Cancel Edit'),
+		'videoSelectPosterImageTitle' => __('Select Poster Image'),
+		'videoAddTrackTitle'	=> __('Add Subtitles'),
 
  		// Playlist
- 		'playlistDragInfo'    => __( 'Drag and drop to reorder tracks.' ),
- 		'createPlaylistTitle' => __( 'Create Audio Playlist' ),
- 		'editPlaylistTitle'   => __( 'Edit Audio Playlist' ),
- 		'cancelPlaylistTitle' => __( '&#8592; Cancel Audio Playlist' ),
- 		'insertPlaylist'      => __( 'Insert audio playlist' ),
- 		'updatePlaylist'      => __( 'Update audio playlist' ),
- 		'addToPlaylist'       => __( 'Add to audio playlist' ),
- 		'addToPlaylistTitle'  => __( 'Add to Audio Playlist' ),
+ 		'playlistDragInfo'    => __('Drag and drop to reorder tracks.'),
+ 		'createPlaylistTitle' => __('Create Audio Playlist'),
+ 		'editPlaylistTitle'   => __('Edit Audio Playlist'),
+ 		'cancelPlaylistTitle' => __('&#8592; Cancel Audio Playlist'),
+ 		'insertPlaylist'      => __('Insert audio playlist'),
+ 		'updatePlaylist'      => __('Update audio playlist'),
+ 		'addToPlaylist'       => __('Add to audio playlist'),
+ 		'addToPlaylistTitle'  => __('Add to Audio Playlist'),
 
  		// Video Playlist
- 		'videoPlaylistDragInfo'    => __( 'Drag and drop to reorder videos.' ),
- 		'createVideoPlaylistTitle' => __( 'Create Video Playlist' ),
- 		'editVideoPlaylistTitle'   => __( 'Edit Video Playlist' ),
- 		'cancelVideoPlaylistTitle' => __( '&#8592; Cancel Video Playlist' ),
- 		'insertVideoPlaylist'      => __( 'Insert video playlist' ),
- 		'updateVideoPlaylist'      => __( 'Update video playlist' ),
- 		'addToVideoPlaylist'       => __( 'Add to video playlist' ),
- 		'addToVideoPlaylistTitle'  => __( 'Add to Video Playlist' ),
+ 		'videoPlaylistDragInfo'    => __('Drag and drop to reorder videos.'),
+ 		'createVideoPlaylistTitle' => __('Create Video Playlist'),
+ 		'editVideoPlaylistTitle'   => __('Edit Video Playlist'),
+ 		'cancelVideoPlaylistTitle' => __('&#8592; Cancel Video Playlist'),
+ 		'insertVideoPlaylist'      => __('Insert video playlist'),
+ 		'updateVideoPlaylist'      => __('Update video playlist'),
+ 		'addToVideoPlaylist'       => __('Add to video playlist'),
+ 		'addToVideoPlaylistTitle'  => __('Add to Video Playlist'),
 	);
 
 	/**
@@ -3153,7 +3153,7 @@ 
 	 * @param array   $settings List of media view settings.
 	 * @param WP_Post $post     Post object.
 	 */
-	$settings = apply_filters( 'media_view_settings', $settings, $post );
+	$settings = apply_filters('media_view_settings', $settings, $post);
 
 	/**
 	 * Filter the media view strings.
@@ -3163,35 +3163,35 @@ 
 	 * @param array   $strings List of media view strings.
 	 * @param WP_Post $post    Post object.
 	 */
-	$strings = apply_filters( 'media_view_strings', $strings,  $post );
+	$strings = apply_filters('media_view_strings', $strings, $post);
 
 	$strings['settings'] = $settings;
 
 	// Ensure we enqueue media-editor first, that way media-views is
 	// registered internally before we try to localize it. see #24724.
-	wp_enqueue_script( 'media-editor' );
-	wp_localize_script( 'media-views', '_wpMediaViewsL10n', $strings );
+	wp_enqueue_script('media-editor');
+	wp_localize_script('media-views', '_wpMediaViewsL10n', $strings);
 
-	wp_enqueue_script( 'media-audiovideo' );
-	wp_enqueue_style( 'media-views' );
-	if ( is_admin() ) {
-		wp_enqueue_script( 'mce-view' );
-		wp_enqueue_script( 'image-edit' );
+	wp_enqueue_script('media-audiovideo');
+	wp_enqueue_style('media-views');
+	if (is_admin()) {
+		wp_enqueue_script('mce-view');
+		wp_enqueue_script('image-edit');
 	}
-	wp_enqueue_style( 'imgareaselect' );
+	wp_enqueue_style('imgareaselect');
 	wp_plupload_default_settings();
 
-	require_once ABSPATH . WPINC . '/media-template.php';
-	add_action( 'admin_footer', 'wp_print_media_templates' );
-	add_action( 'wp_footer', 'wp_print_media_templates' );
-	add_action( 'customize_controls_print_footer_scripts', 'wp_print_media_templates' );
+	require_once ABSPATH.WPINC.'/media-template.php';
+	add_action('admin_footer', 'wp_print_media_templates');
+	add_action('wp_footer', 'wp_print_media_templates');
+	add_action('customize_controls_print_footer_scripts', 'wp_print_media_templates');
 
 	/**
 	 * Fires at the conclusion of wp_enqueue_media().
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( 'wp_enqueue_media' );
+	do_action('wp_enqueue_media');
 }
 
 /**
@@ -3203,8 +3203,8 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return array Found attachments.
  */
-function get_attached_media( $type, $post = 0 ) {
-	if ( ! $post = get_post( $post ) )
+function get_attached_media($type, $post = 0) {
+	if ( ! $post = get_post($post))
 		return array();
 
 	$args = array(
@@ -3225,9 +3225,9 @@ 
 	 * @param string $type Mime type of the desired media.
 	 * @param mixed  $post Post ID or object.
 	 */
-	$args = apply_filters( 'get_attached_media_args', $args, $type, $post );
+	$args = apply_filters('get_attached_media_args', $args, $type, $post);
 
-	$children = get_children( $args );
+	$children = get_children($args);
 
 	/**
 	 * Filter the list of media attached to the given post.
@@ -3238,7 +3238,7 @@ 
 	 * @param string $type     Mime type of the media desired.
 	 * @param mixed  $post     Post ID or object.
 	 */
-	return (array) apply_filters( 'get_attached_media', $children, $type, $post );
+	return (array) apply_filters('get_attached_media', $children, $type, $post);
 }
 
 /**
@@ -3250,7 +3250,7 @@ 
  * @param array  $types   An array of media types: 'audio', 'video', 'object', 'embed', or 'iframe'.
  * @return array A list of found HTML media embeds.
  */
-function get_media_embedded_in_content( $content, $types = null ) {
+function get_media_embedded_in_content($content, $types = null) {
 	$html = array();
 
 	/**
@@ -3261,20 +3261,20 @@ 
 	 * @param array $allowed_media_types An array of allowed media types. Default media types are
 	 *                                   'audio', 'video', 'object', 'embed', and 'iframe'.
 	 */
-	$allowed_media_types = apply_filters( 'media_embedded_in_content_allowed_types', array( 'audio', 'video', 'object', 'embed', 'iframe' ) );
+	$allowed_media_types = apply_filters('media_embedded_in_content_allowed_types', array('audio', 'video', 'object', 'embed', 'iframe'));
 
-	if ( ! empty( $types ) ) {
-		if ( ! is_array( $types ) ) {
-			$types = array( $types );
+	if ( ! empty($types)) {
+		if ( ! is_array($types)) {
+			$types = array($types);
 		}
 
-		$allowed_media_types = array_intersect( $allowed_media_types, $types );
+		$allowed_media_types = array_intersect($allowed_media_types, $types);
 	}
 
-	$tags = implode( '|', $allowed_media_types );
+	$tags = implode('|', $allowed_media_types);
 
-	if ( preg_match_all( '#<(?P<tag>' . $tags . ')[^<]*?(?:>[\s\S]*?<\/(?P=tag)>|\s*\/>)#', $content, $matches ) ) {
-		foreach ( $matches[0] as $match ) {
+	if (preg_match_all('#<(?P<tag>'.$tags.')[^<]*?(?:>[\s\S]*?<\/(?P=tag)>|\s*\/>)#', $content, $matches)) {
+		foreach ($matches[0] as $match) {
 			$html[] = $match;
 		}
 	}
@@ -3292,31 +3292,31 @@ 
  * @return array A list of arrays, each containing gallery data and srcs parsed
  *               from the expanded shortcode.
  */
-function get_post_galleries( $post, $html = true ) {
-	if ( ! $post = get_post( $post ) )
+function get_post_galleries($post, $html = true) {
+	if ( ! $post = get_post($post))
 		return array();
 
-	if ( ! has_shortcode( $post->post_content, 'gallery' ) )
+	if ( ! has_shortcode($post->post_content, 'gallery'))
 		return array();
 
 	$galleries = array();
-	if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $post->post_content, $matches, PREG_SET_ORDER ) ) {
-		foreach ( $matches as $shortcode ) {
-			if ( 'gallery' === $shortcode[2] ) {
+	if (preg_match_all('/'.get_shortcode_regex().'/s', $post->post_content, $matches, PREG_SET_ORDER)) {
+		foreach ($matches as $shortcode) {
+			if ('gallery' === $shortcode[2]) {
 				$srcs = array();
 
-				$gallery = do_shortcode_tag( $shortcode );
-				if ( $html ) {
+				$gallery = do_shortcode_tag($shortcode);
+				if ($html) {
 					$galleries[] = $gallery;
 				} else {
-					preg_match_all( '#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER );
-					if ( ! empty( $src ) ) {
-						foreach ( $src as $s )
+					preg_match_all('#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER);
+					if ( ! empty($src)) {
+						foreach ($src as $s)
 							$srcs[] = $s[2];
 					}
 
-					$data = shortcode_parse_atts( $shortcode[3] );
-					$data['src'] = array_values( array_unique( $srcs ) );
+					$data = shortcode_parse_atts($shortcode[3]);
+					$data['src'] = array_values(array_unique($srcs));
 					$galleries[] = $data;
 				}
 			}
@@ -3331,7 +3331,7 @@ 
 	 * @param array   $galleries Associative array of all found post galleries.
 	 * @param WP_Post $post      Post object.
 	 */
-	return apply_filters( 'get_post_galleries', $galleries, $post );
+	return apply_filters('get_post_galleries', $galleries, $post);
 }
 
 /**
@@ -3343,9 +3343,9 @@ 
  * @param bool        $html Optional. Whether to return HTML or data. Default is true.
  * @return string|array Gallery data and srcs parsed from the expanded shortcode.
  */
-function get_post_gallery( $post = 0, $html = true ) {
-	$galleries = get_post_galleries( $post, $html );
-	$gallery = reset( $galleries );
+function get_post_gallery($post = 0, $html = true) {
+	$galleries = get_post_galleries($post, $html);
+	$gallery = reset($galleries);
 
 	/**
 	 * Filter the first-found post gallery.
@@ -3356,7 +3356,7 @@ 
 	 * @param int|WP_Post $post      Post ID or object.
 	 * @param array       $galleries Associative array of all found post galleries.
 	 */
-	return apply_filters( 'get_post_gallery', $gallery, $post, $galleries );
+	return apply_filters('get_post_gallery', $gallery, $post, $galleries);
 }
 
 /**
@@ -3370,9 +3370,9 @@ 
  * @return array A list of lists, each containing image srcs parsed.
  *               from an expanded shortcode
  */
-function get_post_galleries_images( $post = 0 ) {
-	$galleries = get_post_galleries( $post, false );
-	return wp_list_pluck( $galleries, 'src' );
+function get_post_galleries_images($post = 0) {
+	$galleries = get_post_galleries($post, false);
+	return wp_list_pluck($galleries, 'src');
 }
 
 /**
@@ -3385,9 +3385,9 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return array A list of a gallery's image srcs in order.
  */
-function get_post_gallery_images( $post = 0 ) {
-	$gallery = get_post_gallery( $post, false );
-	return empty( $gallery['src'] ) ? array() : $gallery['src'];
+function get_post_gallery_images($post = 0) {
+	$gallery = get_post_gallery($post, false);
+	return empty($gallery['src']) ? array() : $gallery['src'];
 }
 
 /**
@@ -3397,20 +3397,20 @@ 
  *
  * @param WP_Post $attachment Attachment object.
  */
-function wp_maybe_generate_attachment_metadata( $attachment ) {
-	if ( empty( $attachment ) || ( empty( $attachment->ID ) || ! $attachment_id = (int) $attachment->ID ) ) {
+function wp_maybe_generate_attachment_metadata($attachment) {
+	if (empty($attachment) || (empty($attachment->ID) || ! $attachment_id = (int) $attachment->ID)) {
 		return;
 	}
 
-	$file = get_attached_file( $attachment_id );
-	$meta = wp_get_attachment_metadata( $attachment_id );
-	if ( empty( $meta ) && file_exists( $file ) ) {
-		$_meta = get_post_meta( $attachment_id );
-		$regeneration_lock = 'wp_generating_att_' . $attachment_id;
-		if ( ! array_key_exists( '_wp_attachment_metadata', $_meta ) && ! get_transient( $regeneration_lock ) ) {
-			set_transient( $regeneration_lock, $file );
-			wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
-			delete_transient( $regeneration_lock );
+	$file = get_attached_file($attachment_id);
+	$meta = wp_get_attachment_metadata($attachment_id);
+	if (empty($meta) && file_exists($file)) {
+		$_meta = get_post_meta($attachment_id);
+		$regeneration_lock = 'wp_generating_att_'.$attachment_id;
+		if ( ! array_key_exists('_wp_attachment_metadata', $_meta) && ! get_transient($regeneration_lock)) {
+			set_transient($regeneration_lock, $file);
+			wp_update_attachment_metadata($attachment_id, wp_generate_attachment_metadata($attachment_id, $file));
+			delete_transient($regeneration_lock);
 		}
 	}
 }
@@ -3425,21 +3425,21 @@ 
  * @param string $url The URL to resolve.
  * @return int The found post ID, or 0 on failure.
  */
-function attachment_url_to_postid( $url ) {
+function attachment_url_to_postid($url) {
 	global $wpdb;
 
 	$dir = wp_upload_dir();
 	$path = $url;
 
-	if ( 0 === strpos( $path, $dir['baseurl'] . '/' ) ) {
-		$path = substr( $path, strlen( $dir['baseurl'] . '/' ) );
+	if (0 === strpos($path, $dir['baseurl'].'/')) {
+		$path = substr($path, strlen($dir['baseurl'].'/'));
 	}
 
 	$sql = $wpdb->prepare(
 		"SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attached_file' AND meta_value = %s",
 		$path
 	);
-	$post_id = $wpdb->get_var( $sql );
+	$post_id = $wpdb->get_var($sql);
 
 	/**
 	 * Filter an attachment id found by URL.
@@ -3449,7 +3449,7 @@ 
 	 * @param int|null $post_id The post_id (if any) found by the function.
 	 * @param string   $url     The URL being looked up.
 	 */
-	$post_id = apply_filters( 'attachment_url_to_postid', $post_id, $url );
+	$post_id = apply_filters('attachment_url_to_postid', $post_id, $url);
 
 	return (int) $post_id;
 }
@@ -3464,9 +3464,9 @@ 
  * @return array The relevant CSS file URLs.
  */
 function wpview_media_sandbox_styles() {
- 	$version = 'ver=' . $GLOBALS['wp_version'];
- 	$mediaelement = includes_url( "js/mediaelement/mediaelementplayer.min.css?$version" );
- 	$wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" );
+ 	$version = 'ver='.$GLOBALS['wp_version'];
+ 	$mediaelement = includes_url("js/mediaelement/mediaelementplayer.min.css?$version");
+ 	$wpmediaelement = includes_url("js/mediaelement/wp-mediaelement.css?$version");
 
-	return array( $mediaelement, $wpmediaelement );
+	return array($mediaelement, $wpmediaelement);
 }

Braces +164 added lines, -114 removed lines

@@ -40,14 +40,14 @@ 
 function image_constrain_size_for_editor( $width, $height, $size = 'medium', $context = null ) {
 	global $content_width, $_wp_additional_image_sizes;
 
-	if ( ! $context )
-		$context = is_admin() ? 'edit' : 'display';
+	if ( ! $context ) {
+			$context = is_admin() ? 'edit' : 'display';
+	}
 
 	if ( is_array($size) ) {
 		$max_width = $size[0];
 		$max_height = $size[1];
-	}
-	elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
+	} elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
 		$max_width = intval(get_option('thumbnail_size_w'));
 		$max_height = intval(get_option('thumbnail_size_h'));
 		// last chance thumbnail size defaults
@@ -55,13 +55,11 @@ 
 			$max_width = 128;
 			$max_height = 96;
 		}
-	}
-	elseif ( $size == 'medium' ) {
+	} elseif ( $size == 'medium' ) {
 		$max_width = intval(get_option('medium_size_w'));
 		$max_height = intval(get_option('medium_size_h'));
 		// if no width is set, default to the theme content width if available
-	}
-	elseif ( $size == 'large' ) {
+	} elseif ( $size == 'large' ) {
 		/*
 		 * We're inserting a large size image into the editor. If it's a really
 		 * big image we'll scale it down to fit reasonably within the editor
@@ -70,13 +68,16 @@ 
 		 */
 		$max_width = intval(get_option('large_size_w'));
 		$max_height = intval(get_option('large_size_h'));
-		if ( intval($content_width) > 0 )
-			$max_width = min( intval($content_width), $max_width );
+		if ( intval($content_width) > 0 ) {
+					$max_width = min( intval($content_width), $max_width );
+		}
 	} elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
 		$max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
 		$max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
-		if ( intval($content_width) > 0 && 'edit' == $context ) // Only in admin. Assume that theme authors know what they're doing.
+		if ( intval($content_width) > 0 && 'edit' == $context ) {
+			// Only in admin. Assume that theme authors know what they're doing.
 			$max_width = min( intval($content_width), $max_width );
+		}
 	}
 	// $size == 'full' has no constraint
 	else {
@@ -120,10 +121,12 @@ 
  */
 function image_hwstring( $width, $height ) {
 	$out = '';
-	if ($width)
-		$out .= 'width="'.intval($width).'" ';
-	if ($height)
-		$out .= 'height="'.intval($height).'" ';
+	if ($width) {
+			$out .= 'width="'.intval($width).'" ';
+	}
+	if ($height) {
+			$out .= 'height="'.intval($height).'" ';
+	}
 	return $out;
 }
 
@@ -152,8 +155,9 @@ 
  */
 function image_downsize( $id, $size = 'medium' ) {
 
-	if ( !wp_attachment_is_image($id) )
-		return false;
+	if ( !wp_attachment_is_image($id) ) {
+			return false;
+	}
 
 	/**
 	 * Filter whether to preempt the output of image_downsize().
@@ -183,8 +187,7 @@ 
 		$width = $intermediate['width'];
 		$height = $intermediate['height'];
 		$is_intermediate = true;
-	}
-	elseif ( $size == 'thumbnail' ) {
+	} elseif ( $size == 'thumbnail' ) {
 		// fall back to the old thumbnail
 		if ( ($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file) ) {
 			$img_url = str_replace($img_url_basename, wp_basename($thumb_file), $img_url);
@@ -368,8 +371,9 @@ 
  * @return array First item is the width, the second item is the height.
  */
 function wp_constrain_dimensions( $current_width, $current_height, $max_width = 0, $max_height = 0 ) {
-	if ( !$max_width && !$max_height )
-		return array( $current_width, $current_height );
+	if ( !$max_width && !$max_height ) {
+			return array( $current_width, $current_height );
+	}
 
 	$width_ratio = $height_ratio = 1.0;
 	$did_width = $did_height = false;
@@ -454,11 +458,13 @@ 
  */
 function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = false) {
 
-	if ($orig_w <= 0 || $orig_h <= 0)
-		return false;
+	if ($orig_w <= 0 || $orig_h <= 0) {
+			return false;
+	}
 	// at least one of dest_w or dest_h must be specific
-	if ($dest_w <= 0 && $dest_h <= 0)
-		return false;
+	if ($dest_w <= 0 && $dest_h <= 0) {
+			return false;
+	}
 
 	/**
 	 * Filter whether to preempt calculating the image resize dimensions.
@@ -477,8 +483,9 @@ 
 	 *                           An array can specify positioning of the crop area. Default false.
 	 */
 	$output = apply_filters( 'image_resize_dimensions', null, $orig_w, $orig_h, $dest_w, $dest_h, $crop );
-	if ( null !== $output )
-		return $output;
+	if ( null !== $output ) {
+			return $output;
+	}
 
 	if ( $crop ) {
 		// crop the largest possible portion of the original image that we can size to $dest_w x $dest_h
@@ -562,8 +569,9 @@ 
 	if ( $width || $height ) {
 		$editor = wp_get_image_editor( $file );
 
-		if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) )
-			return false;
+		if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) ) {
+					return false;
+		}
 
 		$resized_file = $editor->save();
 
@@ -602,8 +610,9 @@ 
  * @return false|array False on failure or array of file path, width, and height on success.
  */
 function image_get_intermediate_size( $post_id, $size = 'thumbnail' ) {
-	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) )
-		return false;
+	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) ) {
+			return false;
+	}
 
 	// get the best one for a specified set of dimensions
 	if ( is_array($size) && !empty($imagedata['sizes']) ) {
@@ -629,8 +638,9 @@ 
 					// First, we calculate what size the original image would be if constrained to a box the size of the current image in the loop
 					$maybe_cropped = image_resize_dimensions($imagedata['width'], $imagedata['height'], $data['width'], $data['height'], false );
 					// If the size doesn't match within one pixel, then it is of a different aspect ratio, so we skip it, unless it's the thumbnail size
-					if ( 'thumbnail' != $_size && ( !$maybe_cropped || ( $maybe_cropped[4] != $data['width'] && $maybe_cropped[4] + 1 != $data['width'] ) || ( $maybe_cropped[5] != $data['height'] && $maybe_cropped[5] + 1 != $data['height'] ) ) )
-						continue;
+					if ( 'thumbnail' != $_size && ( !$maybe_cropped || ( $maybe_cropped[4] != $data['width'] && $maybe_cropped[4] + 1 != $data['width'] ) || ( $maybe_cropped[5] != $data['height'] && $maybe_cropped[5] + 1 != $data['height'] ) ) ) {
+											continue;
+					}
 					// If we're still here, then we're going to use this size
 					$file = $data['file'];
 					list($width, $height) = image_constrain_size_for_editor( $data['width'], $data['height'], $size );
@@ -640,8 +650,9 @@ 
 		}
 	}
 
-	if ( is_array($size) || empty($size) || empty($imagedata['sizes'][$size]) )
-		return false;
+	if ( is_array($size) || empty($size) || empty($imagedata['sizes'][$size]) ) {
+			return false;
+	}
 
 	$data = $imagedata['sizes'][$size];
 	// include the full filesystem path of the intermediate file
@@ -665,8 +676,9 @@ 
 function get_intermediate_image_sizes() {
 	global $_wp_additional_image_sizes;
 	$image_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes
-	if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
-		$image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+	if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) ) {
+			$image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+	}
 
 	/**
 	 * Filter the list of intermediate image sizes.
@@ -757,10 +769,14 @@ 
 			'class'	=> "attachment-$size_class",
 			'alt'	=> trim(strip_tags( get_post_meta($attachment_id, '_wp_attachment_image_alt', true) )), // Use Alt field first
 		);
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_excerpt )); // If not, Use the Caption
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_title )); // Finally, use the title
+		if ( empty($default_attr['alt']) ) {
+					$default_attr['alt'] = trim(strip_tags( $attachment->post_excerpt ));
+		}
+		// If not, Use the Caption
+		if ( empty($default_attr['alt']) ) {
+					$default_attr['alt'] = trim(strip_tags( $attachment->post_title ));
+		}
+		// Finally, use the title
 
 		$attr = wp_parse_args($attr, $default_attr);
 
@@ -880,8 +896,9 @@ 
 	 * @param string $content The image element, possibly wrapped in a hyperlink.
 	 */
 	$output = apply_filters( 'img_caption_shortcode', '', $attr, $content );
-	if ( $output != '' )
-		return $output;
+	if ( $output != '' ) {
+			return $output;
+	}
 
 	$atts = shortcode_atts( array(
 		'id'	  => '',
@@ -892,11 +909,13 @@ 
 	), $attr, 'caption' );
 
 	$atts['width'] = (int) $atts['width'];
-	if ( $atts['width'] < 1 || empty( $atts['caption'] ) )
-		return $content;
+	if ( $atts['width'] < 1 || empty( $atts['caption'] ) ) {
+			return $content;
+	}
 
-	if ( ! empty( $atts['id'] ) )
-		$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
+	if ( ! empty( $atts['id'] ) ) {
+			$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
+	}
 
 	$class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
 
@@ -925,8 +944,9 @@ 
 	$caption_width = apply_filters( 'img_caption_shortcode_width', $caption_width, $atts, $content );
 
 	$style = '';
-	if ( $caption_width )
-		$style = 'style="width: ' . (int) $caption_width . 'px" ';
+	if ( $caption_width ) {
+			$style = 'style="width: ' . (int) $caption_width . 'px" ';
+	}
 
 	return '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
 	. do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>';
@@ -1439,8 +1459,10 @@ 
 		echo (int) $theme_width;
 	?>"<?php if ( 'video' === $safe_type ):
 		echo ' height="', (int) $theme_height, '"';
-	else:
+	else {
+		:
 		echo ' style="visibility: hidden"';
+	}
 	endif; ?>></<?php echo $safe_type ?>>
 	<div class="wp-playlist-next"></div>
 	<div class="wp-playlist-prev"></div>
@@ -2058,27 +2080,31 @@ 
 	} elseif ( is_array( $attachment ) ) {
 		$attachment = (object) $attachment;
 	}
-	if ( ! is_object($attachment) )
-		return array();
+	if ( ! is_object($attachment) ) {
+			return array();
+	}
 
 	$filename = basename($attachment->guid);
 
 	$objects = array('attachment');
 
-	if ( false !== strpos($filename, '.') )
-		$objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
+	if ( false !== strpos($filename, '.') ) {
+			$objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
+	}
 	if ( !empty($attachment->post_mime_type) ) {
 		$objects[] = 'attachment:' . $attachment->post_mime_type;
-		if ( false !== strpos($attachment->post_mime_type, '/') )
-			foreach ( explode('/', $attachment->post_mime_type) as $token )
+		if ( false !== strpos($attachment->post_mime_type, '/') ) {
+					foreach ( explode('/', $attachment->post_mime_type) as $token )
 				if ( !empty($token) )
 					$objects[] = "attachment:$token";
+		}
 	}
 
 	$taxonomies = array();
-	foreach ( $objects as $object )
-		if ( $taxes = get_object_taxonomies($object) )
+	foreach ( $objects as $object ) {
+			if ( $taxes = get_object_taxonomies($object) )
 			$taxonomies = array_merge($taxonomies, $taxes);
+	}
 
 	return array_unique($taxonomies);
 }
@@ -2101,10 +2127,11 @@ 
 	foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy ) {
 		foreach ( $taxonomy->object_type as $object_type ) {
 			if ( 'attachment' == $object_type || 0 === strpos( $object_type, 'attachment:' ) ) {
-				if ( 'names' == $output )
-					$taxonomies[] = $taxonomy->name;
-				else
-					$taxonomies[ $taxonomy->name ] = $taxonomy;
+				if ( 'names' == $output ) {
+									$taxonomies[] = $taxonomy->name;
+				} else {
+									$taxonomies[ $taxonomy->name ] = $taxonomy;
+				}
 				break;
 			}
 		}
@@ -2187,11 +2214,13 @@ 
  * @return array Default embed parameters.
  */
 function wp_embed_defaults( $url = '' ) {
-	if ( ! empty( $GLOBALS['content_width'] ) )
-		$width = (int) $GLOBALS['content_width'];
+	if ( ! empty( $GLOBALS['content_width'] ) ) {
+			$width = (int) $GLOBALS['content_width'];
+	}
 
-	if ( empty( $width ) )
-		$width = 500;
+	if ( empty( $width ) ) {
+			$width = 500;
+	}
 
 	$height = min( ceil( $width * 1.5 ), 1000 );
 
@@ -2486,12 +2515,13 @@ 
 function wp_convert_hr_to_bytes( $size ) {
 	$size  = strtolower( $size );
 	$bytes = (int) $size;
-	if ( strpos( $size, 'k' ) !== false )
-		$bytes = intval( $size ) * 1024;
-	elseif ( strpos( $size, 'm' ) !== false )
-		$bytes = intval($size) * 1024 * 1024;
-	elseif ( strpos( $size, 'g' ) !== false )
-		$bytes = intval( $size ) * 1024 * 1024 * 1024;
+	if ( strpos( $size, 'k' ) !== false ) {
+			$bytes = intval( $size ) * 1024;
+	} elseif ( strpos( $size, 'm' ) !== false ) {
+			$bytes = intval($size) * 1024 * 1024;
+	} elseif ( strpos( $size, 'g' ) !== false ) {
+			$bytes = intval( $size ) * 1024 * 1024 * 1024;
+	}
 	return $bytes;
 }
 
@@ -2537,8 +2567,9 @@ 
 
 		// If $file_info['type'] is false, then we let the editor attempt to
 		// figure out the file type, rather than forcing a failure based on extension.
-		if ( isset( $file_info ) && $file_info['type'] )
-			$args['mime_type'] = $file_info['type'];
+		if ( isset( $file_info ) && $file_info['type'] ) {
+					$args['mime_type'] = $file_info['type'];
+		}
 	}
 
 	$implementation = _wp_image_editor_choose( $args );
@@ -2547,8 +2578,9 @@ 
 		$editor = new $implementation( $path );
 		$loaded = $editor->load();
 
-		if ( is_wp_error( $loaded ) )
-			return $loaded;
+		if ( is_wp_error( $loaded ) ) {
+					return $loaded;
+		}
 
 		return $editor;
 	}
@@ -2595,8 +2627,9 @@ 
 	$implementations = apply_filters( 'wp_image_editors', array( 'WP_Image_Editor_Imagick', 'WP_Image_Editor_GD' ) );
 
 	foreach ( $implementations as $implementation ) {
-		if ( ! call_user_func( array( $implementation, 'test' ), $args ) )
-			continue;
+		if ( ! call_user_func( array( $implementation, 'test' ), $args ) ) {
+					continue;
+		}
 
 		if ( isset( $args['mime_type'] ) &&
 			! call_user_func(
@@ -2625,8 +2658,9 @@ 
 	$wp_scripts = wp_scripts();
 
 	$data = $wp_scripts->get_data( 'wp-plupload', 'data' );
-	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) )
-		return;
+	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) ) {
+			return;
+	}
 
 	$max_upload_size = wp_max_upload_size();
 
@@ -2684,8 +2718,9 @@ 
 
 	$script = 'var _wpPluploadSettings = ' . wp_json_encode( $settings ) . ';';
 
-	if ( $data )
-		$script = "$data\n$script";
+	if ( $data ) {
+			$script = "$data\n$script";
+	}
 
 	$wp_scripts->add_data( 'wp-plupload', 'data', $script );
 }
@@ -2700,17 +2735,20 @@ 
  * @return array|void Array of attachment details.
  */
 function wp_prepare_attachment_for_js( $attachment ) {
-	if ( ! $attachment = get_post( $attachment ) )
-		return;
+	if ( ! $attachment = get_post( $attachment ) ) {
+			return;
+	}
 
-	if ( 'attachment' != $attachment->post_type )
-		return;
+	if ( 'attachment' != $attachment->post_type ) {
+			return;
+	}
 
 	$meta = wp_get_attachment_metadata( $attachment->ID );
-	if ( false !== strpos( $attachment->post_mime_type, '/' ) )
-		list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
-	else
-		list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+	if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
+			list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+	} else {
+			list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+	}
 
 	$attachment_url = wp_get_attachment_url( $attachment->ID );
 
@@ -2774,8 +2812,9 @@ 
 		$response['editLink'] = get_edit_post_link( $attachment->ID, 'raw' );
 	}
 
-	if ( current_user_can( 'delete_post', $attachment->ID ) )
-		$response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
+	if ( current_user_can( 'delete_post', $attachment->ID ) ) {
+			$response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
+	}
 
 	if ( $meta && 'image' === $type ) {
 		$sizes = array();
@@ -2797,8 +2836,9 @@ 
 
 			/** This filter is documented in wp-includes/media.php */
 			if ( $downsize = apply_filters( 'image_downsize', false, $attachment->ID, $size ) ) {
-				if ( ! $downsize[3] )
-					continue;
+				if ( ! $downsize[3] ) {
+									continue;
+				}
 				$sizes[ $size ] = array(
 					'height'      => $downsize[2],
 					'width'       => $downsize[1],
@@ -2806,8 +2846,9 @@ 
 					'orientation' => $downsize[2] > $downsize[1] ? 'portrait' : 'landscape',
 				);
 			} elseif ( isset( $meta['sizes'][ $size ] ) ) {
-				if ( ! isset( $base_url ) )
-					$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
+				if ( ! isset( $base_url ) ) {
+									$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
+				}
 
 				// Nothing from the filter, so consult image metadata if we have it.
 				$size_meta = $meta['sizes'][ $size ];
@@ -2835,15 +2876,18 @@ 
 
 		$response = array_merge( $response, array( 'sizes' => $sizes ), $sizes['full'] );
 	} elseif ( $meta && 'video' === $type ) {
-		if ( isset( $meta['width'] ) )
-			$response['width'] = (int) $meta['width'];
-		if ( isset( $meta['height'] ) )
-			$response['height'] = (int) $meta['height'];
+		if ( isset( $meta['width'] ) ) {
+					$response['width'] = (int) $meta['width'];
+		}
+		if ( isset( $meta['height'] ) ) {
+					$response['height'] = (int) $meta['height'];
+		}
 	}
 
 	if ( $meta && ( 'audio' === $type || 'video' === $type ) ) {
-		if ( isset( $meta['length_formatted'] ) )
-			$response['fileLength'] = $meta['length_formatted'];
+		if ( isset( $meta['length_formatted'] ) ) {
+					$response['fileLength'] = $meta['length_formatted'];
+		}
 
 		$response['meta'] = array();
 		foreach ( wp_get_attachment_id3_keys( $attachment, 'js' ) as $key => $label ) {
@@ -2869,8 +2913,9 @@ 
 		}
 	}
 
-	if ( function_exists('get_compat_media_markup') )
-		$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
+	if ( function_exists('get_compat_media_markup') ) {
+			$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
+	}
 
 	/**
 	 * Filter the attachment data prepared for JavaScript.
@@ -2902,8 +2947,9 @@ 
  */
 function wp_enqueue_media( $args = array() ) {
 	// Enqueue me just once per page, please.
-	if ( did_action( 'wp_enqueue_media' ) )
-		return;
+	if ( did_action( 'wp_enqueue_media' ) ) {
+			return;
+	}
 
 	global $content_width, $wpdb, $wp_locale;
 
@@ -3204,8 +3250,9 @@ 
  * @return array Found attachments.
  */
 function get_attached_media( $type, $post = 0 ) {
-	if ( ! $post = get_post( $post ) )
-		return array();
+	if ( ! $post = get_post( $post ) ) {
+			return array();
+	}
 
 	$args = array(
 		'post_parent' => $post->ID,
@@ -3293,11 +3340,13 @@ 
  *               from the expanded shortcode.
  */
 function get_post_galleries( $post, $html = true ) {
-	if ( ! $post = get_post( $post ) )
-		return array();
+	if ( ! $post = get_post( $post ) ) {
+			return array();
+	}
 
-	if ( ! has_shortcode( $post->post_content, 'gallery' ) )
-		return array();
+	if ( ! has_shortcode( $post->post_content, 'gallery' ) ) {
+			return array();
+	}
 
 	$galleries = array();
 	if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $post->post_content, $matches, PREG_SET_ORDER ) ) {
@@ -3311,8 +3360,9 @@ 
 				} else {
 					preg_match_all( '#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER );
 					if ( ! empty( $src ) ) {
-						foreach ( $src as $s )
-							$srcs[] = $s[2];
+						foreach ( $src as $s ) {
+													$srcs[] = $s[2];
+						}
 					}
 
 					$data = shortcode_parse_atts( $shortcode[3] );