ntwb / wordpress

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/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.

Braces +131 added lines, -90 removed lines

@@ -27,19 +27,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] );
+	}
 		}
 }
 
@@ -74,15 +77,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
@@ -93,18 +98,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
@@ -173,15 +181,17 @@ 
  * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
  */
 function wp_maintenance() {
-	if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() )
-		return;
+	if ( ! file_exists( ABSPATH . '.maintenance' ) || 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;
+	}
 
 	/**
 	 * Filters whether to enable maintenance mode.
@@ -213,7 +223,10 @@ 
 	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>
@@ -264,8 +277,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;
 }
 
@@ -320,10 +334,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 );
@@ -394,8 +409,9 @@ 
 	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;
@@ -418,8 +434,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',
@@ -457,8 +474,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;
 }
 
@@ -563,13 +581,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 );
@@ -601,8 +622,9 @@ 
 		array_unshift( $plugins, ABSPATH . 'my-hacks.php' );
 	}
 
-	if ( empty( $active_plugins ) || wp_installing() )
-		return $plugins;
+	if ( empty( $active_plugins ) || wp_installing() ) {
+			return $plugins;
+	}
 
 	$network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
 
@@ -612,8 +634,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;
 }
@@ -630,8 +653,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' );
+		}
 	}
 }
 
@@ -706,10 +730,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;
 }
@@ -729,10 +754,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;
 }
@@ -752,10 +778,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;
 }
@@ -776,10 +803,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;
 }
@@ -792,11 +820,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;
 }
@@ -857,12 +887,14 @@ 
 	global $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';
@@ -880,31 +912,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 );
 
@@ -912,8 +952,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;
 				}
 			}

Spacing +213 added lines, -213 removed lines

@@ -14,7 +14,7 @@ 
  */
 function wp_get_server_protocol() {
 	$protocol = $_SERVER['SERVER_PROTOCOL'];
-	if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
+	if ( ! in_array($protocol, array('HTTP/1.1', 'HTTP/2', 'HTTP/2.0'))) {
 		$protocol = 'HTTP/1.0';
 	}
 	return $protocol;
@@ -27,19 +27,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]);
 		}
 }
 
@@ -60,50 +60,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"]);
 }
 
 /**
@@ -122,23 +122,23 @@ 
 	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();
 
 		$protocol = wp_get_server_protocol();
-		header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
-		header( 'Content-Type: text/html; charset=utf-8' );
+		header(sprintf('%s 500 Internal Server Error', $protocol), true, 500);
+		header('Content-Type: text/html; charset=utf-8');
 		/* translators: 1: Current PHP version number, 2: WordPress version number, 3: Minimum required PHP version number */
-		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 ) );
+		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' ) && ! extension_loaded( 'mysqlnd' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
+	if ( ! extension_loaded('mysql') && ! extension_loaded('mysqli') && ! extension_loaded('mysqlnd') && ! file_exists(WP_CONTENT_DIR.'/db.php')) {
 		wp_load_translations_early();
 
 		$protocol = wp_get_server_protocol();
-		header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
-		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(sprintf('%s 500 Internal Server Error', $protocol), true, 500);
+		header('Content-Type: text/html; charset=utf-8');
+		die(__('Your PHP installation appears to be missing the MySQL extension which is required by WordPress.'));
 	}
 }
 
@@ -150,7 +150,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');
 		exit;
 	}
@@ -173,14 +173,14 @@ 
  * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
  */
 function wp_maintenance() {
-	if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() )
+	if ( ! file_exists(ABSPATH.'.maintenance') || 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;
 
 	/**
@@ -196,31 +196,31 @@ 
 	 * @param bool $enable_checks Whether to enable maintenance mode. Default true.
 	 * @param int  $upgrading     The timestamp set in the .maintenance file.
 	 */
-	if ( ! apply_filters( 'enable_maintenance_mode', true, $upgrading ) ) {
+	if ( ! apply_filters('enable_maintenance_mode', true, $upgrading)) {
 		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 = wp_get_server_protocol();
-	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
@@ -240,7 +240,7 @@ 
  */
 function timer_start() {
 	global $timestart;
-	$timestart = microtime( true );
+	$timestart = microtime(true);
 	return true;
 }
 
@@ -259,12 +259,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;
 }
@@ -313,28 +313,28 @@ 
 	 *
 	 * @param bool $enable_debug_mode Whether to enable debug mode checks to occur. Default true.
 	 */
-	if ( ! apply_filters( 'enable_wp_debug_mode_checks', true ) ){
+	if ( ! apply_filters('enable_wp_debug_mode_checks', true)) {
 		return;
 	}
 
-	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' ) || defined( 'REST_REQUEST' ) || ( defined( 'WP_INSTALLING' ) && WP_INSTALLING ) || wp_doing_ajax() ) {
-		@ini_set( 'display_errors', 0 );
+	if (defined('XMLRPC_REQUEST') || defined('REST_REQUEST') || (defined('WP_INSTALLING') && WP_INSTALLING) || wp_doing_ajax()) {
+		@ini_set('display_errors', 0);
 	}
 }
 
@@ -352,8 +352,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.
 			 *
@@ -361,10 +361,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 backward compatibility - won't work in some cases.
-				define( 'LANGDIR', 'wp-content/languages' );
+				define('LANGDIR', 'wp-content/languages');
 			}
 		} else {
 			/**
@@ -374,10 +374,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 backward compatibility.
-				define( 'LANGDIR', WPINC . '/languages' );
+				define('LANGDIR', WPINC.'/languages');
 			}
 		}
 	}
@@ -393,15 +393,15 @@ 
 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);
 }
 
 /**
@@ -418,24 +418,24 @@ 
  */
 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(
 			/* translators: 1: $table_prefix 2: wp-config.php */
-			sprintf( __( '<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),
+			sprintf(__('<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.'),
 				'<code>$table_prefix</code>',
 				'<code>wp-config.php</code>'
 			)
@@ -454,10 +454,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;
 }
@@ -475,32 +475,32 @@ 
 	global $wp_filter;
 
 	$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);
 			}
 
 			// Re-initialize any hooks added manually by object-cache.php
-			if ( $wp_filter ) {
-				$wp_filter = WP_Hook::build_preinitialized_hooks( $wp_filter );
+			if ($wp_filter) {
+				$wp_filter = WP_Hook::build_preinitialized_hooks($wp_filter);
 			}
 		}
 
 		$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');
 	}
 
 	/*
@@ -508,15 +508,15 @@ 
 	 * 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( get_current_blog_id() );
-	} elseif ( function_exists( 'wp_cache_init' ) ) {
+	if ( ! $first_init && function_exists('wp_cache_switch_to_blog')) {
+		wp_cache_switch_to_blog(get_current_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', 'blog-lookup', 'blog-details', 'site-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
-		wp_cache_add_non_persistent_groups( array( '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', 'blog-lookup', 'blog-details', 'site-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites'));
+		wp_cache_add_non_persistent_groups(array('counts', 'plugins'));
 	}
 }
 
@@ -529,22 +529,22 @@ 
  * @access private
  */
 function wp_not_installed() {
-	if ( is_multisite() ) {
-		if ( ! is_blog_installed() && ! wp_installing() ) {
+	if (is_multisite()) {
+		if ( ! is_blog_installed() && ! 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() && ! wp_installing() ) {
+	} elseif ( ! is_blog_installed() && ! 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();
 	}
 }
@@ -563,16 +563,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;
 }
@@ -593,27 +593,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.0' );
-		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.0');
+		array_unshift($plugins, ABSPATH.'my-hacks.php');
 	}
 
-	if ( empty( $active_plugins ) || wp_installing() )
+	if (empty($active_plugins) || 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;
 }
@@ -628,10 +628,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');
 	}
 }
 
