ntwb / wordpress

src/wp-admin/includes/options.php

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
 <script type="text/javascript">
 	jQuery(document).ready(function($){
 		var $siteName = $( '#wp-admin-bar-site-name' ).children( 'a' ).first(),
-			homeURL = ( <?php echo wp_json_encode( get_home_url() ); ?> || '' ).replace( /^(https?:\/\/)?(www\.)?/, '' );
+			homeURL = ( <?php echo wp_json_encode(get_home_url()); ?> || '' ).replace( /^(https?:\/\/)?(www\.)?/, '' );
 
 		$( '#blogname' ).on( 'input', function() {
 			var title = $.trim( $( this ).val() ) || homeURL;
@@ -136,6 +136,6 @@ 
  * @since 3.5.0
  */
 function options_reading_blog_charset() {
-	echo '<input name="blog_charset" type="text" id="blog_charset" value="' . esc_attr( get_option( 'blog_charset' ) ) . '" class="regular-text" />';
-	echo '<p class="description">' . __( 'The <a href="https://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended)' ) . '</p>';
+	echo '<input name="blog_charset" type="text" id="blog_charset" value="'.esc_attr(get_option('blog_charset')).'" class="regular-text" />';
+	echo '<p class="description">'.__('The <a href="https://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended)').'</p>';
 }

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

Braces +54 added lines, -32 removed lines

@@ -60,8 +60,9 @@ 
 	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 ) )
-			$folder = '/';
+		if ( ! $folder && $this->is_dir( '/' . WPINC ) ) {
+					$folder = '/';
+		}
 		return $folder;
 	}
 
@@ -102,8 +103,9 @@ 
 		$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 );
 	}
@@ -178,8 +180,9 @@ 
 	 * @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 ];
