ntwb / wordpress

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

Doc Comments +2 added lines, -2 removed lines

@@ -391,7 +391,7 @@ 
 	 * @since 2.5.0
 	 *
 	 * @param string $mode string The *nix-style file permission.
-	 * @return int octal representation
+	 * @return string octal representation
 	 */
 	public function getnumchmodfromh( $mode ) {
 		$realmode = '';
@@ -466,7 +466,7 @@ 
 	 * @abstract
 	 *
 	 * @param string $file Name of the file to read.
-	 * @return mixed|bool Returns the read data or false on failure.
+	 * @return boolean Returns the read data or false on failure.
 	 */
 	public function get_contents( $file ) {
 		return false;

Spacing +89 added lines, -92 removed lines

@@ -61,7 +61,7 @@ 
 	public function abspath() {
 		$folder = $this->find_folder(ABSPATH);
 		// Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
-		if ( ! $folder && $this->is_dir( '/' . WPINC ) )
+		if ( ! $folder && $this->is_dir('/'.WPINC))
 			$folder = '/';
 		return $folder;
 	}
@@ -99,14 +99,14 @@ 
 	 * @param string $theme The Theme stylesheet or template for the directory.
 	 * @return string The location of the remote path.
 	 */
-	public function wp_themes_dir( $theme = false ) {
-		$theme_root = get_theme_root( $theme );
+	public function wp_themes_dir($theme = false) {
+		$theme_root = get_theme_root($theme);
 
 		// Account for relative theme roots
-		if ( '/themes' == $theme_root || ! is_dir( $theme_root ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+		if ('/themes' == $theme_root || ! is_dir($theme_root))
+			$theme_root = WP_CONTENT_DIR.$theme_root;
 
-		return $this->find_folder( $theme_root );
+		return $this->find_folder($theme_root);
 	}
 
 	/**
@@ -138,8 +138,8 @@ 
 	 *                     Default false.
 	 * @return string The location of the remote path.
 	 */
-	public function find_base_dir( $base = '.', $echo = false ) {
-		_deprecated_function(__FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
+	public function find_base_dir($base = '.', $echo = false) {
+		_deprecated_function(__FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()');
 		$this->verbose = $echo;
 		return $this->abspath();
 	}
@@ -160,8 +160,8 @@ 
 	 * @param bool   $echo True to display debug information.
 	 * @return string The location of the remote path.
 	 */
-	public function get_base_dir( $base = '.', $echo = false ) {
-		_deprecated_function(__FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
+	public function get_base_dir($base = '.', $echo = false) {
+		_deprecated_function(__FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()');
 		$this->verbose = $echo;
 		return $this->abspath();
 	}
@@ -178,11 +178,11 @@ 
 	 * @param string $folder the folder to locate.
 	 * @return string|false The location of the remote path, false on failure.
 	 */
-	public function find_folder( $folder ) {
-		if ( isset( $this->cache[ $folder ] ) )
-			return $this->cache[ $folder ];
+	public function find_folder($folder) {
+		if (isset($this->cache[$folder]))
+			return $this->cache[$folder];
 
-		if ( stripos($this->method, 'ftp') !== false ) {
+		if (stripos($this->method, 'ftp') !== false) {
 			$constant_overrides = array(
 				'FTP_BASE' => ABSPATH,
 				'FTP_CONTENT_DIR' => WP_CONTENT_DIR,
@@ -191,28 +191,28 @@ 
 			);
 
 			// Direct matches ( folder = CONSTANT/ )
-			foreach ( $constant_overrides as $constant => $dir ) {
-				if ( ! defined( $constant ) )
+			foreach ($constant_overrides as $constant => $dir) {
+				if ( ! defined($constant))
 					continue;
-				if ( $folder === $dir )
-					return trailingslashit( constant( $constant ) );
+				if ($folder === $dir)
+					return trailingslashit(constant($constant));
 			}
 
 			// Prefix Matches ( folder = CONSTANT/subdir )
-			foreach ( $constant_overrides as $constant => $dir ) {
-				if ( ! defined( $constant ) )
+			foreach ($constant_overrides as $constant => $dir) {
+				if ( ! defined($constant))
 					continue;
-				if ( 0 === stripos( $folder, $dir ) ) { // $folder starts with $dir
-					$potential_folder = preg_replace( '#^' . preg_quote( $dir, '#' ) . '/#i', trailingslashit( constant( $constant ) ), $folder );
-					$potential_folder = trailingslashit( $potential_folder );
+				if (0 === stripos($folder, $dir)) { // $folder starts with $dir
+					$potential_folder = preg_replace('#^'.preg_quote($dir, '#').'/#i', trailingslashit(constant($constant)), $folder);
+					$potential_folder = trailingslashit($potential_folder);
 
-					if ( $this->is_dir( $potential_folder ) ) {
-						$this->cache[ $folder ] = $potential_folder;
+					if ($this->is_dir($potential_folder)) {
+						$this->cache[$folder] = $potential_folder;
 						return $potential_folder;
 					}
 				}
 			}
-		} elseif ( 'direct' == $this->method ) {
+		} elseif ('direct' == $this->method) {
 			$folder = str_replace('\\', '/', $folder); // Windows path sanitisation
 			return trailingslashit($folder);
 		}
@@ -220,16 +220,16 @@ 
 		$folder = preg_replace('|^([a-z]{1}):|i', '', $folder); // Strip out windows drive letter if it's there.
 		$folder = str_replace('\\', '/', $folder); // Windows path sanitisation
 
-		if ( isset($this->cache[ $folder ] ) )
-			return $this->cache[ $folder ];
+		if (isset($this->cache[$folder]))
+			return $this->cache[$folder];
 
-		if ( $this->exists($folder) ) { // Folder exists at that absolute path.
+		if ($this->exists($folder)) { // Folder exists at that absolute path.
 			$folder = trailingslashit($folder);
-			$this->cache[ $folder ] = $folder;
+			$this->cache[$folder] = $folder;
 			return $folder;
 		}
-		if ( $return = $this->search_for_folder($folder) )
-			$this->cache[ $folder ] = $return;
+		if ($return = $this->search_for_folder($folder))
+			$this->cache[$folder] = $return;
 		return $return;
 	}
 
@@ -246,26 +246,26 @@ 
 	 * @param bool   $loop   If the function has recursed, Internal use only.
 	 * @return string|false The location of the remote path, false to cease looping.
 	 */
-	public function search_for_folder( $folder, $base = '.', $loop = false ) {
-		if ( empty( $base ) || '.' == $base )
+	public function search_for_folder($folder, $base = '.', $loop = false) {
+		if (empty($base) || '.' == $base)
 			$base = trailingslashit($this->cwd());
 
 		$folder = untrailingslashit($folder);
 
-		if ( $this->verbose ) {
+		if ($this->verbose) {
 			/* translators: 1: folder to locate, 2: folder to start searching from */
-			printf( "\n" . __( 'Looking for %1$s in %2$s' ) . "<br/>\n", $folder, $base );
+			printf("\n".__('Looking for %1$s in %2$s')."<br/>\n", $folder, $base);
 		}
 
 		$folder_parts = explode('/', $folder);
-		$folder_part_keys = array_keys( $folder_parts );
-		$last_index = array_pop( $folder_part_keys );
-		$last_path = $folder_parts[ $last_index ];
+		$folder_part_keys = array_keys($folder_parts);
+		$last_index = array_pop($folder_part_keys);
+		$last_path = $folder_parts[$last_index];
 
-		$files = $this->dirlist( $base );
+		$files = $this->dirlist($base);
 
-		foreach ( $folder_parts as $index => $key ) {
-			if ( $index == $last_index )
+		foreach ($folder_parts as $index => $key) {
+			if ($index == $last_index)
 				continue; // We want this to be caught by the next code block.
 
 			/*
@@ -275,40 +275,40 @@ 
 			 * folder level, and see if that matches, and so on. If it reaches the end, and still
 			 * cant find it, it'll return false for the entire function.
 			 */
-			if ( isset($files[ $key ]) ){
+			if (isset($files[$key])) {
 
 				// Let's try that folder:
 				$newdir = trailingslashit(path_join($base, $key));
-				if ( $this->verbose ) {
+				if ($this->verbose) {
 					/* translators: %s: directory name */
-					printf( "\n" . __( 'Changing to %s' ) . "<br/>\n", $newdir );
+					printf("\n".__('Changing to %s')."<br/>\n", $newdir);
 				}
 
 				// Only search for the remaining path tokens in the directory, not the full path again.
-				$newfolder = implode( '/', array_slice( $folder_parts, $index + 1 ) );
-				if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop) )
+				$newfolder = implode('/', array_slice($folder_parts, $index + 1));
+				if ($ret = $this->search_for_folder($newfolder, $newdir, $loop))
 					return $ret;
 			}
 		}
 
 		// Only check this as a last resort, to prevent locating the incorrect install.
 		// All above procedures will fail quickly if this is the right branch to take.
-		if (isset( $files[ $last_path ] ) ) {
-			if ( $this->verbose ) {
+		if (isset($files[$last_path])) {
+			if ($this->verbose) {
 				/* translators: %s: directory name */
-				printf( "\n" . __( 'Found %s' ) . "<br/>\n",  $base . $last_path );
+				printf("\n".__('Found %s')."<br/>\n", $base.$last_path);
 			}
-			return trailingslashit($base . $last_path);
+			return trailingslashit($base.$last_path);
 		}
 
 		// Prevent this function from looping again.
 		// No need to proceed if we've just searched in /
-		if ( $loop || '/' == $base )
+		if ($loop || '/' == $base)
 			return false;
 
 		// As an extra last resort, Change back to / if the folder wasn't found.
 		// This comes into effect when the CWD is /home/user/ but WP is at /var/www/....
-		return $this->search_for_folder( $folder, '/', true );
+		return $this->search_for_folder($folder, '/', true);
 
 	}
 
@@ -325,8 +325,8 @@ 
 	 * @param string $file String filename.
 	 * @return string The *nix-style representation of permissions.
 	 */
-	public function gethchmod( $file ){
-		$perms = intval( $this->getchmod( $file ), 8 );
+	public function gethchmod($file) {
+		$perms = intval($this->getchmod($file), 8);
 		if (($perms & 0xC000) == 0xC000) // Socket
 			$info = 's';
 		elseif (($perms & 0xA000) == 0xA000) // Symbolic Link
@@ -348,22 +348,19 @@ 
 		$info .= (($perms & 0x0100) ? 'r' : '-');
 		$info .= (($perms & 0x0080) ? 'w' : '-');
 		$info .= (($perms & 0x0040) ?
-					(($perms & 0x0800) ? 's' : 'x' ) :
-					(($perms & 0x0800) ? 'S' : '-'));
+					(($perms & 0x0800) ? 's' : 'x') : (($perms & 0x0800) ? 'S' : '-'));
 
 		// Group
 		$info .= (($perms & 0x0020) ? 'r' : '-');
 		$info .= (($perms & 0x0010) ? 'w' : '-');
 		$info .= (($perms & 0x0008) ?
-					(($perms & 0x0400) ? 's' : 'x' ) :
-					(($perms & 0x0400) ? 'S' : '-'));
+					(($perms & 0x0400) ? 's' : 'x') : (($perms & 0x0400) ? 'S' : '-'));
 
 		// World
 		$info .= (($perms & 0x0004) ? 'r' : '-');
 		$info .= (($perms & 0x0002) ? 'w' : '-');
 		$info .= (($perms & 0x0001) ?
-					(($perms & 0x0200) ? 't' : 'x' ) :
-					(($perms & 0x0200) ? 'T' : '-'));
+					(($perms & 0x0200) ? 't' : 'x') : (($perms & 0x0200) ? 'T' : '-'));
 		return $info;
 	}
 
@@ -375,7 +372,7 @@ 
 	 * @param string $file
 	 * @return string the last 3 characters of the octal number
 	 */
-	public function getchmod( $file ) {
+	public function getchmod($file) {
 		return '777';
 	}
 
@@ -393,12 +390,12 @@ 
 	 * @param string $mode string The *nix-style file permission.
 	 * @return int octal representation
 	 */
-	public function getnumchmodfromh( $mode ) {
+	public function getnumchmodfromh($mode) {
 		$realmode = '';
-		$legal =  array('', 'w', 'r', 'x', '-');
+		$legal = array('', 'w', 'r', 'x', '-');
 		$attarray = preg_split('//', $mode);
 
-		for ( $i = 0, $c = count( $attarray ); $i < $c; $i++ ) {
+		for ($i = 0, $c = count($attarray); $i < $c; $i++) {
 		   if ($key = array_search($attarray[$i], $legal)) {
 			   $realmode .= $legal[$key];
 		   }
@@ -406,7 +403,7 @@ 
 
 		$mode = str_pad($realmode, 10, '-', STR_PAD_LEFT);
 		$trans = array('-'=>'0', 'r'=>'4', 'w'=>'2', 'x'=>'1');
-		$mode = strtr($mode,$trans);
+		$mode = strtr($mode, $trans);
 
 		$newmode = $mode[0];
 		$newmode .= $mode[1] + $mode[2] + $mode[3];
@@ -424,8 +421,8 @@ 
 	 * @param string $text String to test against.
 	 * @return bool true if string is binary, false otherwise.
 	 */
-	public function is_binary( $text ) {
-		return (bool) preg_match( '|[^\x20-\x7E]|', $text ); // chr(32)..chr(127)
+	public function is_binary($text) {
+		return (bool) preg_match('|[^\x20-\x7E]|', $text); // chr(32)..chr(127)
 	}
 
 	/**
@@ -441,7 +438,7 @@ 
 	 * @param bool   $recursive Optional. If set True changes file owner recursivly. Defaults to False.
 	 * @return bool Returns true on success or false on failure.
 	 */
-	public function chown( $file, $owner, $recursive = false ) {
+	public function chown($file, $owner, $recursive = false) {
 		return false;
 	}
 
@@ -468,7 +465,7 @@ 
 	 * @param string $file Name of the file to read.
 	 * @return mixed|bool Returns the read data or false on failure.
 	 */
-	public function get_contents( $file ) {
+	public function get_contents($file) {
 		return false;
 	}
 
@@ -482,7 +479,7 @@ 
 	 * @param string $file Path to the file.
 	 * @return array|bool the file contents in an array or false on failure.
 	 */
-	public function get_contents_array( $file ) {
+	public function get_contents_array($file) {
 		return false;
 	}
 
@@ -498,7 +495,7 @@ 
 	 * @param int    $mode     Optional. The file permissions as octal number, usually 0644.
 	 * @return bool False on failure.
 	 */
-	public function put_contents( $file, $contents, $mode = false ) {
+	public function put_contents($file, $contents, $mode = false) {
 		return false;
 	}
 
@@ -525,7 +522,7 @@ 
 	 * @param string $dir The new current directory.
 	 * @return bool|string
 	 */
-	public function chdir( $dir ) {
+	public function chdir($dir) {
 		return false;
 	}
 
@@ -541,7 +538,7 @@ 
 	 * @param bool   $recursive Optional. If set True changes file group recursively. Defaults to False.
 	 * @return bool|string
 	 */
-	public function chgrp( $file, $group, $recursive = false ) {
+	public function chgrp($file, $group, $recursive = false) {
 		return false;
 	}
 
@@ -557,7 +554,7 @@ 
 	 * @param bool   $recursive Optional. If set True changes file group recursively. Defaults to False.
 	 * @return bool|string
 	 */
-	public function chmod( $file, $mode = false, $recursive = false ) {
+	public function chmod($file, $mode = false, $recursive = false) {
 		return false;
 	}
 
@@ -571,7 +568,7 @@ 
 	 * @param string $file Path to the file.
 	 * @return string|bool Username of the user or false on error.
 	 */
-	public function owner( $file ) {
+	public function owner($file) {
 		return false;
 	}
 
@@ -585,7 +582,7 @@ 
 	 * @param string $file Path to the file.
 	 * @return string|bool The group or false on error.
 	 */
-	public function group( $file ) {
+	public function group($file) {
 		return false;
 	}
 
@@ -604,7 +601,7 @@ 
 	 *                            Default false.
 	 * @return bool True if file copied successfully, False otherwise.
 	 */
-	public function copy( $source, $destination, $overwrite = false, $mode = false ) {
+	public function copy($source, $destination, $overwrite = false, $mode = false) {
 		return false;
 	}
 
@@ -621,7 +618,7 @@ 
 	 *                            Default false.
 	 * @return bool True if file copied successfully, False otherwise.
 	 */
-	public function move( $source, $destination, $overwrite = false ) {
+	public function move($source, $destination, $overwrite = false) {
 		return false;
 	}
 
@@ -639,7 +636,7 @@ 
 	 *                          Default false.
 	 * @return bool True if the file or directory was deleted, false on failure.
 	 */
-	public function delete( $file, $recursive = false, $type = false ) {
+	public function delete($file, $recursive = false, $type = false) {
 		return false;
 	}
 
@@ -653,7 +650,7 @@ 
 	 * @param string $file Path to file/directory.
 	 * @return bool Whether $file exists or not.
 	 */
-	public function exists( $file ) {
+	public function exists($file) {
 		return false;
 	}
 
@@ -667,7 +664,7 @@ 
 	 * @param string $file File path.
 	 * @return bool Whether $file is a file.
 	 */
-	public function is_file( $file ) {
+	public function is_file($file) {
 		return false;
 	}
 
@@ -681,7 +678,7 @@ 
 	 * @param string $path Directory path.
 	 * @return bool Whether $path is a directory.
 	 */
-	public function is_dir( $path ) {
+	public function is_dir($path) {
 		return false;
 	}
 
@@ -695,7 +692,7 @@ 
 	 * @param string $file Path to file.
 	 * @return bool Whether $file is readable.
 	 */
-	public function is_readable( $file ) {
+	public function is_readable($file) {
 		return false;
 	}
 
@@ -709,7 +706,7 @@ 
 	 * @param string $file Path to file.
 	 * @return bool Whether $file is writable.
 	 */
-	public function is_writable( $file ) {
+	public function is_writable($file) {
 		return false;
 	}
 
@@ -723,7 +720,7 @@ 
 	 * @param string $file Path to file.
 	 * @return int|bool Unix timestamp representing last access time.
 	 */
-	public function atime( $file ) {
+	public function atime($file) {
 		return false;
 	}
 
@@ -737,7 +734,7 @@ 
 	 * @param string $file Path to file.
 	 * @return int|bool Unix timestamp representing modification time.
 	 */
-	public function mtime( $file ) {
+	public function mtime($file) {
 		return false;
 	}
 
@@ -751,7 +748,7 @@ 
 	 * @param string $file Path to file.
 	 * @return int|bool Size of the file in bytes.
 	 */
-	public function size( $file ) {
+	public function size($file) {
 		return false;
 	}
 
@@ -771,7 +768,7 @@ 
 	 *                      Default 0.
 	 * @return bool Whether operation was successful or not.
 	 */
-	public function touch( $file, $time = 0, $atime = 0 ) {
+	public function touch($file, $time = 0, $atime = 0) {
 		return false;
 	}
 
@@ -791,7 +788,7 @@ 
 	 *                      Default false.
 	 * @return bool False if directory cannot be created, true otherwise.
 	 */
-	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
+	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		return false;
 	}
 
@@ -807,7 +804,7 @@ 
 	 *                          Default false.
 	 * @return bool Whether directory is deleted successfully or not.
 	 */
-	public function rmdir( $path, $recursive = false ) {
+	public function rmdir($path, $recursive = false) {
 		return false;
 	}
 
@@ -838,7 +835,7 @@ 
 	 *     @type mixed  $files       If a directory and $recursive is true, contains another array of files.
 	 * }
 	 */
-	public function dirlist( $path, $include_hidden = true, $recursive = false ) {
+	public function dirlist($path, $include_hidden = true, $recursive = false) {
 		return false;
 	}
 

src/wp-admin/includes/image-edit.php

Doc Comments +1 added lines, -1 removed lines

@@ -384,7 +384,7 @@
  * @ignore
  * @param resource  $img   Image resource.
  * @param float|int $angle Image rotation angle, in degrees.
- * @return resource|false GD image resource, false otherwise.
+ * @return resource GD image resource, false otherwise.
  */
 function _rotate_image_resource($img, $angle) {
 	_deprecated_function( __FUNCTION__, '3.5.0', __( 'Use WP_Image_Editor::rotate' ) );

Spacing +225 added lines, -225 removed lines

@@ -20,22 +20,22 @@ 
 	$sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
 	$note = '';
 
-	if ( isset( $meta['width'], $meta['height'] ) )
-		$big = max( $meta['width'], $meta['height'] );
+	if (isset($meta['width'], $meta['height']))
+		$big = max($meta['width'], $meta['height']);
 	else
-		die( __('Image data does not exist. Please re-upload the image.') );
+		die(__('Image data does not exist. Please re-upload the image.'));
 
 	$sizer = $big > 400 ? 400 / $big : 1;
 
-	$backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
+	$backup_sizes = get_post_meta($post_id, '_wp_attachment_backup_sizes', true);
 	$can_restore = false;
-	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) )
-		$can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+	if ( ! empty($backup_sizes) && isset($backup_sizes['full-orig'], $meta['file']))
+		$can_restore = $backup_sizes['full-orig']['file'] != basename($meta['file']);
 
-	if ( $msg ) {
-		if ( isset($msg->error) )
+	if ($msg) {
+		if (isset($msg->error))
 			$note = "<div class='error'><p>$msg->error</p></div>";
-		elseif ( isset($msg->msg) )
+		elseif (isset($msg->msg))
 			$note = "<div class='updated'><p>$msg->msg</p></div>";
 	}
 
@@ -46,28 +46,28 @@ 
 	<div class="imgedit-settings">
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
-		<h2><?php _e( 'Scale Image' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Scale Image Help' ); ?></span></button>
+		<h2><?php _e('Scale Image'); ?></h2>
+		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e('Scale Image Help'); ?></span></button>
 		<div class="imgedit-help">
 		<p><?php _e('You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up.'); ?></p>
 		</div>
-		<?php if ( isset( $meta['width'], $meta['height'] ) ): ?>
-		<p><?php printf( __('Original dimensions %s'), $meta['width'] . ' &times; ' . $meta['height'] ); ?></p>
+		<?php if (isset($meta['width'], $meta['height'])): ?>
+		<p><?php printf(__('Original dimensions %s'), $meta['width'].' &times; '.$meta['height']); ?></p>
 		<?php endif ?>
 		<div class="imgedit-submit">
 
 		<fieldset class="imgedit-scale">
-		<legend><?php _e( 'New dimensions:' ); ?></legend>
+		<legend><?php _e('New dimensions:'); ?></legend>
 		<div class="nowrap">
-		<label><span class="screen-reader-text"><?php _e( 'scale width' ); ?></span>
-		<input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
+		<label><span class="screen-reader-text"><?php _e('scale width'); ?></span>
+		<input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" value="<?php echo isset($meta['width']) ? $meta['width'] : 0; ?>" />
 		</label>
 		<span class="imgedit-separator">&times;</span>
-		<label><span class="screen-reader-text"><?php _e( 'scale height' ); ?></span>
-		<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+		<label><span class="screen-reader-text"><?php _e('scale height'); ?></span>
+		<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset($meta['height']) ? $meta['height'] : 0; ?>" />
 		</label>
 		<span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span>
-		<input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
+		<input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e('Scale'); ?>" />
  		</div>
 		</fieldset>
 
@@ -75,20 +75,20 @@ 
 	</div>
 	</div>
 
-<?php if ( $can_restore ) { ?>
+<?php if ($can_restore) { ?>
 
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
-		<h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link"><?php _e( 'Restore Original Image' ); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
+		<h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link"><?php _e('Restore Original Image'); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
 		<div class="imgedit-help">
 		<p><?php _e('Discard any changes and restore the original image.');
 
-		if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
+		if ( ! defined('IMAGE_EDIT_OVERWRITE') || ! IMAGE_EDIT_OVERWRITE)
 			echo ' '.__('Previously edited copies of the image will not be deleted.');
 
 		?></p>
 		<div class="imgedit-submit">
-		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e( 'Restore image' ); ?>" <?php echo $can_restore; ?> />
+		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e('Restore image'); ?>" <?php echo $can_restore; ?> />
 		</div>
 		</div>
 	</div>
@@ -98,8 +98,8 @@ 
 
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
-		<h2><?php _e( 'Image Crop' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Image Crop Help' ); ?></span></button>
+		<h2><?php _e('Image Crop'); ?></h2>
+		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e('Image Crop Help'); ?></span></button>
 
 		<div class="imgedit-help">
 		<p><?php _e('To crop the image, click on it and drag to make your selection.'); ?></p>
@@ -113,26 +113,26 @@ 
 	</div>
 
 	<fieldset class="imgedit-crop-ratio">
-		<legend><?php _e( 'Aspect ratio:' ); ?></legend>
+		<legend><?php _e('Aspect ratio:'); ?></legend>
 		<div class="nowrap">
-		<label><span class="screen-reader-text"><?php _e( 'crop ratio width' ); ?></span>
+		<label><span class="screen-reader-text"><?php _e('crop ratio width'); ?></span>
 		<input type="text" id="imgedit-crop-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" />
 		</label>
 		<span class="imgedit-separator">:</span>
-		<label><span class="screen-reader-text"><?php _e( 'crop ratio height' ); ?></span>
+		<label><span class="screen-reader-text"><?php _e('crop ratio height'); ?></span>
 		<input type="text" id="imgedit-crop-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" />
 		</label>
 		</div>
 	</fieldset>
 
 	<fieldset id="imgedit-crop-sel-<?php echo $post_id; ?>" class="imgedit-crop-sel">
-		<legend><?php _e( 'Selection:' ); ?></legend>
+		<legend><?php _e('Selection:'); ?></legend>
 		<div class="nowrap">
-		<label><span class="screen-reader-text"><?php _e( 'selection width' ); ?></span>
+		<label><span class="screen-reader-text"><?php _e('selection width'); ?></span>
 		<input type="text" id="imgedit-sel-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
 		</label>
 		<span class="imgedit-separator">&times;</span>
-		<label><span class="screen-reader-text"><?php _e( 'selection height' ); ?></span>
+		<label><span class="screen-reader-text"><?php _e('selection height'); ?></span>
 		<input type="text" id="imgedit-sel-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
 		</label>
 		</div>
@@ -140,25 +140,25 @@ 
 
 	</div>
 
-	<?php if ( $thumb && $sub_sizes ) {
-		$thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 );
+	<?php if ($thumb && $sub_sizes) {
+		$thumb_img = wp_constrain_dimensions($thumb['width'], $thumb['height'], 160, 120);
 	?>
 
 	<div class="imgedit-group imgedit-applyto">
 	<div class="imgedit-group-top">
-		<h2><?php _e( 'Thumbnail Settings' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Thumbnail Settings Help' ); ?></span></button>
+		<h2><?php _e('Thumbnail Settings'); ?></h2>
+		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e('Thumbnail Settings Help'); ?></span></button>
 		<p class="imgedit-help"><?php _e('You can edit the image while preserving the thumbnail. For example, you may wish to have a square thumbnail that displays just a section of the image.'); ?></p>
 	</div>
 
 	<figure class="imgedit-thumbnail-preview">
 		<img src="<?php echo $thumb['url']; ?>" width="<?php echo $thumb_img[0]; ?>" height="<?php echo $thumb_img[1]; ?>" class="imgedit-size-preview" alt="" draggable="false" />
-		<figcaption class="imgedit-thumbnail-preview-caption"><?php _e( 'Current thumbnail' ); ?></figcaption>
+		<figcaption class="imgedit-thumbnail-preview-caption"><?php _e('Current thumbnail'); ?></figcaption>
 	</figure>
 
 	<div id="imgedit-save-target-<?php echo $post_id; ?>" class="imgedit-save-target">
 	<fieldset>
-		<legend><strong><?php _e( 'Apply changes to:' ); ?></strong></legend>
+		<legend><strong><?php _e('Apply changes to:'); ?></strong></legend>
 
 		<label class="imgedit-label">
 		<input type="radio" name="imgedit-target-<?php echo $post_id; ?>" value="all" checked="checked" />
@@ -182,26 +182,26 @@ 
 	<div class="imgedit-panel-content wp-clearfix">
 		<?php echo $note; ?>
 		<div class="imgedit-menu wp-clearfix">
-			<button type="button" onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Crop' ); ?></span></button><?php
+			<button type="button" onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop button disabled" disabled><span class="screen-reader-text"><?php esc_html_e('Crop'); ?></span></button><?php
 
 		// On some setups GD library does not provide imagerotate() - Ticket #11536
-		if ( wp_image_editor_supports( array( 'mime_type' => get_post_mime_type( $post_id ), 'methods' => array( 'rotate' ) ) ) ) {
+		if (wp_image_editor_supports(array('mime_type' => get_post_mime_type($post_id), 'methods' => array('rotate')))) {
 			$note_no_rotate = '';
 	?>
-			<button type="button" class="imgedit-rleft button" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e( 'Rotate counter-clockwise' ); ?></span></button>
-			<button type="button" class="imgedit-rright button" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e( 'Rotate clockwise' ); ?></span></button>
+			<button type="button" class="imgedit-rleft button" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e('Rotate counter-clockwise'); ?></span></button>
+			<button type="button" class="imgedit-rright button" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e('Rotate clockwise'); ?></span></button>
 	<?php } else {
-			$note_no_rotate = '<p class="note-no-rotate"><em>' . __( 'Image rotation is not supported by your web host.' ) . '</em></p>';
+			$note_no_rotate = '<p class="note-no-rotate"><em>'.__('Image rotation is not supported by your web host.').'</em></p>';
 	?>
 			<button type="button" class="imgedit-rleft button disabled" disabled></button>
 			<button type="button" class="imgedit-rright button disabled" disabled></button>
 	<?php } ?>
 
-			<button type="button" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><span class="screen-reader-text"><?php esc_html_e( 'Flip vertically' ); ?></span></button>
-			<button type="button" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><span class="screen-reader-text"><?php esc_html_e( 'Flip horizontally' ); ?></span></button>
+			<button type="button" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><span class="screen-reader-text"><?php esc_html_e('Flip vertically'); ?></span></button>
+			<button type="button" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><span class="screen-reader-text"><?php esc_html_e('Flip horizontally'); ?></span></button>
 
-			<button type="button" id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Undo' ); ?></span></button>
-			<button type="button" id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Redo' ); ?></span></button>
+			<button type="button" id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e('Undo'); ?></span></button>
+			<button type="button" id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e('Redo'); ?></span></button>
 			<?php echo $note_no_rotate; ?>
 		</div>
 
@@ -209,16 +209,16 @@ 
 		<input type="hidden" id="imgedit-history-<?php echo $post_id; ?>" value="" />
 		<input type="hidden" id="imgedit-undone-<?php echo $post_id; ?>" value="0" />
 		<input type="hidden" id="imgedit-selection-<?php echo $post_id; ?>" value="" />
-		<input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
-		<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+		<input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset($meta['width']) ? $meta['width'] : 0; ?>" />
+		<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset($meta['height']) ? $meta['height'] : 0; ?>" />
 
 		<div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
-		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand(1, 99999); ?>" alt="" />
+		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url('admin-ajax.php', 'relative'); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand(1, 99999); ?>" alt="" />
 		</div>
 
 		<div class="imgedit-submit">
-			<input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button imgedit-cancel-btn" value="<?php esc_attr_e( 'Cancel' ); ?>" />
-			<input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn" value="<?php esc_attr_e( 'Save' ); ?>" />
+			<input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button imgedit-cancel-btn" value="<?php esc_attr_e('Cancel'); ?>" />
+			<input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn" value="<?php esc_attr_e('Save'); ?>" />
 		</div>
 	</div>
 
@@ -238,8 +238,8 @@ 
  * @param int $post_id
  * @return bool
  */
-function wp_stream_image( $image, $mime_type, $post_id ) {
-	if ( $image instanceof WP_Image_Editor ) {
+function wp_stream_image($image, $mime_type, $post_id) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/**
 		 * Filters the WP_Image_Editor instance for the image to be streamed to the browser.
@@ -249,14 +249,14 @@ 
 		 * @param WP_Image_Editor $image   WP_Image_Editor instance.
 		 * @param int             $post_id Post ID.
 		 */
-		$image = apply_filters( 'image_editor_save_pre', $image, $post_id );
+		$image = apply_filters('image_editor_save_pre', $image, $post_id);
 
-		if ( is_wp_error( $image->stream( $mime_type ) ) )
+		if (is_wp_error($image->stream($mime_type)))
 			return false;
 
 		return true;
 	} else {
-		_deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+		_deprecated_argument(__FUNCTION__, '3.5.0', __('$image needs to be an WP_Image_Editor object'));
 
 		/**
 		 * Filters the GD image resource to be streamed to the browser.
@@ -267,18 +267,18 @@ 
 		 * @param resource $image   Image resource to be streamed.
 		 * @param int      $post_id Post ID.
 		 */
-		$image = apply_filters( 'image_save_pre', $image, $post_id );
+		$image = apply_filters('image_save_pre', $image, $post_id);
 
-		switch ( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
-				header( 'Content-Type: image/jpeg' );
-				return imagejpeg( $image, null, 90 );
+				header('Content-Type: image/jpeg');
+				return imagejpeg($image, null, 90);
 			case 'image/png':
-				header( 'Content-Type: image/png' );
-				return imagepng( $image );
+				header('Content-Type: image/png');
+				return imagepng($image);
 			case 'image/gif':
-				header( 'Content-Type: image/gif' );
-				return imagegif( $image );
+				header('Content-Type: image/gif');
+				return imagegif($image);
 			default:
 				return false;
 		}
@@ -294,11 +294,11 @@ 
  * @param int $post_id
  * @return bool
  */
-function wp_save_image_file( $filename, $image, $mime_type, $post_id ) {
-	if ( $image instanceof WP_Image_Editor ) {
+function wp_save_image_file($filename, $image, $mime_type, $post_id) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/** This filter is documented in wp-admin/includes/image-edit.php */
-		$image = apply_filters( 'image_editor_save_pre', $image, $post_id );
+		$image = apply_filters('image_editor_save_pre', $image, $post_id);
 
 		/**
 		 * Filters whether to skip saving the image file.
@@ -314,17 +314,17 @@ 
 		 * @param string          $mime_type Image mime type.
 		 * @param int             $post_id   Post ID.
 		 */
-		$saved = apply_filters( 'wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id );
+		$saved = apply_filters('wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id);
 
-		if ( null !== $saved )
+		if (null !== $saved)
 			return $saved;
 
-		return $image->save( $filename, $mime_type );
+		return $image->save($filename, $mime_type);
 	} else {
-		_deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+		_deprecated_argument(__FUNCTION__, '3.5.0', __('$image needs to be an WP_Image_Editor object'));
 
 		/** This filter is documented in wp-admin/includes/image-edit.php */
-		$image = apply_filters( 'image_save_pre', $image, $post_id );
+		$image = apply_filters('image_save_pre', $image, $post_id);
 
 		/**
 		 * Filters whether to skip saving the image file.
@@ -341,20 +341,20 @@ 
 		 * @param string          $mime_type Image mime type.
 		 * @param int             $post_id   Post ID.
 		 */
-		$saved = apply_filters( 'wp_save_image_file', null, $filename, $image, $mime_type, $post_id );
+		$saved = apply_filters('wp_save_image_file', null, $filename, $image, $mime_type, $post_id);
 
-		if ( null !== $saved )
+		if (null !== $saved)
 			return $saved;
 
-		switch ( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 
 				/** This filter is documented in wp-includes/class-wp-image-editor.php */
-				return imagejpeg( $image, $filename, apply_filters( 'jpeg_quality', 90, 'edit_image' ) );
+				return imagejpeg($image, $filename, apply_filters('jpeg_quality', 90, 'edit_image'));
 			case 'image/png':
-				return imagepng( $image, $filename );
+				return imagepng($image, $filename);
 			case 'image/gif':
-				return imagegif( $image, $filename );
+				return imagegif($image, $filename);
 			default:
 				return false;
 		}
@@ -387,10 +387,10 @@ 
  * @return resource|false GD image resource, false otherwise.
  */
 function _rotate_image_resource($img, $angle) {
-	_deprecated_function( __FUNCTION__, '3.5.0', __( 'Use WP_Image_Editor::rotate' ) );
-	if ( function_exists('imagerotate') ) {
+	_deprecated_function(__FUNCTION__, '3.5.0', __('Use WP_Image_Editor::rotate'));
+	if (function_exists('imagerotate')) {
 		$rotated = imagerotate($img, $angle, 0);
-		if ( is_resource($rotated) ) {
+		if (is_resource($rotated)) {
 			imagedestroy($img);
 			$img = $rotated;
 		}
@@ -410,17 +410,17 @@ 
  * @return resource (maybe) flipped image resource.
  */
 function _flip_image_resource($img, $horz, $vert) {
-	_deprecated_function( __FUNCTION__, '3.5.0', __( 'Use WP_Image_Editor::flip' ) );
+	_deprecated_function(__FUNCTION__, '3.5.0', __('Use WP_Image_Editor::flip'));
 	$w = imagesx($img);
 	$h = imagesy($img);
 	$dst = wp_imagecreatetruecolor($w, $h);
-	if ( is_resource($dst) ) {
+	if (is_resource($dst)) {
 		$sx = $vert ? ($w - 1) : 0;
 		$sy = $horz ? ($h - 1) : 0;
 		$sw = $vert ? -$w : $w;
 		$sh = $horz ? -$h : $h;
 
-		if ( imagecopyresampled($dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh) ) {
+		if (imagecopyresampled($dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh)) {
 			imagedestroy($img);
 			$img = $dst;
 		}
@@ -443,8 +443,8 @@ 
  */
 function _crop_image_resource($img, $x, $y, $w, $h) {
 	$dst = wp_imagecreatetruecolor($w, $h);
-	if ( is_resource($dst) ) {
-		if ( imagecopy($dst, $img, 0, 0, $x, $y, $w, $h) ) {
+	if (is_resource($dst)) {
+		if (imagecopy($dst, $img, 0, 0, $x, $y, $w, $h)) {
 			imagedestroy($img);
 			$img = $dst;
 		}
@@ -461,24 +461,24 @@ 
  * @param array           $changes Array of change operations.
  * @return WP_Image_Editor WP_Image_Editor instance with changes applied.
  */
-function image_edit_apply_changes( $image, $changes ) {
-	if ( is_resource( $image ) )
-		_deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+function image_edit_apply_changes($image, $changes) {
+	if (is_resource($image))
+		_deprecated_argument(__FUNCTION__, '3.5.0', __('$image needs to be an WP_Image_Editor object'));
 
-	if ( !is_array($changes) )
+	if ( ! is_array($changes))
 		return $image;
 
 	// Expand change operations.
-	foreach ( $changes as $key => $obj ) {
-		if ( isset($obj->r) ) {
+	foreach ($changes as $key => $obj) {
+		if (isset($obj->r)) {
 			$obj->type = 'rotate';
 			$obj->angle = $obj->r;
 			unset($obj->r);
-		} elseif ( isset($obj->f) ) {
+		} elseif (isset($obj->f)) {
 			$obj->type = 'flip';
 			$obj->axis = $obj->f;
 			unset($obj->f);
-		} elseif ( isset($obj->c) ) {
+		} elseif (isset($obj->c)) {
 			$obj->type = 'crop';
 			$obj->sel = $obj->c;
 			unset($obj->c);
@@ -487,12 +487,12 @@ 
 	}
 
 	// Combine operations.
-	if ( count($changes) > 1 ) {
+	if (count($changes) > 1) {
 		$filtered = array($changes[0]);
-		for ( $i = 0, $j = 1, $c = count( $changes ); $j < $c; $j++ ) {
+		for ($i = 0, $j = 1, $c = count($changes); $j < $c; $j++) {
 			$combined = false;
-			if ( $filtered[$i]->type == $changes[$j]->type ) {
-				switch ( $filtered[$i]->type ) {
+			if ($filtered[$i]->type == $changes[$j]->type) {
+				switch ($filtered[$i]->type) {
 					case 'rotate':
 						$filtered[$i]->angle += $changes[$j]->angle;
 						$combined = true;
@@ -503,7 +503,7 @@ 
 						break;
 				}
 			}
-			if ( !$combined )
+			if ( ! $combined)
 				$filtered[++$i] = $changes[$j];
 		}
 		$changes = $filtered;
@@ -511,7 +511,7 @@ 
 	}
 
 	// Image resource before applying the changes.
-	if ( $image instanceof WP_Image_Editor ) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/**
 		 * Filters the WP_Image_Editor instance before applying changes to the image.
@@ -521,8 +521,8 @@ 
 		 * @param WP_Image_Editor $image   WP_Image_Editor instance.
  		 * @param array           $changes Array of change operations.
 		 */
-		$image = apply_filters( 'wp_image_editor_before_change', $image, $changes );
-	} elseif ( is_resource( $image ) ) {
+		$image = apply_filters('wp_image_editor_before_change', $image, $changes);
+	} elseif (is_resource($image)) {
 
 		/**
 		 * Filters the GD image resource before applying changes to the image.
@@ -533,39 +533,39 @@ 
 		 * @param resource $image   GD image resource.
  		 * @param array    $changes Array of change operations.
 		 */
-		$image = apply_filters( 'image_edit_before_change', $image, $changes );
+		$image = apply_filters('image_edit_before_change', $image, $changes);
 	}
 
-	foreach ( $changes as $operation ) {
-		switch ( $operation->type ) {
+	foreach ($changes as $operation) {
+		switch ($operation->type) {
 			case 'rotate':
-				if ( $operation->angle != 0 ) {
-					if ( $image instanceof WP_Image_Editor )
-						$image->rotate( $operation->angle );
+				if ($operation->angle != 0) {
+					if ($image instanceof WP_Image_Editor)
+						$image->rotate($operation->angle);
 					else
-						$image = _rotate_image_resource( $image, $operation->angle );
+						$image = _rotate_image_resource($image, $operation->angle);
 				}
 				break;
 			case 'flip':
-				if ( $operation->axis != 0 )
-					if ( $image instanceof WP_Image_Editor )
-						$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
+				if ($operation->axis != 0)
+					if ($image instanceof WP_Image_Editor)
+						$image->flip(($operation->axis & 1) != 0, ($operation->axis & 2) != 0);
 					else
-						$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+						$image = _flip_image_resource($image, ($operation->axis & 1) != 0, ($operation->axis & 2) != 0);
 				break;
 			case 'crop':
 				$sel = $operation->sel;
 
-				if ( $image instanceof WP_Image_Editor ) {
+				if ($image instanceof WP_Image_Editor) {
 					$size = $image->get_size();
 					$w = $size['width'];
 					$h = $size['height'];
 
-					$scale = 1 / _image_get_preview_ratio( $w, $h ); // discard preview scaling
-					$image->crop( $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+					$scale = 1 / _image_get_preview_ratio($w, $h); // discard preview scaling
+					$image->crop($sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale);
 				} else {
-					$scale = 1 / _image_get_preview_ratio( imagesx( $image ), imagesy( $image ) ); // discard preview scaling
-					$image = _crop_image_resource( $image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+					$scale = 1 / _image_get_preview_ratio(imagesx($image), imagesy($image)); // discard preview scaling
+					$image = _crop_image_resource($image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale);
 				}
 				break;
 		}
@@ -582,34 +582,34 @@ 
  * @param int $post_id
  * @return bool
  */
-function stream_preview_image( $post_id ) {
-	$post = get_post( $post_id );
+function stream_preview_image($post_id) {
+	$post = get_post($post_id);
 
-	wp_raise_memory_limit( 'admin' );
+	wp_raise_memory_limit('admin');
 
-	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id ) );
+	$img = wp_get_image_editor(_load_image_to_edit_path($post_id));
 
-	if ( is_wp_error( $img ) ) {
+	if (is_wp_error($img)) {
 		return false;
 	}
 
-	$changes = !empty($_REQUEST['history']) ? json_decode( wp_unslash($_REQUEST['history']) ) : null;
-	if ( $changes )
-		$img = image_edit_apply_changes( $img, $changes );
+	$changes = ! empty($_REQUEST['history']) ? json_decode(wp_unslash($_REQUEST['history'])) : null;
+	if ($changes)
+		$img = image_edit_apply_changes($img, $changes);
 
 	// Scale the image.
 	$size = $img->get_size();
 	$w = $size['width'];
 	$h = $size['height'];
 
-	$ratio = _image_get_preview_ratio( $w, $h );
-	$w2 = max ( 1, $w * $ratio );
-	$h2 = max ( 1, $h * $ratio );
+	$ratio = _image_get_preview_ratio($w, $h);
+	$w2 = max(1, $w * $ratio);
+	$h2 = max(1, $h * $ratio);
 
-	if ( is_wp_error( $img->resize( $w2, $h2 ) ) )
+	if (is_wp_error($img->resize($w2, $h2)))
 		return false;
 
-	return wp_stream_image( $img, $post->post_mime_type, $post_id );
+	return wp_stream_image($img, $post->post_mime_type, $post_id);
 }
 
 /**
@@ -623,30 +623,30 @@ 
 function wp_restore_image($post_id) {
 	$meta = wp_get_attachment_metadata($post_id);
 	$file = get_attached_file($post_id);
-	$backup_sizes = $old_backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
+	$backup_sizes = $old_backup_sizes = get_post_meta($post_id, '_wp_attachment_backup_sizes', true);
 	$restored = false;
 	$msg = new stdClass;
 
-	if ( !is_array($backup_sizes) ) {
+	if ( ! is_array($backup_sizes)) {
 		$msg->error = __('Cannot load image metadata.');
 		return $msg;
 	}
 
 	$parts = pathinfo($file);
-	$suffix = time() . rand(100, 999);
+	$suffix = time().rand(100, 999);
 	$default_sizes = get_intermediate_image_sizes();
 
-	if ( isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig']) ) {
+	if (isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig'])) {
 		$data = $backup_sizes['full-orig'];
 
-		if ( $parts['basename'] != $data['file'] ) {
-			if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
+		if ($parts['basename'] != $data['file']) {
+			if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE) {
 
 				// Delete only if it's an edited image.
-				if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) {
-					wp_delete_file( $file );
+				if (preg_match('/-e[0-9]{13}\./', $parts['basename'])) {
+					wp_delete_file($file);
 				}
-			} elseif ( isset( $meta['width'], $meta['height'] ) ) {
+			} elseif (isset($meta['width'], $meta['height'])) {
 				$backup_sizes["full-$suffix"] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $parts['basename']);
 			}
 		}
@@ -654,21 +654,21 @@ 
 		$restored_file = path_join($parts['dirname'], $data['file']);
 		$restored = update_attached_file($post_id, $restored_file);
 
-		$meta['file'] = _wp_relative_upload_path( $restored_file );
+		$meta['file'] = _wp_relative_upload_path($restored_file);
 		$meta['width'] = $data['width'];
 		$meta['height'] = $data['height'];
 	}
 
-	foreach ( $default_sizes as $default_size ) {
-		if ( isset($backup_sizes["$default_size-orig"]) ) {
+	foreach ($default_sizes as $default_size) {
+		if (isset($backup_sizes["$default_size-orig"])) {
 			$data = $backup_sizes["$default_size-orig"];
-			if ( isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file'] ) {
-				if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
+			if (isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file']) {
+				if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE) {
 
 					// Delete only if it's an edited image.
-					if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) {
-						$delete_file = path_join( $parts['dirname'], $meta['sizes'][$default_size]['file'] );
-						wp_delete_file( $delete_file );
+					if (preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file'])) {
+						$delete_file = path_join($parts['dirname'], $meta['sizes'][$default_size]['file']);
+						wp_delete_file($delete_file);
 					}
 				} else {
 					$backup_sizes["$default_size-{$suffix}"] = $meta['sizes'][$default_size];
@@ -681,14 +681,14 @@ 
 		}
 	}
 
-	if ( ! wp_update_attachment_metadata( $post_id, $meta ) ||
-		( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) ) ) {
+	if ( ! wp_update_attachment_metadata($post_id, $meta) ||
+		($old_backup_sizes !== $backup_sizes && ! update_post_meta($post_id, '_wp_attachment_backup_sizes', $backup_sizes))) {
 
 		$msg->error = __('Cannot save image metadata.');
 		return $msg;
 	}
 
-	if ( !$restored )
+	if ( ! $restored)
 		$msg->error = __('Image metadata is inconsistent.');
 	else
 		$msg->msg = __('Image restored successfully.');
@@ -705,25 +705,25 @@ 
  * @param int $post_id
  * @return \stdClass
  */
-function wp_save_image( $post_id ) {
+function wp_save_image($post_id) {
 	global $_wp_additional_image_sizes;
 
 	$return = new stdClass;
 	$success = $delete = $scaled = $nocrop = false;
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id, 'full' ) );
-	if ( is_wp_error( $img ) ) {
-		$return->error = esc_js( __('Unable to create new image.') );
+	$img = wp_get_image_editor(_load_image_to_edit_path($post_id, 'full'));
+	if (is_wp_error($img)) {
+		$return->error = esc_js(__('Unable to create new image.'));
 		return $return;
 	}
 
-	$fwidth = !empty($_REQUEST['fwidth']) ? intval($_REQUEST['fwidth']) : 0;
-	$fheight = !empty($_REQUEST['fheight']) ? intval($_REQUEST['fheight']) : 0;
-	$target = !empty($_REQUEST['target']) ? preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['target']) : '';
-	$scale = !empty($_REQUEST['do']) && 'scale' == $_REQUEST['do'];
+	$fwidth = ! empty($_REQUEST['fwidth']) ? intval($_REQUEST['fwidth']) : 0;
+	$fheight = ! empty($_REQUEST['fheight']) ? intval($_REQUEST['fheight']) : 0;
+	$target = ! empty($_REQUEST['target']) ? preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['target']) : '';
+	$scale = ! empty($_REQUEST['do']) && 'scale' == $_REQUEST['do'];
 
-	if ( $scale && $fwidth > 0 && $fheight > 0 ) {
+	if ($scale && $fwidth > 0 && $fheight > 0) {
 		$size = $img->get_size();
 		$sX = $size['width'];
 		$sY = $size['height'];
@@ -732,54 +732,54 @@ 
 		$diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
 		if ( -0.1 < $diff && $diff < 0.1 ) {
 			// Scale the full size image.
-			if ( $img->resize( $fwidth, $fheight ) )
+			if ($img->resize($fwidth, $fheight))
 				$scaled = true;
 		}
 
-		if ( !$scaled ) {
-			$return->error = esc_js( __('Error while saving the scaled image. Please reload the page and try again.') );
+		if ( ! $scaled) {
+			$return->error = esc_js(__('Error while saving the scaled image. Please reload the page and try again.'));
 			return $return;
 		}
-	} elseif ( !empty($_REQUEST['history']) ) {
-		$changes = json_decode( wp_unslash($_REQUEST['history']) );
-		if ( $changes )
+	} elseif ( ! empty($_REQUEST['history'])) {
+		$changes = json_decode(wp_unslash($_REQUEST['history']));
+		if ($changes)
 			$img = image_edit_apply_changes($img, $changes);
 	} else {
-		$return->error = esc_js( __('Nothing to save, the image has not changed.') );
+		$return->error = esc_js(__('Nothing to save, the image has not changed.'));
 		return $return;
 	}
 
 	$meta = wp_get_attachment_metadata($post_id);
-	$backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
+	$backup_sizes = get_post_meta($post->ID, '_wp_attachment_backup_sizes', true);
 
-	if ( !is_array($meta) ) {
-		$return->error = esc_js( __('Image data does not exist. Please re-upload the image.') );
+	if ( ! is_array($meta)) {
+		$return->error = esc_js(__('Image data does not exist. Please re-upload the image.'));
 		return $return;
 	}
 
-	if ( !is_array($backup_sizes) )
+	if ( ! is_array($backup_sizes))
 		$backup_sizes = array();
 
 	// Generate new filename.
 	$path = get_attached_file($post_id);
-	$path_parts = pathinfo( $path );
+	$path_parts = pathinfo($path);
 	$filename = $path_parts['filename'];
-	$suffix = time() . rand(100, 999);
+	$suffix = time().rand(100, 999);
 
-	if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
-		isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] ) {
+	if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
+		isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $path_parts['basename']) {
 
-		if ( 'thumbnail' == $target )
+		if ('thumbnail' == $target)
 			$new_path = "{$path_parts['dirname']}/{$filename}-temp.{$path_parts['extension']}";
 		else
 			$new_path = $path;
 	} else {
-		while( true ) {
-			$filename = preg_replace( '/-e([0-9]+)$/', '', $filename );
+		while (true) {
+			$filename = preg_replace('/-e([0-9]+)$/', '', $filename);
 			$filename .= "-e{$suffix}";
 			$new_filename = "{$filename}.{$path_parts['extension']}";
 			$new_path = "{$path_parts['dirname']}/$new_filename";
-			if ( file_exists($new_path) )
+			if (file_exists($new_path))
 				$suffix++;
 			else
 				break;
@@ -787,41 +787,41 @@ 
 	}
 
 	// Save the full-size file, also needed to create sub-sizes.
-	if ( !wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id) ) {
-		$return->error = esc_js( __('Unable to save the image.') );
+	if ( ! wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id)) {
+		$return->error = esc_js(__('Unable to save the image.'));
 		return $return;
 	}
 
-	if ( 'nothumb' == $target || 'all' == $target || 'full' == $target || $scaled ) {
+	if ('nothumb' == $target || 'all' == $target || 'full' == $target || $scaled) {
 		$tag = false;
-		if ( isset($backup_sizes['full-orig']) ) {
-			if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] )
+		if (isset($backup_sizes['full-orig'])) {
+			if (( ! defined('IMAGE_EDIT_OVERWRITE') || ! IMAGE_EDIT_OVERWRITE) && $backup_sizes['full-orig']['file'] != $path_parts['basename'])
 				$tag = "full-$suffix";
 		} else {
 			$tag = 'full-orig';
 		}
 
-		if ( $tag )
+		if ($tag)
 			$backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
 
-		$success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
+		$success = ($path === $new_path) || update_attached_file($post_id, $new_path);
 
-		$meta['file'] = _wp_relative_upload_path( $new_path );
+		$meta['file'] = _wp_relative_upload_path($new_path);
 
 		$size = $img->get_size();
 		$meta['width'] = $size['width'];
 		$meta['height'] = $size['height'];
 
-		if ( $success && ('nothumb' == $target || 'all' == $target) ) {
+		if ($success && ('nothumb' == $target || 'all' == $target)) {
 			$sizes = get_intermediate_image_sizes();
-			if ( 'nothumb' == $target )
-				$sizes = array_diff( $sizes, array('thumbnail') );
+			if ('nothumb' == $target)
+				$sizes = array_diff($sizes, array('thumbnail'));
 		}
 
 		$return->fw = $meta['width'];
 		$return->fh = $meta['height'];
-	} elseif ( 'thumbnail' == $target ) {
-		$sizes = array( 'thumbnail' );
+	} elseif ('thumbnail' == $target) {
+		$sizes = array('thumbnail');
 		$success = $delete = $nocrop = true;
 	}
 
@@ -831,63 +831,63 @@ 
 	 * keeping the new resized images from overwriting the existing image files.
 	 * https://core.trac.wordpress.org/ticket/32171
 	 */
-	if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE && ! empty( $meta['sizes'] ) ) {
-		foreach ( $meta['sizes'] as $size ) {
-			if ( ! empty( $size['file'] ) && preg_match( '/-e[0-9]{13}-/', $size['file'] ) ) {
-				$delete_file = path_join( $path_parts['dirname'], $size['file'] );
-				wp_delete_file( $delete_file );
+	if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE && ! empty($meta['sizes'])) {
+		foreach ($meta['sizes'] as $size) {
+			if ( ! empty($size['file']) && preg_match('/-e[0-9]{13}-/', $size['file'])) {
+				$delete_file = path_join($path_parts['dirname'], $size['file']);
+				wp_delete_file($delete_file);
 			}
 		}
 	}
 
-	if ( isset( $sizes ) ) {
+	if (isset($sizes)) {
 		$_sizes = array();
 
-		foreach ( $sizes as $size ) {
+		foreach ($sizes as $size) {
 			$tag = false;
-			if ( isset( $meta['sizes'][$size] ) ) {
-				if ( isset($backup_sizes["$size-orig"]) ) {
-					if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] )
+			if (isset($meta['sizes'][$size])) {
+				if (isset($backup_sizes["$size-orig"])) {
+					if (( ! defined('IMAGE_EDIT_OVERWRITE') || ! IMAGE_EDIT_OVERWRITE) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'])
 						$tag = "$size-$suffix";
 				} else {
 					$tag = "$size-orig";
 				}
 
-				if ( $tag )
+				if ($tag)
 					$backup_sizes[$tag] = $meta['sizes'][$size];
 			}
 
-			if ( isset( $_wp_additional_image_sizes[ $size ] ) ) {
-				$width  = intval( $_wp_additional_image_sizes[ $size ]['width'] );
-				$height = intval( $_wp_additional_image_sizes[ $size ]['height'] );
-				$crop   = ( $nocrop ) ? false : $_wp_additional_image_sizes[ $size ]['crop'];
+			if (isset($_wp_additional_image_sizes[$size])) {
+				$width  = intval($_wp_additional_image_sizes[$size]['width']);
+				$height = intval($_wp_additional_image_sizes[$size]['height']);
+				$crop   = ($nocrop) ? false : $_wp_additional_image_sizes[$size]['crop'];
 			} else {
-				$height = get_option( "{$size}_size_h" );
-				$width  = get_option( "{$size}_size_w" );
-				$crop   = ( $nocrop ) ? false : get_option( "{$size}_crop" );
+				$height = get_option("{$size}_size_h");
+				$width  = get_option("{$size}_size_w");
+				$crop   = ($nocrop) ? false : get_option("{$size}_crop");
 			}
 
-			$_sizes[ $size ] = array( 'width' => $width, 'height' => $height, 'crop' => $crop );
+			$_sizes[$size] = array('width' => $width, 'height' => $height, 'crop' => $crop);
 		}
 
-		$meta['sizes'] = array_merge( $meta['sizes'], $img->multi_resize( $_sizes ) );
+		$meta['sizes'] = array_merge($meta['sizes'], $img->multi_resize($_sizes));
 	}
 
-	unset( $img );
+	unset($img);
 
-	if ( $success ) {
-		wp_update_attachment_metadata( $post_id, $meta );
-		update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes);
+	if ($success) {
+		wp_update_attachment_metadata($post_id, $meta);
+		update_post_meta($post_id, '_wp_attachment_backup_sizes', $backup_sizes);
 
-		if ( $target == 'thumbnail' || $target == 'all' || $target == 'full' ) {
+		if ($target == 'thumbnail' || $target == 'all' || $target == 'full') {
 			// Check if it's an image edit from attachment edit screen
-			if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' == $_REQUEST['context'] ) {
-				$thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
+			if ( ! empty($_REQUEST['context']) && 'edit-attachment' == $_REQUEST['context']) {
+				$thumb_url = wp_get_attachment_image_src($post_id, array(900, 600), true);
 				$return->thumbnail = $thumb_url[0];
 			} else {
 				$file_url = wp_get_attachment_url($post_id);
-				if ( ! empty( $meta['sizes']['thumbnail'] ) && $thumb = $meta['sizes']['thumbnail'] ) {
-					$return->thumbnail = path_join( dirname($file_url), $thumb['file'] );
+				if ( ! empty($meta['sizes']['thumbnail']) && $thumb = $meta['sizes']['thumbnail']) {
+					$return->thumbnail = path_join(dirname($file_url), $thumb['file']);
 				} else {
 					$return->thumbnail = "$file_url?w=128&h=128";
 				}
@@ -897,10 +897,10 @@ 
 		$delete = true;
 	}
 
-	if ( $delete ) {
-		wp_delete_file( $new_path );
+	if ($delete) {
+		wp_delete_file($new_path);
 	}
 
-	$return->msg = esc_js( __('Image saved') );
+	$return->msg = esc_js(__('Image saved'));
 	return $return;
 }

Braces +89 added lines, -64 removed lines

@@ -20,23 +20,26 @@ 
 	$sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
 	$note = '';
 
-	if ( isset( $meta['width'], $meta['height'] ) )
-		$big = max( $meta['width'], $meta['height'] );
-	else
-		die( __('Image data does not exist. Please re-upload the image.') );
+	if ( isset( $meta['width'], $meta['height'] ) ) {
+			$big = max( $meta['width'], $meta['height'] );
+	} else {
+			die( __('Image data does not exist. Please re-upload the image.') );
+	}
 
 	$sizer = $big > 400 ? 400 / $big : 1;
 
 	$backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
 	$can_restore = false;
-	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) )
-		$can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) ) {
+			$can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+	}
 
 	if ( $msg ) {
-		if ( isset($msg->error) )
-			$note = "<div class='error'><p>$msg->error</p></div>";
-		elseif ( isset($msg->msg) )
-			$note = "<div class='updated'><p>$msg->msg</p></div>";
+		if ( isset($msg->error) ) {
+					$note = "<div class='error'><p>$msg->error</p></div>";
+		} elseif ( isset($msg->msg) ) {
+					$note = "<div class='updated'><p>$msg->msg</p></div>";
+		}
 	}
 
 	?>
@@ -83,8 +86,9 @@ 
 		<div class="imgedit-help">
 		<p><?php _e('Discard any changes and restore the original image.');
 
-		if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
-			echo ' '.__('Previously edited copies of the image will not be deleted.');
+		if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) {
+					echo ' '.__('Previously edited copies of the image will not be deleted.');
+		}
 
 		?></p>
 		<div class="imgedit-submit">
@@ -251,8 +255,9 @@ 
 		 */
 		$image = apply_filters( 'image_editor_save_pre', $image, $post_id );
 
-		if ( is_wp_error( $image->stream( $mime_type ) ) )
-			return false;
+		if ( is_wp_error( $image->stream( $mime_type ) ) ) {
+					return false;
+		}
 
 		return true;
 	} else {
@@ -316,8 +321,9 @@ 
 		 */
 		$saved = apply_filters( 'wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id );
 
-		if ( null !== $saved )
-			return $saved;
+		if ( null !== $saved ) {
+					return $saved;
+		}
 
 		return $image->save( $filename, $mime_type );
 	} else {
@@ -343,8 +349,9 @@ 
 		 */
 		$saved = apply_filters( 'wp_save_image_file', null, $filename, $image, $mime_type, $post_id );
 
-		if ( null !== $saved )
-			return $saved;
+		if ( null !== $saved ) {
+					return $saved;
+		}
 
 		switch ( $mime_type ) {
 			case 'image/jpeg':
@@ -462,11 +469,13 @@ 
  * @return WP_Image_Editor WP_Image_Editor instance with changes applied.
  */
 function image_edit_apply_changes( $image, $changes ) {
-	if ( is_resource( $image ) )
-		_deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+	if ( is_resource( $image ) ) {
+			_deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+	}
 
-	if ( !is_array($changes) )
-		return $image;
+	if ( !is_array($changes) ) {
+			return $image;
+	}
 
 	// Expand change operations.
 	foreach ( $changes as $key => $obj ) {
@@ -503,8 +512,9 @@ 
 						break;
 				}
 			}
-			if ( !$combined )
-				$filtered[++$i] = $changes[$j];
+			if ( !$combined ) {
+							$filtered[++$i] = $changes[$j];
+			}
 		}
 		$changes = $filtered;
 		unset($filtered);
@@ -540,18 +550,20 @@ 
 		switch ( $operation->type ) {
 			case 'rotate':
 				if ( $operation->angle != 0 ) {
-					if ( $image instanceof WP_Image_Editor )
-						$image->rotate( $operation->angle );
-					else
-						$image = _rotate_image_resource( $image, $operation->angle );
+					if ( $image instanceof WP_Image_Editor ) {
+											$image->rotate( $operation->angle );
+					} else {
+											$image = _rotate_image_resource( $image, $operation->angle );
+					}
 				}
 				break;
 			case 'flip':
-				if ( $operation->axis != 0 )
-					if ( $image instanceof WP_Image_Editor )
+				if ( $operation->axis != 0 ) {
+									if ( $image instanceof WP_Image_Editor )
 						$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
-					else
-						$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+				} else {
+											$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+					}
 				break;
 			case 'crop':
 				$sel = $operation->sel;
@@ -594,8 +606,9 @@ 
 	}
 
 	$changes = !empty($_REQUEST['history']) ? json_decode( wp_unslash($_REQUEST['history']) ) : null;
-	if ( $changes )
-		$img = image_edit_apply_changes( $img, $changes );
+	if ( $changes ) {
+			$img = image_edit_apply_changes( $img, $changes );
+	}
 
 	// Scale the image.
 	$size = $img->get_size();
@@ -606,8 +619,9 @@ 
 	$w2 = max ( 1, $w * $ratio );
 	$h2 = max ( 1, $h * $ratio );
 
-	if ( is_wp_error( $img->resize( $w2, $h2 ) ) )
-		return false;
+	if ( is_wp_error( $img->resize( $w2, $h2 ) ) ) {
+			return false;
+	}
 
 	return wp_stream_image( $img, $post->post_mime_type, $post_id );
 }
@@ -688,10 +702,11 @@ 
 		return $msg;
 	}
 
-	if ( !$restored )
-		$msg->error = __('Image metadata is inconsistent.');
-	else
-		$msg->msg = __('Image restored successfully.');
+	if ( !$restored ) {
+			$msg->error = __('Image metadata is inconsistent.');
+	} else {
+			$msg->msg = __('Image restored successfully.');
+	}
 
 	return $msg;
 }
@@ -732,8 +747,9 @@ 
 		$diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
 		if ( -0.1 < $diff && $diff < 0.1 ) {
 			// Scale the full size image.
-			if ( $img->resize( $fwidth, $fheight ) )
-				$scaled = true;
+			if ( $img->resize( $fwidth, $fheight ) ) {
+							$scaled = true;
+			}
 		}
 
 		if ( !$scaled ) {
@@ -742,8 +758,9 @@ 
 		}
 	} elseif ( !empty($_REQUEST['history']) ) {
 		$changes = json_decode( wp_unslash($_REQUEST['history']) );
-		if ( $changes )
-			$img = image_edit_apply_changes($img, $changes);
+		if ( $changes ) {
+					$img = image_edit_apply_changes($img, $changes);
+		}
 	} else {
 		$return->error = esc_js( __('Nothing to save, the image has not changed.') );
 		return $return;
@@ -757,8 +774,9 @@ 
 		return $return;
 	}
 
-	if ( !is_array($backup_sizes) )
-		$backup_sizes = array();
+	if ( !is_array($backup_sizes) ) {
+			$backup_sizes = array();
+	}
 
 	// Generate new filename.
 	$path = get_attached_file($post_id);
@@ -769,20 +787,22 @@ 
 	if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
 		isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] ) {
 
-		if ( 'thumbnail' == $target )
-			$new_path = "{$path_parts['dirname']}/{$filename}-temp.{$path_parts['extension']}";
-		else
-			$new_path = $path;
+		if ( 'thumbnail' == $target ) {
+					$new_path = "{$path_parts['dirname']}/{$filename}-temp.{$path_parts['extension']}";
+		} else {
+					$new_path = $path;
+		}
 	} else {
 		while( true ) {
 			$filename = preg_replace( '/-e([0-9]+)$/', '', $filename );
 			$filename .= "-e{$suffix}";
 			$new_filename = "{$filename}.{$path_parts['extension']}";
 			$new_path = "{$path_parts['dirname']}/$new_filename";
-			if ( file_exists($new_path) )
-				$suffix++;
-			else
-				break;
+			if ( file_exists($new_path) ) {
+							$suffix++;
+			} else {
+							break;
+			}
 		}
 	}
 
@@ -795,14 +815,16 @@ 
 	if ( 'nothumb' == $target || 'all' == $target || 'full' == $target || $scaled ) {
 		$tag = false;
 		if ( isset($backup_sizes['full-orig']) ) {
-			if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] )
-				$tag = "full-$suffix";
+			if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] ) {
+							$tag = "full-$suffix";
+			}
 		} else {
 			$tag = 'full-orig';
 		}
 
-		if ( $tag )
-			$backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
+		if ( $tag ) {
+					$backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
+		}
 
 		$success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
 
@@ -814,8 +836,9 @@ 
 
 		if ( $success && ('nothumb' == $target || 'all' == $target) ) {
 			$sizes = get_intermediate_image_sizes();
-			if ( 'nothumb' == $target )
-				$sizes = array_diff( $sizes, array('thumbnail') );
+			if ( 'nothumb' == $target ) {
+							$sizes = array_diff( $sizes, array('thumbnail') );
+			}
 		}
 
 		$return->fw = $meta['width'];
@@ -847,14 +870,16 @@ 
 			$tag = false;
 			if ( isset( $meta['sizes'][$size] ) ) {
 				if ( isset($backup_sizes["$size-orig"]) ) {
-					if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] )
-						$tag = "$size-$suffix";
+					if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] ) {
+											$tag = "$size-$suffix";
+					}
 				} else {
 					$tag = "$size-orig";
 				}
 
-				if ( $tag )
-					$backup_sizes[$tag] = $meta['sizes'][$size];
+				if ( $tag ) {
+									$backup_sizes[$tag] = $meta['sizes'][$size];
+				}
 			}
 
 			if ( isset( $_wp_additional_image_sizes[ $size ] ) ) {

src/wp-includes/class-feed.php

Doc Comments +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
 	 * @access public
 	 *
 	 * @param SimplePie $data Data to save.
-	 * @return true Always true.
+	 * @return boolean Always true.
 	 */
 	public function save($data) {
 		if ( $data instanceof SimplePie ) {
@@ -152,7 +152,7 @@ 
 	 * @since 2.8.0
 	 * @access public
 	 *
-	 * @return true Always true.
+	 * @return boolean Always true.
 	 */
 	public function unlink() {
 		delete_transient($this->name);

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

Doc Comments +2 added lines, -2 removed lines

@@ -337,8 +337,8 @@
 	 *
 	 * @since 3.4.0
 	 *
-	 * @param mixed $ajax_message Ajax return
-	 * @param mixed $message UI message
+	 * @param integer $ajax_message Ajax return
+	 * @param string $message UI message
 	 */
 	protected function wp_die( $ajax_message, $message = null ) {
 		if ( $this->doing_ajax() || isset( $_POST['customized'] ) ) {

Spacing +526 added lines, -526 removed lines

@@ -109,7 +109,7 @@ 
 	 * @access protected
 	 * @var array
 	 */
-	protected $components = array( 'widgets', 'nav_menus' );
+	protected $components = array('widgets', 'nav_menus');
 
 	/**
 	 * Registered instances of WP_Customize_Section.
@@ -205,41 +205,41 @@ 
 	 * @since 3.4.0
 	 */
 	public function __construct() {
-		require_once( ABSPATH . WPINC . '/class-wp-customize-setting.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-panel.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-section.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-control.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-color-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-media-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-upload-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menus-panel.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-themes-section.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-sidebar-section.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-section.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-setting.php' );
+		require_once(ABSPATH.WPINC.'/class-wp-customize-setting.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-panel.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-section.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-control.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-color-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-media-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-upload-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-cropped-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-site-icon-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-theme-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-widget-area-customize-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-widget-form-customize-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-location-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-name-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-auto-add-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-new-menu-control.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menus-panel.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-themes-section.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-sidebar-section.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-section.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-new-menu-section.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-filter-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-setting.php');
 
 		/**
 		 * Filters the core Customizer components to load.
@@ -256,52 +256,52 @@ 
 		 * @param array                $components List of core components to load.
 		 * @param WP_Customize_Manager $this       WP_Customize_Manager instance.
 		 */
-		$components = apply_filters( 'customize_loaded_components', $this->components, $this );
+		$components = apply_filters('customize_loaded_components', $this->components, $this);
 
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-selective-refresh.php' );
-		$this->selective_refresh = new WP_Customize_Selective_Refresh( $this );
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-selective-refresh.php');
+		$this->selective_refresh = new WP_Customize_Selective_Refresh($this);
 
-		if ( in_array( 'widgets', $components, true ) ) {
-			require_once( ABSPATH . WPINC . '/class-wp-customize-widgets.php' );
-			$this->widgets = new WP_Customize_Widgets( $this );
+		if (in_array('widgets', $components, true)) {
+			require_once(ABSPATH.WPINC.'/class-wp-customize-widgets.php');
+			$this->widgets = new WP_Customize_Widgets($this);
 		}
 
-		if ( in_array( 'nav_menus', $components, true ) ) {
-			require_once( ABSPATH . WPINC . '/class-wp-customize-nav-menus.php' );
-			$this->nav_menus = new WP_Customize_Nav_Menus( $this );
+		if (in_array('nav_menus', $components, true)) {
+			require_once(ABSPATH.WPINC.'/class-wp-customize-nav-menus.php');
+			$this->nav_menus = new WP_Customize_Nav_Menus($this);
 		}
 
-		add_filter( 'wp_die_handler', array( $this, 'wp_die_handler' ) );
+		add_filter('wp_die_handler', array($this, 'wp_die_handler'));
 
-		add_action( 'setup_theme', array( $this, 'setup_theme' ) );
-		add_action( 'wp_loaded',   array( $this, 'wp_loaded' ) );
+		add_action('setup_theme', array($this, 'setup_theme'));
+		add_action('wp_loaded', array($this, 'wp_loaded'));
 
 		// Run wp_redirect_status late to make sure we override the status last.
-		add_action( 'wp_redirect_status', array( $this, 'wp_redirect_status' ), 1000 );
+		add_action('wp_redirect_status', array($this, 'wp_redirect_status'), 1000);
 
 		// Do not spawn cron (especially the alternate cron) while running the Customizer.
-		remove_action( 'init', 'wp_cron' );
+		remove_action('init', 'wp_cron');
 
 		// Do not run update checks when rendering the controls.
-		remove_action( 'admin_init', '_maybe_update_core' );
-		remove_action( 'admin_init', '_maybe_update_plugins' );
-		remove_action( 'admin_init', '_maybe_update_themes' );
+		remove_action('admin_init', '_maybe_update_core');
+		remove_action('admin_init', '_maybe_update_plugins');
+		remove_action('admin_init', '_maybe_update_themes');
 
-		add_action( 'wp_ajax_customize_save',           array( $this, 'save' ) );
-		add_action( 'wp_ajax_customize_refresh_nonces', array( $this, 'refresh_nonces' ) );
+		add_action('wp_ajax_customize_save', array($this, 'save'));
+		add_action('wp_ajax_customize_refresh_nonces', array($this, 'refresh_nonces'));
 
-		add_action( 'customize_register',                 array( $this, 'register_controls' ) );
-		add_action( 'customize_register',                 array( $this, 'register_dynamic_settings' ), 11 ); // allow code to create settings first
-		add_action( 'customize_controls_init',            array( $this, 'prepare_controls' ) );
-		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_control_scripts' ) );
+		add_action('customize_register', array($this, 'register_controls'));
+		add_action('customize_register', array($this, 'register_dynamic_settings'), 11); // allow code to create settings first
+		add_action('customize_controls_init', array($this, 'prepare_controls'));
+		add_action('customize_controls_enqueue_scripts', array($this, 'enqueue_control_scripts'));
 
 		// Render Panel, Section, and Control templates.
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_panel_templates' ), 1 );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_section_templates' ), 1 );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_control_templates' ), 1 );
+		add_action('customize_controls_print_footer_scripts', array($this, 'render_panel_templates'), 1);
+		add_action('customize_controls_print_footer_scripts', array($this, 'render_section_templates'), 1);
+		add_action('customize_controls_print_footer_scripts', array($this, 'render_control_templates'), 1);
 
 		// Export the settings to JS via the _wpCustomizeSettings variable.
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'customize_pane_settings' ), 1000 );
+		add_action('customize_controls_print_footer_scripts', array($this, 'customize_pane_settings'), 1000);
 	}
 
 	/**
@@ -314,20 +314,20 @@ 
 	 * @param string|null $action Whether the supplied Ajax action is being run.
 	 * @return bool True if it's an Ajax request, false otherwise.
 	 */
-	public function doing_ajax( $action = null ) {
-		$doing_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
-		if ( ! $doing_ajax ) {
+	public function doing_ajax($action = null) {
+		$doing_ajax = (defined('DOING_AJAX') && DOING_AJAX);
+		if ( ! $doing_ajax) {
 			return false;
 		}
 
-		if ( ! $action ) {
+		if ( ! $action) {
 			return true;
 		} else {
 			/*
 			 * Note: we can't just use doing_action( "wp_ajax_{$action}" ) because we need
 			 * to check before admin-ajax.php gets to that point.
 			 */
-			return isset( $_REQUEST['action'] ) && wp_unslash( $_REQUEST['action'] ) === $action;
+			return isset($_REQUEST['action']) && wp_unslash($_REQUEST['action']) === $action;
 		}
 	}
 
@@ -340,16 +340,16 @@ 
 	 * @param mixed $ajax_message Ajax return
 	 * @param mixed $message UI message
 	 */
-	protected function wp_die( $ajax_message, $message = null ) {
-		if ( $this->doing_ajax() || isset( $_POST['customized'] ) ) {
-			wp_die( $ajax_message );
+	protected function wp_die($ajax_message, $message = null) {
+		if ($this->doing_ajax() || isset($_POST['customized'])) {
+			wp_die($ajax_message);
 		}
 
-		if ( ! $message ) {
-			$message = __( 'Cheatin’ uh?' );
+		if ( ! $message) {
+			$message = __('Cheatin’ uh?');
 		}
 
-		wp_die( $message );
+		wp_die($message);
 	}
 
 	/**
@@ -360,7 +360,7 @@ 
 	 * @return string
 	 */
 	public function wp_die_handler() {
-		if ( $this->doing_ajax() || isset( $_POST['customized'] ) ) {
+		if ($this->doing_ajax() || isset($_POST['customized'])) {
 			return '_ajax_wp_die_handler';
 		}
 
@@ -377,41 +377,41 @@ 
 	public function setup_theme() {
 		send_origin_headers();
 
-		$doing_ajax_or_is_customized = ( $this->doing_ajax() || isset( $_POST['customized'] ) );
-		if ( is_admin() && ! $doing_ajax_or_is_customized ) {
+		$doing_ajax_or_is_customized = ($this->doing_ajax() || isset($_POST['customized']));
+		if (is_admin() && ! $doing_ajax_or_is_customized) {
 			auth_redirect();
-		} elseif ( $doing_ajax_or_is_customized && ! is_user_logged_in() ) {
-			$this->wp_die( 0, __( 'You must be logged in to complete this action.' ) );
+		} elseif ($doing_ajax_or_is_customized && ! is_user_logged_in()) {
+			$this->wp_die(0, __('You must be logged in to complete this action.'));
 		}
 
-		show_admin_bar( false );
+		show_admin_bar(false);
 
-		if ( ! current_user_can( 'customize' ) ) {
-			$this->wp_die( -1, __( 'Sorry, you are not allowed to customize this site.' ) );
+		if ( ! current_user_can('customize')) {
+			$this->wp_die( -1, __('Sorry, you are not allowed to customize this site.') );
 		}
 
 		$this->original_stylesheet = get_stylesheet();
 
-		$this->theme = wp_get_theme( isset( $_REQUEST['theme'] ) ? $_REQUEST['theme'] : null );
+		$this->theme = wp_get_theme(isset($_REQUEST['theme']) ? $_REQUEST['theme'] : null);
 
-		if ( $this->is_theme_active() ) {
+		if ($this->is_theme_active()) {
 			// Once the theme is loaded, we'll validate it.
-			add_action( 'after_setup_theme', array( $this, 'after_setup_theme' ) );
+			add_action('after_setup_theme', array($this, 'after_setup_theme'));
 		} else {
 			// If the requested theme is not the active theme and the user doesn't have the
 			// switch_themes cap, bail.
-			if ( ! current_user_can( 'switch_themes' ) ) {
-				$this->wp_die( -1, __( 'Sorry, you are not allowed to edit theme options on this site.' ) );
+			if ( ! current_user_can('switch_themes')) {
+				$this->wp_die( -1, __('Sorry, you are not allowed to edit theme options on this site.') );
 			}
 
 			// If the theme has errors while loading, bail.
-			if ( $this->theme()->errors() ) {
+			if ($this->theme()->errors()) {
 				$this->wp_die( -1, $this->theme()->errors()->get_error_message() );
 			}
 
 			// If the theme isn't allowed per multisite settings, bail.
-			if ( ! $this->theme()->is_allowed() ) {
-				$this->wp_die( -1, __( 'The requested theme does not exist.' ) );
+			if ( ! $this->theme()->is_allowed()) {
+				$this->wp_die( -1, __('The requested theme does not exist.') );
 			}
 		}
 
@@ -424,9 +424,9 @@ 
 	 * @since 3.4.0
 	 */
 	public function after_setup_theme() {
-		$doing_ajax_or_is_customized = ( $this->doing_ajax() || isset( $_POST['customized'] ) );
-		if ( ! $doing_ajax_or_is_customized && ! validate_current_theme() ) {
-			wp_redirect( 'themes.php?broken=true' );
+		$doing_ajax_or_is_customized = ($this->doing_ajax() || isset($_POST['customized']));
+		if ( ! $doing_ajax_or_is_customized && ! validate_current_theme()) {
+			wp_redirect('themes.php?broken=true');
 			exit;
 		}
 	}
@@ -439,24 +439,24 @@ 
 	 */
 	public function start_previewing_theme() {
 		// Bail if we're already previewing.
-		if ( $this->is_preview() ) {
+		if ($this->is_preview()) {
 			return;
 		}
 
 		$this->previewing = true;
 
-		if ( ! $this->is_theme_active() ) {
-			add_filter( 'template', array( $this, 'get_template' ) );
-			add_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
-			add_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
+		if ( ! $this->is_theme_active()) {
+			add_filter('template', array($this, 'get_template'));
+			add_filter('stylesheet', array($this, 'get_stylesheet'));
+			add_filter('pre_option_current_theme', array($this, 'current_theme'));
 
 			// @link: https://core.trac.wordpress.org/ticket/20027
-			add_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
-			add_filter( 'pre_option_template', array( $this, 'get_template' ) );
+			add_filter('pre_option_stylesheet', array($this, 'get_stylesheet'));
+			add_filter('pre_option_template', array($this, 'get_template'));
 
 			// Handle custom theme roots.
-			add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
-			add_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
+			add_filter('pre_option_stylesheet_root', array($this, 'get_stylesheet_root'));
+			add_filter('pre_option_template_root', array($this, 'get_template_root'));
 		}
 
 		/**
@@ -466,7 +466,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'start_previewing_theme', $this );
+		do_action('start_previewing_theme', $this);
 	}
 
 	/**
@@ -477,24 +477,24 @@ 
 	 * @since 3.4.0
 	 */
 	public function stop_previewing_theme() {
-		if ( ! $this->is_preview() ) {
+		if ( ! $this->is_preview()) {
 			return;
 		}
 
 		$this->previewing = false;
 
-		if ( ! $this->is_theme_active() ) {
-			remove_filter( 'template', array( $this, 'get_template' ) );
-			remove_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
-			remove_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
+		if ( ! $this->is_theme_active()) {
+			remove_filter('template', array($this, 'get_template'));
+			remove_filter('stylesheet', array($this, 'get_stylesheet'));
+			remove_filter('pre_option_current_theme', array($this, 'current_theme'));
 
 			// @link: https://core.trac.wordpress.org/ticket/20027
-			remove_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
-			remove_filter( 'pre_option_template', array( $this, 'get_template' ) );
+			remove_filter('pre_option_stylesheet', array($this, 'get_stylesheet'));
+			remove_filter('pre_option_template', array($this, 'get_template'));
 
 			// Handle custom theme roots.
-			remove_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
-			remove_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
+			remove_filter('pre_option_stylesheet_root', array($this, 'get_stylesheet_root'));
+			remove_filter('pre_option_template_root', array($this, 'get_template_root'));
 		}
 
 		/**
@@ -504,7 +504,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'stop_previewing_theme', $this );
+		do_action('stop_previewing_theme', $this);
 	}
 
 	/**
@@ -515,7 +515,7 @@ 
 	 * @return WP_Theme
 	 */
 	public function theme() {
-		if ( ! $this->theme ) {
+		if ( ! $this->theme) {
 			$this->theme = wp_get_theme();
 		}
 		return $this->theme;
@@ -602,9 +602,9 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_register', $this );
+		do_action('customize_register', $this);
 
-		if ( $this->is_preview() && ! is_admin() )
+		if ($this->is_preview() && ! is_admin())
 			$this->customize_preview_init();
 	}
 
@@ -619,8 +619,8 @@ 
 	 * @param $status
 	 * @return int
 	 */
-	public function wp_redirect_status( $status ) {
-		if ( $this->is_preview() && ! is_admin() )
+	public function wp_redirect_status($status) {
+		if ($this->is_preview() && ! is_admin())
 			return 200;
 
 		return $status;
@@ -635,15 +635,15 @@ 
 	 * @return array
 	 */
 	public function unsanitized_post_values() {
-		if ( ! isset( $this->_post_values ) ) {
-			if ( isset( $_POST['customized'] ) ) {
-				$this->_post_values = json_decode( wp_unslash( $_POST['customized'] ), true );
+		if ( ! isset($this->_post_values)) {
+			if (isset($_POST['customized'])) {
+				$this->_post_values = json_decode(wp_unslash($_POST['customized']), true);
 			}
-			if ( empty( $this->_post_values ) ) { // if not isset or if JSON error
+			if (empty($this->_post_values)) { // if not isset or if JSON error
 				$this->_post_values = array();
 			}
 		}
-		if ( empty( $this->_post_values ) ) {
+		if (empty($this->_post_values)) {
 			return array();
 		} else {
 			return $this->_post_values;
@@ -667,18 +667,18 @@ 
 	 *                                      or the post value is invalid (added in 4.6.0).
 	 * @return string|mixed $post_value Sanitized value or the $default provided.
 	 */
-	public function post_value( $setting, $default = null ) {
+	public function post_value($setting, $default = null) {
 		$post_values = $this->unsanitized_post_values();
-		if ( ! array_key_exists( $setting->id, $post_values ) ) {
+		if ( ! array_key_exists($setting->id, $post_values)) {
 			return $default;
 		}
-		$value = $post_values[ $setting->id ];
-		$valid = $setting->validate( $value );
-		if ( is_wp_error( $valid ) ) {
+		$value = $post_values[$setting->id];
+		$valid = $setting->validate($value);
+		if (is_wp_error($valid)) {
 			return $default;
 		}
-		$value = $setting->sanitize( $value );
-		if ( is_null( $value ) || is_wp_error( $value ) ) {
+		$value = $setting->sanitize($value);
+		if (is_null($value) || is_wp_error($value)) {
 			return $default;
 		}
 		return $value;
@@ -693,9 +693,9 @@ 
 	 * @param string $setting_id ID for the WP_Customize_Setting instance.
 	 * @param mixed  $value      Post value.
 	 */
-	public function set_post_value( $setting_id, $value ) {
+	public function set_post_value($setting_id, $value) {
 		$this->unsanitized_post_values();
-		$this->_post_values[ $setting_id ] = $value;
+		$this->_post_values[$setting_id] = $value;
 
 		/**
 		 * Announce when a specific setting's unsanitized post value has been set.
@@ -709,7 +709,7 @@ 
 		 * @param mixed                $value Unsanitized setting post value.
 		 * @param WP_Customize_Manager $this  WP_Customize_Manager instance.
 		 */
-		do_action( "customize_post_value_set_{$setting_id}", $value, $this );
+		do_action("customize_post_value_set_{$setting_id}", $value, $this);
 
 		/**
 		 * Announce when any setting's unsanitized post value has been set.
@@ -725,7 +725,7 @@ 
 		 * @param mixed                $value      Unsanitized setting post value.
 		 * @param WP_Customize_Manager $this       WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_post_value_set', $setting_id, $value, $this );
+		do_action('customize_post_value_set', $setting_id, $value, $this);
 	}
 
 	/**
@@ -734,20 +734,20 @@ 
 	 * @since 3.4.0
 	 */
 	public function customize_preview_init() {
-		$this->nonce_tick = check_ajax_referer( 'preview-customize_' . $this->get_stylesheet(), 'nonce' );
+		$this->nonce_tick = check_ajax_referer('preview-customize_'.$this->get_stylesheet(), 'nonce');
 
 		$this->prepare_controls();
 
-		wp_enqueue_script( 'customize-preview' );
-		add_action( 'wp', array( $this, 'customize_preview_override_404_status' ) );
-		add_action( 'wp_head', array( $this, 'customize_preview_base' ) );
-		add_action( 'wp_head', array( $this, 'customize_preview_html5' ) );
-		add_action( 'wp_head', array( $this, 'customize_preview_loading_style' ) );
-		add_action( 'wp_footer', array( $this, 'customize_preview_settings' ), 20 );
-		add_action( 'shutdown', array( $this, 'customize_preview_signature' ), 1000 );
-		add_filter( 'wp_die_handler', array( $this, 'remove_preview_signature' ) );
+		wp_enqueue_script('customize-preview');
+		add_action('wp', array($this, 'customize_preview_override_404_status'));
+		add_action('wp_head', array($this, 'customize_preview_base'));
+		add_action('wp_head', array($this, 'customize_preview_html5'));
+		add_action('wp_head', array($this, 'customize_preview_loading_style'));
+		add_action('wp_footer', array($this, 'customize_preview_settings'), 20);
+		add_action('shutdown', array($this, 'customize_preview_signature'), 1000);
+		add_filter('wp_die_handler', array($this, 'remove_preview_signature'));
 
-		foreach ( $this->settings as $setting ) {
+		foreach ($this->settings as $setting) {
 			$setting->preview();
 		}
 
@@ -759,7 +759,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_preview_init', $this );
+		do_action('customize_preview_init', $this);
 	}
 
 	/**
@@ -770,8 +770,8 @@ 
 	 * @access public
 	 */
 	public function customize_preview_override_404_status() {
-		if ( is_404() ) {
-			status_header( 200 );
+		if (is_404()) {
+			status_header(200);
 		}
 	}
 
@@ -781,7 +781,7 @@ 
 	 * @since 3.4.0
 	 */
 	public function customize_preview_base() {
-		?><base href="<?php echo home_url( '/' ); ?>" /><?php
+		?><base href="<?php echo home_url('/'); ?>" /><?php
 	}
 
 	/**
@@ -828,8 +828,8 @@ 
 	 * @since 3.4.0
 	 */
 	public function customize_preview_settings() {
-		$setting_validities = $this->validate_setting_values( $this->unsanitized_post_values() );
-		$exported_setting_validities = array_map( array( $this, 'prepare_setting_validity_for_js' ), $setting_validities );
+		$setting_validities = $this->validate_setting_values($this->unsanitized_post_values());
+		$exported_setting_validities = array_map(array($this, 'prepare_setting_validity_for_js'), $setting_validities);
 
 		$settings = array(
 			'theme' => array(
@@ -837,44 +837,44 @@ 
 				'active'     => $this->is_theme_active(),
 			),
 			'url' => array(
-				'self' => empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+				'self' => empty($_SERVER['REQUEST_URI']) ? home_url('/') : esc_url_raw(wp_unslash($_SERVER['REQUEST_URI'])),
 			),
-			'channel' => wp_unslash( $_POST['customize_messenger_channel'] ),
+			'channel' => wp_unslash($_POST['customize_messenger_channel']),
 			'activePanels' => array(),
 			'activeSections' => array(),
 			'activeControls' => array(),
 			'settingValidities' => $exported_setting_validities,
 			'nonce' => $this->get_nonces(),
 			'l10n' => array(
-				'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
+				'shiftClickToEdit' => __('Shift-click to edit this element.'),
 			),
-			'_dirty' => array_keys( $this->unsanitized_post_values() ),
+			'_dirty' => array_keys($this->unsanitized_post_values()),
 		);
 
-		foreach ( $this->panels as $panel_id => $panel ) {
-			if ( $panel->check_capabilities() ) {
-				$settings['activePanels'][ $panel_id ] = $panel->active();
-				foreach ( $panel->sections as $section_id => $section ) {
-					if ( $section->check_capabilities() ) {
-						$settings['activeSections'][ $section_id ] = $section->active();
+		foreach ($this->panels as $panel_id => $panel) {
+			if ($panel->check_capabilities()) {
+				$settings['activePanels'][$panel_id] = $panel->active();
+				foreach ($panel->sections as $section_id => $section) {
+					if ($section->check_capabilities()) {
+						$settings['activeSections'][$section_id] = $section->active();
 					}
 				}
 			}
 		}
-		foreach ( $this->sections as $id => $section ) {
-			if ( $section->check_capabilities() ) {
-				$settings['activeSections'][ $id ] = $section->active();
+		foreach ($this->sections as $id => $section) {
+			if ($section->check_capabilities()) {
+				$settings['activeSections'][$id] = $section->active();
 			}
 		}
-		foreach ( $this->controls as $id => $control ) {
-			if ( $control->check_capabilities() ) {
-				$settings['activeControls'][ $id ] = $control->active();
+		foreach ($this->controls as $id => $control) {
+			if ($control->check_capabilities()) {
+				$settings['activeControls'][$id] = $control->active();
 			}
 		}
 
 		?>
 		<script type="text/javascript">
-			var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+			var _wpCustomizeSettings = <?php echo wp_json_encode($settings); ?>;
 			_wpCustomizeSettings.values = {};
 			(function( v ) {
 				<?php
@@ -883,12 +883,12 @@ 
 				 * serialization in order to avoid a peak memory usage spike.
 				 * @todo We may not even need to export the values at all since the pane syncs them anyway.
 				 */
-				foreach ( $this->settings as $id => $setting ) {
-					if ( $setting->check_capabilities() ) {
+				foreach ($this->settings as $id => $setting) {
+					if ($setting->check_capabilities()) {
 						printf(
 							"v[%s] = %s;\n",
-							wp_json_encode( $id ),
-							wp_json_encode( $setting->js_value() )
+							wp_json_encode($id),
+							wp_json_encode($setting->js_value())
 						);
 					}
 				}
@@ -915,8 +915,8 @@ 
 	 * @param mixed $return Value passed through for {@see 'wp_die_handler'} filter.
 	 * @return mixed Value passed through for {@see 'wp_die_handler'} filter.
 	 */
-	public function remove_preview_signature( $return = null ) {
-		remove_action( 'shutdown', array( $this, 'customize_preview_signature' ), 1000 );
+	public function remove_preview_signature($return = null) {
+		remove_action('shutdown', array($this, 'customize_preview_signature'), 1000);
 
 		return $return;
 	}
@@ -962,7 +962,7 @@ 
 	 * @return string Theme root.
 	 */
 	public function get_template_root() {
-		return get_raw_theme_root( $this->get_template(), true );
+		return get_raw_theme_root($this->get_template(), true);
 	}
 
 	/**
@@ -973,7 +973,7 @@ 
 	 * @return string Theme root.
 	 */
 	public function get_stylesheet_root() {
-		return get_raw_theme_root( $this->get_stylesheet(), true );
+		return get_raw_theme_root($this->get_stylesheet(), true);
 	}
 
 	/**
@@ -984,7 +984,7 @@ 
 	 * @param $current_theme {@internal Parameter is not used}
 	 * @return string Theme name.
 	 */
-	public function current_theme( $current_theme ) {
+	public function current_theme($current_theme) {
 		return $this->theme()->display('Name');
 	}
 
@@ -1004,26 +1004,26 @@ 
 	 * @param array $setting_values Mapping of setting IDs to values to sanitize and validate.
 	 * @return array Mapping of setting IDs to return value of validate method calls, either `true` or `WP_Error`.
 	 */
-	public function validate_setting_values( $setting_values ) {
+	public function validate_setting_values($setting_values) {
 		$validities = array();
-		foreach ( $setting_values as $setting_id => $unsanitized_value ) {
-			$setting = $this->get_setting( $setting_id );
-			if ( ! $setting || is_null( $unsanitized_value ) ) {
+		foreach ($setting_values as $setting_id => $unsanitized_value) {
+			$setting = $this->get_setting($setting_id);
+			if ( ! $setting || is_null($unsanitized_value)) {
 				continue;
 			}
-			$validity = $setting->validate( $unsanitized_value );
-			if ( ! is_wp_error( $validity ) ) {
-				$value = $setting->sanitize( $unsanitized_value );
-				if ( is_null( $value ) ) {
+			$validity = $setting->validate($unsanitized_value);
+			if ( ! is_wp_error($validity)) {
+				$value = $setting->sanitize($unsanitized_value);
+				if (is_null($value)) {
 					$validity = false;
-				} elseif ( is_wp_error( $value ) ) {
+				} elseif (is_wp_error($value)) {
 					$validity = $value;
 				}
 			}
-			if ( false === $validity ) {
-				$validity = new WP_Error( 'invalid_value', __( 'Invalid value.' ) );
+			if (false === $validity) {
+				$validity = new WP_Error('invalid_value', __('Invalid value.'));
 			}
-			$validities[ $setting_id ] = $validity;
+			$validities[$setting_id] = $validity;
 		}
 		return $validities;
 	}
@@ -1042,20 +1042,20 @@ 
 	 *                    to their respective `message` and `data` to pass into the
 	 *                    `wp.customize.Notification` JS model.
 	 */
-	public function prepare_setting_validity_for_js( $validity ) {
-		if ( is_wp_error( $validity ) ) {
+	public function prepare_setting_validity_for_js($validity) {
+		if (is_wp_error($validity)) {
 			$notification = array();
-			foreach ( $validity->errors as $error_code => $error_messages ) {
-				$error_data = $validity->get_error_data( $error_code );
-				if ( is_null( $error_data ) ) {
+			foreach ($validity->errors as $error_code => $error_messages) {
+				$error_data = $validity->get_error_data($error_code);
+				if (is_null($error_data)) {
 					$error_data = array();
 				}
 				$error_data = array_merge(
 					$error_data,
-					array( 'from_server' => true )
+					array('from_server' => true)
 				);
-				$notification[ $error_code ] = array(
-					'message' => join( ' ', $error_messages ),
+				$notification[$error_code] = array(
+					'message' => join(' ', $error_messages),
 					'data' => $error_data,
 				);
 			}
@@ -1071,13 +1071,13 @@ 
 	 * @since 3.4.0
 	 */
 	public function save() {
-		if ( ! $this->is_preview() ) {
-			wp_send_json_error( 'not_preview' );
+		if ( ! $this->is_preview()) {
+			wp_send_json_error('not_preview');
 		}
 
-		$action = 'save-customize_' . $this->get_stylesheet();
-		if ( ! check_ajax_referer( $action, 'nonce', false ) ) {
-			wp_send_json_error( 'invalid_nonce' );
+		$action = 'save-customize_'.$this->get_stylesheet();
+		if ( ! check_ajax_referer($action, 'nonce', false)) {
+			wp_send_json_error('invalid_nonce');
 		}
 
 		/**
@@ -1091,30 +1091,30 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_save_validation_before', $this );
+		do_action('customize_save_validation_before', $this);
 
 		// Validate settings.
-		$setting_validities = $this->validate_setting_values( $this->unsanitized_post_values() );
-		$invalid_setting_count = count( array_filter( $setting_validities, 'is_wp_error' ) );
-		$exported_setting_validities = array_map( array( $this, 'prepare_setting_validity_for_js' ), $setting_validities );
-		if ( $invalid_setting_count > 0 ) {
+		$setting_validities = $this->validate_setting_values($this->unsanitized_post_values());
+		$invalid_setting_count = count(array_filter($setting_validities, 'is_wp_error'));
+		$exported_setting_validities = array_map(array($this, 'prepare_setting_validity_for_js'), $setting_validities);
+		if ($invalid_setting_count > 0) {
 			$response = array(
 				'setting_validities' => $exported_setting_validities,
-				'message' => sprintf( _n( 'There is %s invalid setting.', 'There are %s invalid settings.', $invalid_setting_count ), number_format_i18n( $invalid_setting_count ) ),
+				'message' => sprintf(_n('There is %s invalid setting.', 'There are %s invalid settings.', $invalid_setting_count), number_format_i18n($invalid_setting_count)),
 			);
 
 			/** This filter is documented in wp-includes/class-wp-customize-manager.php */
-			$response = apply_filters( 'customize_save_response', $response, $this );
-			wp_send_json_error( $response );
+			$response = apply_filters('customize_save_response', $response, $this);
+			wp_send_json_error($response);
 		}
 
 		// Do we have to switch themes?
-		if ( ! $this->is_theme_active() ) {
+		if ( ! $this->is_theme_active()) {
 			// Temporarily stop previewing the theme to allow switch_themes()
 			// to operate properly.
 			$this->stop_previewing_theme();
-			switch_theme( $this->get_stylesheet() );
-			update_option( 'theme_switched_via_customizer', true );
+			switch_theme($this->get_stylesheet());
+			update_option('theme_switched_via_customizer', true);
 			$this->start_previewing_theme();
 		}
 
@@ -1126,9 +1126,9 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_save', $this );
+		do_action('customize_save', $this);
 
-		foreach ( $this->settings as $setting ) {
+		foreach ($this->settings as $setting) {
 			$setting->save();
 		}
 
@@ -1139,7 +1139,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_save_after', $this );
+		do_action('customize_save_after', $this);
 
 		$data = array(
 			'setting_validities' => $exported_setting_validities,
@@ -1156,8 +1156,8 @@ 
 		 *                                   event on `wp.customize`.
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		$response = apply_filters( 'customize_save_response', $data, $this );
-		wp_send_json_success( $response );
+		$response = apply_filters('customize_save_response', $data, $this);
+		wp_send_json_success($response);
 	}
 
 	/**
@@ -1166,11 +1166,11 @@ 
 	 * @since 4.2.0
 	 */
 	public function refresh_nonces() {
-		if ( ! $this->is_preview() ) {
-			wp_send_json_error( 'not_preview' );
+		if ( ! $this->is_preview()) {
+			wp_send_json_error('not_preview');
 		}
 
-		wp_send_json_success( $this->get_nonces() );
+		wp_send_json_success($this->get_nonces());
 	}
 
 	/**
@@ -1185,22 +1185,22 @@ 
 	 *                                          constructor.
 	 * @return WP_Customize_Setting             The instance of the setting that was added.
 	 */
-	public function add_setting( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Setting ) {
+	public function add_setting($id, $args = array()) {
+		if ($id instanceof WP_Customize_Setting) {
 			$setting = $id;
 		} else {
 			$class = 'WP_Customize_Setting';
 
 			/** This filter is documented in wp-includes/class-wp-customize-manager.php */
-			$args = apply_filters( 'customize_dynamic_setting_args', $args, $id );
+			$args = apply_filters('customize_dynamic_setting_args', $args, $id);
 
 			/** This filter is documented in wp-includes/class-wp-customize-manager.php */
-			$class = apply_filters( 'customize_dynamic_setting_class', $class, $id, $args );
+			$class = apply_filters('customize_dynamic_setting_class', $class, $id, $args);
 
-			$setting = new $class( $this, $id, $args );
+			$setting = new $class($this, $id, $args);
 		}
 
-		$this->settings[ $setting->id ] = $setting;
+		$this->settings[$setting->id] = $setting;
 		return $setting;
 	}
 
@@ -1219,11 +1219,11 @@ 
 	 * @param array $setting_ids The setting IDs to add.
 	 * @return array The WP_Customize_Setting objects added.
 	 */
-	public function add_dynamic_settings( $setting_ids ) {
+	public function add_dynamic_settings($setting_ids) {
 		$new_settings = array();
-		foreach ( $setting_ids as $setting_id ) {
+		foreach ($setting_ids as $setting_id) {
 			// Skip settings already created
-			if ( $this->get_setting( $setting_id ) ) {
+			if ($this->get_setting($setting_id)) {
 				continue;
 			}
 
@@ -1242,8 +1242,8 @@ 
 			 * @param false|array $setting_args The arguments to the WP_Customize_Setting constructor.
 			 * @param string      $setting_id   ID for dynamic setting, usually coming from `$_POST['customized']`.
 			 */
-			$setting_args = apply_filters( 'customize_dynamic_setting_args', $setting_args, $setting_id );
-			if ( false === $setting_args ) {
+			$setting_args = apply_filters('customize_dynamic_setting_args', $setting_args, $setting_id);
+			if (false === $setting_args) {
 				continue;
 			}
 
@@ -1256,11 +1256,11 @@ 
 			 * @param string $setting_id    ID for dynamic setting, usually coming from `$_POST['customized']`.
 			 * @param array  $setting_args  WP_Customize_Setting or a subclass.
 			 */
-			$setting_class = apply_filters( 'customize_dynamic_setting_class', $setting_class, $setting_id, $setting_args );
+			$setting_class = apply_filters('customize_dynamic_setting_class', $setting_class, $setting_id, $setting_args);
 
-			$setting = new $setting_class( $this, $setting_id, $setting_args );
+			$setting = new $setting_class($this, $setting_id, $setting_args);
 
-			$this->add_setting( $setting );
+			$this->add_setting($setting);
 			$new_settings[] = $setting;
 		}
 		return $new_settings;
@@ -1274,9 +1274,9 @@ 
 	 * @param string $id Customize Setting ID.
 	 * @return WP_Customize_Setting|void The setting, if set.
 	 */
-	public function get_setting( $id ) {
-		if ( isset( $this->settings[ $id ] ) ) {
-			return $this->settings[ $id ];
+	public function get_setting($id) {
+		if (isset($this->settings[$id])) {
+			return $this->settings[$id];
 		}
 	}
 
@@ -1287,8 +1287,8 @@ 
 	 *
 	 * @param string $id Customize Setting ID.
 	 */
-	public function remove_setting( $id ) {
-		unset( $this->settings[ $id ] );
+	public function remove_setting($id) {
+		unset($this->settings[$id]);
 	}
 
 	/**
@@ -1303,14 +1303,14 @@ 
 	 *
 	 * @return WP_Customize_Panel             The instance of the panel that was added.
 	 */
-	public function add_panel( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Panel ) {
+	public function add_panel($id, $args = array()) {
+		if ($id instanceof WP_Customize_Panel) {
 			$panel = $id;
 		} else {
-			$panel = new WP_Customize_Panel( $this, $id, $args );
+			$panel = new WP_Customize_Panel($this, $id, $args);
 		}
 
-		$this->panels[ $panel->id ] = $panel;
+		$this->panels[$panel->id] = $panel;
 		return $panel;
 	}
 
@@ -1323,9 +1323,9 @@ 
 	 * @param string $id Panel ID to get.
 	 * @return WP_Customize_Panel|void Requested panel instance, if set.
 	 */
-	public function get_panel( $id ) {
-		if ( isset( $this->panels[ $id ] ) ) {
-			return $this->panels[ $id ];
+	public function get_panel($id) {
+		if (isset($this->panels[$id])) {
+			return $this->panels[$id];
 		}
 	}
 
@@ -1337,18 +1337,18 @@ 
 	 *
 	 * @param string $id Panel ID to remove.
 	 */
-	public function remove_panel( $id ) {
+	public function remove_panel($id) {
 		// Removing core components this way is _doing_it_wrong().
-		if ( in_array( $id, $this->components, true ) ) {
+		if (in_array($id, $this->components, true)) {
 			/* translators: 1: panel id, 2: link to 'customize_loaded_components' filter reference */
-			$message = sprintf( __( 'Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.' ),
+			$message = sprintf(__('Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.'),
 				$id,
-				'<a href="' . esc_url( 'https://developer.wordpress.org/reference/hooks/customize_loaded_components/' ) . '"><code>customize_loaded_components</code></a>'
+				'<a href="'.esc_url('https://developer.wordpress.org/reference/hooks/customize_loaded_components/').'"><code>customize_loaded_components</code></a>'
 			);
 
-			_doing_it_wrong( __METHOD__, $message, '4.5.0' );
+			_doing_it_wrong(__METHOD__, $message, '4.5.0');
 		}
-		unset( $this->panels[ $id ] );
+		unset($this->panels[$id]);
 	}
 
 	/**
@@ -1363,7 +1363,7 @@ 
 	 *
 	 * @param string $panel Name of a custom panel which is a subclass of WP_Customize_Panel.
 	 */
-	public function register_panel_type( $panel ) {
+	public function register_panel_type($panel) {
 		$this->registered_panel_types[] = $panel;
 	}
 
@@ -1374,8 +1374,8 @@ 
 	 * @access public
 	 */
 	public function render_panel_templates() {
-		foreach ( $this->registered_panel_types as $panel_type ) {
-			$panel = new $panel_type( $this, 'temp', array() );
+		foreach ($this->registered_panel_types as $panel_type) {
+			$panel = new $panel_type($this, 'temp', array());
 			$panel->print_template();
 		}
 	}
@@ -1392,14 +1392,14 @@ 
 	 *
 	 * @return WP_Customize_Section             The instance of the section that was added.
 	 */
-	public function add_section( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Section ) {
+	public function add_section($id, $args = array()) {
+		if ($id instanceof WP_Customize_Section) {
 			$section = $id;
 		} else {
-			$section = new WP_Customize_Section( $this, $id, $args );
+			$section = new WP_Customize_Section($this, $id, $args);
 		}
 
-		$this->sections[ $section->id ] = $section;
+		$this->sections[$section->id] = $section;
 		return $section;
 	}
 
@@ -1411,9 +1411,9 @@ 
 	 * @param string $id Section ID.
 	 * @return WP_Customize_Section|void The section, if set.
 	 */
-	public function get_section( $id ) {
-		if ( isset( $this->sections[ $id ] ) )
-			return $this->sections[ $id ];
+	public function get_section($id) {
+		if (isset($this->sections[$id]))
+			return $this->sections[$id];
 	}
 
 	/**
@@ -1423,8 +1423,8 @@ 
 	 *
 	 * @param string $id Section ID.
 	 */
-	public function remove_section( $id ) {
-		unset( $this->sections[ $id ] );
+	public function remove_section($id) {
+		unset($this->sections[$id]);
 	}
 
 	/**
@@ -1439,7 +1439,7 @@ 
 	 *
 	 * @param string $section Name of a custom section which is a subclass of WP_Customize_Section.
 	 */
-	public function register_section_type( $section ) {
+	public function register_section_type($section) {
 		$this->registered_section_types[] = $section;
 	}
 
@@ -1450,8 +1450,8 @@ 
 	 * @access public
 	 */
 	public function render_section_templates() {
-		foreach ( $this->registered_section_types as $section_type ) {
-			$section = new $section_type( $this, 'temp', array() );
+		foreach ($this->registered_section_types as $section_type) {
+			$section = new $section_type($this, 'temp', array());
 			$section->print_template();
 		}
 	}
@@ -1468,14 +1468,14 @@ 
 	 *                                          constructor.
 	 * @return WP_Customize_Control             The instance of the control that was added.
 	 */
-	public function add_control( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Control ) {
+	public function add_control($id, $args = array()) {
+		if ($id instanceof WP_Customize_Control) {
 			$control = $id;
 		} else {
-			$control = new WP_Customize_Control( $this, $id, $args );
+			$control = new WP_Customize_Control($this, $id, $args);
 		}
 
-		$this->controls[ $control->id ] = $control;
+		$this->controls[$control->id] = $control;
 		return $control;
 	}
 
@@ -1487,9 +1487,9 @@ 
 	 * @param string $id ID of the control.
 	 * @return WP_Customize_Control|void The control object, if set.
 	 */
-	public function get_control( $id ) {
-		if ( isset( $this->controls[ $id ] ) )
-			return $this->controls[ $id ];
+	public function get_control($id) {
+		if (isset($this->controls[$id]))
+			return $this->controls[$id];
 	}
 
 	/**
@@ -1499,8 +1499,8 @@ 
 	 *
 	 * @param string $id ID of the control.
 	 */
-	public function remove_control( $id ) {
-		unset( $this->controls[ $id ] );
+	public function remove_control($id) {
+		unset($this->controls[$id]);
 	}
 
 	/**
@@ -1514,7 +1514,7 @@ 
 	 * @param string $control Name of a custom control which is a subclass of
 	 *                        WP_Customize_Control.
 	 */
-	public function register_control_type( $control ) {
+	public function register_control_type($control) {
 		$this->registered_control_types[] = $control;
 	}
 
@@ -1525,10 +1525,10 @@ 
 	 * @access public
 	 */
 	public function render_control_templates() {
-		foreach ( $this->registered_control_types as $control_type ) {
-			$control = new $control_type( $this, 'temp', array(
+		foreach ($this->registered_control_types as $control_type) {
+			$control = new $control_type($this, 'temp', array(
 				'settings' => array(),
-			) );
+			));
 			$control->print_template();
 		}
 		?>
@@ -1551,8 +1551,8 @@ 
 	 * @param WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control $b Object B.
 	 * @return int
 	 */
-	protected function _cmp_priority( $a, $b ) {
-		if ( $a->priority === $b->priority ) {
+	protected function _cmp_priority($a, $b) {
+		if ($a->priority === $b->priority) {
 			return $a->instance_number - $b->instance_number;
 		} else {
 			return $a->priority - $b->priority;
@@ -1571,58 +1571,58 @@ 
 	public function prepare_controls() {
 
 		$controls = array();
-		uasort( $this->controls, array( $this, '_cmp_priority' ) );
+		uasort($this->controls, array($this, '_cmp_priority'));
 
-		foreach ( $this->controls as $id => $control ) {
-			if ( ! isset( $this->sections[ $control->section ] ) || ! $control->check_capabilities() ) {
+		foreach ($this->controls as $id => $control) {
+			if ( ! isset($this->sections[$control->section]) || ! $control->check_capabilities()) {
 				continue;
 			}
 
-			$this->sections[ $control->section ]->controls[] = $control;
-			$controls[ $id ] = $control;
+			$this->sections[$control->section]->controls[] = $control;
+			$controls[$id] = $control;
 		}
 		$this->controls = $controls;
 
 		// Prepare sections.
-		uasort( $this->sections, array( $this, '_cmp_priority' ) );
+		uasort($this->sections, array($this, '_cmp_priority'));
 		$sections = array();
 
-		foreach ( $this->sections as $section ) {
-			if ( ! $section->check_capabilities() ) {
+		foreach ($this->sections as $section) {
+			if ( ! $section->check_capabilities()) {
 				continue;
 			}
 
-			usort( $section->controls, array( $this, '_cmp_priority' ) );
+			usort($section->controls, array($this, '_cmp_priority'));
 
-			if ( ! $section->panel ) {
+			if ( ! $section->panel) {
 				// Top-level section.
-				$sections[ $section->id ] = $section;
+				$sections[$section->id] = $section;
 			} else {
 				// This section belongs to a panel.
-				if ( isset( $this->panels [ $section->panel ] ) ) {
-					$this->panels[ $section->panel ]->sections[ $section->id ] = $section;
+				if (isset($this->panels [$section->panel])) {
+					$this->panels[$section->panel]->sections[$section->id] = $section;
 				}
 			}
 		}
 		$this->sections = $sections;
 
 		// Prepare panels.
-		uasort( $this->panels, array( $this, '_cmp_priority' ) );
+		uasort($this->panels, array($this, '_cmp_priority'));
 		$panels = array();
 
-		foreach ( $this->panels as $panel ) {
-			if ( ! $panel->check_capabilities() ) {
+		foreach ($this->panels as $panel) {
+			if ( ! $panel->check_capabilities()) {
 				continue;
 			}
 
-			uasort( $panel->sections, array( $this, '_cmp_priority' ) );
-			$panels[ $panel->id ] = $panel;
+			uasort($panel->sections, array($this, '_cmp_priority'));
+			$panels[$panel->id] = $panel;
 		}
 		$this->panels = $panels;
 
 		// Sort panels and top-level sections together.
-		$this->containers = array_merge( $this->panels, $this->sections );
-		uasort( $this->containers, array( $this, '_cmp_priority' ) );
+		$this->containers = array_merge($this->panels, $this->sections);
+		uasort($this->containers, array($this, '_cmp_priority'));
 	}
 
 	/**
@@ -1631,7 +1631,7 @@ 
 	 * @since 3.4.0
 	 */
 	public function enqueue_control_scripts() {
-		foreach ( $this->controls as $control ) {
+		foreach ($this->controls as $control) {
 			$control->enqueue();
 		}
 	}
@@ -1645,7 +1645,7 @@ 
 	 * @return bool Whether the user agent is iOS.
 	 */
 	public function is_ios() {
-		return wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] );
+		return wp_is_mobile() && preg_match('/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT']);
 	}
 
 	/**
@@ -1657,14 +1657,14 @@ 
 	 * @return string The template string for the document title.
 	 */
 	public function get_document_title_template() {
-		if ( $this->is_theme_active() ) {
+		if ($this->is_theme_active()) {
 			/* translators: %s: document title from the preview */
-			$document_title_tmpl = __( 'Customize: %s' );
+			$document_title_tmpl = __('Customize: %s');
 		} else {
 			/* translators: %s: document title from the preview */
-			$document_title_tmpl = __( 'Live Preview: %s' );
+			$document_title_tmpl = __('Live Preview: %s');
 		}
-		$document_title_tmpl = html_entity_decode( $document_title_tmpl, ENT_QUOTES, 'UTF-8' ); // Because exported to JS and assigned to document.title.
+		$document_title_tmpl = html_entity_decode($document_title_tmpl, ENT_QUOTES, 'UTF-8'); // Because exported to JS and assigned to document.title.
 		return $document_title_tmpl;
 	}
 
@@ -1678,9 +1678,9 @@ 
 	 *
 	 * @param string $preview_url URL to be previewed.
 	 */
-	public function set_preview_url( $preview_url ) {
-		$preview_url = esc_url_raw( $preview_url );
-		$this->preview_url = wp_validate_redirect( $preview_url, home_url( '/' ) );
+	public function set_preview_url($preview_url) {
+		$preview_url = esc_url_raw($preview_url);
+		$this->preview_url = wp_validate_redirect($preview_url, home_url('/'));
 	}
 
 	/**
@@ -1692,8 +1692,8 @@ 
 	 * @return string URL being previewed.
 	 */
 	public function get_preview_url() {
-		if ( empty( $this->preview_url ) ) {
-			$preview_url = home_url( '/' );
+		if (empty($this->preview_url)) {
+			$preview_url = home_url('/');
 		} else {
 			$preview_url = $this->preview_url;
 		}
@@ -1710,10 +1710,10 @@ 
 	 *
 	 * @param string $return_url URL for return link.
 	 */
-	public function set_return_url( $return_url ) {
-		$return_url = esc_url_raw( $return_url );
-		$return_url = remove_query_arg( wp_removable_query_args(), $return_url );
-		$return_url = wp_validate_redirect( $return_url );
+	public function set_return_url($return_url) {
+		$return_url = esc_url_raw($return_url);
+		$return_url = remove_query_arg(wp_removable_query_args(), $return_url);
+		$return_url = wp_validate_redirect($return_url);
 		$this->return_url = $return_url;
 	}
 
@@ -1727,16 +1727,16 @@ 
 	 */
 	public function get_return_url() {
 		$referer = wp_get_referer();
-		$excluded_referer_basenames = array( 'customize.php', 'wp-login.php' );
+		$excluded_referer_basenames = array('customize.php', 'wp-login.php');
 
-		if ( $this->return_url ) {
+		if ($this->return_url) {
 			$return_url = $this->return_url;
-		} else if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
+		} else if ($referer && ! in_array(basename(parse_url($referer, PHP_URL_PATH)), $excluded_referer_basenames, true)) {
 			$return_url = $referer;
-		} else if ( $this->preview_url ) {
+		} else if ($this->preview_url) {
 			$return_url = $this->preview_url;
 		} else {
-			$return_url = home_url( '/' );
+			$return_url = home_url('/');
 		}
 		return $return_url;
 	}
@@ -1755,8 +1755,8 @@ 
 	 *     @type string [$panel]    ID for panel to be autofocused.
 	 * }
 	 */
-	public function set_autofocus( $autofocus ) {
-		$this->autofocus = array_filter( wp_array_slice_assoc( $autofocus, array( 'panel', 'section', 'control' ) ), 'is_string' );
+	public function set_autofocus($autofocus) {
+		$this->autofocus = array_filter(wp_array_slice_assoc($autofocus, array('panel', 'section', 'control')), 'is_string');
 	}
 
 	/**
@@ -1785,8 +1785,8 @@ 
 	 */
 	public function get_nonces() {
 		$nonces = array(
-			'save' => wp_create_nonce( 'save-customize_' . $this->get_stylesheet() ),
-			'preview' => wp_create_nonce( 'preview-customize_' . $this->get_stylesheet() ),
+			'save' => wp_create_nonce('save-customize_'.$this->get_stylesheet()),
+			'preview' => wp_create_nonce('preview-customize_'.$this->get_stylesheet()),
 		);
 
 		/**
@@ -1798,7 +1798,7 @@ 
 		 *                                     preview actions.
 		 * @param WP_Customize_Manager $this   WP_Customize_Manager instance.
 		 */
-		$nonces = apply_filters( 'customize_refresh_nonces', $nonces, $this );
+		$nonces = apply_filters('customize_refresh_nonces', $nonces, $this);
 
 		return $nonces;
 	}
@@ -1818,13 +1818,13 @@ 
 		 * using the customize_allowed_urls filter.
 		 */
 
-		$allowed_urls = array( home_url( '/' ) );
-		$admin_origin = parse_url( admin_url() );
-		$home_origin  = parse_url( home_url() );
-		$cross_domain = ( strtolower( $admin_origin['host'] ) !== strtolower( $home_origin['host'] ) );
+		$allowed_urls = array(home_url('/'));
+		$admin_origin = parse_url(admin_url());
+		$home_origin  = parse_url(home_url());
+		$cross_domain = (strtolower($admin_origin['host']) !== strtolower($home_origin['host']));
 
-		if ( is_ssl() && ! $cross_domain ) {
-			$allowed_urls[] = home_url( '/', 'https' );
+		if (is_ssl() && ! $cross_domain) {
+			$allowed_urls[] = home_url('/', 'https');
 		}
 
 		/**
@@ -1834,12 +1834,12 @@ 
 		 *
 		 * @param array $allowed_urls An array of allowed URLs.
 		 */
-		$allowed_urls = array_unique( apply_filters( 'customize_allowed_urls', $allowed_urls ) );
+		$allowed_urls = array_unique(apply_filters('customize_allowed_urls', $allowed_urls));
 
-		$login_url = add_query_arg( array(
+		$login_url = add_query_arg(array(
 			'interim-login' => 1,
 			'customize-login' => 1,
-		), wp_login_url() );
+		), wp_login_url());
 
 		// Prepare Customizer settings to pass to JavaScript.
 		$settings = array(
@@ -1848,14 +1848,14 @@ 
 				'active'     => $this->is_theme_active(),
 			),
 			'url'      => array(
-				'preview'       => esc_url_raw( $this->get_preview_url() ),
-				'parent'        => esc_url_raw( admin_url() ),
-				'activated'     => esc_url_raw( home_url( '/' ) ),
-				'ajax'          => esc_url_raw( admin_url( 'admin-ajax.php', 'relative' ) ),
-				'allowed'       => array_map( 'esc_url_raw', $allowed_urls ),
+				'preview'       => esc_url_raw($this->get_preview_url()),
+				'parent'        => esc_url_raw(admin_url()),
+				'activated'     => esc_url_raw(home_url('/')),
+				'ajax'          => esc_url_raw(admin_url('admin-ajax.php', 'relative')),
+				'allowed'       => array_map('esc_url_raw', $allowed_urls),
 				'isCrossDomain' => $cross_domain,
-				'home'          => esc_url_raw( home_url( '/' ) ),
-				'login'         => esc_url_raw( $login_url ),
+				'home'          => esc_url_raw(home_url('/')),
+				'login'         => esc_url_raw($login_url),
 			),
 			'browser'  => array(
 				'mobile' => wp_is_mobile(),
@@ -1870,19 +1870,19 @@ 
 		);
 
 		// Prepare Customize Section objects to pass to JavaScript.
-		foreach ( $this->sections() as $id => $section ) {
-			if ( $section->check_capabilities() ) {
-				$settings['sections'][ $id ] = $section->json();
+		foreach ($this->sections() as $id => $section) {
+			if ($section->check_capabilities()) {
+				$settings['sections'][$id] = $section->json();
 			}
 		}
 
 		// Prepare Customize Panel objects to pass to JavaScript.
-		foreach ( $this->panels() as $panel_id => $panel ) {
-			if ( $panel->check_capabilities() ) {
-				$settings['panels'][ $panel_id ] = $panel->json();
-				foreach ( $panel->sections as $section_id => $section ) {
-					if ( $section->check_capabilities() ) {
-						$settings['sections'][ $section_id ] = $section->json();
+		foreach ($this->panels() as $panel_id => $panel) {
+			if ($panel->check_capabilities()) {
+				$settings['panels'][$panel_id] = $panel->json();
+				foreach ($panel->sections as $section_id => $section) {
+					if ($section->check_capabilities()) {
+						$settings['sections'][$section_id] = $section->json();
 					}
 				}
 			}
@@ -1890,19 +1890,19 @@ 
 
 		?>
 		<script type="text/javascript">
-			var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+			var _wpCustomizeSettings = <?php echo wp_json_encode($settings); ?>;
 			_wpCustomizeSettings.controls = {};
 			_wpCustomizeSettings.settings = {};
 			<?php
 
 			// Serialize settings one by one to improve memory usage.
 			echo "(function ( s ){\n";
-			foreach ( $this->settings() as $setting ) {
-				if ( $setting->check_capabilities() ) {
+			foreach ($this->settings() as $setting) {
+				if ($setting->check_capabilities()) {
 					printf(
 						"s[%s] = %s;\n",
-						wp_json_encode( $setting->id ),
-						wp_json_encode( $setting->json() )
+						wp_json_encode($setting->id),
+						wp_json_encode($setting->json())
 					);
 				}
 			}
@@ -1910,12 +1910,12 @@ 
 
 			// Serialize controls one by one to improve memory usage.
 			echo "(function ( c ){\n";
-			foreach ( $this->controls() as $control ) {
-				if ( $control->check_capabilities() ) {
+			foreach ($this->controls() as $control) {
+				if ($control->check_capabilities()) {
 					printf(
 						"c[%s] = %s;\n",
-						wp_json_encode( $control->id ),
-						wp_json_encode( $control->json() )
+						wp_json_encode($control->id),
+						wp_json_encode($control->json())
 					);
 				}
 			}
@@ -1936,14 +1936,14 @@ 
 	public function get_previewable_devices() {
 		$devices = array(
 			'desktop' => array(
-				'label' => __( 'Enter desktop preview mode' ),
+				'label' => __('Enter desktop preview mode'),
 				'default' => true,
 			),
 			'tablet' => array(
-				'label' => __( 'Enter tablet preview mode' ),
+				'label' => __('Enter tablet preview mode'),
 			),
 			'mobile' => array(
-				'label' => __( 'Enter mobile preview mode' ),
+				'label' => __('Enter mobile preview mode'),
 			),
 		);
 
@@ -1956,7 +1956,7 @@ 
 		 *
 		 * @param array $devices List of devices with labels and default setting.
 		 */
-		$devices = apply_filters( 'customize_previewable_devices', $devices );
+		$devices = apply_filters('customize_previewable_devices', $devices);
 
 		return $devices;
 	}
@@ -1969,134 +1969,134 @@ 
 	public function register_controls() {
 
 		/* Panel, Section, and Control Types */
-		$this->register_panel_type( 'WP_Customize_Panel' );
-		$this->register_section_type( 'WP_Customize_Section' );
-		$this->register_section_type( 'WP_Customize_Sidebar_Section' );
-		$this->register_control_type( 'WP_Customize_Color_Control' );
-		$this->register_control_type( 'WP_Customize_Media_Control' );
-		$this->register_control_type( 'WP_Customize_Upload_Control' );
-		$this->register_control_type( 'WP_Customize_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Background_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Cropped_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Site_Icon_Control' );
-		$this->register_control_type( 'WP_Customize_Theme_Control' );
+		$this->register_panel_type('WP_Customize_Panel');
+		$this->register_section_type('WP_Customize_Section');
+		$this->register_section_type('WP_Customize_Sidebar_Section');
+		$this->register_control_type('WP_Customize_Color_Control');
+		$this->register_control_type('WP_Customize_Media_Control');
+		$this->register_control_type('WP_Customize_Upload_Control');
+		$this->register_control_type('WP_Customize_Image_Control');
+		$this->register_control_type('WP_Customize_Background_Image_Control');
+		$this->register_control_type('WP_Customize_Cropped_Image_Control');
+		$this->register_control_type('WP_Customize_Site_Icon_Control');
+		$this->register_control_type('WP_Customize_Theme_Control');
 
 		/* Themes */
 
-		$this->add_section( new WP_Customize_Themes_Section( $this, 'themes', array(
-			'title'      => $this->theme()->display( 'Name' ),
+		$this->add_section(new WP_Customize_Themes_Section($this, 'themes', array(
+			'title'      => $this->theme()->display('Name'),
 			'capability' => 'switch_themes',
 			'priority'   => 0,
-		) ) );
+		)));
 
 		// Themes Setting (unused - the theme is considerably more fundamental to the Customizer experience).
-		$this->add_setting( new WP_Customize_Filter_Setting( $this, 'active_theme', array(
+		$this->add_setting(new WP_Customize_Filter_Setting($this, 'active_theme', array(
 			'capability' => 'switch_themes',
-		) ) );
+		)));
 
-		require_once( ABSPATH . 'wp-admin/includes/theme.php' );
+		require_once(ABSPATH.'wp-admin/includes/theme.php');
 
 		// Theme Controls.
 
 		// Add a control for the active/original theme.
-		if ( ! $this->is_theme_active() ) {
-			$themes = wp_prepare_themes_for_js( array( wp_get_theme( $this->original_stylesheet ) ) );
-			$active_theme = current( $themes );
+		if ( ! $this->is_theme_active()) {
+			$themes = wp_prepare_themes_for_js(array(wp_get_theme($this->original_stylesheet)));
+			$active_theme = current($themes);
 			$active_theme['isActiveTheme'] = true;
-			$this->add_control( new WP_Customize_Theme_Control( $this, $active_theme['id'], array(
+			$this->add_control(new WP_Customize_Theme_Control($this, $active_theme['id'], array(
 				'theme'    => $active_theme,
 				'section'  => 'themes',
 				'settings' => 'active_theme',
-			) ) );
+			)));
 		}
 
 		$themes = wp_prepare_themes_for_js();
-		foreach ( $themes as $theme ) {
-			if ( $theme['active'] || $theme['id'] === $this->original_stylesheet ) {
+		foreach ($themes as $theme) {
+			if ($theme['active'] || $theme['id'] === $this->original_stylesheet) {
 				continue;
 			}
 
-			$theme_id = 'theme_' . $theme['id'];
+			$theme_id = 'theme_'.$theme['id'];
 			$theme['isActiveTheme'] = false;
-			$this->add_control( new WP_Customize_Theme_Control( $this, $theme_id, array(
+			$this->add_control(new WP_Customize_Theme_Control($this, $theme_id, array(
 				'theme'    => $theme,
 				'section'  => 'themes',
 				'settings' => 'active_theme',
-			) ) );
+			)));
 		}
 
 		/* Site Identity */
 
-		$this->add_section( 'title_tagline', array(
-			'title'    => __( 'Site Identity' ),
+		$this->add_section('title_tagline', array(
+			'title'    => __('Site Identity'),
 			'priority' => 20,
-		) );
+		));
 
-		$this->add_setting( 'blogname', array(
-			'default'    => get_option( 'blogname' ),
+		$this->add_setting('blogname', array(
+			'default'    => get_option('blogname'),
 			'type'       => 'option',
 			'capability' => 'manage_options',
-		) );
+		));
 
-		$this->add_control( 'blogname', array(
-			'label'      => __( 'Site Title' ),
+		$this->add_control('blogname', array(
+			'label'      => __('Site Title'),
 			'section'    => 'title_tagline',
-		) );
+		));
 
-		$this->add_setting( 'blogdescription', array(
-			'default'    => get_option( 'blogdescription' ),
+		$this->add_setting('blogdescription', array(
+			'default'    => get_option('blogdescription'),
 			'type'       => 'option',
 			'capability' => 'manage_options',
-		) );
+		));
 
-		$this->add_control( 'blogdescription', array(
-			'label'      => __( 'Tagline' ),
+		$this->add_control('blogdescription', array(
+			'label'      => __('Tagline'),
 			'section'    => 'title_tagline',
-		) );
+		));
 
 		// Add a setting to hide header text if the theme doesn't support custom headers.
-		if ( ! current_theme_supports( 'custom-header', 'header-text' ) ) {
-			$this->add_setting( 'header_text', array(
-				'theme_supports'    => array( 'custom-logo', 'header-text' ),
+		if ( ! current_theme_supports('custom-header', 'header-text')) {
+			$this->add_setting('header_text', array(
+				'theme_supports'    => array('custom-logo', 'header-text'),
 				'default'           => 1,
 				'sanitize_callback' => 'absint',
-			) );
+			));
 
-			$this->add_control( 'header_text', array(
-				'label'    => __( 'Display Site Title and Tagline' ),
+			$this->add_control('header_text', array(
+				'label'    => __('Display Site Title and Tagline'),
 				'section'  => 'title_tagline',
 				'settings' => 'header_text',
 				'type'     => 'checkbox',
-			) );
+			));
 		}
 
-		$this->add_setting( 'site_icon', array(
+		$this->add_setting('site_icon', array(
 			'type'       => 'option',
 			'capability' => 'manage_options',
 			'transport'  => 'postMessage', // Previewed with JS in the Customizer controls window.
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Site_Icon_Control( $this, 'site_icon', array(
-			'label'       => __( 'Site Icon' ),
+		$this->add_control(new WP_Customize_Site_Icon_Control($this, 'site_icon', array(
+			'label'       => __('Site Icon'),
 			'description' => sprintf(
 				/* translators: %s: site icon size in pixels */
-				__( 'The Site Icon is used as a browser and app icon for your site. Icons must be square, and at least %s pixels wide and tall.' ),
+				__('The Site Icon is used as a browser and app icon for your site. Icons must be square, and at least %s pixels wide and tall.'),
 				'<strong>512</strong>'
 			),
 			'section'     => 'title_tagline',
 			'priority'    => 60,
 			'height'      => 512,
 			'width'       => 512,
-		) ) );
+		)));
 
-		$this->add_setting( 'custom_logo', array(
-			'theme_supports' => array( 'custom-logo' ),
+		$this->add_setting('custom_logo', array(
+			'theme_supports' => array('custom-logo'),
 			'transport'      => 'postMessage',
-		) );
+		));
 
-		$custom_logo_args = get_theme_support( 'custom-logo' );
-		$this->add_control( new WP_Customize_Cropped_Image_Control( $this, 'custom_logo', array(
-			'label'         => __( 'Logo' ),
+		$custom_logo_args = get_theme_support('custom-logo');
+		$this->add_control(new WP_Customize_Cropped_Image_Control($this, 'custom_logo', array(
+			'label'         => __('Logo'),
 			'section'       => 'title_tagline',
 			'priority'      => 8,
 			'height'        => $custom_logo_args[0]['height'],
@@ -2104,115 +2104,115 @@ 
 			'flex_height'   => $custom_logo_args[0]['flex-height'],
 			'flex_width'    => $custom_logo_args[0]['flex-width'],
 			'button_labels' => array(
-				'select'       => __( 'Select logo' ),
-				'change'       => __( 'Change logo' ),
-				'remove'       => __( 'Remove' ),
-				'default'      => __( 'Default' ),
-				'placeholder'  => __( 'No logo selected' ),
-				'frame_title'  => __( 'Select logo' ),
-				'frame_button' => __( 'Choose logo' ),
+				'select'       => __('Select logo'),
+				'change'       => __('Change logo'),
+				'remove'       => __('Remove'),
+				'default'      => __('Default'),
+				'placeholder'  => __('No logo selected'),
+				'frame_title'  => __('Select logo'),
+				'frame_button' => __('Choose logo'),
 			),
-		) ) );
+		)));
 
-		$this->selective_refresh->add_partial( 'custom_logo', array(
-			'settings'            => array( 'custom_logo' ),
+		$this->selective_refresh->add_partial('custom_logo', array(
+			'settings'            => array('custom_logo'),
 			'selector'            => '.custom-logo-link',
-			'render_callback'     => array( $this, '_render_custom_logo_partial' ),
+			'render_callback'     => array($this, '_render_custom_logo_partial'),
 			'container_inclusive' => true,
-		) );
+		));
 
 		/* Colors */
 
-		$this->add_section( 'colors', array(
-			'title'          => __( 'Colors' ),
+		$this->add_section('colors', array(
+			'title'          => __('Colors'),
 			'priority'       => 40,
-		) );
+		));
 
-		$this->add_setting( 'header_textcolor', array(
-			'theme_supports' => array( 'custom-header', 'header-text' ),
-			'default'        => get_theme_support( 'custom-header', 'default-text-color' ),
+		$this->add_setting('header_textcolor', array(
+			'theme_supports' => array('custom-header', 'header-text'),
+			'default'        => get_theme_support('custom-header', 'default-text-color'),
 
-			'sanitize_callback'    => array( $this, '_sanitize_header_textcolor' ),
+			'sanitize_callback'    => array($this, '_sanitize_header_textcolor'),
 			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
+		));
 
 		// Input type: checkbox
 		// With custom value
-		$this->add_control( 'display_header_text', array(
+		$this->add_control('display_header_text', array(
 			'settings' => 'header_textcolor',
-			'label'    => __( 'Display Site Title and Tagline' ),
+			'label'    => __('Display Site Title and Tagline'),
 			'section'  => 'title_tagline',
 			'type'     => 'checkbox',
 			'priority' => 40,
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Color_Control( $this, 'header_textcolor', array(
-			'label'   => __( 'Header Text Color' ),
+		$this->add_control(new WP_Customize_Color_Control($this, 'header_textcolor', array(
+			'label'   => __('Header Text Color'),
 			'section' => 'colors',
-		) ) );
+		)));
 
 		// Input type: Color
 		// With sanitize_callback
-		$this->add_setting( 'background_color', array(
-			'default'        => get_theme_support( 'custom-background', 'default-color' ),
+		$this->add_setting('background_color', array(
+			'default'        => get_theme_support('custom-background', 'default-color'),
 			'theme_supports' => 'custom-background',
 
 			'sanitize_callback'    => 'sanitize_hex_color_no_hash',
 			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Color_Control( $this, 'background_color', array(
-			'label'   => __( 'Background Color' ),
+		$this->add_control(new WP_Customize_Color_Control($this, 'background_color', array(
+			'label'   => __('Background Color'),
 			'section' => 'colors',
-		) ) );
+		)));
 
 
 		/* Custom Header */
 
-		$this->add_section( 'header_image', array(
-			'title'          => __( 'Header Image' ),
+		$this->add_section('header_image', array(
+			'title'          => __('Header Image'),
 			'theme_supports' => 'custom-header',
 			'priority'       => 60,
-		) );
+		));
 
-		$this->add_setting( new WP_Customize_Filter_Setting( $this, 'header_image', array(
-			'default'        => get_theme_support( 'custom-header', 'default-image' ),
+		$this->add_setting(new WP_Customize_Filter_Setting($this, 'header_image', array(
+			'default'        => get_theme_support('custom-header', 'default-image'),
 			'theme_supports' => 'custom-header',
-		) ) );
+		)));
 
-		$this->add_setting( new WP_Customize_Header_Image_Setting( $this, 'header_image_data', array(
+		$this->add_setting(new WP_Customize_Header_Image_Setting($this, 'header_image_data', array(
 			// 'default'        => get_theme_support( 'custom-header', 'default-image' ),
 			'theme_supports' => 'custom-header',
-		) ) );
+		)));
 
-		$this->add_control( new WP_Customize_Header_Image_Control( $this ) );
+		$this->add_control(new WP_Customize_Header_Image_Control($this));
 
 		/* Custom Background */
 
-		$this->add_section( 'background_image', array(
-			'title'          => __( 'Background Image' ),
+		$this->add_section('background_image', array(
+			'title'          => __('Background Image'),
 			'theme_supports' => 'custom-background',
 			'priority'       => 80,
-		) );
+		));
 
-		$this->add_setting( 'background_image', array(
-			'default'        => get_theme_support( 'custom-background', 'default-image' ),
+		$this->add_setting('background_image', array(
+			'default'        => get_theme_support('custom-background', 'default-image'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_setting( new WP_Customize_Background_Image_Setting( $this, 'background_image_thumb', array(
+		$this->add_setting(new WP_Customize_Background_Image_Setting($this, 'background_image_thumb', array(
 			'theme_supports' => 'custom-background',
-		) ) );
+		)));
 
-		$this->add_control( new WP_Customize_Background_Image_Control( $this ) );
+		$this->add_control(new WP_Customize_Background_Image_Control($this));
 
-		$this->add_setting( 'background_repeat', array(
-			'default'        => get_theme_support( 'custom-background', 'default-repeat' ),
+		$this->add_setting('background_repeat', array(
+			'default'        => get_theme_support('custom-background', 'default-repeat'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_repeat', array(
-			'label'      => __( 'Background Repeat' ),
+		$this->add_control('background_repeat', array(
+			'label'      => __('Background Repeat'),
 			'section'    => 'background_image',
 			'type'       => 'radio',
 			'choices'    => array(
@@ -2221,15 +2221,15 @@ 
 				'repeat-x'   => __('Tile Horizontally'),
 				'repeat-y'   => __('Tile Vertically'),
 			),
-		) );
+		));
 
-		$this->add_setting( 'background_position_x', array(
-			'default'        => get_theme_support( 'custom-background', 'default-position-x' ),
+		$this->add_setting('background_position_x', array(
+			'default'        => get_theme_support('custom-background', 'default-position-x'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_position_x', array(
-			'label'      => __( 'Background Position' ),
+		$this->add_control('background_position_x', array(
+			'label'      => __('Background Position'),
 			'section'    => 'background_image',
 			'type'       => 'radio',
 			'choices'    => array(
@@ -2237,28 +2237,28 @@ 
 				'center'     => __('Center'),
 				'right'      => __('Right'),
 			),
-		) );
+		));
 
-		$this->add_setting( 'background_attachment', array(
-			'default'        => get_theme_support( 'custom-background', 'default-attachment' ),
+		$this->add_setting('background_attachment', array(
+			'default'        => get_theme_support('custom-background', 'default-attachment'),
 			'theme_supports' => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_attachment', array(
-			'label'      => __( 'Background Attachment' ),
+		$this->add_control('background_attachment', array(
+			'label'      => __('Background Attachment'),
 			'section'    => 'background_image',
 			'type'       => 'radio',
 			'choices'    => array(
 				'scroll'     => __('Scroll'),
 				'fixed'      => __('Fixed'),
 			),
-		) );
+		));
 
 		// If the theme is using the default background callback, we can update
 		// the background CSS using postMessage.
-		if ( get_theme_support( 'custom-background', 'wp-head-callback' ) === '_custom_background_cb' ) {
-			foreach ( array( 'color', 'image', 'position_x', 'repeat', 'attachment' ) as $prop ) {
-				$this->get_setting( 'background_' . $prop )->transport = 'postMessage';
+		if (get_theme_support('custom-background', 'wp-head-callback') === '_custom_background_cb') {
+			foreach (array('color', 'image', 'position_x', 'repeat', 'attachment') as $prop) {
+				$this->get_setting('background_'.$prop)->transport = 'postMessage';
 			}
 		}
 
@@ -2266,54 +2266,54 @@ 
 		// #WP19627
 
 		// Replicate behavior from options-reading.php and hide front page options if there are no pages
-		if ( get_pages() ) {
-			$this->add_section( 'static_front_page', array(
-				'title'          => __( 'Static Front Page' ),
+		if (get_pages()) {
+			$this->add_section('static_front_page', array(
+				'title'          => __('Static Front Page'),
 			//	'theme_supports' => 'static-front-page',
 				'priority'       => 120,
-				'description'    => __( 'Your theme supports a static front page.' ),
-			) );
+				'description'    => __('Your theme supports a static front page.'),
+			));
 
-			$this->add_setting( 'show_on_front', array(
-				'default'        => get_option( 'show_on_front' ),
+			$this->add_setting('show_on_front', array(
+				'default'        => get_option('show_on_front'),
 				'capability'     => 'manage_options',
 				'type'           => 'option',
 			//	'theme_supports' => 'static-front-page',
-			) );
+			));
 
-			$this->add_control( 'show_on_front', array(
-				'label'   => __( 'Front page displays' ),
+			$this->add_control('show_on_front', array(
+				'label'   => __('Front page displays'),
 				'section' => 'static_front_page',
 				'type'    => 'radio',
 				'choices' => array(
-					'posts' => __( 'Your latest posts' ),
-					'page'  => __( 'A static page' ),
+					'posts' => __('Your latest posts'),
+					'page'  => __('A static page'),
 				),
-			) );
+			));
 
-			$this->add_setting( 'page_on_front', array(
+			$this->add_setting('page_on_front', array(
 				'type'       => 'option',
 				'capability' => 'manage_options',
 			//	'theme_supports' => 'static-front-page',
-			) );
+			));
 
-			$this->add_control( 'page_on_front', array(
-				'label'      => __( 'Front page' ),
+			$this->add_control('page_on_front', array(
+				'label'      => __('Front page'),
 				'section'    => 'static_front_page',
 				'type'       => 'dropdown-pages',
-			) );
+			));
 
-			$this->add_setting( 'page_for_posts', array(
+			$this->add_setting('page_for_posts', array(
 				'type'           => 'option',
 				'capability'     => 'manage_options',
 			//	'theme_supports' => 'static-front-page',
-			) );
+			));
 
-			$this->add_control( 'page_for_posts', array(
-				'label'      => __( 'Posts page' ),
+			$this->add_control('page_for_posts', array(
+				'label'      => __('Posts page'),
 				'section'    => 'static_front_page',
 				'type'       => 'dropdown-pages',
-			) );
+			));
 		}
 	}
 
@@ -2326,7 +2326,7 @@ 
 	 * @see add_dynamic_settings()
 	 */
 	public function register_dynamic_settings() {
-		$this->add_dynamic_settings( array_keys( $this->unsanitized_post_values() ) );
+		$this->add_dynamic_settings(array_keys($this->unsanitized_post_values()));
 	}
 
 	/**
@@ -2340,13 +2340,13 @@ 
 	 * @param string $color
 	 * @return mixed
 	 */
-	public function _sanitize_header_textcolor( $color ) {
-		if ( 'blank' === $color )
+	public function _sanitize_header_textcolor($color) {
+		if ('blank' === $color)
 			return 'blank';
 
-		$color = sanitize_hex_color_no_hash( $color );
-		if ( empty( $color ) )
-			$color = get_theme_support( 'custom-header', 'default-text-color' );
+		$color = sanitize_hex_color_no_hash($color);
+		if (empty($color))
+			$color = get_theme_support('custom-header', 'default-text-color');
 
 		return $color;
 	}

src/wp-includes/deprecated.php

Doc Comments +4 added lines, -5 removed lines

@@ -610,7 +610,7 @@ 
  * @param string $feed_image
  * @param string $exclude
  * @param bool $hierarchical
- * @return false|null
+ * @return false|string
  */
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0,
 				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=false, $child_of=0, $categories=0,
@@ -630,7 +630,7 @@ 
  * @see wp_list_categories()
  *
  * @param string|array $args
- * @return false|null|string
+ * @return false|string
  */
 function wp_list_cats($args = '') {
 	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_categories()' );
@@ -2101,7 +2101,6 @@ 
  * @param string|int $name            Widget ID.
  * @param callable   $output_callback Run when widget is called.
  * @param string     $classname       Optional. Classname widget option. Default empty.
- * @param mixed      $params ,...     Widget parameters.
  */
 function register_sidebar_widget($name, $output_callback, $classname = '') {
 	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()' );
@@ -2419,7 +2418,7 @@ 
  * @see count_user_posts()
  *
  * @param int $userid User to count posts for.
- * @return int Number of posts the given user has written.
+ * @return string Number of posts the given user has written.
  */
 function get_usernumposts( $userid ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'count_user_posts()' );
@@ -3601,7 +3600,7 @@ 
  * @deprecated 4.4.0 Use get_permalink()
  * @see get_permalink()
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string|false
  */
 function post_permalink( $post_id = 0 ) {

Spacing +527 added lines, -527 removed lines

@@ -23,11 +23,11 @@ 
  * @return array Post data.
  */
 function get_postdata($postid) {
-	_deprecated_function( __FUNCTION__, '1.5.1', 'get_post()' );
+	_deprecated_function(__FUNCTION__, '1.5.1', 'get_post()');
 
 	$post = get_post($postid);
 
-	$postdata = array (
+	$postdata = array(
 		'ID' => $post->ID,
 		'Author_ID' => $post->post_author,
 		'Date' => $post->post_date,
@@ -61,12 +61,12 @@ 
 function start_wp() {
 	global $wp_query;
 
-	_deprecated_function( __FUNCTION__, '1.5.0', __('new WordPress Loop') );
+	_deprecated_function(__FUNCTION__, '1.5.0', __('new WordPress Loop'));
 
 	// Since the old style loop is being used, advance the query iterator here.
 	$wp_query->next_post();
 
-	setup_postdata( get_post() );
+	setup_postdata(get_post());
 }
 
 /**
@@ -80,13 +80,13 @@ 
  * @return int Category ID.
  */
 function the_category_ID($echo = true) {
-	_deprecated_function( __FUNCTION__, '0.71', 'get_the_category()' );
+	_deprecated_function(__FUNCTION__, '0.71', 'get_the_category()');
 
 	// Grab the first cat in the list.
 	$categories = get_the_category();
 	$cat = $categories[0]->term_id;
 
-	if ( $echo )
+	if ($echo)
 		echo $cat;
 
 	return $cat;
@@ -102,15 +102,15 @@ 
  * @param string $before Optional. Text to display before the category. Default empty.
  * @param string $after  Optional. Text to display after the category. Default empty.
  */
-function the_category_head( $before = '', $after = '' ) {
+function the_category_head($before = '', $after = '') {
 	global $currentcat, $previouscat;
 
-	_deprecated_function( __FUNCTION__, '0.71', 'get_the_category_by_ID()' );
+	_deprecated_function(__FUNCTION__, '0.71', 'get_the_category_by_ID()');
 
 	// Grab the first cat in the list.
 	$categories = get_the_category();
 	$currentcat = $categories[0]->category_id;
-	if ( $currentcat != $previouscat ) {
+	if ($currentcat != $previouscat) {
 		echo $before;
 		echo get_the_category_by_ID($currentcat);
 		echo $after;
@@ -132,22 +132,22 @@ 
  * @param int    $limitprev
  * @param string $excluded_categories
  */
-function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
+function previous_post($format = '%', $previous = 'previous post: ', $title = 'yes', $in_same_cat = 'no', $limitprev = 1, $excluded_categories = '') {
 
-	_deprecated_function( __FUNCTION__, '2.0.0', 'previous_post_link()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'previous_post_link()');
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
+	if (empty($in_same_cat) || 'no' == $in_same_cat)
 		$in_same_cat = false;
 	else
 		$in_same_cat = true;
 
 	$post = get_previous_post($in_same_cat, $excluded_categories);
 
-	if ( !$post )
+	if ( ! $post)
 		return;
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
-	if ( 'yes' == $title )
+	if ('yes' == $title)
 		$string .= apply_filters('the_title', $post->post_title, $post->ID);
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
@@ -168,21 +168,21 @@ 
  * @param int $limitnext
  * @param string $excluded_categories
  */
-function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'next_post_link()' );
+function next_post($format = '%', $next = 'next post: ', $title = 'yes', $in_same_cat = 'no', $limitnext = 1, $excluded_categories = '') {
+	_deprecated_function(__FUNCTION__, '2.0.0', 'next_post_link()');
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
+	if (empty($in_same_cat) || 'no' == $in_same_cat)
 		$in_same_cat = false;
 	else
 		$in_same_cat = true;
 
 	$post = get_next_post($in_same_cat, $excluded_categories);
 
-	if ( !$post	)
+	if ( ! $post)
 		return;
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$next;
-	if ( 'yes' == $title )
+	if ('yes' == $title)
 		$string .= apply_filters('the_title', $post->post_title, $post->ID);
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
@@ -202,7 +202,7 @@ 
  * @return bool
  */
 function user_can_create_post($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return ($author_data->user_level > 1);
@@ -221,7 +221,7 @@ 
  * @return bool
  */
 function user_can_create_draft($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return ($author_data->user_level >= 1);
@@ -240,15 +240,15 @@ 
  * @return bool
  */
 function user_can_edit_post($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	$post = get_post($post_id);
 	$post_author_data = get_userdata($post->post_author);
 
-	if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' && $author_data->user_level < 2))
+	if ((($user_id == $post_author_data->ID) && ! ($post->post_status == 'publish' && $author_data->user_level < 2))
 			 || ($author_data->user_level > $post_author_data->user_level)
-			 || ($author_data->user_level >= 10) ) {
+			 || ($author_data->user_level >= 10)) {
 		return true;
 	} else {
 		return false;
@@ -268,7 +268,7 @@ 
  * @return bool
  */
 function user_can_delete_post($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	// right now if one can edit, one can delete
 	return user_can_edit_post($user_id, $post_id, $blog_id);
@@ -287,7 +287,7 @@ 
  * @return bool
  */
 function user_can_set_post_date($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return (($author_data->user_level > 4) && user_can_create_post($user_id, $blog_id, $category_id));
@@ -306,7 +306,7 @@ 
  * @return bool returns true if $user_id can edit $post_id's date
  */
 function user_can_edit_post_date($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return (($author_data->user_level > 4) && user_can_edit_post($user_id, $post_id, $blog_id));
@@ -325,7 +325,7 @@ 
  * @return bool returns true if $user_id can edit $post_id's comments
  */
 function user_can_edit_post_comments($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	// right now if one can edit a post, one can edit comments made on it
 	return user_can_edit_post($user_id, $post_id, $blog_id);
@@ -344,7 +344,7 @@ 
  * @return bool returns true if $user_id can delete $post_id's comments
  */
 function user_can_delete_post_comments($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	// right now if one can edit comments, one can delete comments
 	return user_can_edit_post_comments($user_id, $post_id, $blog_id);
@@ -362,11 +362,11 @@ 
  * @return bool
  */
 function user_can_edit_user($user_id, $other_user) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'current_user_can()');
 
 	$user  = get_userdata($user_id);
 	$other = get_userdata($other_user);
-	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
+	if ($user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID)
 		return true;
 	else
 		return false;
@@ -395,11 +395,11 @@ 
 function get_linksbyname($cat_name = "noname", $before = '', $after = '<br />', $between = " ", $show_images = true, $orderby = 'id',
 						 $show_description = true, $show_rating = false,
 						 $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
+	if ($cat)
 		$cat_id = $cat->term_id;
 
 	get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
@@ -430,7 +430,7 @@ 
 		'title_li' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	return wp_list_bookmarks($r);
 }
@@ -454,12 +454,12 @@ 
  * @param int $limit Limit to X entries. If not specified, all entries are shown.
  * @return array
  */
-function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit = -1) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+function get_linkobjectsbyname($cat_name = "noname", $orderby = 'name', $limit = -1) {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
+	if ($cat)
 		$cat_id = $cat->term_id;
 
 	return get_linkobjects($cat_id, $orderby, $limit);
@@ -506,9 +506,9 @@ 
  * @return array
  */
 function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
-	$links = get_bookmarks( array( 'category' => $category, 'orderby' => $orderby, 'limit' => $limit ) ) ;
+	$links = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'limit' => $limit));
 
 	$links_array = array();
 	foreach ($links as $link)
@@ -539,7 +539,7 @@ 
  */
 function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = '<br />', $between = " ",
 									$show_images = true, $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	get_linksbyname($cat_name, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
 }
@@ -566,7 +566,7 @@ 
  */
 function get_links_withrating($category = -1, $before = '', $after = '<br />', $between = " ", $show_images = true,
 							  $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	get_links($category, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
 }
@@ -581,7 +581,7 @@ 
  * @return int Only returns 0.
  */
 function get_autotoggle($id = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0' );
+	_deprecated_function(__FUNCTION__, '2.1.0');
 	return 0;
 }
 
@@ -613,9 +613,9 @@ 
  * @return false|null
  */
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0,
-				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=false, $child_of=0, $categories=0,
-				   $recurse=0, $feed = '', $feed_image = '', $exclude = '', $hierarchical=false) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_categories()' );
+				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children = false, $child_of = 0, $categories = 0,
+				   $recurse = 0, $feed = '', $feed_image = '', $exclude = '', $hierarchical = false) {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_categories()');
 
 	$query = compact('optionall', 'all', 'sort_column', 'sort_order', 'file', 'list', 'optiondates', 'optioncount', 'hide_empty', 'use_desc_for_title', 'children',
 		'child_of', 'categories', 'recurse', 'feed', 'feed_image', 'exclude', 'hierarchical');
@@ -633,22 +633,22 @@ 
  * @return false|null|string
  */
 function wp_list_cats($args = '') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_categories()');
 
-	$r = wp_parse_args( $args );
+	$r = wp_parse_args($args);
 
 	// Map to new names.
-	if ( isset($r['optionall']) && isset($r['all']))
+	if (isset($r['optionall']) && isset($r['all']))
 		$r['show_option_all'] = $r['all'];
-	if ( isset($r['sort_column']) )
+	if (isset($r['sort_column']))
 		$r['orderby'] = $r['sort_column'];
-	if ( isset($r['sort_order']) )
+	if (isset($r['sort_order']))
 		$r['order'] = $r['sort_order'];
-	if ( isset($r['optiondates']) )
+	if (isset($r['optiondates']))
 		$r['show_last_update'] = $r['optiondates'];
-	if ( isset($r['optioncount']) )
+	if (isset($r['optioncount']))
 		$r['show_count'] = $r['optioncount'];
-	if ( isset($r['list']) )
+	if (isset($r['list']))
 		$r['style'] = $r['list'] ? 'list' : 'break';
 	$r['title_li'] = '';
 
@@ -677,14 +677,14 @@ 
 function dropdown_cats($optionall = 1, $all = 'All', $orderby = 'ID', $order = 'asc',
 		$show_last_update = 0, $show_count = 0, $hide_empty = 1, $optionnone = false,
 		$selected = 0, $exclude = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_dropdown_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_dropdown_categories()');
 
 	$show_option_all = '';
-	if ( $optionall )
+	if ($optionall)
 		$show_option_all = $all;
 
 	$show_option_none = '';
-	if ( $optionnone )
+	if ($optionnone)
 		$show_option_none = __('None');
 
 	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
@@ -709,7 +709,7 @@ 
  * @return null|string
  */
 function list_authors($optioncount = false, $exclude_admin = true, $show_fullname = false, $hide_empty = true, $feed = '', $feed_image = '') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_authors()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_authors()');
 
 	$args = compact('optioncount', 'exclude_admin', 'show_fullname', 'hide_empty', 'feed', 'feed_image');
 	return wp_list_authors($args);
@@ -727,7 +727,7 @@ 
  * @return array
  */
 function wp_get_post_cats($blogid = '1', $post_ID = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_get_post_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_get_post_categories()');
 	return wp_get_post_categories($post_ID);
 }
 
@@ -745,7 +745,7 @@ 
  * @return bool|mixed
  */
 function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array()) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_set_post_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_set_post_categories()');
 	return wp_set_post_categories($post_ID, $post_categories);
 }
 
@@ -764,8 +764,8 @@ 
  * @param bool $show_post_count
  * @return string|null
  */
-function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_get_archives()' );
+function get_archives($type = '', $limit = '', $format = 'html', $before = '', $after = '', $show_post_count = false) {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_get_archives()');
 	$args = compact('type', 'limit', 'format', 'before', 'after', 'show_post_count');
 	return wp_get_archives($args);
 }
@@ -783,11 +783,11 @@ 
  * @return string|null
  */
 function get_author_link($echo, $author_id, $author_nicename = '') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_author_posts_url()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_author_posts_url()');
 
 	$link = get_author_posts_url($author_id, $author_nicename);
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -808,9 +808,9 @@ 
  * @param string $more_file
  * @return string
  */
-function link_pages($before='<br />', $after='<br />', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page',
-					$pagelink='%', $more_file='') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_link_pages()' );
+function link_pages($before = '<br />', $after = '<br />', $next_or_number = 'number', $nextpagelink = 'next page', $previouspagelink = 'previous page',
+					$pagelink = '%', $more_file = '') {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_link_pages()');
 
 	$args = compact('before', 'after', 'next_or_number', 'nextpagelink', 'previouspagelink', 'pagelink', 'more_file');
 	return wp_link_pages($args);
@@ -827,7 +827,7 @@ 
  * @return string
  */
 function get_settings($option) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_option()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_option()');
 
 	return get_option($option);
 }
@@ -840,7 +840,7 @@ 
  * @see the_permalink()
  */
 function permalink_link() {
-	_deprecated_function( __FUNCTION__, '1.2.0', 'the_permalink()' );
+	_deprecated_function(__FUNCTION__, '1.2.0', 'the_permalink()');
 	the_permalink();
 }
 
@@ -854,7 +854,7 @@ 
  * @param string $deprecated
  */
 function permalink_single_rss($deprecated = '') {
-	_deprecated_function( __FUNCTION__, '2.3.0', 'the_permalink_rss()' );
+	_deprecated_function(__FUNCTION__, '2.3.0', 'the_permalink_rss()');
 	the_permalink_rss();
 }
 
@@ -869,11 +869,11 @@ 
  * @return null|string
  */
 function wp_get_links($args = '') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_bookmarks()');
 
-	if ( strpos( $args, '=' ) === false ) {
+	if (strpos($args, '=') === false) {
 		$cat_id = $args;
-		$args = add_query_arg( 'category', $cat_id, $args );
+		$args = add_query_arg('category', $cat_id, $args);
 	}
 
 	$defaults = array(
@@ -892,7 +892,7 @@ 
 		'title_li' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	return wp_list_bookmarks($r);
 }
@@ -923,81 +923,81 @@ 
  */
 function get_links($category = -1, $before = '', $after = '<br />', $between = ' ', $show_images = true, $orderby = 'name',
 			$show_description = true, $show_rating = false, $limit = -1, $show_updated = 1, $echo = true) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmarks()');
 
 	$order = 'ASC';
-	if ( substr($orderby, 0, 1) == '_' ) {
+	if (substr($orderby, 0, 1) == '_') {
 		$order = 'DESC';
 		$orderby = substr($orderby, 1);
 	}
 
-	if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
+	if ($category == -1) //get_bookmarks uses '' to signify all categories
 		$category = '';
 
 	$results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
 
-	if ( !$results )
+	if ( ! $results)
 		return;
 
 	$output = '';
 
-	foreach ( (array) $results as $row ) {
-		if ( !isset($row->recently_updated) )
+	foreach ((array) $results as $row) {
+		if ( ! isset($row->recently_updated))
 			$row->recently_updated = false;
 		$output .= $before;
-		if ( $show_updated && $row->recently_updated )
+		if ($show_updated && $row->recently_updated)
 			$output .= get_option('links_recently_updated_prepend');
 		$the_link = '#';
-		if ( !empty($row->link_url) )
+		if ( ! empty($row->link_url))
 			$the_link = esc_url($row->link_url);
 		$rel = $row->link_rel;
-		if ( '' != $rel )
-			$rel = ' rel="' . $rel . '"';
+		if ('' != $rel)
+			$rel = ' rel="'.$rel.'"';
 
 		$desc = esc_attr(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
 		$name = esc_attr(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
 		$title = $desc;
 
-		if ( $show_updated )
+		if ($show_updated)
 			if (substr($row->link_updated_f, 0, 2) != '00')
-				$title .= ' ('.__('Last updated') . ' ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)) . ')';
+				$title .= ' ('.__('Last updated').' '.date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)).')';
 
-		if ( '' != $title )
-			$title = ' title="' . $title . '"';
+		if ('' != $title)
+			$title = ' title="'.$title.'"';
 
-		$alt = ' alt="' . $name . '"';
+		$alt = ' alt="'.$name.'"';
 
 		$target = $row->link_target;
-		if ( '' != $target )
-			$target = ' target="' . $target . '"';
+		if ('' != $target)
+			$target = ' target="'.$target.'"';
 
-		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
+		$output .= '<a href="'.$the_link.'"'.$rel.$title.$target.'>';
 
-		if ( $row->link_image != null && $show_images ) {
-			if ( strpos($row->link_image, 'http') !== false )
+		if ($row->link_image != null && $show_images) {
+			if (strpos($row->link_image, 'http') !== false)
 				$output .= "<img src=\"$row->link_image\" $alt $title />";
 			else // If it's a relative path
-				$output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
+				$output .= "<img src=\"".get_option('siteurl')."$row->link_image\" $alt $title />";
 		} else {
 			$output .= $name;
 		}
 
 		$output .= '</a>';
 
-		if ( $show_updated && $row->recently_updated )
+		if ($show_updated && $row->recently_updated)
 			$output .= get_option('links_recently_updated_append');
 
-		if ( $show_description && '' != $desc )
-			$output .= $between . $desc;
+		if ($show_description && '' != $desc)
+			$output .= $between.$desc;
 
 		if ($show_rating) {
-			$output .= $between . get_linkrating($row);
+			$output .= $between.get_linkrating($row);
 		}
 
 		$output .= "$after\n";
 	} // end while
 
-	if ( !$echo )
+	if ( ! $echo)
 		return $output;
 	echo $output;
 }
@@ -1015,29 +1015,29 @@ 
  * @param string $order Sort link categories by 'name' or 'id'
  */
 function get_links_list($order = 'name') {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_bookmarks()');
 
 	$order = strtolower($order);
 
 	// Handle link category sorting
 	$direction = 'ASC';
-	if ( '_' == substr($order,0,1) ) {
+	if ('_' == substr($order, 0, 1)) {
 		$direction = 'DESC';
-		$order = substr($order,1);
+		$order = substr($order, 1);
 	}
 
-	if ( !isset($direction) )
+	if ( ! isset($direction))
 		$direction = '';
 
 	$cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
 
 	// Display each category
-	if ( $cats ) {
-		foreach ( (array) $cats as $cat ) {
+	if ($cats) {
+		foreach ((array) $cats as $cat) {
 			// Handle each category.
 
 			// Display the category name
-			echo '  <li id="linkcat-' . $cat->term_id . '" class="linkcat"><h2>' . apply_filters('link_category', $cat->name ) . "</h2>\n\t<ul>\n";
+			echo '  <li id="linkcat-'.$cat->term_id.'" class="linkcat"><h2>'.apply_filters('link_category', $cat->name)."</h2>\n\t<ul>\n";
 			// Call get_links() with all the appropriate params
 			get_links($cat->term_id, '<li>', "</li>", "\n", true, 'name', false);
 
@@ -1059,8 +1059,8 @@ 
  * @param string $file the page to open in the popup window
  * @param bool $count the number of links in the db
  */
-function links_popup_script($text = 'Links', $width=400, $height=400, $file='links.all.php', $count = true) {
-	_deprecated_function( __FUNCTION__, '2.1.0' );
+function links_popup_script($text = 'Links', $width = 400, $height = 400, $file = 'links.all.php', $count = true) {
+	_deprecated_function(__FUNCTION__, '2.1.0');
 }
 
 /**
@@ -1073,8 +1073,8 @@ 
  * @param object $link Link object.
  * @return mixed Value of the 'link_rating' field, false otherwise.
  */
-function get_linkrating( $link ) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'sanitize_bookmark_field()' );
+function get_linkrating($link) {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'sanitize_bookmark_field()');
 	return sanitize_bookmark_field('link_rating', $link->link_rating, $link->link_id, 'display');
 }
 
@@ -1089,16 +1089,16 @@ 
  * @return string
  */
 function get_linkcatname($id = 0) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_category()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_category()');
 
 	$id = (int) $id;
 
-	if ( empty($id) )
+	if (empty($id))
 		return '';
 
 	$cats = wp_get_link_cats($id);
 
-	if ( empty($cats) || ! is_array($cats) )
+	if (empty($cats) || ! is_array($cats))
 		return '';
 
 	$cat_id = (int) $cats[0]; // Take the first cat.
@@ -1117,7 +1117,7 @@ 
  * @param string $link_text
  */
 function comments_rss_link($link_text = 'Comments RSS') {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'post_comments_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'post_comments_feed_link()');
 	post_comments_feed_link($link_text);
 }
 
@@ -1133,11 +1133,11 @@ 
  * @return string
  */
 function get_category_rss_link($echo = false, $cat_ID = 1) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'get_category_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'get_category_feed_link()');
 
 	$link = get_category_feed_link($cat_ID, 'rss2');
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -1154,10 +1154,10 @@ 
  * @return string
  */
 function get_author_rss_link($echo = false, $author_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'get_author_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'get_author_feed_link()');
 
 	$link = get_author_feed_link($author_id);
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -1172,8 +1172,8 @@ 
  * @return string
  */
 function comments_rss() {
-	_deprecated_function( __FUNCTION__, '2.2.0', 'get_post_comments_feed_link()' );
-	return esc_url( get_post_comments_feed_link() );
+	_deprecated_function(__FUNCTION__, '2.2.0', 'get_post_comments_feed_link()');
+	return esc_url(get_post_comments_feed_link());
 }
 
 /**
@@ -1189,7 +1189,7 @@ 
  * @return int The new user's ID.
  */
 function create_user($username, $password, $email) {
-	_deprecated_function( __FUNCTION__, '2.0.0', 'wp_create_user()' );
+	_deprecated_function(__FUNCTION__, '2.0.0', 'wp_create_user()');
 	return wp_create_user($username, $password, $email);
 }
 
@@ -1199,7 +1199,7 @@ 
  * @deprecated 2.5.0
  */
 function gzip_compression() {
-	_deprecated_function( __FUNCTION__, '2.5.0' );
+	_deprecated_function(__FUNCTION__, '2.5.0');
 	return false;
 }
 
@@ -1215,8 +1215,8 @@ 
  * @param bool $include_unapproved Whether to include unapproved comments
  * @return array The comment data
  */
-function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = false ) {
-	_deprecated_function( __FUNCTION__, '2.7.0', 'get_comment()' );
+function get_commentdata($comment_ID, $no_cache = 0, $include_unapproved = false) {
+	_deprecated_function(__FUNCTION__, '2.7.0', 'get_comment()');
 	return get_comment($comment_ID, ARRAY_A);
 }
 
@@ -1230,9 +1230,9 @@ 
  * @param int $cat_ID Category ID
  * @return string category name
  */
-function get_catname( $cat_ID ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_cat_name()' );
-	return get_cat_name( $cat_ID );
+function get_catname($cat_ID) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_cat_name()');
+	return get_cat_name($cat_ID);
 }
 
 /**
@@ -1248,25 +1248,25 @@ 
  * @param array $visited Optional. Category Term IDs that have already been added.
  * @return string
  */
-function get_category_children( $id, $before = '/', $after = '', $visited = array() ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_term_children()' );
-	if ( 0 == $id )
+function get_category_children($id, $before = '/', $after = '', $visited = array()) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_term_children()');
+	if (0 == $id)
 		return '';
 
 	$chain = '';
 	/** TODO: consult hierarchy */
 	$cat_ids = get_all_category_ids();
-	foreach ( (array) $cat_ids as $cat_id ) {
-		if ( $cat_id == $id )
+	foreach ((array) $cat_ids as $cat_id) {
+		if ($cat_id == $id)
 			continue;
 
-		$category = get_category( $cat_id );
-		if ( is_wp_error( $category ) )
+		$category = get_category($cat_id);
+		if (is_wp_error($category))
 			return $category;
-		if ( $category->parent == $id && !in_array( $category->term_id, $visited ) ) {
+		if ($category->parent == $id && ! in_array($category->term_id, $visited)) {
 			$visited[] = $category->term_id;
 			$chain .= $before.$category->term_id.$after;
-			$chain .= get_category_children( $category->term_id, $before, $after );
+			$chain .= get_category_children($category->term_id, $before, $after);
 		}
 	}
 	return $chain;
@@ -1284,11 +1284,11 @@ 
  * @return object List of all of the category IDs.
  */
 function get_all_category_ids() {
-	_deprecated_function( __FUNCTION__, '4.0.0', 'get_terms()' );
+	_deprecated_function(__FUNCTION__, '4.0.0', 'get_terms()');
 
-	if ( ! $cat_ids = wp_cache_get( 'all_category_ids', 'category' ) ) {
-		$cat_ids = get_terms( 'category', array('fields' => 'ids', 'get' => 'all') );
-		wp_cache_add( 'all_category_ids', $cat_ids, 'category' );
+	if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category')) {
+		$cat_ids = get_terms('category', array('fields' => 'ids', 'get' => 'all'));
+		wp_cache_add('all_category_ids', $cat_ids, 'category');
 	}
 
 	return $cat_ids;
@@ -1304,7 +1304,7 @@ 
  * @return string The author's description.
  */
 function get_the_author_description() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'description\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'description\')');
 	return get_the_author_meta('description');
 }
 
@@ -1316,7 +1316,7 @@ 
  * @see the_author_meta()
  */
 function the_author_description() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'description\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'description\')');
 	the_author_meta('description');
 }
 
@@ -1330,7 +1330,7 @@ 
  * @return string The author's login name (username).
  */
 function get_the_author_login() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'login\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'login\')');
 	return get_the_author_meta('login');
 }
 
@@ -1342,7 +1342,7 @@ 
  * @see the_author_meta()
  */
 function the_author_login() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'login\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'login\')');
 	the_author_meta('login');
 }
 
@@ -1356,7 +1356,7 @@ 
  * @return string The author's first name.
  */
 function get_the_author_firstname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'first_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'first_name\')');
 	return get_the_author_meta('first_name');
 }
 
@@ -1368,7 +1368,7 @@ 
  * @see the_author_meta()
  */
 function the_author_firstname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'first_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'first_name\')');
 	the_author_meta('first_name');
 }
 
@@ -1382,7 +1382,7 @@ 
  * @return string The author's last name.
  */
 function get_the_author_lastname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'last_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'last_name\')');
 	return get_the_author_meta('last_name');
 }
 
@@ -1394,7 +1394,7 @@ 
  * @see the_author_meta()
  */
 function the_author_lastname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'last_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'last_name\')');
 	the_author_meta('last_name');
 }
 
@@ -1408,7 +1408,7 @@ 
  * @return string The author's nickname.
  */
 function get_the_author_nickname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'nickname\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'nickname\')');
 	return get_the_author_meta('nickname');
 }
 
@@ -1420,7 +1420,7 @@ 
  * @see the_author_meta()
  */
 function the_author_nickname() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'nickname\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'nickname\')');
 	the_author_meta('nickname');
 }
 
@@ -1434,7 +1434,7 @@ 
  * @return string The author's username.
  */
 function get_the_author_email() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'email\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'email\')');
 	return get_the_author_meta('email');
 }
 
@@ -1446,7 +1446,7 @@ 
  * @see the_author_meta()
  */
 function the_author_email() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'email\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'email\')');
 	the_author_meta('email');
 }
 
@@ -1460,7 +1460,7 @@ 
  * @return string The author's ICQ number.
  */
 function get_the_author_icq() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'icq\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'icq\')');
 	return get_the_author_meta('icq');
 }
 
@@ -1472,7 +1472,7 @@ 
  * @see the_author_meta()
  */
 function the_author_icq() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'icq\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'icq\')');
 	the_author_meta('icq');
 }
 
@@ -1486,7 +1486,7 @@ 
  * @return string The author's Yahoo! IM name.
  */
 function get_the_author_yim() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'yim\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'yim\')');
 	return get_the_author_meta('yim');
 }
 
@@ -1498,7 +1498,7 @@ 
  * @see the_author_meta()
  */
 function the_author_yim() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'yim\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'yim\')');
 	the_author_meta('yim');
 }
 
@@ -1512,7 +1512,7 @@ 
  * @return string The author's MSN address.
  */
 function get_the_author_msn() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'msn\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'msn\')');
 	return get_the_author_meta('msn');
 }
 
@@ -1524,7 +1524,7 @@ 
  * @see the_author_meta()
  */
 function the_author_msn() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'msn\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'msn\')');
 	the_author_meta('msn');
 }
 
@@ -1538,7 +1538,7 @@ 
  * @return string The author's AIM address.
  */
 function get_the_author_aim() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'aim\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'aim\')');
 	return get_the_author_meta('aim');
 }
 
@@ -1550,7 +1550,7 @@ 
  * @see the_author_meta()
  */
 function the_author_aim() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'aim\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'aim\')');
 	the_author_meta('aim');
 }
 
@@ -1564,8 +1564,8 @@ 
  * @param int $auth_id The ID of the author.
  * @return string The author's display name.
  */
-function get_author_name( $auth_id = false ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'display_name\')' );
+function get_author_name($auth_id = false) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'display_name\')');
 	return get_the_author_meta('display_name', $auth_id);
 }
 
@@ -1579,7 +1579,7 @@ 
  * @return string The URL to the author's page.
  */
 function get_the_author_url() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'url\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'url\')');
 	return get_the_author_meta('url');
 }
 
@@ -1591,7 +1591,7 @@ 
  * @see the_author_meta()
  */
 function the_author_url() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'url\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'url\')');
 	the_author_meta('url');
 }
 
@@ -1605,7 +1605,7 @@ 
  * @return string|int The author's ID.
  */
 function get_the_author_ID() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'get_the_author_meta(\'ID\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'get_the_author_meta(\'ID\')');
 	return get_the_author_meta('ID');
 }
 
@@ -1617,7 +1617,7 @@ 
  * @see the_author_meta()
  */
 function the_author_ID() {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'the_author_meta(\'ID\')' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'the_author_meta(\'ID\')');
 	the_author_meta('ID');
 }
 
@@ -1649,23 +1649,23 @@ 
  * @param int $cut Optional. Amount of words to keep for the content.
  * @param int $encode_html Optional. How to encode the content.
  */
-function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
-	_deprecated_function( __FUNCTION__, '2.9.0', 'the_content_feed' );
+function the_content_rss($more_link_text = '(more...)', $stripteaser = 0, $more_file = '', $cut = 0, $encode_html = 0) {
+	_deprecated_function(__FUNCTION__, '2.9.0', 'the_content_feed');
 	$content = get_the_content($more_link_text, $stripteaser);
 	$content = apply_filters('the_content_rss', $content);
-	if ( $cut && !$encode_html )
+	if ($cut && ! $encode_html)
 		$encode_html = 2;
-	if ( 1== $encode_html ) {
+	if (1 == $encode_html) {
 		$content = esc_html($content);
 		$cut = 0;
-	} elseif ( 0 == $encode_html ) {
+	} elseif (0 == $encode_html) {
 		$content = make_url_footnote($content);
-	} elseif ( 2 == $encode_html ) {
+	} elseif (2 == $encode_html) {
 		$content = strip_tags($content);
 	}
-	if ( $cut ) {
+	if ($cut) {
 		$blah = explode(' ', $content);
-		if ( count($blah) > $cut ) {
+		if (count($blah) > $cut) {
 			$k = $cut;
 			$use_dotdotdot = 1;
 		} else {
@@ -1674,7 +1674,7 @@ 
 		}
 
 		/** @todo Check performance, might be faster to use array slice instead. */
-		for ( $i=0; $i<$k; $i++ )
+		for ($i = 0; $i < $k; $i++)
 			$excerpt .= $blah[$i].' ';
 		$excerpt .= ($use_dotdotdot) ? '...' : '';
 		$content = $excerpt;
@@ -1695,20 +1695,20 @@ 
  * @param string $content Content to get links
  * @return string HTML stripped out of content with links at the bottom.
  */
-function make_url_footnote( $content ) {
-	_deprecated_function( __FUNCTION__, '2.9.0', '' );
-	preg_match_all( '/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches );
+function make_url_footnote($content) {
+	_deprecated_function(__FUNCTION__, '2.9.0', '');
+	preg_match_all('/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches);
 	$links_summary = "\n";
-	for ( $i = 0, $c = count( $matches[0] ); $i < $c; $i++ ) {
+	for ($i = 0, $c = count($matches[0]); $i < $c; $i++) {
 		$link_match = $matches[0][$i];
-		$link_number = '['.($i+1).']';
+		$link_number = '['.($i + 1).']';
 		$link_url = $matches[2][$i];
 		$link_text = $matches[4][$i];
-		$content = str_replace( $link_match, $link_text . ' ' . $link_number, $content );
-		$link_url = ( ( strtolower( substr( $link_url, 0, 7 ) ) != 'http://' ) && ( strtolower( substr( $link_url, 0, 8 ) ) != 'https://' ) ) ? get_option( 'home' ) . $link_url : $link_url;
-		$links_summary .= "\n" . $link_number . ' ' . $link_url;
+		$content = str_replace($link_match, $link_text.' '.$link_number, $content);
+		$link_url = ((strtolower(substr($link_url, 0, 7)) != 'http://') && (strtolower(substr($link_url, 0, 8)) != 'https://')) ? get_option('home').$link_url : $link_url;
+		$links_summary .= "\n".$link_number.' '.$link_url;
 	}
-	$content  = strip_tags( $content );
+	$content  = strip_tags($content);
 	$content .= $links_summary;
 	return $content;
 }
@@ -1734,9 +1734,9 @@ 
  * @param string $domain Optional. Domain to retrieve the translated text
  * @return string Translated context string without pipe
  */
-function _c( $text, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9.0', '_x()' );
-	return before_last_bar( translate( $text, $domain ) );
+function _c($text, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9.0', '_x()');
+	return before_last_bar(translate($text, $domain));
 }
 
 /**
@@ -1751,9 +1751,9 @@ 
  * @param string $domain Domain to retrieve the translated text
  * @return string Translated text
  */
-function translate_with_context( $text, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9.0', '_x()' );
-	return before_last_bar( translate( $text, $domain ) );
+function translate_with_context($text, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9.0', '_x()');
+	return before_last_bar(translate($text, $domain));
 }
 
 /**
@@ -1772,9 +1772,9 @@ 
  *                       Default 'default'.
  * @return string The translated singular or plural form.
  */
-function _nc( $single, $plural, $number, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9.0', '_nx()' );
-	return before_last_bar( _n( $single, $plural, $number, $domain ) );
+function _nc($single, $plural, $number, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9.0', '_nx()');
+	return before_last_bar(_n($single, $plural, $number, $domain));
 }
 
 /**
@@ -1785,7 +1785,7 @@ 
  * @see _n()
  */
 function __ngettext() {
-	_deprecated_function( __FUNCTION__, '2.8.0', '_n()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', '_n()');
 	$args = func_get_args();
 	return call_user_func_array('_n', $args);
 }
@@ -1798,7 +1798,7 @@ 
  * @see _n_noop()
  */
 function __ngettext_noop() {
-	_deprecated_function( __FUNCTION__, '2.8.0', '_n_noop()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', '_n_noop()');
 	$args = func_get_args();
 	return call_user_func_array('_n_noop', $args);
 
@@ -1814,7 +1814,7 @@ 
  * @return array List of all options.
  */
 function get_alloptions() {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_load_alloptions()' );
+	_deprecated_function(__FUNCTION__, '3.0.0', 'wp_load_alloptions()');
 	return wp_load_alloptions();
 }
 
@@ -1832,14 +1832,14 @@ 
  * @return string
  */
 function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false, $permalink = false) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_link()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_get_attachment_link()');
 	$id = (int) $id;
 	$_post = get_post($id);
 
-	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
+	if (('attachment' != $_post->post_type) || ! $url = wp_get_attachment_url($_post->ID))
 		return __('Missing Attachment');
 
-	if ( $permalink )
+	if ($permalink)
 		$url = get_attachment_link($_post->ID);
 
 	$post_title = esc_attr($_post->post_title);
@@ -1859,31 +1859,31 @@ 
  * @param bool $fullsize Optional, default to false. Whether to have full image.
  * @return array Icon URL and full path to file, respectively.
  */
-function get_attachment_icon_src( $id = 0, $fullsize = false ) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image_src()' );
+function get_attachment_icon_src($id = 0, $fullsize = false) {
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_get_attachment_image_src()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	$file = get_attached_file( $post->ID );
+	$file = get_attached_file($post->ID);
 
-	if ( !$fullsize && $src = wp_get_attachment_thumb_url( $post->ID ) ) {
+	if ( ! $fullsize && $src = wp_get_attachment_thumb_url($post->ID)) {
 		// We have a thumbnail desired, specified and existing
 
 		$src_file = basename($src);
-	} elseif ( wp_attachment_is_image( $post->ID ) ) {
+	} elseif (wp_attachment_is_image($post->ID)) {
 		// We have an image without a thumbnail
 
-		$src = wp_get_attachment_url( $post->ID );
+		$src = wp_get_attachment_url($post->ID);
 		$src_file = & $file;
-	} elseif ( $src = wp_mime_type_icon( $post->ID ) ) {
+	} elseif ($src = wp_mime_type_icon($post->ID)) {
 		// No thumb, no image. We'll look for a mime-related icon instead.
 
-		$icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
-		$src_file = $icon_dir . '/' . basename($src);
+		$icon_dir = apply_filters('icon_dir', get_template_directory().'/images');
+		$src_file = $icon_dir.'/'.basename($src);
 	}
 
-	if ( !isset($src) || !$src )
+	if ( ! isset($src) || ! $src)
 		return false;
 
 	return array($src, $src_file);
@@ -1901,27 +1901,27 @@ 
  * @param array $max_dims Optional. Dimensions of image.
  * @return false|string HTML content.
  */
-function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
+function get_attachment_icon($id = 0, $fullsize = false, $max_dims = false) {
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_get_attachment_image()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
+	if ( ! $src = get_attachment_icon_src($post->ID, $fullsize))
 		return false;
 
 	list($src, $src_file) = $src;
 
 	// Do we need to constrain the image?
-	if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) {
+	if (($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file)) {
 
 		$imagesize = getimagesize($src_file);
 
-		if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1] ) {
+		if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1]) {
 			$actual_aspect = $imagesize[0] / $imagesize[1];
 			$desired_aspect = $max_dims[0] / $max_dims[1];
 
-			if ( $actual_aspect >= $desired_aspect ) {
+			if ($actual_aspect >= $desired_aspect) {
 				$height = $actual_aspect * $max_dims[0];
 				$constraint = "width='{$max_dims[0]}' ";
 				$post->iconsize = array($max_dims[0], $height);
@@ -1942,7 +1942,7 @@ 
 
 	$icon = "<img src='$src' title='$post_title' alt='$post_title' $constraint/>";
 
-	return apply_filters( 'attachment_icon', $icon, $post->ID );
+	return apply_filters('attachment_icon', $icon, $post->ID);
 }
 
 /**
@@ -1958,12 +1958,12 @@ 
  * @return false|string
  */
 function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
-	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
+	_deprecated_function(__FUNCTION__, '2.5.0', 'wp_get_attachment_image()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
+	if ($innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
 		return $innerHTML;
 
 	$innerHTML = esc_attr($post->post_title);
@@ -1985,8 +1985,8 @@ 
  *                            'attribute', 'js', 'db', or 'display'. Default 'raw'.
  * @return object|array Bookmark object or array, depending on the type specified by `$output`.
  */
-function get_link( $bookmark_id, $output = OBJECT, $filter = 'raw' ) {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmark()' );
+function get_link($bookmark_id, $output = OBJECT, $filter = 'raw') {
+	_deprecated_function(__FUNCTION__, '2.1.0', 'get_bookmark()');
 	return get_bookmark($bookmark_id, $output, $filter);
 }
 
@@ -2001,9 +2001,9 @@ 
  * @param array $protocols An array of acceptable protocols.
  * @return string The cleaned URL.
  */
-function sanitize_url( $url, $protocols = null ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'esc_url_raw()' );
-	return esc_url_raw( $url, $protocols );
+function sanitize_url($url, $protocols = null) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'esc_url_raw()');
+	return esc_url_raw($url, $protocols);
 }
 
 /**
@@ -2022,12 +2022,12 @@ 
  * @param string $context Optional. How the URL will be used. Default is 'display'.
  * @return string The cleaned $url after the {@see 'clean_url'} filter is applied.
  */
-function clean_url( $url, $protocols = null, $context = 'display' ) {
-	if ( $context == 'db' )
-		_deprecated_function( 'clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()' );
+function clean_url($url, $protocols = null, $context = 'display') {
+	if ($context == 'db')
+		_deprecated_function('clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()');
 	else
-		_deprecated_function( __FUNCTION__, '3.0.0', 'esc_url()' );
-	return esc_url( $url, $protocols, $context );
+		_deprecated_function(__FUNCTION__, '3.0.0', 'esc_url()');
+	return esc_url($url, $protocols, $context);
 }
 
 /**
@@ -2042,9 +2042,9 @@ 
  * @param string $text The text to be escaped.
  * @return string Escaped text.
  */
-function js_escape( $text ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'esc_js()' );
-	return esc_js( $text );
+function js_escape($text) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'esc_js()');
+	return esc_js($text);
 }
 
 /**
@@ -2059,13 +2059,13 @@ 
  * @param false        $double_encode Whether to double encode. Unused.
  * @return string Escaped `$string`.
  */
-function wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'esc_html()' );
-	if ( func_num_args() > 1 ) { // Maintain back-compat for people passing additional arguments.
+function wp_specialchars($string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'esc_html()');
+	if (func_num_args() > 1) { // Maintain back-compat for people passing additional arguments.
 		$args = func_get_args();
-		return call_user_func_array( '_wp_specialchars', $args );
+		return call_user_func_array('_wp_specialchars', $args);
 	} else {
-		return esc_html( $string );
+		return esc_html($string);
 	}
 }
 
@@ -2079,9 +2079,9 @@ 
  * @param string $text
  * @return string
  */
-function attribute_escape( $text ) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'esc_attr()' );
-	return esc_attr( $text );
+function attribute_escape($text) {
+	_deprecated_function(__FUNCTION__, '2.8.0', 'esc_attr()');
+	return esc_attr($text);
 }
 
 /**
@@ -2104,10 +2104,10 @@ 
  * @param mixed      $params ,...     Widget parameters.
  */
 function register_sidebar_widget($name, $output_callback, $classname = '') {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()');
 	// Compat
-	if ( is_array($name) ) {
-		if ( count($name) == 3 )
+	if (is_array($name)) {
+		if (count($name) == 3)
 			$name = sprintf($name[0], $name[2]);
 		else
 			$name = $name[0];
@@ -2115,11 +2115,11 @@ 
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($classname) && is_string($classname) )
+	if ( ! empty($classname) && is_string($classname))
 		$options['classname'] = $classname;
 	$params = array_slice(func_get_args(), 2);
 	$args = array($id, $name, $output_callback, $options);
-	if ( !empty($params) )
+	if ( ! empty($params))
 		$args = array_merge($args, $params);
 
 	call_user_func_array('wp_register_sidebar_widget', $args);
@@ -2135,7 +2135,7 @@ 
  * @param int|string $id Widget ID.
  */
 function unregister_sidebar_widget($id) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_unregister_sidebar_widget()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'wp_unregister_sidebar_widget()');
 	return wp_unregister_sidebar_widget($id);
 }
 
@@ -2159,10 +2159,10 @@ 
  * @param int $height Widget height.
  */
 function register_widget_control($name, $control_callback, $width = '', $height = '') {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_widget_control()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'wp_register_widget_control()');
 	// Compat
-	if ( is_array($name) ) {
-		if ( count($name) == 3 )
+	if (is_array($name)) {
+		if (count($name) == 3)
 			$name = sprintf($name[0], $name[2]);
 		else
 			$name = $name[0];
@@ -2170,13 +2170,13 @@ 
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($width) )
+	if ( ! empty($width))
 		$options['width'] = $width;
-	if ( !empty($height) )
+	if ( ! empty($height))
 		$options['height'] = $height;
 	$params = array_slice(func_get_args(), 4);
 	$args = array($id, $name, $control_callback, $options);
-	if ( !empty($params) )
+	if ( ! empty($params))
 		$args = array_merge($args, $params);
 
 	call_user_func_array('wp_register_widget_control', $args);
@@ -2192,7 +2192,7 @@ 
  * @param int|string $id Widget ID.
  */
 function unregister_widget_control($id) {
-	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_unregister_widget_control()' );
+	_deprecated_function(__FUNCTION__, '2.8.0', 'wp_unregister_widget_control()');
 	return wp_unregister_widget_control($id);
 }
 
@@ -2208,32 +2208,32 @@ 
  * @param mixed $meta_value Metadata value.
  * @return bool True deletion completed and false if user_id is not a number.
  */
-function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'delete_user_meta()' );
+function delete_usermeta($user_id, $meta_key, $meta_value = '') {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'delete_user_meta()');
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
+	if ( ! is_numeric($user_id))
 		return false;
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
-	if ( is_array($meta_value) || is_object($meta_value) )
+	if (is_array($meta_value) || is_object($meta_value))
 		$meta_value = serialize($meta_value);
-	$meta_value = trim( $meta_value );
+	$meta_value = trim($meta_value);
 
-	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	$cur = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur && $cur->umeta_id)
+		do_action('delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
-	if ( ! empty($meta_value) )
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
+	if ( ! empty($meta_value))
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value));
 	else
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	clean_user_cache( $user_id );
-	wp_cache_delete( $user_id, 'user_meta' );
+	clean_user_cache($user_id);
+	wp_cache_delete($user_id, 'user_meta');
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur && $cur->umeta_id)
+		do_action('deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
 	return true;
 }
@@ -2254,28 +2254,28 @@ 
  * @param string $meta_key Optional. Metadata key.
  * @return mixed
  */
-function get_usermeta( $user_id, $meta_key = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'get_user_meta()' );
+function get_usermeta($user_id, $meta_key = '') {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'get_user_meta()');
 	global $wpdb;
 	$user_id = (int) $user_id;
 
-	if ( !$user_id )
+	if ( ! $user_id)
 		return false;
 
-	if ( !empty($meta_key) ) {
+	if ( ! empty($meta_key)) {
 		$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 		$user = wp_cache_get($user_id, 'users');
 		// Check the cached user object
-		if ( false !== $user && isset($user->$meta_key) )
+		if (false !== $user && isset($user->$meta_key))
 			$metas = array($user->$meta_key);
 		else
-			$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+			$metas = $wpdb->get_col($wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 	} else {
-		$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id) );
+		$metas = $wpdb->get_col($wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id));
 	}
 
-	if ( empty($metas) ) {
-		if ( empty($meta_key) )
+	if (empty($metas)) {
+		if (empty($meta_key))
 			return array();
 		else
 			return '';
@@ -2283,7 +2283,7 @@ 
 
 	$metas = array_map('maybe_unserialize', $metas);
 
-	if ( count($metas) == 1 )
+	if (count($metas) == 1)
 		return $metas[0];
 	else
 		return $metas;
@@ -2307,15 +2307,15 @@ 
  * @param mixed $meta_value Metadata value.
  * @return bool True on successful update, false on failure.
  */
-function update_usermeta( $user_id, $meta_key, $meta_value ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'update_user_meta()' );
+function update_usermeta($user_id, $meta_key, $meta_value) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'update_user_meta()');
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
+	if ( ! is_numeric($user_id))
 		return false;
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
 	/** @todo Might need fix because usermeta data is assumed to be already escaped */
-	if ( is_string($meta_value) )
+	if (is_string($meta_value))
 		$meta_value = stripslashes($meta_value);
 	$meta_value = maybe_serialize($meta_value);
 
@@ -2323,25 +2323,25 @@ 
 		return delete_usermeta($user_id, $meta_key);
 	}
 
-	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	$cur = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	if ( $cur )
-		do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur)
+		do_action('update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
-	if ( !$cur )
-		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
-	elseif ( $cur->meta_value != $meta_value )
-		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
+	if ( ! $cur)
+		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value'));
+	elseif ($cur->meta_value != $meta_value)
+		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key'));
 	else
 		return false;
 
-	clean_user_cache( $user_id );
-	wp_cache_delete( $user_id, 'user_meta' );
+	clean_user_cache($user_id);
+	wp_cache_delete($user_id, 'user_meta');
 
-	if ( !$cur )
-		do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
+	if ( ! $cur)
+		do_action('added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value);
 	else
-		do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+		do_action('updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
 	return true;
 }
@@ -2362,14 +2362,14 @@ 
  * @param int $id Site ID.
  * @return array List of users that are part of that site ID
  */
-function get_users_of_blog( $id = '' ) {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+function get_users_of_blog($id = '') {
+	_deprecated_function(__FUNCTION__, '3.1.0', 'get_users()');
 
 	global $wpdb, $blog_id;
-	if ( empty($id) )
+	if (empty($id))
 		$id = (int) $blog_id;
 	$blog_prefix = $wpdb->get_blog_prefix($id);
-	$users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
+	$users = $wpdb->get_results("SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id");
 	return $users;
 }
 
@@ -2382,13 +2382,13 @@ 
  *
  * @param bool $add Optional, default is true. Add or remove links. Defaults to true.
  */
-function automatic_feed_links( $add = true ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', "add_theme_support( 'automatic-feed-links' )" );
+function automatic_feed_links($add = true) {
+	_deprecated_function(__FUNCTION__, '3.0.0', "add_theme_support( 'automatic-feed-links' )");
 
-	if ( $add )
-		add_theme_support( 'automatic-feed-links' );
+	if ($add)
+		add_theme_support('automatic-feed-links');
 	else
-		remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+
+		remove_action('wp_head', 'feed_links_extra', 3); // Just do this yourself in 3.0+
 }
 
 /**
@@ -2402,13 +2402,13 @@ 
  * @param false|int $user Optional. User ID to retrieve the field for. Default false (current user).
  * @return string The author's field from the current author's DB object.
  */
-function get_profile( $field, $user = false ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'get_the_author_meta()' );
-	if ( $user ) {
-		$user = get_user_by( 'login', $user );
+function get_profile($field, $user = false) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'get_the_author_meta()');
+	if ($user) {
+		$user = get_user_by('login', $user);
 		$user = $user->ID;
 	}
-	return get_the_author_meta( $field, $user );
+	return get_the_author_meta($field, $user);
 }
 
 /**
@@ -2421,9 +2421,9 @@ 
  * @param int $userid User to count posts for.
  * @return int Number of posts the given user has written.
  */
-function get_usernumposts( $userid ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'count_user_posts()' );
-	return count_user_posts( $userid );
+function get_usernumposts($userid) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'count_user_posts()');
+	return count_user_posts($userid);
 }
 
 /**
@@ -2437,7 +2437,7 @@ 
  * @return string An HTML entity
  */
 function funky_javascript_callback($matches) {
-	return "&#".base_convert($matches[1],16,10).";";
+	return "&#".base_convert($matches[1], 16, 10).";";
 }
 
 /**
@@ -2455,12 +2455,12 @@ 
  * @return string Fixed text.
  */
 function funky_javascript_fix($text) {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+	_deprecated_function(__FUNCTION__, '3.0.0');
 	// Fixes for browsers' JavaScript bugs.
 	global $is_macIE, $is_winIE;
 
-	if ( $is_winIE || $is_macIE )
-		$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
+	if ($is_winIE || $is_macIE)
+		$text = preg_replace_callback("/\%u([0-9A-F]{4,4})/",
 					"funky_javascript_callback",
 					$text);
 
@@ -2477,9 +2477,9 @@ 
  * @param string $taxonomy Name of taxonomy object
  * @return bool Whether the taxonomy exists.
  */
-function is_taxonomy( $taxonomy ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'taxonomy_exists()' );
-	return taxonomy_exists( $taxonomy );
+function is_taxonomy($taxonomy) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'taxonomy_exists()');
+	return taxonomy_exists($taxonomy);
 }
 
 /**
@@ -2494,9 +2494,9 @@ 
  * @param int $parent ID of parent term under which to confine the exists search.
  * @return mixed Get the term id or Term Object, if exists.
  */
-function is_term( $term, $taxonomy = '', $parent = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'term_exists()' );
-	return term_exists( $term, $taxonomy, $parent );
+function is_term($term, $taxonomy = '', $parent = 0) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'term_exists()');
+	return term_exists($term, $taxonomy, $parent);
 }
 
 /**
@@ -2512,11 +2512,11 @@ 
  * @return bool
  */
 function is_plugin_page() {
-	_deprecated_function( __FUNCTION__, '3.1.0'  );
+	_deprecated_function(__FUNCTION__, '3.1.0');
 
 	global $plugin_page;
 
-	if ( isset($plugin_page) )
+	if (isset($plugin_page))
 		return true;
 
 	return false;
@@ -2535,7 +2535,7 @@ 
  * @return bool Always return True
  */
 function update_category_cache() {
-	_deprecated_function( __FUNCTION__, '3.1.0'  );
+	_deprecated_function(__FUNCTION__, '3.1.0');
 
 	return true;
 }
@@ -2549,7 +2549,7 @@ 
  * @return bool
  */
 function wp_timezone_supported() {
-	_deprecated_function( __FUNCTION__, '3.2.0' );
+	_deprecated_function(__FUNCTION__, '3.2.0');
 
 	return true;
 }
@@ -2569,9 +2569,9 @@ 
  * @param bool   $extended      Optional. Unused.
  */
 function the_editor($content, $id = 'content', $prev_id = 'title', $media_buttons = true, $tab_index = 2, $extended = true) {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_editor()');
 
-	wp_editor( $content, $id, array( 'media_buttons' => $media_buttons ) );
+	wp_editor($content, $id, array('media_buttons' => $media_buttons));
 }
 
 /**
@@ -2584,20 +2584,20 @@ 
  * @return array of arrays. The array is indexed by user_id, containing $metavalues object arrays.
  */
 function get_user_metavalues($ids) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	$objects = array();
 
 	$ids = array_map('intval', $ids);
-	foreach ( $ids as $id )
+	foreach ($ids as $id)
 		$objects[$id] = array();
 
 	$metas = update_meta_cache('user', $ids);
 
-	foreach ( $metas as $id => $meta ) {
-		foreach ( $meta as $key => $metavalues ) {
-			foreach ( $metavalues as $value ) {
-				$objects[$id][] = (object)array( 'user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);
+	foreach ($metas as $id => $meta) {
+		foreach ($meta as $key => $metavalues) {
+			foreach ($metavalues as $value) {
+				$objects[$id][] = (object) array('user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);
 			}
 		}
 	}
@@ -2618,23 +2618,23 @@ 
  * @return object|array The now sanitized User Object or Array (will be the same type as $user)
  */
 function sanitize_user_object($user, $context = 'display') {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
-	if ( is_object($user) ) {
-		if ( !isset($user->ID) )
+	if (is_object($user)) {
+		if ( ! isset($user->ID))
 			$user->ID = 0;
-		if ( ! ( $user instanceof WP_User ) ) {
+		if ( ! ($user instanceof WP_User)) {
 			$vars = get_object_vars($user);
-			foreach ( array_keys($vars) as $field ) {
-				if ( is_string($user->$field) || is_numeric($user->$field) )
+			foreach (array_keys($vars) as $field) {
+				if (is_string($user->$field) || is_numeric($user->$field))
 					$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
 			}
 		}
 		$user->filter = $context;
 	} else {
-		if ( !isset($user['ID']) )
+		if ( ! isset($user['ID']))
 			$user['ID'] = 0;
-		foreach ( array_keys($user) as $field )
+		foreach (array_keys($user) as $field)
 			$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
 		$user['filter'] = $context;
 	}
@@ -2657,17 +2657,17 @@ 
  * @return string
  */
 function get_boundary_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '', $start = true) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	$posts = get_boundary_post($in_same_cat, $excluded_categories, $start);
 	// If there is no post stop.
-	if ( empty($posts) )
+	if (empty($posts))
 		return;
 
 	// Even though we limited get_posts to return only 1 item it still returns an array of objects.
 	$post = $posts[0];
 
-	if ( empty($post->post_title) )
+	if (empty($post->post_title))
 		$post->post_title = $start ? __('First Post') : __('Last Post');
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
@@ -2678,10 +2678,10 @@ 
 
 	$link = $start ? "<link rel='start' title='" : "<link rel='end' title='";
 	$link .= esc_attr($title);
-	$link .= "' href='" . get_permalink($post) . "' />\n";
+	$link .= "' href='".get_permalink($post)."' />\n";
 
 	$boundary = $start ? 'start' : 'end';
-	return apply_filters( "{$boundary}_post_rel_link", $link );
+	return apply_filters("{$boundary}_post_rel_link", $link);
 }
 
 /**
@@ -2695,7 +2695,7 @@ 
  * @param string $excluded_categories Optional. Excluded categories IDs.
  */
 function start_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	echo get_boundary_post_rel_link($title, $in_same_cat, $excluded_categories, true);
 }
@@ -2709,10 +2709,10 @@ 
  * @return string
  */
 function get_index_rel_link() {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
-	$link = "<link rel='index' title='" . esc_attr( get_bloginfo( 'name', 'display' ) ) . "' href='" . esc_url( user_trailingslashit( get_bloginfo( 'url', 'display' ) ) ) . "' />\n";
-	return apply_filters( "index_rel_link", $link );
+	$link = "<link rel='index' title='".esc_attr(get_bloginfo('name', 'display'))."' href='".esc_url(user_trailingslashit(get_bloginfo('url', 'display')))."' />\n";
+	return apply_filters("index_rel_link", $link);
 }
 
 /**
@@ -2722,7 +2722,7 @@ 
  * @deprecated 3.3.0
  */
 function index_rel_link() {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	echo get_index_rel_link();
 }
@@ -2736,13 +2736,13 @@ 
  * @param string $title Optional. Link title format. Default '%title'.
  * @return string
  */
-function get_parent_post_rel_link( $title = '%title' ) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+function get_parent_post_rel_link($title = '%title') {
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
-	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) )
+	if ( ! empty($GLOBALS['post']) && ! empty($GLOBALS['post']->post_parent))
 		$post = get_post($GLOBALS['post']->post_parent);
 
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
@@ -2752,10 +2752,10 @@ 
 	$title = apply_filters('the_title', $title, $post->ID);
 
 	$link = "<link rel='up' title='";
-	$link .= esc_attr( $title );
-	$link .= "' href='" . get_permalink($post) . "' />\n";
+	$link .= esc_attr($title);
+	$link .= "' href='".get_permalink($post)."' />\n";
 
-	return apply_filters( "parent_post_rel_link", $link );
+	return apply_filters("parent_post_rel_link", $link);
 }
 
 /**
@@ -2766,8 +2766,8 @@ 
  *
  * @param string $title Optional. Link title format. Default '%title'.
  */
-function parent_post_rel_link( $title = '%title' ) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+function parent_post_rel_link($title = '%title') {
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	echo get_parent_post_rel_link($title);
 }
@@ -2780,18 +2780,18 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance.
  */
-function wp_admin_bar_dashboard_view_site_menu( $wp_admin_bar ) {
-	_deprecated_function( __FUNCTION__, '3.3.0' );
+function wp_admin_bar_dashboard_view_site_menu($wp_admin_bar) {
+	_deprecated_function(__FUNCTION__, '3.3.0');
 
 	$user_id = get_current_user_id();
 
-	if ( 0 != $user_id ) {
-		if ( is_admin() )
-			$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
-		elseif ( is_multisite() )
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
+	if (0 != $user_id) {
+		if (is_admin())
+			$wp_admin_bar->add_menu(array('id' => 'view-site', 'title' => __('Visit Site'), 'href' => home_url()));
+		elseif (is_multisite())
+			$wp_admin_bar->add_menu(array('id' => 'dashboard', 'title' => __('Dashboard'), 'href' => get_dashboard_url($user_id)));
 		else
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+			$wp_admin_bar->add_menu(array('id' => 'dashboard', 'title' => __('Dashboard'), 'href' => admin_url()));
 	}
 }
 
@@ -2805,10 +2805,10 @@ 
  * @param int $blog_id Site ID
  * @return bool True if the current users belong to $blog_id, false if not.
  */
-function is_blog_user( $blog_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'is_user_member_of_blog()' );
+function is_blog_user($blog_id = 0) {
+	_deprecated_function(__FUNCTION__, '3.3.0', 'is_user_member_of_blog()');
 
-	return is_user_member_of_blog( get_current_user_id(), $blog_id );
+	return is_user_member_of_blog(get_current_user_id(), $blog_id);
 }
 
 /**
@@ -2824,8 +2824,8 @@ 
  * @param string $mode     Type of access you required to the stream.
  * @return false Always false.
  */
-function debug_fopen( $filename, $mode ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
+function debug_fopen($filename, $mode) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
 	return false;
 }
 
@@ -2841,10 +2841,10 @@ 
  * @param mixed  $fp     Unused.
  * @param string $string Message to log.
  */
-function debug_fwrite( $fp, $string ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
-	if ( ! empty( $GLOBALS['debug'] ) )
-		error_log( $string );
+function debug_fwrite($fp, $string) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
+	if ( ! empty($GLOBALS['debug']))
+		error_log($string);
 }
 
 /**
@@ -2858,8 +2858,8 @@ 
  *
  * @param mixed $fp Unused.
  */
-function debug_fclose( $fp ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
+function debug_fclose($fp) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
 }
 
 /**
@@ -2876,21 +2876,21 @@ 
  * @return array Theme list with theme data.
  */
 function get_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_themes()' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_themes()');
 
 	global $wp_themes;
-	if ( isset( $wp_themes ) )
+	if (isset($wp_themes))
 		return $wp_themes;
 
 	$themes = wp_get_themes();
 	$wp_themes = array();
 
-	foreach ( $themes as $theme ) {
+	foreach ($themes as $theme) {
 		$name = $theme->get('Name');
-		if ( isset( $wp_themes[ $name ] ) )
-			$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
+		if (isset($wp_themes[$name]))
+			$wp_themes[$name.'/'.$theme->get_stylesheet()] = $theme;
 		else
-			$wp_themes[ $name ] = $theme;
+			$wp_themes[$name] = $theme;
 	}
 
 	return $wp_themes;
@@ -2906,12 +2906,12 @@ 
  * @param string $theme Theme name.
  * @return array|null Null, if theme name does not exist. Theme data, if exists.
  */
-function get_theme( $theme ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme( $stylesheet )' );
+function get_theme($theme) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_theme( $stylesheet )');
 
 	$themes = get_themes();
-	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) )
-		return $themes[ $theme ];
+	if (is_array($themes) && array_key_exists($theme, $themes))
+		return $themes[$theme];
 	return null;
 }
 
@@ -2925,9 +2925,9 @@ 
  * @return string
  */
 function get_current_theme() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_theme()');
 
-	if ( $theme = get_option( 'current_theme' ) )
+	if ($theme = get_option('current_theme'))
 		return $theme;
 
 	return wp_get_theme()->get('Name');
@@ -2946,10 +2946,10 @@ 
  * @return string The pre block without paragraph/line-break conversion.
  */
 function clean_pre($matches) {
-	_deprecated_function( __FUNCTION__, '3.4.0' );
+	_deprecated_function(__FUNCTION__, '3.4.0');
 
-	if ( is_array($matches) )
-		$text = $matches[1] . $matches[2] . "</pre>";
+	if (is_array($matches))
+		$text = $matches[1].$matches[2]."</pre>";
 	else
 		$text = $matches;
 
@@ -2972,15 +2972,15 @@ 
  * @param callable $admin_head_callback Call on custom header administration screen.
  * @param callable $admin_preview_callback Output a custom header image div on the custom header administration screen. Optional.
  */
-function add_custom_image_header( $wp_head_callback, $admin_head_callback, $admin_preview_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'add_theme_support( \'custom-header\', $args )' );
+function add_custom_image_header($wp_head_callback, $admin_head_callback, $admin_preview_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'add_theme_support( \'custom-header\', $args )');
 	$args = array(
 		'wp-head-callback'    => $wp_head_callback,
 		'admin-head-callback' => $admin_head_callback,
 	);
-	if ( $admin_preview_callback )
+	if ($admin_preview_callback)
 		$args['admin-preview-callback'] = $admin_preview_callback;
-	return add_theme_support( 'custom-header', $args );
+	return add_theme_support('custom-header', $args);
 }
 
 /**
@@ -2993,8 +2993,8 @@ 
  * @return null|bool Whether support was removed.
  */
 function remove_custom_image_header() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'remove_theme_support( \'custom-header\' )' );
-	return remove_theme_support( 'custom-header' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'remove_theme_support( \'custom-header\' )');
+	return remove_theme_support('custom-header');
 }
 
 /**
@@ -3008,16 +3008,16 @@ 
  * @param callable $admin_head_callback Call on custom background administration screen.
  * @param callable $admin_preview_callback Output a custom background image div on the custom background administration screen. Optional.
  */
-function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'add_theme_support( \'custom-background\', $args )' );
+function add_custom_background($wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'add_theme_support( \'custom-background\', $args )');
 	$args = array();
-	if ( $wp_head_callback )
+	if ($wp_head_callback)
 		$args['wp-head-callback'] = $wp_head_callback;
-	if ( $admin_head_callback )
+	if ($admin_head_callback)
 		$args['admin-head-callback'] = $admin_head_callback;
-	if ( $admin_preview_callback )
+	if ($admin_preview_callback)
 		$args['admin-preview-callback'] = $admin_preview_callback;
-	return add_theme_support( 'custom-background', $args );
+	return add_theme_support('custom-background', $args);
 }
 
 /**
@@ -3030,8 +3030,8 @@ 
  * @return null|bool Whether support was removed.
  */
 function remove_custom_background() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'remove_theme_support( \'custom-background\' )' );
-	return remove_theme_support( 'custom-background' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'remove_theme_support( \'custom-background\' )');
+	return remove_theme_support('custom-background');
 }
 
 /**
@@ -3044,9 +3044,9 @@ 
  * @param string $theme_file Theme file path.
  * @return array Theme data.
  */
-function get_theme_data( $theme_file ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
-	$theme = new WP_Theme( basename( dirname( $theme_file ) ), dirname( dirname( $theme_file ) ) );
+function get_theme_data($theme_file) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_theme()');
+	$theme = new WP_Theme(basename(dirname($theme_file)), dirname(dirname($theme_file)));
 
 	$theme_data = array(
 		'Name' => $theme->get('Name'),
@@ -3062,9 +3062,9 @@ 
 		'AuthorName' => $theme->get('Author'),
 	);
 
-	foreach ( apply_filters( 'extra_theme_headers', array() ) as $extra_header ) {
-		if ( ! isset( $theme_data[ $extra_header ] ) )
-			$theme_data[ $extra_header ] = $theme->get( $extra_header );
+	foreach (apply_filters('extra_theme_headers', array()) as $extra_header) {
+		if ( ! isset($theme_data[$extra_header]))
+			$theme_data[$extra_header] = $theme->get($extra_header);
 	}
 
 	return $theme_data;
@@ -3081,10 +3081,10 @@ 
  *
  * @param array $pages list of page objects
  */
-function update_page_cache( &$pages ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'update_post_cache()' );
+function update_page_cache(&$pages) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'update_post_cache()');
 
-	update_post_cache( $pages );
+	update_post_cache($pages);
 }
 
 /**
@@ -3099,10 +3099,10 @@ 
  *
  * @param int $id Page ID to clean
  */
-function clean_page_cache( $id ) {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'clean_post_cache()' );
+function clean_page_cache($id) {
+	_deprecated_function(__FUNCTION__, '3.4.0', 'clean_post_cache()');
 
-	clean_post_cache( $id );
+	clean_post_cache($id);
 }
 
 /**
@@ -3117,9 +3117,9 @@ 
  * @param string $action Nonce action.
  * @return string Are you sure message.
  */
-function wp_explain_nonce( $action ) {
-	_deprecated_function( __FUNCTION__, '3.4.1', 'wp_nonce_ays()' );
-	return __( 'Are you sure you want to do this?' );
+function wp_explain_nonce($action) {
+	_deprecated_function(__FUNCTION__, '3.4.1', 'wp_nonce_ays()');
+	return __('Are you sure you want to do this?');
 }
 
 /**
@@ -3131,9 +3131,9 @@ 
  *
  * @param int $post_id An optional post ID.
  */
-function sticky_class( $post_id = null ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'post_class()' );
-	if ( is_sticky( $post_id ) )
+function sticky_class($post_id = null) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'post_class()');
+	if (is_sticky($post_id))
 		echo ' sticky';
 }
 
@@ -3149,8 +3149,8 @@ 
  *
  * @param WP_Post &$post Post object, passed by reference (unused).
  */
-function _get_post_ancestors( &$post ) {
-	_deprecated_function( __FUNCTION__, '3.5.0' );
+function _get_post_ancestors(&$post) {
+	_deprecated_function(__FUNCTION__, '3.5.0');
 }
 
 /**
@@ -3163,24 +3163,24 @@ 
  * @param string $file Filename of the image to load.
  * @return resource The resulting image resource on success, Error string on failure.
  */
-function wp_load_image( $file ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
+function wp_load_image($file) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_get_image_editor()');
 
-	if ( is_numeric( $file ) )
-		$file = get_attached_file( $file );
+	if (is_numeric($file))
+		$file = get_attached_file($file);
 
-	if ( ! is_file( $file ) )
+	if ( ! is_file($file))
 		return sprintf(__('File &#8220;%s&#8221; doesn&#8217;t exist?'), $file);
 
-	if ( ! function_exists('imagecreatefromstring') )
+	if ( ! function_exists('imagecreatefromstring'))
 		return __('The GD image library is not installed.');
 
 	// Set artificially high because GD uses uncompressed images in memory.
-	wp_raise_memory_limit( 'image' );
+	wp_raise_memory_limit('image');
 
-	$image = imagecreatefromstring( file_get_contents( $file ) );
+	$image = imagecreatefromstring(file_get_contents($file));
 
-	if ( !is_resource( $image ) )
+	if ( ! is_resource($image))
 		return sprintf(__('File &#8220;%s&#8221; is not an image.'), $file);
 
 	return $image;
@@ -3210,22 +3210,22 @@ 
  * @param int $jpeg_quality Optional, default is 90. Image quality percentage.
  * @return mixed WP_Error on failure. String with new destination path.
  */
-function image_resize( $file, $max_w, $max_h, $crop = false, $suffix = null, $dest_path = null, $jpeg_quality = 90 ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
+function image_resize($file, $max_w, $max_h, $crop = false, $suffix = null, $dest_path = null, $jpeg_quality = 90) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_get_image_editor()');
 
-	$editor = wp_get_image_editor( $file );
-	if ( is_wp_error( $editor ) )
+	$editor = wp_get_image_editor($file);
+	if (is_wp_error($editor))
 		return $editor;
-	$editor->set_quality( $jpeg_quality );
+	$editor->set_quality($jpeg_quality);
 
-	$resized = $editor->resize( $max_w, $max_h, $crop );
-	if ( is_wp_error( $resized ) )
+	$resized = $editor->resize($max_w, $max_h, $crop);
+	if (is_wp_error($resized))
 		return $resized;
 
-	$dest_file = $editor->generate_filename( $suffix, $dest_path );
-	$saved = $editor->save( $dest_file );
+	$dest_file = $editor->generate_filename($suffix, $dest_path);
+	$saved = $editor->save($dest_file);
 
-	if ( is_wp_error( $saved ) )
+	if (is_wp_error($saved))
 		return $saved;
 
 	return $dest_file;
@@ -3245,9 +3245,9 @@ 
  * @param string $mode How to return result, either OBJECT, ARRAY_N, or ARRAY_A.
  * @return WP_Post|null Post object or array holding post contents and information
  */
-function wp_get_single_post( $postid = 0, $mode = OBJECT ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'get_post()' );
-	return get_post( $postid, $mode );
+function wp_get_single_post($postid = 0, $mode = OBJECT) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'get_post()');
+	return get_post($postid, $mode);
 }
 
 /**
@@ -3262,9 +3262,9 @@ 
  * @return bool False if does not authenticate, true if username and password authenticates.
  */
 function user_pass_ok($user_login, $user_pass) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_authenticate()' );
-	$user = wp_authenticate( $user_login, $user_pass );
-	if ( is_wp_error( $user ) )
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_authenticate()');
+	$user = wp_authenticate($user_login, $user_pass);
+	if (is_wp_error($user))
 		return false;
 
 	return true;
@@ -3289,10 +3289,10 @@ 
  * @return bool
  */
 function gd_edit_image_support($mime_type) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_image_editor_supports()' );
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_image_editor_supports()');
 
-	if ( function_exists('imagetypes') ) {
-		switch( $mime_type ) {
+	if (function_exists('imagetypes')) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				return (imagetypes() & IMG_JPG) != 0;
 			case 'image/png':
@@ -3301,7 +3301,7 @@ 
 				return (imagetypes() & IMG_GIF) != 0;
 		}
 	} else {
-		switch( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				return function_exists('imagecreatefromjpeg');
 			case 'image/png':
@@ -3323,22 +3323,22 @@ 
  * @param int $bytes An integer byte value.
  * @return string A shorthand byte value.
  */
-function wp_convert_bytes_to_hr( $bytes ) {
-	_deprecated_function( __FUNCTION__, '3.6.0', 'size_format()' );
+function wp_convert_bytes_to_hr($bytes) {
+	_deprecated_function(__FUNCTION__, '3.6.0', 'size_format()');
 
-	$units = array( 0 => 'B', 1 => 'KB', 2 => 'MB', 3 => 'GB', 4 => 'TB' );
-	$log   = log( $bytes, KB_IN_BYTES );
+	$units = array(0 => 'B', 1 => 'KB', 2 => 'MB', 3 => 'GB', 4 => 'TB');
+	$log   = log($bytes, KB_IN_BYTES);
 	$power = (int) $log;
-	$size  = pow( KB_IN_BYTES, $log - $power );
+	$size  = pow(KB_IN_BYTES, $log - $power);
 
-	if ( ! is_nan( $size ) && array_key_exists( $power, $units ) ) {
-		$unit = $units[ $power ];
+	if ( ! is_nan($size) && array_key_exists($power, $units)) {
+		$unit = $units[$power];
 	} else {
 		$size = $bytes;
 		$unit = $units[0];
 	}
 
-	return $size . $unit;
+	return $size.$unit;
 }
 
 /**
@@ -3351,9 +3351,9 @@ 
  * @param string $t Search terms to "tidy", e.g. trim.
  * @return string Trimmed search terms.
  */
-function _search_terms_tidy( $t ) {
-	_deprecated_function( __FUNCTION__, '3.7.0' );
-	return trim( $t, "\"'\n\r " );
+function _search_terms_tidy($t) {
+	_deprecated_function(__FUNCTION__, '3.7.0');
+	return trim($t, "\"'\n\r ");
 }
 
 /**
@@ -3369,10 +3369,10 @@ 
  */
 function rich_edit_exists() {
 	global $wp_rich_edit_exists;
-	_deprecated_function( __FUNCTION__, '3.9.0' );
+	_deprecated_function(__FUNCTION__, '3.9.0');
 
-	if ( ! isset( $wp_rich_edit_exists ) )
-		$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	if ( ! isset($wp_rich_edit_exists))
+		$wp_rich_edit_exists = file_exists(ABSPATH.WPINC.'/js/tinymce/tinymce.js');
 
 	return $wp_rich_edit_exists;
 }
@@ -3387,7 +3387,7 @@ 
  * @param int $count Number of topics.
  * @return int Number of topics.
  */
-function default_topic_count_text( $count ) {
+function default_topic_count_text($count) {
 	return $count;
 }
 
@@ -3402,8 +3402,8 @@ 
  * @param string $content The text to format.
  * @return string The very same text.
  */
-function format_to_post( $content ) {
-	_deprecated_function( __FUNCTION__, '3.9.0' );
+function format_to_post($content) {
+	_deprecated_function(__FUNCTION__, '3.9.0');
 	return $content;
 }
 
@@ -3418,8 +3418,8 @@ 
  * @return string text, safe for inclusion in LIKE query.
  */
 function like_escape($text) {
-	_deprecated_function( __FUNCTION__, '4.0.0', 'wpdb::esc_like()' );
-	return str_replace( array( "%", "_" ), array( "\\%", "\\_" ), $text );
+	_deprecated_function(__FUNCTION__, '4.0.0', 'wpdb::esc_like()');
+	return str_replace(array("%", "_"), array("\\%", "\\_"), $text);
 }
 
 /**
@@ -3434,14 +3434,14 @@ 
  * @param string $url The URL to test.
  * @return bool Whether SSL access is available.
  */
-function url_is_accessable_via_ssl( $url ) {
-	_deprecated_function( __FUNCTION__, '4.0.0' );
+function url_is_accessable_via_ssl($url) {
+	_deprecated_function(__FUNCTION__, '4.0.0');
 
-	$response = wp_remote_get( set_url_scheme( $url, 'https' ) );
+	$response = wp_remote_get(set_url_scheme($url, 'https'));
 
-	if ( !is_wp_error( $response ) ) {
-		$status = wp_remote_retrieve_response_code( $response );
-		if ( 200 == $status || 401 == $status ) {
+	if ( ! is_wp_error($response)) {
+		$status = wp_remote_retrieve_response_code($response);
+		if (200 == $status || 401 == $status) {
 			return true;
 		}
 	}
@@ -3459,7 +3459,7 @@ 
  * @deprecated 4.3.0
  */
 function preview_theme() {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+	_deprecated_function(__FUNCTION__, '4.3.0');
 }
 
 /**
@@ -3472,7 +3472,7 @@ 
  * @return string
  */
 function _preview_theme_template_filter() {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+	_deprecated_function(__FUNCTION__, '4.3.0');
 	return '';
 }
 
@@ -3486,7 +3486,7 @@ 
  * @return string
  */
 function _preview_theme_stylesheet_filter() {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+	_deprecated_function(__FUNCTION__, '4.3.0');
 	return '';
 }
 
@@ -3500,8 +3500,8 @@ 
  * @param string $content
  * @return string
  */
-function preview_theme_ob_filter( $content ) {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+function preview_theme_ob_filter($content) {
+	_deprecated_function(__FUNCTION__, '4.3.0');
 	return $content;
 }
 
@@ -3517,8 +3517,8 @@ 
  * @param array $matches
  * @return string
  */
-function preview_theme_ob_filter_callback( $matches ) {
-	_deprecated_function( __FUNCTION__, '4.3.0' );
+function preview_theme_ob_filter_callback($matches) {
+	_deprecated_function(__FUNCTION__, '4.3.0');
 	return '';
 }
 
@@ -3535,9 +3535,9 @@ 
  * @return string The formatted text after filter is applied.
  */
 function wp_richedit_pre($text) {
-	_deprecated_function( __FUNCTION__, '4.3.0', 'format_for_editor()' );
+	_deprecated_function(__FUNCTION__, '4.3.0', 'format_for_editor()');
 
-	if ( empty( $text ) ) {
+	if (empty($text)) {
 		/**
 		 * Filters text returned for the rich text editor.
 		 *
@@ -3553,15 +3553,15 @@ 
 		 *
 		 * @param string $output Text for the rich text editor.
 		 */
-		return apply_filters( 'richedit_pre', '' );
+		return apply_filters('richedit_pre', '');
 	}
 
 	$output = convert_chars($text);
 	$output = wpautop($output);
-	$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+	$output = htmlspecialchars($output, ENT_NOQUOTES, get_option('blog_charset'));
 
 	/** This filter is documented in wp-includes/deprecated.php */
-	return apply_filters( 'richedit_pre', $output );
+	return apply_filters('richedit_pre', $output);
 }
 
 /**
@@ -3578,10 +3578,10 @@ 
  * @return string Formatted text after filter applied.
  */
 function wp_htmledit_pre($output) {
-	_deprecated_function( __FUNCTION__, '4.3.0', 'format_for_editor()' );
+	_deprecated_function(__FUNCTION__, '4.3.0', 'format_for_editor()');
 
-	if ( !empty($output) )
-		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
+	if ( ! empty($output))
+		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option('blog_charset')); // convert only < > &
 
 	/**
 	 * Filters the text before it is formatted for the HTML editor.
@@ -3591,7 +3591,7 @@ 
 	 *
 	 * @param string $output The HTML-formatted text.
 	 */
-	return apply_filters( 'htmledit_pre', $output );
+	return apply_filters('htmledit_pre', $output);
 }
 
 /**
@@ -3604,10 +3604,10 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string|false
  */
-function post_permalink( $post_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '4.4.0', 'get_permalink()' );
+function post_permalink($post_id = 0) {
+	_deprecated_function(__FUNCTION__, '4.4.0', 'get_permalink()');
 
-	return get_permalink( $post_id );
+	return get_permalink($post_id);
 }
 
 /**
@@ -3626,44 +3626,44 @@ 
  *                               returns false. Default 1.
  * @return bool|string False on failure and string of headers if HEAD request.
  */
-function wp_get_http( $url, $file_path = false, $red = 1 ) {
-	_deprecated_function( __FUNCTION__, '4.4.0', 'WP_Http' );
+function wp_get_http($url, $file_path = false, $red = 1) {
+	_deprecated_function(__FUNCTION__, '4.4.0', 'WP_Http');
 
-	@set_time_limit( 60 );
+	@set_time_limit(60);
 
-	if ( $red > 5 )
+	if ($red > 5)
 		return false;
 
 	$options = array();
 	$options['redirection'] = 5;
 
-	if ( false == $file_path )
+	if (false == $file_path)
 		$options['method'] = 'HEAD';
 	else
 		$options['method'] = 'GET';
 
-	$response = wp_safe_remote_request( $url, $options );
+	$response = wp_safe_remote_request($url, $options);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	$headers = wp_remote_retrieve_headers( $response );
-	$headers['response'] = wp_remote_retrieve_response_code( $response );
+	$headers = wp_remote_retrieve_headers($response);
+	$headers['response'] = wp_remote_retrieve_response_code($response);
 
 	// WP_HTTP no longer follows redirects for HEAD requests.
-	if ( 'HEAD' == $options['method'] && in_array($headers['response'], array(301, 302)) && isset( $headers['location'] ) ) {
-		return wp_get_http( $headers['location'], $file_path, ++$red );
+	if ('HEAD' == $options['method'] && in_array($headers['response'], array(301, 302)) && isset($headers['location'])) {
+		return wp_get_http($headers['location'], $file_path, ++$red);
 	}
 
-	if ( false == $file_path )
+	if (false == $file_path)
 		return $headers;
 
 	// GET request - write it to the supplied filename
 	$out_fp = fopen($file_path, 'w');
-	if ( !$out_fp )
+	if ( ! $out_fp)
 		return $headers;
 
-	fwrite( $out_fp,  wp_remote_retrieve_body( $response ) );
+	fwrite($out_fp, wp_remote_retrieve_body($response));
 	fclose($out_fp);
 	clearstatcache();
 
@@ -3680,9 +3680,9 @@ 
  * @param string|bool $force Optional Whether to force SSL login. Default null.
  * @return bool True if forced, false if not forced.
  */
-function force_ssl_login( $force = null ) {
-	_deprecated_function( __FUNCTION__, '4.4.0', 'force_ssl_admin()' );
-	return force_ssl_admin( $force );
+function force_ssl_login($force = null) {
+	_deprecated_function(__FUNCTION__, '4.4.0', 'force_ssl_admin()');
+	return force_ssl_admin($force);
 }
 
 /**
@@ -3694,7 +3694,7 @@ 
  * @return string Full path to comments popup template file.
  */
 function get_comments_popup_template() {
-	_deprecated_function( __FUNCTION__, '4.5.0' );
+	_deprecated_function(__FUNCTION__, '4.5.0');
 
 	return '';
 }
@@ -3708,7 +3708,7 @@ 
  * @return bool
  */
 function is_comments_popup() {
-	_deprecated_function( __FUNCTION__, '4.5.0' );
+	_deprecated_function(__FUNCTION__, '4.5.0');
 
 	return false;
 }
@@ -3720,7 +3720,7 @@ 
  * @deprecated 4.5.0
  */
 function comments_popup_script() {
-	_deprecated_function( __FUNCTION__, '4.5.0' );
+	_deprecated_function(__FUNCTION__, '4.5.0');
 }
 
 /**
@@ -3732,8 +3732,8 @@ 
  * @param string $text Content to replace links to open in a new window.
  * @return string Content that has filtered links.
  */
-function popuplinks( $text ) {
-	_deprecated_function( __FUNCTION__, '4.5.0' );
+function popuplinks($text) {
+	_deprecated_function(__FUNCTION__, '4.5.0');
 	$text = preg_replace('/<a (.+?)>/i', "<a $1 target='_blank' rel='external'>", $text);
 	return $text;
 }
@@ -3749,8 +3749,8 @@ 
  *
  * @return string An empty string.
  */
-function wp_embed_handler_googlevideo( $matches, $attr, $url, $rawattr ) {
-	_deprecated_function( __FUNCTION__, '4.6.0' );
+function wp_embed_handler_googlevideo($matches, $attr, $url, $rawattr) {
+	_deprecated_function(__FUNCTION__, '4.6.0');
 
 	return '';
 }

Braces +388 added lines, -270 removed lines

@@ -86,8 +86,9 @@ 
 	$categories = get_the_category();
 	$cat = $categories[0]->term_id;
 
-	if ( $echo )
-		echo $cat;
+	if ( $echo ) {
+			echo $cat;
+	}
 
 	return $cat;
 }
@@ -136,19 +137,22 @@ 
 
 	_deprecated_function( __FUNCTION__, '2.0.0', 'previous_post_link()' );
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
+	if ( empty($in_same_cat) || 'no' == $in_same_cat ) {
+			$in_same_cat = false;
+	} else {
+			$in_same_cat = true;
+	}
 
 	$post = get_previous_post($in_same_cat, $excluded_categories);
 
-	if ( !$post )
-		return;
+	if ( !$post ) {
+			return;
+	}
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	if ( 'yes' == $title ) {
+			$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	}
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
 	echo $format;
@@ -171,19 +175,22 @@ 
 function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
 	_deprecated_function( __FUNCTION__, '2.0.0', 'next_post_link()' );
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
+	if ( empty($in_same_cat) || 'no' == $in_same_cat ) {
+			$in_same_cat = false;
+	} else {
+			$in_same_cat = true;
+	}
 
 	$post = get_next_post($in_same_cat, $excluded_categories);
 
-	if ( !$post	)
-		return;
+	if ( !$post	) {
+			return;
+	}
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$next;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	if ( 'yes' == $title ) {
+			$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	}
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
 	echo $format;
@@ -366,11 +373,12 @@ 
 
 	$user  = get_userdata($user_id);
 	$other = get_userdata($other_user);
-	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
-		return true;
-	else
-		return false;
-}
+	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID ) {
+			return true;
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Gets the links associated with category $cat_name.
@@ -399,8 +407,9 @@ 
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
+	if ( $cat ) {
+			$cat_id = $cat->term_id;
+	}
 
 	get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
 }
@@ -459,8 +468,9 @@ 
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
+	if ( $cat ) {
+			$cat_id = $cat->term_id;
+	}
 
 	return get_linkobjects($cat_id, $orderby, $limit);
 }
@@ -511,8 +521,9 @@ 
 	$links = get_bookmarks( array( 'category' => $category, 'orderby' => $orderby, 'limit' => $limit ) ) ;
 
 	$links_array = array();
-	foreach ($links as $link)
-		$links_array[] = $link;
+	foreach ($links as $link) {
+			$links_array[] = $link;
+	}
 
 	return $links_array;
 }
@@ -638,18 +649,24 @@ 
 	$r = wp_parse_args( $args );
 
 	// Map to new names.
-	if ( isset($r['optionall']) && isset($r['all']))
-		$r['show_option_all'] = $r['all'];
-	if ( isset($r['sort_column']) )
-		$r['orderby'] = $r['sort_column'];
-	if ( isset($r['sort_order']) )
-		$r['order'] = $r['sort_order'];
-	if ( isset($r['optiondates']) )
-		$r['show_last_update'] = $r['optiondates'];
-	if ( isset($r['optioncount']) )
-		$r['show_count'] = $r['optioncount'];
-	if ( isset($r['list']) )
-		$r['style'] = $r['list'] ? 'list' : 'break';
+	if ( isset($r['optionall']) && isset($r['all'])) {
+			$r['show_option_all'] = $r['all'];
+	}
+	if ( isset($r['sort_column']) ) {
+			$r['orderby'] = $r['sort_column'];
+	}
+	if ( isset($r['sort_order']) ) {
+			$r['order'] = $r['sort_order'];
+	}
+	if ( isset($r['optiondates']) ) {
+			$r['show_last_update'] = $r['optiondates'];
+	}
+	if ( isset($r['optioncount']) ) {
+			$r['show_count'] = $r['optioncount'];
+	}
+	if ( isset($r['list']) ) {
+			$r['style'] = $r['list'] ? 'list' : 'break';
+	}
 	$r['title_li'] = '';
 
 	return wp_list_categories($r);
@@ -680,12 +697,14 @@ 
 	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_dropdown_categories()' );
 
 	$show_option_all = '';
-	if ( $optionall )
-		$show_option_all = $all;
+	if ( $optionall ) {
+			$show_option_all = $all;
+	}
 
 	$show_option_none = '';
-	if ( $optionnone )
-		$show_option_none = __('None');
+	if ( $optionnone ) {
+			$show_option_none = __('None');
+	}
 
 	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
 					'show_last_update', 'show_count', 'hide_empty', 'selected', 'exclude');
@@ -787,8 +806,9 @@ 
 
 	$link = get_author_posts_url($author_id, $author_nicename);
 
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -931,64 +951,78 @@ 
 		$orderby = substr($orderby, 1);
 	}
 
-	if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
+	if ( $category == -1 ) {
+		//get_bookmarks uses '' to signify all categories
 		$category = '';
+	}
 
 	$results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
 
-	if ( !$results )
-		return;
+	if ( !$results ) {
+			return;
+	}
 
 	$output = '';
 
 	foreach ( (array) $results as $row ) {
-		if ( !isset($row->recently_updated) )
-			$row->recently_updated = false;
+		if ( !isset($row->recently_updated) ) {
+					$row->recently_updated = false;
+		}
 		$output .= $before;
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_prepend');
+		if ( $show_updated && $row->recently_updated ) {
+					$output .= get_option('links_recently_updated_prepend');
+		}
 		$the_link = '#';
-		if ( !empty($row->link_url) )
-			$the_link = esc_url($row->link_url);
+		if ( !empty($row->link_url) ) {
+					$the_link = esc_url($row->link_url);
+		}
 		$rel = $row->link_rel;
-		if ( '' != $rel )
-			$rel = ' rel="' . $rel . '"';
+		if ( '' != $rel ) {
+					$rel = ' rel="' . $rel . '"';
+		}
 
 		$desc = esc_attr(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
 		$name = esc_attr(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
 		$title = $desc;
 
-		if ( $show_updated )
-			if (substr($row->link_updated_f, 0, 2) != '00')
+		if ( $show_updated ) {
+					if (substr($row->link_updated_f, 0, 2) != '00')
 				$title .= ' ('.__('Last updated') . ' ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)) . ')';
+		}
 
-		if ( '' != $title )
-			$title = ' title="' . $title . '"';
+		if ( '' != $title ) {
+					$title = ' title="' . $title . '"';
+		}
 
 		$alt = ' alt="' . $name . '"';
 
 		$target = $row->link_target;
-		if ( '' != $target )
-			$target = ' target="' . $target . '"';
+		if ( '' != $target ) {
+					$target = ' target="' . $target . '"';
+		}
 
 		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
 
 		if ( $row->link_image != null && $show_images ) {
-			if ( strpos($row->link_image, 'http') !== false )
-				$output .= "<img src=\"$row->link_image\" $alt $title />";
-			else // If it's a relative path
+			if ( strpos($row->link_image, 'http') !== false ) {
+							$output .= "<img src=\"$row->link_image\" $alt $title />";
+			} else {
+				// If it's a relative path
 				$output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
+			}
 		} else {
 			$output .= $name;
 		}
 
 		$output .= '</a>';
 
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_append');
+		if ( $show_updated && $row->recently_updated ) {
+					$output .= get_option('links_recently_updated_append');
+		}
 
-		if ( $show_description && '' != $desc )
-			$output .= $between . $desc;
+		if ( $show_description && '' != $desc ) {
+					$output .= $between . $desc;
+		}
 
 		if ($show_rating) {
 			$output .= $between . get_linkrating($row);
@@ -997,8 +1031,9 @@ 
 		$output .= "$after\n";
 	} // end while
 
-	if ( !$echo )
-		return $output;
+	if ( !$echo ) {
+			return $output;
+	}
 	echo $output;
 }
 
@@ -1026,8 +1061,9 @@ 
 		$order = substr($order,1);
 	}
 
-	if ( !isset($direction) )
-		$direction = '';
+	if ( !isset($direction) ) {
+			$direction = '';
+	}
 
 	$cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
 
@@ -1093,13 +1129,15 @@ 
 
 	$id = (int) $id;
 
-	if ( empty($id) )
-		return '';
+	if ( empty($id) ) {
+			return '';
+	}
 
 	$cats = wp_get_link_cats($id);
 
-	if ( empty($cats) || ! is_array($cats) )
-		return '';
+	if ( empty($cats) || ! is_array($cats) ) {
+			return '';
+	}
 
 	$cat_id = (int) $cats[0]; // Take the first cat.
 
@@ -1137,8 +1175,9 @@ 
 
 	$link = get_category_feed_link($cat_ID, 'rss2');
 
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -1157,8 +1196,9 @@ 
 	_deprecated_function( __FUNCTION__, '2.5.0', 'get_author_feed_link()' );
 
 	$link = get_author_feed_link($author_id);
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -1250,19 +1290,22 @@ 
  */
 function get_category_children( $id, $before = '/', $after = '', $visited = array() ) {
 	_deprecated_function( __FUNCTION__, '2.8.0', 'get_term_children()' );
-	if ( 0 == $id )
-		return '';
+	if ( 0 == $id ) {
+			return '';
+	}
 
 	$chain = '';
 	/** TODO: consult hierarchy */
 	$cat_ids = get_all_category_ids();
 	foreach ( (array) $cat_ids as $cat_id ) {
-		if ( $cat_id == $id )
-			continue;
+		if ( $cat_id == $id ) {
+					continue;
+		}
 
 		$category = get_category( $cat_id );
-		if ( is_wp_error( $category ) )
-			return $category;
+		if ( is_wp_error( $category ) ) {
+					return $category;
+		}
 		if ( $category->parent == $id && !in_array( $category->term_id, $visited ) ) {
 			$visited[] = $category->term_id;
 			$chain .= $before.$category->term_id.$after;
@@ -1653,8 +1696,9 @@ 
 	_deprecated_function( __FUNCTION__, '2.9.0', 'the_content_feed' );
 	$content = get_the_content($more_link_text, $stripteaser);
 	$content = apply_filters('the_content_rss', $content);
-	if ( $cut && !$encode_html )
-		$encode_html = 2;
+	if ( $cut && !$encode_html ) {
+			$encode_html = 2;
+	}
 	if ( 1== $encode_html ) {
 		$content = esc_html($content);
 		$cut = 0;
@@ -1674,8 +1718,9 @@ 
 		}
 
 		/** @todo Check performance, might be faster to use array slice instead. */
-		for ( $i=0; $i<$k; $i++ )
-			$excerpt .= $blah[$i].' ';
+		for ( $i=0; $i<$k; $i++ ) {
+					$excerpt .= $blah[$i].' ';
+		}
 		$excerpt .= ($use_dotdotdot) ? '...' : '';
 		$content = $excerpt;
 	}
@@ -1836,11 +1881,13 @@ 
 	$id = (int) $id;
 	$_post = get_post($id);
 
-	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
-		return __('Missing Attachment');
+	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) ) {
+			return __('Missing Attachment');
+	}
 
-	if ( $permalink )
-		$url = get_attachment_link($_post->ID);
+	if ( $permalink ) {
+			$url = get_attachment_link($_post->ID);
+	}
 
 	$post_title = esc_attr($_post->post_title);
 
@@ -1862,8 +1909,9 @@ 
 function get_attachment_icon_src( $id = 0, $fullsize = false ) {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image_src()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
 	$file = get_attached_file( $post->ID );
 
@@ -1883,8 +1931,9 @@ 
 		$src_file = $icon_dir . '/' . basename($src);
 	}
 
-	if ( !isset($src) || !$src )
-		return false;
+	if ( !isset($src) || !$src ) {
+			return false;
+	}
 
 	return array($src, $src_file);
 }
@@ -1904,11 +1953,13 @@ 
 function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
-	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
-		return false;
+	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) ) {
+			return false;
+	}
 
 	list($src, $src_file) = $src;
 
@@ -1960,11 +2011,13 @@ 
 function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
-	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
-		return $innerHTML;
+	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims)) {
+			return $innerHTML;
+	}
 
 	$innerHTML = esc_attr($post->post_title);
 
@@ -2023,10 +2076,11 @@ 
  * @return string The cleaned $url after the {@see 'clean_url'} filter is applied.
  */
 function clean_url( $url, $protocols = null, $context = 'display' ) {
-	if ( $context == 'db' )
-		_deprecated_function( 'clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()' );
-	else
-		_deprecated_function( __FUNCTION__, '3.0.0', 'esc_url()' );
+	if ( $context == 'db' ) {
+			_deprecated_function( 'clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()' );
+	} else {
+			_deprecated_function( __FUNCTION__, '3.0.0', 'esc_url()' );
+	}
 	return esc_url( $url, $protocols, $context );
 }
 
@@ -2107,20 +2161,23 @@ 
 	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_sidebar_widget()' );
 	// Compat
 	if ( is_array($name) ) {
-		if ( count($name) == 3 )
-			$name = sprintf($name[0], $name[2]);
-		else
-			$name = $name[0];
+		if ( count($name) == 3 ) {
+					$name = sprintf($name[0], $name[2]);
+		} else {
+					$name = $name[0];
+		}
 	}
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($classname) && is_string($classname) )
-		$options['classname'] = $classname;
+	if ( !empty($classname) && is_string($classname) ) {
+			$options['classname'] = $classname;
+	}
 	$params = array_slice(func_get_args(), 2);
 	$args = array($id, $name, $output_callback, $options);
-	if ( !empty($params) )
-		$args = array_merge($args, $params);
+	if ( !empty($params) ) {
+			$args = array_merge($args, $params);
+	}
 
 	call_user_func_array('wp_register_sidebar_widget', $args);
 }
@@ -2162,22 +2219,26 @@ 
 	_deprecated_function( __FUNCTION__, '2.8.0', 'wp_register_widget_control()' );
 	// Compat
 	if ( is_array($name) ) {
-		if ( count($name) == 3 )
-			$name = sprintf($name[0], $name[2]);
-		else
-			$name = $name[0];
+		if ( count($name) == 3 ) {
+					$name = sprintf($name[0], $name[2]);
+		} else {
+					$name = $name[0];
+		}
 	}
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($width) )
-		$options['width'] = $width;
-	if ( !empty($height) )
-		$options['height'] = $height;
+	if ( !empty($width) ) {
+			$options['width'] = $width;
+	}
+	if ( !empty($height) ) {
+			$options['height'] = $height;
+	}
 	$params = array_slice(func_get_args(), 4);
 	$args = array($id, $name, $control_callback, $options);
-	if ( !empty($params) )
-		$args = array_merge($args, $params);
+	if ( !empty($params) ) {
+			$args = array_merge($args, $params);
+	}
 
 	call_user_func_array('wp_register_widget_control', $args);
 }
@@ -2211,29 +2272,34 @@ 
 function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'delete_user_meta()' );
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
-		return false;
+	if ( !is_numeric( $user_id ) ) {
+			return false;
+	}
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
-	if ( is_array($meta_value) || is_object($meta_value) )
-		$meta_value = serialize($meta_value);
+	if ( is_array($meta_value) || is_object($meta_value) ) {
+			$meta_value = serialize($meta_value);
+	}
 	$meta_value = trim( $meta_value );
 
 	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur && $cur->umeta_id ) {
+			do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
-	if ( ! empty($meta_value) )
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
-	else
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	if ( ! empty($meta_value) ) {
+			$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
+	} else {
+			$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	}
 
 	clean_user_cache( $user_id );
 	wp_cache_delete( $user_id, 'user_meta' );
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur && $cur->umeta_id ) {
+			do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
 	return true;
 }
@@ -2259,35 +2325,39 @@ 
 	global $wpdb;
 	$user_id = (int) $user_id;
 
-	if ( !$user_id )
-		return false;
+	if ( !$user_id ) {
+			return false;
+	}
 
 	if ( !empty($meta_key) ) {
 		$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 		$user = wp_cache_get($user_id, 'users');
 		// Check the cached user object
-		if ( false !== $user && isset($user->$meta_key) )
-			$metas = array($user->$meta_key);
-		else
-			$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		if ( false !== $user && isset($user->$meta_key) ) {
+					$metas = array($user->$meta_key);
+		} else {
+					$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		}
 	} else {
 		$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id) );
 	}
 
 	if ( empty($metas) ) {
-		if ( empty($meta_key) )
-			return array();
-		else
-			return '';
+		if ( empty($meta_key) ) {
+					return array();
+		} else {
+					return '';
+		}
 	}
 
 	$metas = array_map('maybe_unserialize', $metas);
 
-	if ( count($metas) == 1 )
-		return $metas[0];
-	else
-		return $metas;
-}
+	if ( count($metas) == 1 ) {
+			return $metas[0];
+	} else {
+			return $metas;
+	}
+	}
 
 /**
  * Update metadata of user.
@@ -2310,13 +2380,15 @@ 
 function update_usermeta( $user_id, $meta_key, $meta_value ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'update_user_meta()' );
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
-		return false;
+	if ( !is_numeric( $user_id ) ) {
+			return false;
+	}
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
 	/** @todo Might need fix because usermeta data is assumed to be already escaped */
-	if ( is_string($meta_value) )
-		$meta_value = stripslashes($meta_value);
+	if ( is_string($meta_value) ) {
+			$meta_value = stripslashes($meta_value);
+	}
 	$meta_value = maybe_serialize($meta_value);
 
 	if (empty($meta_value)) {
@@ -2325,23 +2397,26 @@ 
 
 	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
-	if ( $cur )
-		do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur ) {
+			do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
-	if ( !$cur )
-		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
-	elseif ( $cur->meta_value != $meta_value )
-		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
-	else
-		return false;
+	if ( !$cur ) {
+			$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
+	} elseif ( $cur->meta_value != $meta_value ) {
+			$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
+	} else {
+			return false;
+	}
 
 	clean_user_cache( $user_id );
 	wp_cache_delete( $user_id, 'user_meta' );
 
-	if ( !$cur )
-		do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
-	else
-		do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( !$cur ) {
+			do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
+	} else {
+			do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
 	return true;
 }
@@ -2366,8 +2441,9 @@ 
 	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
 
 	global $wpdb, $blog_id;
-	if ( empty($id) )
-		$id = (int) $blog_id;
+	if ( empty($id) ) {
+			$id = (int) $blog_id;
+	}
 	$blog_prefix = $wpdb->get_blog_prefix($id);
 	$users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
 	return $users;
@@ -2385,10 +2461,12 @@ 
 function automatic_feed_links( $add = true ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', "add_theme_support( 'automatic-feed-links' )" );
 
-	if ( $add )
-		add_theme_support( 'automatic-feed-links' );
-	else
-		remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+
+	if ( $add ) {
+			add_theme_support( 'automatic-feed-links' );
+	} else {
+			remove_action( 'wp_head', 'feed_links_extra', 3 );
+	}
+	// Just do this yourself in 3.0+
 }
 
 /**
@@ -2459,10 +2537,11 @@ 
 	// Fixes for browsers' JavaScript bugs.
 	global $is_macIE, $is_winIE;
 
-	if ( $is_winIE || $is_macIE )
-		$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
+	if ( $is_winIE || $is_macIE ) {
+			$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
 					"funky_javascript_callback",
 					$text);
+	}
 
 	return $text;
 }
@@ -2516,8 +2595,9 @@ 
 
 	global $plugin_page;
 
-	if ( isset($plugin_page) )
-		return true;
+	if ( isset($plugin_page) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -2589,8 +2669,9 @@ 
 	$objects = array();
 
 	$ids = array_map('intval', $ids);
-	foreach ( $ids as $id )
-		$objects[$id] = array();
+	foreach ( $ids as $id ) {
+			$objects[$id] = array();
+	}
 
 	$metas = update_meta_cache('user', $ids);
 
@@ -2621,21 +2702,25 @@ 
 	_deprecated_function( __FUNCTION__, '3.3.0' );
 
 	if ( is_object($user) ) {
-		if ( !isset($user->ID) )
-			$user->ID = 0;
+		if ( !isset($user->ID) ) {
+					$user->ID = 0;
+		}
 		if ( ! ( $user instanceof WP_User ) ) {
 			$vars = get_object_vars($user);
 			foreach ( array_keys($vars) as $field ) {
-				if ( is_string($user->$field) || is_numeric($user->$field) )
-					$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
+				if ( is_string($user->$field) || is_numeric($user->$field) ) {
+									$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
+				}
 			}
 		}
 		$user->filter = $context;
 	} else {
-		if ( !isset($user['ID']) )
-			$user['ID'] = 0;
-		foreach ( array_keys($user) as $field )
-			$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
+		if ( !isset($user['ID']) ) {
+					$user['ID'] = 0;
+		}
+		foreach ( array_keys($user) as $field ) {
+					$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
+		}
 		$user['filter'] = $context;
 	}
 
@@ -2661,14 +2746,16 @@ 
 
 	$posts = get_boundary_post($in_same_cat, $excluded_categories, $start);
 	// If there is no post stop.
-	if ( empty($posts) )
-		return;
+	if ( empty($posts) ) {
+			return;
+	}
 
 	// Even though we limited get_posts to return only 1 item it still returns an array of objects.
 	$post = $posts[0];
 
-	if ( empty($post->post_title) )
-		$post->post_title = $start ? __('First Post') : __('Last Post');
+	if ( empty($post->post_title) ) {
+			$post->post_title = $start ? __('First Post') : __('Last Post');
+	}
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
 
@@ -2739,11 +2826,13 @@ 
 function get_parent_post_rel_link( $title = '%title' ) {
 	_deprecated_function( __FUNCTION__, '3.3.0' );
 
-	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) )
-		$post = get_post($GLOBALS['post']->post_parent);
+	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) ) {
+			$post = get_post($GLOBALS['post']->post_parent);
+	}
 
-	if ( empty($post) )
-		return;
+	if ( empty($post) ) {
+			return;
+	}
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
 
@@ -2786,12 +2875,13 @@ 
 	$user_id = get_current_user_id();
 
 	if ( 0 != $user_id ) {
-		if ( is_admin() )
-			$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
-		elseif ( is_multisite() )
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
-		else
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+		if ( is_admin() ) {
+					$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
+		} elseif ( is_multisite() ) {
+					$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
+		} else {
+					$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+		}
 	}
 }
 
@@ -2843,9 +2933,10 @@ 
  */
 function debug_fwrite( $fp, $string ) {
 	_deprecated_function( __FUNCTION__, 'error_log()' );
-	if ( ! empty( $GLOBALS['debug'] ) )
-		error_log( $string );
-}
+	if ( ! empty( $GLOBALS['debug'] ) ) {
+			error_log( $string );
+	}
+	}
 
 /**
  * Close the debugging file handle.
@@ -2879,18 +2970,20 @@ 
 	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_themes()' );
 
 	global $wp_themes;
-	if ( isset( $wp_themes ) )
-		return $wp_themes;
+	if ( isset( $wp_themes ) ) {
+			return $wp_themes;
+	}
 
 	$themes = wp_get_themes();
 	$wp_themes = array();
 
 	foreach ( $themes as $theme ) {
 		$name = $theme->get('Name');
-		if ( isset( $wp_themes[ $name ] ) )
-			$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
-		else
-			$wp_themes[ $name ] = $theme;
+		if ( isset( $wp_themes[ $name ] ) ) {
+					$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
+		} else {
+					$wp_themes[ $name ] = $theme;
+		}
 	}
 
 	return $wp_themes;
@@ -2910,8 +3003,9 @@ 
 	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme( $stylesheet )' );
 
 	$themes = get_themes();
-	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) )
-		return $themes[ $theme ];
+	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) ) {
+			return $themes[ $theme ];
+	}
 	return null;
 }
 
@@ -2927,8 +3021,9 @@ 
 function get_current_theme() {
 	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
 
-	if ( $theme = get_option( 'current_theme' ) )
-		return $theme;
+	if ( $theme = get_option( 'current_theme' ) ) {
+			return $theme;
+	}
 
 	return wp_get_theme()->get('Name');
 }
@@ -2948,10 +3043,11 @@ 
 function clean_pre($matches) {
 	_deprecated_function( __FUNCTION__, '3.4.0' );
 
-	if ( is_array($matches) )
-		$text = $matches[1] . $matches[2] . "</pre>";
-	else
-		$text = $matches;
+	if ( is_array($matches) ) {
+			$text = $matches[1] . $matches[2] . "</pre>";
+	} else {
+			$text = $matches;
+	}
 
 	$text = str_replace(array('<br />', '<br/>', '<br>'), array('', '', ''), $text);
 	$text = str_replace('<p>', "\n", $text);
@@ -2978,8 +3074,9 @@ 
 		'wp-head-callback'    => $wp_head_callback,
 		'admin-head-callback' => $admin_head_callback,
 	);
-	if ( $admin_preview_callback )
-		$args['admin-preview-callback'] = $admin_preview_callback;
+	if ( $admin_preview_callback ) {
+			$args['admin-preview-callback'] = $admin_preview_callback;
+	}
 	return add_theme_support( 'custom-header', $args );
 }
 
@@ -3011,12 +3108,15 @@ 
 function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
 	_deprecated_function( __FUNCTION__, '3.4.0', 'add_theme_support( \'custom-background\', $args )' );
 	$args = array();
-	if ( $wp_head_callback )
-		$args['wp-head-callback'] = $wp_head_callback;
-	if ( $admin_head_callback )
-		$args['admin-head-callback'] = $admin_head_callback;
-	if ( $admin_preview_callback )
-		$args['admin-preview-callback'] = $admin_preview_callback;
+	if ( $wp_head_callback ) {
+			$args['wp-head-callback'] = $wp_head_callback;
+	}
+	if ( $admin_head_callback ) {
+			$args['admin-head-callback'] = $admin_head_callback;
+	}
+	if ( $admin_preview_callback ) {
+			$args['admin-preview-callback'] = $admin_preview_callback;
+	}
 	return add_theme_support( 'custom-background', $args );
 }
 
@@ -3063,8 +3163,9 @@ 
 	);
 
 	foreach ( apply_filters( 'extra_theme_headers', array() ) as $extra_header ) {
-		if ( ! isset( $theme_data[ $extra_header ] ) )
-			$theme_data[ $extra_header ] = $theme->get( $extra_header );
+		if ( ! isset( $theme_data[ $extra_header ] ) ) {
+					$theme_data[ $extra_header ] = $theme->get( $extra_header );
+		}
 	}
 
 	return $theme_data;
@@ -3133,9 +3234,10 @@ 
  */
 function sticky_class( $post_id = null ) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'post_class()' );
-	if ( is_sticky( $post_id ) )
-		echo ' sticky';
-}
+	if ( is_sticky( $post_id ) ) {
+			echo ' sticky';
+	}
+	}
 
 /**
  * Retrieve post ancestors.
@@ -3166,22 +3268,26 @@ 
 function wp_load_image( $file ) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
 
-	if ( is_numeric( $file ) )
-		$file = get_attached_file( $file );
+	if ( is_numeric( $file ) ) {
+			$file = get_attached_file( $file );
+	}
 
-	if ( ! is_file( $file ) )
-		return sprintf(__('File &#8220;%s&#8221; doesn&#8217;t exist?'), $file);
+	if ( ! is_file( $file ) ) {
+			return sprintf(__('File &#8220;%s&#8221; doesn&#8217;t exist?'), $file);
+	}
 
-	if ( ! function_exists('imagecreatefromstring') )
-		return __('The GD image library is not installed.');
+	if ( ! function_exists('imagecreatefromstring') ) {
+			return __('The GD image library is not installed.');
+	}
 
 	// Set artificially high because GD uses uncompressed images in memory.
 	wp_raise_memory_limit( 'image' );
 
 	$image = imagecreatefromstring( file_get_contents( $file ) );
 
-	if ( !is_resource( $image ) )
-		return sprintf(__('File &#8220;%s&#8221; is not an image.'), $file);
+	if ( !is_resource( $image ) ) {
+			return sprintf(__('File &#8220;%s&#8221; is not an image.'), $file);
+	}
 
 	return $image;
 }
@@ -3214,19 +3320,22 @@ 
 	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
 
 	$editor = wp_get_image_editor( $file );
-	if ( is_wp_error( $editor ) )
-		return $editor;
+	if ( is_wp_error( $editor ) ) {
+			return $editor;
+	}
 	$editor->set_quality( $jpeg_quality );
 
 	$resized = $editor->resize( $max_w, $max_h, $crop );
-	if ( is_wp_error( $resized ) )
-		return $resized;
+	if ( is_wp_error( $resized ) ) {
+			return $resized;
+	}
 
 	$dest_file = $editor->generate_filename( $suffix, $dest_path );
 	$saved = $editor->save( $dest_file );
 
-	if ( is_wp_error( $saved ) )
-		return $saved;
+	if ( is_wp_error( $saved ) ) {
+			return $saved;
+	}
 
 	return $dest_file;
 }
@@ -3264,8 +3373,9 @@ 
 function user_pass_ok($user_login, $user_pass) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_authenticate()' );
 	$user = wp_authenticate( $user_login, $user_pass );
-	if ( is_wp_error( $user ) )
-		return false;
+	if ( is_wp_error( $user ) ) {
+			return false;
+	}
 
 	return true;
 }
@@ -3371,8 +3481,9 @@ 
 	global $wp_rich_edit_exists;
 	_deprecated_function( __FUNCTION__, '3.9.0' );
 
-	if ( ! isset( $wp_rich_edit_exists ) )
-		$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	if ( ! isset( $wp_rich_edit_exists ) ) {
+			$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	}
 
 	return $wp_rich_edit_exists;
 }
@@ -3580,8 +3691,10 @@ 
 function wp_htmledit_pre($output) {
 	_deprecated_function( __FUNCTION__, '4.3.0', 'format_for_editor()' );
 
-	if ( !empty($output) )
-		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
+	if ( !empty($output) ) {
+			$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+	}
+	// convert only < > &
 
 	/**
 	 * Filters the text before it is formatted for the HTML editor.
@@ -3631,21 +3744,24 @@ 
 
 	@set_time_limit( 60 );
 
-	if ( $red > 5 )
-		return false;
+	if ( $red > 5 ) {
+			return false;
+	}
 
 	$options = array();
 	$options['redirection'] = 5;
 
-	if ( false == $file_path )
-		$options['method'] = 'HEAD';
-	else
-		$options['method'] = 'GET';
+	if ( false == $file_path ) {
+			$options['method'] = 'HEAD';
+	} else {
+			$options['method'] = 'GET';
+	}
 
 	$response = wp_safe_remote_request( $url, $options );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	$headers = wp_remote_retrieve_headers( $response );
 	$headers['response'] = wp_remote_retrieve_response_code( $response );
@@ -3655,13 +3771,15 @@ 
 		return wp_get_http( $headers['location'], $file_path, ++$red );
 	}
 
-	if ( false == $file_path )
-		return $headers;
+	if ( false == $file_path ) {
+			return $headers;
+	}
 
 	// GET request - write it to the supplied filename
 	$out_fp = fopen($file_path, 'w');
-	if ( !$out_fp )
-		return $headers;
+	if ( !$out_fp ) {
+			return $headers;
+	}
 
 	fwrite( $out_fp,  wp_remote_retrieve_body( $response ) );
 	fclose($out_fp);

src/wp-includes/formatting.php

Doc Comments +3 added lines, -4 removed lines

@@ -879,7 +879,7 @@ 
  * @staticvar string $_charset
  *
  * @param string     $string         The text which is to be encoded.
- * @param int|string $quote_style    Optional. Converts double quotes if set to ENT_COMPAT,
+ * @param integer $quote_style    Optional. Converts double quotes if set to ENT_COMPAT,
  *                                   both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES.
  *                                   Also compatible with old values; converting single quotes if set to 'single',
  *                                   double if set to 'double' or both if otherwise set.
@@ -952,7 +952,7 @@ 
  * @since 2.8.0
  *
  * @param string     $string The text which is to be decoded.
- * @param string|int $quote_style Optional. Converts double quotes if set to ENT_COMPAT,
+ * @param integer $quote_style Optional. Converts double quotes if set to ENT_COMPAT,
  *                                both single and double if set to ENT_QUOTES or
  *                                none if set to ENT_NOQUOTES.
  *                                Also compatible with old _wp_specialchars() values;
@@ -3692,7 +3692,7 @@ 
  * @since 2.8.1
  * @access private
  *
- * @param string|array $search  The value being searched for, otherwise known as the needle.
+ * @param string[] $search  The value being searched for, otherwise known as the needle.
  *                              An array may be used to designate multiple needles.
  * @param string       $subject The string being searched and replaced on, otherwise known as the haystack.
  * @return string The string with the replaced svalues.
@@ -4358,7 +4358,6 @@ 
  * @link https://secure.php.net/sprintf
  *
  * @param string $pattern   The string which formatted args are inserted.
- * @param mixed  $args ,... Arguments to be formatted into the $pattern string.
  * @return string The formatted string.
  */
 function wp_sprintf( $pattern ) {

Spacing +980 added lines, -981 removed lines

@@ -38,7 +38,7 @@ 
  * @param bool   $reset Set to true for unit testing. Translated patterns will reset.
  * @return string The string replaced with html entities
  */
-function wptexturize( $text, $reset = false ) {
+function wptexturize($text, $reset = false) {
 	global $wp_cockneyreplace, $shortcode_tags;
 	static $static_characters = null,
 		$static_replacements = null,
@@ -59,12 +59,12 @@ 
 		$apos_flag = '<!--apos-->';
 
 	// If there's nothing to do, just stop.
-	if ( empty( $text ) || false === $run_texturize ) {
+	if (empty($text) || false === $run_texturize) {
 		return $text;
 	}
 
 	// Set up static variables. Run once only.
-	if ( $reset || ! isset( $static_characters ) ) {
+	if ($reset || ! isset($static_characters)) {
 		/**
 		 * Filters whether to skip running wptexturize().
 		 *
@@ -79,118 +79,118 @@ 
 		 *
 		 * @param bool $run_texturize Whether to short-circuit wptexturize().
 		 */
-		$run_texturize = apply_filters( 'run_wptexturize', $run_texturize );
-		if ( false === $run_texturize ) {
+		$run_texturize = apply_filters('run_wptexturize', $run_texturize);
+		if (false === $run_texturize) {
 			return $text;
 		}
 
 		/* translators: opening curly double quote */
-		$opening_quote = _x( '&#8220;', 'opening curly double quote' );
+		$opening_quote = _x('&#8220;', 'opening curly double quote');
 		/* translators: closing curly double quote */
-		$closing_quote = _x( '&#8221;', 'closing curly double quote' );
+		$closing_quote = _x('&#8221;', 'closing curly double quote');
 
 		/* translators: apostrophe, for example in 'cause or can't */
-		$apos = _x( '&#8217;', 'apostrophe' );
+		$apos = _x('&#8217;', 'apostrophe');
 
 		/* translators: prime, for example in 9' (nine feet) */
-		$prime = _x( '&#8242;', 'prime' );
+		$prime = _x('&#8242;', 'prime');
 		/* translators: double prime, for example in 9" (nine inches) */
-		$double_prime = _x( '&#8243;', 'double prime' );
+		$double_prime = _x('&#8243;', 'double prime');
 
 		/* translators: opening curly single quote */
-		$opening_single_quote = _x( '&#8216;', 'opening curly single quote' );
+		$opening_single_quote = _x('&#8216;', 'opening curly single quote');
 		/* translators: closing curly single quote */
-		$closing_single_quote = _x( '&#8217;', 'closing curly single quote' );
+		$closing_single_quote = _x('&#8217;', 'closing curly single quote');
 
 		/* translators: en dash */
-		$en_dash = _x( '&#8211;', 'en dash' );
+		$en_dash = _x('&#8211;', 'en dash');
 		/* translators: em dash */
-		$em_dash = _x( '&#8212;', 'em dash' );
+		$em_dash = _x('&#8212;', 'em dash');
 
 		$default_no_texturize_tags = array('pre', 'code', 'kbd', 'style', 'script', 'tt');
 		$default_no_texturize_shortcodes = array('code');
 
 		// if a plugin has provided an autocorrect array, use it
-		if ( isset($wp_cockneyreplace) ) {
-			$cockney = array_keys( $wp_cockneyreplace );
-			$cockneyreplace = array_values( $wp_cockneyreplace );
+		if (isset($wp_cockneyreplace)) {
+			$cockney = array_keys($wp_cockneyreplace);
+			$cockneyreplace = array_values($wp_cockneyreplace);
 		} else {
 			/* translators: This is a comma-separated list of words that defy the syntax of quotations in normal use,
 			 * for example...  'We do not have enough words yet' ... is a typical quoted phrase.  But when we write
 			 * lines of code 'til we have enough of 'em, then we need to insert apostrophes instead of quotes.
 			 */
-			$cockney = explode( ',', _x( "'tain't,'twere,'twas,'tis,'twill,'til,'bout,'nuff,'round,'cause,'em",
-				'Comma-separated list of words to texturize in your language' ) );
+			$cockney = explode(',', _x("'tain't,'twere,'twas,'tis,'twill,'til,'bout,'nuff,'round,'cause,'em",
+				'Comma-separated list of words to texturize in your language'));
 
-			$cockneyreplace = explode( ',', _x( '&#8217;tain&#8217;t,&#8217;twere,&#8217;twas,&#8217;tis,&#8217;twill,&#8217;til,&#8217;bout,&#8217;nuff,&#8217;round,&#8217;cause,&#8217;em',
-				'Comma-separated list of replacement words in your language' ) );
+			$cockneyreplace = explode(',', _x('&#8217;tain&#8217;t,&#8217;twere,&#8217;twas,&#8217;tis,&#8217;twill,&#8217;til,&#8217;bout,&#8217;nuff,&#8217;round,&#8217;cause,&#8217;em',
+				'Comma-separated list of replacement words in your language'));
 		}
 
-		$static_characters = array_merge( array( '...', '``', '\'\'', ' (tm)' ), $cockney );
-		$static_replacements = array_merge( array( '&#8230;', $opening_quote, $closing_quote, ' &#8482;' ), $cockneyreplace );
+		$static_characters = array_merge(array('...', '``', '\'\'', ' (tm)'), $cockney);
+		$static_replacements = array_merge(array('&#8230;', $opening_quote, $closing_quote, ' &#8482;'), $cockneyreplace);
 
 
 		// Pattern-based replacements of characters.
 		// Sort the remaining patterns into several arrays for performance tuning.
-		$dynamic_characters = array( 'apos' => array(), 'quote' => array(), 'dash' => array() );
-		$dynamic_replacements = array( 'apos' => array(), 'quote' => array(), 'dash' => array() );
+		$dynamic_characters = array('apos' => array(), 'quote' => array(), 'dash' => array());
+		$dynamic_replacements = array('apos' => array(), 'quote' => array(), 'dash' => array());
 		$dynamic = array();
 		$spaces = wp_spaces_regexp();
 
 		// '99' and '99" are ambiguous among other patterns; assume it's an abbreviated year at the end of a quotation.
-		if ( "'" !== $apos || "'" !== $closing_single_quote ) {
-			$dynamic[ '/\'(\d\d)\'(?=\Z|[.,:;!?)}\-\]]|&gt;|' . $spaces . ')/' ] = $apos_flag . '$1' . $closing_single_quote;
+		if ("'" !== $apos || "'" !== $closing_single_quote) {
+			$dynamic['/\'(\d\d)\'(?=\Z|[.,:;!?)}\-\]]|&gt;|'.$spaces.')/'] = $apos_flag.'$1'.$closing_single_quote;
 		}
-		if ( "'" !== $apos || '"' !== $closing_quote ) {
-			$dynamic[ '/\'(\d\d)"(?=\Z|[.,:;!?)}\-\]]|&gt;|' . $spaces . ')/' ] = $apos_flag . '$1' . $closing_quote;
+		if ("'" !== $apos || '"' !== $closing_quote) {
+			$dynamic['/\'(\d\d)"(?=\Z|[.,:;!?)}\-\]]|&gt;|'.$spaces.')/'] = $apos_flag.'$1'.$closing_quote;
 		}
 
 		// '99 '99s '99's (apostrophe)  But never '9 or '99% or '999 or '99.0.
-		if ( "'" !== $apos ) {
-			$dynamic[ '/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/' ] = $apos_flag;
+		if ("'" !== $apos) {
+			$dynamic['/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/'] = $apos_flag;
 		}
 
 		// Quoted Numbers like '0.42'
-		if ( "'" !== $opening_single_quote && "'" !== $closing_single_quote ) {
-			$dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[.,\d]*)\'/' ] = $open_sq_flag . '$1' . $closing_single_quote;
+		if ("'" !== $opening_single_quote && "'" !== $closing_single_quote) {
+			$dynamic['/(?<=\A|'.$spaces.')\'(\d[.,\d]*)\'/'] = $open_sq_flag.'$1'.$closing_single_quote;
 		}
 
 		// Single quote at start, or preceded by (, {, <, [, ", -, or spaces.
-		if ( "'" !== $opening_single_quote ) {
-			$dynamic[ '/(?<=\A|[([{"\-]|&lt;|' . $spaces . ')\'/' ] = $open_sq_flag;
+		if ("'" !== $opening_single_quote) {
+			$dynamic['/(?<=\A|[([{"\-]|&lt;|'.$spaces.')\'/'] = $open_sq_flag;
 		}
 
 		// Apostrophe in a word.  No spaces, double apostrophes, or other punctuation.
-		if ( "'" !== $apos ) {
-			$dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;!?"\'(){}[\]\-]|&[lg]t;|' . $spaces . ')/' ] = $apos_flag;
+		if ("'" !== $apos) {
+			$dynamic['/(?<!'.$spaces.')\'(?!\Z|[.,:;!?"\'(){}[\]\-]|&[lg]t;|'.$spaces.')/'] = $apos_flag;
 		}
 
-		$dynamic_characters['apos'] = array_keys( $dynamic );
-		$dynamic_replacements['apos'] = array_values( $dynamic );
+		$dynamic_characters['apos'] = array_keys($dynamic);
+		$dynamic_replacements['apos'] = array_values($dynamic);
 		$dynamic = array();
 
 		// Quoted Numbers like "42"
-		if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
-			$dynamic[ '/(?<=\A|' . $spaces . ')"(\d[.,\d]*)"/' ] = $open_q_flag . '$1' . $closing_quote;
+		if ('"' !== $opening_quote && '"' !== $closing_quote) {
+			$dynamic['/(?<=\A|'.$spaces.')"(\d[.,\d]*)"/'] = $open_q_flag.'$1'.$closing_quote;
 		}
 
 		// Double quote at start, or preceded by (, {, <, [, -, or spaces, and not followed by spaces.
-		if ( '"' !== $opening_quote ) {
-			$dynamic[ '/(?<=\A|[([{\-]|&lt;|' . $spaces . ')"(?!' . $spaces . ')/' ] = $open_q_flag;
+		if ('"' !== $opening_quote) {
+			$dynamic['/(?<=\A|[([{\-]|&lt;|'.$spaces.')"(?!'.$spaces.')/'] = $open_q_flag;
 		}
 
-		$dynamic_characters['quote'] = array_keys( $dynamic );
-		$dynamic_replacements['quote'] = array_values( $dynamic );
+		$dynamic_characters['quote'] = array_keys($dynamic);
+		$dynamic_replacements['quote'] = array_values($dynamic);
 		$dynamic = array();
 
 		// Dashes and spaces
-		$dynamic[ '/---/' ] = $em_dash;
-		$dynamic[ '/(?<=^|' . $spaces . ')--(?=$|' . $spaces . ')/' ] = $em_dash;
-		$dynamic[ '/(?<!xn)--/' ] = $en_dash;
-		$dynamic[ '/(?<=^|' . $spaces . ')-(?=$|' . $spaces . ')/' ] = $en_dash;
+		$dynamic['/---/'] = $em_dash;
+		$dynamic['/(?<=^|'.$spaces.')--(?=$|'.$spaces.')/'] = $em_dash;
+		$dynamic['/(?<!xn)--/'] = $en_dash;
+		$dynamic['/(?<=^|'.$spaces.')-(?=$|'.$spaces.')/'] = $en_dash;
 
-		$dynamic_characters['dash'] = array_keys( $dynamic );
-		$dynamic_replacements['dash'] = array_values( $dynamic );
+		$dynamic_characters['dash'] = array_keys($dynamic);
+		$dynamic_replacements['dash'] = array_values($dynamic);
 	}
 
 	// Must do this every time in case plugins use these filters in a context sensitive manner
@@ -201,7 +201,7 @@ 
 	 *
 	 * @param array $default_no_texturize_tags An array of HTML element names.
 	 */
-	$no_texturize_tags = apply_filters( 'no_texturize_tags', $default_no_texturize_tags );
+	$no_texturize_tags = apply_filters('no_texturize_tags', $default_no_texturize_tags);
 	/**
 	 * Filters the list of shortcodes not to texturize.
 	 *
@@ -209,84 +209,84 @@ 
 	 *
 	 * @param array $default_no_texturize_shortcodes An array of shortcode names.
 	 */
-	$no_texturize_shortcodes = apply_filters( 'no_texturize_shortcodes', $default_no_texturize_shortcodes );
+	$no_texturize_shortcodes = apply_filters('no_texturize_shortcodes', $default_no_texturize_shortcodes);
 
 	$no_texturize_tags_stack = array();
 	$no_texturize_shortcodes_stack = array();
 
 	// Look for shortcodes and HTML elements.
 
-	preg_match_all( '@\[/?([^<>&/\[\]\x00-\x20=]++)@', $text, $matches );
-	$tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
-	$found_shortcodes = ! empty( $tagnames );
-	$shortcode_regex = $found_shortcodes ? _get_wptexturize_shortcode_regex( $tagnames ) : '';
-	$regex = _get_wptexturize_split_regex( $shortcode_regex );
+	preg_match_all('@\[/?([^<>&/\[\]\x00-\x20=]++)@', $text, $matches);
+	$tagnames = array_intersect(array_keys($shortcode_tags), $matches[1]);
+	$found_shortcodes = ! empty($tagnames);
+	$shortcode_regex = $found_shortcodes ? _get_wptexturize_shortcode_regex($tagnames) : '';
+	$regex = _get_wptexturize_split_regex($shortcode_regex);
 
-	$textarr = preg_split( $regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+	$textarr = preg_split($regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-	foreach ( $textarr as &$curl ) {
+	foreach ($textarr as &$curl) {
 		// Only call _wptexturize_pushpop_element if $curl is a delimiter.
 		$first = $curl[0];
-		if ( '<' === $first ) {
-			if ( '<!--' === substr( $curl, 0, 4 ) ) {
+		if ('<' === $first) {
+			if ('<!--' === substr($curl, 0, 4)) {
 				// This is an HTML comment delimiter.
 				continue;
 			} else {
 				// This is an HTML element delimiter.
 
 				// Replace each & with &#038; unless it already looks like an entity.
-				$curl = preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl );
+				$curl = preg_replace('/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl);
 
-				_wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags );
+				_wptexturize_pushpop_element($curl, $no_texturize_tags_stack, $no_texturize_tags);
 			}
 
-		} elseif ( '' === trim( $curl ) ) {
+		} elseif ('' === trim($curl)) {
 			// This is a newline between delimiters.  Performance improves when we check this.
 			continue;
 
-		} elseif ( '[' === $first && $found_shortcodes && 1 === preg_match( '/^' . $shortcode_regex . '$/', $curl ) ) {
+		} elseif ('[' === $first && $found_shortcodes && 1 === preg_match('/^'.$shortcode_regex.'$/', $curl)) {
 			// This is a shortcode delimiter.
 
-			if ( '[[' !== substr( $curl, 0, 2 ) && ']]' !== substr( $curl, -2 ) ) {
+			if ('[[' !== substr($curl, 0, 2) && ']]' !== substr($curl, -2)) {
 				// Looks like a normal shortcode.
-				_wptexturize_pushpop_element( $curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes );
+				_wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes);
 			} else {
 				// Looks like an escaped shortcode.
 				continue;
 			}
 
-		} elseif ( empty( $no_texturize_shortcodes_stack ) && empty( $no_texturize_tags_stack ) ) {
+		} elseif (empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack)) {
 			// This is neither a delimiter, nor is this content inside of no_texturize pairs.  Do texturize.
 
-			$curl = str_replace( $static_characters, $static_replacements, $curl );
+			$curl = str_replace($static_characters, $static_replacements, $curl);
 
-			if ( false !== strpos( $curl, "'" ) ) {
-				$curl = preg_replace( $dynamic_characters['apos'], $dynamic_replacements['apos'], $curl );
-				$curl = wptexturize_primes( $curl, "'", $prime, $open_sq_flag, $closing_single_quote );
-				$curl = str_replace( $apos_flag, $apos, $curl );
-				$curl = str_replace( $open_sq_flag, $opening_single_quote, $curl );
+			if (false !== strpos($curl, "'")) {
+				$curl = preg_replace($dynamic_characters['apos'], $dynamic_replacements['apos'], $curl);
+				$curl = wptexturize_primes($curl, "'", $prime, $open_sq_flag, $closing_single_quote);
+				$curl = str_replace($apos_flag, $apos, $curl);
+				$curl = str_replace($open_sq_flag, $opening_single_quote, $curl);
 			}
-			if ( false !== strpos( $curl, '"' ) ) {
-				$curl = preg_replace( $dynamic_characters['quote'], $dynamic_replacements['quote'], $curl );
-				$curl = wptexturize_primes( $curl, '"', $double_prime, $open_q_flag, $closing_quote );
-				$curl = str_replace( $open_q_flag, $opening_quote, $curl );
+			if (false !== strpos($curl, '"')) {
+				$curl = preg_replace($dynamic_characters['quote'], $dynamic_replacements['quote'], $curl);
+				$curl = wptexturize_primes($curl, '"', $double_prime, $open_q_flag, $closing_quote);
+				$curl = str_replace($open_q_flag, $opening_quote, $curl);
 			}
-			if ( false !== strpos( $curl, '-' ) ) {
-				$curl = preg_replace( $dynamic_characters['dash'], $dynamic_replacements['dash'], $curl );
+			if (false !== strpos($curl, '-')) {
+				$curl = preg_replace($dynamic_characters['dash'], $dynamic_replacements['dash'], $curl);
 			}
 
 			// 9x9 (times), but never 0x9999
-			if ( 1 === preg_match( '/(?<=\d)x\d/', $curl ) ) {
+			if (1 === preg_match('/(?<=\d)x\d/', $curl)) {
 				// Searching for a digit is 10 times more expensive than for the x, so we avoid doing this one!
-				$curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl );
+				$curl = preg_replace('/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl);
 			}
 
 			// Replace each & with &#038; unless it already looks like an entity.
-			$curl = preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl );
+			$curl = preg_replace('/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl);
 		}
 	}
 
-	return implode( '', $textarr );
+	return implode('', $textarr);
 }
 
 /**
@@ -303,59 +303,59 @@ 
  * @param string $close_quote The closing quote char to use for replacement.
  * @return string The $haystack value after primes and quotes replacements.
  */
-function wptexturize_primes( $haystack, $needle, $prime, $open_quote, $close_quote ) {
+function wptexturize_primes($haystack, $needle, $prime, $open_quote, $close_quote) {
 	$spaces = wp_spaces_regexp();
 	$flag = '<!--wp-prime-or-quote-->';
-	$quote_pattern = "/$needle(?=\\Z|[.,:;!?)}\\-\\]]|&gt;|" . $spaces . ")/";
+	$quote_pattern = "/$needle(?=\\Z|[.,:;!?)}\\-\\]]|&gt;|".$spaces.")/";
 	$prime_pattern    = "/(?<=\\d)$needle/";
 	$flag_after_digit = "/(?<=\\d)$flag/";
 	$flag_no_digit    = "/(?<!\\d)$flag/";
 
-	$sentences = explode( $open_quote, $haystack );
+	$sentences = explode($open_quote, $haystack);
 
-	foreach ( $sentences as $key => &$sentence ) {
-		if ( false === strpos( $sentence, $needle ) ) {
+	foreach ($sentences as $key => &$sentence) {
+		if (false === strpos($sentence, $needle)) {
 			continue;
-		} elseif ( 0 !== $key && 0 === substr_count( $sentence, $close_quote ) ) {
-			$sentence = preg_replace( $quote_pattern, $flag, $sentence, -1, $count );
-			if ( $count > 1 ) {
+		} elseif (0 !== $key && 0 === substr_count($sentence, $close_quote)) {
+			$sentence = preg_replace($quote_pattern, $flag, $sentence, -1, $count);
+			if ($count > 1) {
 				// This sentence appears to have multiple closing quotes.  Attempt Vulcan logic.
-				$sentence = preg_replace( $flag_no_digit, $close_quote, $sentence, -1, $count2 );
-				if ( 0 === $count2 ) {
+				$sentence = preg_replace($flag_no_digit, $close_quote, $sentence, -1, $count2);
+				if (0 === $count2) {
 					// Try looking for a quote followed by a period.
-					$count2 = substr_count( $sentence, "$flag." );
-					if ( $count2 > 0 ) {
+					$count2 = substr_count($sentence, "$flag.");
+					if ($count2 > 0) {
 						// Assume the rightmost quote-period match is the end of quotation.
-						$pos = strrpos( $sentence, "$flag." );
+						$pos = strrpos($sentence, "$flag.");
 					} else {
 						// When all else fails, make the rightmost candidate a closing quote.
 						// This is most likely to be problematic in the context of bug #18549.
-						$pos = strrpos( $sentence, $flag );
+						$pos = strrpos($sentence, $flag);
 					}
-					$sentence = substr_replace( $sentence, $close_quote, $pos, strlen( $flag ) );
+					$sentence = substr_replace($sentence, $close_quote, $pos, strlen($flag));
 				}
 				// Use conventional replacement on any remaining primes and quotes.
-				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
-				$sentence = preg_replace( $flag_after_digit, $prime, $sentence );
-				$sentence = str_replace( $flag, $close_quote, $sentence );
-			} elseif ( 1 == $count ) {
+				$sentence = preg_replace($prime_pattern, $prime, $sentence);
+				$sentence = preg_replace($flag_after_digit, $prime, $sentence);
+				$sentence = str_replace($flag, $close_quote, $sentence);
+			} elseif (1 == $count) {
 				// Found only one closing quote candidate, so give it priority over primes.
-				$sentence = str_replace( $flag, $close_quote, $sentence );
-				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
+				$sentence = str_replace($flag, $close_quote, $sentence);
+				$sentence = preg_replace($prime_pattern, $prime, $sentence);
 			} else {
 				// No closing quotes found.  Just run primes pattern.
-				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
+				$sentence = preg_replace($prime_pattern, $prime, $sentence);
 			}
 		} else {
-			$sentence = preg_replace( $prime_pattern, $prime, $sentence );
-			$sentence = preg_replace( $quote_pattern, $close_quote, $sentence );
+			$sentence = preg_replace($prime_pattern, $prime, $sentence);
+			$sentence = preg_replace($quote_pattern, $close_quote, $sentence);
 		}
-		if ( '"' == $needle && false !== strpos( $sentence, '"' ) ) {
-			$sentence = str_replace( '"', $close_quote, $sentence );
+		if ('"' == $needle && false !== strpos($sentence, '"')) {
+			$sentence = str_replace('"', $close_quote, $sentence);
 		}
 	}
 
-	return implode( $open_quote, $sentences );
+	return implode($open_quote, $sentences);
 }
 
 /**
@@ -372,12 +372,12 @@ 
  * @param array  $stack List of open tag elements.
  * @param array  $disabled_elements The tag names to match against. Spaces are not allowed in tag names.
  */
-function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
+function _wptexturize_pushpop_element($text, &$stack, $disabled_elements) {
 	// Is it an opening tag or closing tag?
-	if ( isset( $text[1] ) && '/' !== $text[1] ) {
+	if (isset($text[1]) && '/' !== $text[1]) {
 		$opening_tag = true;
 		$name_offset = 1;
-	} elseif ( 0 == count( $stack ) ) {
+	} elseif (0 == count($stack)) {
 		// Stack is empty. Just stop.
 		return;
 	} else {
@@ -386,17 +386,17 @@ 
 	}
 
 	// Parse out the tag name.
-	$space = strpos( $text, ' ' );
-	if ( false === $space ) {
+	$space = strpos($text, ' ');
+	if (false === $space) {
 		$space = -1;
 	} else {
 		$space -= $name_offset;
 	}
-	$tag = substr( $text, $name_offset, $space );
+	$tag = substr($text, $name_offset, $space);
 
 	// Handle disabled tags.
-	if ( in_array( $tag, $disabled_elements ) ) {
-		if ( $opening_tag ) {
+	if (in_array($tag, $disabled_elements)) {
+		if ($opening_tag) {
 			/*
 			 * This disables texturize until we find a closing tag of our type
 			 * (e.g. <pre>) even if there was invalid nesting before that
@@ -405,9 +405,9 @@ 
 			 *          "baba" won't be texturize
 			 */
 
-			array_push( $stack, $tag );
-		} elseif ( end( $stack ) == $tag ) {
-			array_pop( $stack );
+			array_push($stack, $tag);
+		} elseif (end($stack) == $tag) {
+			array_pop($stack);
 		}
 	}
 }
@@ -426,38 +426,38 @@ 
  *                    after paragraphing. Default true.
  * @return string Text which has been converted into correct paragraph tags.
  */
-function wpautop( $pee, $br = true ) {
+function wpautop($pee, $br = true) {
 	$pre_tags = array();
 
-	if ( trim($pee) === '' )
+	if (trim($pee) === '')
 		return '';
 
 	// Just to make things a little easier, pad the end.
-	$pee = $pee . "\n";
+	$pee = $pee."\n";
 
 	/*
 	 * Pre tags shouldn't be touched by autop.
 	 * Replace pre tags with placeholders and bring them back after autop.
 	 */
-	if ( strpos($pee, '<pre') !== false ) {
-		$pee_parts = explode( '</pre>', $pee );
+	if (strpos($pee, '<pre') !== false) {
+		$pee_parts = explode('</pre>', $pee);
 		$last_pee = array_pop($pee_parts);
 		$pee = '';
 		$i = 0;
 
-		foreach ( $pee_parts as $pee_part ) {
+		foreach ($pee_parts as $pee_part) {
 			$start = strpos($pee_part, '<pre');
 
 			// Malformed html?
-			if ( $start === false ) {
+			if ($start === false) {
 				$pee .= $pee_part;
 				continue;
 			}
 
 			$name = "<pre wp-pre-tag-$i></pre>";
-			$pre_tags[$name] = substr( $pee_part, $start ) . '</pre>';
+			$pre_tags[$name] = substr($pee_part, $start).'</pre>';
 
-			$pee .= substr( $pee_part, 0, $start ) . $name;
+			$pee .= substr($pee_part, 0, $start).$name;
 			$i++;
 		}
 
@@ -469,41 +469,41 @@ 
 	$allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
 
 	// Add a single line break above block-level opening tags.
-	$pee = preg_replace('!(<' . $allblocks . '[\s/>])!', "\n$1", $pee);
+	$pee = preg_replace('!(<'.$allblocks.'[\s/>])!', "\n$1", $pee);
 
 	// Add a double line break below block-level closing tags.
-	$pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
+	$pee = preg_replace('!(</'.$allblocks.'>)!', "$1\n\n", $pee);
 
 	// Standardize newline characters to "\n".
 	$pee = str_replace(array("\r\n", "\r"), "\n", $pee);
 
 	// Find newlines in all elements and add placeholders.
-	$pee = wp_replace_in_html_tags( $pee, array( "\n" => " <!-- wpnl --> " ) );
+	$pee = wp_replace_in_html_tags($pee, array("\n" => " <!-- wpnl --> "));
 
 	// Collapse line breaks before and after <option> elements so they don't get autop'd.
-	if ( strpos( $pee, '<option' ) !== false ) {
-		$pee = preg_replace( '|\s*<option|', '<option', $pee );
-		$pee = preg_replace( '|</option>\s*|', '</option>', $pee );
+	if (strpos($pee, '<option') !== false) {
+		$pee = preg_replace('|\s*<option|', '<option', $pee);
+		$pee = preg_replace('|</option>\s*|', '</option>', $pee);
 	}
 
 	/*
 	 * Collapse line breaks inside <object> elements, before <param> and <embed> elements
 	 * so they don't get autop'd.
 	 */
-	if ( strpos( $pee, '</object>' ) !== false ) {
-		$pee = preg_replace( '|(<object[^>]*>)\s*|', '$1', $pee );
-		$pee = preg_replace( '|\s*</object>|', '</object>', $pee );
-		$pee = preg_replace( '%\s*(</?(?:param|embed)[^>]*>)\s*%', '$1', $pee );
+	if (strpos($pee, '</object>') !== false) {
+		$pee = preg_replace('|(<object[^>]*>)\s*|', '$1', $pee);
+		$pee = preg_replace('|\s*</object>|', '</object>', $pee);
+		$pee = preg_replace('%\s*(</?(?:param|embed)[^>]*>)\s*%', '$1', $pee);
 	}
 
 	/*
 	 * Collapse line breaks inside <audio> and <video> elements,
 	 * before and after <source> and <track> elements.
 	 */
-	if ( strpos( $pee, '<source' ) !== false || strpos( $pee, '<track' ) !== false ) {
-		$pee = preg_replace( '%([<\[](?:audio|video)[^>\]]*[>\]])\s*%', '$1', $pee );
-		$pee = preg_replace( '%\s*([<\[]/(?:audio|video)[>\]])%', '$1', $pee );
-		$pee = preg_replace( '%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $pee );
+	if (strpos($pee, '<source') !== false || strpos($pee, '<track') !== false) {
+		$pee = preg_replace('%([<\[](?:audio|video)[^>\]]*[>\]])\s*%', '$1', $pee);
+		$pee = preg_replace('%\s*([<\[]/(?:audio|video)[>\]])%', '$1', $pee);
+		$pee = preg_replace('%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $pee);
 	}
 
 	// Remove more than two contiguous line breaks.
@@ -516,8 +516,8 @@ 
 	$pee = '';
 
 	// Rebuild the content as a string, wrapping every bit with a <p>.
-	foreach ( $pees as $tinkle ) {
-		$pee .= '<p>' . trim($tinkle, "\n") . "</p>\n";
+	foreach ($pees as $tinkle) {
+		$pee .= '<p>'.trim($tinkle, "\n")."</p>\n";
 	}
 
 	// Under certain strange conditions it could create a P of entirely whitespace.
@@ -527,7 +527,7 @@ 
 	$pee = preg_replace('!<p>([^<]+)</(div|address|form)>!', "<p>$1</p></$2>", $pee);
 
 	// If an opening or closing block element tag is wrapped in a <p>, unwrap it.
-	$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+	$pee = preg_replace('!<p>\s*(</?'.$allblocks.'[^>]*>)\s*</p>!', "$1", $pee);
 
 	// In some cases <li> may get wrapped in <p>, fix them.
 	$pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee);
@@ -537,18 +537,18 @@ 
 	$pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee);
 
 	// If an opening or closing block element tag is preceded by an opening <p> tag, remove it.
-	$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee);
+	$pee = preg_replace('!<p>\s*(</?'.$allblocks.'[^>]*>)!', "$1", $pee);
 
 	// If an opening or closing block element tag is followed by a closing <p> tag, remove it.
-	$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+	$pee = preg_replace('!(</?'.$allblocks.'[^>]*>)\s*</p>!', "$1", $pee);
 
 	// Optionally insert line breaks.
-	if ( $br ) {
+	if ($br) {
 		// Replace newlines that shouldn't be touched with a placeholder.
 		$pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
 
 		// Normalize <br>
-		$pee = str_replace( array( '<br>', '<br/>' ), '<br />', $pee );
+		$pee = str_replace(array('<br>', '<br/>'), '<br />', $pee);
 
 		// Replace any new line characters that aren't preceded by a <br /> with a <br />.
 		$pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee);
@@ -558,19 +558,19 @@ 
 	}
 
 	// If a <br /> tag is after an opening or closing block tag, remove it.
-	$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
+	$pee = preg_replace('!(</?'.$allblocks.'[^>]*>)\s*<br />!', "$1", $pee);
 
 	// If a <br /> tag is before a subset of opening or closing block tags, remove it.
 	$pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
-	$pee = preg_replace( "|\n</p>$|", '</p>', $pee );
+	$pee = preg_replace("|\n</p>$|", '</p>', $pee);
 
 	// Replace placeholder <pre> tags with their original content.
-	if ( !empty($pre_tags) )
+	if ( ! empty($pre_tags))
 		$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
 
 	// Restore newlines in all elements.
-	if ( false !== strpos( $pee, '<!-- wpnl -->' ) ) {
-		$pee = str_replace( array( ' <!-- wpnl --> ', '<!-- wpnl -->' ), "\n", $pee );
+	if (false !== strpos($pee, '<!-- wpnl -->')) {
+		$pee = str_replace(array(' <!-- wpnl --> ', '<!-- wpnl -->'), "\n", $pee);
 	}
 
 	return $pee;
@@ -584,8 +584,8 @@ 
  * @param string $input The text which has to be formatted.
  * @return array The formatted text.
  */
-function wp_html_split( $input ) {
-	return preg_split( get_html_split_regex(), $input, -1, PREG_SPLIT_DELIM_CAPTURE );
+function wp_html_split($input) {
+	return preg_split(get_html_split_regex(), $input, -1, PREG_SPLIT_DELIM_CAPTURE);
 }
 
 /**
@@ -598,14 +598,14 @@ 
 function get_html_split_regex() {
 	static $regex;
 
-	if ( ! isset( $regex ) ) {
+	if ( ! isset($regex)) {
 		$comments =
 			  '!'           // Start of comment, after the <.
 			. '(?:'         // Unroll the loop: Consume everything until --> is found.
 			.     '-(?!->)' // Dash not followed by end of comment.
 			.     '[^\-]*+' // Consume non-dashes.
 			. ')*+'         // Loop possessively.
-			. '(?:-->)?';   // End of comment. If not found, match all input.
+			. '(?:-->)?'; // End of comment. If not found, match all input.
 
 		$cdata =
 			  '!\[CDATA\['  // Start of comment, after the <.
@@ -614,7 +614,7 @@ 
 			.     '](?!]>)' // One ] not followed by end of comment.
 			.     '[^\]]*+' // Consume non-].
 			. ')*+'         // Loop possessively.
-			. '(?:]]>)?';   // End of comment. If not found, match all input.
+			. '(?:]]>)?'; // End of comment. If not found, match all input.
 
 		$escaped =
 			  '(?='           // Is the element escaped?
@@ -653,19 +653,19 @@ 
  * @param string $shortcode_regex The result from _get_wptexturize_shortcode_regex().  Optional.
  * @return string The regular expression
  */
-function _get_wptexturize_split_regex( $shortcode_regex = '' ) {
+function _get_wptexturize_split_regex($shortcode_regex = '') {
 	static $html_regex;
 
-	if ( ! isset( $html_regex ) ) {
+	if ( ! isset($html_regex)) {
 		$comment_regex =
 			  '!'           // Start of comment, after the <.
 			. '(?:'         // Unroll the loop: Consume everything until --> is found.
 			.     '-(?!->)' // Dash not followed by end of comment.
 			.     '[^\-]*+' // Consume non-dashes.
 			. ')*+'         // Loop possessively.
-			. '(?:-->)?';   // End of comment. If not found, match all input.
+			. '(?:-->)?'; // End of comment. If not found, match all input.
 
-		$html_regex =			 // Needs replaced with wp_html_split() per Shortcode API Roadmap.
+		$html_regex = // Needs replaced with wp_html_split() per Shortcode API Roadmap.
 			  '<'                // Find start of element.
 			. '(?(?=!--)'        // Is this a comment?
 			.     $comment_regex // Find end of comment.
@@ -674,10 +674,10 @@ 
 			. ')';
 	}
 
-	if ( empty( $shortcode_regex ) ) {
-		$regex = '/(' . $html_regex . ')/';
+	if (empty($shortcode_regex)) {
+		$regex = '/('.$html_regex.')/';
 	} else {
-		$regex = '/(' . $html_regex . '|' . $shortcode_regex . ')/';
+		$regex = '/('.$html_regex.'|'.$shortcode_regex.')/';
 	}
 
 	return $regex;
@@ -694,8 +694,8 @@ 
  * @param array $tagnames List of shortcodes to find.
  * @return string The regular expression
  */
-function _get_wptexturize_shortcode_regex( $tagnames ) {
-	$tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
+function _get_wptexturize_shortcode_regex($tagnames) {
+	$tagregexp = join('|', array_map('preg_quote', $tagnames));
 	$tagregexp = "(?:$tagregexp)(?=[\\s\\]\\/])"; // Excerpt of get_shortcode_regex().
 	$regex =
 		  '\['              // Find start of shortcode.
@@ -707,7 +707,7 @@ 
 		.     '<[^\[\]>]*>' // HTML elements permitted. Prevents matching ] before >.
 		. ')*+'             // Possessive critical.
 		. '\]'              // Find end of shortcode.
-		. '\]?';            // Shortcodes may end with ]]
+		. '\]?'; // Shortcodes may end with ]]
 
 	return $regex;
 }
@@ -721,32 +721,32 @@ 
  * @param array $replace_pairs In the form array('from' => 'to', ...).
  * @return string The formatted text.
  */
-function wp_replace_in_html_tags( $haystack, $replace_pairs ) {
+function wp_replace_in_html_tags($haystack, $replace_pairs) {
 	// Find all elements.
-	$textarr = wp_html_split( $haystack );
+	$textarr = wp_html_split($haystack);
 	$changed = false;
 
 	// Optimize when searching for one item.
-	if ( 1 === count( $replace_pairs ) ) {
+	if (1 === count($replace_pairs)) {
 		// Extract $needle and $replace.
-		foreach ( $replace_pairs as $needle => $replace );
+		foreach ($replace_pairs as $needle => $replace);
 
 		// Loop through delimiters (elements) only.
-		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
-			if ( false !== strpos( $textarr[$i], $needle ) ) {
-				$textarr[$i] = str_replace( $needle, $replace, $textarr[$i] );
+		for ($i = 1, $c = count($textarr); $i < $c; $i += 2) {
+			if (false !== strpos($textarr[$i], $needle)) {
+				$textarr[$i] = str_replace($needle, $replace, $textarr[$i]);
 				$changed = true;
 			}
 		}
 	} else {
 		// Extract all $needles.
-		$needles = array_keys( $replace_pairs );
+		$needles = array_keys($replace_pairs);
 
 		// Loop through delimiters (elements) only.
-		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
-			foreach ( $needles as $needle ) {
-				if ( false !== strpos( $textarr[$i], $needle ) ) {
-					$textarr[$i] = strtr( $textarr[$i], $replace_pairs );
+		for ($i = 1, $c = count($textarr); $i < $c; $i += 2) {
+			foreach ($needles as $needle) {
+				if (false !== strpos($textarr[$i], $needle)) {
+					$textarr[$i] = strtr($textarr[$i], $replace_pairs);
 					$changed = true;
 					// After one strtr() break out of the foreach loop and look at next element.
 					break;
@@ -755,8 +755,8 @@ 
 		}
 	}
 
-	if ( $changed ) {
-		$haystack = implode( $textarr );
+	if ($changed) {
+		$haystack = implode($textarr);
 	}
 
 	return $haystack;
@@ -771,8 +771,8 @@ 
  * @param array $matches preg_replace_callback matches array
  * @return string
  */
-function _autop_newline_preservation_helper( $matches ) {
-	return str_replace( "\n", "<WPPreserveNewline />", $matches[0] );
+function _autop_newline_preservation_helper($matches) {
+	return str_replace("\n", "<WPPreserveNewline />", $matches[0]);
 }
 
 /**
@@ -787,20 +787,20 @@ 
  * @param string $pee The content.
  * @return string The filtered content.
  */
-function shortcode_unautop( $pee ) {
+function shortcode_unautop($pee) {
 	global $shortcode_tags;
 
-	if ( empty( $shortcode_tags ) || !is_array( $shortcode_tags ) ) {
+	if (empty($shortcode_tags) || ! is_array($shortcode_tags)) {
 		return $pee;
 	}
 
-	$tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
+	$tagregexp = join('|', array_map('preg_quote', array_keys($shortcode_tags)));
 	$spaces = wp_spaces_regexp();
 
 	$pattern =
 		  '/'
 		. '<p>'                              // Opening paragraph
-		. '(?:' . $spaces . ')*+'            // Optional leading whitespace
+		. '(?:'.$spaces.')*+'            // Optional leading whitespace
 		. '('                                // 1: The shortcode
 		.     '\\['                          // Opening bracket
 		.     "($tagregexp)"                 // 2: Shortcode name
@@ -825,11 +825,11 @@ 
 		.         ')?'
 		.     ')'
 		. ')'
-		. '(?:' . $spaces . ')*+'            // optional trailing whitespace
+		. '(?:'.$spaces.')*+'            // optional trailing whitespace
 		. '<\\/p>'                           // closing paragraph
 		. '/';
 
-	return preg_replace( $pattern, '$1', $pee );
+	return preg_replace($pattern, '$1', $pee);
 }
 
 /**
@@ -844,20 +844,20 @@ 
  * @param string $str The string to be checked
  * @return bool True if $str fits a UTF-8 model, false otherwise.
  */
-function seems_utf8( $str ) {
+function seems_utf8($str) {
 	mbstring_binary_safe_encoding();
 	$length = strlen($str);
 	reset_mbstring_encoding();
-	for ($i=0; $i < $length; $i++) {
+	for ($i = 0; $i < $length; $i++) {
 		$c = ord($str[$i]);
 		if ($c < 0x80) $n = 0; // 0bbbbbbb
-		elseif (($c & 0xE0) == 0xC0) $n=1; // 110bbbbb
-		elseif (($c & 0xF0) == 0xE0) $n=2; // 1110bbbb
-		elseif (($c & 0xF8) == 0xF0) $n=3; // 11110bbb
-		elseif (($c & 0xFC) == 0xF8) $n=4; // 111110bb
-		elseif (($c & 0xFE) == 0xFC) $n=5; // 1111110b
+		elseif (($c & 0xE0) == 0xC0) $n = 1; // 110bbbbb
+		elseif (($c & 0xF0) == 0xE0) $n = 2; // 1110bbbb
+		elseif (($c & 0xF8) == 0xF0) $n = 3; // 11110bbb
+		elseif (($c & 0xFC) == 0xF8) $n = 4; // 111110bb
+		elseif (($c & 0xFE) == 0xFC) $n = 5; // 1111110b
 		else return false; // Does not match any model
-		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
+		for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?
 			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
 				return false;
 		}
@@ -888,55 +888,55 @@ 
  * @param bool       $double_encode  Optional. Whether to encode existing html entities. Default is false.
  * @return string The encoded text with HTML entities.
  */
-function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
+function _wp_specialchars($string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) )
+	if (0 === strlen($string))
 		return '';
 
 	// Don't bother if there are no specialchars - saves some processing
-	if ( ! preg_match( '/[&<>"\']/', $string ) )
+	if ( ! preg_match('/[&<>"\']/', $string))
 		return $string;
 
 	// Account for the previous behaviour of the function when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) )
+	if (empty($quote_style))
 		$quote_style = ENT_NOQUOTES;
-	elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) )
+	elseif ( ! in_array($quote_style, array(0, 2, 3, 'single', 'double'), true))
 		$quote_style = ENT_QUOTES;
 
 	// Store the site charset as a static to avoid multiple calls to wp_load_alloptions()
-	if ( ! $charset ) {
+	if ( ! $charset) {
 		static $_charset = null;
-		if ( ! isset( $_charset ) ) {
+		if ( ! isset($_charset)) {
 			$alloptions = wp_load_alloptions();
-			$_charset = isset( $alloptions['blog_charset'] ) ? $alloptions['blog_charset'] : '';
+			$_charset = isset($alloptions['blog_charset']) ? $alloptions['blog_charset'] : '';
 		}
 		$charset = $_charset;
 	}
 
-	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) )
+	if (in_array($charset, array('utf8', 'utf-8', 'UTF8')))
 		$charset = 'UTF-8';
 
 	$_quote_style = $quote_style;
 
-	if ( $quote_style === 'double' ) {
+	if ($quote_style === 'double') {
 		$quote_style = ENT_COMPAT;
 		$_quote_style = ENT_COMPAT;
-	} elseif ( $quote_style === 'single' ) {
+	} elseif ($quote_style === 'single') {
 		$quote_style = ENT_NOQUOTES;
 	}
 
-	if ( ! $double_encode ) {
+	if ( ! $double_encode) {
 		// Guarantee every &entity; is valid, convert &garbage; into &amp;garbage;
 		// This is required for PHP < 5.4.0 because ENT_HTML401 flag is unavailable.
-		$string = wp_kses_normalize_entities( $string );
+		$string = wp_kses_normalize_entities($string);
 	}
 
-	$string = @htmlspecialchars( $string, $quote_style, $charset, $double_encode );
+	$string = @htmlspecialchars($string, $quote_style, $charset, $double_encode);
 
 	// Back-compat.
-	if ( 'single' === $_quote_style )
-		$string = str_replace( "'", '&#039;', $string );
+	if ('single' === $_quote_style)
+		$string = str_replace("'", '&#039;', $string);
 
 	return $string;
 }
@@ -961,52 +961,52 @@ 
  *                                Default is ENT_NOQUOTES.
  * @return string The decoded text without HTML entities.
  */
-function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
+function wp_specialchars_decode($string, $quote_style = ENT_NOQUOTES) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) ) {
+	if (0 === strlen($string)) {
 		return '';
 	}
 
 	// Don't bother if there are no entities - saves a lot of processing
-	if ( strpos( $string, '&' ) === false ) {
+	if (strpos($string, '&') === false) {
 		return $string;
 	}
 
 	// Match the previous behaviour of _wp_specialchars() when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) ) {
+	if (empty($quote_style)) {
 		$quote_style = ENT_NOQUOTES;
-	} elseif ( !in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
+	} elseif ( ! in_array($quote_style, array(0, 2, 3, 'single', 'double'), true)) {
 		$quote_style = ENT_QUOTES;
 	}
 
 	// More complete than get_html_translation_table( HTML_SPECIALCHARS )
-	$single = array( '&#039;'  => '\'', '&#x27;' => '\'' );
-	$single_preg = array( '/&#0*39;/'  => '&#039;', '/&#x0*27;/i' => '&#x27;' );
-	$double = array( '&quot;' => '"', '&#034;'  => '"', '&#x22;' => '"' );
-	$double_preg = array( '/&#0*34;/'  => '&#034;', '/&#x0*22;/i' => '&#x22;' );
-	$others = array( '&lt;'   => '<', '&#060;'  => '<', '&gt;'   => '>', '&#062;'  => '>', '&amp;'  => '&', '&#038;'  => '&', '&#x26;' => '&' );
-	$others_preg = array( '/&#0*60;/'  => '&#060;', '/&#0*62;/'  => '&#062;', '/&#0*38;/'  => '&#038;', '/&#x0*26;/i' => '&#x26;' );
-
-	if ( $quote_style === ENT_QUOTES ) {
-		$translation = array_merge( $single, $double, $others );
-		$translation_preg = array_merge( $single_preg, $double_preg, $others_preg );
-	} elseif ( $quote_style === ENT_COMPAT || $quote_style === 'double' ) {
-		$translation = array_merge( $double, $others );
-		$translation_preg = array_merge( $double_preg, $others_preg );
-	} elseif ( $quote_style === 'single' ) {
-		$translation = array_merge( $single, $others );
-		$translation_preg = array_merge( $single_preg, $others_preg );
-	} elseif ( $quote_style === ENT_NOQUOTES ) {
+	$single = array('&#039;'  => '\'', '&#x27;' => '\'');
+	$single_preg = array('/&#0*39;/'  => '&#039;', '/&#x0*27;/i' => '&#x27;');
+	$double = array('&quot;' => '"', '&#034;'  => '"', '&#x22;' => '"');
+	$double_preg = array('/&#0*34;/'  => '&#034;', '/&#x0*22;/i' => '&#x22;');
+	$others = array('&lt;'   => '<', '&#060;'  => '<', '&gt;'   => '>', '&#062;'  => '>', '&amp;'  => '&', '&#038;'  => '&', '&#x26;' => '&');
+	$others_preg = array('/&#0*60;/'  => '&#060;', '/&#0*62;/'  => '&#062;', '/&#0*38;/'  => '&#038;', '/&#x0*26;/i' => '&#x26;');
+
+	if ($quote_style === ENT_QUOTES) {
+		$translation = array_merge($single, $double, $others);
+		$translation_preg = array_merge($single_preg, $double_preg, $others_preg);
+	} elseif ($quote_style === ENT_COMPAT || $quote_style === 'double') {
+		$translation = array_merge($double, $others);
+		$translation_preg = array_merge($double_preg, $others_preg);
+	} elseif ($quote_style === 'single') {
+		$translation = array_merge($single, $others);
+		$translation_preg = array_merge($single_preg, $others_preg);
+	} elseif ($quote_style === ENT_NOQUOTES) {
 		$translation = $others;
 		$translation_preg = $others_preg;
 	}
 
 	// Remove zero padding on numeric entities
-	$string = preg_replace( array_keys( $translation_preg ), array_values( $translation_preg ), $string );
+	$string = preg_replace(array_keys($translation_preg), array_values($translation_preg), $string);
 
 	// Replace characters according to translation table
-	return strtr( $string, $translation );
+	return strtr($string, $translation);
 }
 
 /**
@@ -1021,40 +1021,40 @@ 
  * @param bool    $strip Optional. Whether to attempt to strip out invalid UTF8. Default is false.
  * @return string The checked text.
  */
-function wp_check_invalid_utf8( $string, $strip = false ) {
+function wp_check_invalid_utf8($string, $strip = false) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) ) {
+	if (0 === strlen($string)) {
 		return '';
 	}
 
 	// Store the site charset as a static to avoid multiple calls to get_option()
 	static $is_utf8 = null;
-	if ( ! isset( $is_utf8 ) ) {
-		$is_utf8 = in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) );
+	if ( ! isset($is_utf8)) {
+		$is_utf8 = in_array(get_option('blog_charset'), array('utf8', 'utf-8', 'UTF8', 'UTF-8'));
 	}
-	if ( ! $is_utf8 ) {
+	if ( ! $is_utf8) {
 		return $string;
 	}
 
 	// Check for support for utf8 in the installed PCRE library once and store the result in a static
 	static $utf8_pcre = null;
-	if ( ! isset( $utf8_pcre ) ) {
-		$utf8_pcre = @preg_match( '/^./u', 'a' );
+	if ( ! isset($utf8_pcre)) {
+		$utf8_pcre = @preg_match('/^./u', 'a');
 	}
 	// We can't demand utf8 in the PCRE installation, so just return the string in those cases
-	if ( !$utf8_pcre ) {
+	if ( ! $utf8_pcre) {
 		return $string;
 	}
 
 	// preg_match fails when it encounters invalid UTF8 in $string
-	if ( 1 === @preg_match( '/^./us', $string ) ) {
+	if (1 === @preg_match('/^./us', $string)) {
 		return $string;
 	}
 
 	// Attempt to strip the bad chars if requested (not recommended)
-	if ( $strip && function_exists( 'iconv' ) ) {
-		return iconv( 'utf-8', 'utf-8', $string );
+	if ($strip && function_exists('iconv')) {
+		return iconv('utf-8', 'utf-8', $string);
 	}
 
 	return '';
@@ -1069,30 +1069,30 @@ 
  * @param int    $length Max  length of the string
  * @return string String with Unicode encoded for URI.
  */
-function utf8_uri_encode( $utf8_string, $length = 0 ) {
+function utf8_uri_encode($utf8_string, $length = 0) {
 	$unicode = '';
 	$values = array();
 	$num_octets = 1;
 	$unicode_length = 0;
 
 	mbstring_binary_safe_encoding();
-	$string_length = strlen( $utf8_string );
+	$string_length = strlen($utf8_string);
 	reset_mbstring_encoding();
 
-	for ($i = 0; $i < $string_length; $i++ ) {
+	for ($i = 0; $i < $string_length; $i++) {
 
-		$value = ord( $utf8_string[ $i ] );
+		$value = ord($utf8_string[$i]);
 
-		if ( $value < 128 ) {
-			if ( $length && ( $unicode_length >= $length ) )
+		if ($value < 128) {
+			if ($length && ($unicode_length >= $length))
 				break;
 			$unicode .= chr($value);
 			$unicode_length++;
 		} else {
-			if ( count( $values ) == 0 ) {
-				if ( $value < 224 ) {
+			if (count($values) == 0) {
+				if ($value < 224) {
 					$num_octets = 2;
-				} elseif ( $value < 240 ) {
+				} elseif ($value < 240) {
 					$num_octets = 3;
 				} else {
 					$num_octets = 4;
@@ -1101,11 +1101,11 @@ 
 
 			$values[] = $value;
 
-			if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length )
+			if ($length && ($unicode_length + ($num_octets * 3)) > $length)
 				break;
-			if ( count( $values ) == $num_octets ) {
-				for ( $j = 0; $j < $num_octets; $j++ ) {
-					$unicode .= '%' . dechex( $values[ $j ] );
+			if (count($values) == $num_octets) {
+				for ($j = 0; $j < $num_octets; $j++) {
+					$unicode .= '%'.dechex($values[$j]);
 				}
 
 				$unicode_length += $num_octets * 3;
@@ -1496,8 +1496,8 @@ 
  * @param string $string Text that might have accent characters
  * @return string Filtered string with replaced "nice" characters.
  */
-function remove_accents( $string ) {
-	if ( !preg_match('/[\x80-\xff]/', $string) )
+function remove_accents($string) {
+	if ( ! preg_match('/[\x80-\xff]/', $string))
 		return $string;
 
 	if (seems_utf8($string)) {
@@ -1507,7 +1507,7 @@ 
 		chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
 		chr(195).chr(130) => 'A', chr(195).chr(131) => 'A',
 		chr(195).chr(132) => 'A', chr(195).chr(133) => 'A',
-		chr(195).chr(134) => 'AE',chr(195).chr(135) => 'C',
+		chr(195).chr(134) => 'AE', chr(195).chr(135) => 'C',
 		chr(195).chr(136) => 'E', chr(195).chr(137) => 'E',
 		chr(195).chr(138) => 'E', chr(195).chr(139) => 'E',
 		chr(195).chr(140) => 'I', chr(195).chr(141) => 'I',
@@ -1518,11 +1518,11 @@ 
 		chr(195).chr(150) => 'O', chr(195).chr(153) => 'U',
 		chr(195).chr(154) => 'U', chr(195).chr(155) => 'U',
 		chr(195).chr(156) => 'U', chr(195).chr(157) => 'Y',
-		chr(195).chr(158) => 'TH',chr(195).chr(159) => 's',
+		chr(195).chr(158) => 'TH', chr(195).chr(159) => 's',
 		chr(195).chr(160) => 'a', chr(195).chr(161) => 'a',
 		chr(195).chr(162) => 'a', chr(195).chr(163) => 'a',
 		chr(195).chr(164) => 'a', chr(195).chr(165) => 'a',
-		chr(195).chr(166) => 'ae',chr(195).chr(167) => 'c',
+		chr(195).chr(166) => 'ae', chr(195).chr(167) => 'c',
 		chr(195).chr(168) => 'e', chr(195).chr(169) => 'e',
 		chr(195).chr(170) => 'e', chr(195).chr(171) => 'e',
 		chr(195).chr(172) => 'i', chr(195).chr(173) => 'i',
@@ -1561,7 +1561,7 @@ 
 		chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
 		chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
 		chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
-		chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+		chr(196).chr(178) => 'IJ', chr(196).chr(179) => 'ij',
 		chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
 		chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
 		chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
@@ -1577,13 +1577,13 @@ 
 		chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
 		chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
 		chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
-		chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
-		chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
-		chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
-		chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
-		chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
-		chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
-		chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
+		chr(197).chr(146) => 'OE', chr(197).chr(147) => 'oe',
+		chr(197).chr(148) => 'R', chr(197).chr(149) => 'r',
+		chr(197).chr(150) => 'R', chr(197).chr(151) => 'r',
+		chr(197).chr(152) => 'R', chr(197).chr(153) => 'r',
+		chr(197).chr(154) => 'S', chr(197).chr(155) => 's',
+		chr(197).chr(156) => 'S', chr(197).chr(157) => 's',
+		chr(197).chr(158) => 'S', chr(197).chr(159) => 's',
 		chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
 		chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
 		chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
@@ -1680,23 +1680,23 @@ 
 		// Used for locale-specific rules
 		$locale = get_locale();
 
-		if ( 'de_DE' == $locale || 'de_DE_formal' == $locale || 'de_CH' == $locale || 'de_CH_informal' == $locale ) {
-			$chars[ chr(195).chr(132) ] = 'Ae';
-			$chars[ chr(195).chr(164) ] = 'ae';
-			$chars[ chr(195).chr(150) ] = 'Oe';
-			$chars[ chr(195).chr(182) ] = 'oe';
-			$chars[ chr(195).chr(156) ] = 'Ue';
-			$chars[ chr(195).chr(188) ] = 'ue';
-			$chars[ chr(195).chr(159) ] = 'ss';
-		} elseif ( 'da_DK' === $locale ) {
-			$chars[ chr(195).chr(134) ] = 'Ae';
- 			$chars[ chr(195).chr(166) ] = 'ae';
-			$chars[ chr(195).chr(152) ] = 'Oe';
-			$chars[ chr(195).chr(184) ] = 'oe';
-			$chars[ chr(195).chr(133) ] = 'Aa';
-			$chars[ chr(195).chr(165) ] = 'aa';
-		} elseif ( 'ca' === $locale ) {
-			$chars[ chr(108).chr(194).chr(183).chr(108) ] = 'll';
+		if ('de_DE' == $locale || 'de_DE_formal' == $locale || 'de_CH' == $locale || 'de_CH_informal' == $locale) {
+			$chars[chr(195).chr(132)] = 'Ae';
+			$chars[chr(195).chr(164)] = 'ae';
+			$chars[chr(195).chr(150)] = 'Oe';
+			$chars[chr(195).chr(182)] = 'oe';
+			$chars[chr(195).chr(156)] = 'Ue';
+			$chars[chr(195).chr(188)] = 'ue';
+			$chars[chr(195).chr(159)] = 'ss';
+		} elseif ('da_DK' === $locale) {
+			$chars[chr(195).chr(134)] = 'Ae';
+ 			$chars[chr(195).chr(166)] = 'ae';
+			$chars[chr(195).chr(152)] = 'Oe';
+			$chars[chr(195).chr(184)] = 'oe';
+			$chars[chr(195).chr(133)] = 'Aa';
+			$chars[chr(195).chr(165)] = 'aa';
+		} elseif ('ca' === $locale) {
+			$chars[chr(108).chr(194).chr(183).chr(108)] = 'll';
 		}
 
 		$string = strtr($string, $chars);
@@ -1741,7 +1741,7 @@ 
  * @param string $filename The filename to be sanitized
  * @return string The sanitized filename
  */
-function sanitize_file_name( $filename ) {
+function sanitize_file_name($filename) {
 	$filename_raw = $filename;
 	$special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", "%", "+", chr(0));
 	/**
@@ -1752,18 +1752,18 @@ 
 	 * @param array  $special_chars Characters to remove.
 	 * @param string $filename_raw  Filename as it was passed into sanitize_file_name().
 	 */
-	$special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw );
-	$filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );
-	$filename = str_replace( $special_chars, '', $filename );
-	$filename = str_replace( array( '%20', '+' ), '-', $filename );
-	$filename = preg_replace( '/[\r\n\t -]+/', '-', $filename );
-	$filename = trim( $filename, '.-_' );
-
-	if ( false === strpos( $filename, '.' ) ) {
+	$special_chars = apply_filters('sanitize_file_name_chars', $special_chars, $filename_raw);
+	$filename = preg_replace("#\x{00a0}#siu", ' ', $filename);
+	$filename = str_replace($special_chars, '', $filename);
+	$filename = str_replace(array('%20', '+'), '-', $filename);
+	$filename = preg_replace('/[\r\n\t -]+/', '-', $filename);
+	$filename = trim($filename, '.-_');
+
+	if (false === strpos($filename, '.')) {
 		$mime_types = wp_get_mime_types();
-		$filetype = wp_check_filetype( 'test.' . $filename, $mime_types );
-		if ( $filetype['ext'] === $filename ) {
-			$filename = 'unnamed-file.' . $filetype['ext'];
+		$filetype = wp_check_filetype('test.'.$filename, $mime_types);
+		if ($filetype['ext'] === $filename) {
+			$filename = 'unnamed-file.'.$filetype['ext'];
 		}
 	}
 
@@ -1771,7 +1771,7 @@ 
 	$parts = explode('.', $filename);
 
 	// Return if only one extension
-	if ( count( $parts ) <= 2 ) {
+	if (count($parts) <= 2) {
 		/**
 		 * Filters a sanitized filename string.
 		 *
@@ -1780,7 +1780,7 @@ 
 		 * @param string $filename     Sanitized filename.
 		 * @param string $filename_raw The filename prior to sanitization.
 		 */
-		return apply_filters( 'sanitize_file_name', $filename, $filename_raw );
+		return apply_filters('sanitize_file_name', $filename, $filename_raw);
 	}
 
 	// Process multiple extensions
@@ -1792,23 +1792,23 @@ 
 	 * Loop over any intermediate extensions. Postfix them with a trailing underscore
 	 * if they are a 2 - 5 character long alpha string not in the extension whitelist.
 	 */
-	foreach ( (array) $parts as $part) {
-		$filename .= '.' . $part;
+	foreach ((array) $parts as $part) {
+		$filename .= '.'.$part;
 
-		if ( preg_match("/^[a-zA-Z]{2,5}\d?$/", $part) ) {
+		if (preg_match("/^[a-zA-Z]{2,5}\d?$/", $part)) {
 			$allowed = false;
-			foreach ( $mimes as $ext_preg => $mime_match ) {
-				$ext_preg = '!^(' . $ext_preg . ')$!i';
-				if ( preg_match( $ext_preg, $part ) ) {
+			foreach ($mimes as $ext_preg => $mime_match) {
+				$ext_preg = '!^('.$ext_preg.')$!i';
+				if (preg_match($ext_preg, $part)) {
 					$allowed = true;
 					break;
 				}
 			}
-			if ( !$allowed )
+			if ( ! $allowed)
 				$filename .= '_';
 		}
 	}
-	$filename .= '.' . $extension;
+	$filename .= '.'.$extension;
 	/** This filter is documented in wp-includes/formatting.php */
 	return apply_filters('sanitize_file_name', $filename, $filename_raw);
 }
@@ -1827,21 +1827,21 @@ 
  * @param bool   $strict   If set limits $username to specific characters. Default false.
  * @return string The sanitized username, after passing through filters.
  */
-function sanitize_user( $username, $strict = false ) {
+function sanitize_user($username, $strict = false) {
 	$raw_username = $username;
-	$username = wp_strip_all_tags( $username );
-	$username = remove_accents( $username );
+	$username = wp_strip_all_tags($username);
+	$username = remove_accents($username);
 	// Kill octets
-	$username = preg_replace( '|%([a-fA-F0-9][a-fA-F0-9])|', '', $username );
-	$username = preg_replace( '/&.+?;/', '', $username ); // Kill entities
+	$username = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '', $username);
+	$username = preg_replace('/&.+?;/', '', $username); // Kill entities
 
 	// If strict, reduce to ASCII for max portability.
-	if ( $strict )
-		$username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
+	if ($strict)
+		$username = preg_replace('|[^a-z0-9 _.\-@]|i', '', $username);
 
-	$username = trim( $username );
+	$username = trim($username);
 	// Consolidate contiguous whitespace
-	$username = preg_replace( '|\s+|', ' ', $username );
+	$username = preg_replace('|\s+|', ' ', $username);
 
 	/**
 	 * Filters a sanitized username string.
@@ -1852,7 +1852,7 @@ 
 	 * @param string $raw_username The username prior to sanitization.
 	 * @param bool   $strict       Whether to limit the sanitization to specific characters. Default false.
 	 */
-	return apply_filters( 'sanitize_user', $username, $raw_username, $strict );
+	return apply_filters('sanitize_user', $username, $raw_username, $strict);
 }
 
 /**
@@ -1865,10 +1865,10 @@ 
  * @param string $key String key
  * @return string Sanitized key
  */
-function sanitize_key( $key ) {
+function sanitize_key($key) {
 	$raw_key = $key;
-	$key = strtolower( $key );
-	$key = preg_replace( '/[^a-z0-9_\-]/', '', $key );
+	$key = strtolower($key);
+	$key = preg_replace('/[^a-z0-9_\-]/', '', $key);
 
 	/**
 	 * Filters a sanitized key string.
@@ -1878,7 +1878,7 @@ 
 	 * @param string $key     Sanitized key.
 	 * @param string $raw_key The key prior to sanitization.
 	 */
-	return apply_filters( 'sanitize_key', $key, $raw_key );
+	return apply_filters('sanitize_key', $key, $raw_key);
 }
 
 /**
@@ -1895,10 +1895,10 @@ 
  * @param string $context        Optional. The operation for which the string is sanitized
  * @return string The sanitized string.
  */
-function sanitize_title( $title, $fallback_title = '', $context = 'save' ) {
+function sanitize_title($title, $fallback_title = '', $context = 'save') {
 	$raw_title = $title;
 
-	if ( 'save' == $context )
+	if ('save' == $context)
 		$title = remove_accents($title);
 
 	/**
@@ -1910,9 +1910,9 @@ 
 	 * @param string $raw_title The title prior to sanitization.
 	 * @param string $context   The context for which the title is being sanitized.
 	 */
-	$title = apply_filters( 'sanitize_title', $title, $raw_title, $context );
+	$title = apply_filters('sanitize_title', $title, $raw_title, $context);
 
-	if ( '' === $title || false === $title )
+	if ('' === $title || false === $title)
 		$title = $fallback_title;
 
 	return $title;
@@ -1928,8 +1928,8 @@ 
  * @param string $title The string to be sanitized.
  * @return string The sanitized string.
  */
-function sanitize_title_for_query( $title ) {
-	return sanitize_title( $title, '', 'query' );
+function sanitize_title_for_query($title) {
+	return sanitize_title($title, '', 'query');
 }
 
 /**
@@ -1945,7 +1945,7 @@ 
  * @param string $context   Optional. The operation for which the string is sanitized.
  * @return string The sanitized title.
  */
-function sanitize_title_with_dashes( $title, $raw_title = '', $context = 'display' ) {
+function sanitize_title_with_dashes($title, $raw_title = '', $context = 'display') {
 	$title = strip_tags($title);
 	// Preserve escaped octets.
 	$title = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '---$1---', $title);
@@ -1963,14 +1963,14 @@ 
 
 	$title = strtolower($title);
 
-	if ( 'save' == $context ) {
+	if ('save' == $context) {
 		// Convert nbsp, ndash and mdash to hyphens
-		$title = str_replace( array( '%c2%a0', '%e2%80%93', '%e2%80%94' ), '-', $title );
+		$title = str_replace(array('%c2%a0', '%e2%80%93', '%e2%80%94'), '-', $title);
 		// Convert nbsp, ndash and mdash HTML entities to hyphens
-		$title = str_replace( array( '&nbsp;', '&#160;', '&ndash;', '&#8211;', '&mdash;', '&#8212;' ), '-', $title );
+		$title = str_replace(array('&nbsp;', '&#160;', '&ndash;', '&#8211;', '&mdash;', '&#8212;'), '-', $title);
 
 		// Strip these characters entirely
-		$title = str_replace( array(
+		$title = str_replace(array(
 			// iexcl and iquest
 			'%c2%a1', '%c2%bf',
 			// angle quotes
@@ -1984,10 +1984,10 @@ 
 			'%c2%b4', '%cb%8a', '%cc%81', '%cd%81',
 			// grave accent, macron, caron
 			'%cc%80', '%cc%84', '%cc%8c',
-		), '', $title );
+		), '', $title);
 
 		// Convert times to x
-		$title = str_replace( '%c3%97', 'x', $title );
+		$title = str_replace('%c3%97', 'x', $title);
 	}
 
 	$title = preg_replace('/&.+?;/', '', $title); // kill entities
@@ -2014,8 +2014,8 @@ 
  * @param string $orderby Order by clause to be validated.
  * @return string|false Returns $orderby if valid, false otherwise.
  */
-function sanitize_sql_orderby( $orderby ) {
-	if ( preg_match( '/^\s*(([a-z0-9_]+|`[a-z0-9_]+`)(\s+(ASC|DESC))?\s*(,\s*(?=[a-z0-9_`])|$))+$/i', $orderby ) || preg_match( '/^\s*RAND\(\s*\)\s*$/i', $orderby ) ) {
+function sanitize_sql_orderby($orderby) {
+	if (preg_match('/^\s*(([a-z0-9_]+|`[a-z0-9_]+`)(\s+(ASC|DESC))?\s*(,\s*(?=[a-z0-9_`])|$))+$/i', $orderby) || preg_match('/^\s*RAND\(\s*\)\s*$/i', $orderby)) {
 		return $orderby;
 	}
 	return false;
@@ -2036,15 +2036,15 @@ 
  * 	Defaults to an empty string.
  * @return string The sanitized value
  */
-function sanitize_html_class( $class, $fallback = '' ) {
+function sanitize_html_class($class, $fallback = '') {
 	//Strip out any % encoded octets
-	$sanitized = preg_replace( '|%[a-fA-F0-9][a-fA-F0-9]|', '', $class );
+	$sanitized = preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $class);
 
 	//Limit to A-Z,a-z,0-9,_,-
-	$sanitized = preg_replace( '/[^A-Za-z0-9_-]/', '', $sanitized );
+	$sanitized = preg_replace('/[^A-Za-z0-9_-]/', '', $sanitized);
 
-	if ( '' == $sanitized && $fallback ) {
-		return sanitize_html_class( $fallback );
+	if ('' == $sanitized && $fallback) {
+		return sanitize_html_class($fallback);
 	}
 	/**
 	 * Filters a sanitized HTML class string.
@@ -2055,7 +2055,7 @@ 
 	 * @param string $class     HTML class before sanitization.
 	 * @param string $fallback  The fallback string.
 	 */
-	return apply_filters( 'sanitize_html_class', $sanitized, $class, $fallback );
+	return apply_filters('sanitize_html_class', $sanitized, $class, $fallback);
 }
 
 /**
@@ -2067,13 +2067,13 @@ 
  * @param string $deprecated Not used.
  * @return string Converted string.
  */
-function convert_chars( $content, $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '0.71' );
+function convert_chars($content, $deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '0.71');
 	}
 
-	if ( strpos( $content, '&' ) !== false ) {
-		$content = preg_replace( '/&([^#])(?![a-z1-4]{1,8};)/i', '&#038;$1', $content );
+	if (strpos($content, '&') !== false) {
+		$content = preg_replace('/&([^#])(?![a-z1-4]{1,8};)/i', '&#038;$1', $content);
 	}
 
 	return $content;
@@ -2087,12 +2087,12 @@ 
  * @param string $content String with entities that need converting.
  * @return string Converted string.
  */
-function convert_invalid_entities( $content ) {
+function convert_invalid_entities($content) {
 	$wp_htmltranswinuni = array(
 		'&#128;' => '&#8364;', // the Euro sign
 		'&#129;' => '',
 		'&#130;' => '&#8218;', // these are Windows CP1252 specific characters
-		'&#131;' => '&#402;',  // they would look weird on non-Windows browsers
+		'&#131;' => '&#402;', // they would look weird on non-Windows browsers
 		'&#132;' => '&#8222;',
 		'&#133;' => '&#8230;',
 		'&#134;' => '&#8224;',
@@ -2123,8 +2123,8 @@ 
 		'&#159;' => '&#376;'
 	);
 
-	if ( strpos( $content, '&#1' ) !== false ) {
-		$content = strtr( $content, $wp_htmltranswinuni );
+	if (strpos($content, '&#1') !== false) {
+		$content = strtr($content, $wp_htmltranswinuni);
 	}
 
 	return $content;
@@ -2139,9 +2139,9 @@ 
  * @param bool   $force If true, forces balancing, ignoring the value of the option. Default false.
  * @return string Balanced text
  */
-function balanceTags( $text, $force = false ) {
-	if ( $force || get_option('use_balanceTags') == 1 ) {
-		return force_balance_tags( $text );
+function balanceTags($text, $force = false) {
+	if ($force || get_option('use_balanceTags') == 1) {
+		return force_balance_tags($text);
 	} else {
 		return $text;
 	}
@@ -2165,22 +2165,22 @@ 
  * @param string $text Text to be balanced.
  * @return string Balanced text.
  */
-function force_balance_tags( $text ) {
+function force_balance_tags($text) {
 	$tagstack = array();
 	$stacksize = 0;
 	$tagqueue = '';
 	$newtext = '';
 	// Known single-entity/self-closing tags
-	$single_tags = array( 'area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param', 'source' );
+	$single_tags = array('area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param', 'source');
 	// Tags that can be immediately nested within themselves
-	$nestable_tags = array( 'blockquote', 'div', 'object', 'q', 'span' );
+	$nestable_tags = array('blockquote', 'div', 'object', 'q', 'span');
 
 	// WP bug fix for comments - in case you REALLY meant to type '< !--'
 	$text = str_replace('< !--', '<    !--', $text);
 	// WP bug fix for LOVE <3 (and other situations with '<' before a number)
 	$text = preg_replace('#<([0-9]{1})#', '&lt;$1', $text);
 
-	while ( preg_match("/<(\/?[\w:]*)\s*([^>]*)>/", $text, $regex) ) {
+	while (preg_match("/<(\/?[\w:]*)\s*([^>]*)>/", $text, $regex)) {
 		$newtext .= $tagqueue;
 
 		$i = strpos($text, $regex[0]);
@@ -2189,25 +2189,25 @@ 
 		// clear the shifter
 		$tagqueue = '';
 		// Pop or Push
-		if ( isset($regex[1][0]) && '/' == $regex[1][0] ) { // End Tag
-			$tag = strtolower(substr($regex[1],1));
+		if (isset($regex[1][0]) && '/' == $regex[1][0]) { // End Tag
+			$tag = strtolower(substr($regex[1], 1));
 			// if too many closing tags
-			if ( $stacksize <= 0 ) {
+			if ($stacksize <= 0) {
 				$tag = '';
 				// or close to be safe $tag = '/' . $tag;
 			}
 			// if stacktop value = tag close value then pop
-			elseif ( $tagstack[$stacksize - 1] == $tag ) { // found closing tag
-				$tag = '</' . $tag . '>'; // Close Tag
+			elseif ($tagstack[$stacksize - 1] == $tag) { // found closing tag
+				$tag = '</'.$tag.'>'; // Close Tag
 				// Pop
-				array_pop( $tagstack );
+				array_pop($tagstack);
 				$stacksize--;
 			} else { // closing tag not at top, search for it
-				for ( $j = $stacksize-1; $j >= 0; $j-- ) {
-					if ( $tagstack[$j] == $tag ) {
+				for ($j = $stacksize - 1; $j >= 0; $j--) {
+					if ($tagstack[$j] == $tag) {
 					// add tag to tagqueue
-						for ( $k = $stacksize-1; $k >= $j; $k--) {
-							$tagqueue .= '</' . array_pop( $tagstack ) . '>';
+						for ($k = $stacksize - 1; $k >= $j; $k--) {
+							$tagqueue .= '</'.array_pop($tagstack).'>';
 							$stacksize--;
 						}
 						break;
@@ -2221,43 +2221,43 @@ 
 			// Tag Cleaning
 
 			// If it's an empty tag "< >", do nothing
-			if ( '' == $tag ) {
+			if ('' == $tag) {
 				// do nothing
 			}
 			// ElseIf it presents itself as a self-closing tag...
-			elseif ( substr( $regex[2], -1 ) == '/' ) {
+			elseif (substr($regex[2], -1) == '/') {
 				// ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such and
 				// immediately close it with a closing tag (the tag will encapsulate no text as a result)
-				if ( ! in_array( $tag, $single_tags ) )
-					$regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
+				if ( ! in_array($tag, $single_tags))
+					$regex[2] = trim(substr($regex[2], 0, -1))."></$tag";
 			}
 			// ElseIf it's a known single-entity tag but it doesn't close itself, do so
-			elseif ( in_array($tag, $single_tags) ) {
+			elseif (in_array($tag, $single_tags)) {
 				$regex[2] .= '/';
 			}
 			// Else it's not a single-entity tag
 			else {
 				// If the top of the stack is the same as the tag we want to push, close previous tag
-				if ( $stacksize > 0 && !in_array($tag, $nestable_tags) && $tagstack[$stacksize - 1] == $tag ) {
-					$tagqueue = '</' . array_pop( $tagstack ) . '>';
+				if ($stacksize > 0 && ! in_array($tag, $nestable_tags) && $tagstack[$stacksize - 1] == $tag) {
+					$tagqueue = '</'.array_pop($tagstack).'>';
 					$stacksize--;
 				}
-				$stacksize = array_push( $tagstack, $tag );
+				$stacksize = array_push($tagstack, $tag);
 			}
 
 			// Attributes
 			$attributes = $regex[2];
-			if ( ! empty( $attributes ) && $attributes[0] != '>' )
-				$attributes = ' ' . $attributes;
+			if ( ! empty($attributes) && $attributes[0] != '>')
+				$attributes = ' '.$attributes;
 
-			$tag = '<' . $tag . $attributes . '>';
+			$tag = '<'.$tag.$attributes.'>';
 			//If already queuing a close tag, then put this tag on, too
-			if ( !empty($tagqueue) ) {
+			if ( ! empty($tagqueue)) {
 				$tagqueue .= $tag;
 				$tag = '';
 			}
 		}
-		$newtext .= substr($text, 0, $i) . $tag;
+		$newtext .= substr($text, 0, $i).$tag;
 		$text = substr($text, $i + $l);
 	}
 
@@ -2268,12 +2268,12 @@ 
 	$newtext .= $text;
 
 	// Empty Stack
-	while( $x = array_pop($tagstack) )
-		$newtext .= '</' . $x . '>'; // Add remaining tags to close
+	while ($x = array_pop($tagstack))
+		$newtext .= '</'.$x.'>'; // Add remaining tags to close
 
 	// WP fix for the bug with HTML comments
-	$newtext = str_replace("< !--","<!--",$newtext);
-	$newtext = str_replace("<    !--","< !--",$newtext);
+	$newtext = str_replace("< !--", "<!--", $newtext);
+	$newtext = str_replace("<    !--", "< !--", $newtext);
 
 	return $newtext;
 }
@@ -2294,7 +2294,7 @@ 
  *                          Default false.
  * @return string The text after the filter (and possibly htmlspecialchars()) has been run.
  */
-function format_to_edit( $content, $rich_text = false ) {
+function format_to_edit($content, $rich_text = false) {
 	/**
 	 * Filters the text to be formatted for editing.
 	 *
@@ -2302,9 +2302,9 @@ 
 	 *
 	 * @param string $content The text, prior to formatting for editing.
 	 */
-	$content = apply_filters( 'format_to_edit', $content );
-	if ( ! $rich_text )
-		$content = esc_textarea( $content );
+	$content = apply_filters('format_to_edit', $content);
+	if ( ! $rich_text)
+		$content = esc_textarea($content);
 	return $content;
 }
 
@@ -2325,8 +2325,8 @@ 
  * @param int $threshold  Digit places number needs to be to not have zeros added.
  * @return string Adds leading zeros to number if needed.
  */
-function zeroise( $number, $threshold ) {
-	return sprintf( '%0' . $threshold . 's', $number );
+function zeroise($number, $threshold) {
+	return sprintf('%0'.$threshold.'s', $number);
 }
 
 /**
@@ -2337,10 +2337,10 @@ 
  * @param string $string Value to which backslashes will be added.
  * @return string String with backslashes inserted.
  */
-function backslashit( $string ) {
-	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' )
-		$string = '\\\\' . $string;
-	return addcslashes( $string, 'A..Za..z' );
+function backslashit($string) {
+	if (isset($string[0]) && $string[0] >= '0' && $string[0] <= '9')
+		$string = '\\\\'.$string;
+	return addcslashes($string, 'A..Za..z');
 }
 
 /**
@@ -2357,8 +2357,8 @@ 
  * @param string $string What to add the trailing slash to.
  * @return string String with trailing slash added.
  */
-function trailingslashit( $string ) {
-	return untrailingslashit( $string ) . '/';
+function trailingslashit($string) {
+	return untrailingslashit($string).'/';
 }
 
 /**
@@ -2372,8 +2372,8 @@ 
  * @param string $string What to remove the trailing slashes from.
  * @return string String without the trailing slashes.
  */
-function untrailingslashit( $string ) {
-	return rtrim( $string, '/\\' );
+function untrailingslashit($string) {
+	return rtrim($string, '/\\');
 }
 
 /**
@@ -2388,7 +2388,7 @@ 
  * @return string Returns a string escaped with slashes.
  */
 function addslashes_gpc($gpc) {
-	if ( get_magic_quotes_gpc() )
+	if (get_magic_quotes_gpc())
 		$gpc = stripslashes($gpc);
 
 	return wp_slash($gpc);
@@ -2402,8 +2402,8 @@ 
  * @param mixed $value The value to be stripped.
  * @return mixed Stripped value.
  */
-function stripslashes_deep( $value ) {
-	return map_deep( $value, 'stripslashes_from_strings_only' );
+function stripslashes_deep($value) {
+	return map_deep($value, 'stripslashes_from_strings_only');
 }
 
 /**
@@ -2414,8 +2414,8 @@ 
  * @param mixed $value The array or string to be stripped.
  * @return mixed $value The stripped value.
  */
-function stripslashes_from_strings_only( $value ) {
-	return is_string( $value ) ? stripslashes( $value ) : $value;
+function stripslashes_from_strings_only($value) {
+	return is_string($value) ? stripslashes($value) : $value;
 }
 
 /**
@@ -2426,8 +2426,8 @@ 
  * @param mixed $value The array or string to be encoded.
  * @return mixed $value The encoded value.
  */
-function urlencode_deep( $value ) {
-	return map_deep( $value, 'urlencode' );
+function urlencode_deep($value) {
+	return map_deep($value, 'urlencode');
 }
 
 /**
@@ -2438,8 +2438,8 @@ 
  * @param mixed $value The array or string to be encoded.
  * @return mixed $value The encoded value.
  */
-function rawurlencode_deep( $value ) {
-	return map_deep( $value, 'rawurlencode' );
+function rawurlencode_deep($value) {
+	return map_deep($value, 'rawurlencode');
 }
 
 /**
@@ -2450,8 +2450,8 @@ 
  * @param mixed $value The array or string to be decoded.
  * @return mixed $value The decoded value.
  */
-function urldecode_deep( $value ) {
-	return map_deep( $value, 'urldecode' );
+function urldecode_deep($value) {
+	return map_deep($value, 'urldecode');
 }
 
 /**
@@ -2463,20 +2463,20 @@ 
  * @param int    $hex_encoding  Optional. Set to 1 to enable hex encoding.
  * @return string Converted email address.
  */
-function antispambot( $email_address, $hex_encoding = 0 ) {
+function antispambot($email_address, $hex_encoding = 0) {
 	$email_no_spam_address = '';
-	for ( $i = 0, $len = strlen( $email_address ); $i < $len; $i++ ) {
-		$j = rand( 0, 1 + $hex_encoding );
-		if ( $j == 0 ) {
-			$email_no_spam_address .= '&#' . ord( $email_address[$i] ) . ';';
-		} elseif ( $j == 1 ) {
+	for ($i = 0, $len = strlen($email_address); $i < $len; $i++) {
+		$j = rand(0, 1 + $hex_encoding);
+		if ($j == 0) {
+			$email_no_spam_address .= '&#'.ord($email_address[$i]).';';
+		} elseif ($j == 1) {
 			$email_no_spam_address .= $email_address[$i];
-		} elseif ( $j == 2 ) {
-			$email_no_spam_address .= '%' . zeroise( dechex( ord( $email_address[$i] ) ), 2 );
+		} elseif ($j == 2) {
+			$email_no_spam_address .= '%'.zeroise(dechex(ord($email_address[$i])), 2);
 		}
 	}
 
-	return str_replace( '@', '&#64;', $email_no_spam_address );
+	return str_replace('@', '&#64;', $email_no_spam_address);
 }
 
 /**
@@ -2490,10 +2490,10 @@ 
  * @param array $matches Single Regex Match.
  * @return string HTML A element with URI address.
  */
-function _make_url_clickable_cb( $matches ) {
+function _make_url_clickable_cb($matches) {
 	$url = $matches[2];
 
-	if ( ')' == $matches[3] && strpos( $url, '(' ) ) {
+	if (')' == $matches[3] && strpos($url, '(')) {
 		// If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it, add the closing parenthesis to the URL.
 		// Then we can let the parenthesis balancer do its thing below.
 		$url .= $matches[3];
@@ -2503,16 +2503,16 @@ 
 	}
 
 	// Include parentheses in the URL only if paired
-	while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
-		$suffix = strrchr( $url, ')' ) . $suffix;
-		$url = substr( $url, 0, strrpos( $url, ')' ) );
+	while (substr_count($url, '(') < substr_count($url, ')')) {
+		$suffix = strrchr($url, ')').$suffix;
+		$url = substr($url, 0, strrpos($url, ')'));
 	}
 
 	$url = esc_url($url);
-	if ( empty($url) )
+	if (empty($url))
 		return $matches[0];
 
-	return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
+	return $matches[1]."<a href=\"$url\" rel=\"nofollow\">$url</a>".$suffix;
 }
 
 /**
@@ -2526,22 +2526,22 @@ 
  * @param array $matches Single Regex Match.
  * @return string HTML A element with URL address.
  */
-function _make_web_ftp_clickable_cb( $matches ) {
+function _make_web_ftp_clickable_cb($matches) {
 	$ret = '';
 	$dest = $matches[2];
-	$dest = 'http://' . $dest;
+	$dest = 'http://'.$dest;
 
 	// removed trailing [.,;:)] from URL
-	if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
+	if (in_array(substr($dest, -1), array('.', ',', ';', ':', ')')) === true) {
 		$ret = substr($dest, -1);
-		$dest = substr($dest, 0, strlen($dest)-1);
+		$dest = substr($dest, 0, strlen($dest) - 1);
 	}
 
 	$dest = esc_url($dest);
-	if ( empty($dest) )
+	if (empty($dest))
 		return $matches[0];
 
-	return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
+	return $matches[1]."<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
 }
 
 /**
@@ -2555,9 +2555,9 @@ 
  * @param array $matches Single Regex Match.
  * @return string HTML A element with email address.
  */
-function _make_email_clickable_cb( $matches ) {
-	$email = $matches[2] . '@' . $matches[3];
-	return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
+function _make_email_clickable_cb($matches) {
+	$email = $matches[2].'@'.$matches[3];
+	return $matches[1]."<a href=\"mailto:$email\">$email</a>";
 }
 
 /**
@@ -2571,30 +2571,30 @@ 
  * @param string $text Content to convert URIs.
  * @return string Content with converted URIs.
  */
-function make_clickable( $text ) {
+function make_clickable($text) {
 	$r = '';
-	$textarr = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags
+	$textarr = preg_split('/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // split out HTML tags
 	$nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
-	foreach ( $textarr as $piece ) {
+	foreach ($textarr as $piece) {
 
-		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) )
+		if (preg_match('|^<code[\s>]|i', $piece) || preg_match('|^<pre[\s>]|i', $piece) || preg_match('|^<script[\s>]|i', $piece) || preg_match('|^<style[\s>]|i', $piece))
 			$nested_code_pre++;
-		elseif ( $nested_code_pre && ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) || '</script>' === strtolower( $piece ) || '</style>' === strtolower( $piece ) ) )
+		elseif ($nested_code_pre && ('</code>' === strtolower($piece) || '</pre>' === strtolower($piece) || '</script>' === strtolower($piece) || '</style>' === strtolower($piece)))
 			$nested_code_pre--;
 
-		if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
+		if ($nested_code_pre || empty($piece) || ($piece[0] === '<' && ! preg_match('|^<\s*[\w]{1,20}+://|', $piece))) {
 			$r .= $piece;
 			continue;
 		}
 
 		// Long strings might contain expensive edge cases ...
-		if ( 10000 < strlen( $piece ) ) {
+		if (10000 < strlen($piece)) {
 			// ... break it up
-			foreach ( _split_str_by_whitespace( $piece, 2100 ) as $chunk ) { // 2100: Extra room for scheme and leading and trailing paretheses
-				if ( 2101 < strlen( $chunk ) ) {
+			foreach (_split_str_by_whitespace($piece, 2100) as $chunk) { // 2100: Extra room for scheme and leading and trailing paretheses
+				if (2101 < strlen($chunk)) {
 					$r .= $chunk; // Too big, no whitespace: bail.
 				} else {
-					$r .= make_clickable( $chunk );
+					$r .= make_clickable($chunk);
 				}
 			}
 		} else {
@@ -2615,18 +2615,18 @@ 
 			~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character.
 			      // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
 
-			$ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
+			$ret = preg_replace_callback($url_clickable, '_make_url_clickable_cb', $ret);
 
-			$ret = preg_replace_callback( '#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret );
-			$ret = preg_replace_callback( '#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret );
+			$ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret);
+			$ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret);
 
-			$ret = substr( $ret, 1, -1 ); // Remove our whitespace padding.
+			$ret = substr($ret, 1, -1); // Remove our whitespace padding.
 			$r .= $ret;
 		}
 	}
 
 	// Cleanup of accidental links within links
-	return preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
+	return preg_replace('#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r);
 }
 
 /**
@@ -2658,27 +2658,27 @@ 
  * @param int    $goal   The desired chunk length.
  * @return array Numeric array of chunks.
  */
-function _split_str_by_whitespace( $string, $goal ) {
+function _split_str_by_whitespace($string, $goal) {
 	$chunks = array();
 
-	$string_nullspace = strtr( $string, "\r\n\t\v\f ", "\000\000\000\000\000\000" );
+	$string_nullspace = strtr($string, "\r\n\t\v\f ", "\000\000\000\000\000\000");
 
-	while ( $goal < strlen( $string_nullspace ) ) {
-		$pos = strrpos( substr( $string_nullspace, 0, $goal + 1 ), "\000" );
+	while ($goal < strlen($string_nullspace)) {
+		$pos = strrpos(substr($string_nullspace, 0, $goal + 1), "\000");
 
-		if ( false === $pos ) {
-			$pos = strpos( $string_nullspace, "\000", $goal + 1 );
-			if ( false === $pos ) {
+		if (false === $pos) {
+			$pos = strpos($string_nullspace, "\000", $goal + 1);
+			if (false === $pos) {
 				break;
 			}
 		}
 
-		$chunks[] = substr( $string, 0, $pos + 1 );
-		$string = substr( $string, $pos + 1 );
-		$string_nullspace = substr( $string_nullspace, $pos + 1 );
+		$chunks[] = substr($string, 0, $pos + 1);
+		$string = substr($string, $pos + 1);
+		$string_nullspace = substr($string_nullspace, $pos + 1);
 	}
 
-	if ( $string ) {
+	if ($string) {
 		$chunks[] = $string;
 	}
 
@@ -2693,11 +2693,11 @@ 
  * @param string $text Content that may contain HTML A elements.
  * @return string Converted content.
  */
-function wp_rel_nofollow( $text ) {
+function wp_rel_nofollow($text) {
 	// This is a pre save filter, so text is already escaped.
 	$text = stripslashes($text);
 	$text = preg_replace_callback('|<a (.+?)>|i', 'wp_rel_nofollow_callback', $text);
-	return wp_slash( $text );
+	return wp_slash($text);
 }
 
 /**
@@ -2711,30 +2711,30 @@ 
  * @param array $matches Single Match
  * @return string HTML A Element with rel nofollow.
  */
-function wp_rel_nofollow_callback( $matches ) {
+function wp_rel_nofollow_callback($matches) {
 	$text = $matches[1];
-	$atts = shortcode_parse_atts( $matches[1] );
+	$atts = shortcode_parse_atts($matches[1]);
 	$rel  = 'nofollow';
 
-	if ( preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'http' ) ) . ')%i', $text ) ||
-	     preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text )
+	if (preg_match('%href=["\']('.preg_quote(set_url_scheme(home_url(), 'http')).')%i', $text) ||
+	     preg_match('%href=["\']('.preg_quote(set_url_scheme(home_url(), 'https')).')%i', $text)
 	) {
 		return "<a $text>";
 	}
 
-	if ( ! empty( $atts['rel'] ) ) {
-		$parts = array_map( 'trim', explode( ' ', $atts['rel'] ) );
-		if ( false === array_search( 'nofollow', $parts ) ) {
+	if ( ! empty($atts['rel'])) {
+		$parts = array_map('trim', explode(' ', $atts['rel']));
+		if (false === array_search('nofollow', $parts)) {
 			$parts[] = 'nofollow';
 		}
-		$rel = implode( ' ', $parts );
-		unset( $atts['rel'] );
+		$rel = implode(' ', $parts);
+		unset($atts['rel']);
 
 		$html = '';
-		foreach ( $atts as $name => $value ) {
+		foreach ($atts as $name => $value) {
 			$html .= "{$name}=\"$value\" ";
 		}
-		$text = trim( $html );
+		$text = trim($html);
 	}
 	return "<a $text rel=\"$rel\">";
 }
@@ -2754,21 +2754,21 @@ 
  * @param array $matches Single match. Smiley code to convert to image.
  * @return string Image string for smiley.
  */
-function translate_smiley( $matches ) {
+function translate_smiley($matches) {
 	global $wpsmiliestrans;
 
-	if ( count( $matches ) == 0 )
+	if (count($matches) == 0)
 		return '';
 
-	$smiley = trim( reset( $matches ) );
-	$img = $wpsmiliestrans[ $smiley ];
+	$smiley = trim(reset($matches));
+	$img = $wpsmiliestrans[$smiley];
 
 	$matches = array();
-	$ext = preg_match( '/\.([^.]+)$/', $img, $matches ) ? strtolower( $matches[1] ) : false;
-	$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
+	$ext = preg_match('/\.([^.]+)$/', $img, $matches) ? strtolower($matches[1]) : false;
+	$image_exts = array('jpg', 'jpeg', 'jpe', 'gif', 'png');
 
 	// Don't convert smilies that aren't images - they're probably emoji.
-	if ( ! in_array( $ext, $image_exts ) ) {
+	if ( ! in_array($ext, $image_exts)) {
 		return $img;
 	}
 
@@ -2781,9 +2781,9 @@ 
 	 * @param string $img        Filename for the smiley image.
 	 * @param string $site_url   Site URL, as returned by site_url().
 	 */
-	$src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() );
+	$src_url = apply_filters('smilies_src', includes_url("images/smilies/$img"), $img, site_url());
 
-	return sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', esc_url( $src_url ), esc_attr( $smiley ) );
+	return sprintf('<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', esc_url($src_url), esc_attr($smiley));
 }
 
 /**
@@ -2799,33 +2799,33 @@ 
  * @param string $text Content to convert smilies from text.
  * @return string Converted content with text smilies replaced with images.
  */
-function convert_smilies( $text ) {
+function convert_smilies($text) {
 	global $wp_smiliessearch;
 	$output = '';
-	if ( get_option( 'use_smilies' ) && ! empty( $wp_smiliessearch ) ) {
+	if (get_option('use_smilies') && ! empty($wp_smiliessearch)) {
 		// HTML loop taken from texturize function, could possible be consolidated
-		$textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // capture the tags as well as in between
-		$stop = count( $textarr );// loop stuff
+		$textarr = preg_split('/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between
+		$stop = count($textarr); // loop stuff
 
 		// Ignore proessing of specific tags
 		$tags_to_ignore = 'code|pre|style|script|textarea';
 		$ignore_block_element = '';
 
-		for ( $i = 0; $i < $stop; $i++ ) {
+		for ($i = 0; $i < $stop; $i++) {
 			$content = $textarr[$i];
 
 			// If we're in an ignore block, wait until we find its closing tag
-			if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) )  {
+			if ('' == $ignore_block_element && preg_match('/^<('.$tags_to_ignore.')>/', $content, $matches)) {
 				$ignore_block_element = $matches[1];
 			}
 
 			// If it's not a tag and not in ignore block
-			if ( '' ==  $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
-				$content = preg_replace_callback( $wp_smiliessearch, 'translate_smiley', $content );
+			if ('' == $ignore_block_element && strlen($content) > 0 && '<' != $content[0]) {
+				$content = preg_replace_callback($wp_smiliessearch, 'translate_smiley', $content);
 			}
 
 			// did we exit ignore block
-			if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content )  {
+			if ('' != $ignore_block_element && '</'.$ignore_block_element.'>' == $content) {
 				$ignore_block_element = '';
 			}
 
@@ -2849,12 +2849,12 @@ 
  * @param bool   $deprecated Deprecated.
  * @return string|bool Either false or the valid email address.
  */
-function is_email( $email, $deprecated = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0.0' );
+function is_email($email, $deprecated = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '3.0.0');
 
 	// Test for the minimum length the email can be
-	if ( strlen( $email ) < 3 ) {
+	if (strlen($email) < 3) {
 		/**
 		 * Filters whether an email address is valid.
 		 *
@@ -2868,65 +2868,65 @@ 
 		 * @param string $email    The email address being checked.
 		 * @param string $context  Context under which the email was tested.
 		 */
-		return apply_filters( 'is_email', false, $email, 'email_too_short' );
+		return apply_filters('is_email', false, $email, 'email_too_short');
 	}
 
 	// Test for an @ character after the first position
-	if ( strpos( $email, '@', 1 ) === false ) {
+	if (strpos($email, '@', 1) === false) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'email_no_at' );
+		return apply_filters('is_email', false, $email, 'email_no_at');
 	}
 
 	// Split out the local and domain parts
-	list( $local, $domain ) = explode( '@', $email, 2 );
+	list($local, $domain) = explode('@', $email, 2);
 
 	// LOCAL PART
 	// Test for invalid characters
-	if ( !preg_match( '/^[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local ) ) {
+	if ( ! preg_match('/^[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'local_invalid_chars' );
+		return apply_filters('is_email', false, $email, 'local_invalid_chars');
 	}
 
 	// DOMAIN PART
 	// Test for sequences of periods
-	if ( preg_match( '/\.{2,}/', $domain ) ) {
+	if (preg_match('/\.{2,}/', $domain)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'domain_period_sequence' );
+		return apply_filters('is_email', false, $email, 'domain_period_sequence');
 	}
 
 	// Test for leading and trailing periods and whitespace
-	if ( trim( $domain, " \t\n\r\0\x0B." ) !== $domain ) {
+	if (trim($domain, " \t\n\r\0\x0B.") !== $domain) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'domain_period_limits' );
+		return apply_filters('is_email', false, $email, 'domain_period_limits');
 	}
 
 	// Split the domain into subs
-	$subs = explode( '.', $domain );
+	$subs = explode('.', $domain);
 
 	// Assume the domain will have at least two subs
-	if ( 2 > count( $subs ) ) {
+	if (2 > count($subs)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'domain_no_periods' );
+		return apply_filters('is_email', false, $email, 'domain_no_periods');
 	}
 
 	// Loop through each sub
-	foreach ( $subs as $sub ) {
+	foreach ($subs as $sub) {
 		// Test for leading and trailing hyphens and whitespace
-		if ( trim( $sub, " \t\n\r\0\x0B-" ) !== $sub ) {
+		if (trim($sub, " \t\n\r\0\x0B-") !== $sub) {
 			/** This filter is documented in wp-includes/formatting.php */
-			return apply_filters( 'is_email', false, $email, 'sub_hyphen_limits' );
+			return apply_filters('is_email', false, $email, 'sub_hyphen_limits');
 		}
 
 		// Test for invalid characters
-		if ( !preg_match('/^[a-z0-9-]+$/i', $sub ) ) {
+		if ( ! preg_match('/^[a-z0-9-]+$/i', $sub)) {
 			/** This filter is documented in wp-includes/formatting.php */
-			return apply_filters( 'is_email', false, $email, 'sub_invalid_chars' );
+			return apply_filters('is_email', false, $email, 'sub_invalid_chars');
 		}
 	}
 
 	// Congratulations your email made it!
 	/** This filter is documented in wp-includes/formatting.php */
-	return apply_filters( 'is_email', $email, $email, null );
+	return apply_filters('is_email', $email, $email, null);
 }
 
 /**
@@ -2937,13 +2937,13 @@ 
  * @param string $string Subject line
  * @return string Converted string to ASCII
  */
-function wp_iso_descrambler( $string ) {
+function wp_iso_descrambler($string) {
 	/* this may only work with iso-8859-1, I'm afraid */
-	if (!preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches)) {
+	if ( ! preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches)) {
 		return $string;
 	} else {
 		$subject = str_replace('_', ' ', $matches[2]);
-		return preg_replace_callback( '#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject );
+		return preg_replace_callback('#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject);
 	}
 }
 
@@ -2956,8 +2956,8 @@ 
  * @param array $match The preg_replace_callback matches array
  * @return string Converted chars
  */
-function _wp_iso_convert( $match ) {
-	return chr( hexdec( strtolower( $match[1] ) ) );
+function _wp_iso_convert($match) {
+	return chr(hexdec(strtolower($match[1])));
 }
 
 /**
@@ -2974,25 +2974,25 @@ 
  * @param string $format The format string for the returned date (default is Y-m-d H:i:s)
  * @return string GMT version of the date provided.
  */
-function get_gmt_from_date( $string, $format = 'Y-m-d H:i:s' ) {
-	$tz = get_option( 'timezone_string' );
-	if ( $tz ) {
-		$datetime = date_create( $string, new DateTimeZone( $tz ) );
-		if ( ! $datetime ) {
-			return gmdate( $format, 0 );
+function get_gmt_from_date($string, $format = 'Y-m-d H:i:s') {
+	$tz = get_option('timezone_string');
+	if ($tz) {
+		$datetime = date_create($string, new DateTimeZone($tz));
+		if ( ! $datetime) {
+			return gmdate($format, 0);
 		}
-		$datetime->setTimezone( new DateTimeZone( 'UTC' ) );
-		$string_gmt = $datetime->format( $format );
+		$datetime->setTimezone(new DateTimeZone('UTC'));
+		$string_gmt = $datetime->format($format);
 	} else {
-		if ( ! preg_match( '#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches ) ) {
-			$datetime = strtotime( $string );
-			if ( false === $datetime ) {
-				return gmdate( $format, 0 );
+		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches)) {
+			$datetime = strtotime($string);
+			if (false === $datetime) {
+				return gmdate($format, 0);
 			}
-			return gmdate( $format, $datetime );
+			return gmdate($format, $datetime);
 		}
-		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
-		$string_gmt = gmdate( $format, $string_time - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+		$string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
+		$string_gmt = gmdate($format, $string_time - get_option('gmt_offset') * HOUR_IN_SECONDS);
 	}
 	return $string_gmt;
 }
@@ -3011,19 +3011,19 @@ 
  * @param string $format The format string for the returned date (default is Y-m-d H:i:s)
  * @return string Formatted date relative to the timezone / GMT offset.
  */
-function get_date_from_gmt( $string, $format = 'Y-m-d H:i:s' ) {
-	$tz = get_option( 'timezone_string' );
-	if ( $tz ) {
-		$datetime = date_create( $string, new DateTimeZone( 'UTC' ) );
-		if ( ! $datetime )
-			return date( $format, 0 );
-		$datetime->setTimezone( new DateTimeZone( $tz ) );
-		$string_localtime = $datetime->format( $format );
+function get_date_from_gmt($string, $format = 'Y-m-d H:i:s') {
+	$tz = get_option('timezone_string');
+	if ($tz) {
+		$datetime = date_create($string, new DateTimeZone('UTC'));
+		if ( ! $datetime)
+			return date($format, 0);
+		$datetime->setTimezone(new DateTimeZone($tz));
+		$string_localtime = $datetime->format($format);
 	} else {
-		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches) )
-			return date( $format, 0 );
-		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
-		$string_localtime = gmdate( $format, $string_time + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches))
+			return date($format, 0);
+		$string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
+		$string_localtime = gmdate($format, $string_time + get_option('gmt_offset') * HOUR_IN_SECONDS);
 	}
 	return $string_localtime;
 }
@@ -3036,7 +3036,7 @@ 
  * @param string $timezone Either 'Z' for 0 offset or '±hhmm'.
  * @return int|float The offset in seconds.
  */
-function iso8601_timezone_to_offset( $timezone ) {
+function iso8601_timezone_to_offset($timezone) {
 	// $timezone is either 'Z' or '[+|-]hhmm'
 	if ($timezone == 'Z') {
 		$offset = 0;
@@ -3058,14 +3058,14 @@ 
  * @param string $timezone    Optional. If set to GMT returns the time minus gmt_offset. Default is 'user'.
  * @return string The date and time in MySQL DateTime format - Y-m-d H:i:s.
  */
-function iso8601_to_datetime( $date_string, $timezone = 'user' ) {
+function iso8601_to_datetime($date_string, $timezone = 'user') {
 	$timezone = strtolower($timezone);
 
 	if ($timezone == 'gmt') {
 
 		preg_match('#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', $date_string, $date_bits);
 
-		if (!empty($date_bits[7])) { // we have a timezone, so let's compute an offset
+		if ( ! empty($date_bits[7])) { // we have a timezone, so let's compute an offset
 			$offset = iso8601_timezone_to_offset($date_bits[7]);
 		} else { // we don't have a timezone, so we assume user local timezone (not server's!)
 			$offset = HOUR_IN_SECONDS * get_option('gmt_offset');
@@ -3089,9 +3089,9 @@ 
  * @param string $email Email address to filter.
  * @return string Filtered email address.
  */
-function sanitize_email( $email ) {
+function sanitize_email($email) {
 	// Test for the minimum length the email can be
-	if ( strlen( $email ) < 3 ) {
+	if (strlen($email) < 3) {
 		/**
 		 * Filters a sanitized email address.
 		 *
@@ -3105,82 +3105,82 @@ 
 		 * @param string $email   The email address, as provided to sanitize_email().
 		 * @param string $message A message to pass to the user.
 		 */
-		return apply_filters( 'sanitize_email', '', $email, 'email_too_short' );
+		return apply_filters('sanitize_email', '', $email, 'email_too_short');
 	}
 
 	// Test for an @ character after the first position
-	if ( strpos( $email, '@', 1 ) === false ) {
+	if (strpos($email, '@', 1) === false) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'email_no_at' );
+		return apply_filters('sanitize_email', '', $email, 'email_no_at');
 	}
 
 	// Split out the local and domain parts
-	list( $local, $domain ) = explode( '@', $email, 2 );
+	list($local, $domain) = explode('@', $email, 2);
 
 	// LOCAL PART
 	// Test for invalid characters
-	$local = preg_replace( '/[^a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]/', '', $local );
-	if ( '' === $local ) {
+	$local = preg_replace('/[^a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]/', '', $local);
+	if ('' === $local) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'local_invalid_chars' );
+		return apply_filters('sanitize_email', '', $email, 'local_invalid_chars');
 	}
 
 	// DOMAIN PART
 	// Test for sequences of periods
-	$domain = preg_replace( '/\.{2,}/', '', $domain );
-	if ( '' === $domain ) {
+	$domain = preg_replace('/\.{2,}/', '', $domain);
+	if ('' === $domain) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_period_sequence' );
+		return apply_filters('sanitize_email', '', $email, 'domain_period_sequence');
 	}
 
 	// Test for leading and trailing periods and whitespace
-	$domain = trim( $domain, " \t\n\r\0\x0B." );
-	if ( '' === $domain ) {
+	$domain = trim($domain, " \t\n\r\0\x0B.");
+	if ('' === $domain) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_period_limits' );
+		return apply_filters('sanitize_email', '', $email, 'domain_period_limits');
 	}
 
 	// Split the domain into subs
-	$subs = explode( '.', $domain );
+	$subs = explode('.', $domain);
 
 	// Assume the domain will have at least two subs
-	if ( 2 > count( $subs ) ) {
+	if (2 > count($subs)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_no_periods' );
+		return apply_filters('sanitize_email', '', $email, 'domain_no_periods');
 	}
 
 	// Create an array that will contain valid subs
 	$new_subs = array();
 
 	// Loop through each sub
-	foreach ( $subs as $sub ) {
+	foreach ($subs as $sub) {
 		// Test for leading and trailing hyphens
-		$sub = trim( $sub, " \t\n\r\0\x0B-" );
+		$sub = trim($sub, " \t\n\r\0\x0B-");
 
 		// Test for invalid characters
-		$sub = preg_replace( '/[^a-z0-9-]+/i', '', $sub );
+		$sub = preg_replace('/[^a-z0-9-]+/i', '', $sub);
 
 		// If there's anything left, add it to the valid subs
-		if ( '' !== $sub ) {
+		if ('' !== $sub) {
 			$new_subs[] = $sub;
 		}
 	}
 
 	// If there aren't 2 or more valid subs
-	if ( 2 > count( $new_subs ) ) {
+	if (2 > count($new_subs)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_no_valid_subs' );
+		return apply_filters('sanitize_email', '', $email, 'domain_no_valid_subs');
 	}
 
 	// Join valid subs into the new domain
-	$domain = join( '.', $new_subs );
+	$domain = join('.', $new_subs);
 
 	// Put the email back together
-	$email = $local . '@' . $domain;
+	$email = $local.'@'.$domain;
 
 	// Congratulations your email made it!
 	/** This filter is documented in wp-includes/formatting.php */
-	return apply_filters( 'sanitize_email', $email, $email, null );
+	return apply_filters('sanitize_email', $email, $email, null);
 }
 
 /**
@@ -3195,44 +3195,44 @@ 
  * @param int $to   Optional. Unix timestamp to end the time difference. Default becomes time() if not set.
  * @return string Human readable time difference.
  */
-function human_time_diff( $from, $to = '' ) {
-	if ( empty( $to ) ) {
+function human_time_diff($from, $to = '') {
+	if (empty($to)) {
 		$to = time();
 	}
 
-	$diff = (int) abs( $to - $from );
+	$diff = (int) abs($to - $from);
 
-	if ( $diff < HOUR_IN_SECONDS ) {
-		$mins = round( $diff / MINUTE_IN_SECONDS );
-		if ( $mins <= 1 )
+	if ($diff < HOUR_IN_SECONDS) {
+		$mins = round($diff / MINUTE_IN_SECONDS);
+		if ($mins <= 1)
 			$mins = 1;
 		/* translators: min=minute */
-		$since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
-	} elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
-		$hours = round( $diff / HOUR_IN_SECONDS );
-		if ( $hours <= 1 )
+		$since = sprintf(_n('%s min', '%s mins', $mins), $mins);
+	} elseif ($diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS) {
+		$hours = round($diff / HOUR_IN_SECONDS);
+		if ($hours <= 1)
 			$hours = 1;
-		$since = sprintf( _n( '%s hour', '%s hours', $hours ), $hours );
-	} elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
-		$days = round( $diff / DAY_IN_SECONDS );
-		if ( $days <= 1 )
+		$since = sprintf(_n('%s hour', '%s hours', $hours), $hours);
+	} elseif ($diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS) {
+		$days = round($diff / DAY_IN_SECONDS);
+		if ($days <= 1)
 			$days = 1;
-		$since = sprintf( _n( '%s day', '%s days', $days ), $days );
-	} elseif ( $diff < MONTH_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
-		$weeks = round( $diff / WEEK_IN_SECONDS );
-		if ( $weeks <= 1 )
+		$since = sprintf(_n('%s day', '%s days', $days), $days);
+	} elseif ($diff < MONTH_IN_SECONDS && $diff >= WEEK_IN_SECONDS) {
+		$weeks = round($diff / WEEK_IN_SECONDS);
+		if ($weeks <= 1)
 			$weeks = 1;
-		$since = sprintf( _n( '%s week', '%s weeks', $weeks ), $weeks );
-	} elseif ( $diff < YEAR_IN_SECONDS && $diff >= MONTH_IN_SECONDS ) {
-		$months = round( $diff / MONTH_IN_SECONDS );
-		if ( $months <= 1 )
+		$since = sprintf(_n('%s week', '%s weeks', $weeks), $weeks);
+	} elseif ($diff < YEAR_IN_SECONDS && $diff >= MONTH_IN_SECONDS) {
+		$months = round($diff / MONTH_IN_SECONDS);
+		if ($months <= 1)
 			$months = 1;
-		$since = sprintf( _n( '%s month', '%s months', $months ), $months );
-	} elseif ( $diff >= YEAR_IN_SECONDS ) {
-		$years = round( $diff / YEAR_IN_SECONDS );
-		if ( $years <= 1 )
+		$since = sprintf(_n('%s month', '%s months', $months), $months);
+	} elseif ($diff >= YEAR_IN_SECONDS) {
+		$years = round($diff / YEAR_IN_SECONDS);
+		if ($years <= 1)
 			$years = 1;
-		$since = sprintf( _n( '%s year', '%s years', $years ), $years );
+		$since = sprintf(_n('%s year', '%s years', $years), $years);
 	}
 
 	/**
@@ -3245,7 +3245,7 @@ 
 	 * @param int    $from  Unix timestamp from which the difference begins.
 	 * @param int    $to    Unix timestamp to end the time difference.
 	 */
-	return apply_filters( 'human_time_diff', $since, $diff, $from, $to );
+	return apply_filters('human_time_diff', $since, $diff, $from, $to);
 }
 
 /**
@@ -3263,15 +3263,15 @@ 
  * @param string $text Optional. The excerpt. If set to empty, an excerpt is generated.
  * @return string The excerpt.
  */
-function wp_trim_excerpt( $text = '' ) {
+function wp_trim_excerpt($text = '') {
 	$raw_excerpt = $text;
-	if ( '' == $text ) {
+	if ('' == $text) {
 		$text = get_the_content('');
 
-		$text = strip_shortcodes( $text );
+		$text = strip_shortcodes($text);
 
 		/** This filter is documented in wp-includes/post-template.php */
-		$text = apply_filters( 'the_content', $text );
+		$text = apply_filters('the_content', $text);
 		$text = str_replace(']]>', ']]&gt;', $text);
 
 		/**
@@ -3281,7 +3281,7 @@ 
 		 *
 		 * @param int $number The number of words. Default 55.
 		 */
-		$excerpt_length = apply_filters( 'excerpt_length', 55 );
+		$excerpt_length = apply_filters('excerpt_length', 55);
 		/**
 		 * Filters the string in the "more" link displayed after a trimmed excerpt.
 		 *
@@ -3289,8 +3289,8 @@ 
 		 *
 		 * @param string $more_string The string shown within the more link.
 		 */
-		$excerpt_more = apply_filters( 'excerpt_more', ' ' . '[&hellip;]' );
-		$text = wp_trim_words( $text, $excerpt_length, $excerpt_more );
+		$excerpt_more = apply_filters('excerpt_more', ' '.'[&hellip;]');
+		$text = wp_trim_words($text, $excerpt_length, $excerpt_more);
 	}
 	/**
 	 * Filters the trimmed excerpt string.
@@ -3300,7 +3300,7 @@ 
 	 * @param string $text        The trimmed text.
 	 * @param string $raw_excerpt The text prior to trimming.
 	 */
-	return apply_filters( 'wp_trim_excerpt', $text, $raw_excerpt );
+	return apply_filters('wp_trim_excerpt', $text, $raw_excerpt);
 }
 
 /**
@@ -3317,35 +3317,35 @@ 
  * @param string $more      Optional. What to append if $text needs to be trimmed. Default '&hellip;'.
  * @return string Trimmed text.
  */
-function wp_trim_words( $text, $num_words = 55, $more = null ) {
-	if ( null === $more ) {
-		$more = __( '&hellip;' );
+function wp_trim_words($text, $num_words = 55, $more = null) {
+	if (null === $more) {
+		$more = __('&hellip;');
 	}
 
 	$original_text = $text;
-	$text = wp_strip_all_tags( $text );
+	$text = wp_strip_all_tags($text);
 
 	/*
 	 * translators: If your word count is based on single characters (e.g. East Asian characters),
 	 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
 	 * Do not translate into your own language.
 	 */
-	if ( strpos( _x( 'words', 'Word count type. Do not translate!' ), 'characters' ) === 0 && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
-		$text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
-		preg_match_all( '/./u', $text, $words_array );
-		$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
+	if (strpos(_x('words', 'Word count type. Do not translate!'), 'characters') === 0 && preg_match('/^utf\-?8$/i', get_option('blog_charset'))) {
+		$text = trim(preg_replace("/[\n\r\t ]+/", ' ', $text), ' ');
+		preg_match_all('/./u', $text, $words_array);
+		$words_array = array_slice($words_array[0], 0, $num_words + 1);
 		$sep = '';
 	} else {
-		$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
+		$words_array = preg_split("/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY);
 		$sep = ' ';
 	}
 
-	if ( count( $words_array ) > $num_words ) {
-		array_pop( $words_array );
-		$text = implode( $sep, $words_array );
-		$text = $text . $more;
+	if (count($words_array) > $num_words) {
+		array_pop($words_array);
+		$text = implode($sep, $words_array);
+		$text = $text.$more;
 	} else {
-		$text = implode( $sep, $words_array );
+		$text = implode($sep, $words_array);
 	}
 
 	/**
@@ -3358,7 +3358,7 @@ 
 	 * @param string $more          An optional string to append to the end of the trimmed text, e.g. &hellip;.
 	 * @param string $original_text The text before it was trimmed.
 	 */
-	return apply_filters( 'wp_trim_words', $text, $num_words, $more, $original_text );
+	return apply_filters('wp_trim_words', $text, $num_words, $more, $original_text);
 }
 
 /**
@@ -3369,7 +3369,7 @@ 
  * @param string $text The text within which entities will be converted.
  * @return string Text with converted entities.
  */
-function ent2ncr( $text ) {
+function ent2ncr($text) {
 
 	/**
 	 * Filters text before named entities are converted into numbered entities.
@@ -3381,8 +3381,8 @@ 
 	 * @param null   $converted_text The text to be converted. Default null.
 	 * @param string $text           The text prior to entity conversion.
 	 */
-	$filtered = apply_filters( 'pre_ent2ncr', null, $text );
-	if ( null !== $filtered )
+	$filtered = apply_filters('pre_ent2ncr', null, $text);
+	if (null !== $filtered)
 		return $filtered;
 
 	$to_ncr = array(
@@ -3644,7 +3644,7 @@ 
 		'&diams;' => '&#9830;'
 	);
 
-	return str_replace( array_keys($to_ncr), array_values($to_ncr), $text );
+	return str_replace(array_keys($to_ncr), array_values($to_ncr), $text);
 }
 
 /**
@@ -3665,9 +3665,9 @@ 
  *                               It is usually either 'html' or 'tinymce'.
  * @return string The formatted text after filter is applied.
  */
-function format_for_editor( $text, $default_editor = null ) {
-	if ( $text ) {
-		$text = htmlspecialchars( $text, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+function format_for_editor($text, $default_editor = null) {
+	if ($text) {
+		$text = htmlspecialchars($text, ENT_NOQUOTES, get_option('blog_charset'));
 	}
 
 	/**
@@ -3679,7 +3679,7 @@ 
 	 * @param string $default_editor The default editor for the current user.
 	 *                               It is usually either 'html' or 'tinymce'.
 	 */
-	return apply_filters( 'format_for_editor', $text, $default_editor );
+	return apply_filters('format_for_editor', $text, $default_editor);
 }
 
 /**
@@ -3697,12 +3697,12 @@ 
  * @param string       $subject The string being searched and replaced on, otherwise known as the haystack.
  * @return string The string with the replaced svalues.
  */
-function _deep_replace( $search, $subject ) {
+function _deep_replace($search, $subject) {
 	$subject = (string) $subject;
 
 	$count = 1;
-	while ( $count ) {
-		$subject = str_replace( $search, '', $subject, $count );
+	while ($count) {
+		$subject = str_replace($search, '', $subject, $count);
 	}
 
 	return $subject;
@@ -3722,9 +3722,9 @@ 
  * @param string|array $data Unescaped data
  * @return string|array Escaped data
  */
-function esc_sql( $data ) {
+function esc_sql($data) {
 	global $wpdb;
-	return $wpdb->_escape( $data );
+	return $wpdb->_escape($data);
 }
 
 /**
@@ -3742,20 +3742,20 @@ 
  * @param string $_context  Private. Use esc_url_raw() for database usage.
  * @return string The cleaned $url after the {@see 'clean_url'} filter is applied.
  */
-function esc_url( $url, $protocols = null, $_context = 'display' ) {
+function esc_url($url, $protocols = null, $_context = 'display') {
 	$original_url = $url;
 
-	if ( '' == $url )
+	if ('' == $url)
 		return $url;
 
-	$url = str_replace( ' ', '%20', $url );
+	$url = str_replace(' ', '%20', $url);
 	$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
 
-	if ( '' === $url ) {
+	if ('' === $url) {
 		return $url;
 	}
 
-	if ( 0 !== stripos( $url, 'mailto:' ) ) {
+	if (0 !== stripos($url, 'mailto:')) {
 		$strip = array('%0d', '%0a', '%0D', '%0A');
 		$url = _deep_replace($strip, $url);
 	}
@@ -3765,61 +3765,61 @@ 
 	 * presume it needs http:// prepended (unless a relative
 	 * link starting with /, # or ? or a php file).
 	 */
-	if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-		! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-		$url = 'http://' . $url;
+	if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) &&
+		! preg_match('/^[a-z0-9-]+?\.php/i', $url))
+		$url = 'http://'.$url;
 
 	// Replace ampersands and single quotes only when displaying.
-	if ( 'display' == $_context ) {
-		$url = wp_kses_normalize_entities( $url );
-		$url = str_replace( '&amp;', '&#038;', $url );
-		$url = str_replace( "'", '&#039;', $url );
+	if ('display' == $_context) {
+		$url = wp_kses_normalize_entities($url);
+		$url = str_replace('&amp;', '&#038;', $url);
+		$url = str_replace("'", '&#039;', $url);
 	}
 
-	if ( ( false !== strpos( $url, '[' ) ) || ( false !== strpos( $url, ']' ) ) ) {
+	if ((false !== strpos($url, '[')) || (false !== strpos($url, ']'))) {
 
-		$parsed = wp_parse_url( $url );
+		$parsed = wp_parse_url($url);
 		$front  = '';
 
-		if ( isset( $parsed['scheme'] ) ) {
-			$front .= $parsed['scheme'] . '://';
-		} elseif ( '/' === $url[0] ) {
+		if (isset($parsed['scheme'])) {
+			$front .= $parsed['scheme'].'://';
+		} elseif ('/' === $url[0]) {
 			$front .= '//';
 		}
 
-		if ( isset( $parsed['user'] ) ) {
+		if (isset($parsed['user'])) {
 			$front .= $parsed['user'];
 		}
 
-		if ( isset( $parsed['pass'] ) ) {
-			$front .= ':' . $parsed['pass'];
+		if (isset($parsed['pass'])) {
+			$front .= ':'.$parsed['pass'];
 		}
 
-		if ( isset( $parsed['user'] ) || isset( $parsed['pass'] ) ) {
+		if (isset($parsed['user']) || isset($parsed['pass'])) {
 			$front .= '@';
 		}
 
-		if ( isset( $parsed['host'] ) ) {
+		if (isset($parsed['host'])) {
 			$front .= $parsed['host'];
 		}
 
-		if ( isset( $parsed['port'] ) ) {
-			$front .= ':' . $parsed['port'];
+		if (isset($parsed['port'])) {
+			$front .= ':'.$parsed['port'];
 		}
 
-		$end_dirty = str_replace( $front, '', $url );
-		$end_clean = str_replace( array( '[', ']' ), array( '%5B', '%5D' ), $end_dirty );
-		$url       = str_replace( $end_dirty, $end_clean, $url );
+		$end_dirty = str_replace($front, '', $url);
+		$end_clean = str_replace(array('[', ']'), array('%5B', '%5D'), $end_dirty);
+		$url       = str_replace($end_dirty, $end_clean, $url);
 
 	}
 
-	if ( '/' === $url[0] ) {
+	if ('/' === $url[0]) {
 		$good_protocol_url = $url;
 	} else {
-		if ( ! is_array( $protocols ) )
+		if ( ! is_array($protocols))
 			$protocols = wp_allowed_protocols();
-		$good_protocol_url = wp_kses_bad_protocol( $url, $protocols );
-		if ( strtolower( $good_protocol_url ) != strtolower( $url ) )
+		$good_protocol_url = wp_kses_bad_protocol($url, $protocols);
+		if (strtolower($good_protocol_url) != strtolower($url))
 			return '';
 	}
 
@@ -3832,7 +3832,7 @@ 
 	 * @param string $original_url      The URL prior to cleaning.
 	 * @param string $_context          If 'display', replace ampersands and single quotes only.
 	 */
-	return apply_filters( 'clean_url', $good_protocol_url, $original_url, $_context );
+	return apply_filters('clean_url', $good_protocol_url, $original_url, $_context);
 }
 
 /**
@@ -3844,8 +3844,8 @@ 
  * @param array  $protocols An array of acceptable protocols.
  * @return string The cleaned URL.
  */
-function esc_url_raw( $url, $protocols = null ) {
-	return esc_url( $url, $protocols, 'db' );
+function esc_url_raw($url, $protocols = null) {
+	return esc_url($url, $protocols, 'db');
 }
 
 /**
@@ -3858,10 +3858,10 @@ 
  * @param string $myHTML The text to be converted.
  * @return string Converted text.
  */
-function htmlentities2( $myHTML ) {
-	$translation_table = get_html_translation_table( HTML_ENTITIES, ENT_QUOTES );
+function htmlentities2($myHTML) {
+	$translation_table = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES);
 	$translation_table[chr(38)] = '&';
-	return preg_replace( "/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&amp;", strtr($myHTML, $translation_table) );
+	return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&amp;", strtr($myHTML, $translation_table));
 }
 
 /**
@@ -3876,12 +3876,12 @@ 
  * @param string $text The text to be escaped.
  * @return string Escaped text.
  */
-function esc_js( $text ) {
-	$safe_text = wp_check_invalid_utf8( $text );
-	$safe_text = _wp_specialchars( $safe_text, ENT_COMPAT );
-	$safe_text = preg_replace( '/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes( $safe_text ) );
-	$safe_text = str_replace( "\r", '', $safe_text );
-	$safe_text = str_replace( "\n", '\\n', addslashes( $safe_text ) );
+function esc_js($text) {
+	$safe_text = wp_check_invalid_utf8($text);
+	$safe_text = _wp_specialchars($safe_text, ENT_COMPAT);
+	$safe_text = preg_replace('/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes($safe_text));
+	$safe_text = str_replace("\r", '', $safe_text);
+	$safe_text = str_replace("\n", '\\n', addslashes($safe_text));
 	/**
 	 * Filters a string cleaned and escaped for output in JavaScript.
 	 *
@@ -3893,7 +3893,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'js_escape', $safe_text, $text );
+	return apply_filters('js_escape', $safe_text, $text);
 }
 
 /**
@@ -3904,9 +3904,9 @@ 
  * @param string $text
  * @return string
  */
-function esc_html( $text ) {
-	$safe_text = wp_check_invalid_utf8( $text );
-	$safe_text = _wp_specialchars( $safe_text, ENT_QUOTES );
+function esc_html($text) {
+	$safe_text = wp_check_invalid_utf8($text);
+	$safe_text = _wp_specialchars($safe_text, ENT_QUOTES);
 	/**
 	 * Filters a string cleaned and escaped for output in HTML.
 	 *
@@ -3918,7 +3918,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'esc_html', $safe_text, $text );
+	return apply_filters('esc_html', $safe_text, $text);
 }
 
 /**
@@ -3929,9 +3929,9 @@ 
  * @param string $text
  * @return string
  */
-function esc_attr( $text ) {
-	$safe_text = wp_check_invalid_utf8( $text );
-	$safe_text = _wp_specialchars( $safe_text, ENT_QUOTES );
+function esc_attr($text) {
+	$safe_text = wp_check_invalid_utf8($text);
+	$safe_text = _wp_specialchars($safe_text, ENT_QUOTES);
 	/**
 	 * Filters a string cleaned and escaped for output in an HTML attribute.
 	 *
@@ -3943,7 +3943,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'attribute_escape', $safe_text, $text );
+	return apply_filters('attribute_escape', $safe_text, $text);
 }
 
 /**
@@ -3954,8 +3954,8 @@ 
  * @param string $text
  * @return string
  */
-function esc_textarea( $text ) {
-	$safe_text = htmlspecialchars( $text, ENT_QUOTES, get_option( 'blog_charset' ) );
+function esc_textarea($text) {
+	$safe_text = htmlspecialchars($text, ENT_QUOTES, get_option('blog_charset'));
 	/**
 	 * Filters a string cleaned and escaped for output in a textarea element.
 	 *
@@ -3964,7 +3964,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'esc_textarea', $safe_text, $text );
+	return apply_filters('esc_textarea', $safe_text, $text);
 }
 
 /**
@@ -3975,8 +3975,8 @@ 
  * @param string $tag_name
  * @return string
  */
-function tag_escape( $tag_name ) {
-	$safe_tag = strtolower( preg_replace('/[^a-zA-Z0-9_:]/', '', $tag_name) );
+function tag_escape($tag_name) {
+	$safe_tag = strtolower(preg_replace('/[^a-zA-Z0-9_:]/', '', $tag_name));
 	/**
 	 * Filters a string cleaned and escaped for output as an HTML tag.
 	 *
@@ -3985,7 +3985,7 @@ 
 	 * @param string $safe_tag The tag name after it has been escaped.
  	 * @param string $tag_name The text before it was escaped.
 	 */
-	return apply_filters( 'tag_escape', $safe_tag, $tag_name );
+	return apply_filters('tag_escape', $safe_tag, $tag_name);
 }
 
 /**
@@ -4000,8 +4000,8 @@ 
  * @param string $link Full URL path.
  * @return string Absolute path.
  */
-function wp_make_link_relative( $link ) {
-	return preg_replace( '|^(https?:)?//[^/]+(/?.*)|i', '$2', $link );
+function wp_make_link_relative($link) {
+	return preg_replace('|^(https?:)?//[^/]+(/?.*)|i', '$2', $link);
 }
 
 /**
@@ -4018,22 +4018,22 @@ 
  * @param string $value  The unsanitised value.
  * @return string Sanitized value.
  */
-function sanitize_option( $option, $value ) {
+function sanitize_option($option, $value) {
 	global $wpdb;
 
 	$original_value = $value;
 	$error = '';
 
-	switch ( $option ) {
+	switch ($option) {
 		case 'admin_email' :
 		case 'new_admin_email' :
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = sanitize_email( $value );
-				if ( ! is_email( $value ) ) {
-					$error = __( 'The email address entered did not appear to be a valid email address. Please enter a valid email address.' );
+				$value = sanitize_email($value);
+				if ( ! is_email($value)) {
+					$error = __('The email address entered did not appear to be a valid email address. Please enter a valid email address.');
 				}
 			}
 			break;
@@ -4060,36 +4060,36 @@ 
 		case 'users_can_register':
 		case 'start_of_week':
 		case 'site_icon':
-			$value = absint( $value );
+			$value = absint($value);
 			break;
 
 		case 'posts_per_page':
 		case 'posts_per_rss':
 			$value = (int) $value;
-			if ( empty($value) )
+			if (empty($value))
 				$value = 1;
-			if ( $value < -1 )
+			if ($value < -1)
 				$value = abs($value);
 			break;
 
 		case 'default_ping_status':
 		case 'default_comment_status':
 			// Options that if not there have 0 value but need to be something like "closed"
-			if ( $value == '0' || $value == '')
+			if ($value == '0' || $value == '')
 				$value = 'closed';
 			break;
 
 		case 'blogdescription':
 		case 'blogname':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( $value !== $original_value ) {
-				$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', wp_encode_emoji( $original_value ) );
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if ($value !== $original_value) {
+				$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', wp_encode_emoji($original_value));
 			}
 
-			if ( is_wp_error( $value ) ) {
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = esc_html( $value );
+				$value = esc_html($value);
 			}
 			break;
 
@@ -4099,10 +4099,10 @@ 
 
 		case 'blog_public':
 			// This is the value if the settings checkbox is not checked on POST. Don't rely on this.
-			if ( null === $value )
+			if (null === $value)
 				$value = 1;
 			else
-				$value = intval( $value );
+				$value = intval($value);
 			break;
 
 		case 'date_format':
@@ -4111,20 +4111,20 @@ 
 		case 'mailserver_login':
 		case 'mailserver_pass':
 		case 'upload_path':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = strip_tags( $value );
-				$value = wp_kses_data( $value );
+				$value = strip_tags($value);
+				$value = wp_kses_data($value);
 			}
 			break;
 
 		case 'ping_sites':
-			$value = explode( "\n", $value );
-			$value = array_filter( array_map( 'trim', $value ) );
-			$value = array_filter( array_map( 'esc_url_raw', $value ) );
-			$value = implode( "\n", $value );
+			$value = explode("\n", $value);
+			$value = array_filter(array_map('trim', $value));
+			$value = array_filter(array_map('esc_url_raw', $value));
+			$value = implode("\n", $value);
 			break;
 
 		case 'gmt_offset':
@@ -4132,128 +4132,128 @@ 
 			break;
 
 		case 'siteurl':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
-					$value = esc_url_raw( $value );
+				if (preg_match('#http(s?)://(.+)#i', $value)) {
+					$value = esc_url_raw($value);
 				} else {
-					$error = __( 'The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL.' );
+					$error = __('The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL.');
 				}
 			}
 			break;
 
 		case 'home':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
-					$value = esc_url_raw( $value );
+				if (preg_match('#http(s?)://(.+)#i', $value)) {
+					$value = esc_url_raw($value);
 				} else {
-					$error = __( 'The Site address you entered did not appear to be a valid URL. Please enter a valid URL.' );
+					$error = __('The Site address you entered did not appear to be a valid URL. Please enter a valid URL.');
 				}
 			}
 			break;
 
 		case 'WPLANG':
 			$allowed = get_available_languages();
-			if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG ) {
+			if ( ! is_multisite() && defined('WPLANG') && '' !== WPLANG && 'en_US' !== WPLANG) {
 				$allowed[] = WPLANG;
 			}
-			if ( ! in_array( $value, $allowed ) && ! empty( $value ) ) {
-				$value = get_option( $option );
+			if ( ! in_array($value, $allowed) && ! empty($value)) {
+				$value = get_option($option);
 			}
 			break;
 
 		case 'illegal_names':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( ' ', $value );
+				if ( ! is_array($value))
+					$value = explode(' ', $value);
 
-				$value = array_values( array_filter( array_map( 'trim', $value ) ) );
+				$value = array_values(array_filter(array_map('trim', $value)));
 
-				if ( ! $value )
+				if ( ! $value)
 					$value = '';
 			}
 			break;
 
 		case 'limited_email_domains':
 		case 'banned_email_domains':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( "\n", $value );
+				if ( ! is_array($value))
+					$value = explode("\n", $value);
 
-				$domains = array_values( array_filter( array_map( 'trim', $value ) ) );
+				$domains = array_values(array_filter(array_map('trim', $value)));
 				$value = array();
 
-				foreach ( $domains as $domain ) {
-					if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) ) {
+				foreach ($domains as $domain) {
+					if ( ! preg_match('/(--|\.\.)/', $domain) && preg_match('|^([a-zA-Z0-9-\.])+$|', $domain)) {
 						$value[] = $domain;
 					}
 				}
-				if ( ! $value )
+				if ( ! $value)
 					$value = '';
 			}
 			break;
 
 		case 'timezone_string':
 			$allowed_zones = timezone_identifiers_list();
-			if ( ! in_array( $value, $allowed_zones ) && ! empty( $value ) ) {
-				$error = __( 'The timezone you have entered is not valid. Please select a valid timezone.' );
+			if ( ! in_array($value, $allowed_zones) && ! empty($value)) {
+				$error = __('The timezone you have entered is not valid. Please select a valid timezone.');
 			}
 			break;
 
 		case 'permalink_structure':
 		case 'category_base':
 		case 'tag_base':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = esc_url_raw( $value );
-				$value = str_replace( 'http://', '', $value );
+				$value = esc_url_raw($value);
+				$value = str_replace('http://', '', $value);
 			}
 
-			if ( 'permalink_structure' === $option && '' !== $value && ! preg_match( '/%[^\/%]+%/', $value ) ) {
+			if ('permalink_structure' === $option && '' !== $value && ! preg_match('/%[^\/%]+%/', $value)) {
 				$error = sprintf(
 					/* translators: %s: Codex URL */
-					__( 'A structure tag is required when using custom permalinks. <a href="%s">Learn more</a>' ),
-					__( 'https://codex.wordpress.org/Using_Permalinks#Choosing_your_permalink_structure' )
+					__('A structure tag is required when using custom permalinks. <a href="%s">Learn more</a>'),
+					__('https://codex.wordpress.org/Using_Permalinks#Choosing_your_permalink_structure')
 				);
 			}
 			break;
 
 		case 'default_role' :
-			if ( ! get_role( $value ) && get_role( 'subscriber' ) )
+			if ( ! get_role($value) && get_role('subscriber'))
 				$value = 'subscriber';
 			break;
 
 		case 'moderation_keys':
 		case 'blacklist_keys':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = explode( "\n", $value );
-				$value = array_filter( array_map( 'trim', $value ) );
-				$value = array_unique( $value );
-				$value = implode( "\n", $value );
+				$value = explode("\n", $value);
+				$value = array_filter(array_map('trim', $value));
+				$value = array_unique($value);
+				$value = implode("\n", $value);
 			}
 			break;
 	}
 
-	if ( ! empty( $error ) ) {
-		$value = get_option( $option );
-		if ( function_exists( 'add_settings_error' ) ) {
-			add_settings_error( $option, "invalid_{$option}", $error );
+	if ( ! empty($error)) {
+		$value = get_option($option);
+		if (function_exists('add_settings_error')) {
+			add_settings_error($option, "invalid_{$option}", $error);
 		}
 	}
 
@@ -4267,7 +4267,7 @@ 
 	 * @param string $option         The option name.
 	 * @param string $original_value The original value passed to the function.
 	 */
-	return apply_filters( "sanitize_option_{$option}", $value, $option, $original_value );
+	return apply_filters("sanitize_option_{$option}", $value, $option, $original_value);
 }
 
 /**
@@ -4281,18 +4281,18 @@ 
  * @param callable $callback The function to map onto $value.
  * @return mixed The value with the callback applied to all non-arrays and non-objects inside it.
  */
-function map_deep( $value, $callback ) {
-	if ( is_array( $value ) ) {
-		foreach ( $value as $index => $item ) {
-			$value[ $index ] = map_deep( $item, $callback );
+function map_deep($value, $callback) {
+	if (is_array($value)) {
+		foreach ($value as $index => $item) {
+			$value[$index] = map_deep($item, $callback);
 		}
-	} elseif ( is_object( $value ) ) {
-		$object_vars = get_object_vars( $value );
-		foreach ( $object_vars as $property_name => $property_value ) {
-			$value->$property_name = map_deep( $property_value, $callback );
+	} elseif (is_object($value)) {
+		$object_vars = get_object_vars($value);
+		foreach ($object_vars as $property_name => $property_value) {
+			$value->$property_name = map_deep($property_value, $callback);
 		}
 	} else {
-		$value = call_user_func( $callback, $value );
+		$value = call_user_func($callback, $value);
 	}
 
 	return $value;
@@ -4309,10 +4309,10 @@ 
  * @param string $string The string to be parsed.
  * @param array  $array  Variables will be stored in this array.
  */
-function wp_parse_str( $string, &$array ) {
-	parse_str( $string, $array );
-	if ( get_magic_quotes_gpc() )
-		$array = stripslashes_deep( $array );
+function wp_parse_str($string, &$array) {
+	parse_str($string, $array);
+	if (get_magic_quotes_gpc())
+		$array = stripslashes_deep($array);
 	/**
 	 * Filters the array of variables derived from a parsed string.
 	 *
@@ -4320,7 +4320,7 @@ 
 	 *
 	 * @param array $array The array populated with variables.
 	 */
-	$array = apply_filters( 'wp_parse_str', $array );
+	$array = apply_filters('wp_parse_str', $array);
 }
 
 /**
@@ -4333,7 +4333,7 @@ 
  * @param string $text Text to be converted.
  * @return string Converted text.
  */
-function wp_pre_kses_less_than( $text ) {
+function wp_pre_kses_less_than($text) {
 	return preg_replace_callback('%<[^>]*?((?=<)|>|$)%', 'wp_pre_kses_less_than_callback', $text);
 }
 
@@ -4345,8 +4345,8 @@ 
  * @param array $matches Populated by matches to preg_replace.
  * @return string The text returned after esc_html if needed.
  */
-function wp_pre_kses_less_than_callback( $matches ) {
-	if ( false === strpos($matches[0], '>') )
+function wp_pre_kses_less_than_callback($matches) {
+	if (false === strpos($matches[0], '>'))
 		return esc_html($matches[0]);
 	return $matches[0];
 }
@@ -4361,21 +4361,21 @@ 
  * @param mixed  $args ,... Arguments to be formatted into the $pattern string.
  * @return string The formatted string.
  */
-function wp_sprintf( $pattern ) {
+function wp_sprintf($pattern) {
 	$args = func_get_args();
 	$len = strlen($pattern);
 	$start = 0;
 	$result = '';
 	$arg_index = 0;
-	while ( $len > $start ) {
+	while ($len > $start) {
 		// Last character: append and break
-		if ( strlen($pattern) - 1 == $start ) {
+		if (strlen($pattern) - 1 == $start) {
 			$result .= substr($pattern, -1);
 			break;
 		}
 
 		// Literal %: append and continue
-		if ( substr($pattern, $start, 2) == '%%' ) {
+		if (substr($pattern, $start, 2) == '%%') {
 			$start += 2;
 			$result .= '%';
 			continue;
@@ -4383,14 +4383,14 @@ 
 
 		// Get fragment before next %
 		$end = strpos($pattern, '%', $start + 1);
-		if ( false === $end )
+		if (false === $end)
 			$end = $len;
 		$fragment = substr($pattern, $start, $end - $start);
 
 		// Fragment has a specifier
-		if ( $pattern[$start] == '%' ) {
+		if ($pattern[$start] == '%') {
 			// Find numbered arguments or take the next one in order
-			if ( preg_match('/^%(\d+)\$/', $fragment, $matches) ) {
+			if (preg_match('/^%(\d+)\$/', $fragment, $matches)) {
 				$arg = isset($args[$matches[1]]) ? $args[$matches[1]] : '';
 				$fragment = str_replace("%{$matches[1]}$", '%', $fragment);
 			} else {
@@ -4408,11 +4408,11 @@ 
 			 * @param string $fragment A fragment from the pattern.
 			 * @param string $arg      The argument.
 			 */
-			$_fragment = apply_filters( 'wp_sprintf', $fragment, $arg );
-			if ( $_fragment != $fragment )
+			$_fragment = apply_filters('wp_sprintf', $fragment, $arg);
+			if ($_fragment != $fragment)
 				$fragment = $_fragment;
 			else
-				$fragment = sprintf($fragment, strval($arg) );
+				$fragment = sprintf($fragment, strval($arg));
 		}
 
 		// Append to result and move to next fragment
@@ -4435,13 +4435,13 @@ 
  * @param array  $args    List items to prepend to the content and replace '%l'.
  * @return string Localized list items and rest of the content.
  */
-function wp_sprintf_l( $pattern, $args ) {
+function wp_sprintf_l($pattern, $args) {
 	// Not a match
-	if ( substr($pattern, 0, 2) != '%l' )
+	if (substr($pattern, 0, 2) != '%l')
 		return $pattern;
 
 	// Nothing to work with
-	if ( empty($args) )
+	if (empty($args))
 		return '';
 
 	/**
@@ -4455,30 +4455,30 @@ 
 	 *
 	 * @param array $delimiters An array of translated delimiters.
 	 */
-	$l = apply_filters( 'wp_sprintf_l', array(
+	$l = apply_filters('wp_sprintf_l', array(
 		/* translators: used to join items in a list with more than 2 items */
-		'between'          => sprintf( __('%s, %s'), '', '' ),
+		'between'          => sprintf(__('%s, %s'), '', ''),
 		/* translators: used to join last two items in a list with more than 2 times */
-		'between_last_two' => sprintf( __('%s, and %s'), '', '' ),
+		'between_last_two' => sprintf(__('%s, and %s'), '', ''),
 		/* translators: used to join items in a list with only 2 items */
-		'between_only_two' => sprintf( __('%s and %s'), '', '' ),
-	) );
+		'between_only_two' => sprintf(__('%s and %s'), '', ''),
+	));
 
 	$args = (array) $args;
 	$result = array_shift($args);
-	if ( count($args) == 1 )
-		$result .= $l['between_only_two'] . array_shift($args);
+	if (count($args) == 1)
+		$result .= $l['between_only_two'].array_shift($args);
 	// Loop when more than two args
 	$i = count($args);
-	while ( $i ) {
+	while ($i) {
 		$arg = array_shift($args);
 		$i--;
-		if ( 0 == $i )
-			$result .= $l['between_last_two'] . $arg;
+		if (0 == $i)
+			$result .= $l['between_last_two'].$arg;
 		else
-			$result .= $l['between'] . $arg;
+			$result .= $l['between'].$arg;
 	}
-	return $result . substr($pattern, 2);
+	return $result.substr($pattern, 2);
 }
 
 /**
@@ -4495,15 +4495,15 @@ 
  * @param string $more  Optional. What to append if $str needs to be trimmed. Defaults to empty string.
  * @return string The excerpt.
  */
-function wp_html_excerpt( $str, $count, $more = null ) {
-	if ( null === $more )
+function wp_html_excerpt($str, $count, $more = null) {
+	if (null === $more)
 		$more = '';
-	$str = wp_strip_all_tags( $str, true );
-	$excerpt = mb_substr( $str, 0, $count );
+	$str = wp_strip_all_tags($str, true);
+	$excerpt = mb_substr($str, 0, $count);
 	// remove part of an entity at the end
-	$excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
-	if ( $str != $excerpt )
-		$excerpt = trim( $excerpt ) . $more;
+	$excerpt = preg_replace('/&[^;\s]{0,6}$/', '', $excerpt);
+	if ($str != $excerpt)
+		$excerpt = trim($excerpt).$more;
 	return $excerpt;
 }
 
@@ -4522,11 +4522,11 @@ 
  * @param array  $attrs   The attributes which should be processed.
  * @return string The processed content.
  */
-function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) {
+function links_add_base_url($content, $base, $attrs = array('src', 'href')) {
 	global $_links_add_base;
 	$_links_add_base = $base;
-	$attrs = implode('|', (array)$attrs);
-	return preg_replace_callback( "!($attrs)=(['\"])(.+?)\\2!i", '_links_add_base', $content );
+	$attrs = implode('|', (array) $attrs);
+	return preg_replace_callback("!($attrs)=(['\"])(.+?)\\2!i", '_links_add_base', $content);
 }
 
 /**
@@ -4540,13 +4540,12 @@ 
  * @param string $m The matched link.
  * @return string The processed link.
  */
-function _links_add_base( $m ) {
+function _links_add_base($m) {
 	global $_links_add_base;
 	//1 = attribute name  2 = quotation mark  3 = URL
-	return $m[1] . '=' . $m[2] .
-		( preg_match( '#^(\w{1,20}):#', $m[3], $protocol ) && in_array( $protocol[1], wp_allowed_protocols() ) ?
-			$m[3] :
-			WP_Http::make_absolute_url( $m[3], $_links_add_base )
+	return $m[1].'='.$m[2].
+		(preg_match('#^(\w{1,20}):#', $m[3], $protocol) && in_array($protocol[1], wp_allowed_protocols()) ?
+			$m[3] : WP_Http::make_absolute_url($m[3], $_links_add_base)
 		)
 		. $m[2];
 }
@@ -4568,11 +4567,11 @@ 
  * @param array  $tags    An array of tags to apply to.
  * @return string The processed content.
  */
-function links_add_target( $content, $target = '_blank', $tags = array('a') ) {
+function links_add_target($content, $target = '_blank', $tags = array('a')) {
 	global $_links_add_target;
 	$_links_add_target = $target;
-	$tags = implode('|', (array)$tags);
-	return preg_replace_callback( "!<($tags)([^>]*)>!i", '_links_add_target', $content );
+	$tags = implode('|', (array) $tags);
+	return preg_replace_callback("!<($tags)([^>]*)>!i", '_links_add_target', $content);
 }
 
 /**
@@ -4586,11 +4585,11 @@ 
  * @param string $m The matched link.
  * @return string The processed link.
  */
-function _links_add_target( $m ) {
+function _links_add_target($m) {
 	global $_links_add_target;
 	$tag = $m[1];
 	$link = preg_replace('|( target=([\'"])(.*?)\2)|i', '', $m[2]);
-	return '<' . $tag . $link . ' target="' . esc_attr( $_links_add_target ) . '">';
+	return '<'.$tag.$link.' target="'.esc_attr($_links_add_target).'">';
 }
 
 /**
@@ -4601,10 +4600,10 @@ 
  * @param string $str The string to normalize.
  * @return string The normalized string.
  */
-function normalize_whitespace( $str ) {
-	$str  = trim( $str );
-	$str  = str_replace( "\r", "\n", $str );
-	$str  = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $str );
+function normalize_whitespace($str) {
+	$str  = trim($str);
+	$str  = str_replace("\r", "\n", $str);
+	$str  = preg_replace(array('/\n+/', '/[ \t]+/'), array("\n", ' '), $str);
 	return $str;
 }
 
@@ -4622,13 +4621,13 @@ 
  * @return string The processed string.
  */
 function wp_strip_all_tags($string, $remove_breaks = false) {
-	$string = preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $string );
+	$string = preg_replace('@<(script|style)[^>]*?>.*?</\\1>@si', '', $string);
 	$string = strip_tags($string);
 
-	if ( $remove_breaks )
+	if ($remove_breaks)
 		$string = preg_replace('/[\r\n\t ]+/', ' ', $string);
 
-	return trim( $string );
+	return trim($string);
 }
 
 /**
@@ -4648,26 +4647,26 @@ 
  * @param string $str String to sanitize.
  * @return string Sanitized string.
  */
-function sanitize_text_field( $str ) {
-	$filtered = wp_check_invalid_utf8( $str );
+function sanitize_text_field($str) {
+	$filtered = wp_check_invalid_utf8($str);
 
-	if ( strpos($filtered, '<') !== false ) {
-		$filtered = wp_pre_kses_less_than( $filtered );
+	if (strpos($filtered, '<') !== false) {
+		$filtered = wp_pre_kses_less_than($filtered);
 		// This will strip extra whitespace for us.
-		$filtered = wp_strip_all_tags( $filtered, true );
+		$filtered = wp_strip_all_tags($filtered, true);
 	} else {
-		$filtered = trim( preg_replace('/[\r\n\t ]+/', ' ', $filtered) );
+		$filtered = trim(preg_replace('/[\r\n\t ]+/', ' ', $filtered));
 	}
 
 	$found = false;
-	while ( preg_match('/%[a-f0-9]{2}/i', $filtered, $match) ) {
+	while (preg_match('/%[a-f0-9]{2}/i', $filtered, $match)) {
 		$filtered = str_replace($match[0], '', $filtered);
 		$found = true;
 	}
 
-	if ( $found ) {
+	if ($found) {
 		// Strip out the whitespace that may now exist after removing the octets.
-		$filtered = trim( preg_replace('/ +/', ' ', $filtered) );
+		$filtered = trim(preg_replace('/ +/', ' ', $filtered));
 	}
 
 	/**
@@ -4678,7 +4677,7 @@ 
 	 * @param string $filtered The sanitized string.
 	 * @param string $str      The string prior to being sanitized.
 	 */
-	return apply_filters( 'sanitize_text_field', $filtered, $str );
+	return apply_filters('sanitize_text_field', $filtered, $str);
 }
 
 /**
@@ -4690,8 +4689,8 @@ 
  * @param string $suffix If the filename ends in suffix this will also be cut off.
  * @return string
  */
-function wp_basename( $path, $suffix = '' ) {
-	return urldecode( basename( str_replace( array( '%2F', '%5C' ), '/', urlencode( $path ) ), $suffix ) );
+function wp_basename($path, $suffix = '') {
+	return urldecode(basename(str_replace(array('%2F', '%5C'), '/', urlencode($path)), $suffix));
 }
 
 /**
@@ -4706,19 +4705,19 @@ 
  * @param string $text The text to be modified.
  * @return string The modified text.
  */
-function capital_P_dangit( $text ) {
+function capital_P_dangit($text) {
 	// Simple replacement for titles
 	$current_filter = current_filter();
-	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter )
-		return str_replace( 'Wordpress', 'WordPress', $text );
+	if ('the_title' === $current_filter || 'wp_title' === $current_filter)
+		return str_replace('Wordpress', 'WordPress', $text);
 	// Still here? Use the more judicious replacement
 	static $dblq = false;
-	if ( false === $dblq ) {
-		$dblq = _x( '&#8220;', 'opening curly double quote' );
+	if (false === $dblq) {
+		$dblq = _x('&#8220;', 'opening curly double quote');
 	}
 	return str_replace(
-		array( ' Wordpress', '&#8216;Wordpress', $dblq . 'Wordpress', '>Wordpress', '(Wordpress' ),
-		array( ' WordPress', '&#8216;WordPress', $dblq . 'WordPress', '>WordPress', '(WordPress' ),
+		array(' Wordpress', '&#8216;Wordpress', $dblq.'Wordpress', '>Wordpress', '(Wordpress'),
+		array(' WordPress', '&#8216;WordPress', $dblq.'WordPress', '>WordPress', '(WordPress'),
 	$text );
 }
 
@@ -4730,8 +4729,8 @@ 
  * @param string $mime_type Mime type
  * @return string Sanitized mime type
  */
-function sanitize_mime_type( $mime_type ) {
-	$sani_mime_type = preg_replace( '/[^-+*.a-zA-Z0-9\/]/', '', $mime_type );
+function sanitize_mime_type($mime_type) {
+	$sani_mime_type = preg_replace('/[^-+*.a-zA-Z0-9\/]/', '', $mime_type);
 	/**
 	 * Filters a mime type following sanitization.
 	 *
@@ -4740,7 +4739,7 @@ 
 	 * @param string $sani_mime_type The sanitized mime type.
 	 * @param string $mime_type      The mime type prior to sanitization.
 	 */
-	return apply_filters( 'sanitize_mime_type', $sani_mime_type, $mime_type );
+	return apply_filters('sanitize_mime_type', $sani_mime_type, $mime_type);
 }
 
 /**
@@ -4751,14 +4750,14 @@ 
  * @param string $to_ping Space or carriage return separated URLs
  * @return string URLs starting with the http or https protocol, separated by a carriage return.
  */
-function sanitize_trackback_urls( $to_ping ) {
-	$urls_to_ping = preg_split( '/[\r\n\t ]/', trim( $to_ping ), -1, PREG_SPLIT_NO_EMPTY );
-	foreach ( $urls_to_ping as $k => $url ) {
-		if ( !preg_match( '#^https?://.#i', $url ) )
-			unset( $urls_to_ping[$k] );
+function sanitize_trackback_urls($to_ping) {
+	$urls_to_ping = preg_split('/[\r\n\t ]/', trim($to_ping), -1, PREG_SPLIT_NO_EMPTY);
+	foreach ($urls_to_ping as $k => $url) {
+		if ( ! preg_match('#^https?://.#i', $url))
+			unset($urls_to_ping[$k]);
 	}
-	$urls_to_ping = array_map( 'esc_url_raw', $urls_to_ping );
-	$urls_to_ping = implode( "\n", $urls_to_ping );
+	$urls_to_ping = array_map('esc_url_raw', $urls_to_ping);
+	$urls_to_ping = implode("\n", $urls_to_ping);
 	/**
 	 * Filters a list of trackback URLs following sanitization.
 	 *
@@ -4770,7 +4769,7 @@ 
 	 * @param string $urls_to_ping Sanitized space or carriage return separated URLs.
 	 * @param string $to_ping      Space or carriage return separated URLs before sanitization.
 	 */
-	return apply_filters( 'sanitize_trackback_urls', $urls_to_ping, $to_ping );
+	return apply_filters('sanitize_trackback_urls', $urls_to_ping, $to_ping);
 }
 
 /**
@@ -4784,17 +4783,17 @@ 
  * @param string|array $value String or array of strings to slash.
  * @return string|array Slashed $value
  */
-function wp_slash( $value ) {
-	if ( is_array( $value ) ) {
-		foreach ( $value as $k => $v ) {
-			if ( is_array( $v ) ) {
-				$value[$k] = wp_slash( $v );
+function wp_slash($value) {
+	if (is_array($value)) {
+		foreach ($value as $k => $v) {
+			if (is_array($v)) {
+				$value[$k] = wp_slash($v);
 			} else {
-				$value[$k] = addslashes( $v );
+				$value[$k] = addslashes($v);
 			}
 		}
 	} else {
-		$value = addslashes( $value );
+		$value = addslashes($value);
 	}
 
 	return $value;
@@ -4811,8 +4810,8 @@ 
  * @param string|array $value String or array of strings to unslash.
  * @return string|array Unslashed $value
  */
-function wp_unslash( $value ) {
-	return stripslashes_deep( $value );
+function wp_unslash($value) {
+	return stripslashes_deep($value);
 }
 
 /**
@@ -4823,13 +4822,13 @@ 
  * @param string $content A string which might contain a URL.
  * @return string|false The found URL.
  */
-function get_url_in_content( $content ) {
-	if ( empty( $content ) ) {
+function get_url_in_content($content) {
+	if (empty($content)) {
 		return false;
 	}
 
-	if ( preg_match( '/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches ) ) {
-		return esc_url_raw( $matches[2] );
+	if (preg_match('/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches)) {
+		return esc_url_raw($matches[2]);
 	}
 
 	return false;
@@ -4851,7 +4850,7 @@ 
 function wp_spaces_regexp() {
 	static $spaces = '';
 
-	if ( empty( $spaces ) ) {
+	if (empty($spaces)) {
 		/**
 		 * Filters the regexp for common whitespace characters.
 		 *
@@ -4864,7 +4863,7 @@ 
 		 *
 		 * @param string $spaces Regexp pattern for matching common whitespace characters.
 		 */
-		$spaces = apply_filters( 'wp_spaces_regexp', '[\r\n\t ]|\xC2\xA0|&nbsp;' );
+		$spaces = apply_filters('wp_spaces_regexp', '[\r\n\t ]|\xC2\xA0|&nbsp;');
 	}
 
 	return $spaces;
@@ -4880,7 +4879,7 @@ 
 function print_emoji_styles() {
 	static $printed = false;
 
-	if ( $printed ) {
+	if ($printed) {
 		return;
 	}
 
@@ -4912,7 +4911,7 @@ 
 function print_emoji_detection_script() {
 	static $printed = false;
 
-	if ( $printed ) {
+	if ($printed) {
 		return;
 	}
 
@@ -4941,7 +4940,7 @@ 
 		 *
 		 * @param string The emoji base URL for png images.
 		 */
-		'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2/72x72/' ),
+		'baseUrl' => apply_filters('emoji_url', 'https://s.w.org/images/core/emoji/2/72x72/'),
 
 		/**
 		 * Filters the extension of the emoji png files.
@@ -4950,7 +4949,7 @@ 
 		 *
 		 * @param string The emoji extension for png files. Default .png.
 		 */
-		'ext' => apply_filters( 'emoji_ext', '.png' ),
+		'ext' => apply_filters('emoji_ext', '.png'),
 
 		/**
 		 * Filters the URL where emoji SVG images are hosted.
@@ -4959,7 +4958,7 @@ 
 		 *
 		 * @param string The emoji base URL for svg images.
 		 */
-		'svgUrl' => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2/svg/' ),
+		'svgUrl' => apply_filters('emoji_svg_url', 'https://s.w.org/images/core/emoji/2/svg/'),
 
 		/**
 		 * Filters the extension of the emoji SVG files.
@@ -4968,29 +4967,29 @@ 
 		 *
 		 * @param string The emoji extension for svg files. Default .svg.
 		 */
-		'svgExt' => apply_filters( 'emoji_svg_ext', '.svg' ),
+		'svgExt' => apply_filters('emoji_svg_ext', '.svg'),
 	);
 
-	$version = 'ver=' . $wp_version;
+	$version = 'ver='.$wp_version;
 
-	if ( SCRIPT_DEBUG ) {
+	if (SCRIPT_DEBUG) {
 		$settings['source'] = array(
 			/** This filter is documented in wp-includes/class.wp-scripts.php */
-			'wpemoji' => apply_filters( 'script_loader_src', includes_url( "js/wp-emoji.js?$version" ), 'wpemoji' ),
+			'wpemoji' => apply_filters('script_loader_src', includes_url("js/wp-emoji.js?$version"), 'wpemoji'),
 			/** This filter is documented in wp-includes/class.wp-scripts.php */
-			'twemoji' => apply_filters( 'script_loader_src', includes_url( "js/twemoji.js?$version" ), 'twemoji' ),
+			'twemoji' => apply_filters('script_loader_src', includes_url("js/twemoji.js?$version"), 'twemoji'),
 		);
 
 		?>
 		<script type="text/javascript">
-			window._wpemojiSettings = <?php echo wp_json_encode( $settings ); ?>;
-			<?php readfile( ABSPATH . WPINC . "/js/wp-emoji-loader.js" ); ?>
+			window._wpemojiSettings = <?php echo wp_json_encode($settings); ?>;
+			<?php readfile(ABSPATH.WPINC."/js/wp-emoji-loader.js"); ?>
 		</script>
 		<?php
 	} else {
 		$settings['source'] = array(
 			/** This filter is documented in wp-includes/class.wp-scripts.php */
-			'concatemoji' => apply_filters( 'script_loader_src', includes_url( "js/wp-emoji-release.min.js?$version" ), 'concatemoji' ),
+			'concatemoji' => apply_filters('script_loader_src', includes_url("js/wp-emoji-release.min.js?$version"), 'concatemoji'),
 		);
 
 		/*
@@ -5005,7 +5004,7 @@ 
 		 */
 		?>
 		<script type="text/javascript">
-			window._wpemojiSettings = <?php echo wp_json_encode( $settings ); ?>;
+			window._wpemojiSettings = <?php echo wp_json_encode($settings); ?>;
 			include "js/wp-emoji-loader.min.js"
 		</script>
 		<?php
@@ -5025,8 +5024,8 @@ 
  * @param string $content The content to encode.
  * @return string The encoded content.
  */
-function wp_encode_emoji( $content ) {
-	if ( function_exists( 'mb_convert_encoding' ) ) {
+function wp_encode_emoji($content) {
+	if (function_exists('mb_convert_encoding')) {
 		$regex = '/(
 		     \x23\xE2\x83\xA3               # Digits
 		     [\x30-\x39]\xE2\x83\xA3
@@ -5038,18 +5037,18 @@ 
 		)/x';
 
 		$matches = array();
-		if ( preg_match_all( $regex, $content, $matches ) ) {
-			if ( ! empty( $matches[1] ) ) {
-				foreach ( $matches[1] as $emoji ) {
+		if (preg_match_all($regex, $content, $matches)) {
+			if ( ! empty($matches[1])) {
+				foreach ($matches[1] as $emoji) {
 					/*
 					 * UTF-32's hex encoding is the same as HTML's hex encoding.
 					 * So, by converting the emoji from UTF-8 to UTF-32, we magically
 					 * get the correct hex encoding.
 					 */
-					$unpacked = unpack( 'H*', mb_convert_encoding( $emoji, 'UTF-32', 'UTF-8' ) );
-					if ( isset( $unpacked[1] ) ) {
-						$entity = '&#x' . ltrim( $unpacked[1], '0' ) . ';';
-						$content = str_replace( $emoji, $entity, $content );
+					$unpacked = unpack('H*', mb_convert_encoding($emoji, 'UTF-32', 'UTF-8'));
+					if (isset($unpacked[1])) {
+						$entity = '&#x'.ltrim($unpacked[1], '0').';';
+						$content = str_replace($emoji, $entity, $content);
 					}
 				}
 			}
@@ -5067,14 +5066,14 @@ 
  * @param string $text The content to encode.
  * @return string The encoded content.
  */
-function wp_staticize_emoji( $text ) {
-	$text = wp_encode_emoji( $text );
+function wp_staticize_emoji($text) {
+	$text = wp_encode_emoji($text);
 
 	/** This filter is documented in wp-includes/formatting.php */
-	$cdn_url = apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2/72x72/' );
+	$cdn_url = apply_filters('emoji_url', 'https://s.w.org/images/core/emoji/2/72x72/');
 
 	/** This filter is documented in wp-includes/formatting.php */
-	$ext = apply_filters( 'emoji_ext', '.png' );
+	$ext = apply_filters('emoji_ext', '.png');
 
 	$output = '';
 	/*
@@ -5083,33 +5082,33 @@ 
 	 *
 	 * First, capture the tags as well as in between.
 	 */
-	$textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE );
-	$stop = count( $textarr );
+	$textarr = preg_split('/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+	$stop = count($textarr);
 
 	// Ignore processing of specific tags.
 	$tags_to_ignore = 'code|pre|style|script|textarea';
 	$ignore_block_element = '';
 
-	for ( $i = 0; $i < $stop; $i++ ) {
+	for ($i = 0; $i < $stop; $i++) {
 		$content = $textarr[$i];
 
 		// If we're in an ignore block, wait until we find its closing tag.
-		if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) )  {
+		if ('' == $ignore_block_element && preg_match('/^<('.$tags_to_ignore.')>/', $content, $matches)) {
 			$ignore_block_element = $matches[1];
 		}
 
 		// If it's not a tag and not in ignore block.
-		if ( '' ==  $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
+		if ('' == $ignore_block_element && strlen($content) > 0 && '<' != $content[0]) {
 			$matches = array();
-			if ( preg_match_all( '/(&#x1f1(e[6-9a-f]|f[0-9a-f]);){2}/', $content, $matches ) ) {
-				if ( ! empty( $matches[0] ) ) {
-					foreach ( $matches[0] as $flag ) {
-						$chars = str_replace( array( '&#x', ';'), '', $flag );
+			if (preg_match_all('/(&#x1f1(e[6-9a-f]|f[0-9a-f]);){2}/', $content, $matches)) {
+				if ( ! empty($matches[0])) {
+					foreach ($matches[0] as $flag) {
+						$chars = str_replace(array('&#x', ';'), '', $flag);
 
-						list( $char1, $char2 ) = str_split( $chars, 5 );
-						$entity = sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url . $char1 . '-' . $char2 . $ext, html_entity_decode( $flag ) );
+						list($char1, $char2) = str_split($chars, 5);
+						$entity = sprintf('<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url.$char1.'-'.$char2.$ext, html_entity_decode($flag));
 
-						$content = str_replace( $flag, $entity, $content );
+						$content = str_replace($flag, $entity, $content);
 					}
 				}
 			}
@@ -5118,20 +5117,20 @@ 
 			$regex = '/(&#x[2-3][0-9a-f]{3};|&#x1f[1-6][0-9a-f]{2};)/';
 
 			$matches = array();
-			if ( preg_match_all( $regex, $content, $matches ) ) {
-				if ( ! empty( $matches[1] ) ) {
-					foreach ( $matches[1] as $emoji ) {
-						$char = str_replace( array( '&#x', ';'), '', $emoji );
-						$entity = sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url . $char . $ext, html_entity_decode( $emoji ) );
+			if (preg_match_all($regex, $content, $matches)) {
+				if ( ! empty($matches[1])) {
+					foreach ($matches[1] as $emoji) {
+						$char = str_replace(array('&#x', ';'), '', $emoji);
+						$entity = sprintf('<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url.$char.$ext, html_entity_decode($emoji));
 
-						$content = str_replace( $emoji, $entity, $content );
+						$content = str_replace($emoji, $entity, $content);
 					}
 				}
 			}
 		}
 
 		// Did we exit ignore block.
-		if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content )  {
+		if ('' != $ignore_block_element && '</'.$ignore_block_element.'>' == $content) {
 			$ignore_block_element = '';
 		}
 
@@ -5149,8 +5148,8 @@ 
  * @param array $mail The email data array.
  * @return array The email data array, with emoji in the message staticized.
  */
-function wp_staticize_emoji_for_email( $mail ) {
-	if ( ! isset( $mail['message'] ) ) {
+function wp_staticize_emoji_for_email($mail) {
+	if ( ! isset($mail['message'])) {
 		return $mail;
 	}
 
@@ -5162,47 +5161,47 @@ 
 	 * is handling changing the Content-Type.
 	 */
 	$headers = array();
-	if ( isset( $mail['headers'] ) ) {
-		if ( is_array( $mail['headers'] ) ) {
+	if (isset($mail['headers'])) {
+		if (is_array($mail['headers'])) {
 			$headers = $mail['headers'];
 		} else {
-			$headers = explode( "\n", str_replace( "\r\n", "\n", $mail['headers'] ) );
+			$headers = explode("\n", str_replace("\r\n", "\n", $mail['headers']));
 		}
 	}
 
-	foreach ( $headers as $header ) {
-		if ( strpos($header, ':') === false ) {
+	foreach ($headers as $header) {
+		if (strpos($header, ':') === false) {
 			continue;
 		}
 
 		// Explode them out.
-		list( $name, $content ) = explode( ':', trim( $header ), 2 );
+		list($name, $content) = explode(':', trim($header), 2);
 
 		// Cleanup crew.
-		$name    = trim( $name    );
-		$content = trim( $content );
+		$name    = trim($name);
+		$content = trim($content);
 
-		if ( 'content-type' === strtolower( $name ) ) {
-			if ( strpos( $content, ';' ) !== false ) {
-				list( $type, $charset ) = explode( ';', $content );
-				$content_type = trim( $type );
+		if ('content-type' === strtolower($name)) {
+			if (strpos($content, ';') !== false) {
+				list($type, $charset) = explode(';', $content);
+				$content_type = trim($type);
 			} else {
-				$content_type = trim( $content );
+				$content_type = trim($content);
 			}
 			break;
 		}
 	}
 
 	// Set Content-Type if we don't have a content-type from the input headers.
-	if ( ! isset( $content_type ) ) {
+	if ( ! isset($content_type)) {
 		$content_type = 'text/plain';
 	}
 
 	/** This filter is documented in wp-includes/pluggable.php */
-	$content_type = apply_filters( 'wp_mail_content_type', $content_type );
+	$content_type = apply_filters('wp_mail_content_type', $content_type);
 
-	if ( 'text/html' === $content_type ) {
-		$mail['message'] = wp_staticize_emoji( $mail['message'] );
+	if ('text/html' === $content_type) {
+		$mail['message'] = wp_staticize_emoji($mail['message']);
 	}
 
 	return $mail;
@@ -5218,12 +5217,12 @@ 
  * @param int    $length Optional. Maximum length of the shortened URL. Default 35 characters.
  * @return string Shortened URL.
  */
-function url_shorten( $url, $length = 35 ) {
-	$stripped = str_replace( array( 'https://', 'http://', 'www.' ), '', $url );
-	$short_url = untrailingslashit( $stripped );
+function url_shorten($url, $length = 35) {
+	$stripped = str_replace(array('https://', 'http://', 'www.'), '', $url);
+	$short_url = untrailingslashit($stripped);
 
-	if ( strlen( $short_url ) > $length ) {
-		$short_url = substr( $short_url, 0, $length - 3 ) . '&hellip;';
+	if (strlen($short_url) > $length) {
+		$short_url = substr($short_url, 0, $length - 3).'&hellip;';
 	}
 	return $short_url;
 }
@@ -5239,13 +5238,13 @@ 
  * @param string $color
  * @return string|void
  */
-function sanitize_hex_color( $color ) {
-	if ( '' === $color ) {
+function sanitize_hex_color($color) {
+	if ('' === $color) {
 		return '';
 	}
 
 	// 3 or 6 hex digits, or the empty string.
-	if ( preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color ) ) {
+	if (preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color)) {
 		return $color;
 	}
 }
@@ -5264,14 +5263,14 @@ 
  * @param string $color
  * @return string|null
  */
-function sanitize_hex_color_no_hash( $color ) {
-	$color = ltrim( $color, '#' );
+function sanitize_hex_color_no_hash($color) {
+	$color = ltrim($color, '#');
 
-	if ( '' === $color ) {
+	if ('' === $color) {
 		return '';
 	}
 
-	return sanitize_hex_color( '#' . $color ) ? $color : null;
+	return sanitize_hex_color('#'.$color) ? $color : null;
 }
 
 /**
@@ -5285,9 +5284,9 @@ 
  * @param string $color
  * @return string
  */
-function maybe_hash_hex_color( $color ) {
-	if ( $unhashed = sanitize_hex_color_no_hash( $color ) ) {
-		return '#' . $unhashed;
+function maybe_hash_hex_color($color) {
+	if ($unhashed = sanitize_hex_color_no_hash($color)) {
+		return '#'.$unhashed;
 	}
 
 	return $color;

Braces +222 added lines, -139 removed lines

@@ -429,8 +429,9 @@ 
 function wpautop( $pee, $br = true ) {
 	$pre_tags = array();
 
-	if ( trim($pee) === '' )
-		return '';
+	if ( trim($pee) === '' ) {
+			return '';
+	}
 
 	// Just to make things a little easier, pad the end.
 	$pee = $pee . "\n";
@@ -565,8 +566,9 @@ 
 	$pee = preg_replace( "|\n</p>$|", '</p>', $pee );
 
 	// Replace placeholder <pre> tags with their original content.
-	if ( !empty($pre_tags) )
-		$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
+	if ( !empty($pre_tags) ) {
+			$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
+	}
 
 	// Restore newlines in all elements.
 	if ( false !== strpos( $pee, '<!-- wpnl -->' ) ) {
@@ -850,16 +852,38 @@ 
 	reset_mbstring_encoding();
 	for ($i=0; $i < $length; $i++) {
 		$c = ord($str[$i]);
-		if ($c < 0x80) $n = 0; // 0bbbbbbb
-		elseif (($c & 0xE0) == 0xC0) $n=1; // 110bbbbb
-		elseif (($c & 0xF0) == 0xE0) $n=2; // 1110bbbb
-		elseif (($c & 0xF8) == 0xF0) $n=3; // 11110bbb
-		elseif (($c & 0xFC) == 0xF8) $n=4; // 111110bb
-		elseif (($c & 0xFE) == 0xFC) $n=5; // 1111110b
-		else return false; // Does not match any model
+		if ($c < 0x80) {
+			$n = 0;
+		}
+		// 0bbbbbbb
+		elseif (($c & 0xE0) == 0xC0) {
+			$n=1;
+		}
+		// 110bbbbb
+		elseif (($c & 0xF0) == 0xE0) {
+			$n=2;
+		}
+		// 1110bbbb
+		elseif (($c & 0xF8) == 0xF0) {
+			$n=3;
+		}
+		// 11110bbb
+		elseif (($c & 0xFC) == 0xF8) {
+			$n=4;
+		}
+		// 111110bb
+		elseif (($c & 0xFE) == 0xFC) {
+			$n=5;
+		}
+		// 1111110b
+		else {
+			return false;
+		}
+		// Does not match any model
 		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
-			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
-				return false;
+			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+							return false;
+			}
 		}
 	}
 	return true;
@@ -891,18 +915,21 @@ 
 function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) )
-		return '';
+	if ( 0 === strlen( $string ) ) {
+			return '';
+	}
 
 	// Don't bother if there are no specialchars - saves some processing
-	if ( ! preg_match( '/[&<>"\']/', $string ) )
-		return $string;
+	if ( ! preg_match( '/[&<>"\']/', $string ) ) {
+			return $string;
+	}
 
 	// Account for the previous behaviour of the function when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) )
-		$quote_style = ENT_NOQUOTES;
-	elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) )
-		$quote_style = ENT_QUOTES;
+	if ( empty( $quote_style ) ) {
+			$quote_style = ENT_NOQUOTES;
+	} elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
+			$quote_style = ENT_QUOTES;
+	}
 
 	// Store the site charset as a static to avoid multiple calls to wp_load_alloptions()
 	if ( ! $charset ) {
@@ -914,8 +941,9 @@ 
 		$charset = $_charset;
 	}
 
-	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) )
-		$charset = 'UTF-8';
+	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) ) {
+			$charset = 'UTF-8';
+	}
 
 	$_quote_style = $quote_style;
 
@@ -935,8 +963,9 @@ 
 	$string = @htmlspecialchars( $string, $quote_style, $charset, $double_encode );
 
 	// Back-compat.
-	if ( 'single' === $_quote_style )
-		$string = str_replace( "'", '&#039;', $string );
+	if ( 'single' === $_quote_style ) {
+			$string = str_replace( "'", '&#039;', $string );
+	}
 
 	return $string;
 }
@@ -1084,8 +1113,9 @@ 
 		$value = ord( $utf8_string[ $i ] );
 
 		if ( $value < 128 ) {
-			if ( $length && ( $unicode_length >= $length ) )
-				break;
+			if ( $length && ( $unicode_length >= $length ) ) {
+							break;
+			}
 			$unicode .= chr($value);
 			$unicode_length++;
 		} else {
@@ -1101,8 +1131,9 @@ 
 
 			$values[] = $value;
 
-			if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length )
-				break;
+			if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length ) {
+							break;
+			}
 			if ( count( $values ) == $num_octets ) {
 				for ( $j = 0; $j < $num_octets; $j++ ) {
 					$unicode .= '%' . dechex( $values[ $j ] );
@@ -1497,8 +1528,9 @@ 
  * @return string Filtered string with replaced "nice" characters.
  */
 function remove_accents( $string ) {
-	if ( !preg_match('/[\x80-\xff]/', $string) )
-		return $string;
+	if ( !preg_match('/[\x80-\xff]/', $string) ) {
+			return $string;
+	}
 
 	if (seems_utf8($string)) {
 		$chars = array(
@@ -1804,8 +1836,9 @@ 
 					break;
 				}
 			}
-			if ( !$allowed )
-				$filename .= '_';
+			if ( !$allowed ) {
+							$filename .= '_';
+			}
 		}
 	}
 	$filename .= '.' . $extension;
@@ -1836,8 +1869,9 @@ 
 	$username = preg_replace( '/&.+?;/', '', $username ); // Kill entities
 
 	// If strict, reduce to ASCII for max portability.
-	if ( $strict )
-		$username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
+	if ( $strict ) {
+			$username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
+	}
 
 	$username = trim( $username );
 	// Consolidate contiguous whitespace
@@ -1898,8 +1932,9 @@ 
 function sanitize_title( $title, $fallback_title = '', $context = 'save' ) {
 	$raw_title = $title;
 
-	if ( 'save' == $context )
-		$title = remove_accents($title);
+	if ( 'save' == $context ) {
+			$title = remove_accents($title);
+	}
 
 	/**
 	 * Filters a sanitized title string.
@@ -1912,8 +1947,9 @@ 
 	 */
 	$title = apply_filters( 'sanitize_title', $title, $raw_title, $context );
 
-	if ( '' === $title || false === $title )
-		$title = $fallback_title;
+	if ( '' === $title || false === $title ) {
+			$title = $fallback_title;
+	}
 
 	return $title;
 }
@@ -2228,8 +2264,9 @@ 
 			elseif ( substr( $regex[2], -1 ) == '/' ) {
 				// ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such and
 				// immediately close it with a closing tag (the tag will encapsulate no text as a result)
-				if ( ! in_array( $tag, $single_tags ) )
-					$regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
+				if ( ! in_array( $tag, $single_tags ) ) {
+									$regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
+				}
 			}
 			// ElseIf it's a known single-entity tag but it doesn't close itself, do so
 			elseif ( in_array($tag, $single_tags) ) {
@@ -2247,8 +2284,9 @@ 
 
 			// Attributes
 			$attributes = $regex[2];
-			if ( ! empty( $attributes ) && $attributes[0] != '>' )
-				$attributes = ' ' . $attributes;
+			if ( ! empty( $attributes ) && $attributes[0] != '>' ) {
+							$attributes = ' ' . $attributes;
+			}
 
 			$tag = '<' . $tag . $attributes . '>';
 			//If already queuing a close tag, then put this tag on, too
@@ -2268,8 +2306,10 @@ 
 	$newtext .= $text;
 
 	// Empty Stack
-	while( $x = array_pop($tagstack) )
-		$newtext .= '</' . $x . '>'; // Add remaining tags to close
+	while( $x = array_pop($tagstack) ) {
+			$newtext .= '</' . $x . '>';
+	}
+	// Add remaining tags to close
 
 	// WP fix for the bug with HTML comments
 	$newtext = str_replace("< !--","<!--",$newtext);
@@ -2303,8 +2343,9 @@ 
 	 * @param string $content The text, prior to formatting for editing.
 	 */
 	$content = apply_filters( 'format_to_edit', $content );
-	if ( ! $rich_text )
-		$content = esc_textarea( $content );
+	if ( ! $rich_text ) {
+			$content = esc_textarea( $content );
+	}
 	return $content;
 }
 
@@ -2338,8 +2379,9 @@ 
  * @return string String with backslashes inserted.
  */
 function backslashit( $string ) {
-	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' )
-		$string = '\\\\' . $string;
+	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' ) {
+			$string = '\\\\' . $string;
+	}
 	return addcslashes( $string, 'A..Za..z' );
 }
 
@@ -2388,8 +2430,9 @@ 
  * @return string Returns a string escaped with slashes.
  */
 function addslashes_gpc($gpc) {
-	if ( get_magic_quotes_gpc() )
-		$gpc = stripslashes($gpc);
+	if ( get_magic_quotes_gpc() ) {
+			$gpc = stripslashes($gpc);
+	}
 
 	return wp_slash($gpc);
 }
@@ -2509,8 +2552,9 @@ 
 	}
 
 	$url = esc_url($url);
-	if ( empty($url) )
-		return $matches[0];
+	if ( empty($url) ) {
+			return $matches[0];
+	}
 
 	return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
 }
@@ -2538,8 +2582,9 @@ 
 	}
 
 	$dest = esc_url($dest);
-	if ( empty($dest) )
-		return $matches[0];
+	if ( empty($dest) ) {
+			return $matches[0];
+	}
 
 	return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
 }
@@ -2577,10 +2622,11 @@ 
 	$nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
 	foreach ( $textarr as $piece ) {
 
-		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) )
-			$nested_code_pre++;
-		elseif ( $nested_code_pre && ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) || '</script>' === strtolower( $piece ) || '</style>' === strtolower( $piece ) ) )
-			$nested_code_pre--;
+		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) ) {
+					$nested_code_pre++;
+		} elseif ( $nested_code_pre && ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) || '</script>' === strtolower( $piece ) || '</style>' === strtolower( $piece ) ) ) {
+					$nested_code_pre--;
+		}
 
 		if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
 			$r .= $piece;
@@ -2757,8 +2803,9 @@ 
 function translate_smiley( $matches ) {
 	global $wpsmiliestrans;
 
-	if ( count( $matches ) == 0 )
-		return '';
+	if ( count( $matches ) == 0 ) {
+			return '';
+	}
 
 	$smiley = trim( reset( $matches ) );
 	$img = $wpsmiliestrans[ $smiley ];
@@ -2850,8 +2897,9 @@ 
  * @return string|bool Either false or the valid email address.
  */
 function is_email( $email, $deprecated = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0.0' );
+	if ( ! empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '3.0.0' );
+	}
 
 	// Test for the minimum length the email can be
 	if ( strlen( $email ) < 3 ) {
@@ -3015,13 +3063,15 @@ 
 	$tz = get_option( 'timezone_string' );
 	if ( $tz ) {
 		$datetime = date_create( $string, new DateTimeZone( 'UTC' ) );
-		if ( ! $datetime )
-			return date( $format, 0 );
+		if ( ! $datetime ) {
+					return date( $format, 0 );
+		}
 		$datetime->setTimezone( new DateTimeZone( $tz ) );
 		$string_localtime = $datetime->format( $format );
 	} else {
-		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches) )
-			return date( $format, 0 );
+		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches) ) {
+					return date( $format, 0 );
+		}
 		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
 		$string_localtime = gmdate( $format, $string_time + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
 	}
@@ -3204,34 +3254,40 @@ 
 
 	if ( $diff < HOUR_IN_SECONDS ) {
 		$mins = round( $diff / MINUTE_IN_SECONDS );
-		if ( $mins <= 1 )
-			$mins = 1;
+		if ( $mins <= 1 ) {
+					$mins = 1;
+		}
 		/* translators: min=minute */
 		$since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
 	} elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
 		$hours = round( $diff / HOUR_IN_SECONDS );
-		if ( $hours <= 1 )
-			$hours = 1;
+		if ( $hours <= 1 ) {
+					$hours = 1;
+		}
 		$since = sprintf( _n( '%s hour', '%s hours', $hours ), $hours );
 	} elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
 		$days = round( $diff / DAY_IN_SECONDS );
-		if ( $days <= 1 )
-			$days = 1;
+		if ( $days <= 1 ) {
+					$days = 1;
+		}
 		$since = sprintf( _n( '%s day', '%s days', $days ), $days );
 	} elseif ( $diff < MONTH_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
 		$weeks = round( $diff / WEEK_IN_SECONDS );
-		if ( $weeks <= 1 )
-			$weeks = 1;
+		if ( $weeks <= 1 ) {
+					$weeks = 1;
+		}
 		$since = sprintf( _n( '%s week', '%s weeks', $weeks ), $weeks );
 	} elseif ( $diff < YEAR_IN_SECONDS && $diff >= MONTH_IN_SECONDS ) {
 		$months = round( $diff / MONTH_IN_SECONDS );
-		if ( $months <= 1 )
-			$months = 1;
+		if ( $months <= 1 ) {
+					$months = 1;
+		}
 		$since = sprintf( _n( '%s month', '%s months', $months ), $months );
 	} elseif ( $diff >= YEAR_IN_SECONDS ) {
 		$years = round( $diff / YEAR_IN_SECONDS );
-		if ( $years <= 1 )
-			$years = 1;
+		if ( $years <= 1 ) {
+					$years = 1;
+		}
 		$since = sprintf( _n( '%s year', '%s years', $years ), $years );
 	}
 
@@ -3382,8 +3438,9 @@ 
 	 * @param string $text           The text prior to entity conversion.
 	 */
 	$filtered = apply_filters( 'pre_ent2ncr', null, $text );
-	if ( null !== $filtered )
-		return $filtered;
+	if ( null !== $filtered ) {
+			return $filtered;
+	}
 
 	$to_ncr = array(
 		'&quot;' => '&#34;',
@@ -3745,8 +3802,9 @@ 
 function esc_url( $url, $protocols = null, $_context = 'display' ) {
 	$original_url = $url;
 
-	if ( '' == $url )
-		return $url;
+	if ( '' == $url ) {
+			return $url;
+	}
 
 	$url = str_replace( ' ', '%20', $url );
 	$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
@@ -3766,8 +3824,9 @@ 
 	 * link starting with /, # or ? or a php file).
 	 */
 	if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-		! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-		$url = 'http://' . $url;
+		! preg_match('/^[a-z0-9-]+?\.php/i', $url) ) {
+			$url = 'http://' . $url;
+	}
 
 	// Replace ampersands and single quotes only when displaying.
 	if ( 'display' == $_context ) {
@@ -3816,11 +3875,13 @@ 
 	if ( '/' === $url[0] ) {
 		$good_protocol_url = $url;
 	} else {
-		if ( ! is_array( $protocols ) )
-			$protocols = wp_allowed_protocols();
+		if ( ! is_array( $protocols ) ) {
+					$protocols = wp_allowed_protocols();
+		}
 		$good_protocol_url = wp_kses_bad_protocol( $url, $protocols );
-		if ( strtolower( $good_protocol_url ) != strtolower( $url ) )
-			return '';
+		if ( strtolower( $good_protocol_url ) != strtolower( $url ) ) {
+					return '';
+		}
 	}
 
 	/**
@@ -4066,17 +4127,20 @@ 
 		case 'posts_per_page':
 		case 'posts_per_rss':
 			$value = (int) $value;
-			if ( empty($value) )
-				$value = 1;
-			if ( $value < -1 )
-				$value = abs($value);
+			if ( empty($value) ) {
+							$value = 1;
+			}
+			if ( $value < -1 ) {
+							$value = abs($value);
+			}
 			break;
 
 		case 'default_ping_status':
 		case 'default_comment_status':
 			// Options that if not there have 0 value but need to be something like "closed"
-			if ( $value == '0' || $value == '')
-				$value = 'closed';
+			if ( $value == '0' || $value == '') {
+							$value = 'closed';
+			}
 			break;
 
 		case 'blogdescription':
@@ -4099,10 +4163,11 @@ 
 
 		case 'blog_public':
 			// This is the value if the settings checkbox is not checked on POST. Don't rely on this.
-			if ( null === $value )
-				$value = 1;
-			else
-				$value = intval( $value );
+			if ( null === $value ) {
+							$value = 1;
+			} else {
+							$value = intval( $value );
+			}
 			break;
 
 		case 'date_format':
@@ -4172,13 +4237,15 @@ 
 			if ( is_wp_error( $value ) ) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( ' ', $value );
+				if ( ! is_array( $value ) ) {
+									$value = explode( ' ', $value );
+				}
 
 				$value = array_values( array_filter( array_map( 'trim', $value ) ) );
 
-				if ( ! $value )
-					$value = '';
+				if ( ! $value ) {
+									$value = '';
+				}
 			}
 			break;
 
@@ -4188,8 +4255,9 @@ 
 			if ( is_wp_error( $value ) ) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( "\n", $value );
+				if ( ! is_array( $value ) ) {
+									$value = explode( "\n", $value );
+				}
 
 				$domains = array_values( array_filter( array_map( 'trim', $value ) ) );
 				$value = array();
@@ -4199,8 +4267,9 @@ 
 						$value[] = $domain;
 					}
 				}
-				if ( ! $value )
-					$value = '';
+				if ( ! $value ) {
+									$value = '';
+				}
 			}
 			break;
 
@@ -4232,8 +4301,9 @@ 
 			break;
 
 		case 'default_role' :
-			if ( ! get_role( $value ) && get_role( 'subscriber' ) )
-				$value = 'subscriber';
+			if ( ! get_role( $value ) && get_role( 'subscriber' ) ) {
+							$value = 'subscriber';
+			}
 			break;
 
 		case 'moderation_keys':
@@ -4311,8 +4381,9 @@ 
  */
 function wp_parse_str( $string, &$array ) {
 	parse_str( $string, $array );
-	if ( get_magic_quotes_gpc() )
-		$array = stripslashes_deep( $array );
+	if ( get_magic_quotes_gpc() ) {
+			$array = stripslashes_deep( $array );
+	}
 	/**
 	 * Filters the array of variables derived from a parsed string.
 	 *
@@ -4346,8 +4417,9 @@ 
  * @return string The text returned after esc_html if needed.
  */
 function wp_pre_kses_less_than_callback( $matches ) {
-	if ( false === strpos($matches[0], '>') )
-		return esc_html($matches[0]);
+	if ( false === strpos($matches[0], '>') ) {
+			return esc_html($matches[0]);
+	}
 	return $matches[0];
 }
 
@@ -4383,8 +4455,9 @@ 
 
 		// Get fragment before next %
 		$end = strpos($pattern, '%', $start + 1);
-		if ( false === $end )
-			$end = $len;
+		if ( false === $end ) {
+					$end = $len;
+		}
 		$fragment = substr($pattern, $start, $end - $start);
 
 		// Fragment has a specifier
@@ -4409,10 +4482,11 @@ 
 			 * @param string $arg      The argument.
 			 */
 			$_fragment = apply_filters( 'wp_sprintf', $fragment, $arg );
-			if ( $_fragment != $fragment )
-				$fragment = $_fragment;
-			else
-				$fragment = sprintf($fragment, strval($arg) );
+			if ( $_fragment != $fragment ) {
+							$fragment = $_fragment;
+			} else {
+							$fragment = sprintf($fragment, strval($arg) );
+			}
 		}
 
 		// Append to result and move to next fragment
@@ -4437,12 +4511,14 @@ 
  */
 function wp_sprintf_l( $pattern, $args ) {
 	// Not a match
-	if ( substr($pattern, 0, 2) != '%l' )
-		return $pattern;
+	if ( substr($pattern, 0, 2) != '%l' ) {
+			return $pattern;
+	}
 
 	// Nothing to work with
-	if ( empty($args) )
-		return '';
+	if ( empty($args) ) {
+			return '';
+	}
 
 	/**
 	 * Filters the translated delimiters used by wp_sprintf_l().
@@ -4466,17 +4542,19 @@ 
 
 	$args = (array) $args;
 	$result = array_shift($args);
-	if ( count($args) == 1 )
-		$result .= $l['between_only_two'] . array_shift($args);
+	if ( count($args) == 1 ) {
+			$result .= $l['between_only_two'] . array_shift($args);
+	}
 	// Loop when more than two args
 	$i = count($args);
 	while ( $i ) {
 		$arg = array_shift($args);
 		$i--;
-		if ( 0 == $i )
-			$result .= $l['between_last_two'] . $arg;
-		else
-			$result .= $l['between'] . $arg;
+		if ( 0 == $i ) {
+					$result .= $l['between_last_two'] . $arg;
+		} else {
+					$result .= $l['between'] . $arg;
+		}
 	}
 	return $result . substr($pattern, 2);
 }
@@ -4496,14 +4574,16 @@ 
  * @return string The excerpt.
  */
 function wp_html_excerpt( $str, $count, $more = null ) {
-	if ( null === $more )
-		$more = '';
+	if ( null === $more ) {
+			$more = '';
+	}
 	$str = wp_strip_all_tags( $str, true );
 	$excerpt = mb_substr( $str, 0, $count );
 	// remove part of an entity at the end
 	$excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
-	if ( $str != $excerpt )
-		$excerpt = trim( $excerpt ) . $more;
+	if ( $str != $excerpt ) {
+			$excerpt = trim( $excerpt ) . $more;
+	}
 	return $excerpt;
 }
 
@@ -4625,8 +4705,9 @@ 
 	$string = preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $string );
 	$string = strip_tags($string);
 
-	if ( $remove_breaks )
-		$string = preg_replace('/[\r\n\t ]+/', ' ', $string);
+	if ( $remove_breaks ) {
+			$string = preg_replace('/[\r\n\t ]+/', ' ', $string);
+	}
 
 	return trim( $string );
 }
@@ -4709,8 +4790,9 @@ 
 function capital_P_dangit( $text ) {
 	// Simple replacement for titles
 	$current_filter = current_filter();
-	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter )
-		return str_replace( 'Wordpress', 'WordPress', $text );
+	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter ) {
+			return str_replace( 'Wordpress', 'WordPress', $text );
+	}
 	// Still here? Use the more judicious replacement
 	static $dblq = false;
 	if ( false === $dblq ) {
@@ -4754,8 +4836,9 @@ 
 function sanitize_trackback_urls( $to_ping ) {
 	$urls_to_ping = preg_split( '/[\r\n\t ]/', trim( $to_ping ), -1, PREG_SPLIT_NO_EMPTY );
 	foreach ( $urls_to_ping as $k => $url ) {
-		if ( !preg_match( '#^https?://.#i', $url ) )
-			unset( $urls_to_ping[$k] );
+		if ( !preg_match( '#^https?://.#i', $url ) ) {
+					unset( $urls_to_ping[$k] );
+		}
 	}
 	$urls_to_ping = array_map( 'esc_url_raw', $urls_to_ping );
 	$urls_to_ping = implode( "\n", $urls_to_ping );

src/wp-includes/functions.php

Doc Comments +8 added lines, -11 removed lines

@@ -55,7 +55,7 @@ 
  *
  * @param string   $type Type of time to retrieve. Accepts 'mysql', 'timestamp', or PHP date
  *                       format string (e.g. 'Y-m-d').
- * @param int|bool $gmt  Optional. Whether to use GMT timezone. Default false.
+ * @param integer $gmt  Optional. Whether to use GMT timezone. Default false.
  * @return int|string Integer if $type is 'timestamp', string otherwise.
  */
 function current_time( $type, $gmt = 0 ) {
@@ -436,7 +436,7 @@ 
  * @since 2.0.5
  *
  * @param string|array|object $data Data that might be serialized.
- * @return mixed A scalar data
+ * @return string A scalar data
  */
 function maybe_serialize( $data ) {
 	if ( is_array( $data ) || is_object( $data ) )
@@ -771,9 +771,6 @@ 
  *
  * @since 1.5.0
  *
- * @param string|array $key   Either a query variable key, or an associative array of query variables.
- * @param string       $value Optional. Either a query variable value, or a URL to act upon.
- * @param string       $url   Optional. A URL to act upon.
  * @return string New URL query string (unescaped).
  */
 function add_query_arg() {
@@ -1428,7 +1425,7 @@ 
  * @since 2.0.4
  *
  * @param string     $actionurl URL to add nonce action.
- * @param int|string $action    Optional. Nonce action name. Default -1.
+ * @param integer $action    Optional. Nonce action name. Default -1.
  * @param string     $name      Optional. Nonce name. Default '_wpnonce'.
  * @return string Escaped URL with nonce action added.
  */
@@ -1457,7 +1454,7 @@ 
  *
  * @since 2.0.4
  *
- * @param int|string $action  Optional. Action name. Default -1.
+ * @param integer $action  Optional. Action name. Default -1.
  * @param string     $name    Optional. Nonce name. Default '_wpnonce'.
  * @param bool       $referer Optional. Whether to set the referer field for validation. Default true.
  * @param bool       $echo    Optional. Whether to display or return hidden form field. Default true.
@@ -1549,7 +1546,7 @@ 
  *
  * @since 4.5.0
  *
- * @return string|false Referer URL on success, false on failure.
+ * @return string Referer URL on success, false on failure.
  */
 function wp_get_raw_referer() {
 	if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
@@ -1861,7 +1858,7 @@ 
  * @param bool   $create_dir Optional. Whether to check and create the uploads directory.
  *                           Default true for backward compatibility.
  * @param bool   $refresh_cache Optional. Whether to refresh the cache. Default false.
- * @return array See above for description.
+ * @return callable|null See above for description.
  */
 function wp_upload_dir( $time = null, $create_dir = true, $refresh_cache = false ) {
 	static $cache = array(), $tested_paths = array();
@@ -4692,7 +4689,7 @@ 
  *
  * @see __return_false()
  *
- * @return true True.
+ * @return boolean True.
  */
 function __return_true() {
 	return true;
@@ -4814,7 +4811,7 @@ 
  * @param int      $start         The ID to start the loop check at.
  * @param int      $start_parent  The parent_ID of $start to use instead of calling $callback( $start ).
  *                                Use null to always use $callback
- * @param array    $callback_args Optional. Additional arguments to send to $callback.
+ * @param string[]    $callback_args Optional. Additional arguments to send to $callback.
  * @return array IDs of all members of loop.
  */
 function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {

Spacing +1027 added lines, -1027 removed lines

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

Braces +516 added lines, -365 removed lines

@@ -24,22 +24,26 @@ 
  * @return string|int|bool Formatted date string or Unix timestamp. False if $date is empty.
  */
 function mysql2date( $format, $date, $translate = true ) {
-	if ( empty( $date ) )
-		return false;
+	if ( empty( $date ) ) {
+			return false;
+	}
 
-	if ( 'G' == $format )
-		return strtotime( $date . ' +0000' );
+	if ( 'G' == $format ) {
+			return strtotime( $date . ' +0000' );
+	}
 
 	$i = strtotime( $date );
 
-	if ( 'U' == $format )
-		return $i;
+	if ( 'U' == $format ) {
+			return $i;
+	}
 
-	if ( $translate )
-		return date_i18n( $format, $i );
-	else
-		return date( $format, $i );
-}
+	if ( $translate ) {
+			return date_i18n( $format, $i );
+	} else {
+			return date( $format, $i );
+	}
+	}
 
 /**
  * Retrieve the current time based on specified type.
@@ -91,10 +95,11 @@ 
 	$i = $unixtimestamp;
 
 	if ( false === $i ) {
-		if ( ! $gmt )
-			$i = current_time( 'timestamp' );
-		else
-			$i = time();
+		if ( ! $gmt ) {
+					$i = current_time( 'timestamp' );
+		} else {
+					$i = time();
+		}
 		// we should not let date() interfere with our
 		// specially computed timestamp
 		$gmt = true;
@@ -306,11 +311,13 @@ 
 	// The day of the week from the timestamp.
 	$weekday = date( 'w', $day );
 
-	if ( !is_numeric($start_of_week) )
-		$start_of_week = get_option( 'start_of_week' );
+	if ( !is_numeric($start_of_week) ) {
+			$start_of_week = get_option( 'start_of_week' );
+	}
 
-	if ( $weekday < $start_of_week )
-		$weekday += 7;
+	if ( $weekday < $start_of_week ) {
+			$weekday += 7;
+	}
 
 	// The most recent week start day on or before $day.
 	$start = $day - DAY_IN_SECONDS * ( $weekday - $start_of_week );
@@ -329,8 +336,10 @@ 
  * @return mixed Unserialized data can be any type.
  */
 function maybe_unserialize( $original ) {
-	if ( is_serialized( $original ) ) // don't attempt to unserialize data that wasn't serialized going in
+	if ( is_serialized( $original ) ) {
+		// don't attempt to unserialize data that wasn't serialized going in
 		return @unserialize( $original );
+	}
 	return $original;
 }
 
@@ -370,13 +379,16 @@ 
 		$semicolon = strpos( $data, ';' );
 		$brace     = strpos( $data, '}' );
 		// Either ; or } must exist.
-		if ( false === $semicolon && false === $brace )
-			return false;
+		if ( false === $semicolon && false === $brace ) {
+					return false;
+		}
 		// But neither must be in the first X characters.
-		if ( false !== $semicolon && $semicolon < 3 )
-			return false;
-		if ( false !== $brace && $brace < 4 )
-			return false;
+		if ( false !== $semicolon && $semicolon < 3 ) {
+					return false;
+		}
+		if ( false !== $brace && $brace < 4 ) {
+					return false;
+		}
 	}
 	$token = $data[0];
 	switch ( $token ) {
@@ -439,14 +451,16 @@ 
  * @return mixed A scalar data
  */
 function maybe_serialize( $data ) {
-	if ( is_array( $data ) || is_object( $data ) )
-		return serialize( $data );
+	if ( is_array( $data ) || is_object( $data ) ) {
+			return serialize( $data );
+	}
 
 	// Double serialization is required for backward compatibility.
 	// See https://core.trac.wordpress.org/ticket/12930
 	// Also the world will end. See WP 3.6.1.
-	if ( is_serialized( $data, false ) )
-		return serialize( $data );
+	if ( is_serialized( $data, false ) ) {
+			return serialize( $data );
+	}
 
 	return $data;
 }
@@ -574,20 +588,23 @@ 
 	foreach ( $pung as $link_test ) {
 		if ( ! in_array( $link_test, $post_links_temp ) ) { // link no longer in post
 			$mids = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $link_test ) . '%') );
-			foreach ( $mids as $mid )
-				delete_metadata_by_mid( 'post', $mid );
+			foreach ( $mids as $mid ) {
+							delete_metadata_by_mid( 'post', $mid );
+			}
 		}
 	}
 
 	foreach ( (array) $post_links_temp as $link_test ) {
 		if ( !in_array( $link_test, $pung ) ) { // If we haven't pung it already
 			$test = @parse_url( $link_test );
-			if ( false === $test )
-				continue;
-			if ( isset( $test['query'] ) )
-				$post_links[] = $link_test;
-			elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) )
-				$post_links[] = $link_test;
+			if ( false === $test ) {
+							continue;
+			}
+			if ( isset( $test['query'] ) ) {
+							$post_links[] = $link_test;
+			} elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) ) {
+							$post_links[] = $link_test;
+			}
 		}
 	}
 
@@ -645,13 +662,15 @@ 
  * @return bool|string False on failure, headers on success.
  */
 function wp_get_http_headers( $url, $deprecated = false ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.7.0' );
+	}
 
 	$response = wp_safe_remote_head( $url );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	return wp_remote_retrieve_headers( $response );
 }
@@ -669,11 +688,12 @@ 
  */
 function is_new_day() {
 	global $currentday, $previousday;
-	if ( $currentday != $previousday )
-		return 1;
-	else
-		return 0;
-}
+	if ( $currentday != $previousday ) {
+			return 1;
+	} else {
+			return 0;
+	}
+	}
 
 /**
  * Build URL query based on an associative and, or indexed array.
@@ -716,27 +736,33 @@ 
 	$ret = array();
 
 	foreach ( (array) $data as $k => $v ) {
-		if ( $urlencode)
-			$k = urlencode($k);
-		if ( is_int($k) && $prefix != null )
-			$k = $prefix.$k;
-		if ( !empty($key) )
-			$k = $key . '%5B' . $k . '%5D';
-		if ( $v === null )
-			continue;
-		elseif ( $v === false )
-			$v = '0';
+		if ( $urlencode) {
+					$k = urlencode($k);
+		}
+		if ( is_int($k) && $prefix != null ) {
+					$k = $prefix.$k;
+		}
+		if ( !empty($key) ) {
+					$k = $key . '%5B' . $k . '%5D';
+		}
+		if ( $v === null ) {
+					continue;
+		} elseif ( $v === false ) {
+					$v = '0';
+		}
 
-		if ( is_array($v) || is_object($v) )
-			array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
-		elseif ( $urlencode )
-			array_push($ret, $k.'='.urlencode($v));
-		else
-			array_push($ret, $k.'='.$v);
+		if ( is_array($v) || is_object($v) ) {
+					array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
+		} elseif ( $urlencode ) {
+					array_push($ret, $k.'='.urlencode($v));
+		} else {
+					array_push($ret, $k.'='.$v);
+		}
 	}
 
-	if ( null === $sep )
-		$sep = ini_get('arg_separator.output');
+	if ( null === $sep ) {
+			$sep = ini_get('arg_separator.output');
+	}
 
 	return implode($sep, $ret);
 }
@@ -779,21 +805,24 @@ 
 function add_query_arg() {
 	$args = func_get_args();
 	if ( is_array( $args[0] ) ) {
-		if ( count( $args ) < 2 || false === $args[1] )
-			$uri = $_SERVER['REQUEST_URI'];
-		else
-			$uri = $args[1];
+		if ( count( $args ) < 2 || false === $args[1] ) {
+					$uri = $_SERVER['REQUEST_URI'];
+		} else {
+					$uri = $args[1];
+		}
 	} else {
-		if ( count( $args ) < 3 || false === $args[2] )
-			$uri = $_SERVER['REQUEST_URI'];
-		else
-			$uri = $args[2];
+		if ( count( $args ) < 3 || false === $args[2] ) {
+					$uri = $_SERVER['REQUEST_URI'];
+		} else {
+					$uri = $args[2];
+		}
 	}
 
-	if ( $frag = strstr( $uri, '#' ) )
-		$uri = substr( $uri, 0, -strlen( $frag ) );
-	else
-		$frag = '';
+	if ( $frag = strstr( $uri, '#' ) ) {
+			$uri = substr( $uri, 0, -strlen( $frag ) );
+	} else {
+			$frag = '';
+	}
 
 	if ( 0 === stripos( $uri, 'http://' ) ) {
 		$protocol = 'http://';
@@ -827,8 +856,9 @@ 
 	}
 
 	foreach ( $qs as $k => $v ) {
-		if ( $v === false )
-			unset( $qs[$k] );
+		if ( $v === false ) {
+					unset( $qs[$k] );
+		}
 	}
 
 	$ret = build_query( $qs );
@@ -850,8 +880,9 @@ 
  */
 function remove_query_arg( $key, $query = false ) {
 	if ( is_array( $key ) ) { // removing multiple keys
-		foreach ( $key as $k )
-			$query = add_query_arg( $k, false, $query );
+		foreach ( $key as $k ) {
+					$query = add_query_arg( $k, false, $query );
+		}
 		return $query;
 	}
 	return add_query_arg( $key, false, $query );
@@ -933,16 +964,18 @@ 
 function wp_remote_fopen( $uri ) {
 	$parsed_url = @parse_url( $uri );
 
-	if ( !$parsed_url || !is_array( $parsed_url ) )
-		return false;
+	if ( !$parsed_url || !is_array( $parsed_url ) ) {
+			return false;
+	}
 
 	$options = array();
 	$options['timeout'] = 10;
 
 	$response = wp_safe_remote_get( $uri, $options );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	return wp_remote_retrieve_body( $response );
 }
@@ -962,9 +995,10 @@ 
 	global $wp, $wp_query, $wp_the_query;
 	$wp->main( $query_vars );
 
-	if ( !isset($wp_the_query) )
-		$wp_the_query = $wp_query;
-}
+	if ( !isset($wp_the_query) ) {
+			$wp_the_query = $wp_query;
+	}
+	}
 
 /**
  * Retrieve the description for the HTTP status.
@@ -1049,11 +1083,12 @@ 
 		);
 	}
 
-	if ( isset( $wp_header_to_desc[$code] ) )
-		return $wp_header_to_desc[$code];
-	else
-		return '';
-}
+	if ( isset( $wp_header_to_desc[$code] ) ) {
+			return $wp_header_to_desc[$code];
+	} else {
+			return '';
+	}
+	}
 
 /**
  * Set HTTP status header.
@@ -1077,8 +1112,8 @@ 
 
 	$protocol = wp_get_server_protocol();
 	$status_header = "$protocol $code $description";
-	if ( function_exists( 'apply_filters' ) )
-
+	if ( function_exists( 'apply_filters' ) ) {
+	
 		/**
 		 * Filters an HTTP status header.
 		 *
@@ -1090,6 +1125,7 @@ 
 		 * @param string $protocol      Server protocol.
 		 */
 		$status_header = apply_filters( 'status_header', $status_header, $code, $description, $protocol );
+	}
 
 	@header( $status_header, true, $code );
 }
@@ -1161,9 +1197,10 @@ 
 		}
 	}
 
-	foreach ( $headers as $name => $field_value )
-		@header("{$name}: {$field_value}");
-}
+	foreach ( $headers as $name => $field_value ) {
+			@header("{$name}: {$field_value}");
+	}
+	}
 
 /**
  * Set the headers for caching for 10 days with JavaScript content type.
@@ -1226,8 +1263,9 @@ 
 	// Remove the pad, if present.
 	$feed = preg_replace( '/^_+/', '', $feed );
 
-	if ( $feed == '' || $feed == 'feed' )
-		$feed = get_default_feed();
+	if ( $feed == '' || $feed == 'feed' ) {
+			$feed = get_default_feed();
+	}
 
 	if ( ! has_action( "do_feed_{$feed}" ) ) {
 		wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
@@ -1280,11 +1318,12 @@ 
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
 function do_feed_rss2( $for_comments ) {
-	if ( $for_comments )
-		load_template( ABSPATH . WPINC . '/feed-rss2-comments.php' );
-	else
-		load_template( ABSPATH . WPINC . '/feed-rss2.php' );
-}
+	if ( $for_comments ) {
+			load_template( ABSPATH . WPINC . '/feed-rss2-comments.php' );
+	} else {
+			load_template( ABSPATH . WPINC . '/feed-rss2.php' );
+	}
+	}
 
 /**
  * Load either Atom comment feed or Atom posts feed.
@@ -1296,11 +1335,12 @@ 
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
 function do_feed_atom( $for_comments ) {
-	if ($for_comments)
-		load_template( ABSPATH . WPINC . '/feed-atom-comments.php');
-	else
-		load_template( ABSPATH . WPINC . '/feed-atom.php' );
-}
+	if ($for_comments) {
+			load_template( ABSPATH . WPINC . '/feed-atom-comments.php');
+	} else {
+			load_template( ABSPATH . WPINC . '/feed-atom.php' );
+	}
+	}
 
 /**
  * Display the robots.txt file content.
@@ -1364,29 +1404,33 @@ 
 	 * Check cache first. If options table goes away and we have true
 	 * cached, oh well.
 	 */
-	if ( wp_cache_get( 'is_blog_installed' ) )
-		return true;
+	if ( wp_cache_get( 'is_blog_installed' ) ) {
+			return true;
+	}
 
 	$suppress = $wpdb->suppress_errors();
 	if ( ! wp_installing() ) {
 		$alloptions = wp_load_alloptions();
 	}
 	// If siteurl is not set to autoload, check it specifically
-	if ( !isset( $alloptions['siteurl'] ) )
-		$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
-	else
-		$installed = $alloptions['siteurl'];
+	if ( !isset( $alloptions['siteurl'] ) ) {
+			$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
+	} else {
+			$installed = $alloptions['siteurl'];
+	}
 	$wpdb->suppress_errors( $suppress );
 
 	$installed = !empty( $installed );
 	wp_cache_set( 'is_blog_installed', $installed );
 
-	if ( $installed )
-		return true;
+	if ( $installed ) {
+			return true;
+	}
 
 	// If visiting repair.php, return true and let it take over.
-	if ( defined( 'WP_REPAIRING' ) )
-		return true;
+	if ( defined( 'WP_REPAIRING' ) ) {
+			return true;
+	}
 
 	$suppress = $wpdb->suppress_errors();
 
@@ -1398,13 +1442,16 @@ 
 	$wp_tables = $wpdb->tables();
 	foreach ( $wp_tables as $table ) {
 		// The existence of custom user tables shouldn't suggest an insane state or prevent a clean install.
-		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
-			continue;
-		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
-			continue;
+		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table ) {
+					continue;
+		}
+		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table ) {
+					continue;
+		}
 
-		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) )
-			continue;
+		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) ) {
+					continue;
+		}
 
 		// One or more tables exist. We are insane.
 
@@ -1467,11 +1514,13 @@ 
 	$name = esc_attr( $name );
 	$nonce_field = '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . wp_create_nonce( $action ) . '" />';
 
-	if ( $referer )
-		$nonce_field .= wp_referer_field( false );
+	if ( $referer ) {
+			$nonce_field .= wp_referer_field( false );
+	}
 
-	if ( $echo )
-		echo $nonce_field;
+	if ( $echo ) {
+			echo $nonce_field;
+	}
 
 	return $nonce_field;
 }
@@ -1490,8 +1539,9 @@ 
 function wp_referer_field( $echo = true ) {
 	$referer_field = '<input type="hidden" name="_wp_http_referer" value="'. esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
 
-	if ( $echo )
-		echo $referer_field;
+	if ( $echo ) {
+			echo $referer_field;
+	}
 	return $referer_field;
 }
 
@@ -1514,8 +1564,9 @@ 
 		$ref = 'previous' == $jump_back_to ? wp_get_referer() : wp_unslash( $_SERVER['REQUEST_URI'] );
 	}
 	$orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . esc_attr( $ref ) . '" />';
-	if ( $echo )
-		echo $orig_referer_field;
+	if ( $echo ) {
+			echo $orig_referer_field;
+	}
 	return $orig_referer_field;
 }
 
@@ -1569,8 +1620,9 @@ 
  * @return string|false False if no original referer or original referer if set.
  */
 function wp_get_original_referer() {
-	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) )
-		return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
+	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) ) {
+			return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
+	}
 	return false;
 }
 
@@ -1605,11 +1657,13 @@ 
 	 * Use rtrim() instead of untrailingslashit to avoid formatting.php dependency.
 	 */
 	$target = rtrim($target, '/');
-	if ( empty($target) )
-		$target = '/';
+	if ( empty($target) ) {
+			$target = '/';
+	}
 
-	if ( file_exists( $target ) )
-		return @is_dir( $target );
+	if ( file_exists( $target ) ) {
+			return @is_dir( $target );
+	}
 
 	// We need to find the permissions of the parent folder that exists and inherit that.
 	$target_parent = dirname( $target );
@@ -1658,15 +1712,18 @@ 
 	 * This is definitive if true but fails if $path does not exist or contains
 	 * a symbolic link.
 	 */
-	if ( realpath($path) == $path )
-		return true;
+	if ( realpath($path) == $path ) {
+			return true;
+	}
 
-	if ( strlen($path) == 0 || $path[0] == '.' )
-		return false;
+	if ( strlen($path) == 0 || $path[0] == '.' ) {
+			return false;
+	}
 
 	// Windows allows absolute paths like this.
-	if ( preg_match('#^[a-zA-Z]:\\\\#', $path) )
-		return true;
+	if ( preg_match('#^[a-zA-Z]:\\\\#', $path) ) {
+			return true;
+	}
 
 	// A path starting with / or \ is absolute; anything else is relative.
 	return ( $path[0] == '/' || $path[0] == '\\' );
@@ -1685,8 +1742,9 @@ 
  * @return string The path with the base or absolute path.
  */
 function path_join( $base, $path ) {
-	if ( path_is_absolute($path) )
-		return $path;
+	if ( path_is_absolute($path) ) {
+			return $path;
+	}
 
 	return rtrim($base, '/') . '/' . ltrim($path, '/');
 }
@@ -1733,25 +1791,30 @@ 
  */
 function get_temp_dir() {
 	static $temp = '';
-	if ( defined('WP_TEMP_DIR') )
-		return trailingslashit(WP_TEMP_DIR);
+	if ( defined('WP_TEMP_DIR') ) {
+			return trailingslashit(WP_TEMP_DIR);
+	}
 
-	if ( $temp )
-		return trailingslashit( $temp );
+	if ( $temp ) {
+			return trailingslashit( $temp );
+	}
 
 	if ( function_exists('sys_get_temp_dir') ) {
 		$temp = sys_get_temp_dir();
-		if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-			return trailingslashit( $temp );
+		if ( @is_dir( $temp ) && wp_is_writable( $temp ) ) {
+					return trailingslashit( $temp );
+		}
 	}
 
 	$temp = ini_get('upload_tmp_dir');
-	if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-		return trailingslashit( $temp );
+	if ( @is_dir( $temp ) && wp_is_writable( $temp ) ) {
+			return trailingslashit( $temp );
+	}
 
 	$temp = WP_CONTENT_DIR . '/';
-	if ( is_dir( $temp ) && wp_is_writable( $temp ) )
-		return $temp;
+	if ( is_dir( $temp ) && wp_is_writable( $temp ) ) {
+			return $temp;
+	}
 
 	return '/tmp/';
 }
@@ -1770,11 +1833,12 @@ 
  * @return bool Whether the path is writable.
  */
 function wp_is_writable( $path ) {
-	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) )
-		return win_is_writable( $path );
-	else
-		return @is_writable( $path );
-}
+	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) ) {
+			return win_is_writable( $path );
+	} else {
+			return @is_writable( $path );
+	}
+	}
 
 /**
  * Workaround for Windows bug in is_writable() function
@@ -1802,11 +1866,13 @@ 
 	// check tmp file for read/write capabilities
 	$should_delete_tmp_file = !file_exists( $path );
 	$f = @fopen( $path, 'a' );
-	if ( $f === false )
-		return false;
+	if ( $f === false ) {
+			return false;
+	}
 	fclose( $f );
-	if ( $should_delete_tmp_file )
-		unlink( $path );
+	if ( $should_delete_tmp_file ) {
+			unlink( $path );
+	}
 	return true;
 }
 
@@ -1927,10 +1993,11 @@ 
 	}
 
 	if ( !$url = get_option( 'upload_url_path' ) ) {
-		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
-			$url = WP_CONTENT_URL . '/uploads';
-		else
-			$url = trailingslashit( $siteurl ) . $upload_path;
+		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) ) {
+					$url = WP_CONTENT_URL . '/uploads';
+		} else {
+					$url = trailingslashit( $siteurl ) . $upload_path;
+		}
 	}
 
 	/*
@@ -1955,10 +2022,11 @@ 
 			 * had wp-content/uploads for the main site.)
 			 */
 
-			if ( defined( 'MULTISITE' ) )
-				$ms_dir = '/sites/' . get_current_blog_id();
-			else
-				$ms_dir = '/' . get_current_blog_id();
+			if ( defined( 'MULTISITE' ) ) {
+							$ms_dir = '/sites/' . get_current_blog_id();
+			} else {
+							$ms_dir = '/' . get_current_blog_id();
+			}
 
 			$dir .= $ms_dir;
 			$url .= $ms_dir;
@@ -1978,10 +2046,11 @@ 
 			 * rewriting in multisite, the resulting URL is /files. (#WP22702 for background.)
 			 */
 
-			if ( defined( 'BLOGUPLOADDIR' ) )
-				$dir = untrailingslashit( BLOGUPLOADDIR );
-			else
-				$dir = ABSPATH . UPLOADS;
+			if ( defined( 'BLOGUPLOADDIR' ) ) {
+							$dir = untrailingslashit( BLOGUPLOADDIR );
+			} else {
+							$dir = ABSPATH . UPLOADS;
+			}
 			$url = trailingslashit( $siteurl ) . 'files';
 		}
 	}
@@ -1992,8 +2061,9 @@ 
 	$subdir = '';
 	if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
 		// Generate the yearly and monthly dirs
-		if ( !$time )
-			$time = current_time( 'mysql' );
+		if ( !$time ) {
+					$time = current_time( 'mysql' );
+		}
 		$y = substr( $time, 0, 4 );
 		$m = substr( $time, 5, 2 );
 		$subdir = "/$y/$m";
@@ -2039,8 +2109,9 @@ 
 	$name = basename($filename, $ext);
 
 	// Edge case: if file is named '.ext', treat as an empty name.
-	if ( $name === $ext )
-		$name = '';
+	if ( $name === $ext ) {
+			$name = '';
+	}
 
 	/*
 	 * Increment the file number until we have a unique file to save in $dir.
@@ -2114,20 +2185,24 @@ 
  * @return array
  */
 function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.0.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.0.0' );
+	}
 
-	if ( empty( $name ) )
-		return array( 'error' => __( 'Empty filename' ) );
+	if ( empty( $name ) ) {
+			return array( 'error' => __( 'Empty filename' ) );
+	}
 
 	$wp_filetype = wp_check_filetype( $name );
-	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) )
-		return array( 'error' => __( 'Invalid file type' ) );
+	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) ) {
+			return array( 'error' => __( 'Invalid file type' ) );
+	}
 
 	$upload = wp_upload_dir( $time );
 
-	if ( $upload['error'] !== false )
-		return $upload;
+	if ( $upload['error'] !== false ) {
+			return $upload;
+	}
 
 	/**
 	 * Filters whether to treat the upload bits as an error.
@@ -2149,18 +2224,20 @@ 
 
 	$new_file = $upload['path'] . "/$filename";
 	if ( ! wp_mkdir_p( dirname( $new_file ) ) ) {
-		if ( 0 === strpos( $upload['basedir'], ABSPATH ) )
-			$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
-		else
-			$error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+		if ( 0 === strpos( $upload['basedir'], ABSPATH ) ) {
+					$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
+		} else {
+					$error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+		}
 
 		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
 		return array( 'error' => $message );
 	}
 
 	$ifp = @ fopen( $new_file, 'wb' );
-	if ( ! $ifp )
-		return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
+	if ( ! $ifp ) {
+			return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
+	}
 
 	@fwrite( $ifp, $bits );
 	fclose( $ifp );
@@ -2192,10 +2269,11 @@ 
 	$ext = strtolower( $ext );
 
 	$ext2type = wp_get_ext_types();
-	foreach ( $ext2type as $type => $exts )
-		if ( in_array( $ext, $exts ) )
+	foreach ( $ext2type as $type => $exts ) {
+			if ( in_array( $ext, $exts ) )
 			return $type;
-}
+	}
+	}
 
 /**
  * Retrieve the file type from the file name.
@@ -2209,8 +2287,9 @@ 
  * @return array Values with extension first and mime type.
  */
 function wp_check_filetype( $filename, $mimes = null ) {
-	if ( empty($mimes) )
-		$mimes = get_allowed_mime_types();
+	if ( empty($mimes) ) {
+			$mimes = get_allowed_mime_types();
+	}
 	$type = false;
 	$ext = false;
 
@@ -2482,11 +2561,13 @@ 
 	$t = wp_get_mime_types();
 
 	unset( $t['swf'], $t['exe'] );
-	if ( function_exists( 'current_user_can' ) )
-		$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );
+	if ( function_exists( 'current_user_can' ) ) {
+			$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );
+	}
 
-	if ( empty( $unfiltered ) )
-		unset( $t['htm|html'] );
+	if ( empty( $unfiltered ) ) {
+			unset( $t['htm|html'] );
+	}
 
 	/**
 	 * Filters list of allowed mime types and file extensions.
@@ -2518,8 +2599,9 @@ 
 		$html .= sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url( $redirect_to ) );
 	} else {
 		$html = __( 'Are you sure you want to do this?' );
-		if ( wp_get_referer() )
-			$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+		if ( wp_get_referer() ) {
+					$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+		}
 	}
 
 	wp_die( $html, __( 'WordPress Failure Notice' ), 403 );
@@ -2621,8 +2703,9 @@ 
 	if ( function_exists( 'is_wp_error' ) && is_wp_error( $message ) ) {
 		if ( empty( $title ) ) {
 			$error_data = $message->get_error_data();
-			if ( is_array( $error_data ) && isset( $error_data['title'] ) )
-				$title = $error_data['title'];
+			if ( is_array( $error_data ) && isset( $error_data['title'] ) ) {
+							$title = $error_data['title'];
+			}
 		}
 		$errors = $message->get_error_messages();
 		switch ( count( $errors ) ) {
@@ -2652,19 +2735,26 @@ 
 			header( 'Content-Type: text/html; charset=utf-8' );
 		}
 
-		if ( empty($title) )
-			$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
+		if ( empty($title) ) {
+					$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
+		}
 
 		$text_direction = 'ltr';
-		if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
-			$text_direction = 'rtl';
-		elseif ( function_exists( 'is_rtl' ) && is_rtl() )
-			$text_direction = 'rtl';
-?>
+		if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] ) {
+					$text_direction = 'rtl';
+		} elseif ( function_exists( 'is_rtl' ) && is_rtl() ) {
+					$text_direction = 'rtl';
+		}
+		?>
 <!DOCTYPE html>
 <!-- Ticket #11289, IE bug fix: always pad the error page with enough characters such that it is greater than 512 bytes, even after gzip compression abcdefghijklmnopqrstuvwxyz1234567890aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz11223344556677889900abacbcbdcdcededfefegfgfhghgihihjijikjkjlklkmlmlnmnmononpopoqpqprqrqsrsrtstsubcbcdcdedefefgfabcadefbghicjkldmnoepqrfstugvwxhyz1i234j567k890laabmbccnddeoeffpgghqhiirjjksklltmmnunoovppqwqrrxsstytuuzvvw0wxx1yyz2z113223434455666777889890091abc2def3ghi4jkl5mno6pqr7stu8vwx9yz11aab2bcc3dd4ee5ff6gg7hh8ii9j0jk1kl2lmm3nnoo4p5pq6qrr7ss8tt9uuvv0wwx1x2yyzz13aba4cbcb5dcdc6dedfef8egf9gfh0ghg1ihi2hji3jik4jkj5lkl6kml7mln8mnm9ono
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) language_attributes(); else echo "dir='$text_direction'"; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) {
+	language_attributes();
+} else {
+	echo "dir='$text_direction'";
+}
+?>>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width">
@@ -2838,8 +2928,9 @@ 
  * @param string $message Optional. Response to print. Default empty.
  */
 function _ajax_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
+	if ( is_scalar( $message ) ) {
+			die( (string) $message );
+	}
 	die( '0' );
 }
 
@@ -2854,8 +2945,9 @@ 
  * @param string $message Optional. Response to print. Default empty.
  */
 function _scalar_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
+	if ( is_scalar( $message ) ) {
+			die( (string) $message );
+	}
 	die();
 }
 
@@ -3061,11 +3153,12 @@ 
 function wp_send_json( $response ) {
 	@header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
 	echo wp_json_encode( $response );
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
-		wp_die();
-	else
-		die;
-}
+	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+			wp_die();
+	} else {
+			die;
+	}
+	}
 
 /**
  * Send a JSON response back to an Ajax request, indicating success.
@@ -3077,8 +3170,9 @@ 
 function wp_send_json_success( $data = null ) {
 	$response = array( 'success' => true );
 
-	if ( isset( $data ) )
-		$response['data'] = $data;
+	if ( isset( $data ) ) {
+			$response['data'] = $data;
+	}
 
 	wp_send_json( $response );
 }
@@ -3155,8 +3249,9 @@ 
  * @return string Homepage location.
  */
 function _config_wp_home( $url = '' ) {
-	if ( defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+	if ( defined( 'WP_HOME' ) ) {
+			return untrailingslashit( WP_HOME );
+	}
 	return $url;
 }
 
@@ -3176,8 +3271,9 @@ 
  * @return string The WordPress Site URL.
  */
 function _config_wp_siteurl( $url = '' ) {
-	if ( defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+	if ( defined( 'WP_SITEURL' ) ) {
+			return untrailingslashit( WP_SITEURL );
+	}
 	return $url;
 }
 
@@ -3241,8 +3337,9 @@ 
 	global $wpsmiliestrans, $wp_smiliessearch;
 
 	// don't bother setting up smilies if they are disabled
-	if ( !get_option( 'use_smilies' ) )
-		return;
+	if ( !get_option( 'use_smilies' ) ) {
+			return;
+	}
 
 	if ( !isset( $wpsmiliestrans ) ) {
 		$wpsmiliestrans = array(
@@ -3346,15 +3443,17 @@ 
  * @return array Merged user defined values with defaults.
  */
 function wp_parse_args( $args, $defaults = '' ) {
-	if ( is_object( $args ) )
-		$r = get_object_vars( $args );
-	elseif ( is_array( $args ) )
-		$r =& $args;
-	else
-		wp_parse_str( $args, $r );
-
-	if ( is_array( $defaults ) )
-		return array_merge( $defaults, $r );
+	if ( is_object( $args ) ) {
+			$r = get_object_vars( $args );
+	} elseif ( is_array( $args ) ) {
+			$r =& $args;
+	} else {
+			wp_parse_str( $args, $r );
+	}
+
+	if ( is_array( $defaults ) ) {
+			return array_merge( $defaults, $r );
+	}
 	return $r;
 }
 
@@ -3367,8 +3466,9 @@ 
  * @return array Sanitized array of IDs.
  */
 function wp_parse_id_list( $list ) {
-	if ( !is_array($list) )
-		$list = preg_split('/[\s,]+/', $list);
+	if ( !is_array($list) ) {
+			$list = preg_split('/[\s,]+/', $list);
+	}
 
 	return array_unique(array_map('absint', $list));
 }
@@ -3384,9 +3484,10 @@ 
  */
 function wp_array_slice_assoc( $array, $keys ) {
 	$slice = array();
-	foreach ( $keys as $key )
-		if ( isset( $array[ $key ] ) )
+	foreach ( $keys as $key ) {
+			if ( isset( $array[ $key ] ) )
 			$slice[ $key ] = $array[ $key ];
+	}
 
 	return $slice;
 }
@@ -3426,13 +3527,15 @@ 
  * @return array A list of objects or object fields.
  */
 function wp_filter_object_list( $list, $args = array(), $operator = 'and', $field = false ) {
-	if ( ! is_array( $list ) )
-		return array();
+	if ( ! is_array( $list ) ) {
+			return array();
+	}
 
 	$list = wp_list_filter( $list, $args, $operator );
 
-	if ( $field )
-		$list = wp_list_pluck( $list, $field );
+	if ( $field ) {
+			$list = wp_list_pluck( $list, $field );
+	}
 
 	return $list;
 }
@@ -3452,11 +3555,13 @@ 
  * @return array Array of found values.
  */
 function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
-	if ( ! is_array( $list ) )
-		return array();
+	if ( ! is_array( $list ) ) {
+			return array();
+	}
 
-	if ( empty( $args ) )
-		return $list;
+	if ( empty( $args ) ) {
+			return $list;
+	}
 
 	$operator = strtoupper( $operator );
 	$count = count( $args );
@@ -3467,8 +3572,9 @@ 
 
 		$matched = 0;
 		foreach ( $args as $m_key => $m_value ) {
-			if ( array_key_exists( $m_key, $to_match ) && $m_value == $to_match[ $m_key ] )
-				$matched++;
+			if ( array_key_exists( $m_key, $to_match ) && $m_value == $to_match[ $m_key ] ) {
+							$matched++;
+			}
 		}
 
 		if ( ( 'AND' == $operator && $matched == $count )
@@ -3577,8 +3683,9 @@ 
 function wp_widgets_add_menu() {
 	global $submenu;
 
-	if ( ! current_theme_supports( 'widgets' ) )
-		return;
+	if ( ! current_theme_supports( 'widgets' ) ) {
+			return;
+	}
 
 	$submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_theme_options', 'widgets.php' );
 	ksort( $submenu['themes.php'], SORT_NUMERIC );
@@ -3593,9 +3700,10 @@ 
  */
 function wp_ob_end_flush_all() {
 	$levels = ob_get_level();
-	for ($i=0; $i<$levels; $i++)
-		ob_end_flush();
-}
+	for ($i=0; $i<$levels; $i++) {
+			ob_end_flush();
+	}
+	}
 
 /**
  * Load custom DB error or display WordPress DB error.
@@ -3627,8 +3735,9 @@ 
 	}
 
 	// If installing or in the admin, provide the verbose message.
-	if ( wp_installing() || defined( 'WP_ADMIN' ) )
-		wp_die($wpdb->error);
+	if ( wp_installing() || defined( 'WP_ADMIN' ) ) {
+			wp_die($wpdb->error);
+	}
 
 	// Otherwise, be terse.
 	status_header( 500 );
@@ -3636,7 +3745,10 @@ 
 	header( 'Content-Type: text/html; charset=utf-8' );
 ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) {
+	echo ' dir="rtl"';
+}
+?>>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title><?php _e( 'Database Error' ); ?></title>
@@ -3702,15 +3814,17 @@ 
 	 */
 	if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
 		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
-			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
+			} else {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			}
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
-			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
+			} else {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			}
 		}
 	}
 }
@@ -3826,15 +3940,17 @@ 
 	if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
 		$message = empty( $message ) ? '' : ' ' . $message;
 		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
-			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
+			} else {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+			}
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
-			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version ) . $message );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
+			} else {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version ) . $message );
+			}
 		}
 	}
 }
@@ -3886,15 +4002,17 @@ 
 	 */
 	if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
 		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
-			else
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			if ( ! is_null( $message ) ) {
+							trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
+			} else {
+							trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			}
 		} else {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
-			else
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			if ( ! is_null( $message ) ) {
+							trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
+			} else {
+							trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			}
 		}
 	}
 }
@@ -4030,19 +4148,22 @@ 
 function apache_mod_loaded($mod, $default = false) {
 	global $is_apache;
 
-	if ( !$is_apache )
-		return false;
+	if ( !$is_apache ) {
+			return false;
+	}
 
 	if ( function_exists( 'apache_get_modules' ) ) {
 		$mods = apache_get_modules();
-		if ( in_array($mod, $mods) )
-			return true;
+		if ( in_array($mod, $mods) ) {
+					return true;
+		}
 	} elseif ( function_exists( 'phpinfo' ) && false === strpos( ini_get( 'disable_functions' ), 'phpinfo' ) ) {
 			ob_start();
 			phpinfo(8);
 			$phpinfo = ob_get_clean();
-			if ( false !== strpos($phpinfo, $mod) )
-				return true;
+			if ( false !== strpos($phpinfo, $mod) ) {
+							return true;
+			}
 	}
 	return $default;
 }
@@ -4098,17 +4219,21 @@ 
  * @return int 0 means nothing is wrong, greater than 0 means something was wrong.
  */
 function validate_file( $file, $allowed_files = '' ) {
-	if ( false !== strpos( $file, '..' ) )
-		return 1;
+	if ( false !== strpos( $file, '..' ) ) {
+			return 1;
+	}
 
-	if ( false !== strpos( $file, './' ) )
-		return 1;
+	if ( false !== strpos( $file, './' ) ) {
+			return 1;
+	}
 
-	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) )
-		return 3;
+	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) ) {
+			return 3;
+	}
 
-	if (':' == substr( $file, 1, 1 ) )
-		return 2;
+	if (':' == substr( $file, 1, 1 ) ) {
+			return 2;
+	}
 
 	return 0;
 }
@@ -4204,8 +4329,9 @@ 
 function wp_suspend_cache_addition( $suspend = null ) {
 	static $_suspend = false;
 
-	if ( is_bool( $suspend ) )
-		$_suspend = $suspend;
+	if ( is_bool( $suspend ) ) {
+			$_suspend = $suspend;
+	}
 
 	return $_suspend;
 }
@@ -4247,11 +4373,13 @@ 
 	// This is the current network's information; 'site' is old terminology.
 	global $current_site;
 
-	if ( ! is_multisite() )
-		return true;
+	if ( ! is_multisite() ) {
+			return true;
+	}
 
-	if ( ! $site_id )
-		$site_id = get_current_blog_id();
+	if ( ! $site_id ) {
+			$site_id = get_current_blog_id();
+	}
 
 	return (int) $site_id === (int) $current_site->blog_id;
 }
@@ -4332,8 +4460,9 @@ 
  * @return bool True if multisite and global terms enabled.
  */
 function global_terms_enabled() {
-	if ( ! is_multisite() )
-		return false;
+	if ( ! is_multisite() ) {
+			return false;
+	}
 
 	static $global_terms = null;
 	if ( is_null( $global_terms ) ) {
@@ -4349,10 +4478,11 @@ 
 		 * @param null $enabled Whether global terms are enabled.
 		 */
 		$filter = apply_filters( 'global_terms_enabled', null );
-		if ( ! is_null( $filter ) )
-			$global_terms = (bool) $filter;
-		else
-			$global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+		if ( ! is_null( $filter ) ) {
+					$global_terms = (bool) $filter;
+		} else {
+					$global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+		}
 	}
 	return $global_terms;
 }
@@ -4528,8 +4658,9 @@ 
 	// Do UTC
 	$structure[] = '<optgroup label="'. esc_attr__( 'UTC' ) .'">';
 	$selected = '';
-	if ( 'UTC' === $selected_zone )
-		$selected = 'selected="selected" ';
+	if ( 'UTC' === $selected_zone ) {
+			$selected = 'selected="selected" ';
+	}
 	$structure[] = '<option ' . $selected . 'value="' . esc_attr( 'UTC' ) . '">' . __('UTC') . '</option>';
 	$structure[] = '</optgroup>';
 
@@ -4538,18 +4669,20 @@ 
 	$offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
 		0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
 	foreach ( $offset_range as $offset ) {
-		if ( 0 <= $offset )
-			$offset_name = '+' . $offset;
-		else
-			$offset_name = (string) $offset;
+		if ( 0 <= $offset ) {
+					$offset_name = '+' . $offset;
+		} else {
+					$offset_name = (string) $offset;
+		}
 
 		$offset_value = $offset_name;
 		$offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
 		$offset_name = 'UTC' . $offset_name;
 		$offset_value = 'UTC' . $offset_value;
 		$selected = '';
-		if ( $offset_value === $selected_zone )
-			$selected = 'selected="selected" ';
+		if ( $offset_value === $selected_zone ) {
+					$selected = 'selected="selected" ';
+		}
 		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
 
 	}
@@ -4592,8 +4725,9 @@ 
 
 	foreach ( (array) $posts_to_delete as $post ) {
 		$post_id = (int) $post['post_id'];
-		if ( !$post_id )
-			continue;
+		if ( !$post_id ) {
+					continue;
+		}
 
 		$del_post = get_post($post_id);
 
@@ -4609,8 +4743,9 @@ 
 
 	foreach ( (array) $comments_to_delete as $comment ) {
 		$comment_id = (int) $comment['comment_id'];
-		if ( !$comment_id )
-			continue;
+		if ( !$comment_id ) {
+					continue;
+		}
 
 		$del_comment = get_comment($comment_id);
 
@@ -4674,10 +4809,11 @@ 
 	}
 
 	foreach ( $all_headers as $field => $regex ) {
-		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] )
-			$all_headers[ $field ] = _cleanup_header_comment( $match[1] );
-		else
-			$all_headers[ $field ] = '';
+		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] ) {
+					$all_headers[ $field ] = _cleanup_header_comment( $match[1] );
+		} else {
+					$all_headers[ $field ] = '';
+		}
 	}
 
 	return $all_headers;
@@ -4820,8 +4956,9 @@ 
 function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {
 	$override = is_null( $start_parent ) ? array() : array( $start => $start_parent );
 
-	if ( !$arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) )
-		return array();
+	if ( !$arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) ) {
+			return array();
+	}
 
 	return wp_find_hierarchy_loop_tortoise_hare( $callback, $arbitrary_loop_member, $override, $callback_args, true );
 }
@@ -4859,12 +4996,14 @@ 
 	&&
 		( $hare = isset( $override[$evanescent_hare] ) ? $override[$evanescent_hare] : call_user_func_array( $callback, array_merge( array( $evanescent_hare ), $callback_args ) ) )
 	) {
-		if ( $_return_loop )
-			$return[$tortoise] = $return[$evanescent_hare] = $return[$hare] = true;
+		if ( $_return_loop ) {
+					$return[$tortoise] = $return[$evanescent_hare] = $return[$hare] = true;
+		}
 
 		// tortoise got lapped - must be a loop
-		if ( $tortoise == $evanescent_hare || $tortoise == $hare )
-			return $_return_loop ? $return : $tortoise;
+		if ( $tortoise == $evanescent_hare || $tortoise == $hare ) {
+					return $_return_loop ? $return : $tortoise;
+		}
 
 		// Increment tortoise by one step
 		$tortoise = isset( $override[$tortoise] ) ? $override[$tortoise] : call_user_func_array( $callback, array_merge( array( $tortoise ), $callback_args ) );
@@ -4936,10 +5075,11 @@ 
  *                      of individual calls.
  */
 function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pretty = true ) {
-	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) )
-		$trace = debug_backtrace( false );
-	else
-		$trace = debug_backtrace();
+	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) ) {
+			$trace = debug_backtrace( false );
+	} else {
+			$trace = debug_backtrace();
+	}
 
 	$caller = array();
 	$check_class = ! is_null( $ignore_class );
@@ -4949,8 +5089,10 @@ 
 		if ( $skip_frames > 0 ) {
 			$skip_frames--;
 		} elseif ( isset( $call['class'] ) ) {
-			if ( $check_class && $ignore_class == $call['class'] )
-				continue; // Filter out calls
+			if ( $check_class && $ignore_class == $call['class'] ) {
+							continue;
+			}
+			// Filter out calls
 
 			$caller[] = "{$call['class']}{$call['type']}{$call['function']}";
 		} else {
@@ -4963,11 +5105,12 @@ 
 			}
 		}
 	}
-	if ( $pretty )
-		return join( ', ', array_reverse( $caller ) );
-	else
-		return $caller;
-}
+	if ( $pretty ) {
+			return join( ', ', array_reverse( $caller ) );
+	} else {
+			return $caller;
+	}
+	}
 
 /**
  * Retrieve ids that are not already present in the cache.
@@ -5001,8 +5144,9 @@ 
  * @return bool Whether the device is able to upload files.
  */
 function _device_can_upload() {
-	if ( ! wp_is_mobile() )
-		return true;
+	if ( ! wp_is_mobile() ) {
+			return true;
+	}
 
 	$ua = $_SERVER['HTTP_USER_AGENT'];
 
@@ -5065,11 +5209,13 @@ 
  * @since 3.6.0
  */
 function wp_auth_check_load() {
-	if ( ! is_admin() && ! is_user_logged_in() )
-		return;
+	if ( ! is_admin() && ! is_user_logged_in() ) {
+			return;
+	}
 
-	if ( defined( 'IFRAME_REQUEST' ) )
-		return;
+	if ( defined( 'IFRAME_REQUEST' ) ) {
+			return;
+	}
 
 	$screen = get_current_screen();
 	$hidden = array( 'update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network' );
@@ -5174,8 +5320,9 @@ 
  * @return string Tag RegEx.
  */
 function get_tag_regex( $tag ) {
-	if ( empty( $tag ) )
-		return;
+	if ( empty( $tag ) ) {
+			return;
+	}
 	return sprintf( '<%1$s[^<]*(?:>[\s\S]*<\/%1$s>|\s*\/>)', tag_escape( $tag ) );
 }
 
@@ -5193,12 +5340,14 @@ 
  */
 function _canonical_charset( $charset ) {
 	if ( 'UTF-8' === $charset || 'utf-8' === $charset || 'utf8' === $charset ||
-		'UTF8' === $charset )
-		return 'UTF-8';
+		'UTF8' === $charset ) {
+			return 'UTF-8';
+	}
 
 	if ( 'ISO-8859-1' === $charset || 'iso-8859-1' === $charset ||
-		'iso8859-1' === $charset || 'ISO8859-1' === $charset )
-		return 'ISO-8859-1';
+		'iso8859-1' === $charset || 'ISO8859-1' === $charset ) {
+			return 'ISO-8859-1';
+	}
 
 	return $charset;
 }
@@ -5233,11 +5382,13 @@ 
 	static $encodings = array();
 	static $overloaded = null;
 
-	if ( is_null( $overloaded ) )
-		$overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 );
+	if ( is_null( $overloaded ) ) {
+			$overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 );
+	}
 
-	if ( false === $overloaded )
-		return;
+	if ( false === $overloaded ) {
+			return;
+	}
 
 	if ( ! $reset ) {
 		$encoding = mb_internal_encoding();

src/wp-includes/post.php

Doc Comments +9 added lines, -9 removed lines

@@ -389,7 +389,7 @@ 
  * @since 1.0.0
  *
  * @param string $post Post content.
- * @return array Post before ('main'), after ('extended'), and custom read more ('more_text').
+ * @return integer Post before ('main'), after ('extended'), and custom read more ('more_text').
  */
 function get_extended( $post ) {
 	//Match the new style more links.
@@ -1270,7 +1270,7 @@ 
  *
  * @access private
  *
- * @param object|WP_Post_Type $post_type_object Post type object.
+ * @param WP_Post_Type $post_type_object Post type object.
  * @return object Object with all the labels as member variables.
  */
 function get_post_type_labels( $post_type_object ) {
@@ -1633,7 +1633,7 @@ 
  *
  * @param int    $post_id    Post ID.
  * @param string $meta_key   Metadata name.
- * @param mixed  $meta_value Optional. Metadata value. Must be serializable if
+ * @param string  $meta_value Optional. Metadata value. Must be serializable if
  *                           non-scalar. Default empty.
  * @return bool True on success, false on failure.
  */
@@ -2584,7 +2584,7 @@ 
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
+ * @param integer $post Optional. Post ID or post object. Defaults to global $post.
  * @return mixed|void False on failure.
  */
 function wp_trash_post_comments( $post = null ) {
@@ -2640,8 +2640,8 @@ 
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
- * @return true|void
+ * @param integer $post Optional. Post ID or post object. Defaults to global $post.
+ * @return null|boolean
  */
 function wp_untrash_post_comments( $post = null ) {
 	global $wpdb;
@@ -4317,7 +4317,7 @@ 
  * @since 1.5.0
  * @since 4.6.0 Converted the `$page` parameter to optional.
  *
- * @param WP_Post|object|int $page Optional. Page ID or WP_Post object. Default is global $post.
+ * @param integer $page Optional. Page ID or WP_Post object. Default is global $post.
  * @return string|false Page URI, false on error.
  */
 function get_page_uri( $page = 0 ) {
@@ -5114,7 +5114,7 @@ 
  *
  * @since 2.1.0
  *
- * @param string|int $mime MIME type or attachment ID.
+ * @param integer $mime MIME type or attachment ID.
  * @return string|false Icon, false otherwise.
  */
 function wp_mime_type_icon( $mime = 0 ) {
@@ -6011,7 +6011,7 @@ 
  * @access private
  *
  * @param string $post_name Slug.
- * @param string $post_ID   Optional. Post ID that should be ignored. Default 0.
+ * @param integer $post_ID   Optional. Post ID that should be ignored. Default 0.
  */
 function wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID = 0 ) {
 	$trashed_posts_with_desired_slug = get_posts( array(

Spacing +1223 added lines, -1223 removed lines

@@ -18,9 +18,9 @@ 
  * @since 2.9.0
  */
 function create_initial_post_types() {
-	register_post_type( 'post', array(
+	register_post_type('post', array(
 		'labels' => array(
-			'name_admin_bar' => _x( 'Post', 'add new on admin bar' ),
+			'name_admin_bar' => _x('Post', 'add new on admin bar'),
 		),
 		'public'  => true,
 		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
@@ -32,12 +32,12 @@ 
 		'rewrite' => false,
 		'query_var' => false,
 		'delete_with_user' => true,
-		'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'post-formats' ),
-	) );
+		'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'post-formats'),
+	));
 
-	register_post_type( 'page', array(
+	register_post_type('page', array(
 		'labels' => array(
-			'name_admin_bar' => _x( 'Page', 'add new on admin bar' ),
+			'name_admin_bar' => _x('Page', 'add new on admin bar'),
 		),
 		'public' => true,
 		'publicly_queryable' => false,
@@ -50,16 +50,16 @@ 
 		'rewrite' => false,
 		'query_var' => false,
 		'delete_with_user' => true,
-		'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions' ),
-	) );
+		'supports' => array('title', 'editor', 'author', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions'),
+	));
 
-	register_post_type( 'attachment', array(
+	register_post_type('attachment', array(
 		'labels' => array(
 			'name' => _x('Media', 'post type general name'),
-			'name_admin_bar' => _x( 'Media', 'add new from admin bar' ),
-			'add_new' => _x( 'Add New', 'add new media' ),
- 			'edit_item' => __( 'Edit Media' ),
- 			'view_item' => __( 'View Attachment Page' ),
+			'name_admin_bar' => _x('Media', 'add new from admin bar'),
+			'add_new' => _x('Add New', 'add new media'),
+ 			'edit_item' => __('Edit Media'),
+ 			'view_item' => __('View Attachment Page'),
 		),
 		'public' => true,
 		'show_ui' => true,
@@ -75,15 +75,15 @@ 
 		'query_var' => false,
 		'show_in_nav_menus' => false,
 		'delete_with_user' => true,
-		'supports' => array( 'title', 'author', 'comments' ),
-	) );
-	add_post_type_support( 'attachment:audio', 'thumbnail' );
-	add_post_type_support( 'attachment:video', 'thumbnail' );
+		'supports' => array('title', 'author', 'comments'),
+	));
+	add_post_type_support('attachment:audio', 'thumbnail');
+	add_post_type_support('attachment:video', 'thumbnail');
 
-	register_post_type( 'revision', array(
+	register_post_type('revision', array(
 		'labels' => array(
-			'name' => __( 'Revisions' ),
-			'singular_name' => __( 'Revision' ),
+			'name' => __('Revisions'),
+			'singular_name' => __('Revision'),
 		),
 		'public' => false,
 		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
@@ -95,13 +95,13 @@ 
 		'query_var' => false,
 		'can_export' => false,
 		'delete_with_user' => true,
-		'supports' => array( 'author' ),
-	) );
+		'supports' => array('author'),
+	));
 
-	register_post_type( 'nav_menu_item', array(
+	register_post_type('nav_menu_item', array(
 		'labels' => array(
-			'name' => __( 'Navigation Menu Items' ),
-			'singular_name' => __( 'Navigation Menu Item' ),
+			'name' => __('Navigation Menu Items'),
+			'singular_name' => __('Navigation Menu Item'),
 		),
 		'public' => false,
 		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
@@ -109,63 +109,63 @@ 
 		'rewrite' => false,
 		'delete_with_user' => false,
 		'query_var' => false,
-	) );
+	));
 
-	register_post_status( 'publish', array(
-		'label'       => _x( 'Published', 'post status' ),
+	register_post_status('publish', array(
+		'label'       => _x('Published', 'post status'),
 		'public'      => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'future', array(
-		'label'       => _x( 'Scheduled', 'post status' ),
+	register_post_status('future', array(
+		'label'       => _x('Scheduled', 'post status'),
 		'protected'   => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'draft', array(
-		'label'       => _x( 'Draft', 'post status' ),
+	register_post_status('draft', array(
+		'label'       => _x('Draft', 'post status'),
 		'protected'   => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'pending', array(
-		'label'       => _x( 'Pending', 'post status' ),
+	register_post_status('pending', array(
+		'label'       => _x('Pending', 'post status'),
 		'protected'   => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'private', array(
-		'label'       => _x( 'Private', 'post status' ),
+	register_post_status('private', array(
+		'label'       => _x('Private', 'post status'),
 		'private'     => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'trash', array(
-		'label'       => _x( 'Trash', 'post status' ),
+	register_post_status('trash', array(
+		'label'       => _x('Trash', 'post status'),
 		'internal'    => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>' ),
+		'label_count' => _n_noop('Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>'),
 		'show_in_admin_status_list' => true,
-	) );
+	));
 
-	register_post_status( 'auto-draft', array(
+	register_post_status('auto-draft', array(
 		'label'    => 'auto-draft',
 		'internal' => true,
 		'_builtin' => true, /* internal use only. */
-	) );
+	));
 
-	register_post_status( 'inherit', array(
+	register_post_status('inherit', array(
 		'label'    => 'inherit',
 		'internal' => true,
 		'_builtin' => true, /* internal use only. */
 		'exclude_from_search' => false,
-	) );
+	));
 }
 
 /**
@@ -186,15 +186,15 @@ 
  * @param bool $unfiltered    Optional. Whether to apply filters. Default false.
  * @return string|false The file path to where the attached file should be, false otherwise.
  */
-function get_attached_file( $attachment_id, $unfiltered = false ) {
-	$file = get_post_meta( $attachment_id, '_wp_attached_file', true );
+function get_attached_file($attachment_id, $unfiltered = false) {
+	$file = get_post_meta($attachment_id, '_wp_attached_file', true);
 
 	// If the file is relative, prepend upload dir.
-	if ( $file && 0 !== strpos( $file, '/' ) && ! preg_match( '|^.:\\\|', $file ) && ( ( $uploads = wp_get_upload_dir() ) && false === $uploads['error'] ) ) {
-		$file = $uploads['basedir'] . "/$file";
+	if ($file && 0 !== strpos($file, '/') && ! preg_match('|^.:\\\|', $file) && (($uploads = wp_get_upload_dir()) && false === $uploads['error'])) {
+		$file = $uploads['basedir']."/$file";
 	}
 
-	if ( $unfiltered ) {
+	if ($unfiltered) {
 		return $file;
 	}
 
@@ -206,7 +206,7 @@ 
 	 * @param string $file          Path to attached file.
 	 * @param int    $attachment_id Attachment ID.
 	 */
-	return apply_filters( 'get_attached_file', $file, $attachment_id );
+	return apply_filters('get_attached_file', $file, $attachment_id);
 }
 
 /**
@@ -221,8 +221,8 @@ 
  * @param string $file          File path for the attachment.
  * @return bool True on success, false on failure.
  */
-function update_attached_file( $attachment_id, $file ) {
-	if ( !get_post( $attachment_id ) )
+function update_attached_file($attachment_id, $file) {
+	if ( ! get_post($attachment_id))
 		return false;
 
 	/**
@@ -233,12 +233,12 @@ 
 	 * @param string $file          Path to the attached file to update.
 	 * @param int    $attachment_id Attachment ID.
 	 */
-	$file = apply_filters( 'update_attached_file', $file, $attachment_id );
+	$file = apply_filters('update_attached_file', $file, $attachment_id);
 
-	if ( $file = _wp_relative_upload_path( $file ) )
-		return update_post_meta( $attachment_id, '_wp_attached_file', $file );
+	if ($file = _wp_relative_upload_path($file))
+		return update_post_meta($attachment_id, '_wp_attached_file', $file);
 	else
-		return delete_post_meta( $attachment_id, '_wp_attached_file' );
+		return delete_post_meta($attachment_id, '_wp_attached_file');
 }
 
 /**
@@ -251,13 +251,13 @@ 
  * @param string $path Full path to the file.
  * @return string Relative path on success, unchanged path on failure.
  */
-function _wp_relative_upload_path( $path ) {
+function _wp_relative_upload_path($path) {
 	$new_path = $path;
 
 	$uploads = wp_get_upload_dir();
-	if ( 0 === strpos( $new_path, $uploads['basedir'] ) ) {
-			$new_path = str_replace( $uploads['basedir'], '', $new_path );
-			$new_path = ltrim( $new_path, '/' );
+	if (0 === strpos($new_path, $uploads['basedir'])) {
+			$new_path = str_replace($uploads['basedir'], '', $new_path);
+			$new_path = ltrim($new_path, '/');
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
 	 * @param string $new_path Relative path to the file.
 	 * @param string $path     Full path to the file.
 	 */
-	return apply_filters( '_wp_relative_upload_path', $new_path, $path );
+	return apply_filters('_wp_relative_upload_path', $new_path, $path);
 }
 
 /**
@@ -322,17 +322,17 @@ 
  * @return array Array of children, where the type of each element is determined by $output parameter.
  *               Empty array on failure.
  */
-function get_children( $args = '', $output = OBJECT ) {
+function get_children($args = '', $output = OBJECT) {
 	$kids = array();
-	if ( empty( $args ) ) {
-		if ( isset( $GLOBALS['post'] ) ) {
-			$args = array('post_parent' => (int) $GLOBALS['post']->post_parent );
+	if (empty($args)) {
+		if (isset($GLOBALS['post'])) {
+			$args = array('post_parent' => (int) $GLOBALS['post']->post_parent);
 		} else {
 			return $kids;
 		}
-	} elseif ( is_object( $args ) ) {
-		$args = array('post_parent' => (int) $args->post_parent );
-	} elseif ( is_numeric( $args ) ) {
+	} elseif (is_object($args)) {
+		$args = array('post_parent' => (int) $args->post_parent);
+	} elseif (is_numeric($args)) {
 		$args = array('post_parent' => (int) $args);
 	}
 
@@ -341,32 +341,32 @@ 
 		'post_status' => 'any', 'post_parent' => 0,
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$children = get_posts( $r );
+	$children = get_posts($r);
 
-	if ( ! $children )
+	if ( ! $children)
 		return $kids;
 
-	if ( ! empty( $r['fields'] ) )
+	if ( ! empty($r['fields']))
 		return $children;
 
 	update_post_cache($children);
 
-	foreach ( $children as $key => $child )
+	foreach ($children as $key => $child)
 		$kids[$child->ID] = $children[$key];
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $kids;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		$weeuns = array();
-		foreach ( (array) $kids as $kid ) {
+		foreach ((array) $kids as $kid) {
 			$weeuns[$kid->ID] = get_object_vars($kids[$kid->ID]);
 		}
 		return $weeuns;
-	} elseif ( $output == ARRAY_N ) {
+	} elseif ($output == ARRAY_N) {
 		$babes = array();
-		foreach ( (array) $kids as $kid ) {
+		foreach ((array) $kids as $kid) {
 			$babes[$kid->ID] = array_values(get_object_vars($kids[$kid->ID]));
 		}
 		return $babes;
@@ -391,9 +391,9 @@ 
  * @param string $post Post content.
  * @return array Post before ('main'), after ('extended'), and custom read more ('more_text').
  */
-function get_extended( $post ) {
+function get_extended($post) {
 	//Match the new style more links.
-	if ( preg_match('/<!--more(.*?)?-->/', $post, $matches) ) {
+	if (preg_match('/<!--more(.*?)?-->/', $post, $matches)) {
 		list($main, $extended) = explode($matches[0], $post, 2);
 		$more_text = $matches[1];
 	} else {
@@ -407,7 +407,7 @@ 
 	$extended = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $extended);
 	$more_text = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $more_text);
 
-	return array( 'main' => $main, 'extended' => $extended, 'more_text' => $more_text );
+	return array('main' => $main, 'extended' => $extended, 'more_text' => $more_text);
 }
 
 /**
@@ -428,34 +428,34 @@ 
  * @return WP_Post|array|null Type corresponding to $output on success or null on failure.
  *                            When $output is OBJECT, a `WP_Post` instance is returned.
  */
-function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) {
-	if ( empty( $post ) && isset( $GLOBALS['post'] ) )
+function get_post($post = null, $output = OBJECT, $filter = 'raw') {
+	if (empty($post) && isset($GLOBALS['post']))
 		$post = $GLOBALS['post'];
 
-	if ( $post instanceof WP_Post ) {
+	if ($post instanceof WP_Post) {
 		$_post = $post;
-	} elseif ( is_object( $post ) ) {
-		if ( empty( $post->filter ) ) {
-			$_post = sanitize_post( $post, 'raw' );
-			$_post = new WP_Post( $_post );
-		} elseif ( 'raw' == $post->filter ) {
-			$_post = new WP_Post( $post );
+	} elseif (is_object($post)) {
+		if (empty($post->filter)) {
+			$_post = sanitize_post($post, 'raw');
+			$_post = new WP_Post($_post);
+		} elseif ('raw' == $post->filter) {
+			$_post = new WP_Post($post);
 		} else {
-			$_post = WP_Post::get_instance( $post->ID );
+			$_post = WP_Post::get_instance($post->ID);
 		}
 	} else {
-		$_post = WP_Post::get_instance( $post );
+		$_post = WP_Post::get_instance($post);
 	}
 
-	if ( ! $_post )
+	if ( ! $_post)
 		return null;
 
-	$_post = $_post->filter( $filter );
+	$_post = $_post->filter($filter);
 
-	if ( $output == ARRAY_A )
+	if ($output == ARRAY_A)
 		return $_post->to_array();
-	elseif ( $output == ARRAY_N )
-		return array_values( $_post->to_array() );
+	elseif ($output == ARRAY_N)
+		return array_values($_post->to_array());
 
 	return $_post;
 }
@@ -468,19 +468,19 @@ 
  * @param int|WP_Post $post Post ID or post object.
  * @return array Ancestor IDs or empty array if none are found.
  */
-function get_post_ancestors( $post ) {
-	$post = get_post( $post );
+function get_post_ancestors($post) {
+	$post = get_post($post);
 
-	if ( ! $post || empty( $post->post_parent ) || $post->post_parent == $post->ID )
+	if ( ! $post || empty($post->post_parent) || $post->post_parent == $post->ID)
 		return array();
 
 	$ancestors = array();
 
 	$id = $ancestors[] = $post->post_parent;
 
-	while ( $ancestor = get_post( $id ) ) {
+	while ($ancestor = get_post($id)) {
 		// Loop detection: If the ancestor has been seen before, break.
-		if ( empty( $ancestor->post_parent ) || ( $ancestor->post_parent == $post->ID ) || in_array( $ancestor->post_parent, $ancestors ) )
+		if (empty($ancestor->post_parent) || ($ancestor->post_parent == $post->ID) || in_array($ancestor->post_parent, $ancestors))
 			break;
 
 		$id = $ancestors[] = $ancestor->post_parent;
@@ -509,13 +509,13 @@ 
  *                             or 'display'. Default 'display'.
  * @return string The value of the post field on success, empty string on failure.
  */
-function get_post_field( $field, $post = null, $context = 'display' ) {
-	$post = get_post( $post );
+function get_post_field($field, $post = null, $context = 'display') {
+	$post = get_post($post);
 
-	if ( !$post )
+	if ( ! $post)
 		return '';
 
-	if ( !isset($post->$field) )
+	if ( ! isset($post->$field))
 		return '';
 
 	return sanitize_post_field($field, $post->$field, $post->ID, $context);
@@ -532,10 +532,10 @@ 
  * @param int|WP_Post $ID Optional. Post ID or post object. Default empty.
  * @return string|false The mime type on success, false on failure.
  */
-function get_post_mime_type( $ID = '' ) {
+function get_post_mime_type($ID = '') {
 	$post = get_post($ID);
 
-	if ( is_object($post) )
+	if (is_object($post))
 		return $post->post_mime_type;
 
 	return false;
@@ -552,25 +552,25 @@ 
  * @param int|WP_Post $ID Optional. Post ID or post object. Default empty.
  * @return string|false Post status on success, false on failure.
  */
-function get_post_status( $ID = '' ) {
+function get_post_status($ID = '') {
 	$post = get_post($ID);
 
-	if ( !is_object($post) )
+	if ( ! is_object($post))
 		return false;
 
-	if ( 'attachment' == $post->post_type ) {
-		if ( 'private' == $post->post_status )
+	if ('attachment' == $post->post_type) {
+		if ('private' == $post->post_status)
 			return 'private';
 
 		// Unattached attachments are assumed to be published.
-		if ( ( 'inherit' == $post->post_status ) && ( 0 == $post->post_parent) )
+		if (('inherit' == $post->post_status) && (0 == $post->post_parent))
 			return 'publish';
 
 		// Inherit status from the parent.
-		if ( $post->post_parent && ( $post->ID != $post->post_parent ) ) {
-			$parent_post_status = get_post_status( $post->post_parent );
-			if ( 'trash' == $parent_post_status ) {
-				return get_post_meta( $post->post_parent, '_wp_trash_meta_status', true );
+		if ($post->post_parent && ($post->ID != $post->post_parent)) {
+			$parent_post_status = get_post_status($post->post_parent);
+			if ('trash' == $parent_post_status) {
+				return get_post_meta($post->post_parent, '_wp_trash_meta_status', true);
 			} else {
 				return $parent_post_status;
 			}
@@ -586,7 +586,7 @@ 
 	 * @param string  $post_status The post status.
 	 * @param WP_Post $post        The post object.
 	 */
-	return apply_filters( 'get_post_status', $post->post_status, $post );
+	return apply_filters('get_post_status', $post->post_status, $post);
 }
 
 /**
@@ -601,10 +601,10 @@ 
  */
 function get_post_statuses() {
 	$status = array(
-		'draft'   => __( 'Draft' ),
-		'pending' => __( 'Pending Review' ),
-		'private' => __( 'Private' ),
-		'publish' => __( 'Published' )
+		'draft'   => __('Draft'),
+		'pending' => __('Pending Review'),
+		'private' => __('Private'),
+		'publish' => __('Published')
 	);
 
 	return $status;
@@ -622,9 +622,9 @@ 
  */
 function get_page_statuses() {
 	$status = array(
-		'draft'   => __( 'Draft' ),
-		'private' => __( 'Private' ),
-		'publish' => __( 'Published' )
+		'draft'   => __('Draft'),
+		'private' => __('Private'),
+		'publish' => __('Published')
 	);
 
 	return $status;
@@ -673,10 +673,10 @@ 
  * }
  * @return object
  */
-function register_post_status( $post_status, $args = array() ) {
+function register_post_status($post_status, $args = array()) {
 	global $wp_post_statuses;
 
-	if (!is_array($wp_post_statuses))
+	if ( ! is_array($wp_post_statuses))
 		$wp_post_statuses = array();
 
 	// Args prefixed with an underscore are reserved for internal use.
@@ -700,38 +700,38 @@ 
 	$args->name = $post_status;
 
 	// Set various defaults.
-	if ( null === $args->public && null === $args->internal && null === $args->protected && null === $args->private )
+	if (null === $args->public && null === $args->internal && null === $args->protected && null === $args->private)
 		$args->internal = true;
 
-	if ( null === $args->public  )
+	if (null === $args->public)
 		$args->public = false;
 
-	if ( null === $args->private  )
+	if (null === $args->private)
 		$args->private = false;
 
-	if ( null === $args->protected  )
+	if (null === $args->protected)
 		$args->protected = false;
 
-	if ( null === $args->internal  )
+	if (null === $args->internal)
 		$args->internal = false;
 
-	if ( null === $args->publicly_queryable )
+	if (null === $args->publicly_queryable)
 		$args->publicly_queryable = $args->public;
 
-	if ( null === $args->exclude_from_search )
+	if (null === $args->exclude_from_search)
 		$args->exclude_from_search = $args->internal;
 
-	if ( null === $args->show_in_admin_all_list )
-		$args->show_in_admin_all_list = !$args->internal;
+	if (null === $args->show_in_admin_all_list)
+		$args->show_in_admin_all_list = ! $args->internal;
 
-	if ( null === $args->show_in_admin_status_list )
-		$args->show_in_admin_status_list = !$args->internal;
+	if (null === $args->show_in_admin_status_list)
+		$args->show_in_admin_status_list = ! $args->internal;
 
-	if ( false === $args->label )
+	if (false === $args->label)
 		$args->label = $post_status;
 
-	if ( false === $args->label_count )
-		$args->label_count = array( $args->label, $args->label );
+	if (false === $args->label_count)
+		$args->label_count = array($args->label, $args->label);
 
 	$wp_post_statuses[$post_status] = $args;
 
@@ -750,10 +750,10 @@ 
  * @param string $post_status The name of a registered post status.
  * @return object|null A post status object.
  */
-function get_post_status_object( $post_status ) {
+function get_post_status_object($post_status) {
 	global $wp_post_statuses;
 
-	if ( empty($wp_post_statuses[$post_status]) )
+	if (empty($wp_post_statuses[$post_status]))
 		return null;
 
 	return $wp_post_statuses[$post_status];
@@ -776,7 +776,7 @@ 
  *                               Default 'and'.
  * @return array A list of post status names or objects.
  */
-function get_post_stati( $args = array(), $output = 'names', $operator = 'and' ) {
+function get_post_stati($args = array(), $output = 'names', $operator = 'and') {
 	global $wp_post_statuses;
 
 	$field = ('names' == $output) ? 'name' : false;
@@ -796,11 +796,11 @@ 
  * @param string $post_type Post type name
  * @return bool Whether post type is hierarchical.
  */
-function is_post_type_hierarchical( $post_type ) {
-	if ( ! post_type_exists( $post_type ) )
+function is_post_type_hierarchical($post_type) {
+	if ( ! post_type_exists($post_type))
 		return false;
 
-	$post_type = get_post_type_object( $post_type );
+	$post_type = get_post_type_object($post_type);
 	return $post_type->hierarchical;
 }
 
@@ -814,8 +814,8 @@ 
  * @param string $post_type Post type name.
  * @return bool Whether post type is registered.
  */
-function post_type_exists( $post_type ) {
-	return (bool) get_post_type_object( $post_type );
+function post_type_exists($post_type) {
+	return (bool) get_post_type_object($post_type);
 }
 
 /**
@@ -826,8 +826,8 @@ 
  * @param int|WP_Post|null $post Optional. Post ID or post object. Default is global $post.
  * @return string|false          Post type on success, false on failure.
  */
-function get_post_type( $post = null ) {
-	if ( $post = get_post( $post ) )
+function get_post_type($post = null) {
+	if ($post = get_post($post))
 		return $post->post_type;
 
 	return false;
@@ -846,14 +846,14 @@ 
  * @param string $post_type The name of a registered post type.
  * @return WP_Post_Type|null WP_Post_Type object if it exists, null otherwise.
  */
-function get_post_type_object( $post_type ) {
+function get_post_type_object($post_type) {
 	global $wp_post_types;
 
-	if ( ! is_scalar( $post_type ) || empty( $wp_post_types[ $post_type ] ) ) {
+	if ( ! is_scalar($post_type) || empty($wp_post_types[$post_type])) {
 		return null;
 	}
 
-	return $wp_post_types[ $post_type ];
+	return $wp_post_types[$post_type];
 }
 
 /**
@@ -874,7 +874,7 @@ 
  *                               must match; 'not' means no elements may match. Default 'and'.
  * @return array A list of post type names or objects.
  */
-function get_post_types( $args = array(), $output = 'names', $operator = 'and' ) {
+function get_post_types($args = array(), $output = 'names', $operator = 'and') {
 	global $wp_post_types;
 
 	$field = ('names' == $output) ? 'name' : false;
@@ -1013,27 +1013,27 @@ 
  * }
  * @return WP_Post_Type|WP_Error The registered post type object, or an error object.
  */
-function register_post_type( $post_type, $args = array() ) {
+function register_post_type($post_type, $args = array()) {
 	global $wp_post_types;
 
-	if ( ! is_array( $wp_post_types ) ) {
+	if ( ! is_array($wp_post_types)) {
 		$wp_post_types = array();
 	}
 
 	// Sanitize post type name
-	$post_type = sanitize_key( $post_type );
+	$post_type = sanitize_key($post_type);
 
-	if ( empty( $post_type ) || strlen( $post_type ) > 20 ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Post type names must be between 1 and 20 characters in length.' ), '4.2.0' );
-		return new WP_Error( 'post_type_length_invalid', __( 'Post type names must be between 1 and 20 characters in length.' ) );
+	if (empty($post_type) || strlen($post_type) > 20) {
+		_doing_it_wrong(__FUNCTION__, __('Post type names must be between 1 and 20 characters in length.'), '4.2.0');
+		return new WP_Error('post_type_length_invalid', __('Post type names must be between 1 and 20 characters in length.'));
 	}
 
-	$post_type_object = new WP_Post_Type( $post_type, $args );
+	$post_type_object = new WP_Post_Type($post_type, $args);
 	$post_type_object->add_supports();
 	$post_type_object->add_rewrite_rules();
 	$post_type_object->register_meta_boxes();
 
-	$wp_post_types[ $post_type ] = $post_type_object;
+	$wp_post_types[$post_type] = $post_type_object;
 
 	$post_type_object->add_hooks();
 	$post_type_object->register_taxonomies();
@@ -1047,7 +1047,7 @@ 
 	 * @param string       $post_type        Post type.
 	 * @param WP_Post_Type $post_type_object Arguments used to register the post type.
 	 */
-	do_action( 'registered_post_type', $post_type, $post_type_object );
+	do_action('registered_post_type', $post_type, $post_type_object);
 
 	return $post_type_object;
 }
@@ -1064,18 +1064,18 @@ 
  * @param string $post_type Post type to unregister.
  * @return bool|WP_Error True on success, WP_Error on failure or if the post type doesn't exist.
  */
-function unregister_post_type( $post_type ) {
+function unregister_post_type($post_type) {
 	global $wp_post_types;
 
-	if ( ! post_type_exists( $post_type ) ) {
-		return new WP_Error( 'invalid_post_type', __( 'Invalid post type.' ) );
+	if ( ! post_type_exists($post_type)) {
+		return new WP_Error('invalid_post_type', __('Invalid post type.'));
 	}
 
-	$post_type_object = get_post_type_object( $post_type );
+	$post_type_object = get_post_type_object($post_type);
 
 	// Do not allow unregistering internal post types.
-	if ( $post_type_object->_builtin ) {
-		return new WP_Error( 'invalid_post_type', __( 'Unregistering a built-in post type is not allowed' ) );
+	if ($post_type_object->_builtin) {
+		return new WP_Error('invalid_post_type', __('Unregistering a built-in post type is not allowed'));
 	}
 
 	$post_type_object->remove_supports();
@@ -1084,7 +1084,7 @@ 
 	$post_type_object->remove_hooks();
 	$post_type_object->unregister_taxonomies();
 
-	unset( $wp_post_types[ $post_type ] );
+	unset($wp_post_types[$post_type]);
 
 	/**
 	 * Fires after a post type was unregistered.
@@ -1093,7 +1093,7 @@ 
 	 *
 	 * @param string $post_type Post type key.
 	 */
-	do_action( 'unregistered_post_type', $post_type );
+	do_action('unregistered_post_type', $post_type);
 
 	return true;
 }
@@ -1153,48 +1153,48 @@ 
  * @param object $args Post type registration arguments.
  * @return object object with all the capabilities as member variables.
  */
-function get_post_type_capabilities( $args ) {
-	if ( ! is_array( $args->capability_type ) )
-		$args->capability_type = array( $args->capability_type, $args->capability_type . 's' );
+function get_post_type_capabilities($args) {
+	if ( ! is_array($args->capability_type))
+		$args->capability_type = array($args->capability_type, $args->capability_type.'s');
 
 	// Singular base for meta capabilities, plural base for primitive capabilities.
-	list( $singular_base, $plural_base ) = $args->capability_type;
+	list($singular_base, $plural_base) = $args->capability_type;
 
 	$default_capabilities = array(
 		// Meta capabilities
-		'edit_post'          => 'edit_'         . $singular_base,
-		'read_post'          => 'read_'         . $singular_base,
-		'delete_post'        => 'delete_'       . $singular_base,
+		'edit_post'          => 'edit_'.$singular_base,
+		'read_post'          => 'read_'.$singular_base,
+		'delete_post'        => 'delete_'.$singular_base,
 		// Primitive capabilities used outside of map_meta_cap():
-		'edit_posts'         => 'edit_'         . $plural_base,
-		'edit_others_posts'  => 'edit_others_'  . $plural_base,
-		'publish_posts'      => 'publish_'      . $plural_base,
-		'read_private_posts' => 'read_private_' . $plural_base,
+		'edit_posts'         => 'edit_'.$plural_base,
+		'edit_others_posts'  => 'edit_others_'.$plural_base,
+		'publish_posts'      => 'publish_'.$plural_base,
+		'read_private_posts' => 'read_private_'.$plural_base,
 	);
 
 	// Primitive capabilities used within map_meta_cap():
-	if ( $args->map_meta_cap ) {
+	if ($args->map_meta_cap) {
 		$default_capabilities_for_mapping = array(
 			'read'                   => 'read',
-			'delete_posts'           => 'delete_'           . $plural_base,
-			'delete_private_posts'   => 'delete_private_'   . $plural_base,
-			'delete_published_posts' => 'delete_published_' . $plural_base,
-			'delete_others_posts'    => 'delete_others_'    . $plural_base,
-			'edit_private_posts'     => 'edit_private_'     . $plural_base,
-			'edit_published_posts'   => 'edit_published_'   . $plural_base,
+			'delete_posts'           => 'delete_'.$plural_base,
+			'delete_private_posts'   => 'delete_private_'.$plural_base,
+			'delete_published_posts' => 'delete_published_'.$plural_base,
+			'delete_others_posts'    => 'delete_others_'.$plural_base,
+			'edit_private_posts'     => 'edit_private_'.$plural_base,
+			'edit_published_posts'   => 'edit_published_'.$plural_base,
 		);
-		$default_capabilities = array_merge( $default_capabilities, $default_capabilities_for_mapping );
+		$default_capabilities = array_merge($default_capabilities, $default_capabilities_for_mapping);
 	}
 
-	$capabilities = array_merge( $default_capabilities, $args->capabilities );
+	$capabilities = array_merge($default_capabilities, $args->capabilities);
 
 	// Post creation capability simply maps to edit_posts by default:
-	if ( ! isset( $capabilities['create_posts'] ) )
+	if ( ! isset($capabilities['create_posts']))
 		$capabilities['create_posts'] = $capabilities['edit_posts'];
 
 	// Remember meta capabilities for future reference.
-	if ( $args->map_meta_cap )
-		_post_type_meta_capabilities( $capabilities );
+	if ($args->map_meta_cap)
+		_post_type_meta_capabilities($capabilities);
 
 	return (object) $capabilities;
 }
@@ -1209,12 +1209,12 @@ 
  *
  * @param array $capabilities Post type meta capabilities.
  */
-function _post_type_meta_capabilities( $capabilities = null ) {
+function _post_type_meta_capabilities($capabilities = null) {
 	global $post_type_meta_caps;
 
-	foreach ( $capabilities as $core => $custom ) {
-		if ( in_array( $core, array( 'read_post', 'delete_post', 'edit_post' ) ) ) {
-			$post_type_meta_caps[ $custom ] = $core;
+	foreach ($capabilities as $core => $custom) {
+		if (in_array($core, array('read_post', 'delete_post', 'edit_post'))) {
+			$post_type_meta_caps[$custom] = $core;
 		}
 	}
 }
@@ -1273,34 +1273,34 @@ 
  * @param object|WP_Post_Type $post_type_object Post type object.
  * @return object Object with all the labels as member variables.
  */
-function get_post_type_labels( $post_type_object ) {
+function get_post_type_labels($post_type_object) {
 	$nohier_vs_hier_defaults = array(
-		'name' => array( _x('Posts', 'post type general name'), _x('Pages', 'post type general name') ),
-		'singular_name' => array( _x('Post', 'post type singular name'), _x('Page', 'post type singular name') ),
-		'add_new' => array( _x('Add New', 'post'), _x('Add New', 'page') ),
-		'add_new_item' => array( __('Add New Post'), __('Add New Page') ),
-		'edit_item' => array( __('Edit Post'), __('Edit Page') ),
-		'new_item' => array( __('New Post'), __('New Page') ),
-		'view_item' => array( __('View Post'), __('View Page') ),
-		'search_items' => array( __('Search Posts'), __('Search Pages') ),
-		'not_found' => array( __('No posts found.'), __('No pages found.') ),
-		'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
-		'parent_item_colon' => array( null, __('Parent Page:') ),
-		'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) ),
-		'archives' => array( __( 'Post Archives' ), __( 'Page Archives' ) ),
-		'insert_into_item' => array( __( 'Insert into post' ), __( 'Insert into page' ) ),
-		'uploaded_to_this_item' => array( __( 'Uploaded to this post' ), __( 'Uploaded to this page' ) ),
-		'featured_image' => array( __( 'Featured Image' ), __( 'Featured Image' ) ),
-		'set_featured_image' => array( __( 'Set featured image' ), __( 'Set featured image' ) ),
-		'remove_featured_image' => array( __( 'Remove featured image' ), __( 'Remove featured image' ) ),
-		'use_featured_image' => array( __( 'Use as featured image' ), __( 'Use as featured image' ) ),
-		'filter_items_list' => array( __( 'Filter posts list' ), __( 'Filter pages list' ) ),
-		'items_list_navigation' => array( __( 'Posts list navigation' ), __( 'Pages list navigation' ) ),
-		'items_list' => array( __( 'Posts list' ), __( 'Pages list' ) ),
+		'name' => array(_x('Posts', 'post type general name'), _x('Pages', 'post type general name')),
+		'singular_name' => array(_x('Post', 'post type singular name'), _x('Page', 'post type singular name')),
+		'add_new' => array(_x('Add New', 'post'), _x('Add New', 'page')),
+		'add_new_item' => array(__('Add New Post'), __('Add New Page')),
+		'edit_item' => array(__('Edit Post'), __('Edit Page')),
+		'new_item' => array(__('New Post'), __('New Page')),
+		'view_item' => array(__('View Post'), __('View Page')),
+		'search_items' => array(__('Search Posts'), __('Search Pages')),
+		'not_found' => array(__('No posts found.'), __('No pages found.')),
+		'not_found_in_trash' => array(__('No posts found in Trash.'), __('No pages found in Trash.')),
+		'parent_item_colon' => array(null, __('Parent Page:')),
+		'all_items' => array(__('All Posts'), __('All Pages')),
+		'archives' => array(__('Post Archives'), __('Page Archives')),
+		'insert_into_item' => array(__('Insert into post'), __('Insert into page')),
+		'uploaded_to_this_item' => array(__('Uploaded to this post'), __('Uploaded to this page')),
+		'featured_image' => array(__('Featured Image'), __('Featured Image')),
+		'set_featured_image' => array(__('Set featured image'), __('Set featured image')),
+		'remove_featured_image' => array(__('Remove featured image'), __('Remove featured image')),
+		'use_featured_image' => array(__('Use as featured image'), __('Use as featured image')),
+		'filter_items_list' => array(__('Filter posts list'), __('Filter pages list')),
+		'items_list_navigation' => array(__('Posts list navigation'), __('Pages list navigation')),
+		'items_list' => array(__('Posts list'), __('Pages list')),
 	);
 	$nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
 
-	$labels = _get_custom_object_labels( $post_type_object, $nohier_vs_hier_defaults );
+	$labels = _get_custom_object_labels($post_type_object, $nohier_vs_hier_defaults);
 
 	$post_type = $post_type_object->name;
 
@@ -1318,10 +1318,10 @@ 
 	 *
 	 * @param object $labels Object with labels for the post type as member variables.
 	 */
-	$labels = apply_filters( "post_type_labels_{$post_type}", $labels );
+	$labels = apply_filters("post_type_labels_{$post_type}", $labels);
 
 	// Ensure that the filtered labels contain all required default values.
-	$labels = (object) array_merge( (array) $default_labels, (array) $labels );
+	$labels = (object) array_merge((array) $default_labels, (array) $labels);
 
 	return $labels;
 }
@@ -1337,33 +1337,33 @@ 
  * @param array  $nohier_vs_hier_defaults Hierarchical vs non-hierarchical default labels.
  * @return object Object containing labels for the given custom-something object.
  */
-function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
+function _get_custom_object_labels($object, $nohier_vs_hier_defaults) {
 	$object->labels = (array) $object->labels;
 
-	if ( isset( $object->label ) && empty( $object->labels['name'] ) )
+	if (isset($object->label) && empty($object->labels['name']))
 		$object->labels['name'] = $object->label;
 
-	if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) )
+	if ( ! isset($object->labels['singular_name']) && isset($object->labels['name']))
 		$object->labels['singular_name'] = $object->labels['name'];
 
-	if ( ! isset( $object->labels['name_admin_bar'] ) )
-		$object->labels['name_admin_bar'] = isset( $object->labels['singular_name'] ) ? $object->labels['singular_name'] : $object->name;
+	if ( ! isset($object->labels['name_admin_bar']))
+		$object->labels['name_admin_bar'] = isset($object->labels['singular_name']) ? $object->labels['singular_name'] : $object->name;
 
-	if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) )
+	if ( ! isset($object->labels['menu_name']) && isset($object->labels['name']))
 		$object->labels['menu_name'] = $object->labels['name'];
 
-	if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) )
+	if ( ! isset($object->labels['all_items']) && isset($object->labels['menu_name']))
 		$object->labels['all_items'] = $object->labels['menu_name'];
 
-	if ( !isset( $object->labels['archives'] ) && isset( $object->labels['all_items'] ) ) {
+	if ( ! isset($object->labels['archives']) && isset($object->labels['all_items'])) {
 		$object->labels['archives'] = $object->labels['all_items'];
 	}
 
 	$defaults = array();
-	foreach ( $nohier_vs_hier_defaults as $key => $value ) {
+	foreach ($nohier_vs_hier_defaults as $key => $value) {
 		$defaults[$key] = $object->hierarchical ? $value[1] : $value[0];
 	}
-	$labels = array_merge( $defaults, $object->labels );
+	$labels = array_merge($defaults, $object->labels);
 	$object->labels = (object) $object->labels;
 
 	return (object) $labels;
@@ -1376,12 +1376,12 @@ 
  * @since 3.1.0
  */
 function _add_post_type_submenus() {
-	foreach ( get_post_types( array( 'show_ui' => true ) ) as $ptype ) {
-		$ptype_obj = get_post_type_object( $ptype );
+	foreach (get_post_types(array('show_ui' => true)) as $ptype) {
+		$ptype_obj = get_post_type_object($ptype);
 		// Sub-menus only.
-		if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true )
+		if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true)
 			continue;
-		add_submenu_page( $ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype" );
+		add_submenu_page($ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype");
 	}
 }
 
@@ -1405,15 +1405,15 @@ 
  * @param string|array $feature   The feature being added, accepts an array of
  *                                feature strings or a single string.
  */
-function add_post_type_support( $post_type, $feature ) {
+function add_post_type_support($post_type, $feature) {
 	global $_wp_post_type_features;
 
 	$features = (array) $feature;
 	foreach ($features as $feature) {
-		if ( func_num_args() == 2 )
+		if (func_num_args() == 2)
 			$_wp_post_type_features[$post_type][$feature] = true;
 		else
-			$_wp_post_type_features[$post_type][$feature] = array_slice( func_get_args(), 2 );
+			$_wp_post_type_features[$post_type][$feature] = array_slice(func_get_args(), 2);
 	}
 }
 
@@ -1427,10 +1427,10 @@ 
  * @param string $post_type The post type for which to remove the feature.
  * @param string $feature   The feature being removed.
  */
-function remove_post_type_support( $post_type, $feature ) {
+function remove_post_type_support($post_type, $feature) {
 	global $_wp_post_type_features;
 
-	unset( $_wp_post_type_features[ $post_type ][ $feature ] );
+	unset($_wp_post_type_features[$post_type][$feature]);
 }
 
 /**
@@ -1443,10 +1443,10 @@ 
  * @param string $post_type The post type.
  * @return array Post type supports list.
  */
-function get_all_post_type_supports( $post_type ) {
+function get_all_post_type_supports($post_type) {
 	global $_wp_post_type_features;
 
-	if ( isset( $_wp_post_type_features[$post_type] ) )
+	if (isset($_wp_post_type_features[$post_type]))
 		return $_wp_post_type_features[$post_type];
 
 	return array();
@@ -1463,10 +1463,10 @@ 
  * @param string $feature   The feature being checked.
  * @return bool Whether the post type supports the given feature.
  */
-function post_type_supports( $post_type, $feature ) {
+function post_type_supports($post_type, $feature) {
 	global $_wp_post_type_features;
 
-	return ( isset( $_wp_post_type_features[$post_type][$feature] ) );
+	return (isset($_wp_post_type_features[$post_type][$feature]));
 }
 
 /**
@@ -1483,12 +1483,12 @@ 
  *                               match. Default 'and'.
  * @return array A list of post type names.
  */
-function get_post_types_by_support( $feature, $operator = 'and' ) {
+function get_post_types_by_support($feature, $operator = 'and') {
 	global $_wp_post_type_features;
 
-	$features = array_fill_keys( (array) $feature, true );
+	$features = array_fill_keys((array) $feature, true);
 
-	return array_keys( wp_filter_object_list( $_wp_post_type_features, $features, $operator ) );
+	return array_keys(wp_filter_object_list($_wp_post_type_features, $features, $operator));
 }
 
 /**
@@ -1505,13 +1505,13 @@ 
  *                          name a few. Default 'post'.
  * @return int|false Amount of rows changed. Should be 1 for success and 0 for failure.
  */
-function set_post_type( $post_id = 0, $post_type = 'post' ) {
+function set_post_type($post_id = 0, $post_type = 'post') {
 	global $wpdb;
 
 	$post_type = sanitize_post_field('post_type', $post_type, $post_id, 'db');
-	$return = $wpdb->update( $wpdb->posts, array('post_type' => $post_type), array('ID' => $post_id) );
+	$return = $wpdb->update($wpdb->posts, array('post_type' => $post_type), array('ID' => $post_id));
 
-	clean_post_cache( $post_id );
+	clean_post_cache($post_id);
 
 	return $return;
 }
@@ -1529,15 +1529,15 @@ 
  * @param string|WP_Post_Type $post_type Post type name or object.
  * @return bool Whether the post type should be considered viewable.
  */
-function is_post_type_viewable( $post_type ) {
-	if ( is_scalar( $post_type ) ) {
-		$post_type = get_post_type_object( $post_type );
-		if ( ! $post_type ) {
+function is_post_type_viewable($post_type) {
+	if (is_scalar($post_type)) {
+		$post_type = get_post_type_object($post_type);
+		if ( ! $post_type) {
 			return false;
 		}
 	}
 
-	return $post_type->publicly_queryable || ( $post_type->_builtin && $post_type->public );
+	return $post_type->publicly_queryable || ($post_type->_builtin && $post_type->public);
 }
 
 /**
@@ -1564,7 +1564,7 @@ 
  * }
  * @return array List of posts.
  */
-function get_posts( $args = null ) {
+function get_posts($args = null) {
 	$defaults = array(
 		'numberposts' => 5,
 		'category' => 0, 'orderby' => 'date',
@@ -1574,19 +1574,19 @@ 
 		'suppress_filters' => true
 	);
 
-	$r = wp_parse_args( $args, $defaults );
-	if ( empty( $r['post_status'] ) )
-		$r['post_status'] = ( 'attachment' == $r['post_type'] ) ? 'inherit' : 'publish';
-	if ( ! empty($r['numberposts']) && empty($r['posts_per_page']) )
+	$r = wp_parse_args($args, $defaults);
+	if (empty($r['post_status']))
+		$r['post_status'] = ('attachment' == $r['post_type']) ? 'inherit' : 'publish';
+	if ( ! empty($r['numberposts']) && empty($r['posts_per_page']))
 		$r['posts_per_page'] = $r['numberposts'];
-	if ( ! empty($r['category']) )
+	if ( ! empty($r['category']))
 		$r['cat'] = $r['category'];
-	if ( ! empty($r['include']) ) {
-		$incposts = wp_parse_id_list( $r['include'] );
-		$r['posts_per_page'] = count($incposts);  // only the number of posts included
+	if ( ! empty($r['include'])) {
+		$incposts = wp_parse_id_list($r['include']);
+		$r['posts_per_page'] = count($incposts); // only the number of posts included
 		$r['post__in'] = $incposts;
-	} elseif ( ! empty($r['exclude']) )
-		$r['post__not_in'] = wp_parse_id_list( $r['exclude'] );
+	} elseif ( ! empty($r['exclude']))
+		$r['post__not_in'] = wp_parse_id_list($r['exclude']);
 
 	$r['ignore_sticky_posts'] = true;
 	$r['no_found_rows'] = true;
@@ -1614,9 +1614,9 @@ 
  *                           Default false.
  * @return int|false Meta ID on success, false on failure.
  */
-function add_post_meta( $post_id, $meta_key, $meta_value, $unique = false ) {
+function add_post_meta($post_id, $meta_key, $meta_value, $unique = false) {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
+	if ($the_post = wp_is_post_revision($post_id))
 		$post_id = $the_post;
 
 	return add_metadata('post', $post_id, $meta_key, $meta_value, $unique);
@@ -1637,9 +1637,9 @@ 
  *                           non-scalar. Default empty.
  * @return bool True on success, false on failure.
  */
-function delete_post_meta( $post_id, $meta_key, $meta_value = '' ) {
+function delete_post_meta($post_id, $meta_key, $meta_value = '') {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
+	if ($the_post = wp_is_post_revision($post_id))
 		$post_id = $the_post;
 
 	return delete_metadata('post', $post_id, $meta_key, $meta_value);
@@ -1657,7 +1657,7 @@ 
  * @return mixed Will be an array if $single is false. Will be value of meta data
  *               field if $single is true.
  */
-function get_post_meta( $post_id, $key = '', $single = false ) {
+function get_post_meta($post_id, $key = '', $single = false) {
 	return get_metadata('post', $post_id, $key, $single);
 }
 
@@ -1679,9 +1679,9 @@ 
  * @return int|bool Meta ID if the key didn't exist, true on successful update,
  *                  false on failure.
  */
-function update_post_meta( $post_id, $meta_key, $meta_value, $prev_value = '' ) {
+function update_post_meta($post_id, $meta_key, $meta_value, $prev_value = '') {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
+	if ($the_post = wp_is_post_revision($post_id))
 		$post_id = $the_post;
 
 	return update_metadata('post', $post_id, $meta_key, $meta_value, $prev_value);
@@ -1695,8 +1695,8 @@ 
  * @param string $post_meta_key Key to search for when deleting.
  * @return bool Whether the post meta key was deleted from the database.
  */
-function delete_post_meta_by_key( $post_meta_key ) {
-	return delete_metadata( 'post', null, $post_meta_key, '', true );
+function delete_post_meta_by_key($post_meta_key) {
+	return delete_metadata('post', null, $post_meta_key, '', true);
 }
 
 /**
@@ -1710,12 +1710,12 @@ 
  * @param int $post_id Optional. Post ID. Default is ID of the global $post.
  * @return array Post meta for the given post.
  */
-function get_post_custom( $post_id = 0 ) {
-	$post_id = absint( $post_id );
-	if ( ! $post_id )
+function get_post_custom($post_id = 0) {
+	$post_id = absint($post_id);
+	if ( ! $post_id)
 		$post_id = get_the_ID();
 
-	return get_post_meta( $post_id );
+	return get_post_meta($post_id);
 }
 
 /**
@@ -1728,13 +1728,13 @@ 
  * @param int $post_id Optional. Post ID. Default is ID of the global $post.
  * @return array|void Array of the keys, if retrieved.
  */
-function get_post_custom_keys( $post_id = 0 ) {
-	$custom = get_post_custom( $post_id );
+function get_post_custom_keys($post_id = 0) {
+	$custom = get_post_custom($post_id);
 
-	if ( !is_array($custom) )
+	if ( ! is_array($custom))
 		return;
 
-	if ( $keys = array_keys($custom) )
+	if ($keys = array_keys($custom))
 		return $keys;
 }
 
@@ -1750,8 +1750,8 @@ 
  * @param int    $post_id Optional. Post ID. Default is ID of the global $post.
  * @return array|null Meta field values.
  */
-function get_post_custom_values( $key = '', $post_id = 0 ) {
-	if ( !$key )
+function get_post_custom_values($key = '', $post_id = 0) {
+	if ( ! $key)
 		return null;
 
 	$custom = get_post_custom($post_id);
@@ -1770,18 +1770,18 @@ 
  * @param int $post_id Optional. Post ID. Default is ID of the global $post.
  * @return bool Whether post is sticky.
  */
-function is_sticky( $post_id = 0 ) {
-	$post_id = absint( $post_id );
+function is_sticky($post_id = 0) {
+	$post_id = absint($post_id);
 
-	if ( ! $post_id )
+	if ( ! $post_id)
 		$post_id = get_the_ID();
 
-	$stickies = get_option( 'sticky_posts' );
+	$stickies = get_option('sticky_posts');
 
-	if ( ! is_array( $stickies ) )
+	if ( ! is_array($stickies))
 		return false;
 
-	if ( in_array( $post_id, $stickies ) )
+	if (in_array($post_id, $stickies))
 		return true;
 
 	return false;
@@ -1804,23 +1804,23 @@ 
  * @return object|WP_Post|array The now sanitized Post Object or Array (will be the
  *                              same type as $post).
  */
-function sanitize_post( $post, $context = 'display' ) {
-	if ( is_object($post) ) {
+function sanitize_post($post, $context = 'display') {
+	if (is_object($post)) {
 		// Check if post already filtered for this context.
-		if ( isset($post->filter) && $context == $post->filter )
+		if (isset($post->filter) && $context == $post->filter)
 			return $post;
-		if ( !isset($post->ID) )
+		if ( ! isset($post->ID))
 			$post->ID = 0;
-		foreach ( array_keys(get_object_vars($post)) as $field )
+		foreach (array_keys(get_object_vars($post)) as $field)
 			$post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
 		$post->filter = $context;
-	} elseif ( is_array( $post ) ) {
+	} elseif (is_array($post)) {
 		// Check if post already filtered for this context.
-		if ( isset($post['filter']) && $context == $post['filter'] )
+		if (isset($post['filter']) && $context == $post['filter'])
 			return $post;
-		if ( !isset($post['ID']) )
+		if ( ! isset($post['ID']))
 			$post['ID'] = 0;
-		foreach ( array_keys($post) as $field )
+		foreach (array_keys($post) as $field)
 			$post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);
 		$post['filter'] = $context;
 	}
@@ -1844,31 +1844,31 @@ 
  *                        'db', 'display', 'attribute' and 'js'. Default 'display'.
  * @return mixed Sanitized value.
  */
-function sanitize_post_field( $field, $value, $post_id, $context = 'display' ) {
+function sanitize_post_field($field, $value, $post_id, $context = 'display') {
 	$int_fields = array('ID', 'post_parent', 'menu_order');
-	if ( in_array($field, $int_fields) )
+	if (in_array($field, $int_fields))
 		$value = (int) $value;
 
 	// Fields which contain arrays of integers.
-	$array_int_fields = array( 'ancestors' );
-	if ( in_array($field, $array_int_fields) ) {
-		$value = array_map( 'absint', $value);
+	$array_int_fields = array('ancestors');
+	if (in_array($field, $array_int_fields)) {
+		$value = array_map('absint', $value);
 		return $value;
 	}
 
-	if ( 'raw' == $context )
+	if ('raw' == $context)
 		return $value;
 
 	$prefixed = false;
-	if ( false !== strpos($field, 'post_') ) {
+	if (false !== strpos($field, 'post_')) {
 		$prefixed = true;
 		$field_no_prefix = str_replace('post_', '', $field);
 	}
 
-	if ( 'edit' == $context ) {
+	if ('edit' == $context) {
 		$format_to_edit = array('post_content', 'post_excerpt', 'post_title', 'post_password');
 
-		if ( $prefixed ) {
+		if ($prefixed) {
 
 			/**
 			 * Filters the value of a specific post field to edit.
@@ -1881,7 +1881,7 @@ 
 			 * @param mixed $value   Value of the post field.
 			 * @param int   $post_id Post ID.
 			 */
-			$value = apply_filters( "edit_{$field}", $value, $post_id );
+			$value = apply_filters("edit_{$field}", $value, $post_id);
 
 			/**
 			 * Filters the value of a specific post field to edit.
@@ -1894,21 +1894,21 @@ 
 			 * @param mixed $value   Value of the post field.
 			 * @param int   $post_id Post ID.
 			 */
-			$value = apply_filters( "{$field_no_prefix}_edit_pre", $value, $post_id );
+			$value = apply_filters("{$field_no_prefix}_edit_pre", $value, $post_id);
 		} else {
-			$value = apply_filters( "edit_post_{$field}", $value, $post_id );
+			$value = apply_filters("edit_post_{$field}", $value, $post_id);
 		}
 
-		if ( in_array($field, $format_to_edit) ) {
-			if ( 'post_content' == $field )
+		if (in_array($field, $format_to_edit)) {
+			if ('post_content' == $field)
 				$value = format_to_edit($value, user_can_richedit());
 			else
 				$value = format_to_edit($value);
 		} else {
 			$value = esc_attr($value);
 		}
-	} elseif ( 'db' == $context ) {
-		if ( $prefixed ) {
+	} elseif ('db' == $context) {
+		if ($prefixed) {
 
 			/**
 			 * Filters the value of a specific post field before saving.
@@ -1920,7 +1920,7 @@ 
 			 *
 			 * @param mixed $value Value of the post field.
 			 */
-			$value = apply_filters( "pre_{$field}", $value );
+			$value = apply_filters("pre_{$field}", $value);
 
 			/**
 			 * Filters the value of a specific field before saving.
@@ -1932,9 +1932,9 @@ 
 			 *
 			 * @param mixed $value Value of the post field.
 			 */
-			$value = apply_filters( "{$field_no_prefix}_save_pre", $value );
+			$value = apply_filters("{$field_no_prefix}_save_pre", $value);
 		} else {
-			$value = apply_filters( "pre_post_{$field}", $value );
+			$value = apply_filters("pre_post_{$field}", $value);
 
 			/**
 			 * Filters the value of a specific post field before saving.
@@ -1946,12 +1946,12 @@ 
 			 *
 			 * @param mixed $value Value of the post field.
 			 */
-			$value = apply_filters( "{$field}_pre", $value );
+			$value = apply_filters("{$field}_pre", $value);
 		}
 	} else {
 
 		// Use display filters by default.
-		if ( $prefixed ) {
+		if ($prefixed) {
 
 			/**
 			 * Filters the value of a specific post field for display.
@@ -1967,15 +1967,15 @@ 
 			 *                        values include 'raw', 'edit', 'db', 'display',
 			 *                        'attribute' and 'js'.
 			 */
-			$value = apply_filters( $field, $value, $post_id, $context );
+			$value = apply_filters($field, $value, $post_id, $context);
 		} else {
-			$value = apply_filters( "post_{$field}", $value, $post_id, $context );
+			$value = apply_filters("post_{$field}", $value, $post_id, $context);
 		}
 
-		if ( 'attribute' == $context ) {
-			$value = esc_attr( $value );
-		} elseif ( 'js' == $context ) {
-			$value = esc_js( $value );
+		if ('attribute' == $context) {
+			$value = esc_attr($value);
+		} elseif ('js' == $context) {
+			$value = esc_js($value);
 		}
 	}
 
@@ -1991,18 +1991,18 @@ 
  *
  * @param int $post_id Post ID.
  */
-function stick_post( $post_id ) {
+function stick_post($post_id) {
 	$stickies = get_option('sticky_posts');
 
-	if ( !is_array($stickies) )
+	if ( ! is_array($stickies))
 		$stickies = array($post_id);
 
-	if ( ! in_array($post_id, $stickies) )
+	if ( ! in_array($post_id, $stickies))
 		$stickies[] = $post_id;
 
-	$updated = update_option( 'sticky_posts', $stickies );
+	$updated = update_option('sticky_posts', $stickies);
 
-	if ( $updated ) {
+	if ($updated) {
 		/**
 		 * Fires once a post has been added to the sticky list.
 		 *
@@ -2010,7 +2010,7 @@ 
 		 *
 		 * @param int $post_id ID of the post that was stuck.
 		 */
-		do_action( 'post_stuck', $post_id );
+		do_action('post_stuck', $post_id);
 	}
 }
 
@@ -2023,24 +2023,24 @@ 
  *
  * @param int $post_id Post ID.
  */
-function unstick_post( $post_id ) {
+function unstick_post($post_id) {
 	$stickies = get_option('sticky_posts');
 
-	if ( !is_array($stickies) )
+	if ( ! is_array($stickies))
 		return;
 
-	if ( ! in_array($post_id, $stickies) )
+	if ( ! in_array($post_id, $stickies))
 		return;
 
 	$offset = array_search($post_id, $stickies);
-	if ( false === $offset )
+	if (false === $offset)
 		return;
 
 	array_splice($stickies, $offset, 1);
 
-	$updated = update_option( 'sticky_posts', $stickies );
+	$updated = update_option('sticky_posts', $stickies);
 
-	if ( $updated ) {
+	if ($updated) {
 		/**
 		 * Fires once a post has been removed from the sticky list.
 		 *
@@ -2048,7 +2048,7 @@ 
 		 *
 		 * @param int $post_id ID of the post that was unstuck.
 		 */
-		do_action( 'post_unstuck', $post_id );
+		do_action('post_unstuck', $post_id);
 	}
 }
 
@@ -2061,12 +2061,12 @@ 
  * @param string $perm Optional. 'readable' or empty. Default empty.
  * @return string The cache key.
  */
-function _count_posts_cache_key( $type = 'post', $perm = '' ) {
-	$cache_key = 'posts-' . $type;
-	if ( 'readable' == $perm && is_user_logged_in() ) {
-		$post_type_object = get_post_type_object( $type );
-		if ( $post_type_object && ! current_user_can( $post_type_object->cap->read_private_posts ) ) {
-			$cache_key .= '_' . $perm . '_' . get_current_user_id();
+function _count_posts_cache_key($type = 'post', $perm = '') {
+	$cache_key = 'posts-'.$type;
+	if ('readable' == $perm && is_user_logged_in()) {
+		$post_type_object = get_post_type_object($type);
+		if ($post_type_object && ! current_user_can($post_type_object->cap->read_private_posts)) {
+			$cache_key .= '_'.$perm.'_'.get_current_user_id();
 		}
 	}
 	return $cache_key;
@@ -2091,40 +2091,40 @@ 
  * @param string $perm Optional. 'readable' or empty. Default empty.
  * @return object Number of posts for each status.
  */
-function wp_count_posts( $type = 'post', $perm = '' ) {
+function wp_count_posts($type = 'post', $perm = '') {
 	global $wpdb;
 
-	if ( ! post_type_exists( $type ) )
+	if ( ! post_type_exists($type))
 		return new stdClass;
 
-	$cache_key = _count_posts_cache_key( $type, $perm );
+	$cache_key = _count_posts_cache_key($type, $perm);
 
-	$counts = wp_cache_get( $cache_key, 'counts' );
-	if ( false !== $counts ) {
+	$counts = wp_cache_get($cache_key, 'counts');
+	if (false !== $counts) {
 		/** This filter is documented in wp-includes/post.php */
-		return apply_filters( 'wp_count_posts', $counts, $type, $perm );
+		return apply_filters('wp_count_posts', $counts, $type, $perm);
 	}
 
 	$query = "SELECT post_status, COUNT( * ) AS num_posts FROM {$wpdb->posts} WHERE post_type = %s";
-	if ( 'readable' == $perm && is_user_logged_in() ) {
+	if ('readable' == $perm && is_user_logged_in()) {
 		$post_type_object = get_post_type_object($type);
-		if ( ! current_user_can( $post_type_object->cap->read_private_posts ) ) {
-			$query .= $wpdb->prepare( " AND (post_status != 'private' OR ( post_author = %d AND post_status = 'private' ))",
+		if ( ! current_user_can($post_type_object->cap->read_private_posts)) {
+			$query .= $wpdb->prepare(" AND (post_status != 'private' OR ( post_author = %d AND post_status = 'private' ))",
 				get_current_user_id()
 			);
 		}
 	}
 	$query .= ' GROUP BY post_status';
 
-	$results = (array) $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A );
-	$counts = array_fill_keys( get_post_stati(), 0 );
+	$results = (array) $wpdb->get_results($wpdb->prepare($query, $type), ARRAY_A);
+	$counts = array_fill_keys(get_post_stati(), 0);
 
-	foreach ( $results as $row ) {
-		$counts[ $row['post_status'] ] = $row['num_posts'];
+	foreach ($results as $row) {
+		$counts[$row['post_status']] = $row['num_posts'];
 	}
 
 	$counts = (object) $counts;
-	wp_cache_set( $cache_key, $counts, 'counts' );
+	wp_cache_set($cache_key, $counts, 'counts');
 
 	/**
 	 * Modify returned post counts by status for the current post type.
@@ -2137,7 +2137,7 @@ 
 	 * @param string $perm   The permission to determine if the posts are 'readable'
 	 *                       by the current user.
 	 */
-	return apply_filters( 'wp_count_posts', $counts, $type, $perm );
+	return apply_filters('wp_count_posts', $counts, $type, $perm);
 }
 
 /**
@@ -2156,17 +2156,17 @@ 
  *                                MIME patterns. Default empty.
  * @return object An object containing the attachment counts by mime type.
  */
-function wp_count_attachments( $mime_type = '' ) {
+function wp_count_attachments($mime_type = '') {
 	global $wpdb;
 
-	$and = wp_post_mime_type_where( $mime_type );
-	$count = $wpdb->get_results( "SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' $and GROUP BY post_mime_type", ARRAY_A );
+	$and = wp_post_mime_type_where($mime_type);
+	$count = $wpdb->get_results("SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' $and GROUP BY post_mime_type", ARRAY_A);
 
 	$counts = array();
-	foreach ( (array) $count as $row ) {
-		$counts[ $row['post_mime_type'] ] = $row['num_posts'];
+	foreach ((array) $count as $row) {
+		$counts[$row['post_mime_type']] = $row['num_posts'];
 	}
-	$counts['trash'] = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status = 'trash' $and");
+	$counts['trash'] = $wpdb->get_var("SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status = 'trash' $and");
 
 	/**
 	 * Modify returned attachment counts by mime type.
@@ -2178,7 +2178,7 @@ 
 	 * @param string $mime_type The mime type pattern used to filter the attachments
 	 *                          counted.
 	 */
-	return apply_filters( 'wp_count_attachments', (object) $counts, $mime_type );
+	return apply_filters('wp_count_attachments', (object) $counts, $mime_type);
 }
 
 /**
@@ -2202,7 +2202,7 @@ 
 	 *
 	 * @param array $post_mime_types Default list of post mime types.
 	 */
-	return apply_filters( 'post_mime_types', $post_mime_types );
+	return apply_filters('post_mime_types', $post_mime_types);
 }
 
 /**
@@ -2219,35 +2219,35 @@ 
  * @param string|array $real_mime_types     Real post mime type values.
  * @return array array(wildcard=>array(real types)).
  */
-function wp_match_mime_types( $wildcard_mime_types, $real_mime_types ) {
+function wp_match_mime_types($wildcard_mime_types, $real_mime_types) {
 	$matches = array();
-	if ( is_string( $wildcard_mime_types ) ) {
-		$wildcard_mime_types = array_map( 'trim', explode( ',', $wildcard_mime_types ) );
+	if (is_string($wildcard_mime_types)) {
+		$wildcard_mime_types = array_map('trim', explode(',', $wildcard_mime_types));
 	}
-	if ( is_string( $real_mime_types ) ) {
-		$real_mime_types = array_map( 'trim', explode( ',', $real_mime_types ) );
+	if (is_string($real_mime_types)) {
+		$real_mime_types = array_map('trim', explode(',', $real_mime_types));
 	}
 
 	$patternses = array();
 	$wild = '[-._a-z0-9]*';
 
-	foreach ( (array) $wildcard_mime_types as $type ) {
-		$mimes = array_map( 'trim', explode( ',', $type ) );
-		foreach ( $mimes as $mime ) {
-			$regex = str_replace( '__wildcard__', $wild, preg_quote( str_replace( '*', '__wildcard__', $mime ) ) );
+	foreach ((array) $wildcard_mime_types as $type) {
+		$mimes = array_map('trim', explode(',', $type));
+		foreach ($mimes as $mime) {
+			$regex = str_replace('__wildcard__', $wild, preg_quote(str_replace('*', '__wildcard__', $mime)));
 			$patternses[][$type] = "^$regex$";
-			if ( false === strpos( $mime, '/' ) ) {
+			if (false === strpos($mime, '/')) {
 				$patternses[][$type] = "^$regex/";
 				$patternses[][$type] = $regex;
 			}
 		}
 	}
-	asort( $patternses );
+	asort($patternses);
 
-	foreach ( $patternses as $patterns ) {
-		foreach ( $patterns as $type => $pattern ) {
-			foreach ( (array) $real_mime_types as $real ) {
-				if ( preg_match( "#$pattern#", $real ) && ( empty( $matches[$type] ) || false === array_search( $real, $matches[$type] ) ) ) {
+	foreach ($patternses as $patterns) {
+		foreach ($patterns as $type => $pattern) {
+			foreach ((array) $real_mime_types as $real) {
+				if (preg_match("#$pattern#", $real) && (empty($matches[$type]) || false === array_search($real, $matches[$type]))) {
 					$matches[$type][] = $real;
 				}
 			}
@@ -2267,43 +2267,43 @@ 
  *                                      Default empty.
  * @return string The SQL AND clause for mime searching.
  */
-function wp_post_mime_type_where( $post_mime_types, $table_alias = '' ) {
+function wp_post_mime_type_where($post_mime_types, $table_alias = '') {
 	$where = '';
 	$wildcards = array('', '%', '%/%');
-	if ( is_string($post_mime_types) )
+	if (is_string($post_mime_types))
 		$post_mime_types = array_map('trim', explode(',', $post_mime_types));
 
 	$wheres = array();
 
-	foreach ( (array) $post_mime_types as $mime_type ) {
+	foreach ((array) $post_mime_types as $mime_type) {
 		$mime_type = preg_replace('/\s/', '', $mime_type);
 		$slashpos = strpos($mime_type, '/');
-		if ( false !== $slashpos ) {
+		if (false !== $slashpos) {
 			$mime_group = preg_replace('/[^-*.a-zA-Z0-9]/', '', substr($mime_type, 0, $slashpos));
 			$mime_subgroup = preg_replace('/[^-*.+a-zA-Z0-9]/', '', substr($mime_type, $slashpos + 1));
-			if ( empty($mime_subgroup) )
+			if (empty($mime_subgroup))
 				$mime_subgroup = '*';
 			else
 				$mime_subgroup = str_replace('/', '', $mime_subgroup);
 			$mime_pattern = "$mime_group/$mime_subgroup";
 		} else {
 			$mime_pattern = preg_replace('/[^-*.a-zA-Z0-9]/', '', $mime_type);
-			if ( false === strpos($mime_pattern, '*') )
+			if (false === strpos($mime_pattern, '*'))
 				$mime_pattern .= '/*';
 		}
 
 		$mime_pattern = preg_replace('/\*+/', '%', $mime_pattern);
 
-		if ( in_array( $mime_type, $wildcards ) )
+		if (in_array($mime_type, $wildcards))
 			return '';
 
-		if ( false !== strpos($mime_pattern, '%') )
+		if (false !== strpos($mime_pattern, '%'))
 			$wheres[] = empty($table_alias) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'";
 		else
 			$wheres[] = empty($table_alias) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'";
 	}
-	if ( !empty($wheres) )
-		$where = ' AND (' . join(' OR ', $wheres) . ') ';
+	if ( ! empty($wheres))
+		$where = ' AND ('.join(' OR ', $wheres).') ';
 	return $where;
 }
 
@@ -2328,17 +2328,17 @@ 
  *                           Default false.
  * @return array|false|WP_Post False on failure.
  */
-function wp_delete_post( $postid = 0, $force_delete = false ) {
+function wp_delete_post($postid = 0, $force_delete = false) {
 	global $wpdb;
 
-	if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) )
+	if ( ! $post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)))
 		return $post;
 
-	if ( !$force_delete && ( $post->post_type == 'post' || $post->post_type == 'page') && get_post_status( $postid ) != 'trash' && EMPTY_TRASH_DAYS )
-		return wp_trash_post( $postid );
+	if ( ! $force_delete && ($post->post_type == 'post' || $post->post_type == 'page') && get_post_status($postid) != 'trash' && EMPTY_TRASH_DAYS)
+		return wp_trash_post($postid);
 
-	if ( $post->post_type == 'attachment' )
-		return wp_delete_attachment( $postid, $force_delete );
+	if ($post->post_type == 'attachment')
+		return wp_delete_attachment($postid, $force_delete);
 
 	/**
 	 * Filters whether a post deletion should take place.
@@ -2349,8 +2349,8 @@ 
 	 * @param WP_Post $post         Post object.
 	 * @param bool    $force_delete Whether to bypass the trash.
 	 */
-	$check = apply_filters( 'pre_delete_post', null, $post, $force_delete );
-	if ( null !== $check ) {
+	$check = apply_filters('pre_delete_post', null, $post, $force_delete);
+	if (null !== $check) {
 		return $check;
 	}
 
@@ -2363,46 +2363,46 @@ 
 	 *
 	 * @param int $postid Post ID.
 	 */
-	do_action( 'before_delete_post', $postid );
+	do_action('before_delete_post', $postid);
 
-	delete_post_meta($postid,'_wp_trash_meta_status');
-	delete_post_meta($postid,'_wp_trash_meta_time');
+	delete_post_meta($postid, '_wp_trash_meta_status');
+	delete_post_meta($postid, '_wp_trash_meta_time');
 
 	wp_delete_object_term_relationships($postid, get_object_taxonomies($post->post_type));
 
-	$parent_data = array( 'post_parent' => $post->post_parent );
-	$parent_where = array( 'post_parent' => $postid );
+	$parent_data = array('post_parent' => $post->post_parent);
+	$parent_where = array('post_parent' => $postid);
 
-	if ( is_post_type_hierarchical( $post->post_type ) ) {
+	if (is_post_type_hierarchical($post->post_type)) {
 		// Point children of this page to its parent, also clean the cache of affected children.
-		$children_query = $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_parent = %d AND post_type = %s", $postid, $post->post_type );
-		$children = $wpdb->get_results( $children_query );
-		if ( $children ) {
-			$wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => $post->post_type ) );
+		$children_query = $wpdb->prepare("SELECT * FROM $wpdb->posts WHERE post_parent = %d AND post_type = %s", $postid, $post->post_type);
+		$children = $wpdb->get_results($children_query);
+		if ($children) {
+			$wpdb->update($wpdb->posts, $parent_data, $parent_where + array('post_type' => $post->post_type));
 		}
 	}
 
 	// Do raw query. wp_get_post_revisions() is filtered.
-	$revision_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid ) );
+	$revision_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid));
 	// Use wp_delete_post (via wp_delete_post_revision) again. Ensures any meta/misplaced data gets cleaned up.
-	foreach ( $revision_ids as $revision_id )
-		wp_delete_post_revision( $revision_id );
+	foreach ($revision_ids as $revision_id)
+		wp_delete_post_revision($revision_id);
 
 	// Point all attachments to this post up one level.
-	$wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => 'attachment' ) );
+	$wpdb->update($wpdb->posts, $parent_data, $parent_where + array('post_type' => 'attachment'));
 
-	wp_defer_comment_counting( true );
+	wp_defer_comment_counting(true);
 
-	$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $postid ));
-	foreach ( $comment_ids as $comment_id ) {
-		wp_delete_comment( $comment_id, true );
+	$comment_ids = $wpdb->get_col($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $postid));
+	foreach ($comment_ids as $comment_id) {
+		wp_delete_comment($comment_id, true);
 	}
 
-	wp_defer_comment_counting( false );
+	wp_defer_comment_counting(false);
 
-	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $postid ));
-	foreach ( $post_meta_ids as $mid )
-		delete_metadata_by_mid( 'post', $mid );
+	$post_meta_ids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $postid));
+	foreach ($post_meta_ids as $mid)
+		delete_metadata_by_mid('post', $mid);
 
 	/**
 	 * Fires immediately before a post is deleted from the database.
@@ -2411,9 +2411,9 @@ 
 	 *
 	 * @param int $postid Post ID.
 	 */
-	do_action( 'delete_post', $postid );
-	$result = $wpdb->delete( $wpdb->posts, array( 'ID' => $postid ) );
-	if ( ! $result ) {
+	do_action('delete_post', $postid);
+	$result = $wpdb->delete($wpdb->posts, array('ID' => $postid));
+	if ( ! $result) {
 		return false;
 	}
 
@@ -2424,16 +2424,16 @@ 
 	 *
 	 * @param int $postid Post ID.
 	 */
-	do_action( 'deleted_post', $postid );
+	do_action('deleted_post', $postid);
 
-	clean_post_cache( $post );
+	clean_post_cache($post);
 
-	if ( is_post_type_hierarchical( $post->post_type ) && $children ) {
-		foreach ( $children as $child )
-			clean_post_cache( $child );
+	if (is_post_type_hierarchical($post->post_type) && $children) {
+		foreach ($children as $child)
+			clean_post_cache($child);
 	}
 
-	wp_clear_scheduled_hook('publish_future_post', array( $postid ) );
+	wp_clear_scheduled_hook('publish_future_post', array($postid));
 
 	/**
 	 * Fires after a post is deleted, at the conclusion of wp_delete_post().
@@ -2444,7 +2444,7 @@ 
 	 *
 	 * @param int $postid Post ID.
 	 */
-	do_action( 'after_delete_post', $postid );
+	do_action('after_delete_post', $postid);
 
 	return $post;
 }
@@ -2460,22 +2460,22 @@ 
  *
  * @param int $post_id Post ID.
  */
-function _reset_front_page_settings_for_post( $post_id ) {
-	$post = get_post( $post_id );
-	if ( 'page' == $post->post_type ) {
+function _reset_front_page_settings_for_post($post_id) {
+	$post = get_post($post_id);
+	if ('page' == $post->post_type) {
 	 	/*
 	 	 * If the page is defined in option page_on_front or post_for_posts,
 	 	 * adjust the corresponding options.
 	 	 */
-		if ( get_option( 'page_on_front' ) == $post->ID ) {
-			update_option( 'show_on_front', 'posts' );
-			update_option( 'page_on_front', 0 );
+		if (get_option('page_on_front') == $post->ID) {
+			update_option('show_on_front', 'posts');
+			update_option('page_on_front', 0);
 		}
-		if ( get_option( 'page_for_posts' ) == $post->ID ) {
-			delete_option( 'page_for_posts', 0 );
+		if (get_option('page_for_posts') == $post->ID) {
+			delete_option('page_for_posts', 0);
 		}
 	}
-	unstick_post( $post->ID );
+	unstick_post($post->ID);
 }
 
 /**
@@ -2491,14 +2491,14 @@ 
  *                     if EMPTY_TRASH_DAYS equals true.
  * @return false|array|WP_Post|null Post data array, otherwise false.
  */
-function wp_trash_post( $post_id = 0 ) {
-	if ( !EMPTY_TRASH_DAYS )
+function wp_trash_post($post_id = 0) {
+	if ( ! EMPTY_TRASH_DAYS)
 		return wp_delete_post($post_id, true);
 
-	if ( !$post = get_post($post_id, ARRAY_A) )
+	if ( ! $post = get_post($post_id, ARRAY_A))
 		return $post;
 
-	if ( $post['post_status'] == 'trash' )
+	if ($post['post_status'] == 'trash')
 		return false;
 
 	/**
@@ -2508,13 +2508,13 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'wp_trash_post', $post_id );
+	do_action('wp_trash_post', $post_id);
 
-	add_post_meta($post_id,'_wp_trash_meta_status', $post['post_status']);
-	add_post_meta($post_id,'_wp_trash_meta_time', time());
+	add_post_meta($post_id, '_wp_trash_meta_status', $post['post_status']);
+	add_post_meta($post_id, '_wp_trash_meta_time', time());
 
 	$post['post_status'] = 'trash';
-	wp_insert_post( wp_slash( $post ) );
+	wp_insert_post(wp_slash($post));
 
 	wp_trash_post_comments($post_id);
 
@@ -2525,7 +2525,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'trashed_post', $post_id );
+	do_action('trashed_post', $post_id);
 
 	return $post;
 }
@@ -2538,11 +2538,11 @@ 
  * @param int $post_id Optional. Post ID. Default is ID of the global $post.
  * @return WP_Post|false WP_Post object. False on failure.
  */
-function wp_untrash_post( $post_id = 0 ) {
-	if ( !$post = get_post($post_id, ARRAY_A) )
+function wp_untrash_post($post_id = 0) {
+	if ( ! $post = get_post($post_id, ARRAY_A))
 		return $post;
 
-	if ( $post['post_status'] != 'trash' )
+	if ($post['post_status'] != 'trash')
 		return false;
 
 	/**
@@ -2552,7 +2552,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrash_post', $post_id );
+	do_action('untrash_post', $post_id);
 
 	$post_status = get_post_meta($post_id, '_wp_trash_meta_status', true);
 
@@ -2561,7 +2561,7 @@ 
 	delete_post_meta($post_id, '_wp_trash_meta_status');
 	delete_post_meta($post_id, '_wp_trash_meta_time');
 
-	wp_insert_post( wp_slash( $post ) );
+	wp_insert_post(wp_slash($post));
 
 	wp_untrash_post_comments($post_id);
 
@@ -2572,7 +2572,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrashed_post', $post_id );
+	do_action('untrashed_post', $post_id);
 
 	return $post;
 }
@@ -2587,11 +2587,11 @@ 
  * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
  * @return mixed|void False on failure.
  */
-function wp_trash_post_comments( $post = null ) {
+function wp_trash_post_comments($post = null) {
 	global $wpdb;
 
 	$post = get_post($post);
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
 	$post_id = $post->ID;
@@ -2603,22 +2603,22 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'trash_post_comments', $post_id );
+	do_action('trash_post_comments', $post_id);
 
-	$comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_ID, comment_approved FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id) );
-	if ( empty($comments) )
+	$comments = $wpdb->get_results($wpdb->prepare("SELECT comment_ID, comment_approved FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id));
+	if (empty($comments))
 		return;
 
 	// Cache current status for each comment.
 	$statuses = array();
-	foreach ( $comments as $comment )
+	foreach ($comments as $comment)
 		$statuses[$comment->comment_ID] = $comment->comment_approved;
 	add_post_meta($post_id, '_wp_trash_meta_comments_status', $statuses);
 
 	// Set status for all comments to post-trashed.
 	$result = $wpdb->update($wpdb->comments, array('comment_approved' => 'post-trashed'), array('comment_post_ID' => $post_id));
 
-	clean_comment_cache( array_keys($statuses) );
+	clean_comment_cache(array_keys($statuses));
 
 	/**
 	 * Fires after comments are sent to the trash.
@@ -2628,7 +2628,7 @@ 
 	 * @param int   $post_id  Post ID.
 	 * @param array $statuses Array of comment statuses.
 	 */
-	do_action( 'trashed_post_comments', $post_id, $statuses );
+	do_action('trashed_post_comments', $post_id, $statuses);
 
 	return $result;
 }
@@ -2643,18 +2643,18 @@ 
  * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
  * @return true|void
  */
-function wp_untrash_post_comments( $post = null ) {
+function wp_untrash_post_comments($post = null) {
 	global $wpdb;
 
 	$post = get_post($post);
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
 	$post_id = $post->ID;
 
 	$statuses = get_post_meta($post_id, '_wp_trash_meta_comments_status', true);
 
-	if ( empty($statuses) )
+	if (empty($statuses))
 		return true;
 
 	/**
@@ -2664,23 +2664,23 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrash_post_comments', $post_id );
+	do_action('untrash_post_comments', $post_id);
 
 	// Restore each comment to its original status.
 	$group_by_status = array();
-	foreach ( $statuses as $comment_id => $comment_status )
+	foreach ($statuses as $comment_id => $comment_status)
 		$group_by_status[$comment_status][] = $comment_id;
 
-	foreach ( $group_by_status as $status => $comments ) {
+	foreach ($group_by_status as $status => $comments) {
 		// Sanity check. This shouldn't happen.
-		if ( 'post-trashed' == $status ) {
+		if ('post-trashed' == $status) {
 			$status = '0';
 		}
-		$comments_in = implode( ', ', array_map( 'intval', $comments ) );
-		$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->comments SET comment_approved = %s WHERE comment_ID IN ($comments_in)", $status ) );
+		$comments_in = implode(', ', array_map('intval', $comments));
+		$wpdb->query($wpdb->prepare("UPDATE $wpdb->comments SET comment_approved = %s WHERE comment_ID IN ($comments_in)", $status));
 	}
 
-	clean_comment_cache( array_keys($statuses) );
+	clean_comment_cache(array_keys($statuses));
 
 	delete_post_meta($post_id, '_wp_trash_meta_comments_status');
 
@@ -2691,7 +2691,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrashed_post_comments', $post_id );
+	do_action('untrashed_post_comments', $post_id);
 }
 
 /**
@@ -2711,11 +2711,11 @@ 
  *               'all_with_object_id', an array of WP_Term objects will be returned. If `$fields`
  *               is 'ids', an array of category ids. If `$fields` is 'names', an array of category names.
  */
-function wp_get_post_categories( $post_id = 0, $args = array() ) {
+function wp_get_post_categories($post_id = 0, $args = array()) {
 	$post_id = (int) $post_id;
 
 	$defaults = array('fields' => 'ids');
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	$cats = wp_get_object_terms($post_id, 'category', $args);
 	return $cats;
@@ -2735,8 +2735,8 @@ 
  * @param array $args Optional. Overwrite the defaults
  * @return array List of post tags.
  */
-function wp_get_post_tags( $post_id = 0, $args = array() ) {
-	return wp_get_post_terms( $post_id, 'post_tag', $args);
+function wp_get_post_tags($post_id = 0, $args = array()) {
+	return wp_get_post_terms($post_id, 'post_tag', $args);
 }
 
 /**
@@ -2755,11 +2755,11 @@ 
  * @return array|WP_Error  List of post terms or empty array if no terms were found. WP_Error object
  *                         if `$taxonomy` doesn't exist.
  */
-function wp_get_post_terms( $post_id = 0, $taxonomy = 'post_tag', $args = array() ) {
+function wp_get_post_terms($post_id = 0, $taxonomy = 'post_tag', $args = array()) {
 	$post_id = (int) $post_id;
 
 	$defaults = array('fields' => 'all');
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	$tags = wp_get_object_terms($post_id, $taxonomy, $args);
 
@@ -2777,11 +2777,11 @@ 
  * @param string $output     Optional. Type of output. Accepts ARRAY_A or ''. Default ARRAY_A.
  * @return array|false Associative array if $output equals ARRAY_A, array or false if no results.
  */
-function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) {
+function wp_get_recent_posts($args = array(), $output = ARRAY_A) {
 
-	if ( is_numeric( $args ) ) {
-		_deprecated_argument( __FUNCTION__, '3.1.0', __( 'Passing an integer number of posts is deprecated. Pass an array of arguments instead.' ) );
-		$args = array( 'numberposts' => absint( $args ) );
+	if (is_numeric($args)) {
+		_deprecated_argument(__FUNCTION__, '3.1.0', __('Passing an integer number of posts is deprecated. Pass an array of arguments instead.'));
+		$args = array('numberposts' => absint($args));
 	}
 
 	// Set default arguments.
@@ -2794,14 +2794,14 @@ 
 		'suppress_filters' => true
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$results = get_posts( $r );
+	$results = get_posts($r);
 
 	// Backward compatibility. Prior to 3.1 expected posts to be returned in array.
-	if ( ARRAY_A == $output ){
-		foreach ( $results as $key => $result ) {
-			$results[$key] = get_object_vars( $result );
+	if (ARRAY_A == $output) {
+		foreach ($results as $key => $result) {
+			$results[$key] = get_object_vars($result);
 		}
 		return $results ? $results : array();
 	}
@@ -2869,7 +2869,7 @@ 
  * @param bool  $wp_error Optional. Whether to allow return of WP_Error on failure. Default false.
  * @return int|WP_Error The post ID on success. The value 0 or WP_Error on failure.
  */
-function wp_insert_post( $postarr, $wp_error = false ) {
+function wp_insert_post($postarr, $wp_error = false) {
 	global $wpdb;
 
 	$user_id = get_current_user_id();
@@ -2896,7 +2896,7 @@ 
 
 	$postarr = wp_parse_args($postarr, $defaults);
 
-	unset( $postarr[ 'filter' ] );
+	unset($postarr['filter']);
 
 	$postarr = sanitize_post($postarr, 'db');
 
@@ -2905,42 +2905,42 @@ 
 	$update = false;
 	$guid = $postarr['guid'];
 
-	if ( ! empty( $postarr['ID'] ) ) {
+	if ( ! empty($postarr['ID'])) {
 		$update = true;
 
 		// Get the post ID and GUID.
 		$post_ID = $postarr['ID'];
-		$post_before = get_post( $post_ID );
-		if ( is_null( $post_before ) ) {
-			if ( $wp_error ) {
-				return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+		$post_before = get_post($post_ID);
+		if (is_null($post_before)) {
+			if ($wp_error) {
+				return new WP_Error('invalid_post', __('Invalid post ID.'));
 			}
 			return 0;
 		}
 
-		$guid = get_post_field( 'guid', $post_ID );
-		$previous_status = get_post_field('post_status', $post_ID );
+		$guid = get_post_field('guid', $post_ID);
+		$previous_status = get_post_field('post_status', $post_ID);
 	} else {
 		$previous_status = 'new';
 	}
 
-	$post_type = empty( $postarr['post_type'] ) ? 'post' : $postarr['post_type'];
+	$post_type = empty($postarr['post_type']) ? 'post' : $postarr['post_type'];
 
 	$post_title = $postarr['post_title'];
 	$post_content = $postarr['post_content'];
 	$post_excerpt = $postarr['post_excerpt'];
-	if ( isset( $postarr['post_name'] ) ) {
+	if (isset($postarr['post_name'])) {
 		$post_name = $postarr['post_name'];
-	} elseif ( $update ) {
+	} elseif ($update) {
 		// For an update, don't modify the post_name if it wasn't supplied as an argument.
 		$post_name = $post_before->post_name;
 	}
 
 	$maybe_empty = 'attachment' !== $post_type
 		&& ! $post_content && ! $post_title && ! $post_excerpt
-		&& post_type_supports( $post_type, 'editor' )
-		&& post_type_supports( $post_type, 'title' )
-		&& post_type_supports( $post_type, 'excerpt' );
+		&& post_type_supports($post_type, 'editor')
+		&& post_type_supports($post_type, 'title')
+		&& post_type_supports($post_type, 'excerpt');
 
 	/**
 	 * Filters whether the post should be considered "empty".
@@ -2958,36 +2958,36 @@ 
 	 * @param bool  $maybe_empty Whether the post should be considered "empty".
 	 * @param array $postarr     Array of post data.
 	 */
-	if ( apply_filters( 'wp_insert_post_empty_content', $maybe_empty, $postarr ) ) {
-		if ( $wp_error ) {
-			return new WP_Error( 'empty_content', __( 'Content, title, and excerpt are empty.' ) );
+	if (apply_filters('wp_insert_post_empty_content', $maybe_empty, $postarr)) {
+		if ($wp_error) {
+			return new WP_Error('empty_content', __('Content, title, and excerpt are empty.'));
 		} else {
 			return 0;
 		}
 	}
 
-	$post_status = empty( $postarr['post_status'] ) ? 'draft' : $postarr['post_status'];
-	if ( 'attachment' === $post_type && ! in_array( $post_status, array( 'inherit', 'private', 'trash' ) ) ) {
+	$post_status = empty($postarr['post_status']) ? 'draft' : $postarr['post_status'];
+	if ('attachment' === $post_type && ! in_array($post_status, array('inherit', 'private', 'trash'))) {
 		$post_status = 'inherit';
 	}
 
-	if ( ! empty( $postarr['post_category'] ) ) {
+	if ( ! empty($postarr['post_category'])) {
 		// Filter out empty terms.
-		$post_category = array_filter( $postarr['post_category'] );
+		$post_category = array_filter($postarr['post_category']);
 	}
 
 	// Make sure we set a valid category.
-	if ( empty( $post_category ) || 0 == count( $post_category ) || ! is_array( $post_category ) ) {
+	if (empty($post_category) || 0 == count($post_category) || ! is_array($post_category)) {
 		// 'post' requires at least one category.
-		if ( 'post' == $post_type && 'auto-draft' != $post_status ) {
-			$post_category = array( get_option('default_category') );
+		if ('post' == $post_type && 'auto-draft' != $post_status) {
+			$post_category = array(get_option('default_category'));
 		} else {
 			$post_category = array();
 		}
 	}
 
 	// Don't allow contributors to set the post slug for pending review posts.
-	if ( 'pending' == $post_status && !current_user_can( 'publish_posts' ) ) {
+	if ('pending' == $post_status && ! current_user_can('publish_posts')) {
 		$post_name = '';
 	}
 
@@ -2995,16 +2995,16 @@ 
 	 * Create a valid post name. Drafts and pending posts are allowed to have
 	 * an empty post name.
 	 */
-	if ( empty($post_name) ) {
-		if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) {
+	if (empty($post_name)) {
+		if ( ! in_array($post_status, array('draft', 'pending', 'auto-draft'))) {
 			$post_name = sanitize_title($post_title);
 		} else {
 			$post_name = '';
 		}
 	} else {
 		// On updates, we need to check to see if it's using the old, fixed sanitization context.
-		$check_name = sanitize_title( $post_name, '', 'old-save' );
-		if ( $update && strtolower( urlencode( $post_name ) ) == $check_name && get_post_field( 'post_name', $post_ID ) == $check_name ) {
+		$check_name = sanitize_title($post_name, '', 'old-save');
+		if ($update && strtolower(urlencode($post_name)) == $check_name && get_post_field('post_name', $post_ID) == $check_name) {
 			$post_name = $check_name;
 		} else { // new post, or slug has changed.
 			$post_name = sanitize_title($post_name);
@@ -3015,32 +3015,32 @@ 
 	 * If the post date is empty (due to having been new or a draft) and status
 	 * is not 'draft' or 'pending', set date to now.
 	 */
-	if ( empty( $postarr['post_date'] ) || '0000-00-00 00:00:00' == $postarr['post_date'] ) {
-		if ( empty( $postarr['post_date_gmt'] ) || '0000-00-00 00:00:00' == $postarr['post_date_gmt'] ) {
-			$post_date = current_time( 'mysql' );
+	if (empty($postarr['post_date']) || '0000-00-00 00:00:00' == $postarr['post_date']) {
+		if (empty($postarr['post_date_gmt']) || '0000-00-00 00:00:00' == $postarr['post_date_gmt']) {
+			$post_date = current_time('mysql');
 		} else {
-			$post_date = get_date_from_gmt( $postarr['post_date_gmt'] );
+			$post_date = get_date_from_gmt($postarr['post_date_gmt']);
 		}
 	} else {
 		$post_date = $postarr['post_date'];
 	}
 
 	// Validate the date.
-	$mm = substr( $post_date, 5, 2 );
-	$jj = substr( $post_date, 8, 2 );
-	$aa = substr( $post_date, 0, 4 );
-	$valid_date = wp_checkdate( $mm, $jj, $aa, $post_date );
-	if ( ! $valid_date ) {
-		if ( $wp_error ) {
-			return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) );
+	$mm = substr($post_date, 5, 2);
+	$jj = substr($post_date, 8, 2);
+	$aa = substr($post_date, 0, 4);
+	$valid_date = wp_checkdate($mm, $jj, $aa, $post_date);
+	if ( ! $valid_date) {
+		if ($wp_error) {
+			return new WP_Error('invalid_date', __('Whoops, the provided date is invalid.'));
 		} else {
 			return 0;
 		}
 	}
 
-	if ( empty( $postarr['post_date_gmt'] ) || '0000-00-00 00:00:00' == $postarr['post_date_gmt'] ) {
-		if ( ! in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) {
-			$post_date_gmt = get_gmt_from_date( $post_date );
+	if (empty($postarr['post_date_gmt']) || '0000-00-00 00:00:00' == $postarr['post_date_gmt']) {
+		if ( ! in_array($post_status, array('draft', 'pending', 'auto-draft'))) {
+			$post_date_gmt = get_gmt_from_date($post_date);
 		} else {
 			$post_date_gmt = '0000-00-00 00:00:00';
 		}
@@ -3048,34 +3048,34 @@ 
 		$post_date_gmt = $postarr['post_date_gmt'];
 	}
 
-	if ( $update || '0000-00-00 00:00:00' == $post_date ) {
-		$post_modified     = current_time( 'mysql' );
-		$post_modified_gmt = current_time( 'mysql', 1 );
+	if ($update || '0000-00-00 00:00:00' == $post_date) {
+		$post_modified     = current_time('mysql');
+		$post_modified_gmt = current_time('mysql', 1);
 	} else {
 		$post_modified     = $post_date;
 		$post_modified_gmt = $post_date_gmt;
 	}
 
-	if ( 'attachment' !== $post_type ) {
-		if ( 'publish' == $post_status ) {
+	if ('attachment' !== $post_type) {
+		if ('publish' == $post_status) {
 			$now = gmdate('Y-m-d H:i:59');
-			if ( mysql2date('U', $post_date_gmt, false) > mysql2date('U', $now, false) ) {
+			if (mysql2date('U', $post_date_gmt, false) > mysql2date('U', $now, false)) {
 				$post_status = 'future';
 			}
-		} elseif ( 'future' == $post_status ) {
+		} elseif ('future' == $post_status) {
 			$now = gmdate('Y-m-d H:i:59');
-			if ( mysql2date('U', $post_date_gmt, false) <= mysql2date('U', $now, false) ) {
+			if (mysql2date('U', $post_date_gmt, false) <= mysql2date('U', $now, false)) {
 				$post_status = 'publish';
 			}
 		}
 	}
 
 	// Comment status.
-	if ( empty( $postarr['comment_status'] ) ) {
-		if ( $update ) {
+	if (empty($postarr['comment_status'])) {
+		if ($update) {
 			$comment_status = 'closed';
 		} else {
-			$comment_status = get_default_comment_status( $post_type );
+			$comment_status = get_default_comment_status($post_type);
 		}
 	} else {
 		$comment_status = $postarr['comment_status'];
@@ -3083,28 +3083,28 @@ 
 
 	// These variables are needed by compact() later.
 	$post_content_filtered = $postarr['post_content_filtered'];
-	$post_author = isset( $postarr['post_author'] ) ? $postarr['post_author'] : $user_id;
-	$ping_status = empty( $postarr['ping_status'] ) ? get_default_comment_status( $post_type, 'pingback' ) : $postarr['ping_status'];
-	$to_ping = isset( $postarr['to_ping'] ) ? sanitize_trackback_urls( $postarr['to_ping'] ) : '';
-	$pinged = isset( $postarr['pinged'] ) ? $postarr['pinged'] : '';
-	$import_id = isset( $postarr['import_id'] ) ? $postarr['import_id'] : 0;
+	$post_author = isset($postarr['post_author']) ? $postarr['post_author'] : $user_id;
+	$ping_status = empty($postarr['ping_status']) ? get_default_comment_status($post_type, 'pingback') : $postarr['ping_status'];
+	$to_ping = isset($postarr['to_ping']) ? sanitize_trackback_urls($postarr['to_ping']) : '';
+	$pinged = isset($postarr['pinged']) ? $postarr['pinged'] : '';
+	$import_id = isset($postarr['import_id']) ? $postarr['import_id'] : 0;
 
 	/*
 	 * The 'wp_insert_post_parent' filter expects all variables to be present.
 	 * Previously, these variables would have already been extracted
 	 */
-	if ( isset( $postarr['menu_order'] ) ) {
+	if (isset($postarr['menu_order'])) {
 		$menu_order = (int) $postarr['menu_order'];
 	} else {
 		$menu_order = 0;
 	}
 
-	$post_password = isset( $postarr['post_password'] ) ? $postarr['post_password'] : '';
-	if ( 'private' == $post_status ) {
+	$post_password = isset($postarr['post_password']) ? $postarr['post_password'] : '';
+	if ('private' == $post_status) {
 		$post_password = '';
 	}
 
-	if ( isset( $postarr['post_parent'] ) ) {
+	if (isset($postarr['post_parent'])) {
 		$post_parent = (int) $postarr['post_parent'];
 	} else {
 		$post_parent = 0;
@@ -3120,50 +3120,50 @@ 
 	 * @param array $new_postarr Array of parsed post data.
 	 * @param array $postarr     Array of sanitized, but otherwise unmodified post data.
 	 */
-	$post_parent = apply_filters( 'wp_insert_post_parent', $post_parent, $post_ID, compact( array_keys( $postarr ) ), $postarr );
+	$post_parent = apply_filters('wp_insert_post_parent', $post_parent, $post_ID, compact(array_keys($postarr)), $postarr);
 
 	/*
 	 * If the post is being untrashed and it has a desired slug stored in post meta,
 	 * reassign it.
 	 */
-	if ( 'trash' === $previous_status && 'trash' !== $post_status ) {
-		$desired_post_slug = get_post_meta( $post_ID, '_wp_desired_post_slug', true );
-		if ( $desired_post_slug ) {
-			delete_post_meta( $post_ID, '_wp_desired_post_slug' );
+	if ('trash' === $previous_status && 'trash' !== $post_status) {
+		$desired_post_slug = get_post_meta($post_ID, '_wp_desired_post_slug', true);
+		if ($desired_post_slug) {
+			delete_post_meta($post_ID, '_wp_desired_post_slug');
 			$post_name = $desired_post_slug;
 		}
 	}
 
 	// If a trashed post has the desired slug, change it and let this post have it.
-	if ( 'trash' !== $post_status && $post_name ) {
-		wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID );
+	if ('trash' !== $post_status && $post_name) {
+		wp_add_trashed_suffix_to_post_name_for_trashed_posts($post_name, $post_ID);
 	}
 
 	// When trashing an existing post, change its slug to allow non-trashed posts to use it.
-	if ( 'trash' === $post_status && 'trash' !== $previous_status && 'new' !== $previous_status ) {
-		$post_name = wp_add_trashed_suffix_to_post_name_for_post( $post_ID );
+	if ('trash' === $post_status && 'trash' !== $previous_status && 'new' !== $previous_status) {
+		$post_name = wp_add_trashed_suffix_to_post_name_for_post($post_ID);
 	}
 
-	$post_name = wp_unique_post_slug( $post_name, $post_ID, $post_status, $post_type, $post_parent );
+	$post_name = wp_unique_post_slug($post_name, $post_ID, $post_status, $post_type, $post_parent);
 
 	// Don't unslash.
-	$post_mime_type = isset( $postarr['post_mime_type'] ) ? $postarr['post_mime_type'] : '';
+	$post_mime_type = isset($postarr['post_mime_type']) ? $postarr['post_mime_type'] : '';
 
 	// Expected_slashed (everything!).
-	$data = compact( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'post_mime_type', 'guid' );
+	$data = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'post_mime_type', 'guid');
 
-	$emoji_fields = array( 'post_title', 'post_content', 'post_excerpt' );
+	$emoji_fields = array('post_title', 'post_content', 'post_excerpt');
 
-	foreach ( $emoji_fields as $emoji_field ) {
-		if ( isset( $data[ $emoji_field ] ) ) {
-			$charset = $wpdb->get_col_charset( $wpdb->posts, $emoji_field );
-			if ( 'utf8' === $charset ) {
-				$data[ $emoji_field ] = wp_encode_emoji( $data[ $emoji_field ] );
+	foreach ($emoji_fields as $emoji_field) {
+		if (isset($data[$emoji_field])) {
+			$charset = $wpdb->get_col_charset($wpdb->posts, $emoji_field);
+			if ('utf8' === $charset) {
+				$data[$emoji_field] = wp_encode_emoji($data[$emoji_field]);
 			}
 		}
 	}
 
-	if ( 'attachment' === $post_type ) {
+	if ('attachment' === $post_type) {
 		/**
 		 * Filters attachment post data before it is updated in or added to the database.
 		 *
@@ -3172,7 +3172,7 @@ 
 		 * @param array $data    An array of sanitized attachment post data.
 		 * @param array $postarr An array of unsanitized attachment post data.
 		 */
-		$data = apply_filters( 'wp_insert_attachment_data', $data, $postarr );
+		$data = apply_filters('wp_insert_attachment_data', $data, $postarr);
 	} else {
 		/**
 		 * Filters slashed post data just before it is inserted into the database.
@@ -3182,12 +3182,12 @@ 
 		 * @param array $data    An array of slashed post data.
 		 * @param array $postarr An array of sanitized, but otherwise unmodified post data.
 		 */
-		$data = apply_filters( 'wp_insert_post_data', $data, $postarr );
+		$data = apply_filters('wp_insert_post_data', $data, $postarr);
 	}
-	$data = wp_unslash( $data );
-	$where = array( 'ID' => $post_ID );
+	$data = wp_unslash($data);
+	$where = array('ID' => $post_ID);
 
-	if ( $update ) {
+	if ($update) {
 		/**
 		 * Fires immediately before an existing post is updated in the database.
 		 *
@@ -3196,9 +3196,9 @@ 
 		 * @param int   $post_ID Post ID.
 		 * @param array $data    Array of unslashed post data.
 		 */
-		do_action( 'pre_post_update', $post_ID, $data );
-		if ( false === $wpdb->update( $wpdb->posts, $data, $where ) ) {
-			if ( $wp_error ) {
+		do_action('pre_post_update', $post_ID, $data);
+		if (false === $wpdb->update($wpdb->posts, $data, $where)) {
+			if ($wp_error) {
 				return new WP_Error('db_update_error', __('Could not update post in the database'), $wpdb->last_error);
 			} else {
 				return 0;
@@ -3206,14 +3206,14 @@ 
 		}
 	} else {
 		// If there is a suggested ID, use it if not already present.
-		if ( ! empty( $import_id ) ) {
+		if ( ! empty($import_id)) {
 			$import_id = (int) $import_id;
-			if ( ! $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE ID = %d", $import_id) ) ) {
+			if ( ! $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE ID = %d", $import_id))) {
 				$data['ID'] = $import_id;
 			}
 		}
-		if ( false === $wpdb->insert( $wpdb->posts, $data ) ) {
-			if ( $wp_error ) {
+		if (false === $wpdb->insert($wpdb->posts, $data)) {
+			if ($wp_error) {
 				return new WP_Error('db_insert_error', __('Could not insert post into the database'), $wpdb->last_error);
 			} else {
 				return 0;
@@ -3222,97 +3222,97 @@ 
 		$post_ID = (int) $wpdb->insert_id;
 
 		// Use the newly generated $post_ID.
-		$where = array( 'ID' => $post_ID );
+		$where = array('ID' => $post_ID);
 	}
 
-	if ( empty( $data['post_name'] ) && ! in_array( $data['post_status'], array( 'draft', 'pending', 'auto-draft' ) ) ) {
-		$data['post_name'] = wp_unique_post_slug( sanitize_title( $data['post_title'], $post_ID ), $post_ID, $data['post_status'], $post_type, $post_parent );
-		$wpdb->update( $wpdb->posts, array( 'post_name' => $data['post_name'] ), $where );
-		clean_post_cache( $post_ID );
+	if (empty($data['post_name']) && ! in_array($data['post_status'], array('draft', 'pending', 'auto-draft'))) {
+		$data['post_name'] = wp_unique_post_slug(sanitize_title($data['post_title'], $post_ID), $post_ID, $data['post_status'], $post_type, $post_parent);
+		$wpdb->update($wpdb->posts, array('post_name' => $data['post_name']), $where);
+		clean_post_cache($post_ID);
 	}
 
-	if ( is_object_in_taxonomy( $post_type, 'category' ) ) {
-		wp_set_post_categories( $post_ID, $post_category );
+	if (is_object_in_taxonomy($post_type, 'category')) {
+		wp_set_post_categories($post_ID, $post_category);
 	}
 
-	if ( isset( $postarr['tags_input'] ) && is_object_in_taxonomy( $post_type, 'post_tag' ) ) {
-		wp_set_post_tags( $post_ID, $postarr['tags_input'] );
+	if (isset($postarr['tags_input']) && is_object_in_taxonomy($post_type, 'post_tag')) {
+		wp_set_post_tags($post_ID, $postarr['tags_input']);
 	}
 
 	// New-style support for all custom taxonomies.
-	if ( ! empty( $postarr['tax_input'] ) ) {
-		foreach ( $postarr['tax_input'] as $taxonomy => $tags ) {
+	if ( ! empty($postarr['tax_input'])) {
+		foreach ($postarr['tax_input'] as $taxonomy => $tags) {
 			$taxonomy_obj = get_taxonomy($taxonomy);
-			if ( ! $taxonomy_obj ) {
+			if ( ! $taxonomy_obj) {
 				/* translators: %s: taxonomy name */
-				_doing_it_wrong( __FUNCTION__, sprintf( __( 'Invalid taxonomy: %s.' ), $taxonomy ), '4.4.0' );
+				_doing_it_wrong(__FUNCTION__, sprintf(__('Invalid taxonomy: %s.'), $taxonomy), '4.4.0');
 				continue;
 			}
 
 			// array = hierarchical, string = non-hierarchical.
-			if ( is_array( $tags ) ) {
+			if (is_array($tags)) {
 				$tags = array_filter($tags);
 			}
-			if ( current_user_can( $taxonomy_obj->cap->assign_terms ) ) {
-				wp_set_post_terms( $post_ID, $tags, $taxonomy );
+			if (current_user_can($taxonomy_obj->cap->assign_terms)) {
+				wp_set_post_terms($post_ID, $tags, $taxonomy);
 			}
 		}
 	}
 
 	// Set or remove featured image.
-	if ( isset( $postarr['_thumbnail_id'] ) && ( post_type_supports( $post_type, 'thumbnail' ) || 'revision' === $post_type ) ) {
-		$thumbnail_id = intval( $postarr['_thumbnail_id'] );
+	if (isset($postarr['_thumbnail_id']) && (post_type_supports($post_type, 'thumbnail') || 'revision' === $post_type)) {
+		$thumbnail_id = intval($postarr['_thumbnail_id']);
 		if ( -1 === $thumbnail_id ) {
-			delete_post_thumbnail( $post_ID );
+			delete_post_thumbnail($post_ID);
 		} else {
-			set_post_thumbnail( $post_ID, $thumbnail_id );
+			set_post_thumbnail($post_ID, $thumbnail_id);
 		}
 	}
 
-	if ( ! empty( $postarr['meta_input'] ) ) {
-		foreach ( $postarr['meta_input'] as $field => $value ) {
-			update_post_meta( $post_ID, $field, $value );
+	if ( ! empty($postarr['meta_input'])) {
+		foreach ($postarr['meta_input'] as $field => $value) {
+			update_post_meta($post_ID, $field, $value);
 		}
 	}
 
-	$current_guid = get_post_field( 'guid', $post_ID );
+	$current_guid = get_post_field('guid', $post_ID);
 
 	// Set GUID.
-	if ( ! $update && '' == $current_guid ) {
-		$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post_ID ) ), $where );
+	if ( ! $update && '' == $current_guid) {
+		$wpdb->update($wpdb->posts, array('guid' => get_permalink($post_ID)), $where);
 	}
 
-	if ( 'attachment' === $postarr['post_type'] ) {
-		if ( ! empty( $postarr['file'] ) ) {
-			update_attached_file( $post_ID, $postarr['file'] );
+	if ('attachment' === $postarr['post_type']) {
+		if ( ! empty($postarr['file'])) {
+			update_attached_file($post_ID, $postarr['file']);
 		}
 
-		if ( ! empty( $postarr['context'] ) ) {
-			add_post_meta( $post_ID, '_wp_attachment_context', $postarr['context'], true );
+		if ( ! empty($postarr['context'])) {
+			add_post_meta($post_ID, '_wp_attachment_context', $postarr['context'], true);
 		}
 	}
 
-	clean_post_cache( $post_ID );
+	clean_post_cache($post_ID);
 
-	$post = get_post( $post_ID );
+	$post = get_post($post_ID);
 
-	if ( ! empty( $postarr['page_template'] ) && 'page' == $data['post_type'] ) {
+	if ( ! empty($postarr['page_template']) && 'page' == $data['post_type']) {
 		$post->page_template = $postarr['page_template'];
-		$page_templates = wp_get_theme()->get_page_templates( $post );
-		if ( 'default' != $postarr['page_template'] && ! isset( $page_templates[ $postarr['page_template'] ] ) ) {
-			if ( $wp_error ) {
+		$page_templates = wp_get_theme()->get_page_templates($post);
+		if ('default' != $postarr['page_template'] && ! isset($page_templates[$postarr['page_template']])) {
+			if ($wp_error) {
 				return new WP_Error('invalid_page_template', __('The page template is invalid.'));
 			}
-			update_post_meta( $post_ID, '_wp_page_template', 'default' );
+			update_post_meta($post_ID, '_wp_page_template', 'default');
 		} else {
-			update_post_meta( $post_ID, '_wp_page_template', $postarr['page_template'] );
+			update_post_meta($post_ID, '_wp_page_template', $postarr['page_template']);
 		}
 	}
 
-	if ( 'attachment' !== $postarr['post_type'] ) {
-		wp_transition_post_status( $data['post_status'], $previous_status, $post );
+	if ('attachment' !== $postarr['post_type']) {
+		wp_transition_post_status($data['post_status'], $previous_status, $post);
 	} else {
-		if ( $update ) {
+		if ($update) {
 			/**
 			 * Fires once an existing attachment has been updated.
 			 *
@@ -3320,8 +3320,8 @@ 
 			 *
 			 * @param int $post_ID Attachment ID.
 			 */
-			do_action( 'edit_attachment', $post_ID );
-			$post_after = get_post( $post_ID );
+			do_action('edit_attachment', $post_ID);
+			$post_after = get_post($post_ID);
 
 			/**
 			 * Fires once an existing attachment has been updated.
@@ -3332,7 +3332,7 @@ 
 			 * @param WP_Post $post_after   Post object following the update.
 			 * @param WP_Post $post_before  Post object before the update.
 			 */
-			do_action( 'attachment_updated', $post_ID, $post_after, $post_before );
+			do_action('attachment_updated', $post_ID, $post_after, $post_before);
 		} else {
 
 			/**
@@ -3342,13 +3342,13 @@ 
 			 *
 			 * @param int $post_ID Attachment ID.
 			 */
-			do_action( 'add_attachment', $post_ID );
+			do_action('add_attachment', $post_ID);
 		}
 
 		return $post_ID;
 	}
 
-	if ( $update ) {
+	if ($update) {
 		/**
 		 * Fires once an existing post has been updated.
 		 *
@@ -3357,7 +3357,7 @@ 
 		 * @param int     $post_ID Post ID.
 		 * @param WP_Post $post    Post object.
 		 */
-		do_action( 'edit_post', $post_ID, $post );
+		do_action('edit_post', $post_ID, $post);
 		$post_after = get_post($post_ID);
 
 		/**
@@ -3369,7 +3369,7 @@ 
 		 * @param WP_Post $post_after   Post object following the update.
 		 * @param WP_Post $post_before  Post object before the update.
 		 */
-		do_action( 'post_updated', $post_ID, $post_after, $post_before);
+		do_action('post_updated', $post_ID, $post_after, $post_before);
 	}
 
 	/**
@@ -3384,7 +3384,7 @@ 
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated or not.
 	 */
-	do_action( "save_post_{$post->post_type}", $post_ID, $post, $update );
+	do_action("save_post_{$post->post_type}", $post_ID, $post, $update);
 
 	/**
 	 * Fires once a post has been saved.
@@ -3395,7 +3395,7 @@ 
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated or not.
 	 */
-	do_action( 'save_post', $post_ID, $post, $update );
+	do_action('save_post', $post_ID, $post, $update);
 
 	/**
 	 * Fires once a post has been saved.
@@ -3406,7 +3406,7 @@ 
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated or not.
 	 */
-	do_action( 'wp_insert_post', $post_ID, $post, $update );
+	do_action('wp_insert_post', $post_ID, $post, $update);
 
 	return $post_ID;
 }
@@ -3424,8 +3424,8 @@ 
  * @param bool         $wp_error Optional. Allow return of WP_Error on failure. Default false.
  * @return int|WP_Error The value 0 or WP_Error on failure. The post ID on success.
  */
-function wp_update_post( $postarr = array(), $wp_error = false ) {
-	if ( is_object($postarr) ) {
+function wp_update_post($postarr = array(), $wp_error = false) {
+	if (is_object($postarr)) {
 		// Non-escaped post was passed.
 		$postarr = get_object_vars($postarr);
 		$postarr = wp_slash($postarr);
@@ -3434,9 +3434,9 @@ 
 	// First, get all of the original fields.
 	$post = get_post($postarr['ID'], ARRAY_A);
 
-	if ( is_null( $post ) ) {
-		if ( $wp_error )
-			return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	if (is_null($post)) {
+		if ($wp_error)
+			return new WP_Error('invalid_post', __('Invalid post ID.'));
 		return 0;
 	}
 
@@ -3444,15 +3444,15 @@ 
 	$post = wp_slash($post);
 
 	// Passed post category list overwrites existing category list if not empty.
-	if ( isset($postarr['post_category']) && is_array($postarr['post_category'])
-			 && 0 != count($postarr['post_category']) )
+	if (isset($postarr['post_category']) && is_array($postarr['post_category'])
+			 && 0 != count($postarr['post_category']))
 		$post_cats = $postarr['post_category'];
 	else
 		$post_cats = $post['post_category'];
 
 	// Drafts shouldn't be assigned a date unless explicitly done so by the user.
-	if ( isset( $post['post_status'] ) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) &&
-			 ('0000-00-00 00:00:00' == $post['post_date_gmt']) )
+	if (isset($post['post_status']) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) &&
+			 ('0000-00-00 00:00:00' == $post['post_date_gmt']))
 		$clear_date = true;
 	else
 		$clear_date = false;
@@ -3460,7 +3460,7 @@ 
 	// Merge old and new fields with new fields overwriting old ones.
 	$postarr = array_merge($post, $postarr);
 	$postarr['post_category'] = $post_cats;
-	if ( $clear_date ) {
+	if ($clear_date) {
 		$postarr['post_date'] = current_time('mysql');
 		$postarr['post_date_gmt'] = '';
 	}
@@ -3468,7 +3468,7 @@ 
 	if ($postarr['post_type'] == 'attachment')
 		return wp_insert_attachment($postarr);
 
-	return wp_insert_post( $postarr, $wp_error );
+	return wp_insert_post($postarr, $wp_error);
 }
 
 /**
@@ -3480,34 +3480,34 @@ 
  *
  * @param int|WP_Post $post Post ID or post object.
  */
-function wp_publish_post( $post ) {
+function wp_publish_post($post) {
 	global $wpdb;
 
-	if ( ! $post = get_post( $post ) )
+	if ( ! $post = get_post($post))
 		return;
 
-	if ( 'publish' == $post->post_status )
+	if ('publish' == $post->post_status)
 		return;
 
-	$wpdb->update( $wpdb->posts, array( 'post_status' => 'publish' ), array( 'ID' => $post->ID ) );
+	$wpdb->update($wpdb->posts, array('post_status' => 'publish'), array('ID' => $post->ID));
 
-	clean_post_cache( $post->ID );
+	clean_post_cache($post->ID);
 
 	$old_status = $post->post_status;
 	$post->post_status = 'publish';
-	wp_transition_post_status( 'publish', $old_status, $post );
+	wp_transition_post_status('publish', $old_status, $post);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post->ID, $post );
+	do_action('edit_post', $post->ID, $post);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
+	do_action("save_post_{$post->post_type}", $post->ID, $post, true);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'save_post', $post->ID, $post, true );
+	do_action('save_post', $post->ID, $post, true);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'wp_insert_post', $post->ID, $post, true );
+	do_action('wp_insert_post', $post->ID, $post, true);
 }
 
 /**
@@ -3520,26 +3520,26 @@ 
  *
  * @param int|WP_Post $post_id Post ID or post object.
  */
-function check_and_publish_future_post( $post_id ) {
+function check_and_publish_future_post($post_id) {
 	$post = get_post($post_id);
 
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
-	if ( 'future' != $post->post_status )
+	if ('future' != $post->post_status)
 		return;
 
-	$time = strtotime( $post->post_date_gmt . ' GMT' );
+	$time = strtotime($post->post_date_gmt.' GMT');
 
 	// Uh oh, someone jumped the gun!
-	if ( $time > time() ) {
-		wp_clear_scheduled_hook( 'publish_future_post', array( $post_id ) ); // clear anything else in the system
-		wp_schedule_single_event( $time, 'publish_future_post', array( $post_id ) );
+	if ($time > time()) {
+		wp_clear_scheduled_hook('publish_future_post', array($post_id)); // clear anything else in the system
+		wp_schedule_single_event($time, 'publish_future_post', array($post_id));
 		return;
 	}
 
 	// wp_publish_post() returns no meaningful value.
-	wp_publish_post( $post_id );
+	wp_publish_post($post_id);
 }
 
 /**
@@ -3557,8 +3557,8 @@ 
  * @param int    $post_parent Post parent ID.
  * @return string Unique slug for the post, based on $post_name (with a -1, -2, etc. suffix)
  */
-function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent ) {
-	if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post_status && 'revision' == $post_type ) )
+function wp_unique_post_slug($slug, $post_ID, $post_status, $post_type, $post_parent) {
+	if (in_array($post_status, array('draft', 'pending', 'auto-draft')) || ('inherit' == $post_status && 'revision' == $post_type))
 		return $slug;
 
 	global $wpdb, $wp_rewrite;
@@ -3566,13 +3566,13 @@ 
 	$original_slug = $slug;
 
 	$feeds = $wp_rewrite->feeds;
-	if ( ! is_array( $feeds ) )
+	if ( ! is_array($feeds))
 		$feeds = array();
 
-	if ( 'attachment' == $post_type ) {
+	if ('attachment' == $post_type) {
 		// Attachment slugs must be unique across all types.
 		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1";
-		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID ) );
+		$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID));
 
 		/**
 		 * Filters whether the post slug would make a bad attachment slug.
@@ -3582,17 +3582,17 @@ 
 		 * @param bool   $bad_slug Whether the slug would be bad as an attachment slug.
 		 * @param string $slug     The post slug.
 		 */
-		if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) {
+		if ($post_name_check || in_array($slug, $feeds) || 'embed' === $slug || apply_filters('wp_unique_post_slug_is_bad_attachment_slug', false, $slug)) {
 			$suffix = 2;
 			do {
-				$alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_ID ) );
+				$alt_post_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";
+				$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_ID));
 				$suffix++;
-			} while ( $post_name_check );
+			} while ($post_name_check);
 			$slug = $alt_post_name;
 		}
-	} elseif ( is_post_type_hierarchical( $post_type ) ) {
-		if ( 'nav_menu_item' == $post_type )
+	} elseif (is_post_type_hierarchical($post_type)) {
+		if ('nav_menu_item' == $post_type)
 			return $slug;
 
 		/*
@@ -3600,7 +3600,7 @@ 
 		 * namespace than posts so page slugs are allowed to overlap post slugs.
 		 */
 		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( %s, 'attachment' ) AND ID != %d AND post_parent = %d LIMIT 1";
-		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID, $post_parent ) );
+		$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_type, $post_ID, $post_parent));
 
 		/**
 		 * Filters whether the post slug would make a bad hierarchical post slug.
@@ -3612,26 +3612,26 @@ 
 		 * @param string $post_type   Post type.
 		 * @param int    $post_parent Post parent ID.
 		 */
-		if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug )  || apply_filters( 'wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent ) ) {
+		if ($post_name_check || in_array($slug, $feeds) || 'embed' === $slug || preg_match("@^($wp_rewrite->pagination_base)?\d+$@", $slug) || apply_filters('wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent)) {
 			$suffix = 2;
 			do {
-				$alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID, $post_parent ) );
+				$alt_post_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";
+				$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_type, $post_ID, $post_parent));
 				$suffix++;
-			} while ( $post_name_check );
+			} while ($post_name_check);
 			$slug = $alt_post_name;
 		}
 	} else {
 		// Post slugs must be unique across all posts.
 		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
-		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) );
+		$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_type, $post_ID));
 
 		// Prevent new post slugs that could result in URLs that conflict with date archives.
-		$post = get_post( $post_ID );
+		$post = get_post($post_ID);
 		$conflicts_with_date_archive = false;
-		if ( 'post' === $post_type && ( ! $post || $post->post_name !== $slug ) && preg_match( '/^[0-9]+$/', $slug ) && $slug_num = intval( $slug ) ) {
-			$permastructs   = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) );
-			$postname_index = array_search( '%postname%', $permastructs );
+		if ('post' === $post_type && ( ! $post || $post->post_name !== $slug) && preg_match('/^[0-9]+$/', $slug) && $slug_num = intval($slug)) {
+			$permastructs   = array_values(array_filter(explode('/', get_option('permalink_structure'))));
+			$postname_index = array_search('%postname%', $permastructs);
 
 			/*
 			 * Potential date clashes are as follows:
@@ -3640,9 +3640,9 @@ 
 			 * - An integer between 1 and 12 that follows 'year' conflicts with 'monthnum'.
 			 * - An integer between 1 and 31 that follows 'monthnum' conflicts with 'day'.
 			 */
-			if ( 0 === $postname_index ||
-				( $postname_index && '%year%' === $permastructs[ $postname_index - 1 ] && 13 > $slug_num ) ||
-				( $postname_index && '%monthnum%' === $permastructs[ $postname_index - 1 ] && 32 > $slug_num )
+			if (0 === $postname_index ||
+				($postname_index && '%year%' === $permastructs[$postname_index - 1] && 13 > $slug_num) ||
+				($postname_index && '%monthnum%' === $permastructs[$postname_index - 1] && 32 > $slug_num)
 			) {
 				$conflicts_with_date_archive = true;
 			}
@@ -3657,13 +3657,13 @@ 
 		 * @param string $slug      The post slug.
 		 * @param string $post_type Post type.
 		 */
-		if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || $conflicts_with_date_archive || apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type ) ) {
+		if ($post_name_check || in_array($slug, $feeds) || 'embed' === $slug || $conflicts_with_date_archive || apply_filters('wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type)) {
 			$suffix = 2;
 			do {
-				$alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID ) );
+				$alt_post_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";
+				$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_type, $post_ID));
 				$suffix++;
-			} while ( $post_name_check );
+			} while ($post_name_check);
 			$slug = $alt_post_name;
 		}
 	}
@@ -3680,7 +3680,7 @@ 
 	 * @param int    $post_parent   Post parent ID
 	 * @param string $original_slug The original post slug.
 	 */
-	return apply_filters( 'wp_unique_post_slug', $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug );
+	return apply_filters('wp_unique_post_slug', $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug);
 }
 
 /**
@@ -3695,16 +3695,16 @@ 
  * @param int    $length Optional. Max length of the slug. Default 200 (characters).
  * @return string The truncated slug.
  */
-function _truncate_post_slug( $slug, $length = 200 ) {
-	if ( strlen( $slug ) > $length ) {
-		$decoded_slug = urldecode( $slug );
-		if ( $decoded_slug === $slug )
-			$slug = substr( $slug, 0, $length );
+function _truncate_post_slug($slug, $length = 200) {
+	if (strlen($slug) > $length) {
+		$decoded_slug = urldecode($slug);
+		if ($decoded_slug === $slug)
+			$slug = substr($slug, 0, $length);
 		else
-			$slug = utf8_uri_encode( $decoded_slug, $length );
+			$slug = utf8_uri_encode($decoded_slug, $length);
 	}
 
-	return rtrim( $slug, '-' );
+	return rtrim($slug, '-');
 }
 
 /**
@@ -3719,7 +3719,7 @@ 
  *                              separated by commas. Default empty.
  * @return array|false|WP_Error Array of affected term IDs. WP_Error or false on failure.
  */
-function wp_add_post_tags( $post_id = 0, $tags = '' ) {
+function wp_add_post_tags($post_id = 0, $tags = '') {
 	return wp_set_post_tags($post_id, $tags, true);
 }
 
@@ -3737,8 +3737,8 @@ 
  *                              replace the tags with the new tags. Default false.
  * @return array|false|WP_Error Array of term taxonomy IDs of affected terms. WP_Error or false on failure.
  */
-function wp_set_post_tags( $post_id = 0, $tags = '', $append = false ) {
-	return wp_set_post_terms( $post_id, $tags, 'post_tag', $append);
+function wp_set_post_tags($post_id = 0, $tags = '', $append = false) {
+	return wp_set_post_terms($post_id, $tags, 'post_tag', $append);
 }
 
 /**
@@ -3756,31 +3756,31 @@ 
  *                               replace the terms with the new terms. Default false.
  * @return array|false|WP_Error Array of term taxonomy IDs of affected terms. WP_Error or false on failure.
  */
-function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $append = false ) {
+function wp_set_post_terms($post_id = 0, $tags = '', $taxonomy = 'post_tag', $append = false) {
 	$post_id = (int) $post_id;
 
-	if ( !$post_id )
+	if ( ! $post_id)
 		return false;
 
-	if ( empty($tags) )
+	if (empty($tags))
 		$tags = array();
 
-	if ( ! is_array( $tags ) ) {
-		$comma = _x( ',', 'tag delimiter' );
-		if ( ',' !== $comma )
-			$tags = str_replace( $comma, ',', $tags );
-		$tags = explode( ',', trim( $tags, " \n\t\r\0\x0B," ) );
+	if ( ! is_array($tags)) {
+		$comma = _x(',', 'tag delimiter');
+		if (',' !== $comma)
+			$tags = str_replace($comma, ',', $tags);
+		$tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
 	}
 
 	/*
 	 * Hierarchical taxonomies must always pass IDs rather than names so that
 	 * children with the same names but different parents aren't confused.
 	 */
-	if ( is_taxonomy_hierarchical( $taxonomy ) ) {
-		$tags = array_unique( array_map( 'intval', $tags ) );
+	if (is_taxonomy_hierarchical($taxonomy)) {
+		$tags = array_unique(array_map('intval', $tags));
 	}
 
-	return wp_set_object_terms( $post_id, $tags, $taxonomy, $append );
+	return wp_set_object_terms($post_id, $tags, $taxonomy, $append);
 }
 
 /**
@@ -3799,24 +3799,24 @@ 
  *                                  If false, replace the categories with the new categories.
  * @return array|false|WP_Error Array of term taxonomy IDs of affected categories. WP_Error or false on failure.
  */
-function wp_set_post_categories( $post_ID = 0, $post_categories = array(), $append = false ) {
+function wp_set_post_categories($post_ID = 0, $post_categories = array(), $append = false) {
 	$post_ID = (int) $post_ID;
-	$post_type = get_post_type( $post_ID );
-	$post_status = get_post_status( $post_ID );
+	$post_type = get_post_type($post_ID);
+	$post_status = get_post_status($post_ID);
 	// If $post_categories isn't already an array, make it one:
 	$post_categories = (array) $post_categories;
-	if ( empty( $post_categories ) ) {
-		if ( 'post' == $post_type && 'auto-draft' != $post_status ) {
-			$post_categories = array( get_option('default_category') );
+	if (empty($post_categories)) {
+		if ('post' == $post_type && 'auto-draft' != $post_status) {
+			$post_categories = array(get_option('default_category'));
 			$append = false;
 		} else {
 			$post_categories = array();
 		}
-	} elseif ( 1 == count( $post_categories ) && '' == reset( $post_categories ) ) {
+	} elseif (1 == count($post_categories) && '' == reset($post_categories)) {
 		return true;
 	}
 
-	return wp_set_post_terms( $post_ID, $post_categories, 'category', $append );
+	return wp_set_post_terms($post_ID, $post_categories, 'category', $append);
 }
 
 /**
@@ -3840,7 +3840,7 @@ 
  * @param string  $old_status Previous post status.
  * @param WP_Post $post Post data.
  */
-function wp_transition_post_status( $new_status, $old_status, $post ) {
+function wp_transition_post_status($new_status, $old_status, $post) {
 	/**
 	 * Fires when a post is transitioned from one status to another.
 	 *
@@ -3850,7 +3850,7 @@ 
 	 * @param string  $old_status Old post status.
 	 * @param WP_Post $post       Post object.
 	 */
-	do_action( 'transition_post_status', $new_status, $old_status, $post );
+	do_action('transition_post_status', $new_status, $old_status, $post);
 
 	/**
 	 * Fires when a post is transitioned from one status to another.
@@ -3862,7 +3862,7 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	do_action( "{$old_status}_to_{$new_status}", $post );
+	do_action("{$old_status}_to_{$new_status}", $post);
 
 	/**
 	 * Fires when a post is transitioned from one status to another.
@@ -3883,7 +3883,7 @@ 
 	 * @param int     $post_id Post ID.
 	 * @param WP_Post $post    Post object.
 	 */
-	do_action( "{$new_status}_{$post->post_type}", $post->ID, $post );
+	do_action("{$new_status}_{$post->post_type}", $post->ID, $post);
 }
 
 //
@@ -3901,9 +3901,9 @@ 
  * @param string $uri     Ping URI.
  * @return int|false How many rows were updated.
  */
-function add_ping( $post_id, $uri ) {
+function add_ping($post_id, $uri) {
 	global $wpdb;
-	$pung = $wpdb->get_var( $wpdb->prepare( "SELECT pinged FROM $wpdb->posts WHERE ID = %d", $post_id ));
+	$pung = $wpdb->get_var($wpdb->prepare("SELECT pinged FROM $wpdb->posts WHERE ID = %d", $post_id));
 	$pung = trim($pung);
 	$pung = preg_split('/\s/', $pung);
 	$pung[] = $uri;
@@ -3916,11 +3916,11 @@ 
 	 *
 	 * @param string $new New ping URL to add.
 	 */
-	$new = apply_filters( 'add_ping', $new );
+	$new = apply_filters('add_ping', $new);
 
 	// expected_slashed ($new).
 	$new = wp_unslash($new);
-	return $wpdb->update( $wpdb->posts, array( 'pinged' => $new ), array( 'ID' => $post_id ) );
+	return $wpdb->update($wpdb->posts, array('pinged' => $new), array('ID' => $post_id));
 }
 
 /**
@@ -3931,18 +3931,18 @@ 
  * @param int $post_id Post ID.
  * @return array List of enclosures.
  */
-function get_enclosed( $post_id ) {
-	$custom_fields = get_post_custom( $post_id );
+function get_enclosed($post_id) {
+	$custom_fields = get_post_custom($post_id);
 	$pung = array();
-	if ( !is_array( $custom_fields ) )
+	if ( ! is_array($custom_fields))
 		return $pung;
 
-	foreach ( $custom_fields as $key => $val ) {
-		if ( 'enclosure' != $key || !is_array( $val ) )
+	foreach ($custom_fields as $key => $val) {
+		if ('enclosure' != $key || ! is_array($val))
 			continue;
-		foreach ( $val as $enc ) {
-			$enclosure = explode( "\n", $enc );
-			$pung[] = trim( $enclosure[ 0 ] );
+		foreach ($val as $enc) {
+			$enclosure = explode("\n", $enc);
+			$pung[] = trim($enclosure[0]);
 		}
 	}
 
@@ -3954,7 +3954,7 @@ 
 	 * @param array $pung    Array of enclosures for the given post.
 	 * @param int   $post_id Post ID.
 	 */
-	return apply_filters( 'get_enclosed', $pung, $post_id );
+	return apply_filters('get_enclosed', $pung, $post_id);
 }
 
 /**
@@ -3967,9 +3967,9 @@ 
  * @param int $post_id Post ID.
  * @return array
  */
-function get_pung( $post_id ) {
+function get_pung($post_id) {
 	global $wpdb;
-	$pung = $wpdb->get_var( $wpdb->prepare( "SELECT pinged FROM $wpdb->posts WHERE ID = %d", $post_id ));
+	$pung = $wpdb->get_var($wpdb->prepare("SELECT pinged FROM $wpdb->posts WHERE ID = %d", $post_id));
 	$pung = trim($pung);
 	$pung = preg_split('/\s/', $pung);
 
@@ -3980,7 +3980,7 @@ 
 	 *
 	 * @param array $pung Array of URLs already pinged for the given post.
 	 */
-	return apply_filters( 'get_pung', $pung );
+	return apply_filters('get_pung', $pung);
 }
 
 /**
@@ -3993,10 +3993,10 @@ 
  * @param int $post_id Post ID
  * @return array
  */
-function get_to_ping( $post_id ) {
+function get_to_ping($post_id) {
 	global $wpdb;
-	$to_ping = $wpdb->get_var( $wpdb->prepare( "SELECT to_ping FROM $wpdb->posts WHERE ID = %d", $post_id ));
-	$to_ping = sanitize_trackback_urls( $to_ping );
+	$to_ping = $wpdb->get_var($wpdb->prepare("SELECT to_ping FROM $wpdb->posts WHERE ID = %d", $post_id));
+	$to_ping = sanitize_trackback_urls($to_ping);
 	$to_ping = preg_split('/\s/', $to_ping, -1, PREG_SPLIT_NO_EMPTY);
 
 	/**
@@ -4006,7 +4006,7 @@ 
 	 *
 	 * @param array $to_ping List of URLs yet to ping.
 	 */
-	return apply_filters( 'get_to_ping', $to_ping );
+	return apply_filters('get_to_ping', $to_ping);
 }
 
 /**
@@ -4017,22 +4017,22 @@ 
  * @param string $tb_list Comma separated list of URLs.
  * @param int    $post_id Post ID.
  */
-function trackback_url_list( $tb_list, $post_id ) {
-	if ( ! empty( $tb_list ) ) {
+function trackback_url_list($tb_list, $post_id) {
+	if ( ! empty($tb_list)) {
 		// Get post data.
-		$postdata = get_post( $post_id, ARRAY_A );
+		$postdata = get_post($post_id, ARRAY_A);
 
 		// Form an excerpt.
-		$excerpt = strip_tags( $postdata['post_excerpt'] ? $postdata['post_excerpt'] : $postdata['post_content'] );
+		$excerpt = strip_tags($postdata['post_excerpt'] ? $postdata['post_excerpt'] : $postdata['post_content']);
 
-		if ( strlen( $excerpt ) > 255 ) {
-			$excerpt = substr( $excerpt, 0, 252 ) . '&hellip;';
+		if (strlen($excerpt) > 255) {
+			$excerpt = substr($excerpt, 0, 252).'&hellip;';
 		}
 
-		$trackback_urls = explode( ',', $tb_list );
-		foreach ( (array) $trackback_urls as $tb_url ) {
-			$tb_url = trim( $tb_url );
-			trackback( $tb_url, wp_unslash( $postdata['post_title'] ), $excerpt, $post_id );
+		$trackback_urls = explode(',', $tb_list);
+		foreach ((array) $trackback_urls as $tb_url) {
+			$tb_url = trim($tb_url);
+			trackback($tb_url, wp_unslash($postdata['post_title']), $excerpt, $post_id);
 		}
 	}
 }
@@ -4054,7 +4054,7 @@ 
 	global $wpdb;
 
 	$page_ids = wp_cache_get('all_page_ids', 'posts');
-	if ( ! is_array( $page_ids ) ) {
+	if ( ! is_array($page_ids)) {
 		$page_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_type = 'page'");
 		wp_cache_add('all_page_ids', $page_ids, 'posts');
 	}
@@ -4077,8 +4077,8 @@ 
  *                       'edit', 'db', 'display'. Default 'raw'.
  * @return WP_Post|array|null WP_Post on success or null on failure.
  */
-function get_page( $page, $output = OBJECT, $filter = 'raw') {
-	return get_post( $page, $output, $filter );
+function get_page($page, $output = OBJECT, $filter = 'raw') {
+	return get_post($page, $output, $filter);
 }
 
 /**
@@ -4094,44 +4094,44 @@ 
  * @param string|array $post_type Optional. Post type or array of post types. Default 'page'.
  * @return WP_Post|array|void WP_Post on success.
  */
-function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
+function get_page_by_path($page_path, $output = OBJECT, $post_type = 'page') {
 	global $wpdb;
 
-	$last_changed = wp_cache_get( 'last_changed', 'posts' );
-	if ( false === $last_changed ) {
+	$last_changed = wp_cache_get('last_changed', 'posts');
+	if (false === $last_changed) {
 		$last_changed = microtime();
-		wp_cache_set( 'last_changed', $last_changed, 'posts' );
+		wp_cache_set('last_changed', $last_changed, 'posts');
 	}
 
-	$hash = md5( $page_path . serialize( $post_type ) );
+	$hash = md5($page_path.serialize($post_type));
 	$cache_key = "get_page_by_path:$hash:$last_changed";
-	$cached = wp_cache_get( $cache_key, 'posts' );
-	if ( false !== $cached ) {
+	$cached = wp_cache_get($cache_key, 'posts');
+	if (false !== $cached) {
 		// Special case: '0' is a bad `$page_path`.
-		if ( '0' === $cached || 0 === $cached ) {
+		if ('0' === $cached || 0 === $cached) {
 			return;
 		} else {
-			return get_post( $cached, $output );
+			return get_post($cached, $output);
 		}
 	}
 
 	$page_path = rawurlencode(urldecode($page_path));
 	$page_path = str_replace('%2F', '/', $page_path);
 	$page_path = str_replace('%20', ' ', $page_path);
-	$parts = explode( '/', trim( $page_path, '/' ) );
-	$parts = esc_sql( $parts );
-	$parts = array_map( 'sanitize_title_for_query', $parts );
+	$parts = explode('/', trim($page_path, '/'));
+	$parts = esc_sql($parts);
+	$parts = array_map('sanitize_title_for_query', $parts);
 
-	$in_string = "'" . implode( "','", $parts ) . "'";
+	$in_string = "'".implode("','", $parts)."'";
 
-	if ( is_array( $post_type ) ) {
+	if (is_array($post_type)) {
 		$post_types = $post_type;
 	} else {
-		$post_types = array( $post_type, 'attachment' );
+		$post_types = array($post_type, 'attachment');
 	}
 
-	$post_types = esc_sql( $post_types );
-	$post_type_in_string = "'" . implode( "','", $post_types ) . "'";
+	$post_types = esc_sql($post_types);
+	$post_type_in_string = "'".implode("','", $post_types)."'";
 	$sql = "
 		SELECT ID, post_name, post_parent, post_type
 		FROM $wpdb->posts
@@ -4139,13 +4139,13 @@ 
 		AND post_type IN ($post_type_in_string)
 	";
 
-	$pages = $wpdb->get_results( $sql, OBJECT_K );
+	$pages = $wpdb->get_results($sql, OBJECT_K);
 
-	$revparts = array_reverse( $parts );
+	$revparts = array_reverse($parts);
 
 	$foundid = 0;
-	foreach ( (array) $pages as $page ) {
-		if ( $page->post_name == $revparts[0] ) {
+	foreach ((array) $pages as $page) {
+		if ($page->post_name == $revparts[0]) {
 			$count = 0;
 			$p = $page;
 
@@ -4153,27 +4153,27 @@ 
 			 * Loop through the given path parts from right to left,
 			 * ensuring each matches the post ancestry.
 			 */
-			while ( $p->post_parent != 0 && isset( $pages[ $p->post_parent ] ) ) {
+			while ($p->post_parent != 0 && isset($pages[$p->post_parent])) {
 				$count++;
-				$parent = $pages[ $p->post_parent ];
-				if ( ! isset( $revparts[ $count ] ) || $parent->post_name != $revparts[ $count ] )
+				$parent = $pages[$p->post_parent];
+				if ( ! isset($revparts[$count]) || $parent->post_name != $revparts[$count])
 					break;
 				$p = $parent;
 			}
 
-			if ( $p->post_parent == 0 && $count+1 == count( $revparts ) && $p->post_name == $revparts[ $count ] ) {
+			if ($p->post_parent == 0 && $count + 1 == count($revparts) && $p->post_name == $revparts[$count]) {
 				$foundid = $page->ID;
-				if ( $page->post_type == $post_type )
+				if ($page->post_type == $post_type)
 					break;
 			}
 		}
 	}
 
 	// We cache misses as well as hits.
-	wp_cache_set( $cache_key, $foundid, 'posts' );
+	wp_cache_set($cache_key, $foundid, 'posts');
 
-	if ( $foundid ) {
-		return get_post( $foundid, $output );
+	if ($foundid) {
+		return get_post($foundid, $output);
 	}
 }
 
@@ -4190,31 +4190,31 @@ 
  * @param string|array $post_type  Optional. Post type or array of post types. Default 'page'.
  * @return WP_Post|array|void WP_Post on success or null on failure
  */
-function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' ) {
+function get_page_by_title($page_title, $output = OBJECT, $post_type = 'page') {
 	global $wpdb;
 
-	if ( is_array( $post_type ) ) {
-		$post_type = esc_sql( $post_type );
-		$post_type_in_string = "'" . implode( "','", $post_type ) . "'";
-		$sql = $wpdb->prepare( "
+	if (is_array($post_type)) {
+		$post_type = esc_sql($post_type);
+		$post_type_in_string = "'".implode("','", $post_type)."'";
+		$sql = $wpdb->prepare("
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_title = %s
 			AND post_type IN ($post_type_in_string)
-		", $page_title );
+		", $page_title);
 	} else {
-		$sql = $wpdb->prepare( "
+		$sql = $wpdb->prepare("
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_title = %s
 			AND post_type = %s
-		", $page_title, $post_type );
+		", $page_title, $post_type);
 	}
 
-	$page = $wpdb->get_var( $sql );
+	$page = $wpdb->get_var($sql);
 
-	if ( $page ) {
-		return get_post( $page, $output );
+	if ($page) {
+		return get_post($page, $output);
 	}
 }
 
@@ -4229,25 +4229,25 @@ 
  * @param array $pages   List of page objects from which descendants should be identified.
  * @return array List of page children.
  */
-function get_page_children( $page_id, $pages ) {
+function get_page_children($page_id, $pages) {
 	// Build a hash of ID -> children.
 	$children = array();
-	foreach ( (array) $pages as $page ) {
-		$children[ intval( $page->post_parent ) ][] = $page;
+	foreach ((array) $pages as $page) {
+		$children[intval($page->post_parent)][] = $page;
 	}
 
 	$page_list = array();
 
 	// Start the search by looking at immediate children.
-	if ( isset( $children[ $page_id ] ) ) {
+	if (isset($children[$page_id])) {
 		// Always start at the end of the stack in order to preserve original `$pages` order.
-		$to_look = array_reverse( $children[ $page_id ] );
+		$to_look = array_reverse($children[$page_id]);
 
-		while ( $to_look ) {
-			$p = array_pop( $to_look );
+		while ($to_look) {
+			$p = array_pop($to_look);
 			$page_list[] = $p;
-			if ( isset( $children[ $p->ID ] ) ) {
-				foreach ( array_reverse( $children[ $p->ID ] ) as $child ) {
+			if (isset($children[$p->ID])) {
+				foreach (array_reverse($children[$p->ID]) as $child) {
 					// Append to the `$to_look` stack to descend the tree.
 					$to_look[] = $child;
 				}
@@ -4270,19 +4270,19 @@ 
  * @param int   $page_id Optional. Parent page ID. Default 0.
  * @return array A list arranged by hierarchy. Children immediately follow their parents.
  */
-function get_page_hierarchy( &$pages, $page_id = 0 ) {
-	if ( empty( $pages ) ) {
+function get_page_hierarchy(&$pages, $page_id = 0) {
+	if (empty($pages)) {
 		return array();
 	}
 
 	$children = array();
-	foreach ( (array) $pages as $p ) {
-		$parent_id = intval( $p->post_parent );
-		$children[ $parent_id ][] = $p;
+	foreach ((array) $pages as $p) {
+		$parent_id = intval($p->post_parent);
+		$children[$parent_id][] = $p;
 	}
 
 	$result = array();
-	_page_traverse_name( $page_id, $children, $result );
+	_page_traverse_name($page_id, $children, $result);
 
 	return $result;
 }
@@ -4300,11 +4300,11 @@ 
  * @param array $children  Parent-children relations, passed by reference.
  * @param array $result    Result, passed by reference.
  */
-function _page_traverse_name( $page_id, &$children, &$result ){
-	if ( isset( $children[ $page_id ] ) ){
-		foreach ( (array)$children[ $page_id ] as $child ) {
-			$result[ $child->ID ] = $child->post_name;
-			_page_traverse_name( $child->ID, $children, $result );
+function _page_traverse_name($page_id, &$children, &$result) {
+	if (isset($children[$page_id])) {
+		foreach ((array) $children[$page_id] as $child) {
+			$result[$child->ID] = $child->post_name;
+			_page_traverse_name($child->ID, $children, $result);
 		}
 	}
 }
@@ -4320,20 +4320,20 @@ 
  * @param WP_Post|object|int $page Optional. Page ID or WP_Post object. Default is global $post.
  * @return string|false Page URI, false on error.
  */
-function get_page_uri( $page = 0 ) {
-	if ( ! $page instanceof WP_Post ) {
-		$page = get_post( $page );
+function get_page_uri($page = 0) {
+	if ( ! $page instanceof WP_Post) {
+		$page = get_post($page);
 	}
 
-	if ( ! $page )
+	if ( ! $page)
 		return false;
 
 	$uri = $page->post_name;
 
-	foreach ( $page->ancestors as $parent ) {
-		$parent = get_post( $parent );
-		if ( $parent && $parent->post_name ) {
-			$uri = $parent->post_name . '/' . $uri;
+	foreach ($page->ancestors as $parent) {
+		$parent = get_post($parent);
+		if ($parent && $parent->post_name) {
+			$uri = $parent->post_name.'/'.$uri;
 		}
 	}
 
@@ -4345,7 +4345,7 @@ 
 	 * @param string  $uri  Page URI.
 	 * @param WP_Post $page Page object.
 	 */
-	return apply_filters( 'get_page_uri', $uri, $page );
+	return apply_filters('get_page_uri', $uri, $page);
 }
 
 /**
@@ -4390,7 +4390,7 @@ 
  * }
  * @return array|false List of pages matching defaults or `$args`.
  */
-function get_pages( $args = array() ) {
+function get_pages($args = array()) {
 	global $wpdb;
 
 	$defaults = array(
@@ -4403,7 +4403,7 @@ 
 		'post_type' => 'page', 'post_status' => 'publish',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	$number = (int) $r['number'];
 	$offset = (int) $r['offset'];
@@ -4416,87 +4416,87 @@ 
 	$post_status = $r['post_status'];
 
 	// Make sure the post type is hierarchical.
-	$hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) );
-	if ( ! in_array( $r['post_type'], $hierarchical_post_types ) ) {
+	$hierarchical_post_types = get_post_types(array('hierarchical' => true));
+	if ( ! in_array($r['post_type'], $hierarchical_post_types)) {
 		return false;
 	}
 
-	if ( $parent > 0 && ! $child_of ) {
+	if ($parent > 0 && ! $child_of) {
 		$hierarchical = false;
 	}
 
 	// Make sure we have a valid post status.
-	if ( ! is_array( $post_status ) ) {
-		$post_status = explode( ',', $post_status );
+	if ( ! is_array($post_status)) {
+		$post_status = explode(',', $post_status);
 	}
-	if ( array_diff( $post_status, get_post_stati() ) ) {
+	if (array_diff($post_status, get_post_stati())) {
 		return false;
 	}
 
 	// $args can be whatever, only use the args defined in defaults to compute the key.
-	$key = md5( serialize( wp_array_slice_assoc( $r, array_keys( $defaults ) ) ) );
-	$last_changed = wp_cache_get( 'last_changed', 'posts' );
-	if ( ! $last_changed ) {
+	$key = md5(serialize(wp_array_slice_assoc($r, array_keys($defaults))));
+	$last_changed = wp_cache_get('last_changed', 'posts');
+	if ( ! $last_changed) {
 		$last_changed = microtime();
-		wp_cache_set( 'last_changed', $last_changed, 'posts' );
+		wp_cache_set('last_changed', $last_changed, 'posts');
 	}
 
 	$cache_key = "get_pages:$key:$last_changed";
-	if ( $cache = wp_cache_get( $cache_key, 'posts' ) ) {
+	if ($cache = wp_cache_get($cache_key, 'posts')) {
 		// Convert to WP_Post instances.
-		$pages = array_map( 'get_post', $cache );
+		$pages = array_map('get_post', $cache);
 		/** This filter is documented in wp-includes/post.php */
-		$pages = apply_filters( 'get_pages', $pages, $r );
+		$pages = apply_filters('get_pages', $pages, $r);
 		return $pages;
 	}
 
 	$inclusions = '';
-	if ( ! empty( $r['include'] ) ) {
+	if ( ! empty($r['include'])) {
 		$child_of = 0; //ignore child_of, parent, exclude, meta_key, and meta_value params if using include
 		$parent = -1;
 		$exclude = '';
 		$meta_key = '';
 		$meta_value = '';
 		$hierarchical = false;
-		$incpages = wp_parse_id_list( $r['include'] );
-		if ( ! empty( $incpages ) ) {
-			$inclusions = ' AND ID IN (' . implode( ',', $incpages ) .  ')';
+		$incpages = wp_parse_id_list($r['include']);
+		if ( ! empty($incpages)) {
+			$inclusions = ' AND ID IN ('.implode(',', $incpages).')';
 		}
 	}
 
 	$exclusions = '';
-	if ( ! empty( $exclude ) ) {
-		$expages = wp_parse_id_list( $exclude );
-		if ( ! empty( $expages ) ) {
-			$exclusions = ' AND ID NOT IN (' . implode( ',', $expages ) .  ')';
+	if ( ! empty($exclude)) {
+		$expages = wp_parse_id_list($exclude);
+		if ( ! empty($expages)) {
+			$exclusions = ' AND ID NOT IN ('.implode(',', $expages).')';
 		}
 	}
 
 	$author_query = '';
-	if ( ! empty( $r['authors'] ) ) {
-		$post_authors = preg_split( '/[\s,]+/', $r['authors'] );
+	if ( ! empty($r['authors'])) {
+		$post_authors = preg_split('/[\s,]+/', $r['authors']);
 
-		if ( ! empty( $post_authors ) ) {
-			foreach ( $post_authors as $post_author ) {
+		if ( ! empty($post_authors)) {
+			foreach ($post_authors as $post_author) {
 				//Do we have an author id or an author login?
-				if ( 0 == intval($post_author) ) {
+				if (0 == intval($post_author)) {
 					$post_author = get_user_by('login', $post_author);
-					if ( empty( $post_author ) ) {
+					if (empty($post_author)) {
 						continue;
 					}
-					if ( empty( $post_author->ID ) ) {
+					if (empty($post_author->ID)) {
 						continue;
 					}
 					$post_author = $post_author->ID;
 				}
 
-				if ( '' == $author_query ) {
+				if ('' == $author_query) {
 					$author_query = $wpdb->prepare(' post_author = %d ', $post_author);
 				} else {
 					$author_query .= $wpdb->prepare(' OR post_author = %d ', $post_author);
 				}
 			}
-			if ( '' != $author_query ) {
+			if ('' != $author_query) {
 				$author_query = " AND ($author_query)";
 			}
 		}
@@ -4504,49 +4504,49 @@ 
 
 	$join = '';
 	$where = "$exclusions $inclusions ";
-	if ( '' !== $meta_key || '' !== $meta_value ) {
+	if ('' !== $meta_key || '' !== $meta_value) {
 		$join = " LEFT JOIN $wpdb->postmeta ON ( $wpdb->posts.ID = $wpdb->postmeta.post_id )";
 
 		// meta_key and meta_value might be slashed
 		$meta_key = wp_unslash($meta_key);
 		$meta_value = wp_unslash($meta_value);
-		if ( '' !== $meta_key ) {
+		if ('' !== $meta_key) {
 			$where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_key = %s", $meta_key);
 		}
-		if ( '' !== $meta_value ) {
+		if ('' !== $meta_value) {
 			$where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_value = %s", $meta_value);
 		}
 
 	}
 
-	if ( is_array( $parent ) ) {
-		$post_parent__in = implode( ',', array_map( 'absint', (array) $parent ) );
-		if ( ! empty( $post_parent__in ) ) {
+	if (is_array($parent)) {
+		$post_parent__in = implode(',', array_map('absint', (array) $parent));
+		if ( ! empty($post_parent__in)) {
 			$where .= " AND post_parent IN ($post_parent__in)";
 		}
-	} elseif ( $parent >= 0 ) {
+	} elseif ($parent >= 0) {
 		$where .= $wpdb->prepare(' AND post_parent = %d ', $parent);
 	}
 
-	if ( 1 == count( $post_status ) ) {
-		$where_post_type = $wpdb->prepare( "post_type = %s AND post_status = %s", $r['post_type'], reset( $post_status ) );
+	if (1 == count($post_status)) {
+		$where_post_type = $wpdb->prepare("post_type = %s AND post_status = %s", $r['post_type'], reset($post_status));
 	} else {
-		$post_status = implode( "', '", $post_status );
-		$where_post_type = $wpdb->prepare( "post_type = %s AND post_status IN ('$post_status')", $r['post_type'] );
+		$post_status = implode("', '", $post_status);
+		$where_post_type = $wpdb->prepare("post_type = %s AND post_status IN ('$post_status')", $r['post_type']);
 	}
 
 	$orderby_array = array();
-	$allowed_keys = array( 'author', 'post_author', 'date', 'post_date', 'title', 'post_title', 'name', 'post_name', 'modified',
+	$allowed_keys = array('author', 'post_author', 'date', 'post_date', 'title', 'post_title', 'name', 'post_name', 'modified',
 		'post_modified', 'modified_gmt', 'post_modified_gmt', 'menu_order', 'parent', 'post_parent',
-		'ID', 'rand', 'comment_count' );
+		'ID', 'rand', 'comment_count');
 
-	foreach ( explode( ',', $r['sort_column'] ) as $orderby ) {
-		$orderby = trim( $orderby );
-		if ( ! in_array( $orderby, $allowed_keys ) ) {
+	foreach (explode(',', $r['sort_column']) as $orderby) {
+		$orderby = trim($orderby);
+		if ( ! in_array($orderby, $allowed_keys)) {
 			continue;
 		}
 
-		switch ( $orderby ) {
+		switch ($orderby) {
 			case 'menu_order':
 				break;
 			case 'ID':
@@ -4559,36 +4559,36 @@ 
 				$orderby = "$wpdb->posts.comment_count";
 				break;
 			default:
-				if ( 0 === strpos( $orderby, 'post_' ) ) {
-					$orderby = "$wpdb->posts." . $orderby;
+				if (0 === strpos($orderby, 'post_')) {
+					$orderby = "$wpdb->posts.".$orderby;
 				} else {
-					$orderby = "$wpdb->posts.post_" . $orderby;
+					$orderby = "$wpdb->posts.post_".$orderby;
 				}
 		}
 
 		$orderby_array[] = $orderby;
 
 	}
-	$sort_column = ! empty( $orderby_array ) ? implode( ',', $orderby_array ) : "$wpdb->posts.post_title";
+	$sort_column = ! empty($orderby_array) ? implode(',', $orderby_array) : "$wpdb->posts.post_title";
 
-	$sort_order = strtoupper( $r['sort_order'] );
-	if ( '' !== $sort_order && ! in_array( $sort_order, array( 'ASC', 'DESC' ) ) ) {
+	$sort_order = strtoupper($r['sort_order']);
+	if ('' !== $sort_order && ! in_array($sort_order, array('ASC', 'DESC'))) {
 		$sort_order = 'ASC';
 	}
 
 	$query = "SELECT * FROM $wpdb->posts $join WHERE ($where_post_type) $where ";
 	$query .= $author_query;
-	$query .= " ORDER BY " . $sort_column . " " . $sort_order ;
+	$query .= " ORDER BY ".$sort_column." ".$sort_order;
 
-	if ( ! empty( $number ) ) {
-		$query .= ' LIMIT ' . $offset . ',' . $number;
+	if ( ! empty($number)) {
+		$query .= ' LIMIT '.$offset.','.$number;
 	}
 
 	$pages = $wpdb->get_results($query);
 
-	if ( empty($pages) ) {
+	if (empty($pages)) {
 		/** This filter is documented in wp-includes/post.php */
-		$pages = apply_filters( 'get_pages', array(), $r );
+		$pages = apply_filters('get_pages', array(), $r);
 		return $pages;
 	}
 
@@ -4599,38 +4599,38 @@ 
 	}
 
 	// Update cache.
-	update_post_cache( $pages );
+	update_post_cache($pages);
 
-	if ( $child_of || $hierarchical ) {
+	if ($child_of || $hierarchical) {
 		$pages = get_page_children($child_of, $pages);
 	}
 
-	if ( ! empty( $r['exclude_tree'] ) ) {
-		$exclude = wp_parse_id_list( $r['exclude_tree'] );
-		foreach ( $exclude as $id ) {
-			$children = get_page_children( $id, $pages );
-			foreach ( $children as $child ) {
+	if ( ! empty($r['exclude_tree'])) {
+		$exclude = wp_parse_id_list($r['exclude_tree']);
+		foreach ($exclude as $id) {
+			$children = get_page_children($id, $pages);
+			foreach ($children as $child) {
 				$exclude[] = $child->ID;
 			}
 		}
 
-		$num_pages = count( $pages );
-		for ( $i = 0; $i < $num_pages; $i++ ) {
-			if ( in_array( $pages[$i]->ID, $exclude ) ) {
-				unset( $pages[$i] );
+		$num_pages = count($pages);
+		for ($i = 0; $i < $num_pages; $i++) {
+			if (in_array($pages[$i]->ID, $exclude)) {
+				unset($pages[$i]);
 			}
 		}
 	}
 
 	$page_structure = array();
-	foreach ( $pages as $page ) {
+	foreach ($pages as $page) {
 		$page_structure[] = $page->ID;
 	}
 
-	wp_cache_set( $cache_key, $page_structure, 'posts' );
+	wp_cache_set($cache_key, $page_structure, 'posts');
 
 	// Convert to WP_Post instances
-	$pages = array_map( 'get_post', $pages );
+	$pages = array_map('get_post', $pages);
 
 	/**
 	 * Filters the retrieved list of pages.
@@ -4640,7 +4640,7 @@ 
 	 * @param array $pages List of pages to retrieve.
 	 * @param array $r     Array of get_pages() arguments.
 	 */
-	return apply_filters( 'get_pages', $pages, $r );
+	return apply_filters('get_pages', $pages, $r);
 }
 
 //
@@ -4660,9 +4660,9 @@ 
 		return false;
 	if (strpos($url, home_url('/?attachment_id=')) !== false)
 		return true;
-	if ( $id = url_to_postid($url) ) {
+	if ($id = url_to_postid($url)) {
 		$post = get_post($id);
-		if ( 'attachment' == $post->post_type )
+		if ('attachment' == $post->post_type)
 			return true;
 	}
 	return false;
@@ -4691,21 +4691,21 @@ 
  * @param int          $parent Optional. Parent post ID.
  * @return int Attachment ID.
  */
-function wp_insert_attachment( $args, $file = false, $parent = 0 ) {
+function wp_insert_attachment($args, $file = false, $parent = 0) {
 	$defaults = array(
 		'file'        => $file,
 		'post_parent' => 0
 	);
 
-	$data = wp_parse_args( $args, $defaults );
+	$data = wp_parse_args($args, $defaults);
 
-	if ( ! empty( $parent ) ) {
+	if ( ! empty($parent)) {
 		$data['post_parent'] = $parent;
 	}
 
 	$data['post_type'] = 'attachment';
 
-	return wp_insert_post( $data );
+	return wp_insert_post($data);
 }
 
 /**
@@ -4727,27 +4727,27 @@ 
  *                           Default false.
  * @return mixed False on failure. Post data on success.
  */
-function wp_delete_attachment( $post_id, $force_delete = false ) {
+function wp_delete_attachment($post_id, $force_delete = false) {
 	global $wpdb;
 
-	if ( !$post = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $post_id) ) )
+	if ( ! $post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $post_id)))
 		return $post;
 
-	if ( 'attachment' != $post->post_type )
+	if ('attachment' != $post->post_type)
 		return false;
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && MEDIA_TRASH && 'trash' != $post->post_status )
-		return wp_trash_post( $post_id );
+	if ( ! $force_delete && EMPTY_TRASH_DAYS && MEDIA_TRASH && 'trash' != $post->post_status)
+		return wp_trash_post($post_id);
 
 	delete_post_meta($post_id, '_wp_trash_meta_status');
 	delete_post_meta($post_id, '_wp_trash_meta_time');
 
-	$meta = wp_get_attachment_metadata( $post_id );
-	$backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
-	$file = get_attached_file( $post_id );
+	$meta = wp_get_attachment_metadata($post_id);
+	$backup_sizes = get_post_meta($post->ID, '_wp_attachment_backup_sizes', true);
+	$file = get_attached_file($post_id);
 
-	if ( is_multisite() )
-		delete_transient( 'dirsize_cache' );
+	if (is_multisite())
+		delete_transient('dirsize_cache');
 
 	/**
 	 * Fires before an attachment is deleted, at the start of wp_delete_attachment().
@@ -4756,70 +4756,70 @@ 
 	 *
 	 * @param int $post_id Attachment ID.
 	 */
-	do_action( 'delete_attachment', $post_id );
+	do_action('delete_attachment', $post_id);
 
 	wp_delete_object_term_relationships($post_id, array('category', 'post_tag'));
 	wp_delete_object_term_relationships($post_id, get_object_taxonomies($post->post_type));
 
 	// Delete all for any posts.
-	delete_metadata( 'post', null, '_thumbnail_id', $post_id, true );
+	delete_metadata('post', null, '_thumbnail_id', $post_id, true);
 
-	wp_defer_comment_counting( true );
+	wp_defer_comment_counting(true);
 
-	$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id ));
-	foreach ( $comment_ids as $comment_id ) {
-		wp_delete_comment( $comment_id, true );
+	$comment_ids = $wpdb->get_col($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id));
+	foreach ($comment_ids as $comment_id) {
+		wp_delete_comment($comment_id, true);
 	}
 
-	wp_defer_comment_counting( false );
+	wp_defer_comment_counting(false);
 
-	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $post_id ));
-	foreach ( $post_meta_ids as $mid )
-		delete_metadata_by_mid( 'post', $mid );
+	$post_meta_ids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $post_id));
+	foreach ($post_meta_ids as $mid)
+		delete_metadata_by_mid('post', $mid);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'delete_post', $post_id );
-	$result = $wpdb->delete( $wpdb->posts, array( 'ID' => $post_id ) );
-	if ( ! $result ) {
+	do_action('delete_post', $post_id);
+	$result = $wpdb->delete($wpdb->posts, array('ID' => $post_id));
+	if ( ! $result) {
 		return false;
 	}
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'deleted_post', $post_id );
+	do_action('deleted_post', $post_id);
 
 	$uploadpath = wp_get_upload_dir();
 
-	if ( ! empty($meta['thumb']) ) {
+	if ( ! empty($meta['thumb'])) {
 		// Don't delete the thumb if another attachment uses it.
-		if (! $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE %s AND post_id <> %d", '%' . $wpdb->esc_like( $meta['thumb'] ) . '%', $post_id)) ) {
+		if ( ! $wpdb->get_row($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE %s AND post_id <> %d", '%'.$wpdb->esc_like($meta['thumb']).'%', $post_id))) {
 			$thumbfile = str_replace(basename($file), $meta['thumb'], $file);
 			/** This filter is documented in wp-includes/functions.php */
-			$thumbfile = apply_filters( 'wp_delete_file', $thumbfile );
-			@ unlink( path_join($uploadpath['basedir'], $thumbfile) );
+			$thumbfile = apply_filters('wp_delete_file', $thumbfile);
+			@ unlink(path_join($uploadpath['basedir'], $thumbfile));
 		}
 	}
 
 	// Remove intermediate and backup images if there are any.
-	if ( isset( $meta['sizes'] ) && is_array( $meta['sizes'] ) ) {
-		foreach ( $meta['sizes'] as $size => $sizeinfo ) {
-			$intermediate_file = str_replace( basename( $file ), $sizeinfo['file'], $file );
+	if (isset($meta['sizes']) && is_array($meta['sizes'])) {
+		foreach ($meta['sizes'] as $size => $sizeinfo) {
+			$intermediate_file = str_replace(basename($file), $sizeinfo['file'], $file);
 			/** This filter is documented in wp-includes/functions.php */
-			$intermediate_file = apply_filters( 'wp_delete_file', $intermediate_file );
-			@ unlink( path_join( $uploadpath['basedir'], $intermediate_file ) );
+			$intermediate_file = apply_filters('wp_delete_file', $intermediate_file);
+			@ unlink(path_join($uploadpath['basedir'], $intermediate_file));
 		}
 	}
 
-	if ( is_array($backup_sizes) ) {
-		foreach ( $backup_sizes as $size ) {
-			$del_file = path_join( dirname($meta['file']), $size['file'] );
+	if (is_array($backup_sizes)) {
+		foreach ($backup_sizes as $size) {
+			$del_file = path_join(dirname($meta['file']), $size['file']);
 			/** This filter is documented in wp-includes/functions.php */
-			$del_file = apply_filters( 'wp_delete_file', $del_file );
-			@ unlink( path_join($uploadpath['basedir'], $del_file) );
+			$del_file = apply_filters('wp_delete_file', $del_file);
+			@ unlink(path_join($uploadpath['basedir'], $del_file));
 		}
 	}
 
-	wp_delete_file( $file );
+	wp_delete_file($file);
 
-	clean_post_cache( $post );
+	clean_post_cache($post);
 
 	return $post;
 }
@@ -4833,14 +4833,14 @@ 
  * @param bool $unfiltered Optional. If true, filters are not run. Default false.
  * @return mixed Attachment meta field. False on failure.
  */
-function wp_get_attachment_metadata( $post_id = 0, $unfiltered = false ) {
+function wp_get_attachment_metadata($post_id = 0, $unfiltered = false) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
 
-	$data = get_post_meta( $post->ID, '_wp_attachment_metadata', true );
+	$data = get_post_meta($post->ID, '_wp_attachment_metadata', true);
 
-	if ( $unfiltered )
+	if ($unfiltered)
 		return $data;
 
 	/**
@@ -4852,7 +4852,7 @@ 
 	 *                            if the object does not exist.
 	 * @param int        $post_id Attachment ID.
 	 */
-	return apply_filters( 'wp_get_attachment_metadata', $data, $post->ID );
+	return apply_filters('wp_get_attachment_metadata', $data, $post->ID);
 }
 
 /**
@@ -4864,9 +4864,9 @@ 
  * @param array $data    Attachment data.
  * @return int|bool False if $post is invalid.
  */
-function wp_update_attachment_metadata( $post_id, $data ) {
+function wp_update_attachment_metadata($post_id, $data) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
 
 	/**
@@ -4877,10 +4877,10 @@ 
 	 * @param array $data    Array of updated attachment meta data.
 	 * @param int   $post_id Attachment ID.
 	 */
-	if ( $data = apply_filters( 'wp_update_attachment_metadata', $data, $post->ID ) )
-		return update_post_meta( $post->ID, '_wp_attachment_metadata', $data );
+	if ($data = apply_filters('wp_update_attachment_metadata', $data, $post->ID))
+		return update_post_meta($post->ID, '_wp_attachment_metadata', $data);
 	else
-		return delete_post_meta( $post->ID, '_wp_attachment_metadata' );
+		return delete_post_meta($post->ID, '_wp_attachment_metadata');
 }
 
 /**
@@ -4893,29 +4893,29 @@ 
  * @param int $post_id Optional. Attachment ID. Default 0.
  * @return string|false Attachment URL, otherwise false.
  */
-function wp_get_attachment_url( $post_id = 0 ) {
+function wp_get_attachment_url($post_id = 0) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
 
-	if ( 'attachment' != $post->post_type )
+	if ('attachment' != $post->post_type)
 		return false;
 
 	$url = '';
 	// Get attached file.
-	if ( $file = get_post_meta( $post->ID, '_wp_attached_file', true ) ) {
+	if ($file = get_post_meta($post->ID, '_wp_attached_file', true)) {
 		// Get upload directory.
-		if ( ( $uploads = wp_get_upload_dir() ) && false === $uploads['error'] ) {
+		if (($uploads = wp_get_upload_dir()) && false === $uploads['error']) {
 			// Check that the upload base exists in the file location.
-			if ( 0 === strpos( $file, $uploads['basedir'] ) ) {
+			if (0 === strpos($file, $uploads['basedir'])) {
 				// Replace file location with url location.
 				$url = str_replace($uploads['basedir'], $uploads['baseurl'], $file);
-			} elseif ( false !== strpos($file, 'wp-content/uploads') ) {
+			} elseif (false !== strpos($file, 'wp-content/uploads')) {
 				// Get the directory name relative to the basedir (back compat for pre-2.7 uploads)
-				$url = trailingslashit( $uploads['baseurl'] . '/' . _wp_get_attachment_relative_path( $file ) ) . basename( $file );
+				$url = trailingslashit($uploads['baseurl'].'/'._wp_get_attachment_relative_path($file)).basename($file);
 			} else {
 				// It's a newly-uploaded file, therefore $file is relative to the basedir.
-				$url = $uploads['baseurl'] . "/$file";
+				$url = $uploads['baseurl']."/$file";
 			}
 		}
 	}
@@ -4924,13 +4924,13 @@ 
 	 * If any of the above options failed, Fallback on the GUID as used pre-2.7,
 	 * not recommended to rely upon this.
 	 */
-	if ( empty($url) ) {
-		$url = get_the_guid( $post->ID );
+	if (empty($url)) {
+		$url = get_the_guid($post->ID);
 	}
 
 	// On SSL front end, URLs should be HTTPS.
-	if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] ) {
-		$url = set_url_scheme( $url );
+	if (is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow']) {
+		$url = set_url_scheme($url);
 	}
 
 	/**
@@ -4941,9 +4941,9 @@ 
 	 * @param string $url     URL for the given attachment.
 	 * @param int    $post_id Attachment ID.
 	 */
-	$url = apply_filters( 'wp_get_attachment_url', $url, $post->ID );
+	$url = apply_filters('wp_get_attachment_url', $url, $post->ID);
 
-	if ( empty( $url ) )
+	if (empty($url))
 		return false;
 
 	return $url;
@@ -4957,13 +4957,13 @@ 
  * @param int $post_id Optional. Attachment ID. Default is the ID of the global `$post`.
  * @return string|false False on failure. Attachment caption on success.
  */
-function wp_get_attachment_caption( $post_id = 0 ) {
+function wp_get_attachment_caption($post_id = 0) {
 	$post_id = (int) $post_id;
-	if ( ! $post = get_post( $post_id ) ) {
+	if ( ! $post = get_post($post_id)) {
 		return false;
 	}
 
-	if ( 'attachment' !== $post->post_type ) {
+	if ('attachment' !== $post->post_type) {
 		return false;
 	}
 
@@ -4977,7 +4977,7 @@ 
 	 * @param string $caption Caption for the given attachment.
 	 * @param int    $post_id Attachment ID.
 	 */
-	return apply_filters( 'wp_get_attachment_caption', $caption, $post->ID );
+	return apply_filters('wp_get_attachment_caption', $caption, $post->ID);
 }
 
 /**
@@ -4988,16 +4988,16 @@ 
  * @param int $post_id Optional. Attachment ID. Default 0.
  * @return string|false False on failure. Thumbnail file path on success.
  */
-function wp_get_attachment_thumb_file( $post_id = 0 ) {
+function wp_get_attachment_thumb_file($post_id = 0) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
-	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post->ID ) ) )
+	if ( ! is_array($imagedata = wp_get_attachment_metadata($post->ID)))
 		return false;
 
-	$file = get_attached_file( $post->ID );
+	$file = get_attached_file($post->ID);
 
-	if ( !empty($imagedata['thumb']) && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file)) && file_exists($thumbfile) ) {
+	if ( ! empty($imagedata['thumb']) && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file)) && file_exists($thumbfile)) {
 		/**
 		 * Filters the attachment thumbnail file path.
 		 *
@@ -5006,7 +5006,7 @@ 
 		 * @param string $thumbfile File path to the attachment thumbnail.
 		 * @param int    $post_id   Attachment ID.
 		 */
-		return apply_filters( 'wp_get_attachment_thumb_file', $thumbfile, $post->ID );
+		return apply_filters('wp_get_attachment_thumb_file', $thumbfile, $post->ID);
 	}
 	return false;
 }
@@ -5019,18 +5019,18 @@ 
  * @param int $post_id Optional. Attachment ID. Default 0.
  * @return string|false False on failure. Thumbnail URL on success.
  */
-function wp_get_attachment_thumb_url( $post_id = 0 ) {
+function wp_get_attachment_thumb_url($post_id = 0) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
-	if ( !$url = wp_get_attachment_url( $post->ID ) )
+	if ( ! $url = wp_get_attachment_url($post->ID))
 		return false;
 
-	$sized = image_downsize( $post_id, 'thumbnail' );
-	if ( $sized )
+	$sized = image_downsize($post_id, 'thumbnail');
+	if ($sized)
 		return $sized[0];
 
-	if ( !$thumb = wp_get_attachment_thumb_file( $post->ID ) )
+	if ( ! $thumb = wp_get_attachment_thumb_file($post->ID))
 		return false;
 
 	$url = str_replace(basename($url), basename($thumb), $url);
@@ -5043,7 +5043,7 @@ 
 	 * @param string $url     URL for the attachment thumbnail.
 	 * @param int    $post_id Attachment ID.
 	 */
-	return apply_filters( 'wp_get_attachment_thumb_url', $url, $post->ID );
+	return apply_filters('wp_get_attachment_thumb_url', $url, $post->ID);
 }
 
 /**
@@ -5055,40 +5055,40 @@ 
  * @param int|WP_Post $post Optional. Attachment ID or object. Default is global $post.
  * @return bool True if one of the accepted types, false otherwise.
  */
-function wp_attachment_is( $type, $post = null ) {
-	if ( ! $post = get_post( $post ) ) {
+function wp_attachment_is($type, $post = null) {
+	if ( ! $post = get_post($post)) {
 		return false;
 	}
 
-	if ( ! $file = get_attached_file( $post->ID ) ) {
+	if ( ! $file = get_attached_file($post->ID)) {
 		return false;
 	}
 
-	if ( 0 === strpos( $post->post_mime_type, $type . '/' ) ) {
+	if (0 === strpos($post->post_mime_type, $type.'/')) {
 		return true;
 	}
 
-	$check = wp_check_filetype( $file );
-	if ( empty( $check['ext'] ) ) {
+	$check = wp_check_filetype($file);
+	if (empty($check['ext'])) {
 		return false;
 	}
 
 	$ext = $check['ext'];
 
-	if ( 'import' !== $post->post_mime_type ) {
+	if ('import' !== $post->post_mime_type) {
 		return $type === $ext;
 	}
 
-	switch ( $type ) {
+	switch ($type) {
 	case 'image':
-		$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
-		return in_array( $ext, $image_exts );
+		$image_exts = array('jpg', 'jpeg', 'jpe', 'gif', 'png');
+		return in_array($ext, $image_exts);
 
 	case 'audio':
-		return in_array( $ext, wp_get_audio_extensions() );
+		return in_array($ext, wp_get_audio_extensions());
 
 	case 'video':
-		return in_array( $ext, wp_get_video_extensions() );
+		return in_array($ext, wp_get_video_extensions());
 
 	default:
 		return $type === $ext;
@@ -5105,8 +5105,8 @@ 
  * @param int|WP_Post $post Optional. Attachment ID or object. Default is global $post.
  * @return bool Whether the attachment is an image.
  */
-function wp_attachment_is_image( $post = null ) {
-	return wp_attachment_is( 'image', $post );
+function wp_attachment_is_image($post = null) {
+	return wp_attachment_is('image', $post);
 }
 
 /**
@@ -5117,22 +5117,22 @@ 
  * @param string|int $mime MIME type or attachment ID.
  * @return string|false Icon, false otherwise.
  */
-function wp_mime_type_icon( $mime = 0 ) {
-	if ( !is_numeric($mime) )
+function wp_mime_type_icon($mime = 0) {
+	if ( ! is_numeric($mime))
 		$icon = wp_cache_get("mime_type_icon_$mime");
 
 	$post_id = 0;
-	if ( empty($icon) ) {
+	if (empty($icon)) {
 		$post_mimes = array();
-		if ( is_numeric($mime) ) {
+		if (is_numeric($mime)) {
 			$mime = (int) $mime;
-			if ( $post = get_post( $mime ) ) {
+			if ($post = get_post($mime)) {
 				$post_id = (int) $post->ID;
-				$file = get_attached_file( $post_id );
+				$file = get_attached_file($post_id);
 				$ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $file);
-				if ( !empty($ext) ) {
+				if ( ! empty($ext)) {
 					$post_mimes[] = $ext;
-					if ( $ext_type = wp_ext2type( $ext ) )
+					if ($ext_type = wp_ext2type($ext))
 						$post_mimes[] = $ext_type;
 				}
 				$mime = $post->post_mime_type;
@@ -5145,7 +5145,7 @@ 
 
 		$icon_files = wp_cache_get('icon_files');
 
-		if ( !is_array($icon_files) ) {
+		if ( ! is_array($icon_files)) {
 			/**
 			 * Filters the icon directory path.
 			 *
@@ -5153,7 +5153,7 @@ 
 			 *
 			 * @param string $path Icon directory absolute path.
 			 */
-			$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
+			$icon_dir = apply_filters('icon_dir', ABSPATH.WPINC.'/images/media');
 
 			/**
 			 * Filters the icon directory URI.
@@ -5162,7 +5162,7 @@ 
 			 *
 			 * @param string $uri Icon directory URI.
 			 */
-			$icon_dir_uri = apply_filters( 'icon_dir_uri', includes_url( 'images/media' ) );
+			$icon_dir_uri = apply_filters('icon_dir_uri', includes_url('images/media'));
 
 			/**
 			 * Filters the list of icon directory URIs.
@@ -5171,19 +5171,19 @@ 
 			 *
 			 * @param array $uris List of icon directory URIs.
 			 */
-			$dirs = apply_filters( 'icon_dirs', array( $icon_dir => $icon_dir_uri ) );
+			$dirs = apply_filters('icon_dirs', array($icon_dir => $icon_dir_uri));
 			$icon_files = array();
-			while ( $dirs ) {
-				$keys = array_keys( $dirs );
-				$dir = array_shift( $keys );
+			while ($dirs) {
+				$keys = array_keys($dirs);
+				$dir = array_shift($keys);
 				$uri = array_shift($dirs);
-				if ( $dh = opendir($dir) ) {
-					while ( false !== $file = readdir($dh) ) {
+				if ($dh = opendir($dir)) {
+					while (false !== $file = readdir($dh)) {
 						$file = basename($file);
-						if ( substr($file, 0, 1) == '.' )
+						if (substr($file, 0, 1) == '.')
 							continue;
-						if ( !in_array(strtolower(substr($file, -4)), array('.png', '.gif', '.jpg') ) ) {
-							if ( is_dir("$dir/$file") )
+						if ( ! in_array(strtolower(substr($file, -4)), array('.png', '.gif', '.jpg'))) {
+							if (is_dir("$dir/$file"))
 								$dirs["$dir/$file"] = "$uri/$file";
 							continue;
 						}
@@ -5192,15 +5192,15 @@ 
 					closedir($dh);
 				}
 			}
-			wp_cache_add( 'icon_files', $icon_files, 'default', 600 );
+			wp_cache_add('icon_files', $icon_files, 'default', 600);
 		}
 
 		$types = array();
 		// Icon basename - extension = MIME wildcard.
-		foreach ( $icon_files as $file => $uri )
-			$types[ preg_replace('/^([^.]*).*$/', '$1', basename($file)) ] =& $icon_files[$file];
+		foreach ($icon_files as $file => $uri)
+			$types[preg_replace('/^([^.]*).*$/', '$1', basename($file))] = & $icon_files[$file];
 
-		if ( ! empty($mime) ) {
+		if ( ! empty($mime)) {
 			$post_mimes[] = substr($mime, 0, strpos($mime, '/'));
 			$post_mimes[] = substr($mime, strpos($mime, '/') + 1);
 			$post_mimes[] = str_replace('/', '_', $mime);
@@ -5209,15 +5209,15 @@ 
 		$matches = wp_match_mime_types(array_keys($types), $post_mimes);
 		$matches['default'] = array('default');
 
-		foreach ( $matches as $match => $wilds ) {
-			foreach ( $wilds as $wild ) {
-				if ( ! isset( $types[ $wild ] ) ) {
+		foreach ($matches as $match => $wilds) {
+			foreach ($wilds as $wild) {
+				if ( ! isset($types[$wild])) {
 					continue;
 				}
 
-				$icon = $types[ $wild ];
-				if ( ! is_numeric( $mime ) ) {
-					wp_cache_add( "mime_type_icon_$mime", $icon );
+				$icon = $types[$wild];
+				if ( ! is_numeric($mime)) {
+					wp_cache_add("mime_type_icon_$mime", $icon);
 				}
 				break 2;
 			}
@@ -5234,7 +5234,7 @@ 
 	 * @param int    $post_id Attachment ID. Will equal 0 if the function passed
 	 *                        the mime type.
 	 */
-	return apply_filters( 'wp_mime_type_icon', $icon, $mime, $post_id );
+	return apply_filters('wp_mime_type_icon', $icon, $mime, $post_id);
 }
 
 /**
@@ -5256,27 +5256,27 @@ 
  * @param WP_Post $post        The Post Object
  * @param WP_Post $post_before The Previous Post Object
  */
-function wp_check_for_changed_slugs( $post_id, $post, $post_before ) {
+function wp_check_for_changed_slugs($post_id, $post, $post_before) {
 	// Don't bother if it hasn't changed.
-	if ( $post->post_name == $post_before->post_name ) {
+	if ($post->post_name == $post_before->post_name) {
 		return;
 	}
 
 	// We're only concerned with published, non-hierarchical objects.
-	if ( ! ( 'publish' === $post->post_status || ( 'attachment' === get_post_type( $post ) && 'inherit' === $post->post_status ) ) || is_post_type_hierarchical( $post->post_type ) ) {
+	if ( ! ('publish' === $post->post_status || ('attachment' === get_post_type($post) && 'inherit' === $post->post_status)) || is_post_type_hierarchical($post->post_type)) {
 		return;
 	}
 
-	$old_slugs = (array) get_post_meta( $post_id, '_wp_old_slug' );
+	$old_slugs = (array) get_post_meta($post_id, '_wp_old_slug');
 
 	// If we haven't added this old slug before, add it now.
-	if ( ! empty( $post_before->post_name ) && ! in_array( $post_before->post_name, $old_slugs ) ) {
-		add_post_meta( $post_id, '_wp_old_slug', $post_before->post_name );
+	if ( ! empty($post_before->post_name) && ! in_array($post_before->post_name, $old_slugs)) {
+		add_post_meta($post_id, '_wp_old_slug', $post_before->post_name);
 	}
 
 	// If the new slug was used previously, delete it from the list.
-	if ( in_array( $post->post_name, $old_slugs ) ) {
-		delete_post_meta( $post_id, '_wp_old_slug', $post->post_name );
+	if (in_array($post->post_name, $old_slugs)) {
+		delete_post_meta($post_id, '_wp_old_slug', $post->post_name);
 	}
 }
 
@@ -5294,8 +5294,8 @@ 
  * @param string|array $post_type Single post type or an array of post types. Currently only supports 'post' or 'page'.
  * @return string SQL code that can be added to a where clause.
  */
-function get_private_posts_cap_sql( $post_type ) {
-	return get_posts_by_author_sql( $post_type, false );
+function get_private_posts_cap_sql($post_type) {
+	return get_posts_by_author_sql($post_type, false);
 }
 
 /**
@@ -5315,19 +5315,19 @@ 
  *                                    $current_user.  Default false.
  * @return string SQL WHERE code that can be added to a query.
  */
-function get_posts_by_author_sql( $post_type, $full = true, $post_author = null, $public_only = false ) {
+function get_posts_by_author_sql($post_type, $full = true, $post_author = null, $public_only = false) {
 	global $wpdb;
 
-	if ( is_array( $post_type ) ) {
+	if (is_array($post_type)) {
 		$post_types = $post_type;
 	} else {
-		$post_types = array( $post_type );
+		$post_types = array($post_type);
 	}
 
 	$post_type_clauses = array();
-	foreach ( $post_types as $post_type ) {
-		$post_type_obj = get_post_type_object( $post_type );
-		if ( ! $post_type_obj ) {
+	foreach ($post_types as $post_type) {
+		$post_type_obj = get_post_type_object($post_type);
+		if ( ! $post_type_obj) {
 			continue;
 		}
 
@@ -5340,42 +5340,42 @@ 
 		 *
 		 * @param string $cap Capability.
 		 */
-		if ( ! $cap = apply_filters( 'pub_priv_sql_capability', '' ) ) {
-			$cap = current_user_can( $post_type_obj->cap->read_private_posts );
+		if ( ! $cap = apply_filters('pub_priv_sql_capability', '')) {
+			$cap = current_user_can($post_type_obj->cap->read_private_posts);
 		}
 
 		// Only need to check the cap if $public_only is false.
 		$post_status_sql = "post_status = 'publish'";
-		if ( false === $public_only ) {
-			if ( $cap ) {
+		if (false === $public_only) {
+			if ($cap) {
 				// Does the user have the capability to view private posts? Guess so.
 				$post_status_sql .= " OR post_status = 'private'";
-			} elseif ( is_user_logged_in() ) {
+			} elseif (is_user_logged_in()) {
 				// Users can view their own private posts.
 				$id = get_current_user_id();
-				if ( null === $post_author || ! $full ) {
+				if (null === $post_author || ! $full) {
 					$post_status_sql .= " OR post_status = 'private' AND post_author = $id";
-				} elseif ( $id == (int) $post_author ) {
+				} elseif ($id == (int) $post_author) {
 					$post_status_sql .= " OR post_status = 'private'";
 				} // else none
 			} // else none
 		}
 
-		$post_type_clauses[] = "( post_type = '" . $post_type . "' AND ( $post_status_sql ) )";
+		$post_type_clauses[] = "( post_type = '".$post_type."' AND ( $post_status_sql ) )";
 	}
 
-	if ( empty( $post_type_clauses ) ) {
+	if (empty($post_type_clauses)) {
 		return $full ? 'WHERE 1 = 0' : '1 = 0';
 	}
 
-	$sql = '( '. implode( ' OR ', $post_type_clauses ) . ' )';
+	$sql = '( '.implode(' OR ', $post_type_clauses).' )';
 
-	if ( null !== $post_author ) {
-		$sql .= $wpdb->prepare( ' AND post_author = %d', $post_author );
+	if (null !== $post_author) {
+		$sql .= $wpdb->prepare(' AND post_author = %d', $post_author);
 	}
 
-	if ( $full ) {
-		$sql = 'WHERE ' . $sql;
+	if ($full) {
+		$sql = 'WHERE '.$sql;
 	}
 
 	return $sql;
@@ -5399,7 +5399,7 @@ 
  * @param string $post_type Optional. The post type to check. Default 'any'.
  * @return string The date of the last post.
  */
-function get_lastpostdate( $timezone = 'server', $post_type = 'any' ) {
+function get_lastpostdate($timezone = 'server', $post_type = 'any') {
 	/**
 	 * Filters the date the last post was published.
 	 *
@@ -5409,7 +5409,7 @@ 
 	 * @param string $timezone Location to use for getting the post published date.
 	 *                         See get_lastpostdate() for accepted `$timezone` values.
 	 */
-	return apply_filters( 'get_lastpostdate', _get_last_post_time( $timezone, 'date', $post_type ), $timezone );
+	return apply_filters('get_lastpostdate', _get_last_post_time($timezone, 'date', $post_type), $timezone);
 }
 
 /**
@@ -5428,7 +5428,7 @@ 
  * @param string $post_type Optional. The post type to check. Default 'any'.
  * @return string The timestamp.
  */
-function get_lastpostmodified( $timezone = 'server', $post_type = 'any' ) {
+function get_lastpostmodified($timezone = 'server', $post_type = 'any') {
 	/**
 	 * Pre-filter the return value of get_lastpostmodified() before the query is run.
 	 *
@@ -5440,15 +5440,15 @@ 
 	 *                                 See get_lastpostdate() for accepted `$timezone` values.
 	 * @param string $post_type        The post type to check.
 	 */
-	$lastpostmodified = apply_filters( 'pre_get_lastpostmodified', false, $timezone, $post_type );
-	if ( false !== $lastpostmodified ) {
+	$lastpostmodified = apply_filters('pre_get_lastpostmodified', false, $timezone, $post_type);
+	if (false !== $lastpostmodified) {
 		return $lastpostmodified;
 	}
 
-	$lastpostmodified = _get_last_post_time( $timezone, 'modified', $post_type );
+	$lastpostmodified = _get_last_post_time($timezone, 'modified', $post_type);
 
 	$lastpostdate = get_lastpostdate($timezone);
-	if ( $lastpostdate > $lastpostmodified ) {
+	if ($lastpostdate > $lastpostmodified) {
 		$lastpostmodified = $lastpostdate;
 	}
 
@@ -5461,7 +5461,7 @@ 
 	 * @param string $timezone         Location to use for getting the post modified date.
 	 *                                 See get_lastpostdate() for accepted `$timezone` values.
 	 */
-	return apply_filters( 'get_lastpostmodified', $lastpostmodified, $timezone );
+	return apply_filters('get_lastpostmodified', $lastpostmodified, $timezone);
 }
 
 /**
@@ -5479,32 +5479,32 @@ 
  * @param string $post_type Optional. The post type to check. Default 'any'.
  * @return string|false The timestamp.
  */
-function _get_last_post_time( $timezone, $field, $post_type = 'any' ) {
+function _get_last_post_time($timezone, $field, $post_type = 'any') {
 	global $wpdb;
 
-	if ( ! in_array( $field, array( 'date', 'modified' ) ) ) {
+	if ( ! in_array($field, array('date', 'modified'))) {
 		return false;
 	}
 
-	$timezone = strtolower( $timezone );
+	$timezone = strtolower($timezone);
 
 	$key = "lastpost{$field}:$timezone";
-	if ( 'any' !== $post_type ) {
-		$key .= ':' . sanitize_key( $post_type );
+	if ('any' !== $post_type) {
+		$key .= ':'.sanitize_key($post_type);
 	}
 
-	$date = wp_cache_get( $key, 'timeinfo' );
+	$date = wp_cache_get($key, 'timeinfo');
 
-	if ( ! $date ) {
-		if ( 'any' === $post_type ) {
-			$post_types = get_post_types( array( 'public' => true ) );
-			array_walk( $post_types, array( $wpdb, 'escape_by_ref' ) );
-			$post_types = "'" . implode( "', '", $post_types ) . "'";
+	if ( ! $date) {
+		if ('any' === $post_type) {
+			$post_types = get_post_types(array('public' => true));
+			array_walk($post_types, array($wpdb, 'escape_by_ref'));
+			$post_types = "'".implode("', '", $post_types)."'";
 		} else {
-			$post_types = "'" . sanitize_key( $post_type ) . "'";
+			$post_types = "'".sanitize_key($post_type)."'";
 		}
 
-		switch ( $timezone ) {
+		switch ($timezone) {
 			case 'gmt':
 				$date = $wpdb->get_var("SELECT post_{$field}_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
 				break;
@@ -5512,13 +5512,13 @@ 
 				$date = $wpdb->get_var("SELECT post_{$field} FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
 				break;
 			case 'server':
-				$add_seconds_server = date( 'Z' );
+				$add_seconds_server = date('Z');
 				$date = $wpdb->get_var("SELECT DATE_ADD(post_{$field}_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
 				break;
 		}
 
-		if ( $date ) {
-			wp_cache_set( $key, $date, 'timeinfo' );
+		if ($date) {
+			wp_cache_set($key, $date, 'timeinfo');
 		}
 	}
 
@@ -5532,12 +5532,12 @@ 
  *
  * @param array $posts Array of post objects, passed by reference.
  */
-function update_post_cache( &$posts ) {
-	if ( ! $posts )
+function update_post_cache(&$posts) {
+	if ( ! $posts)
 		return;
 
-	foreach ( $posts as $post )
-		wp_cache_add( $post->ID, $post, 'posts' );
+	foreach ($posts as $post)
+		wp_cache_add($post->ID, $post, 'posts');
 }
 
 /**
@@ -5555,22 +5555,22 @@ 
  *
  * @param int|WP_Post $post Post ID or post object to remove from the cache.
  */
-function clean_post_cache( $post ) {
+function clean_post_cache($post) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( ! empty( $_wp_suspend_cache_invalidation ) )
+	if ( ! empty($_wp_suspend_cache_invalidation))
 		return;
 
-	$post = get_post( $post );
-	if ( empty( $post ) )
+	$post = get_post($post);
+	if (empty($post))
 		return;
 
-	wp_cache_delete( $post->ID, 'posts' );
-	wp_cache_delete( $post->ID, 'post_meta' );
+	wp_cache_delete($post->ID, 'posts');
+	wp_cache_delete($post->ID, 'post_meta');
 
-	clean_object_term_cache( $post->ID, $post->post_type );
+	clean_object_term_cache($post->ID, $post->post_type);
 
-	wp_cache_delete( 'wp_get_archives', 'general' );
+	wp_cache_delete('wp_get_archives', 'general');
 
 	/**
 	 * Fires immediately after the given post's cache is cleaned.
@@ -5580,10 +5580,10 @@ 
 	 * @param int     $post_id Post ID.
 	 * @param WP_Post $post    Post object.
 	 */
-	do_action( 'clean_post_cache', $post->ID, $post );
+	do_action('clean_post_cache', $post->ID, $post);
 
-	if ( 'page' == $post->post_type ) {
-		wp_cache_delete( 'all_page_ids', 'posts' );
+	if ('page' == $post->post_type) {
+		wp_cache_delete('all_page_ids', 'posts');
 
 		/**
 		 * Fires immediately after the given page's cache is cleaned.
@@ -5592,10 +5592,10 @@ 
 		 *
 		 * @param int $post_id Post ID.
 		 */
-		do_action( 'clean_page_cache', $post->ID );
+		do_action('clean_page_cache', $post->ID);
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'posts' );
+	wp_cache_set('last_changed', microtime(), 'posts');
 }
 
 /**
@@ -5608,27 +5608,27 @@ 
  * @param bool   $update_term_cache Optional. Whether to update the term cache. Default true.
  * @param bool   $update_meta_cache Optional. Whether to update the meta cache. Default true.
  */
-function update_post_caches( &$posts, $post_type = 'post', $update_term_cache = true, $update_meta_cache = true ) {
+function update_post_caches(&$posts, $post_type = 'post', $update_term_cache = true, $update_meta_cache = true) {
 	// No point in doing all this work if we didn't match any posts.
-	if ( !$posts )
+	if ( ! $posts)
 		return;
 
 	update_post_cache($posts);
 
 	$post_ids = array();
-	foreach ( $posts as $post )
+	foreach ($posts as $post)
 		$post_ids[] = $post->ID;
 
-	if ( ! $post_type )
+	if ( ! $post_type)
 		$post_type = 'any';
 
-	if ( $update_term_cache ) {
-		if ( is_array($post_type) ) {
+	if ($update_term_cache) {
+		if (is_array($post_type)) {
 			$ptypes = $post_type;
-		} elseif ( 'any' == $post_type ) {
+		} elseif ('any' == $post_type) {
 			$ptypes = array();
 			// Just use the post_types in the supplied posts.
-			foreach ( $posts as $post ) {
+			foreach ($posts as $post) {
 				$ptypes[] = $post->post_type;
 			}
 			$ptypes = array_unique($ptypes);
@@ -5636,11 +5636,11 @@ 
 			$ptypes = array($post_type);
 		}
 
-		if ( ! empty($ptypes) )
+		if ( ! empty($ptypes))
 			update_object_term_cache($post_ids, $ptypes);
 	}
 
-	if ( $update_meta_cache )
+	if ($update_meta_cache)
 		update_postmeta_cache($post_ids);
 }
 
@@ -5657,7 +5657,7 @@ 
  * @return array|false Returns false if there is nothing to update or an array
  *                     of metadata.
  */
-function update_postmeta_cache( $post_ids ) {
+function update_postmeta_cache($post_ids) {
 	return update_meta_cache('post', $post_ids);
 }
 
@@ -5676,10 +5676,10 @@ 
  * @param int  $id          The attachment ID in the cache to clean.
  * @param bool $clean_terms Optional. Whether to clean terms cache. Default false.
  */
-function clean_attachment_cache( $id, $clean_terms = false ) {
+function clean_attachment_cache($id, $clean_terms = false) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( !empty($_wp_suspend_cache_invalidation) )
+	if ( ! empty($_wp_suspend_cache_invalidation))
 		return;
 
 	$id = (int) $id;
@@ -5687,7 +5687,7 @@ 
 	wp_cache_delete($id, 'posts');
 	wp_cache_delete($id, 'post_meta');
 
-	if ( $clean_terms )
+	if ($clean_terms)
 		clean_object_term_cache($id, 'attachment');
 
 	/**
@@ -5697,7 +5697,7 @@ 
 	 *
 	 * @param int $id Attachment ID.
 	 */
-	do_action( 'clean_attachment_cache', $id );
+	do_action('clean_attachment_cache', $id);
 }
 
 //
@@ -5717,13 +5717,13 @@ 
  * @param string  $old_status Previous post status.
  * @param WP_Post $post       Post object.
  */
-function _transition_post_status( $new_status, $old_status, $post ) {
+function _transition_post_status($new_status, $old_status, $post) {
 	global $wpdb;
 
-	if ( $old_status != 'publish' && $new_status == 'publish' ) {
+	if ($old_status != 'publish' && $new_status == 'publish') {
 		// Reset GUID if transitioning to publish and it is empty.
-		if ( '' == get_the_guid($post->ID) )
-			$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post->ID ) ), array( 'ID' => $post->ID ) );
+		if ('' == get_the_guid($post->ID))
+			$wpdb->update($wpdb->posts, array('guid' => get_permalink($post->ID)), array('ID' => $post->ID));
 
 		/**
 		 * Fires when a post's status is transitioned from private to published.
@@ -5737,21 +5737,21 @@ 
 	}
 
 	// If published posts changed clear the lastpostmodified cache.
-	if ( 'publish' == $new_status || 'publish' == $old_status) {
-		foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
-			wp_cache_delete( "lastpostmodified:$timezone", 'timeinfo' );
-			wp_cache_delete( "lastpostdate:$timezone", 'timeinfo' );
-			wp_cache_delete( "lastpostdate:$timezone:{$post->post_type}", 'timeinfo' );
+	if ('publish' == $new_status || 'publish' == $old_status) {
+		foreach (array('server', 'gmt', 'blog') as $timezone) {
+			wp_cache_delete("lastpostmodified:$timezone", 'timeinfo');
+			wp_cache_delete("lastpostdate:$timezone", 'timeinfo');
+			wp_cache_delete("lastpostdate:$timezone:{$post->post_type}", 'timeinfo');
 		}
 	}
 
-	if ( $new_status !== $old_status ) {
-		wp_cache_delete( _count_posts_cache_key( $post->post_type ), 'counts' );
-		wp_cache_delete( _count_posts_cache_key( $post->post_type, 'readable' ), 'counts' );
+	if ($new_status !== $old_status) {
+		wp_cache_delete(_count_posts_cache_key($post->post_type), 'counts');
+		wp_cache_delete(_count_posts_cache_key($post->post_type, 'readable'), 'counts');
 	}
 
 	// Always clears the hook in case the post status bounced from future to draft.
-	wp_clear_scheduled_hook('publish_future_post', array( $post->ID ) );
+	wp_clear_scheduled_hook('publish_future_post', array($post->ID));
 }
 
 /**
@@ -5767,9 +5767,9 @@ 
  *                            wp_transition_post_status() and the default filter for _future_post_hook().
  * @param WP_Post $post       Post object.
  */
-function _future_post_hook( $deprecated, $post ) {
-	wp_clear_scheduled_hook( 'publish_future_post', array( $post->ID ) );
-	wp_schedule_single_event( strtotime( get_gmt_from_date( $post->post_date ) . ' GMT') , 'publish_future_post', array( $post->ID ) );
+function _future_post_hook($deprecated, $post) {
+	wp_clear_scheduled_hook('publish_future_post', array($post->ID));
+	wp_schedule_single_event(strtotime(get_gmt_from_date($post->post_date).' GMT'), 'publish_future_post', array($post->ID));
 }
 
 /**
@@ -5782,8 +5782,8 @@ 
  *
  * @param int $post_id The ID in the database table of the post being published.
  */
-function _publish_post_hook( $post_id ) {
-	if ( defined( 'XMLRPC_REQUEST' ) ) {
+function _publish_post_hook($post_id) {
+	if (defined('XMLRPC_REQUEST')) {
 		/**
 		 * Fires when _publish_post_hook() is called during an XML-RPC request.
 		 *
@@ -5791,15 +5791,15 @@ 
 		 *
 		 * @param int $post_id Post ID.
 		 */
-		do_action( 'xmlrpc_publish_post', $post_id );
+		do_action('xmlrpc_publish_post', $post_id);
 	}
 
-	if ( defined('WP_IMPORTING') )
+	if (defined('WP_IMPORTING'))
 		return;
 
-	if ( get_option('default_pingback_flag') )
-		add_post_meta( $post_id, '_pingme', '1' );
-	add_post_meta( $post_id, '_encloseme', '1' );
+	if (get_option('default_pingback_flag'))
+		add_post_meta($post_id, '_pingme', '1');
+	add_post_meta($post_id, '_encloseme', '1');
 
 	wp_schedule_single_event(time(), 'do_pings');
 }
@@ -5813,9 +5813,9 @@ 
  *
  * @return int|false Post parent ID, otherwise false.
  */
-function wp_get_post_parent_id( $post_ID ) {
-	$post = get_post( $post_ID );
-	if ( !$post || is_wp_error( $post ) )
+function wp_get_post_parent_id($post_ID) {
+	$post = get_post($post_ID);
+	if ( ! $post || is_wp_error($post))
 		return false;
 	return (int) $post->post_parent;
 }
@@ -5834,30 +5834,30 @@ 
  * @param int $post_ID     ID of the post we're checking.
  * @return int The new post_parent for the post, 0 otherwise.
  */
-function wp_check_post_hierarchy_for_loops( $post_parent, $post_ID ) {
+function wp_check_post_hierarchy_for_loops($post_parent, $post_ID) {
 	// Nothing fancy here - bail.
-	if ( !$post_parent )
+	if ( ! $post_parent)
 		return 0;
 
 	// New post can't cause a loop.
-	if ( empty( $post_ID ) )
+	if (empty($post_ID))
 		return $post_parent;
 
 	// Can't be its own parent.
-	if ( $post_parent == $post_ID )
+	if ($post_parent == $post_ID)
 		return 0;
 
 	// Now look for larger loops.
-	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_ID, $post_parent ) )
+	if ( ! $loop = wp_find_hierarchy_loop('wp_get_post_parent_id', $post_ID, $post_parent))
 		return $post_parent; // No loop
 
 	// Setting $post_parent to the given value causes a loop.
-	if ( isset( $loop[$post_ID] ) )
+	if (isset($loop[$post_ID]))
 		return 0;
 
 	// There's a loop, but it doesn't contain $post_ID. Break the loop.
-	foreach ( array_keys( $loop ) as $loop_member )
-		wp_update_post( array( 'ID' => $loop_member, 'post_parent' => 0 ) );
+	foreach (array_keys($loop) as $loop_member)
+		wp_update_post(array('ID' => $loop_member, 'post_parent' => 0));
 
 	return $post_parent;
 }
@@ -5871,14 +5871,14 @@ 
  * @param int         $thumbnail_id Thumbnail to attach.
  * @return int|bool True on success, false on failure.
  */
-function set_post_thumbnail( $post, $thumbnail_id ) {
-	$post = get_post( $post );
-	$thumbnail_id = absint( $thumbnail_id );
-	if ( $post && $thumbnail_id && get_post( $thumbnail_id ) ) {
-		if ( wp_get_attachment_image( $thumbnail_id, 'thumbnail' ) )
-			return update_post_meta( $post->ID, '_thumbnail_id', $thumbnail_id );
+function set_post_thumbnail($post, $thumbnail_id) {
+	$post = get_post($post);
+	$thumbnail_id = absint($thumbnail_id);
+	if ($post && $thumbnail_id && get_post($thumbnail_id)) {
+		if (wp_get_attachment_image($thumbnail_id, 'thumbnail'))
+			return update_post_meta($post->ID, '_thumbnail_id', $thumbnail_id);
 		else
-			return delete_post_meta( $post->ID, '_thumbnail_id' );
+			return delete_post_meta($post->ID, '_thumbnail_id');
 	}
 	return false;
 }
@@ -5891,10 +5891,10 @@ 
  * @param int|WP_Post $post Post ID or post object where thumbnail should be removed from.
  * @return bool True on success, false on failure.
  */
-function delete_post_thumbnail( $post ) {
-	$post = get_post( $post );
-	if ( $post )
-		return delete_post_meta( $post->ID, '_thumbnail_id' );
+function delete_post_thumbnail($post) {
+	$post = get_post($post);
+	if ($post)
+		return delete_post_meta($post->ID, '_thumbnail_id');
 	return false;
 }
 
@@ -5909,10 +5909,10 @@ 
 	global $wpdb;
 
 	// Cleanup old auto-drafts more than 7 days old.
-	$old_posts = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_status = 'auto-draft' AND DATE_SUB( NOW(), INTERVAL 7 DAY ) > post_date" );
-	foreach ( (array) $old_posts as $delete ) {
+	$old_posts = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_status = 'auto-draft' AND DATE_SUB( NOW(), INTERVAL 7 DAY ) > post_date");
+	foreach ((array) $old_posts as $delete) {
 		// Force delete.
-		wp_delete_post( $delete, true );
+		wp_delete_post($delete, true);
 	}
 }
 
@@ -5923,23 +5923,23 @@ 
  *
  * @param array $posts Array of WP_Post objects.
  */
-function wp_queue_posts_for_term_meta_lazyload( $posts ) {
+function wp_queue_posts_for_term_meta_lazyload($posts) {
 	$post_type_taxonomies = $term_ids = array();
-	foreach ( $posts as $post ) {
-		if ( ! ( $post instanceof WP_Post ) ) {
+	foreach ($posts as $post) {
+		if ( ! ($post instanceof WP_Post)) {
 			continue;
 		}
 
-		if ( ! isset( $post_type_taxonomies[ $post->post_type ] ) ) {
-			$post_type_taxonomies[ $post->post_type ] = get_object_taxonomies( $post->post_type );
+		if ( ! isset($post_type_taxonomies[$post->post_type])) {
+			$post_type_taxonomies[$post->post_type] = get_object_taxonomies($post->post_type);
 		}
 
-		foreach ( $post_type_taxonomies[ $post->post_type ] as $taxonomy ) {
+		foreach ($post_type_taxonomies[$post->post_type] as $taxonomy) {
 			// Term cache should already be primed by `update_post_term_cache()`.
-			$terms = get_object_term_cache( $post->ID, $taxonomy );
-			if ( false !== $terms ) {
-				foreach ( $terms as $term ) {
-					if ( ! isset( $term_ids[ $term->term_id ] ) ) {
+			$terms = get_object_term_cache($post->ID, $taxonomy);
+			if (false !== $terms) {
+				foreach ($terms as $term) {
+					if ( ! isset($term_ids[$term->term_id])) {
 						$term_ids[] = $term->term_id;
 					}
 				}
@@ -5947,9 +5947,9 @@ 
 		}
 	}
 
-	if ( $term_ids ) {
+	if ($term_ids) {
 		$lazyloader = wp_metadata_lazyloader();
-		$lazyloader->queue_objects( 'term', $term_ids );
+		$lazyloader->queue_objects('term', $term_ids);
 	}
 }
 
@@ -5966,11 +5966,11 @@ 
  * @param string  $old_status Old post status.
  * @param WP_Post $post       Post object.
  */
-function _update_term_count_on_transition_post_status( $new_status, $old_status, $post ) {
+function _update_term_count_on_transition_post_status($new_status, $old_status, $post) {
 	// Update counts for the post's terms.
-	foreach ( (array) get_object_taxonomies( $post->post_type ) as $taxonomy ) {
-		$tt_ids = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'tt_ids' ) );
-		wp_update_term_count( $tt_ids, $taxonomy );
+	foreach ((array) get_object_taxonomies($post->post_type) as $taxonomy) {
+		$tt_ids = wp_get_object_terms($post->ID, $taxonomy, array('fields' => 'tt_ids'));
+		wp_update_term_count($tt_ids, $taxonomy);
 	}
 }
 
@@ -5988,14 +5988,14 @@ 
  * @param bool  $update_term_cache Optional. Whether to update the term cache. Default true.
  * @param bool  $update_meta_cache Optional. Whether to update the meta cache. Default true.
  */
-function _prime_post_caches( $ids, $update_term_cache = true, $update_meta_cache = true ) {
+function _prime_post_caches($ids, $update_term_cache = true, $update_meta_cache = true) {
 	global $wpdb;
 
-	$non_cached_ids = _get_non_cached_ids( $ids, 'posts' );
-	if ( !empty( $non_cached_ids ) ) {
-		$fresh_posts = $wpdb->get_results( sprintf( "SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", join( ",", $non_cached_ids ) ) );
+	$non_cached_ids = _get_non_cached_ids($ids, 'posts');
+	if ( ! empty($non_cached_ids)) {
+		$fresh_posts = $wpdb->get_results(sprintf("SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", join(",", $non_cached_ids)));
 
-		update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache );
+		update_post_caches($fresh_posts, 'any', $update_term_cache, $update_meta_cache);
 	}
 }
 
@@ -6013,18 +6013,18 @@ 
  * @param string $post_name Slug.
  * @param string $post_ID   Optional. Post ID that should be ignored. Default 0.
  */
-function wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID = 0 ) {
-	$trashed_posts_with_desired_slug = get_posts( array(
+function wp_add_trashed_suffix_to_post_name_for_trashed_posts($post_name, $post_ID = 0) {
+	$trashed_posts_with_desired_slug = get_posts(array(
 		'name' => $post_name,
 		'post_status' => 'trash',
 		'post_type' => 'any',
 		'nopaging' => true,
-		'post__not_in' => array( $post_ID )
-	) );
+		'post__not_in' => array($post_ID)
+	));
 
-	if ( ! empty( $trashed_posts_with_desired_slug ) ) {
-		foreach ( $trashed_posts_with_desired_slug as $_post ) {
-			wp_add_trashed_suffix_to_post_name_for_post( $_post );
+	if ( ! empty($trashed_posts_with_desired_slug)) {
+		foreach ($trashed_posts_with_desired_slug as $_post) {
+			wp_add_trashed_suffix_to_post_name_for_post($_post);
 		}
 	}
 }
@@ -6043,17 +6043,17 @@ 
  * @param WP_Post $post The post.
  * @return string New slug for the post.
  */
-function wp_add_trashed_suffix_to_post_name_for_post( $post ) {
+function wp_add_trashed_suffix_to_post_name_for_post($post) {
 	global $wpdb;
 
-	$post = get_post( $post );
+	$post = get_post($post);
 
-	if ( '__trashed' === substr( $post->post_name, -9 ) ) {
+	if ('__trashed' === substr($post->post_name, -9)) {
 		return $post->post_name;
 	}
-	add_post_meta( $post->ID, '_wp_desired_post_slug', $post->post_name );
-	$post_name = _truncate_post_slug( $post->post_name, 191 ) . '__trashed';
-	$wpdb->update( $wpdb->posts, array( 'post_name' => $post_name ), array( 'ID' => $post->ID ) );
-	clean_post_cache( $post->ID );
+	add_post_meta($post->ID, '_wp_desired_post_slug', $post->post_name);
+	$post_name = _truncate_post_slug($post->post_name, 191).'__trashed';
+	$wpdb->update($wpdb->posts, array('post_name' => $post_name), array('ID' => $post->ID));
+	clean_post_cache($post->ID);
 	return $post_name;
 }

src/wp-includes/revision.php

Doc Comments +1 added lines, -1 removed lines

@@ -432,7 +432,7 @@
  *
  * @see get_children()
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global `$post`.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global `$post`.
  * @param array|null  $args    Optional. Arguments for retrieving post revisions. Default null.
  * @return array An array of revisions, or an empty array if none.
  */

Spacing +151 added lines, -151 removed lines

@@ -21,19 +21,19 @@ 
  * @param bool          $deprecated Not used.
  * @return array Array of fields that can be versioned.
  */
-function _wp_post_revision_fields( $post = array(), $deprecated = false ) {
+function _wp_post_revision_fields($post = array(), $deprecated = false) {
 	static $fields = null;
 
-	if ( ! is_array( $post ) ) {
-		$post = get_post( $post, ARRAY_A );
+	if ( ! is_array($post)) {
+		$post = get_post($post, ARRAY_A);
 	}
 
-	if ( is_null( $fields ) ) {
+	if (is_null($fields)) {
 		// Allow these to be versioned
 		$fields = array(
-			'post_title' => __( 'Title' ),
-			'post_content' => __( 'Content' ),
-			'post_excerpt' => __( 'Excerpt' ),
+			'post_title' => __('Title'),
+			'post_content' => __('Content'),
+			'post_excerpt' => __('Excerpt'),
 		);
 	}
 
@@ -53,11 +53,11 @@ 
 	 *                      'post_content', and 'post_excerpt' by default.
 	 * @param array $post   A post array being processed for insertion as a post revision.
 	 */
-	$fields = apply_filters( '_wp_post_revision_fields', $fields, $post );
+	$fields = apply_filters('_wp_post_revision_fields', $fields, $post);
 
 	// WP uses these internally either in versioning or elsewhere - they cannot be versioned
-	foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author' ) as $protect ) {
-		unset( $fields[ $protect ] );
+	foreach (array('ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author') as $protect) {
+		unset($fields[$protect]);
 	}
 
 
@@ -75,25 +75,25 @@ 
  * @param bool          $autosave Optional. Is the revision an autosave? Default false.
  * @return array Post array ready to be inserted as a post revision.
  */
-function _wp_post_revision_data( $post = array(), $autosave = false ) {
-	if ( ! is_array( $post ) ) {
-		$post = get_post( $post, ARRAY_A );
+function _wp_post_revision_data($post = array(), $autosave = false) {
+	if ( ! is_array($post)) {
+		$post = get_post($post, ARRAY_A);
 	}
 
-	$fields = _wp_post_revision_fields( $post );
+	$fields = _wp_post_revision_fields($post);
 
 	$revision_data = array();
 
-	foreach ( array_intersect( array_keys( $post ), array_keys( $fields ) ) as $field ) {
-		$revision_data[ $field ] = $post[ $field ];
+	foreach (array_intersect(array_keys($post), array_keys($fields)) as $field) {
+		$revision_data[$field] = $post[$field];
 	}
 
 	$revision_data['post_parent']   = $post['ID'];
 	$revision_data['post_status']   = 'inherit';
 	$revision_data['post_type']     = 'revision';
 	$revision_data['post_name']     = $autosave ? "$post[ID]-autosave-v1" : "$post[ID]-revision-v1"; // "1" is the revisioning system version
-	$revision_data['post_date']     = isset( $post['post_modified'] ) ? $post['post_modified'] : '';
-	$revision_data['post_date_gmt'] = isset( $post['post_modified_gmt'] ) ? $post['post_modified_gmt'] : '';
+	$revision_data['post_date']     = isset($post['post_modified']) ? $post['post_modified'] : '';
+	$revision_data['post_date_gmt'] = isset($post['post_modified_gmt']) ? $post['post_modified_gmt'] : '';
 
 	return $revision_data;
 }
@@ -109,29 +109,29 @@ 
  * @param int $post_id The ID of the post to save as a revision.
  * @return int|WP_Error|void Void or 0 if error, new revision ID, if success.
  */
-function wp_save_post_revision( $post_id ) {
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
+function wp_save_post_revision($post_id) {
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
 		return;
 
-	if ( ! $post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return;
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
+	if ( ! post_type_supports($post->post_type, 'revisions'))
 		return;
 
-	if ( 'auto-draft' == $post->post_status )
+	if ('auto-draft' == $post->post_status)
 		return;
 
-	if ( ! wp_revisions_enabled( $post ) )
+	if ( ! wp_revisions_enabled($post))
 		return;
 
 	// Compare the proposed update with the last stored revision verifying that
 	// they are different, unless a plugin tells us to always save regardless.
 	// If no previous revisions, save one
-	if ( $revisions = wp_get_post_revisions( $post_id ) ) {
+	if ($revisions = wp_get_post_revisions($post_id)) {
 		// grab the last revision, but not an autosave
-		foreach ( $revisions as $revision ) {
-			if ( false !== strpos( $revision->post_name, "{$revision->post_parent}-revision" ) ) {
+		foreach ($revisions as $revision) {
+			if (false !== strpos($revision->post_name, "{$revision->post_parent}-revision")) {
 				$last_revision = $revision;
 				break;
 			}
@@ -151,11 +151,11 @@ 
 		 * @param WP_Post $post              The post object.
 		 *
 		 */
-		if ( isset( $last_revision ) && apply_filters( 'wp_save_post_revision_check_for_changes', $check_for_changes = true, $last_revision, $post ) ) {
+		if (isset($last_revision) && apply_filters('wp_save_post_revision_check_for_changes', $check_for_changes = true, $last_revision, $post)) {
 			$post_has_changed = false;
 
-			foreach ( array_keys( _wp_post_revision_fields( $post ) ) as $field ) {
-				if ( normalize_whitespace( $post->$field ) != normalize_whitespace( $last_revision->$field ) ) {
+			foreach (array_keys(_wp_post_revision_fields($post)) as $field) {
+				if (normalize_whitespace($post->$field) != normalize_whitespace($last_revision->$field)) {
 					$post_has_changed = true;
 					break;
 				}
@@ -174,38 +174,38 @@ 
 			 * @param WP_Post $post             The post object.
 			 *
 			 */
-			$post_has_changed = (bool) apply_filters( 'wp_save_post_revision_post_has_changed', $post_has_changed, $last_revision, $post );
+			$post_has_changed = (bool) apply_filters('wp_save_post_revision_post_has_changed', $post_has_changed, $last_revision, $post);
 
 			//don't save revision if post unchanged
-			if ( ! $post_has_changed ) {
+			if ( ! $post_has_changed) {
 				return;
 			}
 		}
 	}
 
-	$return = _wp_put_post_revision( $post );
+	$return = _wp_put_post_revision($post);
 
 	// If a limit for the number of revisions to keep has been set,
 	// delete the oldest ones.
-	$revisions_to_keep = wp_revisions_to_keep( $post );
+	$revisions_to_keep = wp_revisions_to_keep($post);
 
-	if ( $revisions_to_keep < 0 )
+	if ($revisions_to_keep < 0)
 		return $return;
 
-	$revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) );
+	$revisions = wp_get_post_revisions($post_id, array('order' => 'ASC'));
 
 	$delete = count($revisions) - $revisions_to_keep;
 
-	if ( $delete < 1 )
+	if ($delete < 1)
 		return $return;
 
-	$revisions = array_slice( $revisions, 0, $delete );
+	$revisions = array_slice($revisions, 0, $delete);
 
-	for ( $i = 0; isset( $revisions[$i] ); $i++ ) {
-		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) )
+	for ($i = 0; isset($revisions[$i]); $i++) {
+		if (false !== strpos($revisions[$i]->post_name, 'autosave'))
 			continue;
 
-		wp_delete_post_revision( $revisions[ $i ]->ID );
+		wp_delete_post_revision($revisions[$i]->ID);
 	}
 
 	return $return;
@@ -224,12 +224,12 @@ 
  * @param int $user_id Optional The post author ID.
  * @return WP_Post|false The autosaved data or false on failure or when no autosave exists.
  */
-function wp_get_post_autosave( $post_id, $user_id = 0 ) {
-	$revisions = wp_get_post_revisions( $post_id, array( 'check_enabled' => false ) );
+function wp_get_post_autosave($post_id, $user_id = 0) {
+	$revisions = wp_get_post_revisions($post_id, array('check_enabled' => false));
 
-	foreach ( $revisions as $revision ) {
-		if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
-			if ( $user_id && $user_id != $revision->post_author )
+	foreach ($revisions as $revision) {
+		if (false !== strpos($revision->post_name, "{$post_id}-autosave")) {
+			if ($user_id && $user_id != $revision->post_author)
 				continue;
 
 			return $revision;
@@ -247,8 +247,8 @@ 
  * @param int|WP_Post $post Post ID or post object.
  * @return false|int False if not a revision, ID of revision's parent otherwise.
  */
-function wp_is_post_revision( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
+function wp_is_post_revision($post) {
+	if ( ! $post = wp_get_post_revision($post))
 		return false;
 
 	return (int) $post->post_parent;
@@ -262,11 +262,11 @@ 
  * @param int|WP_Post $post Post ID or post object.
  * @return false|int False if not a revision, ID of autosave's parent otherwise
  */
-function wp_is_post_autosave( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
+function wp_is_post_autosave($post) {
+	if ( ! $post = wp_get_post_revision($post))
 		return false;
 
-	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) )
+	if (false !== strpos($post->post_name, "{$post->post_parent}-autosave"))
 		return (int) $post->post_parent;
 
 	return false;
@@ -282,26 +282,26 @@ 
  * @param bool                   $autosave Optional. Is the revision an autosave?
  * @return int|WP_Error WP_Error or 0 if error, new revision ID if success.
  */
-function _wp_put_post_revision( $post = null, $autosave = false ) {
-	if ( is_object($post) )
-		$post = get_object_vars( $post );
-	elseif ( !is_array($post) )
+function _wp_put_post_revision($post = null, $autosave = false) {
+	if (is_object($post))
+		$post = get_object_vars($post);
+	elseif ( ! is_array($post))
 		$post = get_post($post, ARRAY_A);
 
-	if ( ! $post || empty($post['ID']) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	if ( ! $post || empty($post['ID']))
+		return new WP_Error('invalid_post', __('Invalid post ID.'));
 
-	if ( isset($post['post_type']) && 'revision' == $post['post_type'] )
-		return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
+	if (isset($post['post_type']) && 'revision' == $post['post_type'])
+		return new WP_Error('post_type', __('Cannot create a revision of a revision'));
 
-	$post = _wp_post_revision_data( $post, $autosave );
+	$post = _wp_post_revision_data($post, $autosave);
 	$post = wp_slash($post); //since data is from db
 
-	$revision_id = wp_insert_post( $post );
-	if ( is_wp_error($revision_id) )
+	$revision_id = wp_insert_post($post);
+	if (is_wp_error($revision_id))
 		return $revision_id;
 
-	if ( $revision_id ) {
+	if ($revision_id) {
 		/**
 		 * Fires once a revision has been saved.
 		 *
@@ -309,7 +309,7 @@ 
 		 *
 		 * @param int $revision_id Post revision ID.
 		 */
-		do_action( '_wp_put_post_revision', $revision_id );
+		do_action('_wp_put_post_revision', $revision_id);
 	}
 
 	return $revision_id;
@@ -326,17 +326,17 @@ 
  * @return WP_Post|array|null Null if error or post object if success.
  */
 function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
-	if ( !$revision = get_post( $post, OBJECT, $filter ) )
+	if ( ! $revision = get_post($post, OBJECT, $filter))
 		return $revision;
-	if ( 'revision' !== $revision->post_type )
+	if ('revision' !== $revision->post_type)
 		return null;
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $revision;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		$_revision = get_object_vars($revision);
 		return $_revision;
-	} elseif ( $output == ARRAY_N ) {
+	} elseif ($output == ARRAY_N) {
 		$_revision = array_values(get_object_vars($revision));
 		return $_revision;
 	}
@@ -355,31 +355,31 @@ 
  * @param array       $fields      Optional. What fields to restore from. Defaults to all.
  * @return int|false|null Null if error, false if no fields to restore, (int) post ID if success.
  */
-function wp_restore_post_revision( $revision_id, $fields = null ) {
-	if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) )
+function wp_restore_post_revision($revision_id, $fields = null) {
+	if ( ! $revision = wp_get_post_revision($revision_id, ARRAY_A))
 		return $revision;
 
-	if ( !is_array( $fields ) )
-		$fields = array_keys( _wp_post_revision_fields( $revision ) );
+	if ( ! is_array($fields))
+		$fields = array_keys(_wp_post_revision_fields($revision));
 
 	$update = array();
-	foreach ( array_intersect( array_keys( $revision ), $fields ) as $field ) {
+	foreach (array_intersect(array_keys($revision), $fields) as $field) {
 		$update[$field] = $revision[$field];
 	}
 
-	if ( !$update )
+	if ( ! $update)
 		return false;
 
 	$update['ID'] = $revision['post_parent'];
 
-	$update = wp_slash( $update ); //since data is from db
+	$update = wp_slash($update); //since data is from db
 
-	$post_id = wp_update_post( $update );
-	if ( ! $post_id || is_wp_error( $post_id ) )
+	$post_id = wp_update_post($update);
+	if ( ! $post_id || is_wp_error($post_id))
 		return $post_id;
 
 	// Update last edit user
-	update_post_meta( $post_id, '_edit_last', get_current_user_id() );
+	update_post_meta($post_id, '_edit_last', get_current_user_id());
 
 	/**
 	 * Fires after a post revision has been restored.
@@ -389,7 +389,7 @@ 
 	 * @param int $post_id     Post ID.
 	 * @param int $revision_id Post revision ID.
 	 */
-	do_action( 'wp_restore_post_revision', $post_id, $revision['ID'] );
+	do_action('wp_restore_post_revision', $post_id, $revision['ID']);
 
 	return $post_id;
 }
@@ -404,13 +404,13 @@ 
  * @param int|WP_Post $revision_id Revision ID or revision object.
  * @return array|false|WP_Post|WP_Error|null Null or WP_Error if error, deleted post if success.
  */
-function wp_delete_post_revision( $revision_id ) {
-	if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
+function wp_delete_post_revision($revision_id) {
+	if ( ! $revision = wp_get_post_revision($revision_id)) {
 		return $revision;
 	}
 
-	$delete = wp_delete_post( $revision->ID );
-	if ( $delete ) {
+	$delete = wp_delete_post($revision->ID);
+	if ($delete) {
 		/**
 		 * Fires once a post revision has been deleted.
 		 *
@@ -419,7 +419,7 @@ 
 		 * @param int          $revision_id Post revision ID.
 		 * @param object|array $revision    Post revision object or array.
 		 */
-		do_action( 'wp_delete_post_revision', $revision->ID, $revision );
+		do_action('wp_delete_post_revision', $revision->ID, $revision);
 	}
 
 	return $delete;
@@ -436,20 +436,20 @@ 
  * @param array|null  $args    Optional. Arguments for retrieving post revisions. Default null.
  * @return array An array of revisions, or an empty array if none.
  */
-function wp_get_post_revisions( $post_id = 0, $args = null ) {
-	$post = get_post( $post_id );
-	if ( ! $post || empty( $post->ID ) )
+function wp_get_post_revisions($post_id = 0, $args = null) {
+	$post = get_post($post_id);
+	if ( ! $post || empty($post->ID))
 		return array();
 
-	$defaults = array( 'order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true);
+	$args = wp_parse_args($args, $defaults);
 
-	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) )
+	if ($args['check_enabled'] && ! wp_revisions_enabled($post))
 		return array();
 
-	$args = array_merge( $args, array( 'post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit' ) );
+	$args = array_merge($args, array('post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit'));
 
-	if ( ! $revisions = get_children( $args ) )
+	if ( ! $revisions = get_children($args))
 		return array();
 
 	return $revisions;
@@ -463,8 +463,8 @@ 
  * @param WP_Post $post The post object.
  * @return bool True if number of revisions to keep isn't zero, false otherwise.
  */
-function wp_revisions_enabled( $post ) {
-	return wp_revisions_to_keep( $post ) !== 0;
+function wp_revisions_enabled($post) {
+	return wp_revisions_to_keep($post) !== 0;
 }
 
 /**
@@ -480,15 +480,15 @@ 
  * @param WP_Post $post The post object.
  * @return int The number of revisions to keep.
  */
-function wp_revisions_to_keep( $post ) {
+function wp_revisions_to_keep($post) {
 	$num = WP_POST_REVISIONS;
 
-	if ( true === $num )
+	if (true === $num)
 		$num = -1;
 	else
-		$num = intval( $num );
+		$num = intval($num);
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
+	if ( ! post_type_supports($post->post_type, 'revisions'))
 		$num = 0;
 
 	/**
@@ -501,7 +501,7 @@ 
 	 * @param int     $num  Number of revisions to store.
 	 * @param WP_Post $post Post object.
 	 */
-	return (int) apply_filters( 'wp_revisions_to_keep', $num, $post );
+	return (int) apply_filters('wp_revisions_to_keep', $num, $post);
 }
 
 /**
@@ -513,24 +513,24 @@ 
  * @param WP_Post $post
  * @return WP_Post|false
  */
-function _set_preview( $post ) {
-	if ( ! is_object( $post ) ) {
+function _set_preview($post) {
+	if ( ! is_object($post)) {
 		return $post;
 	}
 
-	$preview = wp_get_post_autosave( $post->ID );
-	if ( ! is_object( $preview ) ) {
+	$preview = wp_get_post_autosave($post->ID);
+	if ( ! is_object($preview)) {
 		return $post;
 	}
 
-	$preview = sanitize_post( $preview );
+	$preview = sanitize_post($preview);
 
 	$post->post_content = $preview->post_content;
 	$post->post_title = $preview->post_title;
 	$post->post_excerpt = $preview->post_excerpt;
 
-	add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
-	add_filter( 'get_post_metadata', '_wp_preview_post_thumbnail_filter', 10, 3 );
+	add_filter('get_the_terms', '_wp_preview_terms_filter', 10, 3);
+	add_filter('get_post_metadata', '_wp_preview_post_thumbnail_filter', 10, 3);
 
 	return $post;
 }
@@ -542,11 +542,11 @@ 
  * @access private
  */
 function _show_post_preview() {
-	if ( isset($_GET['preview_id']) && isset($_GET['preview_nonce']) ) {
+	if (isset($_GET['preview_id']) && isset($_GET['preview_nonce'])) {
 		$id = (int) $_GET['preview_id'];
 
-		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) )
-			wp_die( __('Sorry, you are not allowed to preview drafts.') );
+		if (false === wp_verify_nonce($_GET['preview_nonce'], 'post_preview_'.$id))
+			wp_die(__('Sorry, you are not allowed to preview drafts.'));
 
 		add_filter('the_preview', '_set_preview');
 	}
@@ -563,17 +563,17 @@ 
  * @param string $taxonomy
  * @return array
  */
-function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) {
-	if ( ! $post = get_post() )
+function _wp_preview_terms_filter($terms, $post_id, $taxonomy) {
+	if ( ! $post = get_post())
 		return $terms;
 
-	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type )
+	if (empty($_REQUEST['post_format']) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type)
 		return $terms;
 
-	if ( 'standard' == $_REQUEST['post_format'] )
+	if ('standard' == $_REQUEST['post_format'])
 		$terms = array();
-	elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) )
-		$terms = array( $term ); // Can only have one post format
+	elseif ($term = get_term_by('slug', 'post-format-'.sanitize_key($_REQUEST['post_format']), 'post_format'))
+		$terms = array($term); // Can only have one post format
 
 	return $terms;
 }
@@ -589,21 +589,21 @@ 
  * @param string            $meta_key Meta key.
  * @return null|array The default return value or the post thumbnail meta array.
  */
-function _wp_preview_post_thumbnail_filter( $value, $post_id, $meta_key ) {
-	if ( ! $post = get_post() ) {
+function _wp_preview_post_thumbnail_filter($value, $post_id, $meta_key) {
+	if ( ! $post = get_post()) {
 		return $value;
 	}
 
-	if ( empty( $_REQUEST['_thumbnail_id'] ) || $post->ID != $post_id || '_thumbnail_id' != $meta_key || 'revision' == $post->post_type ) {
+	if (empty($_REQUEST['_thumbnail_id']) || $post->ID != $post_id || '_thumbnail_id' != $meta_key || 'revision' == $post->post_type) {
 		return $value;
 	}
 
-	$thumbnail_id = intval( $_REQUEST['_thumbnail_id'] );
-	if ( $thumbnail_id <= 0 ) {
+	$thumbnail_id = intval($_REQUEST['_thumbnail_id']);
+	if ($thumbnail_id <= 0) {
 		return '';
 	}
 
-	return strval( $thumbnail_id );
+	return strval($thumbnail_id);
 }
 
 /**
@@ -615,13 +615,13 @@ 
  * @param WP_Post $revision
  * @return int|false
  */
-function _wp_get_post_revision_version( $revision ) {
-	if ( is_object( $revision ) )
-		$revision = get_object_vars( $revision );
-	elseif ( !is_array( $revision ) )
+function _wp_get_post_revision_version($revision) {
+	if (is_object($revision))
+		$revision = get_object_vars($revision);
+	elseif ( ! is_array($revision))
 		return false;
 
-	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) )
+	if (preg_match('/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches))
 		return (int) $matches[1];
 
 	return 0;
@@ -639,23 +639,23 @@ 
  * @param array   $revisions Current revisions of the post
  * @return bool true if the revisions were upgraded, false if problems
  */
-function _wp_upgrade_revisions_of_post( $post, $revisions ) {
+function _wp_upgrade_revisions_of_post($post, $revisions) {
 	global $wpdb;
 
 	// Add post option exclusively
 	$lock = "revision-upgrade-{$post->ID}";
 	$now = time();
-	$result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'no') /* LOCK */", $lock, $now ) );
-	if ( ! $result ) {
+	$result = $wpdb->query($wpdb->prepare("INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'no') /* LOCK */", $lock, $now));
+	if ( ! $result) {
 		// If we couldn't get a lock, see how old the previous lock is
-		$locked = get_option( $lock );
-		if ( ! $locked ) {
+		$locked = get_option($lock);
+		if ( ! $locked) {
 			// Can't write to the lock, and can't read the lock.
 			// Something broken has happened
 			return false;
 		}
 
-		if ( $locked > $now - 3600 ) {
+		if ($locked > $now - 3600) {
 			// Lock is not too old: some other process may be upgrading this post.  Bail.
 			return false;
 		}
@@ -664,57 +664,57 @@ 
 	}
 
 	// If we could get a lock, re-"add" the option to fire all the correct filters.
-	update_option( $lock, $now );
+	update_option($lock, $now);
 
-	reset( $revisions );
+	reset($revisions);
 	$add_last = true;
 
 	do {
-		$this_revision = current( $revisions );
-		$prev_revision = next( $revisions );
+		$this_revision = current($revisions);
+		$prev_revision = next($revisions);
 
-		$this_revision_version = _wp_get_post_revision_version( $this_revision );
+		$this_revision_version = _wp_get_post_revision_version($this_revision);
 
 		// Something terrible happened
-		if ( false === $this_revision_version )
+		if (false === $this_revision_version)
 			continue;
 
 		// 1 is the latest revision version, so we're already up to date.
 		// No need to add a copy of the post as latest revision.
-		if ( 0 < $this_revision_version ) {
+		if (0 < $this_revision_version) {
 			$add_last = false;
 			continue;
 		}
 
 		// Always update the revision version
 		$update = array(
-			'post_name' => preg_replace( '/^(\d+-(?:autosave|revision))[\d-]*$/', '$1-v1', $this_revision->post_name ),
+			'post_name' => preg_replace('/^(\d+-(?:autosave|revision))[\d-]*$/', '$1-v1', $this_revision->post_name),
 		);
 
 		// If this revision is the oldest revision of the post, i.e. no $prev_revision,
 		// the correct post_author is probably $post->post_author, but that's only a good guess.
 		// Update the revision version only and Leave the author as-is.
-		if ( $prev_revision ) {
-			$prev_revision_version = _wp_get_post_revision_version( $prev_revision );
+		if ($prev_revision) {
+			$prev_revision_version = _wp_get_post_revision_version($prev_revision);
 
 			// If the previous revision is already up to date, it no longer has the information we need :(
-			if ( $prev_revision_version < 1 )
+			if ($prev_revision_version < 1)
 				$update['post_author'] = $prev_revision->post_author;
 		}
 
 		// Upgrade this revision
-		$result = $wpdb->update( $wpdb->posts, $update, array( 'ID' => $this_revision->ID ) );
+		$result = $wpdb->update($wpdb->posts, $update, array('ID' => $this_revision->ID));
 
-		if ( $result )
-			wp_cache_delete( $this_revision->ID, 'posts' );
+		if ($result)
+			wp_cache_delete($this_revision->ID, 'posts');
 
-	} while ( $prev_revision );
+	} while ($prev_revision);
 
-	delete_option( $lock );
+	delete_option($lock);
 
 	// Add a copy of the post as latest revision.
-	if ( $add_last )
-		wp_save_post_revision( $post->ID );
+	if ($add_last)
+		wp_save_post_revision($post->ID);
 
 	return true;
 }

Braces +120 added lines, -82 removed lines

@@ -110,20 +110,25 @@ 
  * @return int|WP_Error|void Void or 0 if error, new revision ID, if success.
  */
 function wp_save_post_revision( $post_id ) {
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
-		return;
+	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+			return;
+	}
 
-	if ( ! $post = get_post( $post_id ) )
-		return;
+	if ( ! $post = get_post( $post_id ) ) {
+			return;
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
-		return;
+	if ( ! post_type_supports( $post->post_type, 'revisions' ) ) {
+			return;
+	}
 
-	if ( 'auto-draft' == $post->post_status )
-		return;
+	if ( 'auto-draft' == $post->post_status ) {
+			return;
+	}
 
-	if ( ! wp_revisions_enabled( $post ) )
-		return;
+	if ( ! wp_revisions_enabled( $post ) ) {
+			return;
+	}
 
 	// Compare the proposed update with the last stored revision verifying that
 	// they are different, unless a plugin tells us to always save regardless.
@@ -189,21 +194,24 @@ 
 	// delete the oldest ones.
 	$revisions_to_keep = wp_revisions_to_keep( $post );
 
-	if ( $revisions_to_keep < 0 )
-		return $return;
+	if ( $revisions_to_keep < 0 ) {
+			return $return;
+	}
 
 	$revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) );
 
 	$delete = count($revisions) - $revisions_to_keep;
 
-	if ( $delete < 1 )
-		return $return;
+	if ( $delete < 1 ) {
+			return $return;
+	}
 
 	$revisions = array_slice( $revisions, 0, $delete );
 
 	for ( $i = 0; isset( $revisions[$i] ); $i++ ) {
-		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) )
-			continue;
+		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) ) {
+					continue;
+		}
 
 		wp_delete_post_revision( $revisions[ $i ]->ID );
 	}
@@ -229,8 +237,9 @@ 
 
 	foreach ( $revisions as $revision ) {
 		if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
-			if ( $user_id && $user_id != $revision->post_author )
-				continue;
+			if ( $user_id && $user_id != $revision->post_author ) {
+							continue;
+			}
 
 			return $revision;
 		}
@@ -248,8 +257,9 @@ 
  * @return false|int False if not a revision, ID of revision's parent otherwise.
  */
 function wp_is_post_revision( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
-		return false;
+	if ( !$post = wp_get_post_revision( $post ) ) {
+			return false;
+	}
 
 	return (int) $post->post_parent;
 }
@@ -263,11 +273,13 @@ 
  * @return false|int False if not a revision, ID of autosave's parent otherwise
  */
 function wp_is_post_autosave( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
-		return false;
+	if ( !$post = wp_get_post_revision( $post ) ) {
+			return false;
+	}
 
-	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) )
-		return (int) $post->post_parent;
+	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) ) {
+			return (int) $post->post_parent;
+	}
 
 	return false;
 }
@@ -283,23 +295,27 @@ 
  * @return int|WP_Error WP_Error or 0 if error, new revision ID if success.
  */
 function _wp_put_post_revision( $post = null, $autosave = false ) {
-	if ( is_object($post) )
-		$post = get_object_vars( $post );
-	elseif ( !is_array($post) )
-		$post = get_post($post, ARRAY_A);
+	if ( is_object($post) ) {
+			$post = get_object_vars( $post );
+	} elseif ( !is_array($post) ) {
+			$post = get_post($post, ARRAY_A);
+	}
 
-	if ( ! $post || empty($post['ID']) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	if ( ! $post || empty($post['ID']) ) {
+			return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	}
 
-	if ( isset($post['post_type']) && 'revision' == $post['post_type'] )
-		return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
+	if ( isset($post['post_type']) && 'revision' == $post['post_type'] ) {
+			return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
+	}
 
 	$post = _wp_post_revision_data( $post, $autosave );
 	$post = wp_slash($post); //since data is from db
 
 	$revision_id = wp_insert_post( $post );
-	if ( is_wp_error($revision_id) )
-		return $revision_id;
+	if ( is_wp_error($revision_id) ) {
+			return $revision_id;
+	}
 
 	if ( $revision_id ) {
 		/**
@@ -326,10 +342,12 @@ 
  * @return WP_Post|array|null Null if error or post object if success.
  */
 function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
-	if ( !$revision = get_post( $post, OBJECT, $filter ) )
-		return $revision;
-	if ( 'revision' !== $revision->post_type )
-		return null;
+	if ( !$revision = get_post( $post, OBJECT, $filter ) ) {
+			return $revision;
+	}
+	if ( 'revision' !== $revision->post_type ) {
+			return null;
+	}
 
 	if ( $output == OBJECT ) {
 		return $revision;
@@ -356,27 +374,31 @@ 
  * @return int|false|null Null if error, false if no fields to restore, (int) post ID if success.
  */
 function wp_restore_post_revision( $revision_id, $fields = null ) {
-	if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) )
-		return $revision;
+	if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) ) {
+			return $revision;
+	}
 
-	if ( !is_array( $fields ) )
-		$fields = array_keys( _wp_post_revision_fields( $revision ) );
+	if ( !is_array( $fields ) ) {
+			$fields = array_keys( _wp_post_revision_fields( $revision ) );
+	}
 
 	$update = array();
 	foreach ( array_intersect( array_keys( $revision ), $fields ) as $field ) {
 		$update[$field] = $revision[$field];
 	}
 
-	if ( !$update )
-		return false;
+	if ( !$update ) {
+			return false;
+	}
 
 	$update['ID'] = $revision['post_parent'];
 
 	$update = wp_slash( $update ); //since data is from db
 
 	$post_id = wp_update_post( $update );
-	if ( ! $post_id || is_wp_error( $post_id ) )
-		return $post_id;
+	if ( ! $post_id || is_wp_error( $post_id ) ) {
+			return $post_id;
+	}
 
 	// Update last edit user
 	update_post_meta( $post_id, '_edit_last', get_current_user_id() );
@@ -438,19 +460,22 @@ 
  */
 function wp_get_post_revisions( $post_id = 0, $args = null ) {
 	$post = get_post( $post_id );
-	if ( ! $post || empty( $post->ID ) )
-		return array();
+	if ( ! $post || empty( $post->ID ) ) {
+			return array();
+	}
 
 	$defaults = array( 'order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true );
 	$args = wp_parse_args( $args, $defaults );
 
-	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) )
-		return array();
+	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) ) {
+			return array();
+	}
 
 	$args = array_merge( $args, array( 'post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit' ) );
 
-	if ( ! $revisions = get_children( $args ) )
-		return array();
+	if ( ! $revisions = get_children( $args ) ) {
+			return array();
+	}
 
 	return $revisions;
 }
@@ -483,13 +508,15 @@ 
 function wp_revisions_to_keep( $post ) {
 	$num = WP_POST_REVISIONS;
 
-	if ( true === $num )
-		$num = -1;
-	else
-		$num = intval( $num );
+	if ( true === $num ) {
+			$num = -1;
+	} else {
+			$num = intval( $num );
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
-		$num = 0;
+	if ( ! post_type_supports( $post->post_type, 'revisions' ) ) {
+			$num = 0;
+	}
 
 	/**
 	 * Filters the number of revisions to save for the given post.
@@ -545,8 +572,9 @@ 
 	if ( isset($_GET['preview_id']) && isset($_GET['preview_nonce']) ) {
 		$id = (int) $_GET['preview_id'];
 
-		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) )
-			wp_die( __('Sorry, you are not allowed to preview drafts.') );
+		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) ) {
+					wp_die( __('Sorry, you are not allowed to preview drafts.') );
+		}
 
 		add_filter('the_preview', '_set_preview');
 	}
@@ -564,16 +592,20 @@ 
  * @return array
  */
 function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) {
-	if ( ! $post = get_post() )
-		return $terms;
+	if ( ! $post = get_post() ) {
+			return $terms;
+	}
 
-	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type )
-		return $terms;
+	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type ) {
+			return $terms;
+	}
 
-	if ( 'standard' == $_REQUEST['post_format'] )
-		$terms = array();
-	elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) )
-		$terms = array( $term ); // Can only have one post format
+	if ( 'standard' == $_REQUEST['post_format'] ) {
+			$terms = array();
+	} elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) ) {
+			$terms = array( $term );
+	}
+	// Can only have one post format
 
 	return $terms;
 }
@@ -616,13 +648,15 @@ 
  * @return int|false
  */
 function _wp_get_post_revision_version( $revision ) {
-	if ( is_object( $revision ) )
-		$revision = get_object_vars( $revision );
-	elseif ( !is_array( $revision ) )
-		return false;
+	if ( is_object( $revision ) ) {
+			$revision = get_object_vars( $revision );
+	} elseif ( !is_array( $revision ) ) {
+			return false;
+	}
 
-	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) )
-		return (int) $matches[1];
+	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) ) {
+			return (int) $matches[1];
+	}
 
 	return 0;
 }
@@ -676,8 +710,9 @@ 
 		$this_revision_version = _wp_get_post_revision_version( $this_revision );
 
 		// Something terrible happened
-		if ( false === $this_revision_version )
-			continue;
+		if ( false === $this_revision_version ) {
+					continue;
+		}
 
 		// 1 is the latest revision version, so we're already up to date.
 		// No need to add a copy of the post as latest revision.
@@ -698,23 +733,26 @@ 
 			$prev_revision_version = _wp_get_post_revision_version( $prev_revision );
 
 			// If the previous revision is already up to date, it no longer has the information we need :(
-			if ( $prev_revision_version < 1 )
-				$update['post_author'] = $prev_revision->post_author;
+			if ( $prev_revision_version < 1 ) {
+							$update['post_author'] = $prev_revision->post_author;
+			}
 		}
 
 		// Upgrade this revision
 		$result = $wpdb->update( $wpdb->posts, $update, array( 'ID' => $this_revision->ID ) );
 
-		if ( $result )
-			wp_cache_delete( $this_revision->ID, 'posts' );
+		if ( $result ) {
+					wp_cache_delete( $this_revision->ID, 'posts' );
+		}
 
 	} while ( $prev_revision );
 
 	delete_option( $lock );
 
 	// Add a copy of the post as latest revision.
-	if ( $add_last )
-		wp_save_post_revision( $post->ID );
+	if ( $add_last ) {
+			wp_save_post_revision( $post->ID );
+	}
 
 	return true;
 }