@@ -646,20 +646,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);
 }
 
 /**
@@ -674,7 +674,7 @@ 
 	 *
 	 * @since 1.2.0
 	 */
-	do_action( 'shutdown' );
+	do_action('shutdown');
 
 	wp_cache_close();
 }
@@ -688,9 +688,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);
 }
 
 /**
@@ -706,9 +706,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;
@@ -729,9 +729,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;
@@ -752,9 +752,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;
@@ -776,9 +776,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;
@@ -792,10 +792,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;
@@ -823,17 +823,17 @@ 
  * @return int The ID of the current network.
  */
 function get_current_network_id() {
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		return 1;
 	}
 
 	$current_network = get_network();
 
-	if ( ! isset( $current_network->id ) ) {
+	if ( ! isset($current_network->id)) {
 		return get_main_network_id();
 	}
 
-	return absint( $current_network->id );
+	return absint($current_network->id);
 }
 
 /**
@@ -857,63 +857,63 @@ 
 	global $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 . '/class-wp-locale.php';
-	require_once ABSPATH . WPINC . '/class-wp-locale-switcher.php';
+	require_once ABSPATH.WPINC.'/pomo/mo.php';
+	require_once ABSPATH.WPINC.'/l10n.php';
+	require_once ABSPATH.WPINC.'/class-wp-locale.php';
+	require_once ABSPATH.WPINC.'/class-wp-locale-switcher.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;
 				}
 			}
@@ -939,15 +939,15 @@ 
  * @return bool True if WP is installing, otherwise false. When a `$is_installing` is passed, the function will
  *              report whether WP was in installing mode prior to the change to `$is_installing`.
  */