+		if ( isset( $this->cache[ $folder ] ) ) {
+					return $this->cache[ $folder ];
+		}
 
 		if ( stripos($this->method, 'ftp') !== false ) {
 			$constant_overrides = array(
@@ -191,16 +194,19 @@ 
 
 			// Direct matches ( folder = CONSTANT/ )
 			foreach ( $constant_overrides as $constant => $dir ) {
-				if ( ! defined( $constant ) )
-					continue;
-				if ( $folder === $dir )
-					return trailingslashit( constant( $constant ) );
+				if ( ! defined( $constant ) ) {
+									continue;
+				}
+				if ( $folder === $dir ) {
+									return trailingslashit( constant( $constant ) );
+				}
 			}
 
 			// Prefix Matches ( folder = CONSTANT/subdir )
 			foreach ( $constant_overrides as $constant => $dir ) {
-				if ( ! defined( $constant ) )
-					continue;
+				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 );
@@ -219,16 +225,18 @@ 
 		$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.
 			$folder = trailingslashit($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,8 +254,9 @@ 
 	 * @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 )
-			$base = trailingslashit($this->cwd());
+		if ( empty( $base ) || '.' == $base ) {
+					$base = trailingslashit($this->cwd());
+		}
 
 		$folder = untrailingslashit($folder);
 
@@ -264,8 +273,10 @@ 
 		$files = $this->dirlist( $base );
 
 		foreach ( $folder_parts as $index => $key ) {
-			if ( $index == $last_index )
-				continue; // We want this to be caught by the next code block.
+			if ( $index == $last_index ) {
+							continue;
+			}
+			// We want this to be caught by the next code block.
 
 			/*
 			 * Working from /home/ to /user/ to /wordpress/ see if that file exists within
@@ -285,8 +296,9 @@ 
 
 				// 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) )
-					return $ret;
+				if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop) ) {
+									return $ret;
+				}
 			}
 		}
 
@@ -302,8 +314,9 @@ 
 
 		// Prevent this function from looping again.
 		// No need to proceed if we've just searched in /
-		if ( $loop || '/' == $base )
-			return false;
+		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/....
@@ -326,22 +339,31 @@ 
 	 */
 	public function gethchmod( $file ){
 		$perms = intval( $this->getchmod( $file ), 8 );
-		if (($perms & 0xC000) == 0xC000) // Socket
+		if (($perms & 0xC000) == 0xC000) {
+			// Socket
 			$info = 's';
-		elseif (($perms & 0xA000) == 0xA000) // Symbolic Link
+		} elseif (($perms & 0xA000) == 0xA000) {
+			// Symbolic Link
 			$info = 'l';
-		elseif (($perms & 0x8000) == 0x8000) // Regular
+		} elseif (($perms & 0x8000) == 0x8000) {
+			// Regular
 			$info = '-';
-		elseif (($perms & 0x6000) == 0x6000) // Block special
+		} elseif (($perms & 0x6000) == 0x6000) {
+			// Block special
 			$info = 'b';
-		elseif (($perms & 0x4000) == 0x4000) // Directory
+		} elseif (($perms & 0x4000) == 0x4000) {
+			// Directory
 			$info = 'd';
-		elseif (($perms & 0x2000) == 0x2000) // Character special
+		} elseif (($perms & 0x2000) == 0x2000) {
+			// Character special
 			$info = 'c';
-		elseif (($perms & 0x1000) == 0x1000) // FIFO pipe
+		} elseif (($perms & 0x1000) == 0x1000) {
+			// FIFO pipe
 			$info = 'p';
-		else // Unknown
+		} else {
+			// Unknown
 			$info = 'u';
+		}
 
 		// Owner
 		$info .= (($perms & 0x0100) ? 'r' : '-');

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;

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 
 	/**
 	 * Used to trigger a success message when settings updated and set to true.
- 	 *
+	 *
 	 * @since 3.0.0
 	 * @access private
 	 * @var bool

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/edit-tag-messages.php

Spacing +24 added lines, -24 removed lines

@@ -11,32 +11,32 @@ 
 // 0 = unused. Messages start at index 1.
 $messages['_item'] = array(
 	0 => '',
-	1 => __( 'Item added.' ),
-	2 => __( 'Item deleted.' ),
-	3 => __( 'Item updated.' ),
-	4 => __( 'Item not added.' ),
-	5 => __( 'Item not updated.' ),
-	6 => __( 'Items deleted.' ),
+	1 => __('Item added.'),
+	2 => __('Item deleted.'),
+	3 => __('Item updated.'),
+	4 => __('Item not added.'),
+	5 => __('Item not updated.'),
+	6 => __('Items deleted.'),
 );
 
 $messages['category'] = array(
 	0 => '',
-	1 => __( 'Category added.' ),
-	2 => __( 'Category deleted.' ),
-	3 => __( 'Category updated.' ),
-	4 => __( 'Category not added.' ),
-	5 => __( 'Category not updated.' ),
-	6 => __( 'Categories deleted.' ),
+	1 => __('Category added.'),
+	2 => __('Category deleted.'),
+	3 => __('Category updated.'),
+	4 => __('Category not added.'),
+	5 => __('Category not updated.'),
+	6 => __('Categories deleted.'),
 );
 
 $messages['post_tag'] = array(
 	0 => '',
-	1 => __( 'Tag added.' ),
-	2 => __( 'Tag deleted.' ),
-	3 => __( 'Tag updated.' ),
-	4 => __( 'Tag not added.' ),
-	5 => __( 'Tag not updated.' ),
-	6 => __( 'Tags deleted.' ),
+	1 => __('Tag added.'),
+	2 => __('Tag deleted.'),
+	3 => __('Tag updated.'),
+	4 => __('Tag not added.'),
+	5 => __('Tag not updated.'),
+	6 => __('Tags deleted.'),
 );
 
 /**
@@ -46,13 +46,13 @@ 
  *
  * @param array $messages The messages to be displayed.
  */
-$messages = apply_filters( 'term_updated_messages', $messages );
+$messages = apply_filters('term_updated_messages', $messages);
 
 $message = false;
-if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) {
-	if ( isset( $messages[ $taxonomy ][ $msg ] ) ) {
-		$message = $messages[ $taxonomy ][ $msg ];
-	} elseif ( ! isset( $messages[ $taxonomy ] ) && isset( $messages['_item'][ $msg ] ) ) {
-		$message = $messages['_item'][ $msg ];
+if (isset($_REQUEST['message']) && ($msg = (int) $_REQUEST['message'])) {
+	if (isset($messages[$taxonomy][$msg])) {
+		$message = $messages[$taxonomy][$msg];
+	} elseif ( ! isset($messages[$taxonomy]) && isset($messages['_item'][$msg])) {
+		$message = $messages['_item'][$msg];
 	}
 }
\ No newline at end of file

src/wp-admin/includes/credits.php

Braces +6 added lines, -4 removed lines

@@ -28,13 +28,15 @@
 	) {
 		$response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale" );
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
-			return false;
+		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+					return false;
+		}
 
 		$results = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( ! is_array( $results ) )
-			return false;
+		if ( ! is_array( $results ) ) {
+					return false;
+		}
 
 		set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS );
 	}

Spacing +14 added lines, -14 removed lines

@@ -15,26 +15,26 @@ 
  * @return array|false A list of all of the contributors, or false on error.
  */
 function wp_credits() {
-	$wp_version = get_bloginfo( 'version' );
+	$wp_version = get_bloginfo('version');
 	$locale = get_user_locale();
 
-	$results = get_site_transient( 'wordpress_credits_' . $locale );
+	$results = get_site_transient('wordpress_credits_'.$locale);
 
-	if ( ! is_array( $results )
-		|| false !== strpos( $wp_version, '-' )
-		|| ( isset( $results['data']['version'] ) && strpos( $wp_version, $results['data']['version'] ) !== 0 )
+	if ( ! is_array($results)
+		|| false !== strpos($wp_version, '-')
+		|| (isset($results['data']['version']) && strpos($wp_version, $results['data']['version']) !== 0)
 	) {
-		$response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version={$wp_version}&locale={$locale}" );
+		$response = wp_remote_get("http://api.wordpress.org/core/credits/1.1/?version={$wp_version}&locale={$locale}");
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response))
 			return false;
 
-		$results = json_decode( wp_remote_retrieve_body( $response ), true );
+		$results = json_decode(wp_remote_retrieve_body($response), true);
 
-		if ( ! is_array( $results ) )
+		if ( ! is_array($results))
 			return false;
 
-		set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS );
+		set_site_transient('wordpress_credits_'.$locale, $results, DAY_IN_SECONDS);
 	}
 
 	return $results;
@@ -50,8 +50,8 @@ 
  * @param string $username      The contributor's username.
  * @param string $profiles      URL to the contributor's WordPress.org profile page.
  */
-function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
-	$display_name = '<a href="' . esc_url( sprintf( $profiles, $username ) ) . '">' . esc_html( $display_name ) . '</a>';
+function _wp_credits_add_profile_link(&$display_name, $username, $profiles) {
+	$display_name = '<a href="'.esc_url(sprintf($profiles, $username)).'">'.esc_html($display_name).'</a>';
 }
 
 /**
@@ -62,6 +62,6 @@ 
  *
  * @param string $data External library data, passed by reference.
  */
-function _wp_credits_build_object_link( &$data ) {
-	$data = '<a href="' . esc_url( $data[1] ) . '">' . esc_html( $data[0] ) . '</a>';
+function _wp_credits_build_object_link(&$data) {
+	$data = '<a href="'.esc_url($data[1]).'">'.esc_html($data[0]).'</a>';
 }

src/wp-admin/includes/export.php

Braces +70 added lines, -47 removed lines

@@ -65,8 +65,9 @@ 
 
 	if ( 'all' != $args['content'] && post_type_exists( $args['content'] ) ) {
 		$ptype = get_post_type_object( $args['content'] );
-		if ( ! $ptype->can_export )
-			$args['content'] = 'post';
+		if ( ! $ptype->can_export ) {
+					$args['content'] = 'post';
+		}
 
 		$where = $wpdb->prepare( "{$wpdb->posts}.post_type = %s", $args['content'] );
 	} else {
@@ -75,10 +76,11 @@ 
 		$where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types );
 	}
 
-	if ( $args['status'] && ( 'post' == $args['content'] || 'page' == $args['content'] ) )
-		$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_status = %s", $args['status'] );
-	else
-		$where .= " AND {$wpdb->posts}.post_status != 'auto-draft'";
+	if ( $args['status'] && ( 'post' == $args['content'] || 'page' == $args['content'] ) ) {
+			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_status = %s", $args['status'] );
+	} else {
+			$where .= " AND {$wpdb->posts}.post_status != 'auto-draft'";
+	}
 
 	$join = '';
 	if ( $args['category'] && 'post' == $args['content'] ) {
@@ -89,14 +91,17 @@ 
 	}
 
 	if ( 'post' == $args['content'] || 'page' == $args['content'] || 'attachment' == $args['content'] ) {
-		if ( $args['author'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_author = %d", $args['author'] );
+		if ( $args['author'] ) {
+					$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_author = %d", $args['author'] );
+		}
 
-		if ( $args['start_date'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date >= %s", date( 'Y-m-d', strtotime($args['start_date']) ) );
+		if ( $args['start_date'] ) {
+					$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date >= %s", date( 'Y-m-d', strtotime($args['start_date']) ) );
+		}
 
-		if ( $args['end_date'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date < %s", date( 'Y-m-d', strtotime('+1 month', strtotime($args['end_date'])) ) );
+		if ( $args['end_date'] ) {
+					$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date < %s", date( 'Y-m-d', strtotime('+1 month', strtotime($args['end_date'])) ) );
+		}
 	}
 
 	// Grab a snapshot of post IDs, just in case it changes during the export.
@@ -120,18 +125,20 @@ 
 
 		// Put categories in order with no child going before its parent.
 		while ( $cat = array_shift( $categories ) ) {
-			if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) )
-				$cats[$cat->term_id] = $cat;
-			else
-				$categories[] = $cat;
+			if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) ) {
+							$cats[$cat->term_id] = $cat;
+			} else {
+							$categories[] = $cat;
+			}
 		}
 
 		// Put terms in order with no child going before its parent.
 		while ( $t = array_shift( $custom_terms ) ) {
-			if ( $t->parent == 0 || isset( $terms[$t->parent] ) )
-				$terms[$t->term_id] = $t;
-			else
-				$custom_terms[] = $t;
+			if ( $t->parent == 0 || isset( $terms[$t->parent] ) ) {
+							$terms[$t->term_id] = $t;
+			} else {
+							$custom_terms[] = $t;
+			}
 		}
 
 		unset( $categories, $custom_taxonomies, $custom_terms );
@@ -164,11 +171,13 @@ 
 	 */
 	function wxr_site_url() {
 		// Multisite: the base URL.
-		if ( is_multisite() )
-			return network_home_url();
+		if ( is_multisite() ) {
+					return network_home_url();
+		}
 		// WordPress (single site): the blog URL.
-		else
-			return get_bloginfo_rss( 'url' );
+		else {
+					return get_bloginfo_rss( 'url' );
+		}
 	}
 
 	/**
@@ -179,8 +188,9 @@ 
 	 * @param object $category Category Object
 	 */
 	function wxr_cat_name( $category ) {
-		if ( empty( $category->name ) )
-			return;
+		if ( empty( $category->name ) ) {
+					return;
+		}
 
 		echo '<wp:cat_name>' . wxr_cdata( $category->name ) . '</wp:cat_name>';
 	}
@@ -193,8 +203,9 @@ 
 	 * @param object $category Category Object
 	 */
 	function wxr_category_description( $category ) {
-		if ( empty( $category->description ) )
-			return;
+		if ( empty( $category->description ) ) {
+					return;
+		}
 
 		echo '<wp:category_description>' . wxr_cdata( $category->description ) . '</wp:category_description>';
 	}
@@ -207,8 +218,9 @@ 
 	 * @param object $tag Tag Object
 	 */
 	function wxr_tag_name( $tag ) {
-		if ( empty( $tag->name ) )
-			return;
+		if ( empty( $tag->name ) ) {
+					return;
+		}
 
 		echo '<wp:tag_name>' . wxr_cdata( $tag->name ) . '</wp:tag_name>';
 	}
@@ -221,8 +233,9 @@ 
 	 * @param object $tag Tag Object
 	 */
 	function wxr_tag_description( $tag ) {
-		if ( empty( $tag->description ) )
-			return;
+		if ( empty( $tag->description ) ) {
+					return;
+		}
 
 		echo '<wp:tag_description>' . wxr_cdata( $tag->description ) . '</wp:tag_description>';
 	}
@@ -235,8 +248,9 @@ 
 	 * @param object $term Term Object
 	 */
 	function wxr_term_name( $term ) {
-		if ( empty( $term->name ) )
-			return;
+		if ( empty( $term->name ) ) {
+					return;
+		}
 
 		echo '<wp:term_name>' . wxr_cdata( $term->name ) . '</wp:term_name>';
 	}
@@ -249,8 +263,9 @@ 
 	 * @param object $term Term Object
 	 */
 	function wxr_term_description( $term ) {
-		if ( empty( $term->description ) )
-			return;
+		if ( empty( $term->description ) ) {
+					return;
+		}
 
 		echo '<wp:term_description>' . wxr_cdata( $term->description ) . '</wp:term_description>';
 	}
@@ -276,8 +291,9 @@ 
 
 		$authors = array();
 		$results = $wpdb->get_results( "SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_status != 'auto-draft' $and" );
-		foreach ( (array) $results as $result )
-			$authors[] = get_userdata( $result->post_author );
+		foreach ( (array) $results as $result ) {
+					$authors[] = get_userdata( $result->post_author );
+		}
 
 		$authors = array_filter( $authors );
 
@@ -300,8 +316,9 @@ 
 	 */
 	function wxr_nav_menu_terms() {
 		$nav_menus = wp_get_nav_menus();
-		if ( empty( $nav_menus ) || ! is_array( $nav_menus ) )
-			return;
+		if ( empty( $nav_menus ) || ! is_array( $nav_menus ) ) {
+					return;
+		}
 
 		foreach ( $nav_menus as $menu ) {
 			echo "\t<wp:term>";
@@ -322,8 +339,9 @@ 
 		$post = get_post();
 
 		$taxonomies = get_object_taxonomies( $post->post_type );
-		if ( empty( $taxonomies ) )
-			return;
+		if ( empty( $taxonomies ) ) {
+					return;
+		}
 		$terms = wp_get_object_terms( $post->ID, $taxonomies );
 
 		foreach ( (array) $terms as $term ) {
@@ -338,8 +356,9 @@ 
 	 * @return bool
 	 */
 	function wxr_filter_postmeta( $return_me, $meta_key ) {
-		if ( '_edit_lock' == $meta_key )
-			$return_me = true;
+		if ( '_edit_lock' == $meta_key ) {
+					$return_me = true;
+		}
 		return $return_me;
 	}
 	add_filter( 'wxr_export_skip_postmeta', 'wxr_filter_postmeta', 10, 2 );
@@ -394,7 +413,10 @@ 
 <?php foreach ( $terms as $t ) : ?>
 	<wp:term><wp:term_id><?php echo wxr_cdata( $t->term_id ); ?></wp:term_id><wp:term_taxonomy><?php echo wxr_cdata( $t->taxonomy ); ?></wp:term_taxonomy><wp:term_slug><?php echo wxr_cdata( $t->slug ); ?></wp:term_slug><wp:term_parent><?php echo wxr_cdata( $t->parent ? $terms[$t->parent]->slug : '' ); ?></wp:term_parent><?php wxr_term_name( $t ); ?><?php wxr_term_description( $t ); ?></wp:term>
 <?php endforeach; ?>
-<?php if ( 'all' == $args['content'] ) wxr_nav_menu_terms(); ?>
+<?php if ( 'all' == $args['content'] ) {
+	wxr_nav_menu_terms();
+}
+?>
 
 	<?php
 	/** This action is documented in wp-includes/feed-rss2.php */
@@ -480,8 +502,9 @@ 
 			 * @param string $meta_key Current meta key.
 			 * @param object $meta     Current meta object.
 			 */
-			if ( apply_filters( 'wxr_export_skip_postmeta', false, $meta->meta_key, $meta ) )
-				continue;
+			if ( apply_filters( 'wxr_export_skip_postmeta', false, $meta->meta_key, $meta ) ) {
+							continue;
+			}
 		?>
 		<wp:postmeta>
 			<wp:meta_key><?php echo wxr_cdata( $meta->meta_key ); ?></wp:meta_key>

Spacing +187 added lines, -187 removed lines

@@ -13,7 +13,7 @@ 
  *
  * @since 2.5.0
  */
-define( 'WXR_VERSION', '1.2' );
+define('WXR_VERSION', '1.2');
 
 /**
  * Generates the WXR export file for download.
@@ -25,13 +25,13 @@ 
  *
  * @param array $args Filters defining what should be included in the export.
  */
-function export_wp( $args = array() ) {
+function export_wp($args = array()) {
 	global $wpdb, $post;
 
-	$defaults = array( 'content' => 'all', 'author' => false, 'category' => false,
+	$defaults = array('content' => 'all', 'author' => false, 'category' => false,
 		'start_date' => false, 'end_date' => false, 'status' => false,
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	/**
 	 * Fires at the beginning of an export, before any headers are sent.
@@ -40,14 +40,14 @@ 
 	 *
 	 * @param array $args An array of export arguments.
 	 */
-	do_action( 'export_wp', $args );
+	do_action('export_wp', $args);
 
-	$sitename = sanitize_key( get_bloginfo( 'name' ) );
-	if ( ! empty( $sitename ) ) {
+	$sitename = sanitize_key(get_bloginfo('name'));
+	if ( ! empty($sitename)) {
 		$sitename .= '.';
 	}
-	$date = date( 'Y-m-d' );
-	$wp_filename = $sitename . 'wordpress.' . $date . '.xml';
+	$date = date('Y-m-d');
+	$wp_filename = $sitename.'wordpress.'.$date.'.xml';
 	/**
 	 * Filters the export filename.
 	 *
@@ -57,84 +57,84 @@ 
 	 * @param string $sitename    The site name.
 	 * @param string $date        Today's date, formatted.
 	 */
-	$filename = apply_filters( 'export_wp_filename', $wp_filename, $sitename, $date );
+	$filename = apply_filters('export_wp_filename', $wp_filename, $sitename, $date);
 
-	header( 'Content-Description: File Transfer' );
-	header( 'Content-Disposition: attachment; filename=' . $filename );
-	header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
+	header('Content-Description: File Transfer');
+	header('Content-Disposition: attachment; filename='.$filename);
+	header('Content-Type: text/xml; charset='.get_option('blog_charset'), true);
 
-	if ( 'all' != $args['content'] && post_type_exists( $args['content'] ) ) {
-		$ptype = get_post_type_object( $args['content'] );
-		if ( ! $ptype->can_export )
+	if ('all' != $args['content'] && post_type_exists($args['content'])) {
+		$ptype = get_post_type_object($args['content']);
+		if ( ! $ptype->can_export)
 			$args['content'] = 'post';
 
-		$where = $wpdb->prepare( "{$wpdb->posts}.post_type = %s", $args['content'] );
+		$where = $wpdb->prepare("{$wpdb->posts}.post_type = %s", $args['content']);
 	} else {
-		$post_types = get_post_types( array( 'can_export' => true ) );
-		$esses = array_fill( 0, count($post_types), '%s' );
-		$where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types );
+		$post_types = get_post_types(array('can_export' => true));
+		$esses = array_fill(0, count($post_types), '%s');
+		$where = $wpdb->prepare("{$wpdb->posts}.post_type IN (".implode(',', $esses).')', $post_types);
 	}
 
-	if ( $args['status'] && ( 'post' == $args['content'] || 'page' == $args['content'] ) )
-		$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_status = %s", $args['status'] );
+	if ($args['status'] && ('post' == $args['content'] || 'page' == $args['content']))
+		$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_status = %s", $args['status']);
 	else
 		$where .= " AND {$wpdb->posts}.post_status != 'auto-draft'";
 
 	$join = '';
-	if ( $args['category'] && 'post' == $args['content'] ) {
-		if ( $term = term_exists( $args['category'], 'category' ) ) {
+	if ($args['category'] && 'post' == $args['content']) {
+		if ($term = term_exists($args['category'], 'category')) {
 			$join = "INNER JOIN {$wpdb->term_relationships} ON ({$wpdb->posts}.ID = {$wpdb->term_relationships}.object_id)";
-			$where .= $wpdb->prepare( " AND {$wpdb->term_relationships}.term_taxonomy_id = %d", $term['term_taxonomy_id'] );
+			$where .= $wpdb->prepare(" AND {$wpdb->term_relationships}.term_taxonomy_id = %d", $term['term_taxonomy_id']);
 		}
 	}
 
-	if ( 'post' == $args['content'] || 'page' == $args['content'] || 'attachment' == $args['content'] ) {
-		if ( $args['author'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_author = %d", $args['author'] );
+	if ('post' == $args['content'] || 'page' == $args['content'] || 'attachment' == $args['content']) {
+		if ($args['author'])
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_author = %d", $args['author']);
 
-		if ( $args['start_date'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date >= %s", date( 'Y-m-d', strtotime($args['start_date']) ) );
+		if ($args['start_date'])
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_date >= %s", date('Y-m-d', strtotime($args['start_date'])));
 
-		if ( $args['end_date'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date < %s", date( 'Y-m-d', strtotime('+1 month', strtotime($args['end_date'])) ) );
+		if ($args['end_date'])
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_date < %s", date('Y-m-d', strtotime('+1 month', strtotime($args['end_date']))));
 	}
 
 	// Grab a snapshot of post IDs, just in case it changes during the export.
-	$post_ids = $wpdb->get_col( "SELECT ID FROM {$wpdb->posts} $join WHERE $where" );
+	$post_ids = $wpdb->get_col("SELECT ID FROM {$wpdb->posts} $join WHERE $where");
 
 	/*
 	 * Get the requested terms ready, empty unless posts filtered by category
 	 * or all content.
 	 */
 	$cats = $tags = $terms = array();
-	if ( isset( $term ) && $term ) {
-		$cat = get_term( $term['term_id'], 'category' );
-		$cats = array( $cat->term_id => $cat );
-		unset( $term, $cat );
-	} elseif ( 'all' == $args['content'] ) {
-		$categories = (array) get_categories( array( 'get' => 'all' ) );
-		$tags = (array) get_tags( array( 'get' => 'all' ) );
+	if (isset($term) && $term) {
+		$cat = get_term($term['term_id'], 'category');
+		$cats = array($cat->term_id => $cat);
+		unset($term, $cat);
+	} elseif ('all' == $args['content']) {
+		$categories = (array) get_categories(array('get' => 'all'));
+		$tags = (array) get_tags(array('get' => 'all'));
 
-		$custom_taxonomies = get_taxonomies( array( '_builtin' => false ) );
-		$custom_terms = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) );
+		$custom_taxonomies = get_taxonomies(array('_builtin' => false));
+		$custom_terms = (array) get_terms($custom_taxonomies, array('get' => 'all'));
 
 		// Put categories in order with no child going before its parent.
-		while ( $cat = array_shift( $categories ) ) {
-			if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) )
+		while ($cat = array_shift($categories)) {
+			if ($cat->parent == 0 || isset($cats[$cat->parent]))
 				$cats[$cat->term_id] = $cat;
 			else
 				$categories[] = $cat;
 		}
 
 		// Put terms in order with no child going before its parent.
-		while ( $t = array_shift( $custom_terms ) ) {
-			if ( $t->parent == 0 || isset( $terms[$t->parent] ) )
+		while ($t = array_shift($custom_terms)) {
+			if ($t->parent == 0 || isset($terms[$t->parent]))
 				$terms[$t->term_id] = $t;
 			else
 				$custom_terms[] = $t;
 		}
 
-		unset( $categories, $custom_taxonomies, $custom_terms );
+		unset($categories, $custom_taxonomies, $custom_terms);
 	}
 
 	/**
@@ -145,12 +145,12 @@ 
 	 * @param string $str String to wrap in XML CDATA tag.
 	 * @return string
 	 */
-	function wxr_cdata( $str ) {
-		if ( ! seems_utf8( $str ) ) {
-			$str = utf8_encode( $str );
+	function wxr_cdata($str) {
+		if ( ! seems_utf8($str)) {
+			$str = utf8_encode($str);
 		}
 		// $str = ent2ncr(esc_html($str));
-		$str = '<![CDATA[' . str_replace( ']]>', ']]]]><![CDATA[>', $str ) . ']]>';
+		$str = '<![CDATA['.str_replace(']]>', ']]]]><![CDATA[>', $str).']]>';
 
 		return $str;
 	}
@@ -164,11 +164,11 @@ 
 	 */
 	function wxr_site_url() {
 		// Multisite: the base URL.
-		if ( is_multisite() )
+		if (is_multisite())
 			return network_home_url();
 		// WordPress (single site): the blog URL.
 		else
-			return get_bloginfo_rss( 'url' );
+			return get_bloginfo_rss('url');
 	}
 
 	/**
@@ -178,11 +178,11 @@ 
 	 *
 	 * @param object $category Category Object
 	 */
-	function wxr_cat_name( $category ) {
-		if ( empty( $category->name ) )
+	function wxr_cat_name($category) {
+		if (empty($category->name))
 			return;
 
-		echo '<wp:cat_name>' . wxr_cdata( $category->name ) . "</wp:cat_name>\n";
+		echo '<wp:cat_name>'.wxr_cdata($category->name)."</wp:cat_name>\n";
 	}
 
 	/**
@@ -192,11 +192,11 @@ 
 	 *
 	 * @param object $category Category Object
 	 */
-	function wxr_category_description( $category ) {
-		if ( empty( $category->description ) )
+	function wxr_category_description($category) {
+		if (empty($category->description))
 			return;
 
-		echo '<wp:category_description>' . wxr_cdata( $category->description ) . "</wp:category_description>\n";
+		echo '<wp:category_description>'.wxr_cdata($category->description)."</wp:category_description>\n";
 	}
 
 	/**
@@ -206,11 +206,11 @@ 
 	 *
 	 * @param object $tag Tag Object
 	 */
-	function wxr_tag_name( $tag ) {
-		if ( empty( $tag->name ) )
+	function wxr_tag_name($tag) {
+		if (empty($tag->name))
 			return;
 
-		echo '<wp:tag_name>' . wxr_cdata( $tag->name ) . "</wp:tag_name>\n";
+		echo '<wp:tag_name>'.wxr_cdata($tag->name)."</wp:tag_name>\n";
 	}
 
 	/**
@@ -220,11 +220,11 @@ 
 	 *
 	 * @param object $tag Tag Object
 	 */
-	function wxr_tag_description( $tag ) {
-		if ( empty( $tag->description ) )
+	function wxr_tag_description($tag) {
+		if (empty($tag->description))
 			return;
 
-		echo '<wp:tag_description>' . wxr_cdata( $tag->description ) . "</wp:tag_description>\n";
+		echo '<wp:tag_description>'.wxr_cdata($tag->description)."</wp:tag_description>\n";
 	}
 
 	/**
@@ -234,11 +234,11 @@ 
 	 *
 	 * @param object $term Term Object
 	 */
-	function wxr_term_name( $term ) {
-		if ( empty( $term->name ) )
+	function wxr_term_name($term) {
+		if (empty($term->name))
 			return;
 
-		echo '<wp:term_name>' . wxr_cdata( $term->name ) . "</wp:term_name>\n";
+		echo '<wp:term_name>'.wxr_cdata($term->name)."</wp:term_name>\n";
 	}
 
 	/**
@@ -248,11 +248,11 @@ 
 	 *
 	 * @param object $term Term Object
 	 */
-	function wxr_term_description( $term ) {
-		if ( empty( $term->description ) )
+	function wxr_term_description($term) {
+		if (empty($term->description))
 			return;
 
-		echo "\t\t<wp:term_description>" . wxr_cdata( $term->description ) . "</wp:term_description>\n";
+		echo "\t\t<wp:term_description>".wxr_cdata($term->description)."</wp:term_description>\n";
 	}
 
 	/**
@@ -262,12 +262,12 @@ 
 	 *
 	 * @param WP_Term $term Term object.
 	 */
-	function wxr_term_meta( $term ) {
+	function wxr_term_meta($term) {
 		global $wpdb;
 
-		$termmeta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->termmeta WHERE term_id = %d", $term->term_id ) );
+		$termmeta = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->termmeta WHERE term_id = %d", $term->term_id));
 
-		foreach ( $termmeta as $meta ) {
+		foreach ($termmeta as $meta) {
 			/**
 			 * Filters whether to selectively skip term meta used for WXR exports.
 			 *
@@ -280,8 +280,8 @@ 
 			 * @param string $meta_key Current meta key.
 			 * @param object $meta     Current meta object.
 			 */
-			if ( ! apply_filters( 'wxr_export_skip_termmeta', false, $meta->meta_key, $meta ) ) {
-				printf( "\t\t<wp:termmeta>\n\t\t\t<wp:meta_key>%s</wp:meta_key>\n\t\t\t<wp:meta_value>%s</wp:meta_value>\n\t\t</wp:termmeta>\n", wxr_cdata( $meta->meta_key ), wxr_cdata( $meta->meta_value ) );
+			if ( ! apply_filters('wxr_export_skip_termmeta', false, $meta->meta_key, $meta)) {
+				printf("\t\t<wp:termmeta>\n\t\t\t<wp:meta_key>%s</wp:meta_key>\n\t\t\t<wp:meta_value>%s</wp:meta_value>\n\t\t</wp:termmeta>\n", wxr_cdata($meta->meta_key), wxr_cdata($meta->meta_value));
 			}
 		}
 	}
@@ -295,31 +295,31 @@ 
 	 *
 	 * @param array $post_ids Array of post IDs to filter the query by. Optional.
 	 */
-	function wxr_authors_list( array $post_ids = null ) {
+	function wxr_authors_list(array $post_ids = null) {
 		global $wpdb;
 
-		if ( !empty( $post_ids ) ) {
-			$post_ids = array_map( 'absint', $post_ids );
-			$and = 'AND ID IN ( ' . implode( ', ', $post_ids ) . ')';
+		if ( ! empty($post_ids)) {
+			$post_ids = array_map('absint', $post_ids);
+			$and = 'AND ID IN ( '.implode(', ', $post_ids).')';
 		} else {
 			$and = '';
 		}
 
 		$authors = array();
-		$results = $wpdb->get_results( "SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_status != 'auto-draft' $and" );
-		foreach ( (array) $results as $result )
-			$authors[] = get_userdata( $result->post_author );
+		$results = $wpdb->get_results("SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_status != 'auto-draft' $and");
+		foreach ((array) $results as $result)
+			$authors[] = get_userdata($result->post_author);
 
-		$authors = array_filter( $authors );
+		$authors = array_filter($authors);
 
-		foreach ( $authors as $author ) {
+		foreach ($authors as $author) {
 			echo "\t<wp:author>";
-			echo '<wp:author_id>' . intval( $author->ID ) . '</wp:author_id>';
-			echo '<wp:author_login>' . wxr_cdata( $author->user_login ) . '</wp:author_login>';
-			echo '<wp:author_email>' . wxr_cdata( $author->user_email ) . '</wp:author_email>';
-			echo '<wp:author_display_name>' . wxr_cdata( $author->display_name ) . '</wp:author_display_name>';
-			echo '<wp:author_first_name>' . wxr_cdata( $author->first_name ) . '</wp:author_first_name>';
-			echo '<wp:author_last_name>' . wxr_cdata( $author->last_name ) . '</wp:author_last_name>';
+			echo '<wp:author_id>'.intval($author->ID).'</wp:author_id>';
+			echo '<wp:author_login>'.wxr_cdata($author->user_login).'</wp:author_login>';
+			echo '<wp:author_email>'.wxr_cdata($author->user_email).'</wp:author_email>';
+			echo '<wp:author_display_name>'.wxr_cdata($author->display_name).'</wp:author_display_name>';
+			echo '<wp:author_first_name>'.wxr_cdata($author->first_name).'</wp:author_first_name>';
+			echo '<wp:author_last_name>'.wxr_cdata($author->last_name).'</wp:author_last_name>';
 			echo "</wp:author>\n";
 		}
 	}
@@ -331,15 +331,15 @@ 
 	 */
 	function wxr_nav_menu_terms() {
 		$nav_menus = wp_get_nav_menus();
-		if ( empty( $nav_menus ) || ! is_array( $nav_menus ) )
+		if (empty($nav_menus) || ! is_array($nav_menus))
 			return;
 
-		foreach ( $nav_menus as $menu ) {
+		foreach ($nav_menus as $menu) {
 			echo "\t<wp:term>";
-			echo '<wp:term_id>' . intval( $menu->term_id ) . '</wp:term_id>';
+			echo '<wp:term_id>'.intval($menu->term_id).'</wp:term_id>';
 			echo '<wp:term_taxonomy>nav_menu</wp:term_taxonomy>';
-			echo '<wp:term_slug>' . wxr_cdata( $menu->slug ) . '</wp:term_slug>';
-			wxr_term_name( $menu );
+			echo '<wp:term_slug>'.wxr_cdata($menu->slug).'</wp:term_slug>';
+			wxr_term_name($menu);
 			echo "</wp:term>\n";
 		}
 	}
@@ -352,13 +352,13 @@ 
 	function wxr_post_taxonomy() {
 		$post = get_post();
 
-		$taxonomies = get_object_taxonomies( $post->post_type );
-		if ( empty( $taxonomies ) )
+		$taxonomies = get_object_taxonomies($post->post_type);
+		if (empty($taxonomies))
 			return;
-		$terms = wp_get_object_terms( $post->ID, $taxonomies );
+		$terms = wp_get_object_terms($post->ID, $taxonomies);
 
-		foreach ( (array) $terms as $term ) {
-			echo "\t\t<category domain=\"{$term->taxonomy}\" nicename=\"{$term->slug}\">" . wxr_cdata( $term->name ) . "</category>\n";
+		foreach ((array) $terms as $term) {
+			echo "\t\t<category domain=\"{$term->taxonomy}\" nicename=\"{$term->slug}\">".wxr_cdata($term->name)."</category>\n";
 		}
 	}
 
@@ -368,14 +368,14 @@ 
 	 * @param string $meta_key
 	 * @return bool
 	 */
-	function wxr_filter_postmeta( $return_me, $meta_key ) {
-		if ( '_edit_lock' == $meta_key )
+	function wxr_filter_postmeta($return_me, $meta_key) {
+		if ('_edit_lock' == $meta_key)
 			$return_me = true;
 		return $return_me;
 	}
-	add_filter( 'wxr_export_skip_postmeta', 'wxr_filter_postmeta', 10, 2 );
+	add_filter('wxr_export_skip_postmeta', 'wxr_filter_postmeta', 10, 2);
 
-	echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . "\" ?>\n";
+	echo '<?xml version="1.0" encoding="'.get_bloginfo('charset')."\" ?>\n";
 
 	?>
 <!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your site. -->
@@ -395,7 +395,7 @@ 
 <!-- 7. WordPress will then import each of the posts, pages, comments, categories, etc. -->
 <!--    contained in this file into your site. -->
 
-<?php the_generator( 'export' ); ?>
+<?php the_generator('export'); ?>
 <rss version="2.0"
 	xmlns:excerpt="http://wordpress.org/export/<?php echo WXR_VERSION; ?>/excerpt/"
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"
@@ -405,55 +405,55 @@ 
 >
 
 <channel>
-	<title><?php bloginfo_rss( 'name' ); ?></title>
-	<link><?php bloginfo_rss( 'url' ); ?></link>
-	<description><?php bloginfo_rss( 'description' ); ?></description>
-	<pubDate><?php echo date( 'D, d M Y H:i:s +0000' ); ?></pubDate>
-	<language><?php bloginfo_rss( 'language' ); ?></language>
+	<title><?php bloginfo_rss('name'); ?></title>
+	<link><?php bloginfo_rss('url'); ?></link>
+	<description><?php bloginfo_rss('description'); ?></description>
+	<pubDate><?php echo date('D, d M Y H:i:s +0000'); ?></pubDate>
+	<language><?php bloginfo_rss('language'); ?></language>
 	<wp:wxr_version><?php echo WXR_VERSION; ?></wp:wxr_version>
 	<wp:base_site_url><?php echo wxr_site_url(); ?></wp:base_site_url>
-	<wp:base_blog_url><?php bloginfo_rss( 'url' ); ?></wp:base_blog_url>
+	<wp:base_blog_url><?php bloginfo_rss('url'); ?></wp:base_blog_url>
 
-<?php wxr_authors_list( $post_ids ); ?>
+<?php wxr_authors_list($post_ids); ?>
 
-<?php foreach ( $cats as $c ) : ?>
+<?php foreach ($cats as $c) : ?>
 	<wp:category>
-		<wp:term_id><?php echo intval( $c->term_id ); ?></wp:term_id>
-		<wp:category_nicename><?php echo wxr_cdata( $c->slug ); ?></wp:category_nicename>
-		<wp:category_parent><?php echo wxr_cdata( $c->parent ? $cats[$c->parent]->slug : '' ); ?></wp:category_parent>
-		<?php wxr_cat_name( $c );
-		wxr_category_description( $c );
-		wxr_term_meta( $c ); ?>
+		<wp:term_id><?php echo intval($c->term_id); ?></wp:term_id>
+		<wp:category_nicename><?php echo wxr_cdata($c->slug); ?></wp:category_nicename>
+		<wp:category_parent><?php echo wxr_cdata($c->parent ? $cats[$c->parent]->slug : ''); ?></wp:category_parent>
+		<?php wxr_cat_name($c);
+		wxr_category_description($c);
+		wxr_term_meta($c); ?>
 	</wp:category>
 <?php endforeach; ?>
-<?php foreach ( $tags as $t ) : ?>
+<?php foreach ($tags as $t) : ?>
 	<wp:tag>
-		<wp:term_id><?php echo intval( $t->term_id ); ?></wp:term_id>
-		<wp:tag_slug><?php echo wxr_cdata( $t->slug ); ?></wp:tag_slug>
-		<?php wxr_tag_name( $t );
-		wxr_tag_description( $t );
-		wxr_term_meta( $t ); ?>
+		<wp:term_id><?php echo intval($t->term_id); ?></wp:term_id>
+		<wp:tag_slug><?php echo wxr_cdata($t->slug); ?></wp:tag_slug>
+		<?php wxr_tag_name($t);
+		wxr_tag_description($t);
+		wxr_term_meta($t); ?>
 	</wp:tag>
 <?php endforeach; ?>
-<?php foreach ( $terms as $t ) : ?>
+<?php foreach ($terms as $t) : ?>
 	<wp:term>
-		<wp:term_id><?php echo wxr_cdata( $t->term_id ); ?></wp:term_id>
-		<wp:term_taxonomy><?php echo wxr_cdata( $t->taxonomy ); ?></wp:term_taxonomy>
-		<wp:term_slug><?php echo wxr_cdata( $t->slug ); ?></wp:term_slug>
-		<wp:term_parent><?php echo wxr_cdata( $t->parent ? $terms[$t->parent]->slug : '' ); ?></wp:term_parent>
-		<?php wxr_term_name( $t );
-		wxr_term_description( $t );
-		wxr_term_meta( $t ); ?>
+		<wp:term_id><?php echo wxr_cdata($t->term_id); ?></wp:term_id>
+		<wp:term_taxonomy><?php echo wxr_cdata($t->taxonomy); ?></wp:term_taxonomy>
+		<wp:term_slug><?php echo wxr_cdata($t->slug); ?></wp:term_slug>
+		<wp:term_parent><?php echo wxr_cdata($t->parent ? $terms[$t->parent]->slug : ''); ?></wp:term_parent>
+		<?php wxr_term_name($t);
+		wxr_term_description($t);
+		wxr_term_meta($t); ?>
 	</wp:term>
 <?php endforeach; ?>
-<?php if ( 'all' == $args['content'] ) wxr_nav_menu_terms(); ?>
+<?php if ('all' == $args['content']) wxr_nav_menu_terms(); ?>
 
 	<?php
 	/** This action is documented in wp-includes/feed-rss2.php */
-	do_action( 'rss2_head' );
+	do_action('rss2_head');
 	?>
 
-<?php if ( $post_ids ) {
+<?php if ($post_ids) {
 	/**
 	 * @global WP_Query $wp_query
 	 */
@@ -463,23 +463,23 @@ 
 	$wp_query->in_the_loop = true;
 
 	// Fetch 20 posts at a time rather than loading the entire table into memory.
-	while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) {
-	$where = 'WHERE ID IN (' . join( ',', $next_posts ) . ')';
-	$posts = $wpdb->get_results( "SELECT * FROM {$wpdb->posts} $where" );
+	while ($next_posts = array_splice($post_ids, 0, 20)) {
+	$where = 'WHERE ID IN ('.join(',', $next_posts).')';
+	$posts = $wpdb->get_results("SELECT * FROM {$wpdb->posts} $where");
 
 	// Begin Loop.
-	foreach ( $posts as $post ) {
-		setup_postdata( $post );
-		$is_sticky = is_sticky( $post->ID ) ? 1 : 0;
+	foreach ($posts as $post) {
+		setup_postdata($post);
+		$is_sticky = is_sticky($post->ID) ? 1 : 0;
 ?>
 	<item>
 		<title><?php
 			/** This filter is documented in wp-includes/feed.php */
-			echo apply_filters( 'the_title_rss', $post->post_title );
+			echo apply_filters('the_title_rss', $post->post_title);
 		?></title>
 		<link><?php the_permalink_rss() ?></link>
-		<pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_post_time( 'Y-m-d H:i:s', true ), false ); ?></pubDate>
-		<dc:creator><?php echo wxr_cdata( get_the_author_meta( 'login' ) ); ?></dc:creator>
+		<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_time('Y-m-d H:i:s', true), false); ?></pubDate>
+		<dc:creator><?php echo wxr_cdata(get_the_author_meta('login')); ?></dc:creator>
 		<guid isPermaLink="false"><?php the_guid(); ?></guid>
 		<description></description>
 		<content:encoded><?php
@@ -490,7 +490,7 @@ 
 			 *
 			 * @param string $post_content Content of the current post.
 			 */
-			echo wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) );
+			echo wxr_cdata(apply_filters('the_content_export', $post->post_content));
 		?></content:encoded>
 		<excerpt:encoded><?php
 			/**
@@ -500,26 +500,26 @@ 
 			 *
 			 * @param string $post_excerpt Excerpt for the current post.
 			 */
-			echo wxr_cdata( apply_filters( 'the_excerpt_export', $post->post_excerpt ) );
+			echo wxr_cdata(apply_filters('the_excerpt_export', $post->post_excerpt));
 		?></excerpt:encoded>
-		<wp:post_id><?php echo intval( $post->ID ); ?></wp:post_id>
-		<wp:post_date><?php echo wxr_cdata( $post->post_date ); ?></wp:post_date>
-		<wp:post_date_gmt><?php echo wxr_cdata( $post->post_date_gmt ); ?></wp:post_date_gmt>
-		<wp:comment_status><?php echo wxr_cdata( $post->comment_status ); ?></wp:comment_status>
-		<wp:ping_status><?php echo wxr_cdata( $post->ping_status ); ?></wp:ping_status>
-		<wp:post_name><?php echo wxr_cdata( $post->post_name ); ?></wp:post_name>
-		<wp:status><?php echo wxr_cdata( $post->post_status ); ?></wp:status>
-		<wp:post_parent><?php echo intval( $post->post_parent ); ?></wp:post_parent>
-		<wp:menu_order><?php echo intval( $post->menu_order ); ?></wp:menu_order>
-		<wp:post_type><?php echo wxr_cdata( $post->post_type ); ?></wp:post_type>
-		<wp:post_password><?php echo wxr_cdata( $post->post_password ); ?></wp:post_password>
-		<wp:is_sticky><?php echo intval( $is_sticky ); ?></wp:is_sticky>
-<?php	if ( $post->post_type == 'attachment' ) : ?>
-		<wp:attachment_url><?php echo wxr_cdata( wp_get_attachment_url( $post->ID ) ); ?></wp:attachment_url>
+		<wp:post_id><?php echo intval($post->ID); ?></wp:post_id>
+		<wp:post_date><?php echo wxr_cdata($post->post_date); ?></wp:post_date>
+		<wp:post_date_gmt><?php echo wxr_cdata($post->post_date_gmt); ?></wp:post_date_gmt>
+		<wp:comment_status><?php echo wxr_cdata($post->comment_status); ?></wp:comment_status>
+		<wp:ping_status><?php echo wxr_cdata($post->ping_status); ?></wp:ping_status>
+		<wp:post_name><?php echo wxr_cdata($post->post_name); ?></wp:post_name>
+		<wp:status><?php echo wxr_cdata($post->post_status); ?></wp:status>
+		<wp:post_parent><?php echo intval($post->post_parent); ?></wp:post_parent>
+		<wp:menu_order><?php echo intval($post->menu_order); ?></wp:menu_order>
+		<wp:post_type><?php echo wxr_cdata($post->post_type); ?></wp:post_type>
+		<wp:post_password><?php echo wxr_cdata($post->post_password); ?></wp:post_password>
+		<wp:is_sticky><?php echo intval($is_sticky); ?></wp:is_sticky>
+<?php	if ($post->post_type == 'attachment') : ?>
+		<wp:attachment_url><?php echo wxr_cdata(wp_get_attachment_url($post->ID)); ?></wp:attachment_url>
 <?php 	endif; ?>
 <?php 	wxr_post_taxonomy(); ?>
-<?php	$postmeta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID ) );
-		foreach ( $postmeta as $meta ) :
+<?php	$postmeta = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID));
+		foreach ($postmeta as $meta) :
 			/**
 			 * Filters whether to selectively skip post meta used for WXR exports.
 			 *
@@ -532,33 +532,33 @@ 
 			 * @param string $meta_key Current meta key.
 			 * @param object $meta     Current meta object.
 			 */
-			if ( apply_filters( 'wxr_export_skip_postmeta', false, $meta->meta_key, $meta ) )
+			if (apply_filters('wxr_export_skip_postmeta', false, $meta->meta_key, $meta))
 				continue;
 		?>
 		<wp:postmeta>
-			<wp:meta_key><?php echo wxr_cdata( $meta->meta_key ); ?></wp:meta_key>
-			<wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
+			<wp:meta_key><?php echo wxr_cdata($meta->meta_key); ?></wp:meta_key>
+			<wp:meta_value><?php echo wxr_cdata($meta->meta_value); ?></wp:meta_value>
 		</wp:postmeta>
 <?php	endforeach;
 
-		$_comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID ) );
-		$comments = array_map( 'get_comment', $_comments );
-		foreach ( $comments as $c ) : ?>
+		$_comments = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID));
+		$comments = array_map('get_comment', $_comments);
+		foreach ($comments as $c) : ?>
 		<wp:comment>
-			<wp:comment_id><?php echo intval( $c->comment_ID ); ?></wp:comment_id>
-			<wp:comment_author><?php echo wxr_cdata( $c->comment_author ); ?></wp:comment_author>
-			<wp:comment_author_email><?php echo wxr_cdata( $c->comment_author_email ); ?></wp:comment_author_email>
-			<wp:comment_author_url><?php echo esc_url_raw( $c->comment_author_url ); ?></wp:comment_author_url>
-			<wp:comment_author_IP><?php echo wxr_cdata( $c->comment_author_IP ); ?></wp:comment_author_IP>
-			<wp:comment_date><?php echo wxr_cdata( $c->comment_date ); ?></wp:comment_date>
-			<wp:comment_date_gmt><?php echo wxr_cdata( $c->comment_date_gmt ); ?></wp:comment_date_gmt>
-			<wp:comment_content><?php echo wxr_cdata( $c->comment_content ) ?></wp:comment_content>
-			<wp:comment_approved><?php echo wxr_cdata( $c->comment_approved ); ?></wp:comment_approved>
-			<wp:comment_type><?php echo wxr_cdata( $c->comment_type ); ?></wp:comment_type>
-			<wp:comment_parent><?php echo intval( $c->comment_parent ); ?></wp:comment_parent>
-			<wp:comment_user_id><?php echo intval( $c->user_id ); ?></wp:comment_user_id>
-<?php		$c_meta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->commentmeta WHERE comment_id = %d", $c->comment_ID ) );
-			foreach ( $c_meta as $meta ) :
+			<wp:comment_id><?php echo intval($c->comment_ID); ?></wp:comment_id>
+			<wp:comment_author><?php echo wxr_cdata($c->comment_author); ?></wp:comment_author>
+			<wp:comment_author_email><?php echo wxr_cdata($c->comment_author_email); ?></wp:comment_author_email>
+			<wp:comment_author_url><?php echo esc_url_raw($c->comment_author_url); ?></wp:comment_author_url>
+			<wp:comment_author_IP><?php echo wxr_cdata($c->comment_author_IP); ?></wp:comment_author_IP>
+			<wp:comment_date><?php echo wxr_cdata($c->comment_date); ?></wp:comment_date>
+			<wp:comment_date_gmt><?php echo wxr_cdata($c->comment_date_gmt); ?></wp:comment_date_gmt>
+			<wp:comment_content><?php echo wxr_cdata($c->comment_content) ?></wp:comment_content>
+			<wp:comment_approved><?php echo wxr_cdata($c->comment_approved); ?></wp:comment_approved>
+			<wp:comment_type><?php echo wxr_cdata($c->comment_type); ?></wp:comment_type>
+			<wp:comment_parent><?php echo intval($c->comment_parent); ?></wp:comment_parent>
+			<wp:comment_user_id><?php echo intval($c->user_id); ?></wp:comment_user_id>
+<?php		$c_meta = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->commentmeta WHERE comment_id = %d", $c->comment_ID));
+			foreach ($c_meta as $meta) :
 				/**
 				 * Filters whether to selectively skip comment meta used for WXR exports.
 				 *
@@ -571,13 +571,13 @@ 
 				 * @param string $meta_key Current meta key.
 				 * @param object $meta     Current meta object.
 				 */
-				if ( apply_filters( 'wxr_export_skip_commentmeta', false, $meta->meta_key, $meta ) ) {
+				if (apply_filters('wxr_export_skip_commentmeta', false, $meta->meta_key, $meta)) {
 					continue;
 				}
 			?>
 			<wp:commentmeta>
-				<wp:meta_key><?php echo wxr_cdata( $meta->meta_key ); ?></wp:meta_key>
-				<wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
+				<wp:meta_key><?php echo wxr_cdata($meta->meta_key); ?></wp:meta_key>
+				<wp:meta_value><?php echo wxr_cdata($meta->meta_value); ?></wp:meta_value>
 			</wp:commentmeta>
 <?php		endforeach; ?>
 		</wp:comment>

src/wp-admin/includes/class-walker-nav-menu-edit.php

Braces +6 added lines, -4 removed lines

@@ -73,8 +73,9 @@ 
 		$original_title = '';
 		if ( 'taxonomy' == $item->type ) {
 			$original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
-			if ( is_wp_error( $original_title ) )
-				$original_title = false;
+			if ( is_wp_error( $original_title ) ) {
+							$original_title = false;
+			}
 		} elseif ( 'post_type' == $item->type ) {
 			$original_object = get_post( $item->object_id );
 			$original_title = get_the_title( $original_object->ID );
@@ -106,8 +107,9 @@ 
 		$title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label;
 
 		$submenu_text = '';
-		if ( 0 == $depth )
-			$submenu_text = 'style="display: none;"';
+		if ( 0 == $depth ) {
+					$submenu_text = 'style="display: none;"';
+		}
 
 		?>
 		<li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes ); ?>">

Spacing +60 added lines, -60 removed lines

@@ -26,7 +26,7 @@ 
 	 * @param int    $depth  Depth of menu item. Used for padding.
 	 * @param array  $args   Not used.
 	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {}
+	public function start_lvl(&$output, $depth = 0, $args = array()) {}
 
 	/**
 	 * Ends the list of after the elements are added.
@@ -39,7 +39,7 @@ 
 	 * @param int    $depth  Depth of menu item. Used for padding.
 	 * @param array  $args   Not used.
 	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {}
+	public function end_lvl(&$output, $depth = 0, $args = array()) {}
 
 	/**
 	 * Start the element output.
@@ -55,12 +55,12 @@ 
 	 * @param array  $args   Not used.
 	 * @param int    $id     Not used.
 	 */
-	public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) {
 		global $_wp_nav_menu_max_depth;
 		$_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth;
 
 		ob_start();
-		$item_id = esc_attr( $item->ID );
+		$item_id = esc_attr($item->ID);
 		$removed_args = array(
 			'action',
 			'customlink-tab',
@@ -71,51 +71,51 @@ 
 		);
 
 		$original_title = false;
-		if ( 'taxonomy' == $item->type ) {
-			$original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
-			if ( is_wp_error( $original_title ) )
+		if ('taxonomy' == $item->type) {
+			$original_title = get_term_field('name', $item->object_id, $item->object, 'raw');
+			if (is_wp_error($original_title))
 				$original_title = false;
-		} elseif ( 'post_type' == $item->type ) {
-			$original_object = get_post( $item->object_id );
-			$original_title = get_the_title( $original_object->ID );
-		} elseif ( 'post_type_archive' == $item->type ) {
-			$original_object = get_post_type_object( $item->object );
-			if ( $original_object ) {
+		} elseif ('post_type' == $item->type) {
+			$original_object = get_post($item->object_id);
+			$original_title = get_the_title($original_object->ID);
+		} elseif ('post_type_archive' == $item->type) {
+			$original_object = get_post_type_object($item->object);
+			if ($original_object) {
 				$original_title = $original_object->labels->archives;
 			}
 		}
 
 		$classes = array(
-			'menu-item menu-item-depth-' . $depth,
-			'menu-item-' . esc_attr( $item->object ),
-			'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? 'active' : 'inactive'),
+			'menu-item menu-item-depth-'.$depth,
+			'menu-item-'.esc_attr($item->object),
+			'menu-item-edit-'.((isset($_GET['edit-menu-item']) && $item_id == $_GET['edit-menu-item']) ? 'active' : 'inactive'),
 		);
 
 		$title = $item->title;
 
-		if ( ! empty( $item->_invalid ) ) {
+		if ( ! empty($item->_invalid)) {
 			$classes[] = 'menu-item-invalid';
 			/* translators: %s: title of menu item which is invalid */
-			$title = sprintf( __( '%s (Invalid)' ), $item->title );
-		} elseif ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
+			$title = sprintf(__('%s (Invalid)'), $item->title);
+		} elseif (isset($item->post_status) && 'draft' == $item->post_status) {
 			$classes[] = 'pending';
 			/* translators: %s: title of menu item in draft status */
-			$title = sprintf( __('%s (Pending)'), $item->title );
+			$title = sprintf(__('%s (Pending)'), $item->title);
 		}
 
-		$title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label;
+		$title = ( ! isset($item->label) || '' == $item->label) ? $title : $item->label;
 
 		$submenu_text = '';
-		if ( 0 == $depth )
+		if (0 == $depth)
 			$submenu_text = 'style="display: none;"';
 
 		?>
-		<li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes ); ?>">
+		<li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes); ?>">
 			<div class="menu-item-bar">
 				<div class="menu-item-handle">
-					<span class="item-title"><span class="menu-item-title"><?php echo esc_html( $title ); ?></span> <span class="is-submenu" <?php echo $submenu_text; ?>><?php _e( 'sub item' ); ?></span></span>
+					<span class="item-title"><span class="menu-item-title"><?php echo esc_html($title); ?></span> <span class="is-submenu" <?php echo $submenu_text; ?>><?php _e('sub item'); ?></span></span>
 					<span class="item-controls">
-						<span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>
+						<span class="item-type"><?php echo esc_html($item->type_label); ?></span>
 						<span class="item-order hide-if-js">
 							<a href="<?php
 								echo wp_nonce_url(
@@ -124,11 +124,11 @@ 
 											'action' => 'move-up-menu-item',
 											'menu-item' => $item_id,
 										),
-										remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
+										remove_query_arg($removed_args, admin_url('nav-menus.php'))
 									),
 									'move-menu_item'
 								);
-							?>" class="item-move-up" aria-label="<?php esc_attr_e( 'Move up' ) ?>">&#8593;</a>
+							?>" class="item-move-up" aria-label="<?php esc_attr_e('Move up') ?>">&#8593;</a>
 							|
 							<a href="<?php
 								echo wp_nonce_url(
@@ -137,79 +137,79 @@ 
 											'action' => 'move-down-menu-item',
 											'menu-item' => $item_id,
 										),
-										remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
+										remove_query_arg($removed_args, admin_url('nav-menus.php'))
 									),
 									'move-menu_item'
 								);
-							?>" class="item-move-down" aria-label="<?php esc_attr_e( 'Move down' ) ?>">&#8595;</a>
+							?>" class="item-move-down" aria-label="<?php esc_attr_e('Move down') ?>">&#8595;</a>
 						</span>
 						<a class="item-edit" id="edit-<?php echo $item_id; ?>" href="<?php
-							echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_id ) ) );
-						?>" aria-label="<?php esc_attr_e( 'Edit menu item' ); ?>"><?php _e( 'Edit' ); ?></a>
+							echo (isset($_GET['edit-menu-item']) && $item_id == $_GET['edit-menu-item']) ? admin_url('nav-menus.php') : add_query_arg('edit-menu-item', $item_id, remove_query_arg($removed_args, admin_url('nav-menus.php#menu-item-settings-'.$item_id)));
+						?>" aria-label="<?php esc_attr_e('Edit menu item'); ?>"><?php _e('Edit'); ?></a>
 					</span>
 				</div>
 			</div>
 
 			<div class="menu-item-settings wp-clearfix" id="menu-item-settings-<?php echo $item_id; ?>">
-				<?php if ( 'custom' == $item->type ) : ?>
+				<?php if ('custom' == $item->type) : ?>
 					<p class="field-url description description-wide">
 						<label for="edit-menu-item-url-<?php echo $item_id; ?>">
-							<?php _e( 'URL' ); ?><br />
-							<input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->url ); ?>" />
+							<?php _e('URL'); ?><br />
+							<input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->url); ?>" />
 						</label>
 					</p>
 				<?php endif; ?>
 				<p class="description description-wide">
 					<label for="edit-menu-item-title-<?php echo $item_id; ?>">
-						<?php _e( 'Navigation Label' ); ?><br />
-						<input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->title ); ?>" />
+						<?php _e('Navigation Label'); ?><br />
+						<input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->title); ?>" />
 					</label>
 				</p>
 				<p class="field-title-attribute field-attr-title description description-wide">
 					<label for="edit-menu-item-attr-title-<?php echo $item_id; ?>">
-						<?php _e( 'Title Attribute' ); ?><br />
-						<input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
+						<?php _e('Title Attribute'); ?><br />
+						<input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->post_excerpt); ?>" />
 					</label>
 				</p>
 				<p class="field-link-target description">
 					<label for="edit-menu-item-target-<?php echo $item_id; ?>">
-						<input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $item->target, '_blank' ); ?> />
-						<?php _e( 'Open link in a new tab' ); ?>
+						<input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked($item->target, '_blank'); ?> />
+						<?php _e('Open link in a new tab'); ?>
 					</label>
 				</p>
 				<p class="field-css-classes description description-thin">
 					<label for="edit-menu-item-classes-<?php echo $item_id; ?>">
-						<?php _e( 'CSS Classes (optional)' ); ?><br />
-						<input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode(' ', $item->classes ) ); ?>" />
+						<?php _e('CSS Classes (optional)'); ?><br />
+						<input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr(implode(' ', $item->classes)); ?>" />
 					</label>
 				</p>
 				<p class="field-xfn description description-thin">
 					<label for="edit-menu-item-xfn-<?php echo $item_id; ?>">
-						<?php _e( 'Link Relationship (XFN)' ); ?><br />
-						<input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->xfn ); ?>" />
+						<?php _e('Link Relationship (XFN)'); ?><br />
+						<input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->xfn); ?>" />
 					</label>
 				</p>
 				<p class="field-description description description-wide">
 					<label for="edit-menu-item-description-<?php echo $item_id; ?>">
-						<?php _e( 'Description' ); ?><br />
-						<textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $item->description ); // textarea_escaped ?></textarea>
+						<?php _e('Description'); ?><br />
+						<textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html($item->description); // textarea_escaped ?></textarea>
 						<span class="description"><?php _e('The description will be displayed in the menu if the current theme supports it.'); ?></span>
 					</label>
 				</p>
 
 				<fieldset class="field-move hide-if-no-js description description-wide">
-					<span class="field-move-visual-label" aria-hidden="true"><?php _e( 'Move' ); ?></span>
-					<button type="button" class="button-link menus-move menus-move-up" data-dir="up"><?php _e( 'Up one' ); ?></button>
-					<button type="button" class="button-link menus-move menus-move-down" data-dir="down"><?php _e( 'Down one' ); ?></button>
+					<span class="field-move-visual-label" aria-hidden="true"><?php _e('Move'); ?></span>
+					<button type="button" class="button-link menus-move menus-move-up" data-dir="up"><?php _e('Up one'); ?></button>
+					<button type="button" class="button-link menus-move menus-move-down" data-dir="down"><?php _e('Down one'); ?></button>
 					<button type="button" class="button-link menus-move menus-move-left" data-dir="left"></button>
 					<button type="button" class="button-link menus-move menus-move-right" data-dir="right"></button>
-					<button type="button" class="button-link menus-move menus-move-top" data-dir="top"><?php _e( 'To the top' ); ?></button>
+					<button type="button" class="button-link menus-move menus-move-top" data-dir="top"><?php _e('To the top'); ?></button>
 				</fieldset>
 
 				<div class="menu-item-actions description-wide submitbox">
-					<?php if ( 'custom' != $item->type && $original_title !== false ) : ?>
+					<?php if ('custom' != $item->type && $original_title !== false) : ?>
 						<p class="link-to-original">
-							<?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
+							<?php printf(__('Original: %s'), '<a href="'.esc_attr($item->url).'">'.esc_html($original_title).'</a>'); ?>
 						</p>
 					<?php endif; ?>
 					<a class="item-delete submitdelete deletion" id="delete-<?php echo $item_id; ?>" href="<?php
@@ -219,19 +219,19 @@ 
 								'action' => 'delete-menu-item',
 								'menu-item' => $item_id,
 							),
-							admin_url( 'nav-menus.php' )
+							admin_url('nav-menus.php')
 						),
-						'delete-menu_item_' . $item_id
-					); ?>"><?php _e( 'Remove' ); ?></a> <span class="meta-sep hide-if-no-js"> | </span> <a class="item-cancel submitcancel hide-if-no-js" id="cancel-<?php echo $item_id; ?>" href="<?php echo esc_url( add_query_arg( array( 'edit-menu-item' => $item_id, 'cancel' => time() ), admin_url( 'nav-menus.php' ) ) );
+						'delete-menu_item_'.$item_id
+					); ?>"><?php _e('Remove'); ?></a> <span class="meta-sep hide-if-no-js"> | </span> <a class="item-cancel submitcancel hide-if-no-js" id="cancel-<?php echo $item_id; ?>" href="<?php echo esc_url(add_query_arg(array('edit-menu-item' => $item_id, 'cancel' => time()), admin_url('nav-menus.php')));
 						?>#menu-item-settings-<?php echo $item_id; ?>"><?php _e('Cancel'); ?></a>
 				</div>
 
 				<input class="menu-item-data-db-id" type="hidden" name="menu-item-db-id[<?php echo $item_id; ?>]" value="<?php echo $item_id; ?>" />
-				<input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object_id ); ?>" />
-				<input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object ); ?>" />
-				<input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_item_parent ); ?>" />
-				<input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_order ); ?>" />
-				<input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->type ); ?>" />
+				<input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->object_id); ?>" />
+				<input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->object); ?>" />
+				<input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->menu_item_parent); ?>" />
+				<input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->menu_order); ?>" />
+				<input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->type); ?>" />
 			</div><!-- .menu-item-settings-->
 			<ul class="menu-item-transport"></ul>
 		<?php

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

Braces +11 added lines, -8 removed lines

@@ -123,8 +123,9 @@ 
 		$nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
 
 		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
-			$tab = key( $tabs );
+		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) ) {
+					$tab = key( $tabs );
+		}
 
 		$args = array(
 			'page' => $paged,
@@ -172,10 +173,11 @@ 
 			case 'favorites':
 				$user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
 				update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
-				if ( $user )
-					$args['user'] = $user;
-				else
-					$args = false;
+				if ( $user ) {
+									$args['user'] = $user;
+				} else {
+									$args = false;
+				}
 
 				add_action( 'install_plugins_favorites', 'install_plugins_favorites_form', 9, 0 );
 				break;
@@ -197,8 +199,9 @@ 
 		 */
 		$args = apply_filters( "install_plugins_table_api_args_$tab", $args );
 
-		if ( !$args )
-			return;
+		if ( !$args ) {
+					return;
+		}
 
 		$api = plugins_api( 'query_plugins', $args );
 

Spacing +148 added lines, -148 removed lines

@@ -46,15 +46,15 @@ 
 	protected function get_installed_plugin_slugs() {
 		$slugs = array();
 
-		$plugin_info = get_site_transient( 'update_plugins' );
-		if ( isset( $plugin_info->no_update ) ) {
-			foreach ( $plugin_info->no_update as $plugin ) {
+		$plugin_info = get_site_transient('update_plugins');
+		if (isset($plugin_info->no_update)) {
+			foreach ($plugin_info->no_update as $plugin) {
 				$slugs[] = $plugin->slug;
 			}
 		}
 
-		if ( isset( $plugin_info->response ) ) {
-			foreach ( $plugin_info->response as $plugin ) {
+		if (isset($plugin_info->response)) {
+			foreach ($plugin_info->response as $plugin) {
 				$slugs[] = $plugin->slug;
 			}
 		}
@@ -71,11 +71,11 @@ 
 	 * @global string $term
 	 */
 	public function prepare_items() {
-		include( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+		include(ABSPATH.'wp-admin/includes/plugin-install.php');
 
 		global $tabs, $tab, $paged, $type, $term;
 
-		wp_reset_vars( array( 'tab' ) );
+		wp_reset_vars(array('tab'));
 
 		$paged = $this->get_pagenum();
 
@@ -84,23 +84,23 @@ 
 		// These are the tabs which are shown on the page
 		$tabs = array();
 
-		if ( 'search' === $tab ) {
-			$tabs['search'] = __( 'Search Results' );
+		if ('search' === $tab) {
+			$tabs['search'] = __('Search Results');
 		}
-		if ( $tab === 'beta' || false !== strpos( get_bloginfo( 'version' ), '-' ) ) {
-			$tabs['beta'] = _x( 'Beta Testing', 'Plugin Installer' );
+		if ($tab === 'beta' || false !== strpos(get_bloginfo('version'), '-')) {
+			$tabs['beta'] = _x('Beta Testing', 'Plugin Installer');
 		}
-		$tabs['featured']    = _x( 'Featured', 'Plugin Installer' );
-		$tabs['popular']     = _x( 'Popular', 'Plugin Installer' );
-		$tabs['recommended'] = _x( 'Recommended', 'Plugin Installer' );
-		$tabs['favorites']   = _x( 'Favorites', 'Plugin Installer' );
-		if ( current_user_can( 'upload_plugins' ) ) {
+		$tabs['featured']    = _x('Featured', 'Plugin Installer');
+		$tabs['popular']     = _x('Popular', 'Plugin Installer');
+		$tabs['recommended'] = _x('Recommended', 'Plugin Installer');
+		$tabs['favorites']   = _x('Favorites', 'Plugin Installer');
+		if (current_user_can('upload_plugins')) {
 			// No longer a real tab. Here for filter compatibility.
 			// Gets skipped in get_views().
-			$tabs['upload'] = __( 'Upload Plugin' );
+			$tabs['upload'] = __('Upload Plugin');
 		}
 
-		$nonmenu_tabs = array( 'plugin-information' ); // Valid actions to perform which do not have a Menu item.
+		$nonmenu_tabs = array('plugin-information'); // Valid actions to perform which do not have a Menu item.
 
 		/**
 		 * Filters the tabs shown on the Plugin Install screen.
@@ -110,7 +110,7 @@ 
 		 * @param array $tabs The tabs shown on the Plugin Install screen. Defaults include 'featured', 'popular',
 		 *                    'recommended', 'favorites', and 'upload'.
 		 */
-		$tabs = apply_filters( 'install_plugins_tabs', $tabs );
+		$tabs = apply_filters('install_plugins_tabs', $tabs);
 
 		/**
 		 * Filters tabs not associated with a menu item on the Plugin Install screen.
@@ -119,11 +119,11 @@ 
 		 *
 		 * @param array $nonmenu_tabs The tabs that don't have a Menu item on the Plugin Install screen.
 		 */
-		$nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
+		$nonmenu_tabs = apply_filters('install_plugins_nonmenu_tabs', $nonmenu_tabs);
 
 		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
-			$tab = key( $tabs );
+		if (empty($tab) || ( ! isset($tabs[$tab]) && ! in_array($tab, (array) $nonmenu_tabs)))
+			$tab = key($tabs);
 
 		$args = array(
 			'page' => $paged,
@@ -138,14 +138,14 @@ 
 			'installed_plugins' => $this->get_installed_plugin_slugs(),
 		);
 
-		switch ( $tab ) {
+		switch ($tab) {
 			case 'search':
-				$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-				$term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
+				$type = isset($_REQUEST['type']) ? wp_unslash($_REQUEST['type']) : 'term';
+				$term = isset($_REQUEST['s']) ? wp_unslash($_REQUEST['s']) : '';
 
-				switch ( $type ) {
+				switch ($type) {
 					case 'tag':
-						$args['tag'] = sanitize_title_with_dashes( $term );
+						$args['tag'] = sanitize_title_with_dashes($term);
 						break;
 					case 'term':
 						$args['search'] = $term;
@@ -169,19 +169,19 @@ 
 				break;
 
 			case 'favorites':
-				$action = 'save_wporg_username_' . get_current_user_id();
-				if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), $action ) ) {
-					$user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
-					update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+				$action = 'save_wporg_username_'.get_current_user_id();
+				if (isset($_GET['_wpnonce']) && wp_verify_nonce(wp_unslash($_GET['_wpnonce']), $action)) {
+					$user = isset($_GET['user']) ? wp_unslash($_GET['user']) : get_user_option('wporg_favorites');
+					update_user_meta(get_current_user_id(), 'wporg_favorites', $user);
 				} else {
-					$user = get_user_option( 'wporg_favorites' );
+					$user = get_user_option('wporg_favorites');
 				}
-				if ( $user )
+				if ($user)
 					$args['user'] = $user;
 				else
 					$args = false;
 
-				add_action( 'install_plugins_favorites', 'install_plugins_favorites_form', 9, 0 );
+				add_action('install_plugins_favorites', 'install_plugins_favorites_form', 9, 0);
 				break;
 
 			default:
@@ -199,30 +199,30 @@ 
 		 *
 		 * @param array|bool $args Plugin Install API arguments.
 		 */
-		$args = apply_filters( "install_plugins_table_api_args_{$tab}", $args );
+		$args = apply_filters("install_plugins_table_api_args_{$tab}", $args);
 
-		if ( !$args )
+		if ( ! $args)
 			return;
 
-		$api = plugins_api( 'query_plugins', $args );
+		$api = plugins_api('query_plugins', $args);
 
-		if ( is_wp_error( $api ) ) {
+		if (is_wp_error($api)) {
 			$this->error = $api;
 			return;
 		}
 
 		$this->items = $api->plugins;
 
-		if ( $this->orderby ) {
-			uasort( $this->items, array( $this, 'order_callback' ) );
+		if ($this->orderby) {
+			uasort($this->items, array($this, 'order_callback'));
 		}
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $api->info['results'],
 			'per_page' => $args['per_page'],
-		) );
+		));
 
-		if ( isset( $api->info['groups'] ) ) {
+		if (isset($api->info['groups'])) {
 			$this->groups = $api->info['groups'];
 		}
 	}
@@ -231,12 +231,12 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		if ( isset( $this->error ) ) {
-			$message = $this->error->get_error_message() . '<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a></p>';
+		if (isset($this->error)) {
+			$message = $this->error->get_error_message().'<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">'.__('Try again').'</a></p>';
 		} else {
-			$message = __( 'No plugins match your request.' );
+			$message = __('No plugins match your request.');
 		}
-		echo '<div class="no-plugin-results">' . $message . '</div>';
+		echo '<div class="no-plugin-results">'.$message.'</div>';
 	}
 
 	/**
@@ -250,13 +250,13 @@ 
 		global $tabs, $tab;
 
 		$display_tabs = array();
-		foreach ( (array) $tabs as $action => $text ) {
-			$class = ( $action === $tab ) ? ' current' : '';
-			$href = self_admin_url('plugin-install.php?tab=' . $action);
+		foreach ((array) $tabs as $action => $text) {
+			$class = ($action === $tab) ? ' current' : '';
+			$href = self_admin_url('plugin-install.php?tab='.$action);
 			$display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
 		}
 		// No longer a real tab.
-		unset( $display_tabs['plugin-install-upload'] );
+		unset($display_tabs['plugin-install-upload']);
 
 		return $display_tabs;
 	}
@@ -268,18 +268,18 @@ 
 		$views = $this->get_views();
 
 		/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
-		$views = apply_filters( "views_{$this->screen->id}", $views );
+		$views = apply_filters("views_{$this->screen->id}", $views);
 
-		$this->screen->render_screen_reader_content( 'heading_views' );
+		$this->screen->render_screen_reader_content('heading_views');
 ?>
 <div class="wp-filter">
 	<ul class="filter-links">
 		<?php
-		if ( ! empty( $views ) ) {
-			foreach ( $views as $class => $view ) {
-				$views[ $class ] = "\t<li class='$class'>$view";
+		if ( ! empty($views)) {
+			foreach ($views as $class => $view) {
+				$views[$class] = "\t<li class='$class'>$view";
 			}
-			echo implode( " </li>\n", $views ) . "</li>\n";
+			echo implode(" </li>\n", $views)."</li>\n";
 		}
 		?>
 	</ul>
@@ -297,23 +297,23 @@ 
 
 		$data_attr = '';
 
-		if ( $singular ) {
+		if ($singular) {
 			$data_attr = " data-wp-lists='list:$singular'";
 		}
 
-		$this->display_tablenav( 'top' );
+		$this->display_tablenav('top');
 
 ?>
-<div class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
+<div class="wp-list-table <?php echo implode(' ', $this->get_table_classes()); ?>">
 <?php
-	$this->screen->render_screen_reader_content( 'heading_list' );
+	$this->screen->render_screen_reader_content('heading_list');
 ?>
 	<div id="the-list"<?php echo $data_attr; ?>>
 		<?php $this->display_rows_or_placeholder(); ?>
 	</div>
 </div>
 <?php
-		$this->display_tablenav( 'bottom' );
+		$this->display_tablenav('bottom');
 	}
 
 	/**
@@ -321,12 +321,12 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
-		if ( $GLOBALS['tab'] === 'featured' ) {
+	protected function display_tablenav($which) {
+		if ($GLOBALS['tab'] === 'featured') {
 			return;
 		}
 
-		if ( 'top' === $which ) {
+		if ('top' === $which) {
 			wp_referer_field();
 		?>
 			<div class="tablenav top">
@@ -337,14 +337,14 @@ 
 					 *
 					 * @since 2.7.0
 					 */
-					do_action( 'install_plugins_table_header' ); ?>
+					do_action('install_plugins_table_header'); ?>
 				</div>
-				<?php $this->pagination( $which ); ?>
+				<?php $this->pagination($which); ?>
 				<br class="clear" />
 			</div>
 		<?php } else { ?>
 			<div class="tablenav bottom">
-				<?php $this->pagination( $which ); ?>
+				<?php $this->pagination($which); ?>
 				<br class="clear" />
 			</div>
 		<?php
@@ -355,7 +355,7 @@ 
 	 * @return array
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', $this->_args['plural'] );
+		return array('widefat', $this->_args['plural']);
 	}
 
 	/**
@@ -370,147 +370,147 @@ 
 	 * @param object $plugin_b
 	 * @return int
 	 */
-	private function order_callback( $plugin_a, $plugin_b ) {
+	private function order_callback($plugin_a, $plugin_b) {
 		$orderby = $this->orderby;
-		if ( ! isset( $plugin_a->$orderby, $plugin_b->$orderby ) ) {
+		if ( ! isset($plugin_a->$orderby, $plugin_b->$orderby)) {
 			return 0;
 		}
 
 		$a = $plugin_a->$orderby;
 		$b = $plugin_b->$orderby;
 
-		if ( $a == $b ) {
+		if ($a == $b) {
 			return 0;
 		}
 
-		if ( 'DESC' === $this->order ) {
-			return ( $a < $b ) ? 1 : -1;
+		if ('DESC' === $this->order) {
+			return ($a < $b) ? 1 : -1;
 		} else {
-			return ( $a < $b ) ? -1 : 1;
+			return ($a < $b) ? -1 : 1;
 		}
 	}
 
 	public function display_rows() {
 		$plugins_allowedtags = array(
-			'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
-			'abbr' => array( 'title' => array() ),'acronym' => array( 'title' => array() ),
-			'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(),
+			'a' => array('href' => array(), 'title' => array(), 'target' => array()),
+			'abbr' => array('title' => array()), 'acronym' => array('title' => array()),
+			'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(),
 			'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
 		);
 
 		$plugins_group_titles = array(
-			'Performance' => _x( 'Performance', 'Plugin installer group title' ),
-			'Social'      => _x( 'Social',      'Plugin installer group title' ),
-			'Tools'       => _x( 'Tools',       'Plugin installer group title' ),
+			'Performance' => _x('Performance', 'Plugin installer group title'),
+			'Social'      => _x('Social', 'Plugin installer group title'),
+			'Tools'       => _x('Tools', 'Plugin installer group title'),
 		);
 
 		$group = null;
 
-		foreach ( (array) $this->items as $plugin ) {
-			if ( is_object( $plugin ) ) {
+		foreach ((array) $this->items as $plugin) {
+			if (is_object($plugin)) {
 				$plugin = (array) $plugin;
 			}
 
 			// Display the group heading if there is one
-			if ( isset( $plugin['group'] ) && $plugin['group'] != $group ) {
-				if ( isset( $this->groups[ $plugin['group'] ] ) ) {
-					$group_name = $this->groups[ $plugin['group'] ];
-					if ( isset( $plugins_group_titles[ $group_name ] ) ) {
-						$group_name = $plugins_group_titles[ $group_name ];
+			if (isset($plugin['group']) && $plugin['group'] != $group) {
+				if (isset($this->groups[$plugin['group']])) {
+					$group_name = $this->groups[$plugin['group']];
+					if (isset($plugins_group_titles[$group_name])) {
+						$group_name = $plugins_group_titles[$group_name];
 					}
 				} else {
 					$group_name = $plugin['group'];
 				}
 
 				// Starting a new group, close off the divs of the last one
-				if ( ! empty( $group ) ) {
+				if ( ! empty($group)) {
 					echo '</div></div>';
 				}
 
-				echo '<div class="plugin-group"><h3>' . esc_html( $group_name ) . '</h3>';
+				echo '<div class="plugin-group"><h3>'.esc_html($group_name).'</h3>';
 				// needs an extra wrapping div for nth-child selectors to work
 				echo '<div class="plugin-items">';
 
 				$group = $plugin['group'];
 			}
-			$title = wp_kses( $plugin['name'], $plugins_allowedtags );
+			$title = wp_kses($plugin['name'], $plugins_allowedtags);
 
 			// Remove any HTML from the description.
-			$description = strip_tags( $plugin['short_description'] );
-			$version = wp_kses( $plugin['version'], $plugins_allowedtags );
+			$description = strip_tags($plugin['short_description']);
+			$version = wp_kses($plugin['version'], $plugins_allowedtags);
 
-			$name = strip_tags( $title . ' ' . $version );
+			$name = strip_tags($title.' '.$version);
 
-			$author = wp_kses( $plugin['author'], $plugins_allowedtags );
-			if ( ! empty( $author ) ) {
-				$author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '</cite>';
+			$author = wp_kses($plugin['author'], $plugins_allowedtags);
+			if ( ! empty($author)) {
+				$author = ' <cite>'.sprintf(__('By %s'), $author).'</cite>';
 			}
 
 			$action_links = array();
 
-			if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
-				$status = install_plugin_install_status( $plugin );
+			if (current_user_can('install_plugins') || current_user_can('update_plugins')) {
+				$status = install_plugin_install_status($plugin);
 
-				switch ( $status['status'] ) {
+				switch ($status['status']) {
 					case 'install':
-						if ( $status['url'] ) {
+						if ($status['url']) {
 							/* translators: 1: Plugin name and version. */
-							$action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Install Now' ) . '</a>';
+							$action_links[] = '<a class="install-now button" data-slug="'.esc_attr($plugin['slug']).'" href="'.esc_url($status['url']).'" aria-label="'.esc_attr(sprintf(__('Install %s now'), $name)).'" data-name="'.esc_attr($name).'">'.__('Install Now').'</a>';
 						}
 						break;
 
 					case 'update_available':
-						if ( $status['url'] ) {
+						if ($status['url']) {
 							/* translators: 1: Plugin name and version */
-							$action_links[] = '<a class="update-now button aria-button-if-js" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
+							$action_links[] = '<a class="update-now button aria-button-if-js" data-plugin="'.esc_attr($status['file']).'" data-slug="'.esc_attr($plugin['slug']).'" href="'.esc_url($status['url']).'" aria-label="'.esc_attr(sprintf(__('Update %s now'), $name)).'" data-name="'.esc_attr($name).'">'.__('Update Now').'</a>';
 						}
 						break;
 
 					case 'latest_installed':
 					case 'newer_installed':
-						if ( is_plugin_active( $status['file'] ) ) {
-							$action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">' . _x( 'Active', 'plugin' ) . '</button>';
-						} elseif ( current_user_can( 'activate_plugins' ) ) {
-							$button_text  = __( 'Activate' );
+						if (is_plugin_active($status['file'])) {
+							$action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">'._x('Active', 'plugin').'</button>';
+						} elseif (current_user_can('activate_plugins')) {
+							$button_text  = __('Activate');
 							/* translators: %s: Plugin name */
-							$button_label = _x( 'Activate %s', 'plugin' );
-							$activate_url = add_query_arg( array(
-								'_wpnonce'    => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
+							$button_label = _x('Activate %s', 'plugin');
+							$activate_url = add_query_arg(array(
+								'_wpnonce'    => wp_create_nonce('activate-plugin_'.$status['file']),
 								'action'      => 'activate',
 								'plugin'      => $status['file'],
-							), network_admin_url( 'plugins.php' ) );
+							), network_admin_url('plugins.php'));
 
-							if ( is_network_admin() ) {
-								$button_text  = __( 'Network Activate' );
+							if (is_network_admin()) {
+								$button_text  = __('Network Activate');
 								/* translators: %s: Plugin name */
-								$button_label = _x( 'Network Activate %s', 'plugin' );
-								$activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
+								$button_label = _x('Network Activate %s', 'plugin');
+								$activate_url = add_query_arg(array('networkwide' => 1), $activate_url);
 							}
 
 							$action_links[] = sprintf(
 								'<a href="%1$s" class="button activate-now" aria-label="%2$s">%3$s</a>',
-								esc_url( $activate_url ),
-								esc_attr( sprintf( $button_label, $plugin['name'] ) ),
+								esc_url($activate_url),
+								esc_attr(sprintf($button_label, $plugin['name'])),
 								$button_text
 							);
 						} else {
-							$action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">' . _x( 'Installed', 'plugin' ) . '</button>';
+							$action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">'._x('Installed', 'plugin').'</button>';
 						}
 						break;
 				}
 			}
 
-			$details_link   = self_admin_url( 'plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
-								'&amp;TB_iframe=true&amp;width=600&amp;height=550' );
+			$details_link = self_admin_url('plugin-install.php?tab=plugin-information&amp;plugin='.$plugin['slug'].
+								'&amp;TB_iframe=true&amp;width=600&amp;height=550');
 
 			/* translators: 1: Plugin name and version. */
-			$action_links[] = '<a href="' . esc_url( $details_link ) . '" class="thickbox open-plugin-details-modal" aria-label="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';
+			$action_links[] = '<a href="'.esc_url($details_link).'" class="thickbox open-plugin-details-modal" aria-label="'.esc_attr(sprintf(__('More information about %s'), $name)).'" data-title="'.esc_attr($name).'">'.__('More Details').'</a>';
 
-			if ( !empty( $plugin['icons']['svg'] ) ) {
+			if ( ! empty($plugin['icons']['svg'])) {
 				$plugin_icon_url = $plugin['icons']['svg'];
-			} elseif ( !empty( $plugin['icons']['2x'] ) ) {
+			} elseif ( ! empty($plugin['icons']['2x'])) {
 				$plugin_icon_url = $plugin['icons']['2x'];
-			} elseif ( !empty( $plugin['icons']['1x'] ) ) {
+			} elseif ( ! empty($plugin['icons']['1x'])) {
 				$plugin_icon_url = $plugin['icons']['1x'];
 			} else {
 				$plugin_icon_url = $plugin['icons']['default'];
@@ -524,24 +524,24 @@ 
 			 * @param array $action_links An array of plugin action hyperlinks. Defaults are links to Details and Install Now.
 			 * @param array $plugin       The plugin currently being listed.
 			 */
-			$action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
+			$action_links = apply_filters('plugin_install_action_links', $action_links, $plugin);
 
-			$last_updated_timestamp = strtotime( $plugin['last_updated'] );
+			$last_updated_timestamp = strtotime($plugin['last_updated']);
 		?>
-		<div class="plugin-card plugin-card-<?php echo sanitize_html_class( $plugin['slug'] ); ?>">
+		<div class="plugin-card plugin-card-<?php echo sanitize_html_class($plugin['slug']); ?>">
 			<div class="plugin-card-top">
 				<div class="name column-name">
 					<h3>
-						<a href="<?php echo esc_url( $details_link ); ?>" class="thickbox open-plugin-details-modal">
+						<a href="<?php echo esc_url($details_link); ?>" class="thickbox open-plugin-details-modal">
 						<?php echo $title; ?>
-						<img src="<?php echo esc_attr( $plugin_icon_url ) ?>" class="plugin-icon" alt="">
+						<img src="<?php echo esc_attr($plugin_icon_url) ?>" class="plugin-icon" alt="">
 						</a>
 					</h3>
 				</div>
 				<div class="action-links">
 					<?php
-						if ( $action_links ) {
-							echo '<ul class="plugin-action-buttons"><li>' . implode( '</li><li>', $action_links ) . '</li></ul>';
+						if ($action_links) {
+							echo '<ul class="plugin-action-buttons"><li>'.implode('</li><li>', $action_links).'</li></ul>';
 						}
 					?>
 				</div>
@@ -552,34 +552,34 @@ 
 			</div>
 			<div class="plugin-card-bottom">
 				<div class="vers column-rating">
-					<?php wp_star_rating( array( 'rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>
-					<span class="num-ratings" aria-hidden="true">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
+					<?php wp_star_rating(array('rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'])); ?>
+					<span class="num-ratings" aria-hidden="true">(<?php echo number_format_i18n($plugin['num_ratings']); ?>)</span>
 				</div>
 				<div class="column-updated">
-					<strong><?php _e( 'Last Updated:' ); ?></strong> <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
+					<strong><?php _e('Last Updated:'); ?></strong> <?php printf(__('%s ago'), human_time_diff($last_updated_timestamp)); ?>
 				</div>
 				<div class="column-downloaded">
 					<?php
-					if ( $plugin['active_installs'] >= 1000000 ) {
-						$active_installs_text = _x( '1+ Million', 'Active plugin installs' );
-					} elseif ( 0 == $plugin['active_installs'] ) {
-						$active_installs_text = _x( 'Less Than 10', 'Active plugin installs' );
+					if ($plugin['active_installs'] >= 1000000) {
+						$active_installs_text = _x('1+ Million', 'Active plugin installs');
+					} elseif (0 == $plugin['active_installs']) {
+						$active_installs_text = _x('Less Than 10', 'Active plugin installs');
 					} else {
-						$active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+';
+						$active_installs_text = number_format_i18n($plugin['active_installs']).'+';
 					}
-					printf( __( '%s Active Installs' ), $active_installs_text );
+					printf(__('%s Active Installs'), $active_installs_text);
 					?>
 				</div>
 				<div class="column-compatibility">
 					<?php
-					$wp_version = get_bloginfo( 'version' );
+					$wp_version = get_bloginfo('version');
 
-					if ( ! empty( $plugin['tested'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) {
-						echo '<span class="compatibility-untested">' . __( 'Untested with your version of WordPress' ) . '</span>';
-					} elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
-						echo '<span class="compatibility-incompatible">' . __( '<strong>Incompatible</strong> with your version of WordPress' ) . '</span>';
+					if ( ! empty($plugin['tested']) && version_compare(substr($wp_version, 0, strlen($plugin['tested'])), $plugin['tested'], '>')) {
+						echo '<span class="compatibility-untested">'.__('Untested with your version of WordPress').'</span>';
+					} elseif ( ! empty($plugin['requires']) && version_compare(substr($wp_version, 0, strlen($plugin['requires'])), $plugin['requires'], '<')) {
+						echo '<span class="compatibility-incompatible">'.__('<strong>Incompatible</strong> with your version of WordPress').'</span>';
 					} else {
-						echo '<span class="compatibility-compatible">' . __( '<strong>Compatible</strong> with your version of WordPress' ) . '</span>';
+						echo '<span class="compatibility-compatible">'.__('<strong>Compatible</strong> with your version of WordPress').'</span>';
 					}
 					?>
 				</div>
@@ -589,7 +589,7 @@ 
 		}
 
 		// Close off the group divs of the last one
-		if ( ! empty( $group ) ) {
+		if ( ! empty($group)) {
 			echo '</div></div>';
 		}
 	}

src/wp-admin/includes/screen.php

Braces +29 added lines, -20 removed lines

@@ -17,8 +17,9 @@ 
  * @return array Containing the headers in the format id => UI String
  */
 function get_column_headers( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	static $column_headers = array();
 
@@ -98,11 +99,13 @@ 
 function meta_box_prefs( $screen ) {
 	global $wp_meta_boxes;
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
-	if ( empty($wp_meta_boxes[$screen->id]) )
-		return;
+	if ( empty($wp_meta_boxes[$screen->id]) ) {
+			return;
+	}
 
 	$hidden = get_hidden_meta_boxes($screen);
 
@@ -112,11 +115,13 @@ 
 				continue;
 			}
 			foreach ( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] as $box ) {
-				if ( false == $box || ! $box['title'] )
-					continue;
+				if ( false == $box || ! $box['title'] ) {
+									continue;
+				}
 				// Submit box cannot be hidden
-				if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] )
-					continue;
+				if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] ) {
+									continue;
+				}
 				$box_id = $box['id'];
 				echo '<label for="' . $box_id . '-hide">';
 				echo '<input class="hide-postbox-tog" name="' . $box_id . '-hide" type="checkbox" id="' . $box_id . '-hide" value="' . $box_id . '"' . (! in_array($box_id, $hidden) ? ' checked="checked"' : '') . ' />';
@@ -135,8 +140,9 @@ 
  * @return array Hidden Meta Boxes
  */
 function get_hidden_meta_boxes( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	$hidden = get_user_option( "metaboxhidden_{$screen->id}" );
 
@@ -146,10 +152,11 @@ 
 	if ( $use_defaults ) {
 		$hidden = array();
 		if ( 'post' == $screen->base ) {
-			if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type )
-				$hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
-			else
-				$hidden = array( 'slugdiv' );
+			if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type ) {
+							$hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
+			} else {
+							$hidden = array( 'slugdiv' );
+			}
 		}
 
 		/**
@@ -187,8 +194,9 @@ 
 function add_screen_option( $option, $args = array() ) {
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return;
+	if ( ! $current_screen ) {
+			return;
+	}
 
 	$current_screen->add_option( $option, $args );
 }
@@ -205,8 +213,9 @@ 
 function get_current_screen() {
 	global $current_screen;
 
-	if ( ! isset( $current_screen ) )
-		return null;
+	if ( ! isset( $current_screen ) ) {
+			return null;
+	}
 
 	return $current_screen;
 }

Spacing +44 added lines, -44 removed lines

@@ -16,13 +16,13 @@ 
  * @param string|WP_Screen $screen The screen you want the headers for
  * @return array Containing the headers in the format id => UI String
  */
-function get_column_headers( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+function get_column_headers($screen) {
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
 	static $column_headers = array();
 
-	if ( ! isset( $column_headers[ $screen->id ] ) ) {
+	if ( ! isset($column_headers[$screen->id])) {
 
 		/**
 		 * Filters the column headers for a list table on a specific screen.
@@ -36,10 +36,10 @@ 
 		 *
 		 * @param array $columns An array of column headers. Default empty.
 		 */
-		$column_headers[ $screen->id ] = apply_filters( "manage_{$screen->id}_columns", array() );
+		$column_headers[$screen->id] = apply_filters("manage_{$screen->id}_columns", array());
 	}
 
-	return $column_headers[ $screen->id ];
+	return $column_headers[$screen->id];
 }
 
 /**
@@ -50,16 +50,16 @@ 
  * @param string|WP_Screen $screen The screen you want the hidden columns for
  * @return array
  */
-function get_hidden_columns( $screen ) {
-	if ( is_string( $screen ) ) {
-		$screen = convert_to_screen( $screen );
+function get_hidden_columns($screen) {
+	if (is_string($screen)) {
+		$screen = convert_to_screen($screen);
 	}
 
-	$hidden = get_user_option( 'manage' . $screen->id . 'columnshidden' );
+	$hidden = get_user_option('manage'.$screen->id.'columnshidden');
 
-	$use_defaults = ! is_array( $hidden );
+	$use_defaults = ! is_array($hidden);
 
-	if ( $use_defaults ) {
+	if ($use_defaults) {
 		$hidden = array();
 
 		/**
@@ -70,7 +70,7 @@ 
 		 * @param array     $hidden An array of columns hidden by default.
 		 * @param WP_Screen $screen WP_Screen object of the current screen.
 		 */
-		$hidden = apply_filters( 'default_hidden_columns', $hidden, $screen );
+		$hidden = apply_filters('default_hidden_columns', $hidden, $screen);
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 * @param WP_Screen $screen WP_Screen object of the current screen.
 	 * @param bool      $use_defaults Whether to show the default columns.
 	 */
-	return apply_filters( 'hidden_columns', $hidden, $screen, $use_defaults );
+	return apply_filters('hidden_columns', $hidden, $screen, $use_defaults);
 }
 
 /**
@@ -95,39 +95,39 @@ 
  *
  * @param WP_Screen $screen
  */
-function meta_box_prefs( $screen ) {
+function meta_box_prefs($screen) {
 	global $wp_meta_boxes;
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
-	if ( empty($wp_meta_boxes[$screen->id]) )
+	if (empty($wp_meta_boxes[$screen->id]))
 		return;
 
 	$hidden = get_hidden_meta_boxes($screen);
 
-	foreach ( array_keys( $wp_meta_boxes[ $screen->id ] ) as $context ) {
-		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
-			if ( ! isset( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] ) ) {
+	foreach (array_keys($wp_meta_boxes[$screen->id]) as $context) {
+		foreach (array('high', 'core', 'default', 'low') as $priority) {
+			if ( ! isset($wp_meta_boxes[$screen->id][$context][$priority])) {
 				continue;
 			}
-			foreach ( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] as $box ) {
-				if ( false == $box || ! $box['title'] )
+			foreach ($wp_meta_boxes[$screen->id][$context][$priority] as $box) {
+				if (false == $box || ! $box['title'])
 					continue;
 				// Submit box cannot be hidden
-				if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] )
+				if ('submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'])
 					continue;
 
 				$widget_title = $box['title'];
 
-				if ( is_array( $box['args'] ) && isset( $box['args']['__widget_basename'] ) ) {
+				if (is_array($box['args']) && isset($box['args']['__widget_basename'])) {
 					$widget_title = $box['args']['__widget_basename'];
 				}
 
 				printf(
 					'<label for="%1$s-hide"><input class="hide-postbox-tog" name="%1$s-hide" type="checkbox" id="%1$s-hide" value="%1$s" %2$s />%3$s</label>',
-					esc_attr( $box['id'] ),
-					checked( in_array( $box['id'], $hidden ), false, false ),
+					esc_attr($box['id']),
+					checked(in_array($box['id'], $hidden), false, false),
 					$widget_title
 				);
 			}
@@ -143,22 +143,22 @@ 
  * @param string|WP_Screen $screen Screen identifier
  * @return array Hidden Meta Boxes
  */
-function get_hidden_meta_boxes( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+function get_hidden_meta_boxes($screen) {
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
-	$hidden = get_user_option( "metaboxhidden_{$screen->id}" );
+	$hidden = get_user_option("metaboxhidden_{$screen->id}");
 
-	$use_defaults = ! is_array( $hidden );
+	$use_defaults = ! is_array($hidden);
 
 	// Hide slug boxes by default
-	if ( $use_defaults ) {
+	if ($use_defaults) {
 		$hidden = array();
-		if ( 'post' == $screen->base ) {
-			if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type )
+		if ('post' == $screen->base) {
+			if ('post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type)
 				$hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
 			else
-				$hidden = array( 'slugdiv' );
+				$hidden = array('slugdiv');
 		}
 
 		/**
@@ -169,7 +169,7 @@ 
 		 * @param array     $hidden An array of meta boxes hidden by default.
 		 * @param WP_Screen $screen WP_Screen object of the current screen.
 		 */
-		$hidden = apply_filters( 'default_hidden_meta_boxes', $hidden, $screen );
+		$hidden = apply_filters('default_hidden_meta_boxes', $hidden, $screen);
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 	 * @param bool      $use_defaults Whether to show the default meta boxes.
 	 *                                Default true.
 	 */
-	return apply_filters( 'hidden_meta_boxes', $hidden, $screen, $use_defaults );
+	return apply_filters('hidden_meta_boxes', $hidden, $screen, $use_defaults);
 }
 
 /**
@@ -193,13 +193,13 @@ 
  * @param string $option An option name.
  * @param mixed $args Option-dependent arguments.
  */
-function add_screen_option( $option, $args = array() ) {
+function add_screen_option($option, $args = array()) {
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
+	if ( ! $current_screen)
 		return;
 
-	$current_screen->add_option( $option, $args );
+	$current_screen->add_option($option, $args);
 }
 
 /**
@@ -214,7 +214,7 @@ 
 function get_current_screen() {
 	global $current_screen;
 
-	if ( ! isset( $current_screen ) )
+	if ( ! isset($current_screen))
 		return null;
 
 	return $current_screen;
@@ -228,6 +228,6 @@ 
  * @param mixed $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen,
  *	                       or an existing screen object.
  */
-function set_current_screen( $hook_name = '' ) {
-	WP_Screen::get( $hook_name )->set_current_screen();
+function set_current_screen($hook_name = '') {
+	WP_Screen::get($hook_name)->set_current_screen();
 }

src/wp-admin/includes/noop.php

Spacing +7 added lines, -7 removed lines

@@ -58,7 +58,7 @@ 
 /**
  * @ignore
  */
-function is_admin() {return true;}
+function is_admin() {return true; }
 
 /**
  * @ignore
@@ -85,22 +85,22 @@ 
  */
 function wp_guess_url() {}
 
-if ( ! function_exists( 'json_encode' ) ) :
+if ( ! function_exists('json_encode')) :
 /**
  * @ignore
  */
 function json_encode() {}
 endif;
 
-function get_file( $path ) {
+function get_file($path) {
 
-	if ( function_exists('realpath') ) {
-		$path = realpath( $path );
+	if (function_exists('realpath')) {
+		$path = realpath($path);
 	}
 
-	if ( ! $path || ! @is_file( $path ) ) {
+	if ( ! $path || ! @is_file($path)) {
 		return '';
 	}
 
-	return @file_get_contents( $path );
+	return @file_get_contents($path);
 }
\ No newline at end of file