-function wp_installing( $is_installing = null ) {
+function wp_installing($is_installing = null) {
 	static $installing = null;
 
 	// Support for the `WP_INSTALLING` constant, defined before WP is loaded.
-	if ( is_null( $installing ) ) {
-		$installing = defined( 'WP_INSTALLING' ) && WP_INSTALLING;
+	if (is_null($installing)) {
+		$installing = defined('WP_INSTALLING') && WP_INSTALLING;
 	}
 
-	if ( ! is_null( $is_installing ) ) {
+	if ( ! is_null($is_installing)) {
 		$old_installing = $installing;
 		$installing = $is_installing;
 		return (bool) $old_installing;
@@ -965,15 +965,15 @@ 
  * @return bool True if SSL, otherwise false.
  */
 function is_ssl() {
-	if ( isset( $_SERVER['HTTPS'] ) ) {
-		if ( 'on' == strtolower( $_SERVER['HTTPS'] ) ) {
+	if (isset($_SERVER['HTTPS'])) {
+		if ('on' == strtolower($_SERVER['HTTPS'])) {
 			return true;
 		}
 
-		if ( '1' == $_SERVER['HTTPS'] ) {
+		if ('1' == $_SERVER['HTTPS']) {
 			return true;
 		}
-	} elseif ( isset($_SERVER['SERVER_PORT'] ) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+	} elseif (isset($_SERVER['SERVER_PORT']) && ('443' == $_SERVER['SERVER_PORT'])) {
 		return true;
 	}
 	return false;
@@ -991,20 +991,20 @@ 
  * @param string $value A (PHP ini) byte value, either shorthand or ordinary.
  * @return int An integer byte value.
  */
-function wp_convert_hr_to_bytes( $value ) {
-	$value = strtolower( trim( $value ) );
+function wp_convert_hr_to_bytes($value) {
+	$value = strtolower(trim($value));
 	$bytes = (int) $value;
 
-	if ( false !== strpos( $value, 'g' ) ) {
+	if (false !== strpos($value, 'g')) {
 		$bytes *= GB_IN_BYTES;
-	} elseif ( false !== strpos( $value, 'm' ) ) {
+	} elseif (false !== strpos($value, 'm')) {
 		$bytes *= MB_IN_BYTES;
-	} elseif ( false !== strpos( $value, 'k' ) ) {
+	} elseif (false !== strpos($value, 'k')) {
 		$bytes *= KB_IN_BYTES;
 	}
 
 	// Deal with large (float) values which run into the maximum integer size.
-	return min( $bytes, PHP_INT_MAX );
+	return min($bytes, PHP_INT_MAX);
 }
 
 /**
@@ -1017,24 +1017,24 @@ 
  * @param string $setting The name of the ini setting to check.
  * @return bool True if the value is changeable at runtime. False otherwise.
  */
-function wp_is_ini_value_changeable( $setting ) {
+function wp_is_ini_value_changeable($setting) {
 	static $ini_all;
 
-	if ( ! isset( $ini_all ) ) {
+	if ( ! isset($ini_all)) {
 		$ini_all = false;
 		// Sometimes `ini_get_all()` is disabled via the `disable_functions` option for "security purposes".
-		if ( function_exists( 'ini_get_all' ) ) {
+		if (function_exists('ini_get_all')) {
 			$ini_all = ini_get_all();
 		}
  	}
 
 	// Bit operator to workaround https://bugs.php.net/bug.php?id=44936 which changes access level to 63 in PHP 5.2.6 - 5.2.17.
-	if ( isset( $ini_all[ $setting ]['access'] ) && ( INI_ALL === ( $ini_all[ $setting ]['access'] & 7 ) || INI_USER === ( $ini_all[ $setting ]['access'] & 7 ) ) ) {
+	if (isset($ini_all[$setting]['access']) && (INI_ALL === ($ini_all[$setting]['access'] & 7) || INI_USER === ($ini_all[$setting]['access'] & 7))) {
 		return true;
 	}
 
 	// If we were unable to retrieve the details, fail gracefully to assume it's changeable.
-	if ( ! is_array( $ini_all ) ) {
+	if ( ! is_array($ini_all)) {
 		return true;
 	}
 
@@ -1056,7 +1056,7 @@ 
 	 *
 	 * @param bool $wp_doing_ajax Whether the current request is a WordPress Ajax request.
 	 */
-	return apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX );
+	return apply_filters('wp_doing_ajax', defined('DOING_AJAX') && DOING_AJAX);
 }
 
 /**
@@ -1074,7 +1074,7 @@ 
 	 *
 	 * @param bool $wp_doing_cron Whether the current request is a WordPress cron request.
 	 */
-	return apply_filters( 'wp_doing_cron', defined( 'DOING_CRON' ) && DOING_CRON );
+	return apply_filters('wp_doing_cron', defined('DOING_CRON') && DOING_CRON);
 }
 
 /**
@@ -1087,8 +1087,8 @@ 
  * @param mixed $thing Check if unknown variable is a WP_Error object.
  * @return bool True, if WP_Error. False, if not WP_Error.
  */
-function is_wp_error( $thing ) {
-	return ( $thing instanceof WP_Error );
+function is_wp_error($thing) {
+	return ($thing instanceof WP_Error);
 }
 
 /**
@@ -1099,7 +1099,7 @@ 
  * @param string $context The usage context.
  * @return bool True if file modification is allowed, false otherwise.
  */
-function wp_is_file_mod_allowed( $context ) {
+function wp_is_file_mod_allowed($context) {
 	/**
 	 * Filters whether file modifications are allowed.
 	 *
@@ -1108,5 +1108,5 @@ 
 	 * @param bool   $file_mod_allowed Whether file modifications are allowed.
 	 * @param string $context          The usage context.
 	 */
-	return apply_filters( 'file_mod_allowed', ! defined( 'DISALLOW_FILE_MODS' ) || ! DISALLOW_FILE_MODS, $context );
+	return apply_filters('file_mod_allowed', ! defined('DISALLOW_FILE_MODS') || ! DISALLOW_FILE_MODS, $context);
 }

src/wp-includes/pomo/mo.php

Doc Comments +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
 	/**
 	 * @param resource $fh
-	 * @return true
+	 * @return boolean
 	 */
 	function export_to_file_handle($fh) {
 		$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );

Spacing +42 added lines, -42 removed lines

@@ -7,10 +7,10 @@ 
  * @subpackage mo
  */
 
-require_once dirname(__FILE__) . '/translations.php';
-require_once dirname(__FILE__) . '/streams.php';
+require_once dirname(__FILE__).'/translations.php';
+require_once dirname(__FILE__).'/streams.php';
 
-if ( ! class_exists( 'MO', false ) ):
+if ( ! class_exists('MO', false)):
 class MO extends Gettext_Translations {
 
 	var $_nplurals = 2;
@@ -37,15 +37,15 @@ 
 	 * @param string $filename MO file to load
 	 */
 	function import_from_file($filename) {
-		$reader = new POMO_FileReader( $filename );
+		$reader = new POMO_FileReader($filename);
 
-		if ( ! $reader->is_resource() ) {
+		if ( ! $reader->is_resource()) {
 			return false;
 		}
 
 		$this->filename = (string) $filename;
 
-		return $this->import_from_reader( $reader );
+		return $this->import_from_reader($reader);
 	}
 
 	/**
@@ -54,8 +54,8 @@ 
 	 */
 	function export_to_file($filename) {
 		$fh = fopen($filename, 'wb');
-		if ( !$fh ) return false;
-		$res = $this->export_to_file_handle( $fh );
+		if ( ! $fh) return false;
+		$res = $this->export_to_file_handle($fh);
 		fclose($fh);
 		return $res;
 	}
@@ -65,22 +65,22 @@ 
 	 */
 	function export() {
 		$tmp_fh = fopen("php://temp", 'r+');
-		if ( !$tmp_fh ) return false;
-		$this->export_to_file_handle( $tmp_fh );
-		rewind( $tmp_fh );
-		return stream_get_contents( $tmp_fh );
+		if ( ! $tmp_fh) return false;
+		$this->export_to_file_handle($tmp_fh);
+		rewind($tmp_fh);
+		return stream_get_contents($tmp_fh);
 	}
 
 	/**
 	 * @param Translation_Entry $entry
 	 * @return bool
 	 */
-	function is_entry_good_for_export( $entry ) {
-		if ( empty( $entry->translations ) ) {
+	function is_entry_good_for_export($entry) {
+		if (empty($entry->translations)) {
 			return false;
 		}
 
-		if ( !array_filter( $entry->translations ) ) {
+		if ( ! array_filter($entry->translations)) {
 			return false;
 		}
 
@@ -92,7 +92,7 @@ 
 	 * @return true
 	 */
 	function export_to_file_handle($fh) {
-		$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );
+		$entries = array_filter($this->entries, array($this, 'is_entry_good_for_export'));
 		ksort($entries);
 		$magic = 0x950412de;
 		$revision = 0;
@@ -113,8 +113,8 @@ 
 
 		$reader = new POMO_Reader();
 
-		foreach($entries as $entry) {
-			$originals_table .= $this->export_original($entry) . chr(0);
+		foreach ($entries as $entry) {
+			$originals_table .= $this->export_original($entry).chr(0);
 			$length = $reader->strlen($this->export_original($entry));
 			fwrite($fh, pack('VV', $length, $current_addr));
 			$current_addr += $length + 1; // account for the NULL byte after
@@ -123,10 +123,10 @@ 
 		$exported_headers = $this->export_headers();
 		fwrite($fh, pack('VV', $reader->strlen($exported_headers), $current_addr));
 		$current_addr += strlen($exported_headers) + 1;
-		$translations_table = $exported_headers . chr(0);
+		$translations_table = $exported_headers.chr(0);
 
-		foreach($entries as $entry) {
-			$translations_table .= $this->export_translations($entry) . chr(0);
+		foreach ($entries as $entry) {
+			$translations_table .= $this->export_translations($entry).chr(0);
 			$length = $reader->strlen($this->export_translations($entry));
 			fwrite($fh, pack('VV', $length, $current_addr));
 			$current_addr += $length + 1;
@@ -145,7 +145,7 @@ 
 		//TODO: warnings for control characters
 		$exported = $entry->singular;
 		if ($entry->is_plural) $exported .= chr(0).$entry->plural;
-		if ($entry->context) $exported = $entry->context . chr(4) . $exported;
+		if ($entry->context) $exported = $entry->context.chr(4).$exported;
 		return $exported;
 	}
 
@@ -163,8 +163,8 @@ 
 	 */
 	function export_headers() {
 		$exported = '';
-		foreach($this->headers as $header => $value) {
-			$exported.= "$header: $value\n";
+		foreach ($this->headers as $header => $value) {
+			$exported .= "$header: $value\n";
 		}
 		return $exported;
 	}
@@ -177,10 +177,10 @@ 
 		// The magic is 0x950412de
 
 		// bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
-		$magic_little = (int) - 1794895138;
+		$magic_little = (int) -1794895138;
 		$magic_little_64 = (int) 2500072158;
 		// 0xde120495
-		$magic_big = ((int) - 569244523) & 0xFFFFFFFF;
+		$magic_big = ((int) -569244523) & 0xFFFFFFFF;
 		if ($magic_little == $magic || $magic_little_64 == $magic) {
 			return 'little';
 		} else if ($magic_big == $magic) {
@@ -200,7 +200,7 @@ 
 		}
 		$reader->setEndian($endian_string);
 
-		$endian = ('big' == $endian_string)? 'N' : 'V';
+		$endian = ('big' == $endian_string) ? 'N' : 'V';
 
 		$header = $reader->read(24);
 		if ($reader->strlen($header) != 24)
@@ -208,42 +208,42 @@ 
 
 		// parse header
 		$header = unpack("{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header);
-		if (!is_array($header))
+		if ( ! is_array($header))
 			return false;
 
 		// support revision 0 of MO format specs, only
-		if ( $header['revision'] != 0 ) {
+		if ($header['revision'] != 0) {
 			return false;
 		}
 
 		// seek to data blocks
-		$reader->seekto( $header['originals_lenghts_addr'] );
+		$reader->seekto($header['originals_lenghts_addr']);
 
 		// read originals' indices
 		$originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
-		if ( $originals_lengths_length != $header['total'] * 8 ) {
+		if ($originals_lengths_length != $header['total'] * 8) {
 			return false;
 		}
 
 		$originals = $reader->read($originals_lengths_length);
-		if ( $reader->strlen( $originals ) != $originals_lengths_length ) {
+		if ($reader->strlen($originals) != $originals_lengths_length) {
 			return false;
 		}
 
 		// read translations' indices
 		$translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
-		if ( $translations_lenghts_length != $header['total'] * 8 ) {
+		if ($translations_lenghts_length != $header['total'] * 8) {
 			return false;
 		}
 
 		$translations = $reader->read($translations_lenghts_length);
-		if ( $reader->strlen( $translations ) != $translations_lenghts_length ) {
+		if ($reader->strlen($translations) != $translations_lenghts_length) {
 			return false;
 		}
 
 		// transform raw data into set of indices
-		$originals    = $reader->str_split( $originals, 8 );
-		$translations = $reader->str_split( $translations, 8 );
+		$originals    = $reader->str_split($originals, 8);
+		$translations = $reader->str_split($translations, 8);
 
 		// skip hash table
 		$strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;
@@ -253,17 +253,17 @@ 
 		$strings = $reader->read_all();
 		$reader->close();
 
-		for ( $i = 0; $i < $header['total']; $i++ ) {
-			$o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
-			$t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );
-			if ( !$o || !$t ) return false;
+		for ($i = 0; $i < $header['total']; $i++) {
+			$o = unpack("{$endian}length/{$endian}pos", $originals[$i]);
+			$t = unpack("{$endian}length/{$endian}pos", $translations[$i]);
+			if ( ! $o || ! $t) return false;
 
 			// adjust offset due to reading strings to separate space before
 			$o['pos'] -= $strings_addr;
 			$t['pos'] -= $strings_addr;
 
-			$original    = $reader->substr( $strings, $o['pos'], $o['length'] );
-			$translation = $reader->substr( $strings, $t['pos'], $t['length'] );
+			$original    = $reader->substr($strings, $o['pos'], $o['length']);
+			$translation = $reader->substr($strings, $t['pos'], $t['length']);
 
 			if ('' === $original) {
 				$this->set_headers($this->make_headers($translation));

Braces +21 added lines, -9 removed lines

@@ -54,7 +54,9 @@ 
 	 */
 	function export_to_file($filename) {
 		$fh = fopen($filename, 'wb');
-		if ( !$fh ) return false;
+		if ( !$fh ) {
+			return false;
+		}
 		$res = $this->export_to_file_handle( $fh );
 		fclose($fh);
 		return $res;
@@ -65,7 +67,9 @@ 
 	 */
 	function export() {
 		$tmp_fh = fopen("php://temp", 'r+');
-		if ( !$tmp_fh ) return false;
+		if ( !$tmp_fh ) {
+			return false;
+		}
 		$this->export_to_file_handle( $tmp_fh );
 		rewind( $tmp_fh );
 		return stream_get_contents( $tmp_fh );
@@ -144,8 +148,12 @@ 
 	function export_original($entry) {
 		//TODO: warnings for control characters
 		$exported = $entry->singular;
-		if ($entry->is_plural) $exported .= chr(0).$entry->plural;
-		if ($entry->context) $exported = $entry->context . chr(4) . $exported;
+		if ($entry->is_plural) {
+			$exported .= chr(0).$entry->plural;
+		}
+		if ($entry->context) {
+			$exported = $entry->context . chr(4) . $exported;
+		}
 		return $exported;
 	}
 
@@ -203,13 +211,15 @@ 
 		$endian = ('big' == $endian_string)? 'N' : 'V';
 
 		$header = $reader->read(24);
-		if ($reader->strlen($header) != 24)
-			return false;
+		if ($reader->strlen($header) != 24) {
+					return false;
+		}
 
 		// parse header
 		$header = unpack("{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header);
-		if (!is_array($header))
-			return false;
+		if (!is_array($header)) {
+					return false;
+		}
 
 		// support revision 0 of MO format specs, only
 		if ( $header['revision'] != 0 ) {
@@ -256,7 +266,9 @@ 
 		for ( $i = 0; $i < $header['total']; $i++ ) {
 			$o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
 			$t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );
-			if ( !$o || !$t ) return false;
+			if ( !$o || !$t ) {
+				return false;
+			}
 
 			// adjust offset due to reading strings to separate space before
 			$o['pos'] -= $strings_addr;

src/wp-includes/pomo/streams.php

Doc Comments +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 	/**
 	 * Sets the endianness of the file.
 	 *
-	 * @param $endian string 'big' or 'little'
+	 * @param string $endian string 'big' or 'little'
 	 */
 	function setEndian($endian) {
 		$this->endian = $endian;
@@ -41,7 +41,7 @@ 
 	/**
 	 * Reads a 32bit Integer from the Stream
 	 *
-	 * @return mixed The integer, corresponding to the next 32 bits from
+	 * @return integer The integer, corresponding to the next 32 bits from
 	 * 	the stream of false if there are not enough bytes or on error
 	 */
 	function readint32() {
@@ -119,14 +119,14 @@ 
 	}
 
 	/**
-	 * @return true
+	 * @return boolean
 	 */
 	function is_resource() {
 		return true;
 	}
 
 	/**
-	 * @return true
+	 * @return boolean
 	 */
 	function close() {
 		return true;

Braces +21 added lines, -12 removed lines

@@ -46,8 +46,9 @@ 
 	 */
 	function readint32() {
 		$bytes = $this->read(4);
-		if (4 != $this->strlen($bytes))
-			return false;
+		if (4 != $this->strlen($bytes)) {
+					return false;
+		}
 		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
 		$int = unpack($endian_letter, $bytes);
 		return reset( $int );
@@ -62,8 +63,9 @@ 
 	 */
 	function readint32array($count) {
 		$bytes = $this->read(4 * $count);
-		if (4*$count != $this->strlen($bytes))
-			return false;
+		if (4*$count != $this->strlen($bytes)) {
+					return false;
+		}
 		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
 		return unpack($endian_letter.$count, $bytes);
 	}
@@ -103,8 +105,9 @@ 
 		if (!function_exists('str_split')) {
 			$length = $this->strlen($string);
 			$out = array();
-			for ($i = 0; $i < $length; $i += $chunk_size)
-				$out[] = $this->substr($string, $i, $chunk_size);
+			for ($i = 0; $i < $length; $i += $chunk_size) {
+							$out[] = $this->substr($string, $i, $chunk_size);
+			}
 			return $out;
 		} else {
 			return str_split( $string, $chunk_size );
@@ -197,8 +200,9 @@ 
 	 */
 	function read_all() {
 		$all = '';
-		while ( !$this->feof() )
-			$all .= $this->read(4096);
+		while ( !$this->feof() ) {
+					$all .= $this->read(4096);
+		}
 		return $all;
 	}
 }
@@ -236,7 +240,9 @@ 
 	function read($bytes) {
 		$data = $this->substr($this->_str, $this->_pos, $bytes);
 		$this->_pos += $bytes;
-		if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
+		if ($this->strlen($this->_str) < $this->_pos) {
+			$this->_pos = $this->strlen($this->_str);
+		}
 		return $data;
 	}
 
@@ -246,7 +252,9 @@ 
 	 */
 	function seekto($pos) {
 		$this->_pos = $pos;
-		if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
+		if ($this->strlen($this->_str) < $this->_pos) {
+			$this->_pos = $this->strlen($this->_str);
+		}
 		return $this->_pos;
 	}
 
@@ -278,8 +286,9 @@ 
 	function __construct( $filename ) {
 		parent::POMO_StringReader();
 		$this->_str = file_get_contents($filename);
-		if (false === $this->_str)
-			return false;
+		if (false === $this->_str) {
+					return false;
+		}
 		$this->_pos = 0;
 	}
 

Spacing +24 added lines, -24 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage streams
  */
 
-if ( ! class_exists( 'POMO_Reader', false ) ):
+if ( ! class_exists('POMO_Reader', false)):
 class POMO_Reader {
 
 	var $endian = 'little';
@@ -48,9 +48,9 @@ 
 		$bytes = $this->read(4);
 		if (4 != $this->strlen($bytes))
 			return false;
-		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
+		$endian_letter = ('big' == $this->endian) ? 'N' : 'V';
 		$int = unpack($endian_letter, $bytes);
-		return reset( $int );
+		return reset($int);
 	}
 
 	/**
@@ -62,9 +62,9 @@ 
 	 */
 	function readint32array($count) {
 		$bytes = $this->read(4 * $count);
-		if (4*$count != $this->strlen($bytes))
+		if (4 * $count != $this->strlen($bytes))
 			return false;
-		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
+		$endian_letter = ('big' == $this->endian) ? 'N' : 'V';
 		return unpack($endian_letter.$count, $bytes);
 	}
 
@@ -100,14 +100,14 @@ 
 	 * @return array
 	 */
 	function str_split($string, $chunk_size) {
-		if (!function_exists('str_split')) {
+		if ( ! function_exists('str_split')) {
 			$length = $this->strlen($string);
 			$out = array();
 			for ($i = 0; $i < $length; $i += $chunk_size)
 				$out[] = $this->substr($string, $i, $chunk_size);
 			return $out;
 		} else {
-			return str_split( $string, $chunk_size );
+			return str_split($string, $chunk_size);
 		}
 	}
 
@@ -134,13 +134,13 @@ 
 }
 endif;
 
-if ( ! class_exists( 'POMO_FileReader', false ) ):
+if ( ! class_exists('POMO_FileReader', false)):
 class POMO_FileReader extends POMO_Reader {
 
 	/**
 	 * @param string $filename
 	 */
-	function __construct( $filename ) {
+	function __construct($filename) {
 		parent::POMO_Reader();
 		$this->_f = fopen($filename, 'rb');
 	}
@@ -148,8 +148,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_FileReader( $filename ) {
-		self::__construct( $filename );
+	public function POMO_FileReader($filename) {
+		self::__construct($filename);
 	}
 
 	/**
@@ -197,14 +197,14 @@ 
 	 */
 	function read_all() {
 		$all = '';
-		while ( !$this->feof() )
+		while ( ! $this->feof())
 			$all .= $this->read(4096);
 		return $all;
 	}
 }
 endif;
 
-if ( ! class_exists( 'POMO_StringReader', false ) ):
+if ( ! class_exists('POMO_StringReader', false)):
 /**
  * Provides file-like methods for manipulating a string instead
  * of a physical file.
@@ -216,7 +216,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $str = '' ) {
+	function __construct($str = '') {
 		parent::POMO_Reader();
 		$this->_str = $str;
 		$this->_pos = 0;
@@ -225,8 +225,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_StringReader( $str = '' ) {
-		self::__construct( $str );
+	public function POMO_StringReader($str = '') {
+		self::__construct($str);
 	}
 
 	/**
@@ -267,7 +267,7 @@ 
 }
 endif;
 
-if ( ! class_exists( 'POMO_CachedFileReader', false ) ):
+if ( ! class_exists('POMO_CachedFileReader', false)):
 /**
  * Reads the contents of the file in the beginning.
  */
@@ -275,7 +275,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $filename ) {
+	function __construct($filename) {
 		parent::POMO_StringReader();
 		$this->_str = file_get_contents($filename);
 		if (false === $this->_str)
@@ -286,13 +286,13 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_CachedFileReader( $filename ) {
-		self::__construct( $filename );
+	public function POMO_CachedFileReader($filename) {
+		self::__construct($filename);
 	}
 }
 endif;
 
-if ( ! class_exists( 'POMO_CachedIntFileReader', false ) ):
+if ( ! class_exists('POMO_CachedIntFileReader', false)):
 /**
  * Reads the contents of the file in the beginning.
  */
@@ -300,15 +300,15 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	public function __construct( $filename ) {
+	public function __construct($filename) {
 		parent::POMO_CachedFileReader($filename);
 	}
 
 	/**
 	 * PHP4 constructor.
 	 */
-	function POMO_CachedIntFileReader( $filename ) {
-		self::__construct( $filename );
+	function POMO_CachedIntFileReader($filename) {
+		self::__construct($filename);
 	}
 }
 endif;

src/wp-includes/pomo/translations.php

Doc Comments +4 added lines, -2 removed lines

@@ -18,6 +18,7 @@ 
 	 * Add entry to the PO structure
 	 *
 	 * @param array|Translation_Entry &$entry
+	 * @param Translation_Entry $entry
 	 * @return bool true on success, false if the entry doesn't have a key
 	 */
 	function add_entry($entry) {
@@ -72,6 +73,7 @@ 
 
 	/**
 	 * @param string $header
+	 * @return string
 	 */
 	function get_header($header) {
 		return isset($this->headers[$header])? $this->headers[$header] : false;
@@ -150,7 +152,7 @@ 
 	}
 
 	/**
-	 * @param object $other
+	 * @param Translations $other
 	 */
 	function merge_originals_with(&$other) {
 		foreach( $other->entries as $entry ) {
@@ -326,7 +328,7 @@ 
 	/**
 	 *
 	 * @param int $count
-	 * @return bool
+	 * @return integer
 	 */
 	function select_plural_form($count) {
 		return 1 == $count? 0 : 1;

Braces +24 added lines, -15 removed lines

@@ -25,7 +25,9 @@ 
 			$entry = new Translation_Entry($entry);
 		}
 		$key = $entry->key();
-		if (false === $key) return false;
+		if (false === $key) {
+			return false;
+		}
 		$this->entries[$key] = &$entry;
 		return true;
 	}
@@ -39,11 +41,14 @@ 
 			$entry = new Translation_Entry($entry);
 		}
 		$key = $entry->key();
-		if (false === $key) return false;
-		if (isset($this->entries[$key]))
-			$this->entries[$key]->merge_with($entry);
-		else
-			$this->entries[$key] = &$entry;
+		if (false === $key) {
+			return false;
+		}
+		if (isset($this->entries[$key])) {
+					$this->entries[$key]->merge_with($entry);
+		} else {
+					$this->entries[$key] = &$entry;
+		}
 		return true;
 	}
 
@@ -131,10 +136,11 @@ 
 		$total_plural_forms = $this->get_plural_forms_count();
 		if ($translated && 0 <= $index && $index < $total_plural_forms &&
 				is_array($translated->translations) &&
-				isset($translated->translations[$index]))
-			return $translated->translations[$index];
-		else
-			return 1 == $count? $singular : $plural;
+				isset($translated->translations[$index])) {
+					return $translated->translations[$index];
+		} else {
+					return 1 == $count? $singular : $plural;
+		}
 	}
 
 	/**
@@ -154,10 +160,11 @@ 
 	 */
 	function merge_originals_with(&$other) {
 		foreach( $other->entries as $entry ) {
-			if ( !isset( $this->entries[$entry->key()] ) )
-				$this->entries[$entry->key()] = $entry;
-			else
-				$this->entries[$entry->key()]->merge_with($entry);
+			if ( !isset( $this->entries[$entry->key()] ) ) {
+							$this->entries[$entry->key()] = $entry;
+			} else {
+							$this->entries[$entry->key()]->merge_with($entry);
+			}
 		}
 	}
 }
@@ -251,7 +258,9 @@ 
 		$lines = explode("\n", $translation);
 		foreach($lines as $line) {
 			$parts = explode(':', $line, 2);
-			if (!isset($parts[1])) continue;
+			if (!isset($parts[1])) {
+				continue;
+			}
 			$headers[trim($parts[0])] = trim($parts[1]);
 		}
 		return $headers;

Spacing +24 added lines, -24 removed lines

@@ -7,9 +7,9 @@ 
  * @subpackage translations
  */
 
-require_once dirname(__FILE__) . '/entry.php';
+require_once dirname(__FILE__).'/entry.php';
 
-if ( ! class_exists( 'Translations', false ) ):
+if ( ! class_exists('Translations', false)):
 class Translations {
 	var $entries = array();
 	var $headers = array();
@@ -65,7 +65,7 @@ 
 	 * @param array $headers
 	 */
 	function set_headers($headers) {
-		foreach($headers as $header => $value) {
+		foreach ($headers as $header => $value) {
 			$this->set_header($header, $value);
 		}
 	}
@@ -74,7 +74,7 @@ 
 	 * @param string $header
 	 */
 	function get_header($header) {
-		return isset($this->headers[$header])? $this->headers[$header] : false;
+		return isset($this->headers[$header]) ? $this->headers[$header] : false;
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	function translate_entry(&$entry) {
 		$key = $entry->key();
-		return isset($this->entries[$key])? $this->entries[$key] : false;
+		return isset($this->entries[$key]) ? $this->entries[$key] : false;
 	}
 
 	/**
@@ -90,10 +90,10 @@ 
 	 * @param string $context
 	 * @return string
 	 */
-	function translate($singular, $context=null) {
+	function translate($singular, $context = null) {
 		$entry = new Translation_Entry(array('singular' => $singular, 'context' => $context));
 		$translated = $this->translate_entry($entry);
-		return ($translated && !empty($translated->translations))? $translated->translations[0] : $singular;
+		return ($translated && ! empty($translated->translations)) ? $translated->translations[0] : $singular;
 	}
 
 	/**
@@ -108,7 +108,7 @@ 
 	 * @param integer $count number of items
 	 */
 	function select_plural_form($count) {
-		return 1 == $count? 0 : 1;
+		return 1 == $count ? 0 : 1;
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 				isset($translated->translations[$index]))
 			return $translated->translations[$index];
 		else
-			return 1 == $count? $singular : $plural;
+			return 1 == $count ? $singular : $plural;
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 * @return void
 	 **/
 	function merge_with(&$other) {
-		foreach( $other->entries as $entry ) {
+		foreach ($other->entries as $entry) {
 			$this->entries[$entry->key()] = $entry;
 		}
 	}
@@ -153,8 +153,8 @@ 
 	 * @param object $other
 	 */
 	function merge_originals_with(&$other) {
-		foreach( $other->entries as $entry ) {
-			if ( !isset( $this->entries[$entry->key()] ) )
+		foreach ($other->entries as $entry) {
+			if ( ! isset($this->entries[$entry->key()]))
 				$this->entries[$entry->key()] = $entry;
 			else
 				$this->entries[$entry->key()]->merge_with($entry);
@@ -172,8 +172,8 @@ 
 	 * @param int $count
 	 */
 	function gettext_select_plural_form($count) {
-		if (!isset($this->_gettext_select_plural_form) || is_null($this->_gettext_select_plural_form)) {
-			list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+		if ( ! isset($this->_gettext_select_plural_form) || is_null($this->_gettext_select_plural_form)) {
+			list($nplurals, $expression) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
 			$this->_nplurals = $nplurals;
 			$this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
 		}
@@ -186,7 +186,7 @@ 
 	 */
 	function nplurals_and_expression_from_header($header) {
 		if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
-			$nplurals = (int)$matches[1];
+			$nplurals = (int) $matches[1];
 			$expression = trim($this->parenthesize_plural_exression($matches[2]));
 			return array($nplurals, $expression);
 		} else {
@@ -230,8 +230,8 @@ 
 					$res .= ') : (';
 					break;
 				case ';':
-					$res .= str_repeat(')', $depth) . ';';
-					$depth= 0;
+					$res .= str_repeat(')', $depth).';';
+					$depth = 0;
 					break;
 				default:
 					$res .= $char;
@@ -249,9 +249,9 @@ 
 		// sometimes \ns are used instead of real new lines
 		$translation = str_replace('\n', "\n", $translation);
 		$lines = explode("\n", $translation);
-		foreach($lines as $line) {
+		foreach ($lines as $line) {
 			$parts = explode(':', $line, 2);
-			if (!isset($parts[1])) continue;
+			if ( ! isset($parts[1])) continue;
 			$headers[trim($parts[0])] = trim($parts[1]);
 		}
 		return $headers;
@@ -264,7 +264,7 @@ 
 	function set_header($header, $value) {
 		parent::set_header($header, $value);
 		if ('Plural-Forms' == $header) {
-			list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+			list($nplurals, $expression) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
 			$this->_nplurals = $nplurals;
 			$this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
 		}
@@ -272,7 +272,7 @@ 
 }
 endif;
 
-if ( ! class_exists( 'NOOP_Translations', false ) ):
+if ( ! class_exists('NOOP_Translations', false)):
 /**
  * Provides the same interface as Translations, but doesn't do anything
  */
@@ -319,7 +319,7 @@ 
 	 * @param string $singular
 	 * @param string $context
 	 */
-	function translate($singular, $context=null) {
+	function translate($singular, $context = null) {
 		return $singular;
 	}
 
@@ -329,7 +329,7 @@ 
 	 * @return bool
 	 */
 	function select_plural_form($count) {
-		return 1 == $count? 0 : 1;
+		return 1 == $count ? 0 : 1;
 	}
 
 	/**
@@ -346,7 +346,7 @@ 
 	 * @param string $context
 	 */
 	function translate_plural($singular, $plural, $count, $context = null) {
-			return 1 == $count? $singular : $plural;
+			return 1 == $count ? $singular : $plural;
 	}
 
 	/**

src/wp-includes/post-formats.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
  * @since 3.1.0
  *
  * @param string $format The post format slug.
- * @return string|WP_Error|false The post format term link.
+ * @return string The post format term link.
  */
 function get_post_format_link( $format ) {
 	$term = get_term_by('slug', 'post-format-' . $format, 'post_format' );

Braces +35 added lines, -25 removed lines

@@ -15,16 +15,19 @@ 
  * @return string|false The format if successful. False otherwise.
  */
 function get_post_format( $post = null ) {
-	if ( ! $post = get_post( $post ) )
-		return false;
+	if ( ! $post = get_post( $post ) ) {
+			return false;
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'post-formats' ) )
-		return false;
+	if ( ! post_type_supports( $post->post_type, 'post-formats' ) ) {
+			return false;
+	}
 
 	$_format = get_the_terms( $post->ID, 'post_format' );
 
-	if ( empty( $_format ) )
-		return false;
+	if ( empty( $_format ) ) {
+			return false;
+	}
 
 	$format = reset( $_format );
 
@@ -64,15 +67,17 @@ 
 function set_post_format( $post, $format ) {
 	$post = get_post( $post );
 
-	if ( empty( $post ) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+	if ( empty( $post ) ) {
+			return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+	}
 
 	if ( ! empty( $format ) ) {
 		$format = sanitize_key( $format );
-		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) )
-			$format = '';
-		else
-			$format = 'post-format-' . $format;
+		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) ) {
+					$format = '';
+		} else {
+					$format = 'post-format-' . $format;
+		}
 	}
 
 	return wp_set_post_terms( $post->ID, $format, 'post_format' );
@@ -123,11 +128,12 @@ 
  */
 function get_post_format_string( $slug ) {
 	$strings = get_post_format_strings();
-	if ( !$slug )
-		return $strings['standard'];
-	else
-		return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
-}
+	if ( !$slug ) {
+			return $strings['standard'];
+	} else {
+			return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
+	}
+	}
 
 /**
  * Returns a link to a post format index.
@@ -139,8 +145,9 @@ 
  */
 function get_post_format_link( $format ) {
 	$term = get_term_by('slug', 'post-format-' . $format, 'post_format' );
-	if ( ! $term || is_wp_error( $term ) )
-		return false;
+	if ( ! $term || is_wp_error( $term ) ) {
+			return false;
+	}
 	return get_term_link( $term );
 }
 
@@ -154,14 +161,17 @@ 
  * @return array
  */
 function _post_format_request( $qvs ) {
-	if ( ! isset( $qvs['post_format'] ) )
-		return $qvs;
+	if ( ! isset( $qvs['post_format'] ) ) {
+			return $qvs;
+	}
 	$slugs = get_post_format_slugs();
-	if ( isset( $slugs[ $qvs['post_format'] ] ) )
-		$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
+	if ( isset( $slugs[ $qvs['post_format'] ] ) ) {
+			$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
+	}
 	$tax = get_taxonomy( 'post_format' );
-	if ( ! is_admin() )
-		$qvs['post_type'] = $tax->object_type;
+	if ( ! is_admin() ) {
+			$qvs['post_type'] = $tax->object_type;
+	}
 	return $qvs;
 }
 

Spacing +67 added lines, -67 removed lines

@@ -14,21 +14,21 @@ 
  * @param int|object|null $post Post ID or post object. Optional, default is the current post from the loop.
  * @return string|false The format if successful. False otherwise.
  */
-function get_post_format( $post = null ) {
-	if ( ! $post = get_post( $post ) )
+function get_post_format($post = null) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	if ( ! post_type_supports( $post->post_type, 'post-formats' ) )
+	if ( ! post_type_supports($post->post_type, 'post-formats'))
 		return false;
 
-	$_format = get_the_terms( $post->ID, 'post_format' );
+	$_format = get_the_terms($post->ID, 'post_format');
 
-	if ( empty( $_format ) )
+	if (empty($_format))
 		return false;
 
-	$format = reset( $_format );
+	$format = reset($_format);
 
-	return str_replace('post-format-', '', $format->slug );
+	return str_replace('post-format-', '', $format->slug);
 }
 
 /**
@@ -40,16 +40,16 @@ 
  * @param object|int|null $post   Optional. The post to check. If not supplied, defaults to the current post if used in the loop.
  * @return bool True if the post has any of the given formats (or any format, if no format specified), false otherwise.
  */
-function has_post_format( $format = array(), $post = null ) {
+function has_post_format($format = array(), $post = null) {
 	$prefixed = array();
 
-	if ( $format ) {
-		foreach ( (array) $format as $single ) {
-			$prefixed[] = 'post-format-' . sanitize_key( $single );
+	if ($format) {
+		foreach ((array) $format as $single) {
+			$prefixed[] = 'post-format-'.sanitize_key($single);
 		}
 	}
 
-	return has_term( $prefixed, 'post_format', $post );
+	return has_term($prefixed, 'post_format', $post);
 }
 
 /**
@@ -61,21 +61,21 @@ 
  * @param string     $format A format to assign. Use an empty string or array to remove all formats from the post.
  * @return array|WP_Error|false WP_Error on error. Array of affected term IDs on success.
  */
-function set_post_format( $post, $format ) {
-	$post = get_post( $post );
+function set_post_format($post, $format) {
+	$post = get_post($post);
 
-	if ( empty( $post ) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+	if (empty($post))
+		return new WP_Error('invalid_post', __('Invalid post.'));
 
-	if ( ! empty( $format ) ) {
-		$format = sanitize_key( $format );
-		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) )
+	if ( ! empty($format)) {
+		$format = sanitize_key($format);
+		if ('standard' === $format || ! in_array($format, get_post_format_slugs()))
 			$format = '';
 		else
-			$format = 'post-format-' . $format;
+			$format = 'post-format-'.$format;
 	}
 
-	return wp_set_post_terms( $post->ID, $format, 'post_format' );
+	return wp_set_post_terms($post->ID, $format, 'post_format');
 }
 
 /**
@@ -87,16 +87,16 @@ 
  */
 function get_post_format_strings() {
 	$strings = array(
-		'standard' => _x( 'Standard', 'Post format' ), // Special case. any value that evals to false will be considered standard
-		'aside'    => _x( 'Aside',    'Post format' ),
-		'chat'     => _x( 'Chat',     'Post format' ),
-		'gallery'  => _x( 'Gallery',  'Post format' ),
-		'link'     => _x( 'Link',     'Post format' ),
-		'image'    => _x( 'Image',    'Post format' ),
-		'quote'    => _x( 'Quote',    'Post format' ),
-		'status'   => _x( 'Status',   'Post format' ),
-		'video'    => _x( 'Video',    'Post format' ),
-		'audio'    => _x( 'Audio',    'Post format' ),
+		'standard' => _x('Standard', 'Post format'), // Special case. any value that evals to false will be considered standard
+		'aside'    => _x('Aside', 'Post format'),
+		'chat'     => _x('Chat', 'Post format'),
+		'gallery'  => _x('Gallery', 'Post format'),
+		'link'     => _x('Link', 'Post format'),
+		'image'    => _x('Image', 'Post format'),
+		'quote'    => _x('Quote', 'Post format'),
+		'status'   => _x('Status', 'Post format'),
+		'video'    => _x('Video', 'Post format'),
+		'audio'    => _x('Audio', 'Post format'),
 	);
 	return $strings;
 }
@@ -109,8 +109,8 @@ 
  * @return array The array of post format slugs.
  */
 function get_post_format_slugs() {
-	$slugs = array_keys( get_post_format_strings() );
-	return array_combine( $slugs, $slugs );
+	$slugs = array_keys(get_post_format_strings());
+	return array_combine($slugs, $slugs);
 }
 
 /**
@@ -121,12 +121,12 @@ 
  * @param string $slug A post format slug.
  * @return string The translated post format name.
  */
-function get_post_format_string( $slug ) {
+function get_post_format_string($slug) {
 	$strings = get_post_format_strings();
-	if ( !$slug )
+	if ( ! $slug)
 		return $strings['standard'];
 	else
-		return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
+		return (isset($strings[$slug])) ? $strings[$slug] : '';
 }
 
 /**
@@ -137,11 +137,11 @@ 
  * @param string $format The post format slug.
  * @return string|WP_Error|false The post format term link.
  */
-function get_post_format_link( $format ) {
-	$term = get_term_by('slug', 'post-format-' . $format, 'post_format' );
-	if ( ! $term || is_wp_error( $term ) )
+function get_post_format_link($format) {
+	$term = get_term_by('slug', 'post-format-'.$format, 'post_format');
+	if ( ! $term || is_wp_error($term))
 		return false;
-	return get_term_link( $term );
+	return get_term_link($term);
 }
 
 /**
@@ -153,14 +153,14 @@ 
  * @param array $qvs
  * @return array
  */
-function _post_format_request( $qvs ) {
-	if ( ! isset( $qvs['post_format'] ) )
+function _post_format_request($qvs) {
+	if ( ! isset($qvs['post_format']))
 		return $qvs;
 	$slugs = get_post_format_slugs();
-	if ( isset( $slugs[ $qvs['post_format'] ] ) )
-		$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
-	$tax = get_taxonomy( 'post_format' );
-	if ( ! is_admin() )
+	if (isset($slugs[$qvs['post_format']]))
+		$qvs['post_format'] = 'post-format-'.$slugs[$qvs['post_format']];
+	$tax = get_taxonomy('post_format');
+	if ( ! is_admin())
 		$qvs['post_type'] = $tax->object_type;
 	return $qvs;
 }
@@ -178,16 +178,16 @@ 
  * @param string $taxonomy
  * @return string
  */
-function _post_format_link( $link, $term, $taxonomy ) {
+function _post_format_link($link, $term, $taxonomy) {
 	global $wp_rewrite;
-	if ( 'post_format' != $taxonomy ) {
+	if ('post_format' != $taxonomy) {
 		return $link;
 	}
-	if ( $wp_rewrite->get_extra_permastruct( $taxonomy ) ) {
-		return str_replace( "/{$term->slug}", '/' . str_replace( 'post-format-', '', $term->slug ), $link );
+	if ($wp_rewrite->get_extra_permastruct($taxonomy)) {
+		return str_replace("/{$term->slug}", '/'.str_replace('post-format-', '', $term->slug), $link);
 	} else {
-		$link = remove_query_arg( 'post_format', $link );
-		return add_query_arg( 'post_format', str_replace( 'post-format-', '', $term->slug ), $link );
+		$link = remove_query_arg('post_format', $link);
+		return add_query_arg('post_format', str_replace('post-format-', '', $term->slug), $link);
 	}
 }
 
@@ -200,9 +200,9 @@ 
  * @param object $term
  * @return object
  */
-function _post_format_get_term( $term ) {
-	if ( isset( $term->slug ) ) {
-		$term->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+function _post_format_get_term($term) {
+	if (isset($term->slug)) {
+		$term->name = get_post_format_string(str_replace('post-format-', '', $term->slug));
 	}
 	return $term;
 }
@@ -218,16 +218,16 @@ 
  * @param array        $args
  * @return array
  */
-function _post_format_get_terms( $terms, $taxonomies, $args ) {
-	if ( in_array( 'post_format', (array) $taxonomies ) ) {
-		if ( isset( $args['fields'] ) && 'names' == $args['fields'] ) {
-			foreach ( $terms as $order => $name ) {
-				$terms[$order] = get_post_format_string( str_replace( 'post-format-', '', $name ) );
+function _post_format_get_terms($terms, $taxonomies, $args) {
+	if (in_array('post_format', (array) $taxonomies)) {
+		if (isset($args['fields']) && 'names' == $args['fields']) {
+			foreach ($terms as $order => $name) {
+				$terms[$order] = get_post_format_string(str_replace('post-format-', '', $name));
 			}
 		} else {
-			foreach ( (array) $terms as $order => $term ) {
-				if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
-					$terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+			foreach ((array) $terms as $order => $term) {
+				if (isset($term->taxonomy) && 'post_format' == $term->taxonomy) {
+					$terms[$order]->name = get_post_format_string(str_replace('post-format-', '', $term->slug));
 				}
 			}
 		}
@@ -244,10 +244,10 @@ 
  * @param array $terms
  * @return array
  */
-function _post_format_wp_get_object_terms( $terms ) {
-	foreach ( (array) $terms as $order => $term ) {
-		if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
-			$terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+function _post_format_wp_get_object_terms($terms) {
+	foreach ((array) $terms as $order => $term) {
+		if (isset($term->taxonomy) && 'post_format' == $term->taxonomy) {
+			$terms[$order]->name = get_post_format_string(str_replace('post-format-', '', $term->slug));
 		}
 	}
 	return $terms;

src/wp-includes/SimplePie/Decode/HTML/Entities.php

Doc Comments +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
 	 * Consume the next byte
 	 *
 	 * @access private
-	 * @return mixed The next byte, or false, if there is no more data
+	 * @return string|false The next byte, or false, if there is no more data
 	 */
 	public function consume()
 	{
@@ -129,7 +129,7 @@ 
 	 *
 	 * @access private
 	 * @param string $chars Characters to consume
-	 * @return mixed A series of characters that match the range, or false
+	 * @return string|false A series of characters that match the range, or false
 	 */
 	public function consume_range($chars)
 	{

Spacing +1 added lines, -1 removed lines

@@ -215,7 +215,7 @@
 						$replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
 					}
 
-					if (!in_array($this->consume(), array(';', false), true))
+					if ( ! in_array($this->consume(), array(';', false), true))
 					{
 						$this->unconsume();
 					}

Braces +4 added lines, -8 removed lines

@@ -117,8 +117,7 @@ 
 		{
 			$this->consumed .= $this->data[$this->position];
 			return $this->data[$this->position++];
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -139,8 +138,7 @@ 
 			$this->consumed .= $data;
 			$this->position += $len;
 			return $data;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -200,8 +198,7 @@ 
 					if ($hex)
 					{
 						$codepoint = hexdec($codepoint);
-					}
-					else
+					} else
 					{
 						$codepoint = intval($codepoint);
 					}
@@ -209,8 +206,7 @@ 
 					if (isset($windows_1252_specials[$codepoint]))
 					{
 						$replacement = $windows_1252_specials[$codepoint];
-					}
-					else
+					} else
 					{
 						$replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
 					}