ntwb / wordpress

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' : '-');

Indentation +1 added lines, -1 removed lines

@@ -384,7 +384,7 @@
 	 *
 	 * Converts '-rw-r--r--' to 0644
 	 * From "info at rvgate dot nl"'s comment on the PHP documentation for chmod()
- 	 *
+	 *
 	 * @link https://secure.php.net/manual/en/function.chmod.php#49614
 	 *
 	 * @access public

Doc Comments +2 added lines, -2 removed lines

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

Spacing +89 added lines, -92 removed lines

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

src/wp-admin/includes/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/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

src/wp-admin/includes/class-wp-media-list-table.php

Braces +16 added lines, -12 removed lines

@@ -150,8 +150,9 @@ 
 			$actions['delete'] = __( 'Delete Permanently' );
 		}
 
-		if ( $this->detached )
-			$actions['attach'] = __( 'Attach' );
+		if ( $this->detached ) {
+					$actions['attach'] = __( 'Attach' );
+		}
 
 		return $actions;
 	}
@@ -189,14 +190,17 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) )
-			return 'attach';
+		if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) ) {
+					return 'attach';
+		}
 
-		if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) )
-			return 'detach';
+		if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) ) {
+					return 'detach';
+		}
 
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
-			return 'delete_all';
+		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
+					return 'delete_all';
+		}
 
 		return parent::current_action();
 	}
@@ -306,8 +310,9 @@ 
 		/* translators: column name */
 		if ( !$this->detached ) {
 			$posts_columns['parent'] = _x( 'Uploaded to', 'column name' );
-			if ( post_type_supports( 'attachment', 'comments' ) )
-				$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+			if ( post_type_supports( 'attachment', 'comments' ) ) {
+							$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+			}
 		}
 		/* translators: column name */
 		$posts_columns['date'] = _x( 'Date', 'column name' );
@@ -692,8 +697,7 @@ 
 					__( 'Attach' )
 				);
 			}
-		}
-		else {
+		} else {
 			if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash ) {
 				$actions['edit'] = sprintf(
 					'<a href="%s" aria-label="%s">%s</a>',

Spacing +201 added lines, -201 removed lines

@@ -39,18 +39,18 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
-		$this->detached = ( isset( $_REQUEST['attachment-filter'] ) && 'detached' === $_REQUEST['attachment-filter'] );
+	public function __construct($args = array()) {
+		$this->detached = (isset($_REQUEST['attachment-filter']) && 'detached' === $_REQUEST['attachment-filter']);
 
 		$this->modes = array(
-			'list' => __( 'List View' ),
-			'grid' => __( 'Grid View' )
+			'list' => __('List View'),
+			'grid' => __('Grid View')
 		);
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'media',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 	}
 
 	/**
@@ -71,17 +71,17 @@ 
 	public function prepare_items() {
 		global $wp_query, $post_mime_types, $avail_post_mime_types, $mode;
 
-		list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $_REQUEST );
+		list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query($_REQUEST);
 
- 		$this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' === $_REQUEST['attachment-filter'];
+ 		$this->is_trash = isset($_REQUEST['attachment-filter']) && 'trash' === $_REQUEST['attachment-filter'];
 
- 		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+ 		$mode = empty($_REQUEST['mode']) ? 'list' : $_REQUEST['mode'];
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $wp_query->found_posts,
 			'total_pages' => $wp_query->max_num_pages,
 			'per_page' => $wp_query->query_vars['posts_per_page'],
-		) );
+		));
 	}
 
 	/**
@@ -94,40 +94,40 @@ 
 
 		$type_links = array();
 
-		$filter = empty( $_GET['attachment-filter'] ) ? '' : $_GET['attachment-filter'];
+		$filter = empty($_GET['attachment-filter']) ? '' : $_GET['attachment-filter'];
 
 		$type_links['all'] = sprintf(
 			'<option value=""%s>%s</option>',
-			selected( $filter, true, false ),
-			__( 'All media items' )
+			selected($filter, true, false),
+			__('All media items')
 		);
 
-		foreach ( $post_mime_types as $mime_type => $label ) {
-			if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
+		foreach ($post_mime_types as $mime_type => $label) {
+			if ( ! wp_match_mime_types($mime_type, $avail_post_mime_types)) {
 				continue;
 			}
 
 			$selected = selected(
-				$filter && 0 === strpos( $filter, 'post_mime_type:' ) &&
-					wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $filter ) ),
+				$filter && 0 === strpos($filter, 'post_mime_type:') &&
+					wp_match_mime_types($mime_type, str_replace('post_mime_type:', '', $filter)),
 				true,
 				false
 			);
 
 			$type_links[$mime_type] = sprintf(
 				'<option value="post_mime_type:%s"%s>%s</option>',
-				esc_attr( $mime_type ),
+				esc_attr($mime_type),
 				$selected,
 				$label[0]
 			);
 		}
-		$type_links['detached'] = '<option value="detached"' . ( $this->detached ? ' selected="selected"' : '' ) . '>' . __( 'Unattached' ) . '</option>';
+		$type_links['detached'] = '<option value="detached"'.($this->detached ? ' selected="selected"' : '').'>'.__('Unattached').'</option>';
 
-		if ( $this->is_trash || ( defined( 'MEDIA_TRASH') && MEDIA_TRASH ) ) {
+		if ($this->is_trash || (defined('MEDIA_TRASH') && MEDIA_TRASH)) {
 			$type_links['trash'] = sprintf(
 				'<option value="trash"%s>%s</option>',
-				selected( 'trash' === $filter, true, false ),
-				_x( 'Trash', 'attachment filter' )
+				selected('trash' === $filter, true, false),
+				_x('Trash', 'attachment filter')
 			);
 		}
 		return $type_links;
@@ -139,19 +139,19 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( MEDIA_TRASH ) {
-			if ( $this->is_trash ) {
-				$actions['untrash'] = __( 'Restore' );
-				$actions['delete'] = __( 'Delete Permanently' );
+		if (MEDIA_TRASH) {
+			if ($this->is_trash) {
+				$actions['untrash'] = __('Restore');
+				$actions['delete'] = __('Delete Permanently');
 			} else {
-				$actions['trash'] = _x( 'Trash', 'verb' );
+				$actions['trash'] = _x('Trash', 'verb');
 			}
 		} else {
-			$actions['delete'] = __( 'Delete Permanently' );
+			$actions['delete'] = __('Delete Permanently');
 		}
 
-		if ( $this->detached )
-			$actions['attach'] = __( 'Attach' );
+		if ($this->detached)
+			$actions['attach'] = __('Attach');
 
 		return $actions;
 	}
@@ -159,26 +159,26 @@ 
 	/**
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
-		if ( 'bar' !== $which ) {
+	protected function extra_tablenav($which) {
+		if ('bar' !== $which) {
 			return;
 		}
 ?>
 		<div class="actions">
 <?php
-		if ( ! is_singular() ) {
-			if ( ! $this->is_trash ) {
-				$this->months_dropdown( 'attachment' );
+		if ( ! is_singular()) {
+			if ( ! $this->is_trash) {
+				$this->months_dropdown('attachment');
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
-			do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
+			do_action('restrict_manage_posts', $this->screen->post_type, $which);
 
-			submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+			submit_button(__('Filter'), '', 'filter_action', false, array('id' => 'post-query-submit'));
 		}
 
-		if ( $this->is_trash && current_user_can( 'edit_others_posts' ) && $this->has_items() ) {
-			submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+		if ($this->is_trash && current_user_can('edit_others_posts') && $this->has_items()) {
+			submit_button(__('Empty Trash'), 'apply', 'delete_all', false);
 		} ?>
 		</div>
 <?php
@@ -189,13 +189,13 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) )
+		if (isset($_REQUEST['found_post_id']) && isset($_REQUEST['media']))
 			return 'attach';
 
-		if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) )
+		if (isset($_REQUEST['parent_post_id']) && isset($_REQUEST['media']))
 			return 'detach';
 
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
+		if (isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2']))
 			return 'delete_all';
 
 		return parent::current_action();
@@ -213,7 +213,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No media files found.' );
+		_e('No media files found.');
 	}
 
 	/**
@@ -226,17 +226,17 @@ 
 
 		$views = $this->get_views();
 
-		$this->screen->render_screen_reader_content( 'heading_views' );
+		$this->screen->render_screen_reader_content('heading_views');
 ?>
 <div class="wp-filter">
 	<div class="filter-items">
-		<?php $this->view_switcher( $mode ); ?>
+		<?php $this->view_switcher($mode); ?>
 
-		<label for="attachment-filter" class="screen-reader-text"><?php _e( 'Filter by type' ); ?></label>
+		<label for="attachment-filter" class="screen-reader-text"><?php _e('Filter by type'); ?></label>
 		<select class="attachment-filters" name="attachment-filter" id="attachment-filter">
 			<?php
-			if ( ! empty( $views ) ) {
-				foreach ( $views as $class => $view ) {
+			if ( ! empty($views)) {
+				foreach ($views as $class => $view) {
 					echo "\t$view\n";
 				}
 			}
@@ -244,15 +244,15 @@ 
 		</select>
 
 <?php
-		$this->extra_tablenav( 'bar' );
+		$this->extra_tablenav('bar');
 
 		/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
-		$views = apply_filters( "views_{$this->screen->id}", array() );
+		$views = apply_filters("views_{$this->screen->id}", array());
 
 		// Back compat for pre-4.0 view links.
-		if ( ! empty( $views ) ) {
+		if ( ! empty($views)) {
 			echo '<ul class="filter-links">';
-			foreach ( $views as $class => $view ) {
+			foreach ($views as $class => $view) {
 				echo "<li class='$class'>$view</li>";
 			}
 			echo '</ul>';
@@ -261,8 +261,8 @@ 
 	</div>
 
 	<div class="search-form">
-		<label for="media-search-input" class="screen-reader-text"><?php esc_html_e( 'Search Media' ); ?></label>
-		<input type="search" placeholder="<?php esc_attr_e( 'Search media items...' ) ?>" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>"></div>
+		<label for="media-search-input" class="screen-reader-text"><?php esc_html_e('Search Media'); ?></label>
+		<input type="search" placeholder="<?php esc_attr_e('Search media items...') ?>" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>"></div>
 	</div>
 	<?php
 	}
@@ -275,11 +275,11 @@ 
 		$posts_columns = array();
 		$posts_columns['cb'] = '<input type="checkbox" />';
 		/* translators: column name */
-		$posts_columns['title'] = _x( 'File', 'column name' );
-		$posts_columns['author'] = __( 'Author' );
+		$posts_columns['title'] = _x('File', 'column name');
+		$posts_columns['author'] = __('Author');
 
-		$taxonomies = get_taxonomies_for_attachments( 'objects' );
-		$taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
+		$taxonomies = get_taxonomies_for_attachments('objects');
+		$taxonomies = wp_filter_object_list($taxonomies, array('show_admin_column' => true), 'and', 'name');
 
 		/**
 		 * Filters the taxonomy columns for attachments in the Media list table.
@@ -289,28 +289,28 @@ 
 		 * @param array  $taxonomies An array of registered taxonomies to show for attachments.
 		 * @param string $post_type  The post type. Default 'attachment'.
 		 */
-		$taxonomies = apply_filters( 'manage_taxonomies_for_attachment_columns', $taxonomies, 'attachment' );
-		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
+		$taxonomies = apply_filters('manage_taxonomies_for_attachment_columns', $taxonomies, 'attachment');
+		$taxonomies = array_filter($taxonomies, 'taxonomy_exists');
 
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' === $taxonomy ) {
+		foreach ($taxonomies as $taxonomy) {
+			if ('category' === $taxonomy) {
 				$column_key = 'categories';
-			} elseif ( 'post_tag' === $taxonomy ) {
+			} elseif ('post_tag' === $taxonomy) {
 				$column_key = 'tags';
 			} else {
-				$column_key = 'taxonomy-' . $taxonomy;
+				$column_key = 'taxonomy-'.$taxonomy;
 			}
-			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
+			$posts_columns[$column_key] = get_taxonomy($taxonomy)->labels->name;
 		}
 
 		/* translators: column name */
-		if ( !$this->detached ) {
-			$posts_columns['parent'] = _x( 'Uploaded to', 'column name' );
-			if ( post_type_supports( 'attachment', 'comments' ) )
-				$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		if ( ! $this->detached) {
+			$posts_columns['parent'] = _x('Uploaded to', 'column name');
+			if (post_type_supports('attachment', 'comments'))
+				$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="'.esc_attr__('Comments').'"><span class="screen-reader-text">'.__('Comments').'</span></span>';
 		}
 		/* translators: column name */
-		$posts_columns['date'] = _x( 'Date', 'column name' );
+		$posts_columns['date'] = _x('Date', 'column name');
 		/**
 		 * Filters the Media list table columns.
 		 *
@@ -320,7 +320,7 @@ 
 		 * @param bool  $detached      Whether the list table contains media not attached
 		 *                             to any posts. Default true.
 		 */
-		return apply_filters( 'manage_media_columns', $posts_columns, $this->detached );
+		return apply_filters('manage_media_columns', $posts_columns, $this->detached);
 	}
 
 	/**
@@ -333,7 +333,7 @@ 
 			'author'   => 'author',
 			'parent'   => 'parent',
 			'comments' => 'comment_count',
-			'date'     => array( 'date', true ),
+			'date'     => array('date', true),
 		);
 	}
 
@@ -345,10 +345,10 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_cb( $post ) {
-		if ( current_user_can( 'edit_post', $post->ID ) ) { ?>
+	public function column_cb($post) {
+		if (current_user_can('edit_post', $post->ID)) { ?>
 			<label class="screen-reader-text" for="cb-select-<?php echo $post->ID; ?>"><?php
-				echo sprintf( __( 'Select %s' ), _draft_or_post_title() );
+				echo sprintf(__('Select %s'), _draft_or_post_title());
 			?></label>
 			<input type="checkbox" name="media[]" id="cb-select-<?php echo $post->ID; ?>" value="<?php echo $post->ID; ?>" />
 		<?php }
@@ -362,19 +362,19 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_title( $post ) {
-		list( $mime ) = explode( '/', $post->post_mime_type );
+	public function column_title($post) {
+		list($mime) = explode('/', $post->post_mime_type);
 
 		$title = _draft_or_post_title();
-		$thumb = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) );
+		$thumb = wp_get_attachment_image($post->ID, array(60, 60), true, array('alt' => ''));
 		$link_start = $link_end = '';
 
-		if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
+		if (current_user_can('edit_post', $post->ID) && ! $this->is_trash) {
 			$link_start = sprintf(
 				'<a href="%s" aria-label="%s">',
-				get_edit_post_link( $post->ID ),
+				get_edit_post_link($post->ID),
 				/* translators: %s: attachment title */
-				esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $title ) )
+				esc_attr(sprintf(__('&#8220;%s&#8221; (Edit)'), $title))
 			);
 			$link_end = '</a>';
 		}
@@ -384,18 +384,18 @@ 
 		<strong<?php echo $class; ?>>
 			<?php
 			echo $link_start;
-			if ( $thumb ) : ?>
-				<span class="media-icon <?php echo sanitize_html_class( $mime . '-icon' ); ?>"><?php echo $thumb; ?></span>
+			if ($thumb) : ?>
+				<span class="media-icon <?php echo sanitize_html_class($mime.'-icon'); ?>"><?php echo $thumb; ?></span>
 			<?php endif;
-			echo $title . $link_end;
-			_media_states( $post );
+			echo $title.$link_end;
+			_media_states($post);
 			?>
 		</strong>
 		<p class="filename">
-			<span class="screen-reader-text"><?php _e( 'File name:' ); ?> </span>
+			<span class="screen-reader-text"><?php _e('File name:'); ?> </span>
 			<?php
-			$file = get_attached_file( $post->ID );
-			echo esc_html( wp_basename( $file ) );
+			$file = get_attached_file($post->ID);
+			echo esc_html(wp_basename($file));
 			?>
 		</p>
 		<?php
@@ -409,9 +409,9 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_author( $post ) {
-		printf( '<a href="%s">%s</a>',
-			esc_url( add_query_arg( array( 'author' => get_the_author_meta('ID') ), 'upload.php' ) ),
+	public function column_author($post) {
+		printf('<a href="%s">%s</a>',
+			esc_url(add_query_arg(array('author' => get_the_author_meta('ID')), 'upload.php')),
 			get_the_author()
 		);
 	}
@@ -424,7 +424,7 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_desc( $post ) {
+	public function column_desc($post) {
 		echo has_excerpt() ? $post->post_excerpt : '';
 	}
 
@@ -436,20 +436,20 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_date( $post ) {
-		if ( '0000-00-00 00:00:00' === $post->post_date ) {
-			$h_time = __( 'Unpublished' );
+	public function column_date($post) {
+		if ('0000-00-00 00:00:00' === $post->post_date) {
+			$h_time = __('Unpublished');
 		} else {
 			$m_time = $post->post_date;
-			$time = get_post_time( 'G', true, $post, false );
-			if ( ( abs( $t_diff = time() - $time ) ) < DAY_IN_SECONDS ) {
-				if ( $t_diff < 0 ) {
-					$h_time = sprintf( __( '%s from now' ), human_time_diff( $time ) );
+			$time = get_post_time('G', true, $post, false);
+			if ((abs($t_diff = time() - $time)) < DAY_IN_SECONDS) {
+				if ($t_diff < 0) {
+					$h_time = sprintf(__('%s from now'), human_time_diff($time));
 				} else {
-					$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+					$h_time = sprintf(__('%s ago'), human_time_diff($time));
 				}
 			} else {
-				$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
+				$h_time = mysql2date(__('Y/m/d'), $m_time);
 			}
 		}
 
@@ -464,54 +464,54 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_parent( $post ) {
-		$user_can_edit = current_user_can( 'edit_post', $post->ID );
+	public function column_parent($post) {
+		$user_can_edit = current_user_can('edit_post', $post->ID);
 
-		if ( $post->post_parent > 0 ) {
-			$parent = get_post( $post->post_parent );
+		if ($post->post_parent > 0) {
+			$parent = get_post($post->post_parent);
 		} else {
 			$parent = false;
 		}
 
-		if ( $parent ) {
-			$title = _draft_or_post_title( $post->post_parent );
-			$parent_type = get_post_type_object( $parent->post_type );
+		if ($parent) {
+			$title = _draft_or_post_title($post->post_parent);
+			$parent_type = get_post_type_object($parent->post_type);
 
-			if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $post->post_parent ) ) {
+			if ($parent_type && $parent_type->show_ui && current_user_can('edit_post', $post->post_parent)) {
 ?>
-				<strong><a href="<?php echo get_edit_post_link( $post->post_parent ); ?>">
+				<strong><a href="<?php echo get_edit_post_link($post->post_parent); ?>">
 					<?php echo $title ?></a></strong><?php
-			} elseif ( $parent_type && current_user_can( 'read_post', $post->post_parent ) ) {
+			} elseif ($parent_type && current_user_can('read_post', $post->post_parent)) {
 ?>
 				<strong><?php echo $title ?></strong><?php
 			} else {
-				_e( '(Private post)' );
+				_e('(Private post)');
 			}
 
-			if ( $user_can_edit ):
-				$detach_url = add_query_arg( array(
+			if ($user_can_edit):
+				$detach_url = add_query_arg(array(
 					'parent_post_id' => $post->post_parent,
 					'media[]' => $post->ID,
-					'_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] )
-				), 'upload.php' );
+					'_wpnonce' => wp_create_nonce('bulk-'.$this->_args['plural'])
+				), 'upload.php');
 				printf(
 					'<br /><a href="%s" class="hide-if-no-js detach-from-parent" aria-label="%s">%s</a>',
 					$detach_url,
 					/* translators: %s: title of the post the attachment is attached to */
-					esc_attr( sprintf( __( 'Detach from &#8220;%s&#8221;' ), $title ) ),
-					__( 'Detach' )
+					esc_attr(sprintf(__('Detach from &#8220;%s&#8221;'), $title)),
+					__('Detach')
 				);
 			endif;
 		} else {
-			_e( '(Unattached)' ); ?>
-			<?php if ( $user_can_edit ) {
-				$title = _draft_or_post_title( $post->post_parent );
+			_e('(Unattached)'); ?>
+			<?php if ($user_can_edit) {
+				$title = _draft_or_post_title($post->post_parent);
 				printf(
 					'<br /><a href="#the-list" onclick="findPosts.open( \'media[]\', \'%s\' ); return false;" class="hide-if-no-js aria-button-if-js" aria-label="%s">%s</a>',
 					$post->ID,
 					/* translators: %s: attachment title */
-					esc_attr( sprintf( __( 'Attach &#8220;%s&#8221; to existing content' ), $title ) ),
-					__( 'Attach' )
+					esc_attr(sprintf(__('Attach &#8220;%s&#8221; to existing content'), $title)),
+					__('Attach')
 				);
 			}
 		}
@@ -525,16 +525,16 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_comments( $post ) {
+	public function column_comments($post) {
 		echo '<div class="post-com-count-wrapper">';
 
-		if ( isset( $this->comment_pending_count[ $post->ID ] ) ) {
-			$pending_comments = $this->comment_pending_count[ $post->ID ];
+		if (isset($this->comment_pending_count[$post->ID])) {
+			$pending_comments = $this->comment_pending_count[$post->ID];
 		} else {
-			$pending_comments = get_pending_comments_num( $post->ID );
+			$pending_comments = get_pending_comments_num($post->ID);
 		}
 
-		$this->comments_bubble( $post->ID, $pending_comments );
+		$this->comments_bubble($post->ID, $pending_comments);
 
 		echo '</div>';
 	}
@@ -548,35 +548,35 @@ 
 	 * @param WP_Post $post        The current WP_Post object.
 	 * @param string  $column_name Current column name.
 	 */
-	public function column_default( $post, $column_name ) {
-		if ( 'categories' === $column_name ) {
+	public function column_default($post, $column_name) {
+		if ('categories' === $column_name) {
 			$taxonomy = 'category';
-		} elseif ( 'tags' === $column_name ) {
+		} elseif ('tags' === $column_name) {
 			$taxonomy = 'post_tag';
-		} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
-			$taxonomy = substr( $column_name, 9 );
+		} elseif (0 === strpos($column_name, 'taxonomy-')) {
+			$taxonomy = substr($column_name, 9);
 		} else {
 			$taxonomy = false;
 		}
 
-		if ( $taxonomy ) {
-			$terms = get_the_terms( $post->ID, $taxonomy );
-			if ( is_array( $terms ) ) {
+		if ($taxonomy) {
+			$terms = get_the_terms($post->ID, $taxonomy);
+			if (is_array($terms)) {
 				$out = array();
-				foreach ( $terms as $t ) {
+				foreach ($terms as $t) {
 					$posts_in_term_qv = array();
 					$posts_in_term_qv['taxonomy'] = $taxonomy;
 					$posts_in_term_qv['term'] = $t->slug;
 
-					$out[] = sprintf( '<a href="%s">%s</a>',
-						esc_url( add_query_arg( $posts_in_term_qv, 'upload.php' ) ),
-						esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) )
+					$out[] = sprintf('<a href="%s">%s</a>',
+						esc_url(add_query_arg($posts_in_term_qv, 'upload.php')),
+						esc_html(sanitize_term_field('name', $t->name, $t->term_id, $taxonomy, 'display'))
 					);
 				}
 				/* translators: used between list items, there is a space after the comma */
-				echo join( __( ', ' ), $out );
+				echo join(__(', '), $out);
 			} else {
-				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . get_taxonomy( $taxonomy )->labels->no_terms . '</span>';
+				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">'.get_taxonomy($taxonomy)->labels->no_terms.'</span>';
 			}
 
 			return;
@@ -592,7 +592,7 @@ 
 		 * @param string $column_name Name of the custom column.
 		 * @param int    $post_id     Attachment ID.
 		 */
-		do_action( 'manage_media_custom_column', $column_name, $post->ID );
+		do_action('manage_media_custom_column', $column_name, $post->ID);
 	}
 
 	/**
@@ -602,24 +602,24 @@ 
 	public function display_rows() {
 		global $post, $wp_query;
 
-		$post_ids = wp_list_pluck( $wp_query->posts, 'ID' );
-		reset( $wp_query->posts );
+		$post_ids = wp_list_pluck($wp_query->posts, 'ID');
+		reset($wp_query->posts);
 
-		$this->comment_pending_count = get_pending_comments_num( $post_ids );
+		$this->comment_pending_count = get_pending_comments_num($post_ids);
 
-		add_filter( 'the_title','esc_html' );
+		add_filter('the_title', 'esc_html');
 
-		while ( have_posts() ) : the_post();
+		while (have_posts()) : the_post();
 			if (
-				( $this->is_trash && $post->post_status != 'trash' )
-				|| ( ! $this->is_trash && $post->post_status === 'trash' )
+				($this->is_trash && $post->post_status != 'trash')
+				|| ( ! $this->is_trash && $post->post_status === 'trash')
 			) {
 				continue;
 			}
-			$post_owner = ( get_current_user_id() == $post->post_author ) ? 'self' : 'other';
+			$post_owner = (get_current_user_id() == $post->post_author) ? 'self' : 'other';
 		?>
-			<tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim( ' author-' . $post_owner . ' status-' . $post->post_status ); ?>">
-				<?php $this->single_row_columns( $post ); ?>
+			<tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim(' author-'.$post_owner.' status-'.$post->post_status); ?>">
+				<?php $this->single_row_columns($post); ?>
 			</tr>
 		<?php
 		endwhile;
@@ -643,105 +643,105 @@ 
 	 *
 	 * @return array
 	 */
-	private function _get_row_actions( $post, $att_title ) {
+	private function _get_row_actions($post, $att_title) {
 		$actions = array();
 
-		if ( $this->detached ) {
-			if ( current_user_can( 'edit_post', $post->ID ) ) {
+		if ($this->detached) {
+			if (current_user_can('edit_post', $post->ID)) {
 				$actions['edit'] = sprintf(
 					'<a href="%s" aria-label="%s">%s</a>',
-					get_edit_post_link( $post->ID ),
+					get_edit_post_link($post->ID),
 					/* translators: %s: attachment title */
-					esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ),
-					__( 'Edit' )
+					esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)),
+					__('Edit')
 				);
 			}
-			if ( current_user_can( 'delete_post', $post->ID ) ) {
-				if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+			if (current_user_can('delete_post', $post->ID)) {
+				if (EMPTY_TRASH_DAYS && MEDIA_TRASH) {
 					$actions['trash'] = sprintf(
 						'<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_'.$post->ID),
 						/* translators: %s: attachment title */
-						esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash' ), $att_title ) ),
-						_x( 'Trash', 'verb' )
+						esc_attr(sprintf(__('Move &#8220;%s&#8221; to the Trash'), $att_title)),
+						_x('Trash', 'verb')
 					);
 				} else {
 					$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
 					$actions['delete'] = sprintf(
 						'<a href="%s" class="submitdelete aria-button-if-js"%s aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_'.$post->ID),
 						$delete_ays,
 						/* translators: %s: attachment title */
-						esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $att_title ) ),
-						__( 'Delete Permanently' )
+						esc_attr(sprintf(__('Delete &#8220;%s&#8221; permanently'), $att_title)),
+						__('Delete Permanently')
 					);
 				}
 			}
 			$actions['view'] = sprintf(
 				'<a href="%s" aria-label="%s" rel="bookmark">%s</a>',
-				get_permalink( $post->ID ),
+				get_permalink($post->ID),
 				/* translators: %s: attachment title */
-				esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ),
-				__( 'View' )
+				esc_attr(sprintf(__('View &#8220;%s&#8221;'), $att_title)),
+				__('View')
 			);
 
-			if ( current_user_can( 'edit_post', $post->ID ) ) {
+			if (current_user_can('edit_post', $post->ID)) {
 				$actions['attach'] = sprintf(
 					'<a href="#the-list" onclick="findPosts.open( \'media[]\', \'%s\' ); return false;" class="hide-if-no-js aria-button-if-js" aria-label="%s">%s</a>',
 					$post->ID,
 					/* translators: %s: attachment title */
-					esc_attr( sprintf( __( 'Attach &#8220;%s&#8221; to existing content' ), $att_title ) ),
-					__( 'Attach' )
+					esc_attr(sprintf(__('Attach &#8220;%s&#8221; to existing content'), $att_title)),
+					__('Attach')
 				);
 			}
 		}
 		else {
-			if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash ) {
+			if (current_user_can('edit_post', $post->ID) && ! $this->is_trash) {
 				$actions['edit'] = sprintf(
 					'<a href="%s" aria-label="%s">%s</a>',
-					get_edit_post_link( $post->ID ),
+					get_edit_post_link($post->ID),
 					/* translators: %s: attachment title */
-					esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ),
-					__( 'Edit' )
+					esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)),
+					__('Edit')
 				);
 			}
-			if ( current_user_can( 'delete_post', $post->ID ) ) {
-				if ( $this->is_trash ) {
+			if (current_user_can('delete_post', $post->ID)) {
+				if ($this->is_trash) {
 					$actions['untrash'] = sprintf(
 						'<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=untrash&amp;post=$post->ID", 'untrash-post_'.$post->ID),
 						/* translators: %s: attachment title */
-						esc_attr( sprintf( __( 'Restore &#8220;%s&#8221; from the Trash' ), $att_title ) ),
-						__( 'Restore' )
+						esc_attr(sprintf(__('Restore &#8220;%s&#8221; from the Trash'), $att_title)),
+						__('Restore')
 					);
-				} elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+				} elseif (EMPTY_TRASH_DAYS && MEDIA_TRASH) {
 					$actions['trash'] = sprintf(
 						'<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_'.$post->ID),
 						/* translators: %s: attachment title */
-						esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash' ), $att_title ) ),
-						_x( 'Trash', 'verb' )
+						esc_attr(sprintf(__('Move &#8220;%s&#8221; to the Trash'), $att_title)),
+						_x('Trash', 'verb')
 					);
 				}
-				if ( $this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) {
-					$delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
+				if ($this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH) {
+					$delete_ays = ( ! $this->is_trash && ! MEDIA_TRASH) ? " onclick='return showNotice.warn();'" : '';
 					$actions['delete'] = sprintf(
 						'<a href="%s" class="submitdelete aria-button-if-js"%s aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_'.$post->ID),
 						$delete_ays,
 						/* translators: %s: attachment title */
-						esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $att_title ) ),
-						__( 'Delete Permanently' )
+						esc_attr(sprintf(__('Delete &#8220;%s&#8221; permanently'), $att_title)),
+						__('Delete Permanently')
 					);
 				}
 			}
-			if ( ! $this->is_trash ) {
+			if ( ! $this->is_trash) {
 				$actions['view'] = sprintf(
 					'<a href="%s" aria-label="%s" rel="bookmark">%s</a>',
-					get_permalink( $post->ID ),
+					get_permalink($post->ID),
 					/* translators: %s: attachment title */
-					esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ),
-					__( 'View' )
+					esc_attr(sprintf(__('View &#8220;%s&#8221;'), $att_title)),
+					__('View')
 				);
 			}
 		}
@@ -757,7 +757,7 @@ 
 		 * @param bool    $detached Whether the list table contains media not attached
 		 *                          to any posts. Default true.
 		 */
-		return apply_filters( 'media_row_actions', $actions, $post, $this->detached );
+		return apply_filters('media_row_actions', $actions, $post, $this->detached);
 	}
 
 	/**
@@ -771,12 +771,12 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for media attachments.
 	 */
-	protected function handle_row_actions( $post, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($post, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
 		$att_title = _draft_or_post_title();
-		return $this->row_actions( $this->_get_row_actions( $post, $att_title ) );
+		return $this->row_actions($this->_get_row_actions($post, $att_title));
 	}
 }

src/wp-admin/includes/class-wp-post-comments-list-table.php

Spacing +8 added lines, -8 removed lines

@@ -24,8 +24,8 @@ 
 	protected function get_column_info() {
 		return array(
 			array(
-				'author'   => __( 'Author' ),
-				'comment'  => _x( 'Comment', 'column name' ),
+				'author'   => __('Author'),
+				'comment'  => _x('Comment', 'column name'),
 			),
 			array(),
 			array(),
@@ -48,17 +48,17 @@ 
 	 *
 	 * @param bool $output_empty
 	 */
-	public function display( $output_empty = false ) {
+	public function display($output_empty = false) {
 		$singular = $this->_args['singular'];
 
-		wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+		wp_nonce_field("fetch-list-".get_class($this), '_ajax_fetch_list_nonce');
 ?>
-<table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" style="display:none;">
+<table class="<?php echo implode(' ', $this->get_table_classes()); ?>" style="display:none;">
 	<tbody id="the-comment-list"<?php
-		if ( $singular ) {
+		if ($singular) {
 			echo " data-wp-lists='list:$singular'";
 		} ?>>
-		<?php if ( ! $output_empty ) {
+		<?php if ( ! $output_empty) {
 			$this->display_rows_or_placeholder();
 		} ?>
 	</tbody>
@@ -71,7 +71,7 @@ 
 	 * @param bool $comment_status
 	 * @return int
 	 */
-	public function get_per_page( $comment_status = false ) {
+	public function get_per_page($comment_status = false) {
 		return 10;
 	}
 }

src/wp-admin/includes/class-wp-plugins-list-table.php

Braces +71 added lines, -48 removed lines

@@ -39,11 +39,13 @@ 
 		) );
 
 		$status = 'all';
-		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) )
-			$status = $_REQUEST['plugin_status'];
+		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) ) {
+					$status = $_REQUEST['plugin_status'];
+		}
 
-		if ( isset($_REQUEST['s']) )
-			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		if ( isset($_REQUEST['s']) ) {
+					$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		}
 
 		$page = $this->get_pagenum();
 	}
@@ -123,8 +125,9 @@ 
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
-				$plugins['dropins'] = get_dropins();
+			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) ) {
+							$plugins['dropins'] = get_dropins();
+			}
 
 			if ( current_user_can( 'update_plugins' ) ) {
 				$current = get_site_transient( 'update_plugins' );
@@ -232,11 +235,13 @@ 
 		}
 
 		$totals = array();
-		foreach ( $plugins as $type => $list )
-			$totals[ $type ] = count( $list );
+		foreach ( $plugins as $type => $list ) {
+					$totals[ $type ] = count( $list );
+		}
 
-		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
-			$status = 'all';
+		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) ) {
+					$status = 'all';
+		}
 
 		$this->items = array();
 		foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {
@@ -260,8 +265,9 @@ 
 
 		$start = ( $page - 1 ) * $plugins_per_page;
 
-		if ( $total_this_page > $plugins_per_page )
-			$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		if ( $total_this_page > $plugins_per_page ) {
+					$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		}
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_this_page,
@@ -300,8 +306,9 @@ 
 		$a = $plugin_a[$orderby];
 		$b = $plugin_b[$orderby];
 
-		if ( $a == $b )
-			return 0;
+		if ( $a == $b ) {
+					return 0;
+		}
 
 		if ( 'DESC' === $order ) {
 			return strcasecmp( $b, $a );
@@ -326,10 +333,11 @@ 
 			if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
 				echo ' <a href="' . esc_url( admin_url( 'plugin-install.php?tab=search&s=' . urlencode( $s ) ) ) . '">' . __( 'Search for plugins in the WordPress Plugin Directory.' ) . '</a>';
 			}
-		} elseif ( ! empty( $plugins['all'] ) )
-			_e( 'No plugins found.' );
-		else
-			_e( 'You do not appear to have any plugins available at this time.' );
+		} elseif ( ! empty( $plugins['all'] ) ) {
+					_e( 'No plugins found.' );
+		} else {
+					_e( 'You do not appear to have any plugins available at this time.' );
+		}
 	}
 
 	/**
@@ -365,8 +373,9 @@ 
 
 		$status_links = array();
 		foreach ( $totals as $type => $count ) {
-			if ( !$count )
-				continue;
+			if ( !$count ) {
+							continue;
+			}
 
 			switch ( $type ) {
 				case 'all':
@@ -414,17 +423,21 @@ 
 
 		$actions = array();
 
-		if ( 'active' != $status )
-			$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		if ( 'active' != $status ) {
+					$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		}
 
-		if ( 'inactive' != $status && 'recent' != $status )
-			$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		if ( 'inactive' != $status && 'recent' != $status ) {
+					$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		}
 
 		if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) {
-			if ( current_user_can( 'update_plugins' ) )
-				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
-				$actions['delete-selected'] = __( 'Delete' );
+			if ( current_user_can( 'update_plugins' ) ) {
+							$actions['update-selected'] = __( 'Update' );
+			}
+			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) ) {
+							$actions['delete-selected'] = __( 'Delete' );
+			}
 		}
 
 		return $actions;
@@ -437,8 +450,9 @@ 
 	public function bulk_actions( $which = '' ) {
 		global $status;
 
-		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
-			return;
+		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+					return;
+		}
 
 		parent::bulk_actions( $which );
 	}
@@ -450,8 +464,9 @@ 
 	protected function extra_tablenav( $which ) {
 		global $status;
 
-		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) )
-			return;
+		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) ) {
+					return;
+		}
 
 		echo '<div class="alignleft actions">';
 
@@ -475,8 +490,9 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset($_POST['clear-recent-list']) )
-			return 'clear-recent-list';
+		if ( isset($_POST['clear-recent-list']) ) {
+					return 'clear-recent-list';
+		}
 
 		return parent::current_action();
 	}
@@ -488,11 +504,13 @@ 
 	public function display_rows() {
 		global $status;
 
-		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
-			return;
+		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+					return;
+		}
 
-		foreach ( $this->items as $plugin_file => $plugin_data )
-			$this->single_row( array( $plugin_file, $plugin_data ) );
+		foreach ( $this->items as $plugin_file => $plugin_data ) {
+					$this->single_row( array( $plugin_file, $plugin_data ) );
+		}
 	}
 
 	/**
@@ -528,8 +546,9 @@ 
 		} elseif ( 'dropins' === $context ) {
 			$dropins = _get_dropins();
 			$plugin_name = $plugin_file;
-			if ( $plugin_file != $plugin_data['Name'] )
-				$plugin_name .= '<br/>' . $plugin_data['Name'];
+			if ( $plugin_file != $plugin_data['Name'] ) {
+							$plugin_name .= '<br/>' . $plugin_data['Name'];
+			}
 			if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
 				$is_active = true;
 				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
@@ -545,8 +564,9 @@ 
 						'<code>wp-config.php</code>'
 					) . '</p>';
 			}
-			if ( $plugin_data['Description'] )
-				$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			if ( $plugin_data['Description'] ) {
+							$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			}
 		} else {
 			if ( $screen->in_admin( 'network' ) ) {
 				$is_active = is_plugin_active_for_network( $plugin_file );
@@ -696,8 +716,9 @@ 
 			$plugin_name = $plugin_data['Name'];
 		}
 
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
-			$class .= ' update';
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) ) {
+					$class .= ' update';
+		}
 
 		$plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name );
 		printf( '<tr class="%s" data-slug="%s" data-plugin="%s">',
@@ -731,12 +752,14 @@ 
 						<div class='$class second plugin-version-author-uri'>";
 
 					$plugin_meta = array();
-					if ( !empty( $plugin_data['Version'] ) )
-						$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+					if ( !empty( $plugin_data['Version'] ) ) {
+											$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+					}
 					if ( !empty( $plugin_data['Author'] ) ) {
 						$author = $plugin_data['Author'];
-						if ( !empty( $plugin_data['AuthorURI'] ) )
-							$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+						if ( !empty( $plugin_data['AuthorURI'] ) ) {
+													$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+						}
 						$plugin_meta[] = sprintf( __( 'By %s' ), $author );
 					}
 

Spacing +234 added lines, -234 removed lines

@@ -30,20 +30,20 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $status, $page;
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'plugins',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 
 		$status = 'all';
-		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) )
+		if (isset($_REQUEST['plugin_status']) && in_array($_REQUEST['plugin_status'], array('active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search')))
 			$status = $_REQUEST['plugin_status'];
 
-		if ( isset($_REQUEST['s']) )
-			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		if (isset($_REQUEST['s']))
+			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']));
 
 		$page = $this->get_pagenum();
 	}
@@ -52,7 +52,7 @@ 
 	 * @return array
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', $this->_args['plural'] );
+		return array('widefat', $this->_args['plural']);
 	}
 
 	/**
@@ -75,7 +75,7 @@ 
 	public function prepare_items() {
 		global $status, $plugins, $totals, $page, $orderby, $order, $s;
 
-		wp_reset_vars( array( 'orderby', 'order' ) );
+		wp_reset_vars(array('orderby', 'order'));
 
 		/**
 		 * Filters the full array of plugins to list in the Plugins list table.
@@ -86,7 +86,7 @@ 
 		 *
 		 * @param array $all_plugins An array of plugins to display in the list table.
 		 */
-		$all_plugins = apply_filters( 'all_plugins', get_plugins() );
+		$all_plugins = apply_filters('all_plugins', get_plugins());
 
 		$plugins = array(
 			'all'                => $all_plugins,
@@ -101,7 +101,7 @@ 
 
 		$screen = $this->screen;
 
-		if ( ! is_multisite() || ( $screen->in_admin( 'network' ) && current_user_can( 'manage_network_plugins' ) ) ) {
+		if ( ! is_multisite() || ($screen->in_admin('network') && current_user_can('manage_network_plugins'))) {
 
 			/**
 			 * Filters whether to display the advanced plugins list table.
@@ -118,27 +118,27 @@ 
 			 *                     plugin type. Default true.
 			 * @param string $type The plugin type. Accepts 'mustuse', 'dropins'.
 			 */
-			if ( apply_filters( 'show_advanced_plugins', true, 'mustuse' ) ) {
+			if (apply_filters('show_advanced_plugins', true, 'mustuse')) {
 				$plugins['mustuse'] = get_mu_plugins();
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
+			if (apply_filters('show_advanced_plugins', true, 'dropins'))
 				$plugins['dropins'] = get_dropins();
 
-			if ( current_user_can( 'update_plugins' ) ) {
-				$current = get_site_transient( 'update_plugins' );
-				foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
-					if ( isset( $current->response[ $plugin_file ] ) ) {
-						$plugins['all'][ $plugin_file ]['update'] = true;
-						$plugins['upgrade'][ $plugin_file ] = $plugins['all'][ $plugin_file ];
+			if (current_user_can('update_plugins')) {
+				$current = get_site_transient('update_plugins');
+				foreach ((array) $plugins['all'] as $plugin_file => $plugin_data) {
+					if (isset($current->response[$plugin_file])) {
+						$plugins['all'][$plugin_file]['update'] = true;
+						$plugins['upgrade'][$plugin_file] = $plugins['all'][$plugin_file];
 					}
 				}
 			}
 		}
 
-		if ( ! $screen->in_admin( 'network' ) ) {
-			$show = current_user_can( 'manage_network_plugins' );
+		if ( ! $screen->in_admin('network')) {
+			$show = current_user_can('manage_network_plugins');
 			/**
 			 * Filters whether to display network-active plugins alongside plugins active for the current site.
 			 *
@@ -152,131 +152,131 @@ 
 			 * @param bool $show Whether to show network-active plugins. Default is whether the current
 			 *                   user can manage network plugins (ie. a Super Admin).
 			 */
-			$show_network_active = apply_filters( 'show_network_active_plugins', $show );
+			$show_network_active = apply_filters('show_network_active_plugins', $show);
 		}
 
-		set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), DAY_IN_SECONDS );
+		set_transient('plugin_slugs', array_keys($plugins['all']), DAY_IN_SECONDS);
 
-		if ( $screen->in_admin( 'network' ) ) {
-			$recently_activated = get_site_option( 'recently_activated', array() );
+		if ($screen->in_admin('network')) {
+			$recently_activated = get_site_option('recently_activated', array());
 		} else {
-			$recently_activated = get_option( 'recently_activated', array() );
+			$recently_activated = get_option('recently_activated', array());
 		}
 
-		foreach ( $recently_activated as $key => $time ) {
-			if ( $time + WEEK_IN_SECONDS < time() ) {
-				unset( $recently_activated[$key] );
+		foreach ($recently_activated as $key => $time) {
+			if ($time + WEEK_IN_SECONDS < time()) {
+				unset($recently_activated[$key]);
 			}
 		}
 
-		if ( $screen->in_admin( 'network' ) ) {
-			update_site_option( 'recently_activated', $recently_activated );
+		if ($screen->in_admin('network')) {
+			update_site_option('recently_activated', $recently_activated);
 		} else {
-			update_option( 'recently_activated', $recently_activated );
+			update_option('recently_activated', $recently_activated);
 		}
 
-		$plugin_info = get_site_transient( 'update_plugins' );
+		$plugin_info = get_site_transient('update_plugins');
 
-		foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
+		foreach ((array) $plugins['all'] as $plugin_file => $plugin_data) {
 			// Extra info if known. array_merge() ensures $plugin_data has precedence if keys collide.
-			if ( isset( $plugin_info->response[ $plugin_file ] ) ) {
-				$plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
+			if (isset($plugin_info->response[$plugin_file])) {
+				$plugins['all'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->response[$plugin_file], $plugin_data);
 				// Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
-				if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
-					$plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
+				if (isset($plugins['upgrade'][$plugin_file])) {
+					$plugins['upgrade'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->response[$plugin_file], $plugin_data);
 				}
 
-			} elseif ( isset( $plugin_info->no_update[ $plugin_file ] ) ) {
-				$plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
+			} elseif (isset($plugin_info->no_update[$plugin_file])) {
+				$plugins['all'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->no_update[$plugin_file], $plugin_data);
 				// Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
-				if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
-					$plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
+				if (isset($plugins['upgrade'][$plugin_file])) {
+					$plugins['upgrade'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->no_update[$plugin_file], $plugin_data);
 				}
 			}
 
 			// Filter into individual sections
-			if ( is_multisite() && ! $screen->in_admin( 'network' ) && is_network_only_plugin( $plugin_file ) && ! is_plugin_active( $plugin_file ) ) {
-				if ( $show_network_active ) {
+			if (is_multisite() && ! $screen->in_admin('network') && is_network_only_plugin($plugin_file) && ! is_plugin_active($plugin_file)) {
+				if ($show_network_active) {
 					// On the non-network screen, show inactive network-only plugins if allowed
-					$plugins['inactive'][ $plugin_file ] = $plugin_data;
+					$plugins['inactive'][$plugin_file] = $plugin_data;
 				} else {
 					// On the non-network screen, filter out network-only plugins as long as they're not individually active
-					unset( $plugins['all'][ $plugin_file ] );
+					unset($plugins['all'][$plugin_file]);
 				}
-			} elseif ( ! $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) {
-				if ( $show_network_active ) {
+			} elseif ( ! $screen->in_admin('network') && is_plugin_active_for_network($plugin_file)) {
+				if ($show_network_active) {
 					// On the non-network screen, show network-active plugins if allowed
-					$plugins['active'][ $plugin_file ] = $plugin_data;
+					$plugins['active'][$plugin_file] = $plugin_data;
 				} else {
 					// On the non-network screen, filter out network-active plugins
-					unset( $plugins['all'][ $plugin_file ] );
+					unset($plugins['all'][$plugin_file]);
 				}
-			} elseif ( ( ! $screen->in_admin( 'network' ) && is_plugin_active( $plugin_file ) )
-				|| ( $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) ) {
+			} elseif (( ! $screen->in_admin('network') && is_plugin_active($plugin_file))
+				|| ($screen->in_admin('network') && is_plugin_active_for_network($plugin_file))) {
 				// On the non-network screen, populate the active list with plugins that are individually activated
 				// On the network-admin screen, populate the active list with plugins that are network activated
-				$plugins['active'][ $plugin_file ] = $plugin_data;
+				$plugins['active'][$plugin_file] = $plugin_data;
 			} else {
-				if ( isset( $recently_activated[ $plugin_file ] ) ) {
+				if (isset($recently_activated[$plugin_file])) {
 					// Populate the recently activated list with plugins that have been recently activated
-					$plugins['recently_activated'][ $plugin_file ] = $plugin_data;
+					$plugins['recently_activated'][$plugin_file] = $plugin_data;
 				}
 				// Populate the inactive list with plugins that aren't activated
-				$plugins['inactive'][ $plugin_file ] = $plugin_data;
+				$plugins['inactive'][$plugin_file] = $plugin_data;
 			}
 		}
 
-		if ( strlen( $s ) ) {
+		if (strlen($s)) {
 			$status = 'search';
-			$plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
+			$plugins['search'] = array_filter($plugins['all'], array($this, '_search_callback'));
 		}
 
 		$totals = array();
-		foreach ( $plugins as $type => $list )
-			$totals[ $type ] = count( $list );
+		foreach ($plugins as $type => $list)
+			$totals[$type] = count($list);
 
-		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
+		if (empty($plugins[$status]) && ! in_array($status, array('all', 'search')))
 			$status = 'all';
 
 		$this->items = array();
-		foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {
+		foreach ($plugins[$status] as $plugin_file => $plugin_data) {
 			// Translate, Don't Apply Markup, Sanitize HTML
-			$this->items[$plugin_file] = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, false, true );
+			$this->items[$plugin_file] = _get_plugin_data_markup_translate($plugin_file, $plugin_data, false, true);
 		}
 
-		$total_this_page = $totals[ $status ];
+		$total_this_page = $totals[$status];
 
 		$js_plugins = array();
-		foreach ( $plugins as $key => $list ) {
-			$js_plugins[ $key ] = array_keys( (array) $list );
+		foreach ($plugins as $key => $list) {
+			$js_plugins[$key] = array_keys((array) $list);
 		}
 
-		wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
+		wp_localize_script('updates', '_wpUpdatesItemCounts', array(
 			'plugins' => $js_plugins,
 			'totals'  => wp_get_update_data(),
-		) );
+		));
 
-		if ( ! $orderby ) {
+		if ( ! $orderby) {
 			$orderby = 'Name';
 		} else {
-			$orderby = ucfirst( $orderby );
+			$orderby = ucfirst($orderby);
 		}
 
-		$order = strtoupper( $order );
+		$order = strtoupper($order);
 
-		uasort( $this->items, array( $this, '_order_callback' ) );
+		uasort($this->items, array($this, '_order_callback'));
 
-		$plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', $screen->id . '_per_page' ), 999 );
+		$plugins_per_page = $this->get_items_per_page(str_replace('-', '_', $screen->id.'_per_page'), 999);
 
-		$start = ( $page - 1 ) * $plugins_per_page;
+		$start = ($page - 1) * $plugins_per_page;
 
-		if ( $total_this_page > $plugins_per_page )
-			$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		if ($total_this_page > $plugins_per_page)
+			$this->items = array_slice($this->items, $start, $plugins_per_page);
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_this_page,
 			'per_page' => $plugins_per_page,
-		) );
+		));
 	}
 
 	/**
@@ -285,11 +285,11 @@ 
 	 * @param array $plugin
 	 * @return bool
 	 */
-	public function _search_callback( $plugin ) {
+	public function _search_callback($plugin) {
 		global $s;
 
-		foreach ( $plugin as $value ) {
-			if ( is_string( $value ) && false !== stripos( strip_tags( $value ), urldecode( $s ) ) ) {
+		foreach ($plugin as $value) {
+			if (is_string($value) && false !== stripos(strip_tags($value), urldecode($s))) {
 				return true;
 			}
 		}
@@ -304,19 +304,19 @@ 
 	 * @param array $plugin_b
 	 * @return int
 	 */
-	public function _order_callback( $plugin_a, $plugin_b ) {
+	public function _order_callback($plugin_a, $plugin_b) {
 		global $orderby, $order;
 
 		$a = $plugin_a[$orderby];
 		$b = $plugin_b[$orderby];
 
-		if ( $a == $b )
+		if ($a == $b)
 			return 0;
 
-		if ( 'DESC' === $order ) {
-			return strcasecmp( $b, $a );
+		if ('DESC' === $order) {
+			return strcasecmp($b, $a);
 		} else {
-			return strcasecmp( $a, $b );
+			return strcasecmp($a, $b);
 		}
 	}
 
@@ -327,19 +327,19 @@ 
 	public function no_items() {
 		global $plugins;
 
-		if ( ! empty( $_REQUEST['s'] ) ) {
-			$s = esc_html( wp_unslash( $_REQUEST['s'] ) );
+		if ( ! empty($_REQUEST['s'])) {
+			$s = esc_html(wp_unslash($_REQUEST['s']));
 
-			printf( __( 'No plugins found for &#8220;%s&#8221;.' ), $s );
+			printf(__('No plugins found for &#8220;%s&#8221;.'), $s);
 
 			// We assume that somebody who can install plugins in multisite is experienced enough to not need this helper link.
-			if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
-				echo ' <a href="' . esc_url( admin_url( 'plugin-install.php?tab=search&s=' . urlencode( $s ) ) ) . '">' . __( 'Search for plugins in the WordPress Plugin Directory.' ) . '</a>';
+			if ( ! is_multisite() && current_user_can('install_plugins')) {
+				echo ' <a href="'.esc_url(admin_url('plugin-install.php?tab=search&s='.urlencode($s))).'">'.__('Search for plugins in the WordPress Plugin Directory.').'</a>';
 			}
-		} elseif ( ! empty( $plugins['all'] ) )
-			_e( 'No plugins found.' );
+		} elseif ( ! empty($plugins['all']))
+			_e('No plugins found.');
 		else
-			_e( 'You do not appear to have any plugins available at this time.' );
+			_e('You do not appear to have any plugins available at this time.');
 	}
 
 	/**
@@ -351,24 +351,24 @@ 
 	 * @param string $text     The 'submit' button label.
 	 * @param string $input_id ID attribute value for the search input field.
 	 */
-	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+	public function search_box($text, $input_id) {
+		if (empty($_REQUEST['s']) && ! $this->has_items()) {
 			return;
 		}
 
-		$input_id = $input_id . '-search-input';
+		$input_id = $input_id.'-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		if ( ! empty($_REQUEST['orderby'])) {
+			echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />';
 		}
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		if ( ! empty($_REQUEST['order'])) {
+			echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />';
 		}
 		?>
 		<p class="search-box">
-			<label class="screen-reader-text" for="<?php echo esc_attr( $input_id ); ?>"><?php echo $text; ?>:</label>
-			<input type="search" id="<?php echo esc_attr( $input_id ); ?>" class="wp-filter-search" name="s" value="<?php _admin_search_query(); ?>" placeholder="<?php esc_attr_e( 'Search installed plugins...' ); ?>"/>
-			<?php submit_button( $text, 'hide-if-js', '', false, array( 'id' => 'search-submit' ) ); ?>
+			<label class="screen-reader-text" for="<?php echo esc_attr($input_id); ?>"><?php echo $text; ?>:</label>
+			<input type="search" id="<?php echo esc_attr($input_id); ?>" class="wp-filter-search" name="s" value="<?php _admin_search_query(); ?>" placeholder="<?php esc_attr_e('Search installed plugins...'); ?>"/>
+			<?php submit_button($text, 'hide-if-js', '', false, array('id' => 'search-submit')); ?>
 		</p>
 		<?php
 	}
@@ -382,9 +382,9 @@ 
 		global $status;
 
 		return array(
-			'cb'          => !in_array( $status, array( 'mustuse', 'dropins' ) ) ? '<input type="checkbox" />' : '',
-			'name'        => __( 'Plugin' ),
-			'description' => __( 'Description' ),
+			'cb'          => ! in_array($status, array('mustuse', 'dropins')) ? '<input type="checkbox" />' : '',
+			'name'        => __('Plugin'),
+			'description' => __('Description'),
 		);
 	}
 
@@ -405,39 +405,39 @@ 
 		global $totals, $status;
 
 		$status_links = array();
-		foreach ( $totals as $type => $count ) {
-			if ( !$count )
+		foreach ($totals as $type => $count) {
+			if ( ! $count)
 				continue;
 
-			switch ( $type ) {
+			switch ($type) {
 				case 'all':
-					$text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'plugins' );
+					$text = _nx('All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'plugins');
 					break;
 				case 'active':
-					$text = _n( 'Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $count );
+					$text = _n('Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $count);
 					break;
 				case 'recently_activated':
-					$text = _n( 'Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $count );
+					$text = _n('Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $count);
 					break;
 				case 'inactive':
-					$text = _n( 'Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count );
+					$text = _n('Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count);
 					break;
 				case 'mustuse':
-					$text = _n( 'Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $count );
+					$text = _n('Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $count);
 					break;
 				case 'dropins':
-					$text = _n( 'Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count );
+					$text = _n('Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count);
 					break;
 				case 'upgrade':
-					$text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
+					$text = _n('Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count);
 					break;
 			}
 
-			if ( 'search' !== $type ) {
-				$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
+			if ('search' !== $type) {
+				$status_links[$type] = sprintf("<a href='%s' %s>%s</a>",
 					add_query_arg('plugin_status', $type, 'plugins.php'),
-					( $type === $status ) ? ' class="current"' : '',
-					sprintf( $text, number_format_i18n( $count ) )
+					($type === $status) ? ' class="current"' : '',
+					sprintf($text, number_format_i18n($count))
 					);
 			}
 		}
@@ -455,17 +455,17 @@ 
 
 		$actions = array();
 
-		if ( 'active' != $status )
-			$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		if ('active' != $status)
+			$actions['activate-selected'] = $this->screen->in_admin('network') ? __('Network Activate') : __('Activate');
 
-		if ( 'inactive' != $status && 'recent' != $status )
-			$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		if ('inactive' != $status && 'recent' != $status)
+			$actions['deactivate-selected'] = $this->screen->in_admin('network') ? __('Network Deactivate') : __('Deactivate');
 
-		if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) {
-			if ( current_user_can( 'update_plugins' ) )
-				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
-				$actions['delete-selected'] = __( 'Delete' );
+		if ( ! is_multisite() || $this->screen->in_admin('network')) {
+			if (current_user_can('update_plugins'))
+				$actions['update-selected'] = __('Update');
+			if (current_user_can('delete_plugins') && ('active' != $status))
+				$actions['delete-selected'] = __('Delete');
 		}
 
 		return $actions;
@@ -475,39 +475,39 @@ 
 	 * @global string $status
 	 * @param string $which
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		global $status;
 
-		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
+		if (in_array($status, array('mustuse', 'dropins')))
 			return;
 
-		parent::bulk_actions( $which );
+		parent::bulk_actions($which);
 	}
 
 	/**
 	 * @global string $status
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		global $status;
 
-		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) )
+		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins')))
 			return;
 
 		echo '<div class="alignleft actions">';
 
-		if ( 'recently_activated' == $status ) {
-			submit_button( __( 'Clear List' ), '', 'clear-recent-list', false );
-		} elseif ( 'top' === $which && 'mustuse' === $status ) {
+		if ('recently_activated' == $status) {
+			submit_button(__('Clear List'), '', 'clear-recent-list', false);
+		} elseif ('top' === $which && 'mustuse' === $status) {
 			/* translators: %s: mu-plugins directory name */
-			echo '<p>' . sprintf( __( 'Files in the %s directory are executed automatically.' ),
-				'<code>' . str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) . '</code>'
-			) . '</p>';
-		} elseif ( 'top' === $which && 'dropins' === $status ) {
+			echo '<p>'.sprintf(__('Files in the %s directory are executed automatically.'),
+				'<code>'.str_replace(ABSPATH, '/', WPMU_PLUGIN_DIR).'</code>'
+			).'</p>';
+		} elseif ('top' === $which && 'dropins' === $status) {
 			/* translators: %s: wp-content directory name */
-			echo '<p>' . sprintf( __( 'Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.' ),
-				'<code>' . str_replace( ABSPATH, '', WP_CONTENT_DIR ) . '</code>'
-			) . '</p>';
+			echo '<p>'.sprintf(__('Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.'),
+				'<code>'.str_replace(ABSPATH, '', WP_CONTENT_DIR).'</code>'
+			).'</p>';
 		}
 		echo '</div>';
 	}
@@ -516,7 +516,7 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset($_POST['clear-recent-list']) )
+		if (isset($_POST['clear-recent-list']))
 			return 'clear-recent-list';
 
 		return parent::current_action();
@@ -529,11 +529,11 @@ 
 	public function display_rows() {
 		global $status;
 
-		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
+		if (is_multisite() && ! $this->screen->in_admin('network') && in_array($status, array('mustuse', 'dropins')))
 			return;
 
-		foreach ( $this->items as $plugin_file => $plugin_data )
-			$this->single_row( array( $plugin_file, $plugin_data ) );
+		foreach ($this->items as $plugin_file => $plugin_data)
+			$this->single_row(array($plugin_file, $plugin_data));
 	}
 
 	/**
@@ -544,10 +544,10 @@ 
 	 *
 	 * @param array $item
 	 */
-	public function single_row( $item ) {
+	public function single_row($item) {
 		global $status, $page, $s, $totals;
 
-		list( $plugin_file, $plugin_data ) = $item;
+		list($plugin_file, $plugin_data) = $item;
 		$context = $status;
 		$screen = $this->screen;
 
@@ -564,88 +564,88 @@ 
 		$restrict_network_active = false;
 		$restrict_network_only = false;
 
-		if ( 'mustuse' === $context ) {
+		if ('mustuse' === $context) {
 			$is_active = true;
-		} elseif ( 'dropins' === $context ) {
+		} elseif ('dropins' === $context) {
 			$dropins = _get_dropins();
 			$plugin_name = $plugin_file;
-			if ( $plugin_file != $plugin_data['Name'] )
-				$plugin_name .= '<br/>' . $plugin_data['Name'];
-			if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
+			if ($plugin_file != $plugin_data['Name'])
+				$plugin_name .= '<br/>'.$plugin_data['Name'];
+			if (true === ($dropins[$plugin_file][1])) { // Doesn't require a constant
 				$is_active = true;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
-			} elseif ( defined( $dropins[ $plugin_file ][1] ) && constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true
+				$description = '<p><strong>'.$dropins[$plugin_file][0].'</strong></p>';
+			} elseif (defined($dropins[$plugin_file][1]) && constant($dropins[$plugin_file][1])) { // Constant is true
 				$is_active = true;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
+				$description = '<p><strong>'.$dropins[$plugin_file][0].'</strong></p>';
 			} else {
 				$is_active = false;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . ' <span class="error-message">' . __( 'Inactive:' ) . '</span></strong> ' .
+				$description = '<p><strong>'.$dropins[$plugin_file][0].' <span class="error-message">'.__('Inactive:').'</span></strong> '.
 					/* translators: 1: drop-in constant name, 2: wp-config.php */
-					sprintf( __( 'Requires %1$s in %2$s file.' ),
-						"<code>define('" . $dropins[ $plugin_file ][1] . "', true);</code>",
+					sprintf(__('Requires %1$s in %2$s file.'),
+						"<code>define('".$dropins[$plugin_file][1]."', true);</code>",
 						'<code>wp-config.php</code>'
-					) . '</p>';
+					).'</p>';
 			}
-			if ( $plugin_data['Description'] )
-				$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			if ($plugin_data['Description'])
+				$description .= '<p>'.$plugin_data['Description'].'</p>';
 		} else {
-			if ( $screen->in_admin( 'network' ) ) {
-				$is_active = is_plugin_active_for_network( $plugin_file );
+			if ($screen->in_admin('network')) {
+				$is_active = is_plugin_active_for_network($plugin_file);
 			} else {
-				$is_active = is_plugin_active( $plugin_file );
-				$restrict_network_active = ( is_multisite() && is_plugin_active_for_network( $plugin_file ) );
-				$restrict_network_only = ( is_multisite() && is_network_only_plugin( $plugin_file ) && ! $is_active );
+				$is_active = is_plugin_active($plugin_file);
+				$restrict_network_active = (is_multisite() && is_plugin_active_for_network($plugin_file));
+				$restrict_network_only = (is_multisite() && is_network_only_plugin($plugin_file) && ! $is_active);
 			}
 
-			if ( $screen->in_admin( 'network' ) ) {
-				if ( $is_active ) {
-					if ( current_user_can( 'manage_network_plugins' ) ) {
+			if ($screen->in_admin('network')) {
+				if ($is_active) {
+					if (current_user_can('manage_network_plugins')) {
 						/* translators: %s: plugin name */
-						$actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Network Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Deactivate' ) . '</a>';
+						$actions['deactivate'] = '<a href="'.wp_nonce_url('plugins.php?action=deactivate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'deactivate-plugin_'.$plugin_file).'" aria-label="'.esc_attr(sprintf(_x('Network Deactivate %s', 'plugin'), $plugin_data['Name'])).'">'.__('Network Deactivate').'</a>';
 						}
 				} else {
-					if ( current_user_can( 'manage_network_plugins' ) ) {
+					if (current_user_can('manage_network_plugins')) {
 						/* translators: %s: plugin name */
-						$actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( _x( 'Network Activate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Activate' ) . '</a>';
+						$actions['activate'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'activate-plugin_'.$plugin_file).'" class="edit" aria-label="'.esc_attr(sprintf(_x('Network Activate %s', 'plugin'), $plugin_data['Name'])).'">'.__('Network Activate').'</a>';
 					}
-					if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) {
+					if (current_user_can('delete_plugins') && ! is_plugin_active($plugin_file)) {
 						/* translators: %s: plugin name */
-						$actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( _x( 'Delete %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
+						$actions['delete'] = '<a href="'.wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'bulk-plugins').'" class="delete" aria-label="'.esc_attr(sprintf(_x('Delete %s', 'plugin'), $plugin_data['Name'])).'">'.__('Delete').'</a>';
 					}
 				}
 			} else {
-				if ( $restrict_network_active ) {
+				if ($restrict_network_active) {
 					$actions = array(
-						'network_active' => __( 'Network Active' ),
+						'network_active' => __('Network Active'),
 					);
-				} elseif ( $restrict_network_only ) {
+				} elseif ($restrict_network_only) {
 					$actions = array(
-						'network_only' => __( 'Network Only' ),
+						'network_only' => __('Network Only'),
 					);
-				} elseif ( $is_active ) {
+				} elseif ($is_active) {
 					/* translators: %s: plugin name */
-					$actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
+					$actions['deactivate'] = '<a href="'.wp_nonce_url('plugins.php?action=deactivate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'deactivate-plugin_'.$plugin_file).'" aria-label="'.esc_attr(sprintf(_x('Deactivate %s', 'plugin'), $plugin_data['Name'])).'">'.__('Deactivate').'</a>';
 				} else {
 					/* translators: %s: plugin name */
-					$actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( _x( 'Activate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Activate' ) . '</a>';
+					$actions['activate'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'activate-plugin_'.$plugin_file).'" class="edit" aria-label="'.esc_attr(sprintf(_x('Activate %s', 'plugin'), $plugin_data['Name'])).'">'.__('Activate').'</a>';
 
-					if ( ! is_multisite() && current_user_can( 'delete_plugins' ) ) {
+					if ( ! is_multisite() && current_user_can('delete_plugins')) {
 						/* translators: %s: plugin name */
-						$actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( _x( 'Delete %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
+						$actions['delete'] = '<a href="'.wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'bulk-plugins').'" class="delete" aria-label="'.esc_attr(sprintf(_x('Delete %s', 'plugin'), $plugin_data['Name'])).'">'.__('Delete').'</a>';
 					}
 				} // end if $is_active
 
 			 } // end if $screen->in_admin( 'network' )
 
-			if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can( 'edit_plugins' ) && is_writable( WP_PLUGIN_DIR . '/' . $plugin_file ) ) {
+			if (( ! is_multisite() || $screen->in_admin('network')) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR.'/'.$plugin_file)) {
 				/* translators: %s: plugin name */
-				$actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Edit %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Edit' ) . '</a>';
+				$actions['edit'] = '<a href="plugin-editor.php?file='.$plugin_file.'" class="edit" aria-label="'.esc_attr(sprintf(__('Edit %s'), $plugin_data['Name'])).'">'.__('Edit').'</a>';
 			}
 		} // end if $context
 
-		$actions = array_filter( $actions );
+		$actions = array_filter($actions);
 
-		if ( $screen->in_admin( 'network' ) ) {
+		if ($screen->in_admin('network')) {
 
 			/**
 			 * Filters the action links displayed for each plugin in the Network Admin Plugins list table.
@@ -662,7 +662,7 @@ 
 			 *                            'Inactive', 'Recently Activated', 'Upgrade',
 			 *                            'Must-Use', 'Drop-ins', 'Search'.
 			 */
-			$actions = apply_filters( 'network_admin_plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
+			$actions = apply_filters('network_admin_plugin_action_links', $actions, $plugin_file, $plugin_data, $context);
 
 			/**
 			 * Filters the list of action links displayed for a specific plugin in the Network Admin Plugins list table.
@@ -679,7 +679,7 @@ 
 			 *                            'Inactive', 'Recently Activated', 'Upgrade',
 			 *                            'Must-Use', 'Drop-ins', 'Search'.
 			 */
-			$actions = apply_filters( "network_admin_plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context );
+			$actions = apply_filters("network_admin_plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context);
 
 		} else {
 
@@ -700,7 +700,7 @@ 
 			 *                            'Inactive', 'Recently Activated', 'Upgrade',
 			 *                            'Must-Use', 'Drop-ins', 'Search'.
 			 */
-			$actions = apply_filters( 'plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
+			$actions = apply_filters('plugin_action_links', $actions, $plugin_file, $plugin_data, $context);
 
 			/**
 			 * Filters the list of action links displayed for a specific plugin in the Plugins list table.
@@ -717,48 +717,48 @@ 
 			 *                            'Inactive', 'Recently Activated', 'Upgrade',
 			 *                            'Must-Use', 'Drop-ins', 'Search'.
 			 */
-			$actions = apply_filters( "plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context );
+			$actions = apply_filters("plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context);
 
 		}
 
 		$class = $is_active ? 'active' : 'inactive';
-		$checkbox_id =  "checkbox_" . md5($plugin_data['Name']);
-		if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+		$checkbox_id = "checkbox_".md5($plugin_data['Name']);
+		if ($restrict_network_active || $restrict_network_only || in_array($status, array('mustuse', 'dropins'))) {
 			$checkbox = '';
 		} else {
-			$checkbox = "<label class='screen-reader-text' for='" . $checkbox_id . "' >" . sprintf( __( 'Select %s' ), $plugin_data['Name'] ) . "</label>"
-				. "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' />";
+			$checkbox = "<label class='screen-reader-text' for='".$checkbox_id."' >".sprintf(__('Select %s'), $plugin_data['Name'])."</label>"
+				. "<input type='checkbox' name='checked[]' value='".esc_attr($plugin_file)."' id='".$checkbox_id."' />";
 		}
-		if ( 'dropins' != $context ) {
-			$description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>';
+		if ('dropins' != $context) {
+			$description = '<p>'.($plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;').'</p>';
 			$plugin_name = $plugin_data['Name'];
 		}
 
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
+		if ( ! empty($totals['upgrade']) && ! empty($plugin_data['update']))
 			$class .= ' update';
 
-		$plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name );
-		printf( '<tr class="%s" data-slug="%s" data-plugin="%s">',
-			esc_attr( $class ),
-			esc_attr( $plugin_slug ),
-			esc_attr( $plugin_file )
+		$plugin_slug = isset($plugin_data['slug']) ? $plugin_data['slug'] : sanitize_title($plugin_name);
+		printf('<tr class="%s" data-slug="%s" data-plugin="%s">',
+			esc_attr($class),
+			esc_attr($plugin_slug),
+			esc_attr($plugin_file)
 		);
 
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 			$extra_classes = '';
-			if ( in_array( $column_name, $hidden ) ) {
+			if (in_array($column_name, $hidden)) {
 				$extra_classes = ' hidden';
 			}
 
-			switch ( $column_name ) {
+			switch ($column_name) {
 				case 'cb':
 					echo "<th scope='row' class='check-column'>$checkbox</th>";
 					break;
 				case 'name':
 					echo "<td class='plugin-title column-primary'><strong>$plugin_name</strong>";
-					echo $this->row_actions( $actions, true );
+					echo $this->row_actions($actions, true);
 					echo "</td>";
 					break;
 				case 'description':
@@ -769,28 +769,28 @@ 
 						<div class='$class second plugin-version-author-uri'>";
 
 					$plugin_meta = array();
-					if ( !empty( $plugin_data['Version'] ) )
-						$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
-					if ( !empty( $plugin_data['Author'] ) ) {
+					if ( ! empty($plugin_data['Version']))
+						$plugin_meta[] = sprintf(__('Version %s'), $plugin_data['Version']);
+					if ( ! empty($plugin_data['Author'])) {
 						$author = $plugin_data['Author'];
-						if ( !empty( $plugin_data['AuthorURI'] ) )
-							$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
-						$plugin_meta[] = sprintf( __( 'By %s' ), $author );
+						if ( ! empty($plugin_data['AuthorURI']))
+							$author = '<a href="'.$plugin_data['AuthorURI'].'">'.$plugin_data['Author'].'</a>';
+						$plugin_meta[] = sprintf(__('By %s'), $author);
 					}
 
 					// Details link using API info, if available
-					if ( isset( $plugin_data['slug'] ) && current_user_can( 'install_plugins' ) ) {
-						$plugin_meta[] = sprintf( '<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
-							esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data['slug'] .
-								'&TB_iframe=true&width=600&height=550' ) ),
-							esc_attr( sprintf( __( 'More information about %s' ), $plugin_name ) ),
-							esc_attr( $plugin_name ),
-							__( 'View details' )
+					if (isset($plugin_data['slug']) && current_user_can('install_plugins')) {
+						$plugin_meta[] = sprintf('<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
+							esc_url(network_admin_url('plugin-install.php?tab=plugin-information&plugin='.$plugin_data['slug'].
+								'&TB_iframe=true&width=600&height=550')),
+							esc_attr(sprintf(__('More information about %s'), $plugin_name)),
+							esc_attr($plugin_name),
+							__('View details')
 						);
-					} elseif ( ! empty( $plugin_data['PluginURI'] ) ) {
-						$plugin_meta[] = sprintf( '<a href="%s">%s</a>',
-							esc_url( $plugin_data['PluginURI'] ),
-							__( 'Visit plugin site' )
+					} elseif ( ! empty($plugin_data['PluginURI'])) {
+						$plugin_meta[] = sprintf('<a href="%s">%s</a>',
+							esc_url($plugin_data['PluginURI']),
+							__('Visit plugin site')
 						);
 					}
 
@@ -808,8 +808,8 @@ 
 					 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
 					 *                            'Drop-ins', 'Search'.
 					 */
-					$plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
-					echo implode( ' | ', $plugin_meta );
+					$plugin_meta = apply_filters('plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status);
+					echo implode(' | ', $plugin_meta);
 
 					echo "</div></td>";
 					break;
@@ -827,7 +827,7 @@ 
 					 * @param string $plugin_file Path to the plugin file.
 					 * @param array  $plugin_data An array of plugin data.
 					 */
-					do_action( 'manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data );
+					do_action('manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data);
 
 					echo "</td>";
 			}
@@ -846,7 +846,7 @@ 
 		 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
 		 *                            'Drop-ins', 'Search'.
 		 */
-		do_action( 'after_plugin_row', $plugin_file, $plugin_data, $status );
+		do_action('after_plugin_row', $plugin_file, $plugin_data, $status);
 
 		/**
 		 * Fires after each specific row in the Plugins list table.
@@ -862,7 +862,7 @@ 
 		 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
 		 *                            'Drop-ins', 'Search'.
 		 */
-		do_action( "after_plugin_row_{$plugin_file}", $plugin_file, $plugin_data, $status );
+		do_action("after_plugin_row_{$plugin_file}", $plugin_file, $plugin_data, $status);
 	}
 
 	/**

src/wp-admin/includes/class-wp-screen.php

Indentation +14 added lines, -14 removed lines

@@ -143,12 +143,12 @@ 
 	private $_help_sidebar = '';
 
  	/**
-	 * The accessible hidden headings and text associated with the screen, if any.
-	 *
-	 * @since 4.4.0
-	 * @access private
-	 * @var array
-	 */
+ 	 * The accessible hidden headings and text associated with the screen, if any.
+ 	 *
+ 	 * @since 4.4.0
+ 	 * @access private
+ 	 * @var array
+ 	 */
 	private $_screen_reader_content = array();
 
 	/**
@@ -656,14 +656,14 @@ 
 	}
 
  	/**
-	 * Get the accessible hidden headings and text used in the screen.
-	 *
-	 * @since 4.4.0
-	 *
-	 * @see set_screen_reader_content() For more information on the array format.
-	 *
-	 * @return array An associative array of screen reader text strings.
-	 */
+ 	 * Get the accessible hidden headings and text used in the screen.
+ 	 *
+ 	 * @since 4.4.0
+ 	 *
+ 	 * @see set_screen_reader_content() For more information on the array format.
+ 	 *
+ 	 * @return array An associative array of screen reader text strings.
+ 	 */
 	public function get_screen_reader_content() {
 		return $this->_screen_reader_content;
 	}

Spacing +224 added lines, -224 removed lines

@@ -214,8 +214,8 @@ 
 	 * 	                                  Defaults to the current $hook_suffix global.
 	 * @return WP_Screen Screen object.
 	 */
-	public static function get( $hook_name = '' ) {
-		if ( $hook_name instanceof WP_Screen ) {
+	public static function get($hook_name = '') {
+		if ($hook_name instanceof WP_Screen) {
 			return $hook_name;
 		}
 
@@ -223,89 +223,89 @@ 
 		$in_admin = false;
 		$action = '';
 
-		if ( $hook_name )
+		if ($hook_name)
 			$id = $hook_name;
 		else
 			$id = $GLOBALS['hook_suffix'];
 
 		// For those pesky meta boxes.
-		if ( $hook_name && post_type_exists( $hook_name ) ) {
+		if ($hook_name && post_type_exists($hook_name)) {
 			$post_type = $id;
 			$id = 'post'; // changes later. ends up being $base.
 		} else {
-			if ( '.php' == substr( $id, -4 ) )
-				$id = substr( $id, 0, -4 );
+			if ('.php' == substr($id, -4))
+				$id = substr($id, 0, -4);
 
-			if ( 'post-new' == $id || 'link-add' == $id || 'media-new' == $id || 'user-new' == $id ) {
-				$id = substr( $id, 0, -4 );
+			if ('post-new' == $id || 'link-add' == $id || 'media-new' == $id || 'user-new' == $id) {
+				$id = substr($id, 0, -4);
 				$action = 'add';
 			}
 		}
 
-		if ( ! $post_type && $hook_name ) {
-			if ( '-network' == substr( $id, -8 ) ) {
-				$id = substr( $id, 0, -8 );
+		if ( ! $post_type && $hook_name) {
+			if ('-network' == substr($id, -8)) {
+				$id = substr($id, 0, -8);
 				$in_admin = 'network';
-			} elseif ( '-user' == substr( $id, -5 ) ) {
-				$id = substr( $id, 0, -5 );
+			} elseif ('-user' == substr($id, -5)) {
+				$id = substr($id, 0, -5);
 				$in_admin = 'user';
 			}
 
-			$id = sanitize_key( $id );
-			if ( 'edit-comments' != $id && 'edit-tags' != $id && 'edit-' == substr( $id, 0, 5 ) ) {
-				$maybe = substr( $id, 5 );
-				if ( taxonomy_exists( $maybe ) ) {
+			$id = sanitize_key($id);
+			if ('edit-comments' != $id && 'edit-tags' != $id && 'edit-' == substr($id, 0, 5)) {
+				$maybe = substr($id, 5);
+				if (taxonomy_exists($maybe)) {
 					$id = 'edit-tags';
 					$taxonomy = $maybe;
-				} elseif ( post_type_exists( $maybe ) ) {
+				} elseif (post_type_exists($maybe)) {
 					$id = 'edit';
 					$post_type = $maybe;
 				}
 			}
 
-			if ( ! $in_admin )
+			if ( ! $in_admin)
 				$in_admin = 'site';
 		} else {
-			if ( defined( 'WP_NETWORK_ADMIN' ) && WP_NETWORK_ADMIN )
+			if (defined('WP_NETWORK_ADMIN') && WP_NETWORK_ADMIN)
 				$in_admin = 'network';
-			elseif ( defined( 'WP_USER_ADMIN' ) && WP_USER_ADMIN )
+			elseif (defined('WP_USER_ADMIN') && WP_USER_ADMIN)
 				$in_admin = 'user';
 			else
 				$in_admin = 'site';
 		}
 
-		if ( 'index' == $id )
+		if ('index' == $id)
 			$id = 'dashboard';
-		elseif ( 'front' == $id )
+		elseif ('front' == $id)
 			$in_admin = false;
 
 		$base = $id;
 
 		// If this is the current screen, see if we can be more accurate for post types and taxonomies.
-		if ( ! $hook_name ) {
-			if ( isset( $_REQUEST['post_type'] ) )
-				$post_type = post_type_exists( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : false;
-			if ( isset( $_REQUEST['taxonomy'] ) )
-				$taxonomy = taxonomy_exists( $_REQUEST['taxonomy'] ) ? $_REQUEST['taxonomy'] : false;
+		if ( ! $hook_name) {
+			if (isset($_REQUEST['post_type']))
+				$post_type = post_type_exists($_REQUEST['post_type']) ? $_REQUEST['post_type'] : false;
+			if (isset($_REQUEST['taxonomy']))
+				$taxonomy = taxonomy_exists($_REQUEST['taxonomy']) ? $_REQUEST['taxonomy'] : false;
 
-			switch ( $base ) {
+			switch ($base) {
 				case 'post' :
-					if ( isset( $_GET['post'] ) )
+					if (isset($_GET['post']))
 						$post_id = (int) $_GET['post'];
-					elseif ( isset( $_POST['post_ID'] ) )
+					elseif (isset($_POST['post_ID']))
 						$post_id = (int) $_POST['post_ID'];
 					else
 						$post_id = 0;
 
-					if ( $post_id ) {
-						$post = get_post( $post_id );
-						if ( $post )
+					if ($post_id) {
+						$post = get_post($post_id);
+						if ($post)
 							$post_type = $post->post_type;
 					}
 					break;
 				case 'edit-tags' :
 				case 'term' :
-					if ( null === $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
+					if (null === $post_type && is_object_in_taxonomy('post', $taxonomy ? $taxonomy : 'post_tag'))
 						$post_type = 'post';
 					break;
 				case 'upload':
@@ -314,58 +314,58 @@ 
 			}
 		}
 
-		switch ( $base ) {
+		switch ($base) {
 			case 'post' :
-				if ( null === $post_type )
+				if (null === $post_type)
 					$post_type = 'post';
 				$id = $post_type;
 				break;
 			case 'edit' :
-				if ( null === $post_type )
+				if (null === $post_type)
 					$post_type = 'post';
-				$id .= '-' . $post_type;
+				$id .= '-'.$post_type;
 				break;
 			case 'edit-tags' :
 			case 'term' :
-				if ( null === $taxonomy )
+				if (null === $taxonomy)
 					$taxonomy = 'post_tag';
 				// The edit-tags ID does not contain the post type. Look for it in the request.
-				if ( null === $post_type ) {
+				if (null === $post_type) {
 					$post_type = 'post';
-					if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+					if (isset($_REQUEST['post_type']) && post_type_exists($_REQUEST['post_type']))
 						$post_type = $_REQUEST['post_type'];
 				}
 
-				$id = 'edit-' . $taxonomy;
+				$id = 'edit-'.$taxonomy;
 				break;
 		}
 
-		if ( 'network' == $in_admin ) {
+		if ('network' == $in_admin) {
 			$id   .= '-network';
 			$base .= '-network';
-		} elseif ( 'user' == $in_admin ) {
+		} elseif ('user' == $in_admin) {
 			$id   .= '-user';
 			$base .= '-user';
 		}
 
-		if ( isset( self::$_registry[ $id ] ) ) {
-			$screen = self::$_registry[ $id ];
-			if ( $screen === get_current_screen() )
+		if (isset(self::$_registry[$id])) {
+			$screen = self::$_registry[$id];
+			if ($screen === get_current_screen())
 				return $screen;
 		} else {
 			$screen = new WP_Screen();
-			$screen->id     = $id;
+			$screen->id = $id;
 		}
 
 		$screen->base       = $base;
 		$screen->action     = $action;
 		$screen->post_type  = (string) $post_type;
 		$screen->taxonomy   = (string) $taxonomy;
-		$screen->is_user    = ( 'user' == $in_admin );
-		$screen->is_network = ( 'network' == $in_admin );
+		$screen->is_user    = ('user' == $in_admin);
+		$screen->is_network = ('network' == $in_admin);
 		$screen->in_admin   = $in_admin;
 
-		self::$_registry[ $id ] = $screen;
+		self::$_registry[$id] = $screen;
 
 		return $screen;
 	}
@@ -393,7 +393,7 @@ 
 		 *
 		 * @param WP_Screen $current_screen Current WP_Screen object.
 		 */
-		do_action( 'current_screen', $current_screen );
+		do_action('current_screen', $current_screen);
 	}
 
 	/**
@@ -413,11 +413,11 @@ 
 	 *                      If empty any of the three admins will result in true.
 	 * @return bool True if the screen is in the indicated admin, false otherwise.
 	 */
-	public function in_admin( $admin = null ) {
-		if ( empty( $admin ) )
+	public function in_admin($admin = null) {
+		if (empty($admin))
 			return (bool) $this->in_admin;
 
-		return ( $admin == $this->in_admin );
+		return ($admin == $this->in_admin);
 	}
 
 	/**
@@ -430,8 +430,8 @@ 
 	 * @param WP_Screen $screen A screen object.
 	 * @param string $help Help text.
 	 */
-	public static function add_old_compat_help( $screen, $help ) {
-		self::$_old_compat_help[ $screen->id ] = $help;
+	public static function add_old_compat_help($screen, $help) {
+		self::$_old_compat_help[$screen->id] = $help;
 	}
 
 	/**
@@ -442,10 +442,10 @@ 
 	 *
 	 * @param string $parent_file The parent file of the screen. Typically the $parent_file global.
 	 */
-	public function set_parentage( $parent_file ) {
+	public function set_parentage($parent_file) {
 		$this->parent_file = $parent_file;
-		list( $this->parent_base ) = explode( '?', $parent_file );
-		$this->parent_base = str_replace( '.php', '', $this->parent_base );
+		list($this->parent_base) = explode('?', $parent_file);
+		$this->parent_base = str_replace('.php', '', $this->parent_base);
 	}
 
 	/**
@@ -457,8 +457,8 @@ 
 	 * @param string $option Option ID
 	 * @param mixed $args Option-dependent arguments.
 	 */
-	public function add_option( $option, $args = array() ) {
-		$this->_options[ $option ] = $args;
+	public function add_option($option, $args = array()) {
+		$this->_options[$option] = $args;
 	}
 
 	/**
@@ -468,8 +468,8 @@ 
 	 *
 	 * @param string $option Option ID.
 	 */
-	public function remove_option( $option ) {
-		unset( $this->_options[ $option ] );
+	public function remove_option($option) {
+		unset($this->_options[$option]);
 	}
 
 	/**
@@ -502,15 +502,15 @@ 
 	 *                       Default false.
 	 * @return string The option value if set, null otherwise.
 	 */
-	public function get_option( $option, $key = false ) {
-		if ( ! isset( $this->_options[ $option ] ) )
+	public function get_option($option, $key = false) {
+		if ( ! isset($this->_options[$option]))
 			return null;
-		if ( $key ) {
-			if ( isset( $this->_options[ $option ][ $key ] ) )
-				return $this->_options[ $option ][ $key ];
+		if ($key) {
+			if (isset($this->_options[$option][$key]))
+				return $this->_options[$option][$key];
 			return null;
 		}
-		return $this->_options[ $option ];
+		return $this->_options[$option];
 	}
 
 	/**
@@ -525,20 +525,20 @@ 
 		$help_tabs = $this->_help_tabs;
 
 		$priorities = array();
-		foreach ( $help_tabs as $help_tab ) {
-			if ( isset( $priorities[ $help_tab['priority'] ] ) ) {
-				$priorities[ $help_tab['priority'] ][] = $help_tab;
+		foreach ($help_tabs as $help_tab) {
+			if (isset($priorities[$help_tab['priority']])) {
+				$priorities[$help_tab['priority']][] = $help_tab;
 			} else {
-				$priorities[ $help_tab['priority'] ] = array( $help_tab );
+				$priorities[$help_tab['priority']] = array($help_tab);
 			}
 		}
 
-		ksort( $priorities );
+		ksort($priorities);
 
 		$sorted = array();
-		foreach ( $priorities as $list ) {
-			foreach ( $list as $tab ) {
-				$sorted[ $tab['id'] ] = $tab;
+		foreach ($priorities as $list) {
+			foreach ($list as $tab) {
+				$sorted[$tab['id']] = $tab;
 			}
 		}
 
@@ -553,10 +553,10 @@ 
 	 * @param string $id Help Tab ID.
 	 * @return array Help tab arguments.
 	 */
-	public function get_help_tab( $id ) {
-		if ( ! isset( $this->_help_tabs[ $id ] ) )
+	public function get_help_tab($id) {
+		if ( ! isset($this->_help_tabs[$id]))
 			return null;
-		return $this->_help_tabs[ $id ];
+		return $this->_help_tabs[$id];
 	}
 
 	/**
@@ -576,7 +576,7 @@ 
 	 *     @type int    $priority Optional. The priority of the tab, used for ordering. Default 10.
 	 * }
 	 */
-	public function add_help_tab( $args ) {
+	public function add_help_tab($args) {
 		$defaults = array(
 			'title'    => false,
 			'id'       => false,
@@ -584,16 +584,16 @@ 
 			'callback' => false,
 			'priority' => 10,
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$args['id'] = sanitize_html_class( $args['id'] );
+		$args['id'] = sanitize_html_class($args['id']);
 
 		// Ensure we have an ID and title.
-		if ( ! $args['id'] || ! $args['title'] )
+		if ( ! $args['id'] || ! $args['title'])
 			return;
 
 		// Allows for overriding an existing tab with that ID.
-		$this->_help_tabs[ $args['id'] ] = $args;
+		$this->_help_tabs[$args['id']] = $args;
 	}
 
 	/**
@@ -603,8 +603,8 @@ 
 	 *
 	 * @param string $id The help tab ID.
 	 */
-	public function remove_help_tab( $id ) {
-		unset( $this->_help_tabs[ $id ] );
+	public function remove_help_tab($id) {
+		unset($this->_help_tabs[$id]);
 	}
 
 	/**
@@ -635,7 +635,7 @@ 
 	 *
 	 * @param string $content Sidebar content in plain text or HTML.
 	 */
-	public function set_help_sidebar( $content ) {
+	public function set_help_sidebar($content) {
 		$this->_help_sidebar = $content;
 	}
 
@@ -677,11 +677,11 @@ 
 	 * @param string $key Screen reader text array named key.
 	 * @return string Screen reader text string.
 	 */
-	public function get_screen_reader_text( $key ) {
-		if ( ! isset( $this->_screen_reader_content[ $key ] ) ) {
+	public function get_screen_reader_text($key) {
+		if ( ! isset($this->_screen_reader_content[$key])) {
 			return null;
 		}
-		return $this->_screen_reader_content[ $key ];
+		return $this->_screen_reader_content[$key];
 	}
 
 	/**
@@ -700,13 +700,13 @@ 
 	 *                                      Default 'Items list'.
 	 * }
 	 */
-	public function set_screen_reader_content( $content = array() ) {
+	public function set_screen_reader_content($content = array()) {
 		$defaults = array(
-			'heading_views'      => __( 'Filter items list' ),
-			'heading_pagination' => __( 'Items list navigation' ),
-			'heading_list'       => __( 'Items list' ),
+			'heading_views'      => __('Filter items list'),
+			'heading_pagination' => __('Items list navigation'),
+			'heading_list'       => __('Items list'),
 		);
-		$content = wp_parse_args( $content, $defaults );
+		$content = wp_parse_args($content, $defaults);
 
 		$this->_screen_reader_content = $content;
 	}
@@ -741,9 +741,9 @@ 
 		 * @param array     $old_compat_help Old contextual help.
 		 * @param WP_Screen $this            Current WP_Screen instance.
 		 */
-		self::$_old_compat_help = apply_filters( 'contextual_help_list', self::$_old_compat_help, $this );
+		self::$_old_compat_help = apply_filters('contextual_help_list', self::$_old_compat_help, $this);
 
-		$old_help = isset( self::$_old_compat_help[ $this->id ] ) ? self::$_old_compat_help[ $this->id ] : '';
+		$old_help = isset(self::$_old_compat_help[$this->id]) ? self::$_old_compat_help[$this->id] : '';
 
 		/**
 		 * Filters the legacy contextual help text.
@@ -757,10 +757,10 @@ 
 		 * @param WP_Screen $this      Current WP_Screen instance.
 		 *
 		 */
-		$old_help = apply_filters( 'contextual_help', $old_help, $this->id, $this );
+		$old_help = apply_filters('contextual_help', $old_help, $this->id, $this);
 
 		// Default help only if there is no old-style block of text and no new-style help tabs.
-		if ( empty( $old_help ) && ! $this->get_help_tabs() ) {
+		if (empty($old_help) && ! $this->get_help_tabs()) {
 
 			/**
 			 * Filters the default legacy contextual help text.
@@ -771,44 +771,44 @@ 
 			 *
 			 * @param string $old_help_default Default contextual help text.
 			 */
-			$default_help = apply_filters( 'default_contextual_help', '' );
-			if ( $default_help )
-				$old_help = '<p>' . $default_help . '</p>';
+			$default_help = apply_filters('default_contextual_help', '');
+			if ($default_help)
+				$old_help = '<p>'.$default_help.'</p>';
 		}
 
-		if ( $old_help ) {
-			$this->add_help_tab( array(
+		if ($old_help) {
+			$this->add_help_tab(array(
 				'id'      => 'old-contextual-help',
 				'title'   => __('Overview'),
 				'content' => $old_help,
-			) );
+			));
 		}
 
 		$help_sidebar = $this->get_help_sidebar();
 
 		$help_class = 'hidden';
-		if ( ! $help_sidebar )
+		if ( ! $help_sidebar)
 			$help_class .= ' no-sidebar';
 
 		// Time to render!
 		?>
 		<div id="screen-meta" class="metabox-prefs">
 
-			<div id="contextual-help-wrap" class="<?php echo esc_attr( $help_class ); ?>" tabindex="-1" aria-label="<?php esc_attr_e('Contextual Help Tab'); ?>">
+			<div id="contextual-help-wrap" class="<?php echo esc_attr($help_class); ?>" tabindex="-1" aria-label="<?php esc_attr_e('Contextual Help Tab'); ?>">
 				<div id="contextual-help-back"></div>
 				<div id="contextual-help-columns">
 					<div class="contextual-help-tabs">
 						<ul>
 						<?php
 						$class = ' class="active"';
-						foreach ( $this->get_help_tabs() as $tab ) :
+						foreach ($this->get_help_tabs() as $tab) :
 							$link_id  = "tab-link-{$tab['id']}";
 							$panel_id = "tab-panel-{$tab['id']}";
 							?>
 
-							<li id="<?php echo esc_attr( $link_id ); ?>"<?php echo $class; ?>>
-								<a href="<?php echo esc_url( "#$panel_id" ); ?>" aria-controls="<?php echo esc_attr( $panel_id ); ?>">
-									<?php echo esc_html( $tab['title'] ); ?>
+							<li id="<?php echo esc_attr($link_id); ?>"<?php echo $class; ?>>
+								<a href="<?php echo esc_url("#$panel_id"); ?>" aria-controls="<?php echo esc_attr($panel_id); ?>">
+									<?php echo esc_html($tab['title']); ?>
 								</a>
 							</li>
 						<?php
@@ -818,7 +818,7 @@ 
 						</ul>
 					</div>
 
-					<?php if ( $help_sidebar ) : ?>
+					<?php if ($help_sidebar) : ?>
 					<div class="contextual-help-sidebar">
 						<?php echo $help_sidebar; ?>
 					</div>
@@ -827,18 +827,18 @@ 
 					<div class="contextual-help-tabs-wrap">
 						<?php
 						$classes = 'help-tab-content active';
-						foreach ( $this->get_help_tabs() as $tab ):
+						foreach ($this->get_help_tabs() as $tab):
 							$panel_id = "tab-panel-{$tab['id']}";
 							?>
 
-							<div id="<?php echo esc_attr( $panel_id ); ?>" class="<?php echo $classes; ?>">
+							<div id="<?php echo esc_attr($panel_id); ?>" class="<?php echo $classes; ?>">
 								<?php
 								// Print tab content.
 								echo $tab['content'];
 
 								// If it exists, fire tab callback.
-								if ( ! empty( $tab['callback'] ) )
-									call_user_func_array( $tab['callback'], array( $this, $tab ) );
+								if ( ! empty($tab['callback']))
+									call_user_func_array($tab['callback'], array($this, $tab));
 								?>
 							</div>
 						<?php
@@ -863,37 +863,37 @@ 
 		 * @param string    $screen_id     Screen ID.
 		 * @param WP_Screen $this          Current WP_Screen instance.
 		 */
-		$columns = apply_filters( 'screen_layout_columns', array(), $this->id, $this );
+		$columns = apply_filters('screen_layout_columns', array(), $this->id, $this);
 
-		if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) )
-			$this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
+		if ( ! empty($columns) && isset($columns[$this->id]))
+			$this->add_option('layout_columns', array('max' => $columns[$this->id]));
 
-		if ( $this->get_option( 'layout_columns' ) ) {
+		if ($this->get_option('layout_columns')) {
 			$this->columns = (int) get_user_option("screen_layout_$this->id");
 
-			if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) )
-				$this->columns = $this->get_option( 'layout_columns', 'default' );
+			if ( ! $this->columns && $this->get_option('layout_columns', 'default'))
+				$this->columns = $this->get_option('layout_columns', 'default');
 		}
-		$GLOBALS[ 'screen_layout_columns' ] = $this->columns; // Set the global for back-compat.
+		$GLOBALS['screen_layout_columns'] = $this->columns; // Set the global for back-compat.
 
 		// Add screen options
-		if ( $this->show_screen_options() )
+		if ($this->show_screen_options())
 			$this->render_screen_options();
 		?>
 		</div>
 		<?php
-		if ( ! $this->get_help_tabs() && ! $this->show_screen_options() )
+		if ( ! $this->get_help_tabs() && ! $this->show_screen_options())
 			return;
 		?>
 		<div id="screen-meta-links">
-		<?php if ( $this->get_help_tabs() ) : ?>
+		<?php if ($this->get_help_tabs()) : ?>
 			<div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
-			<button type="button" id="contextual-help-link" class="button show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e( 'Help' ); ?></button>
+			<button type="button" id="contextual-help-link" class="button show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e('Help'); ?></button>
 			</div>
 		<?php endif;
-		if ( $this->show_screen_options() ) : ?>
+		if ($this->show_screen_options()) : ?>
 			<div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
-			<button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button>
+			<button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e('Screen Options'); ?></button>
 			</div>
 		<?php endif; ?>
 		</div>
@@ -909,22 +909,22 @@ 
 	public function show_screen_options() {
 		global $wp_meta_boxes;
 
-		if ( is_bool( $this->_show_screen_options ) )
+		if (is_bool($this->_show_screen_options))
 			return $this->_show_screen_options;
 
-		$columns = get_column_headers( $this );
+		$columns = get_column_headers($this);
 
-		$show_screen = ! empty( $wp_meta_boxes[ $this->id ] ) || $columns || $this->get_option( 'per_page' );
+		$show_screen = ! empty($wp_meta_boxes[$this->id]) || $columns || $this->get_option('per_page');
 
-		switch ( $this->base ) {
+		switch ($this->base) {
 			case 'widgets':
-				$nonce = wp_create_nonce( 'widgets-access' );
-				$this->_screen_settings = '<p><a id="access-on" href="widgets.php?widgets-access=on&_wpnonce=' . urlencode( $nonce ) . '">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off&_wpnonce=' . urlencode( $nonce ) . '">' . __('Disable accessibility mode') . "</a></p>\n";
+				$nonce = wp_create_nonce('widgets-access');
+				$this->_screen_settings = '<p><a id="access-on" href="widgets.php?widgets-access=on&_wpnonce='.urlencode($nonce).'">'.__('Enable accessibility mode').'</a><a id="access-off" href="widgets.php?widgets-access=off&_wpnonce='.urlencode($nonce).'">'.__('Disable accessibility mode')."</a></p>\n";
 				break;
 			case 'post' :
-				$expand = '<fieldset class="editor-expand hidden"><legend>' . __( 'Additional settings' ) . '</legend><label for="editor-expand-toggle">';
-				$expand .= '<input type="checkbox" id="editor-expand-toggle"' . checked( get_user_setting( 'editor_expand', 'on' ), 'on', false ) . ' />';
-				$expand .= __( 'Enable full-height editor and distraction-free functionality.' ) . '</label></fieldset>';
+				$expand = '<fieldset class="editor-expand hidden"><legend>'.__('Additional settings').'</legend><label for="editor-expand-toggle">';
+				$expand .= '<input type="checkbox" id="editor-expand-toggle"'.checked(get_user_setting('editor_expand', 'on'), 'on', false).' />';
+				$expand .= __('Enable full-height editor and distraction-free functionality.').'</label></fieldset>';
 				$this->_screen_settings = $expand;
 				break;
 			default:
@@ -943,9 +943,9 @@ 
 		 * @param string    $screen_settings Screen settings.
 		 * @param WP_Screen $this            WP_Screen object.
 		 */
-		$this->_screen_settings = apply_filters( 'screen_settings', $this->_screen_settings, $this );
+		$this->_screen_settings = apply_filters('screen_settings', $this->_screen_settings, $this);
 
-		if ( $this->_screen_settings || $this->_options )
+		if ($this->_screen_settings || $this->_options)
 			$show_screen = true;
 
 		/**
@@ -957,7 +957,7 @@ 
 		 *                               Default true.
 		 * @param WP_Screen $this        Current WP_Screen instance.
 		 */
-		$this->_show_screen_options = apply_filters( 'screen_options_show_screen', $show_screen, $this );
+		$this->_show_screen_options = apply_filters('screen_options_show_screen', $show_screen, $this);
 		return $this->_show_screen_options;
 	}
 
@@ -970,26 +970,26 @@ 
 	 *     @type bool $wrap  Whether the screen-options-wrap div will be included. Defaults to true.
 	 * }
 	 */
-	public function render_screen_options( $options = array() ) {
-		$options = wp_parse_args( $options, array(
+	public function render_screen_options($options = array()) {
+		$options = wp_parse_args($options, array(
 			'wrap' => true,
-		) );
+		));
 
 		$wrapper_start = $wrapper_end = $form_start = $form_end = '';
 
 		// Output optional wrapper.
-		if ( $options['wrap'] ) {
-			$wrapper_start = '<div id="screen-options-wrap" class="hidden" tabindex="-1" aria-label="' . esc_attr__( 'Screen Options Tab' ) . '">';
+		if ($options['wrap']) {
+			$wrapper_start = '<div id="screen-options-wrap" class="hidden" tabindex="-1" aria-label="'.esc_attr__('Screen Options Tab').'">';
 			$wrapper_end = '</div>';
 		}
 
 		// Don't output the form and nonce for the widgets accessibility mode links.
-		if ( 'widgets' !== $this->base ) {
+		if ('widgets' !== $this->base) {
 			$form_start = "\n<form id='adv-settings' method='post'>\n";
-			$form_end = "\n" . wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false, false ) . "\n</form>\n";
+			$form_end = "\n".wp_nonce_field('screen-options-nonce', 'screenoptionnonce', false, false)."\n</form>\n";
 		}
 
-		echo $wrapper_start . $form_start;
+		echo $wrapper_start.$form_start;
 
 		$this->render_meta_boxes_preferences();
 		$this->render_list_table_columns_preferences();
@@ -1007,13 +1007,13 @@ 
 		 *                               Default false.
 		 * @param WP_Screen $this        Current WP_Screen instance.
 		 */
-		$show_button = apply_filters( 'screen_options_show_submit', false, $this );
+		$show_button = apply_filters('screen_options_show_submit', false, $this);
 
-		if ( $show_button ) {
-			submit_button( __( 'Apply' ), 'primary', 'screen-options-apply', true );
+		if ($show_button) {
+			submit_button(__('Apply'), 'primary', 'screen-options-apply', true);
 		}
 
-		echo $form_end . $wrapper_end;
+		echo $form_end.$wrapper_end;
 	}
 
 	/**
@@ -1026,28 +1026,28 @@ 
 	public function render_meta_boxes_preferences() {
 		global $wp_meta_boxes;
 
-		if ( ! isset( $wp_meta_boxes[ $this->id ] ) ) {
+		if ( ! isset($wp_meta_boxes[$this->id])) {
 			return;
 		}
 		?>
 		<fieldset class="metabox-prefs">
-		<legend><?php _e( 'Boxes' ); ?></legend>
+		<legend><?php _e('Boxes'); ?></legend>
 		<?php
-			meta_box_prefs( $this );
+			meta_box_prefs($this);
 
-			if ( 'dashboard' === $this->id && has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) {
-				if ( isset( $_GET['welcome'] ) ) {
-					$welcome_checked = empty( $_GET['welcome'] ) ? 0 : 1;
-					update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked );
+			if ('dashboard' === $this->id && has_action('welcome_panel') && current_user_can('edit_theme_options')) {
+				if (isset($_GET['welcome'])) {
+					$welcome_checked = empty($_GET['welcome']) ? 0 : 1;
+					update_user_meta(get_current_user_id(), 'show_welcome_panel', $welcome_checked);
 				} else {
-					$welcome_checked = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
-					if ( 2 == $welcome_checked && wp_get_current_user()->user_email != get_option( 'admin_email' ) ) {
+					$welcome_checked = get_user_meta(get_current_user_id(), 'show_welcome_panel', true);
+					if (2 == $welcome_checked && wp_get_current_user()->user_email != get_option('admin_email')) {
 						$welcome_checked = false;
 					}
 				}
 				echo '<label for="wp_welcome_panel-hide">';
-				echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
-				echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n";
+				echo '<input type="checkbox" id="wp_welcome_panel-hide"'.checked((bool) $welcome_checked, true, false).' />';
+				echo _x('Welcome', 'Welcome panel')."</label>\n";
 			}
 		?>
 		</fieldset>
@@ -1061,37 +1061,37 @@ 
 	 */
 	public function render_list_table_columns_preferences() {
 
-		$columns = get_column_headers( $this );
-		$hidden  = get_hidden_columns( $this );
+		$columns = get_column_headers($this);
+		$hidden  = get_hidden_columns($this);
 
-		if ( ! $columns ) {
+		if ( ! $columns) {
 			return;
 		}
 
-		$legend = ! empty( $columns['_title'] ) ? $columns['_title'] : __( 'Columns' );
+		$legend = ! empty($columns['_title']) ? $columns['_title'] : __('Columns');
 		?>
 		<fieldset class="metabox-prefs">
 		<legend><?php echo $legend; ?></legend>
 		<?php
-		$special = array( '_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname' );
+		$special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname');
 
-		foreach ( $columns as $column => $title ) {
+		foreach ($columns as $column => $title) {
 			// Can't hide these for they are special
-			if ( in_array( $column, $special ) ) {
+			if (in_array($column, $special)) {
 				continue;
 			}
 
-			if ( empty( $title ) ) {
+			if (empty($title)) {
 				continue;
 			}
 
-			if ( 'comments' == $column ) {
-				$title = __( 'Comments' );
+			if ('comments' == $column) {
+				$title = __('Comments');
 			}
 
 			$id = "$column-hide";
 			echo '<label>';
-			echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( ! in_array( $column, $hidden ), true, false ) . ' />';
+			echo '<input class="hide-column-tog" name="'.$id.'" type="checkbox" id="'.$id.'" value="'.$column.'"'.checked( ! in_array($column, $hidden), true, false).' />';
 			echo "$title</label>\n";
 		}
 		?>
@@ -1105,22 +1105,22 @@ 
 	 * @since 3.3.0
 	 */
 	public function render_screen_layout() {
-		if ( ! $this->get_option( 'layout_columns' ) ) {
+		if ( ! $this->get_option('layout_columns')) {
 			return;
 		}
 
 		$screen_layout_columns = $this->get_columns();
-		$num = $this->get_option( 'layout_columns', 'max' );
+		$num = $this->get_option('layout_columns', 'max');
 
 		?>
 		<fieldset class='columns-prefs'>
-		<legend class="screen-layout"><?php _e( 'Layout' ); ?></legend><?php
-			for ( $i = 1; $i <= $num; ++$i ):
+		<legend class="screen-layout"><?php _e('Layout'); ?></legend><?php
+			for ($i = 1; $i <= $num; ++$i):
 				?>
 				<label class="columns-prefs-<?php echo $i; ?>">
-					<input type='radio' name='screen_columns' value='<?php echo esc_attr( $i ); ?>'
-						<?php checked( $screen_layout_columns, $i ); ?> />
-					<?php printf( _n( '%s column', '%s columns', $i ), number_format_i18n( $i ) ); ?>
+					<input type='radio' name='screen_columns' value='<?php echo esc_attr($i); ?>'
+						<?php checked($screen_layout_columns, $i); ?> />
+					<?php printf(_n('%s column', '%s columns', $i), number_format_i18n($i)); ?>
 				</label>
 				<?php
 			endfor; ?>
@@ -1134,60 +1134,60 @@ 
 	 * @since 3.3.0
 	 */
 	public function render_per_page_options() {
-		if ( null === $this->get_option( 'per_page' ) ) {
+		if (null === $this->get_option('per_page')) {
 			return;
 		}
 
-		$per_page_label = $this->get_option( 'per_page', 'label' );
-		if ( null === $per_page_label ) {
-			$per_page_label = __( 'Number of items per page:' );
+		$per_page_label = $this->get_option('per_page', 'label');
+		if (null === $per_page_label) {
+			$per_page_label = __('Number of items per page:');
 		}
 
-		$option = $this->get_option( 'per_page', 'option' );
-		if ( ! $option ) {
-			$option = str_replace( '-', '_', "{$this->id}_per_page" );
+		$option = $this->get_option('per_page', 'option');
+		if ( ! $option) {
+			$option = str_replace('-', '_', "{$this->id}_per_page");
 		}
 
-		$per_page = (int) get_user_option( $option );
-		if ( empty( $per_page ) || $per_page < 1 ) {
-			$per_page = $this->get_option( 'per_page', 'default' );
-			if ( ! $per_page ) {
+		$per_page = (int) get_user_option($option);
+		if (empty($per_page) || $per_page < 1) {
+			$per_page = $this->get_option('per_page', 'default');
+			if ( ! $per_page) {
 				$per_page = 20;
 			}
 		}
 
-		if ( 'edit_comments_per_page' == $option ) {
-			$comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
+		if ('edit_comments_per_page' == $option) {
+			$comment_status = isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all';
 
 			/** This filter is documented in wp-admin/includes/class-wp-comments-list-table.php */
-			$per_page = apply_filters( 'comments_per_page', $per_page, $comment_status );
-		} elseif ( 'categories_per_page' == $option ) {
+			$per_page = apply_filters('comments_per_page', $per_page, $comment_status);
+		} elseif ('categories_per_page' == $option) {
 			/** This filter is documented in wp-admin/includes/class-wp-terms-list-table.php */
-			$per_page = apply_filters( 'edit_categories_per_page', $per_page );
+			$per_page = apply_filters('edit_categories_per_page', $per_page);
 		} else {
 			/** This filter is documented in wp-admin/includes/class-wp-list-table.php */
-			$per_page = apply_filters( "{$option}", $per_page );
+			$per_page = apply_filters("{$option}", $per_page);
 		}
 
 		// Back compat
-		if ( isset( $this->post_type ) ) {
+		if (isset($this->post_type)) {
 			/** This filter is documented in wp-admin/includes/post.php */
-			$per_page = apply_filters( 'edit_posts_per_page', $per_page, $this->post_type );
+			$per_page = apply_filters('edit_posts_per_page', $per_page, $this->post_type);
 		}
 
 		// This needs a submit button
-		add_filter( 'screen_options_show_submit', '__return_true' );
+		add_filter('screen_options_show_submit', '__return_true');
 
 		?>
 		<fieldset class="screen-options">
-		<legend><?php _e( 'Pagination' ); ?></legend>
-			<?php if ( $per_page_label ) : ?>
-				<label for="<?php echo esc_attr( $option ); ?>"><?php echo $per_page_label; ?></label>
+		<legend><?php _e('Pagination'); ?></legend>
+			<?php if ($per_page_label) : ?>
+				<label for="<?php echo esc_attr($option); ?>"><?php echo $per_page_label; ?></label>
 				<input type="number" step="1" min="1" max="999" class="screen-per-page" name="wp_screen_options[value]"
-					id="<?php echo esc_attr( $option ); ?>" maxlength="3"
-					value="<?php echo esc_attr( $per_page ); ?>" />
+					id="<?php echo esc_attr($option); ?>" maxlength="3"
+					value="<?php echo esc_attr($per_page); ?>" />
 			<?php endif; ?>
-				<input type="hidden" name="wp_screen_options[option]" value="<?php echo esc_attr( $option ); ?>" />
+				<input type="hidden" name="wp_screen_options[option]" value="<?php echo esc_attr($option); ?>" />
 		</fieldset>
 		<?php
 	}
@@ -1203,11 +1203,11 @@ 
 		$screen = get_current_screen();
 
 		// Currently only enabled for posts lists
-		if ( 'edit' !== $screen->base ) {
+		if ('edit' !== $screen->base) {
 			return;
 		}
 
-		$view_mode_post_types = get_post_types( array( 'hierarchical' => false, 'show_ui' => true ) );
+		$view_mode_post_types = get_post_types(array('hierarchical' => false, 'show_ui' => true));
 
 		/**
 		 * Filters the post types that have different view mode options.
@@ -1217,26 +1217,26 @@ 
 		 * @param array $view_mode_post_types Array of post types that can change view modes.
 		 *                                    Default hierarchical post types with show_ui on.
 		 */
-		$view_mode_post_types = apply_filters( 'view_mode_post_types', $view_mode_post_types );
+		$view_mode_post_types = apply_filters('view_mode_post_types', $view_mode_post_types);
 
-		if ( ! in_array( $this->post_type, $view_mode_post_types ) ) {
+		if ( ! in_array($this->post_type, $view_mode_post_types)) {
 			return;
 		}
 
 		global $mode;
 
 		// This needs a submit button
-		add_filter( 'screen_options_show_submit', '__return_true' );
+		add_filter('screen_options_show_submit', '__return_true');
 ?>
 		<fieldset class="metabox-prefs view-mode">
-		<legend><?php _e( 'View Mode' ); ?></legend>
+		<legend><?php _e('View Mode'); ?></legend>
 				<label for="list-view-mode">
-					<input id="list-view-mode" type="radio" name="mode" value="list" <?php checked( 'list', $mode ); ?> />
-					<?php _e( 'List View' ); ?>
+					<input id="list-view-mode" type="radio" name="mode" value="list" <?php checked('list', $mode); ?> />
+					<?php _e('List View'); ?>
 				</label>
 				<label for="excerpt-view-mode">
-					<input id="excerpt-view-mode" type="radio" name="mode" value="excerpt" <?php checked( 'excerpt', $mode ); ?> />
-					<?php _e( 'Excerpt View' ); ?>
+					<input id="excerpt-view-mode" type="radio" name="mode" value="excerpt" <?php checked('excerpt', $mode); ?> />
+					<?php _e('Excerpt View'); ?>
 				</label>
 		</fieldset>
 <?php
@@ -1250,11 +1250,11 @@ 
 	 * @param string $key The screen reader text array named key.
 	 * @param string $tag Optional. The HTML tag to wrap the screen reader text. Default h2.
 	 */
-	public function render_screen_reader_content( $key = '', $tag = 'h2' ) {
+	public function render_screen_reader_content($key = '', $tag = 'h2') {
 
-		if ( ! isset( $this->_screen_reader_content[ $key ] ) ) {
+		if ( ! isset($this->_screen_reader_content[$key])) {
 			return;
 		}
-		echo "<$tag class='screen-reader-text'>" . $this->_screen_reader_content[ $key ] . "</$tag>";
+		echo "<$tag class='screen-reader-text'>".$this->_screen_reader_content[$key]."</$tag>";
 	}
 }

Braces +99 added lines, -70 removed lines

@@ -223,18 +223,20 @@ 
 		$in_admin = false;
 		$action = '';
 
-		if ( $hook_name )
-			$id = $hook_name;
-		else
-			$id = $GLOBALS['hook_suffix'];
+		if ( $hook_name ) {
+					$id = $hook_name;
+		} else {
+					$id = $GLOBALS['hook_suffix'];
+		}
 
 		// For those pesky meta boxes.
 		if ( $hook_name && post_type_exists( $hook_name ) ) {
 			$post_type = $id;
 			$id = 'post'; // changes later. ends up being $base.
 		} else {
-			if ( '.php' == substr( $id, -4 ) )
-				$id = substr( $id, 0, -4 );
+			if ( '.php' == substr( $id, -4 ) ) {
+							$id = substr( $id, 0, -4 );
+			}
 
 			if ( 'post-new' == $id || 'link-add' == $id || 'media-new' == $id || 'user-new' == $id ) {
 				$id = substr( $id, 0, -4 );
@@ -263,50 +265,58 @@ 
 				}
 			}
 
-			if ( ! $in_admin )
-				$in_admin = 'site';
+			if ( ! $in_admin ) {
+							$in_admin = 'site';
+			}
 		} else {
-			if ( defined( 'WP_NETWORK_ADMIN' ) && WP_NETWORK_ADMIN )
-				$in_admin = 'network';
-			elseif ( defined( 'WP_USER_ADMIN' ) && WP_USER_ADMIN )
-				$in_admin = 'user';
-			else
-				$in_admin = 'site';
+			if ( defined( 'WP_NETWORK_ADMIN' ) && WP_NETWORK_ADMIN ) {
+							$in_admin = 'network';
+			} elseif ( defined( 'WP_USER_ADMIN' ) && WP_USER_ADMIN ) {
+							$in_admin = 'user';
+			} else {
+							$in_admin = 'site';
+			}
 		}
 
-		if ( 'index' == $id )
-			$id = 'dashboard';
-		elseif ( 'front' == $id )
-			$in_admin = false;
+		if ( 'index' == $id ) {
+					$id = 'dashboard';
+		} elseif ( 'front' == $id ) {
+					$in_admin = false;
+		}
 
 		$base = $id;
 
 		// If this is the current screen, see if we can be more accurate for post types and taxonomies.
 		if ( ! $hook_name ) {
-			if ( isset( $_REQUEST['post_type'] ) )
-				$post_type = post_type_exists( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : false;
-			if ( isset( $_REQUEST['taxonomy'] ) )
-				$taxonomy = taxonomy_exists( $_REQUEST['taxonomy'] ) ? $_REQUEST['taxonomy'] : false;
+			if ( isset( $_REQUEST['post_type'] ) ) {
+							$post_type = post_type_exists( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : false;
+			}
+			if ( isset( $_REQUEST['taxonomy'] ) ) {
+							$taxonomy = taxonomy_exists( $_REQUEST['taxonomy'] ) ? $_REQUEST['taxonomy'] : false;
+			}
 
 			switch ( $base ) {
 				case 'post' :
-					if ( isset( $_GET['post'] ) )
-						$post_id = (int) $_GET['post'];
-					elseif ( isset( $_POST['post_ID'] ) )
-						$post_id = (int) $_POST['post_ID'];
-					else
-						$post_id = 0;
+					if ( isset( $_GET['post'] ) ) {
+											$post_id = (int) $_GET['post'];
+					} elseif ( isset( $_POST['post_ID'] ) ) {
+											$post_id = (int) $_POST['post_ID'];
+					} else {
+											$post_id = 0;
+					}
 
 					if ( $post_id ) {
 						$post = get_post( $post_id );
-						if ( $post )
-							$post_type = $post->post_type;
+						if ( $post ) {
+													$post_type = $post->post_type;
+						}
 					}
 					break;
 				case 'edit-tags' :
 				case 'term' :
-					if ( null === $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
-						$post_type = 'post';
+					if ( null === $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) ) {
+											$post_type = 'post';
+					}
 					break;
 				case 'upload':
 					$post_type = 'attachment';
@@ -316,24 +326,28 @@ 
 
 		switch ( $base ) {
 			case 'post' :
-				if ( null === $post_type )
-					$post_type = 'post';
+				if ( null === $post_type ) {
+									$post_type = 'post';
+				}
 				$id = $post_type;
 				break;
 			case 'edit' :
-				if ( null === $post_type )
-					$post_type = 'post';
+				if ( null === $post_type ) {
+									$post_type = 'post';
+				}
 				$id .= '-' . $post_type;
 				break;
 			case 'edit-tags' :
 			case 'term' :
-				if ( null === $taxonomy )
-					$taxonomy = 'post_tag';
+				if ( null === $taxonomy ) {
+									$taxonomy = 'post_tag';
+				}
 				// The edit-tags ID does not contain the post type. Look for it in the request.
 				if ( null === $post_type ) {
 					$post_type = 'post';
-					if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
-						$post_type = $_REQUEST['post_type'];
+					if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) ) {
+											$post_type = $_REQUEST['post_type'];
+					}
 				}
 
 				$id = 'edit-' . $taxonomy;
@@ -350,8 +364,9 @@ 
 
 		if ( isset( self::$_registry[ $id ] ) ) {
 			$screen = self::$_registry[ $id ];
-			if ( $screen === get_current_screen() )
-				return $screen;
+			if ( $screen === get_current_screen() ) {
+							return $screen;
+			}
 		} else {
 			$screen = new WP_Screen();
 			$screen->id     = $id;
@@ -414,8 +429,9 @@ 
 	 * @return bool True if the screen is in the indicated admin, false otherwise.
 	 */
 	public function in_admin( $admin = null ) {
-		if ( empty( $admin ) )
-			return (bool) $this->in_admin;
+		if ( empty( $admin ) ) {
+					return (bool) $this->in_admin;
+		}
 
 		return ( $admin == $this->in_admin );
 	}
@@ -503,11 +519,13 @@ 
 	 * @return string The option value if set, null otherwise.
 	 */
 	public function get_option( $option, $key = false ) {
-		if ( ! isset( $this->_options[ $option ] ) )
-			return null;
+		if ( ! isset( $this->_options[ $option ] ) ) {
+					return null;
+		}
 		if ( $key ) {
-			if ( isset( $this->_options[ $option ][ $key ] ) )
-				return $this->_options[ $option ][ $key ];
+			if ( isset( $this->_options[ $option ][ $key ] ) ) {
+							return $this->_options[ $option ][ $key ];
+			}
 			return null;
 		}
 		return $this->_options[ $option ];
@@ -554,8 +572,9 @@ 
 	 * @return array Help tab arguments.
 	 */
 	public function get_help_tab( $id ) {
-		if ( ! isset( $this->_help_tabs[ $id ] ) )
-			return null;
+		if ( ! isset( $this->_help_tabs[ $id ] ) ) {
+					return null;
+		}
 		return $this->_help_tabs[ $id ];
 	}
 
@@ -589,8 +608,9 @@ 
 		$args['id'] = sanitize_html_class( $args['id'] );
 
 		// Ensure we have an ID and title.
-		if ( ! $args['id'] || ! $args['title'] )
-			return;
+		if ( ! $args['id'] || ! $args['title'] ) {
+					return;
+		}
 
 		// Allows for overriding an existing tab with that ID.
 		$this->_help_tabs[ $args['id'] ] = $args;
@@ -772,8 +792,9 @@ 
 			 * @param string $old_help_default Default contextual help text.
 			 */
 			$default_help = apply_filters( 'default_contextual_help', '' );
-			if ( $default_help )
-				$old_help = '<p>' . $default_help . '</p>';
+			if ( $default_help ) {
+							$old_help = '<p>' . $default_help . '</p>';
+			}
 		}
 
 		if ( $old_help ) {
@@ -787,8 +808,9 @@ 
 		$help_sidebar = $this->get_help_sidebar();
 
 		$help_class = 'hidden';
-		if ( ! $help_sidebar )
-			$help_class .= ' no-sidebar';
+		if ( ! $help_sidebar ) {
+					$help_class .= ' no-sidebar';
+		}
 
 		// Time to render!
 		?>
@@ -837,8 +859,9 @@ 
 								echo $tab['content'];
 
 								// If it exists, fire tab callback.
-								if ( ! empty( $tab['callback'] ) )
-									call_user_func_array( $tab['callback'], array( $this, $tab ) );
+								if ( ! empty( $tab['callback'] ) ) {
+																	call_user_func_array( $tab['callback'], array( $this, $tab ) );
+								}
 								?>
 							</div>
 						<?php
@@ -865,25 +888,29 @@ 
 		 */
 		$columns = apply_filters( 'screen_layout_columns', array(), $this->id, $this );
 
-		if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) )
-			$this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
+		if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) ) {
+					$this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
+		}
 
 		if ( $this->get_option( 'layout_columns' ) ) {
 			$this->columns = (int) get_user_option("screen_layout_$this->id");
 
-			if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) )
-				$this->columns = $this->get_option( 'layout_columns', 'default' );
+			if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) ) {
+							$this->columns = $this->get_option( 'layout_columns', 'default' );
+			}
 		}
 		$GLOBALS[ 'screen_layout_columns' ] = $this->columns; // Set the global for back-compat.
 
 		// Add screen options
-		if ( $this->show_screen_options() )
-			$this->render_screen_options();
+		if ( $this->show_screen_options() ) {
+					$this->render_screen_options();
+		}
 		?>
 		</div>
 		<?php
-		if ( ! $this->get_help_tabs() && ! $this->show_screen_options() )
-			return;
+		if ( ! $this->get_help_tabs() && ! $this->show_screen_options() ) {
+					return;
+		}
 		?>
 		<div id="screen-meta-links">
 		<?php if ( $this->get_help_tabs() ) : ?>
@@ -909,8 +936,9 @@ 
 	public function show_screen_options() {
 		global $wp_meta_boxes;
 
-		if ( is_bool( $this->_show_screen_options ) )
-			return $this->_show_screen_options;
+		if ( is_bool( $this->_show_screen_options ) ) {
+					return $this->_show_screen_options;
+		}
 
 		$columns = get_column_headers( $this );
 
@@ -945,8 +973,9 @@ 
 		 */
 		$this->_screen_settings = apply_filters( 'screen_settings', $this->_screen_settings, $this );
 
-		if ( $this->_screen_settings || $this->_options )
-			$show_screen = true;
+		if ( $this->_screen_settings || $this->_options ) {
+					$show_screen = true;
+		}
 
 		/**
 		 * Filters whether to show the Screen Options tab.

src/wp-admin/includes/class-wp-internal-pointers.php

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param string $hook_suffix The current admin page.
 	 */
-	public static function enqueue_scripts( $hook_suffix ) {
+	public static function enqueue_scripts($hook_suffix) {
 		/*
 		 * Register feature pointers
 		 *
@@ -47,10 +47,10 @@ 
 		);
 
 		// Check if screen related pointer is registered
-		if ( empty( $registered_pointers[ $hook_suffix ] ) )
+		if (empty($registered_pointers[$hook_suffix]))
 			return;
 
-		$pointers = (array) $registered_pointers[ $hook_suffix ];
+		$pointers = (array) $registered_pointers[$hook_suffix];
 
 		/*
 		 * Specify required capabilities for feature pointers
@@ -70,28 +70,28 @@ 
 		);
 
 		// Get dismissed pointers
-		$dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
+		$dismissed = explode(',', (string) get_user_meta(get_current_user_id(), 'dismissed_wp_pointers', true));
 
 		$got_pointers = false;
-		foreach ( array_diff( $pointers, $dismissed ) as $pointer ) {
-			if ( isset( $caps_required[ $pointer ] ) ) {
-				foreach ( $caps_required[ $pointer ] as $cap ) {
-					if ( ! current_user_can( $cap ) )
+		foreach (array_diff($pointers, $dismissed) as $pointer) {
+			if (isset($caps_required[$pointer])) {
+				foreach ($caps_required[$pointer] as $cap) {
+					if ( ! current_user_can($cap))
 						continue 2;
 				}
 			}
 
 			// Bind pointer print function
-			add_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_' . $pointer ) );
+			add_action('admin_print_footer_scripts', array('WP_Internal_Pointers', 'pointer_'.$pointer));
 			$got_pointers = true;
 		}
 
-		if ( ! $got_pointers )
+		if ( ! $got_pointers)
 			return;
 
 		// Add pointers script and style to queue
-		wp_enqueue_style( 'wp-pointer' );
-		wp_enqueue_script( 'wp-pointer' );
+		wp_enqueue_style('wp-pointer');
+		wp_enqueue_script('wp-pointer');
 	}
 
 	/**
@@ -105,14 +105,14 @@ 
 	 * @param string $selector The HTML elements, on which the pointer should be attached.
 	 * @param array  $args Arguments to be passed to the pointer JS (see wp-pointer.js).
 	 */
-	private static function print_js( $pointer_id, $selector, $args ) {
-		if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) )
+	private static function print_js($pointer_id, $selector, $args) {
+		if (empty($pointer_id) || empty($selector) || empty($args) || empty($args['content']))
 			return;
 
 		?>
 		<script type="text/javascript">
 		(function($){
-			var options = <?php echo wp_json_encode( $args ); ?>, setup;
+			var options = <?php echo wp_json_encode($args); ?>, setup;
 
 			if ( ! options )
 				return;
@@ -160,7 +160,7 @@ 
 	 *
 	 * @param int $user_id User ID.
 	 */
-	public static function dismiss_pointers_for_new_users( $user_id ) {
-		add_user_meta( $user_id, 'dismissed_wp_pointers', '' );
+	public static function dismiss_pointers_for_new_users($user_id) {
+		add_user_meta($user_id, 'dismissed_wp_pointers', '');
 	}
 }

Braces +12 added lines, -8 removed lines

@@ -47,8 +47,9 @@ 
 		);
 
 		// Check if screen related pointer is registered
-		if ( empty( $registered_pointers[ $hook_suffix ] ) )
-			return;
+		if ( empty( $registered_pointers[ $hook_suffix ] ) ) {
+					return;
+		}
 
 		$pointers = (array) $registered_pointers[ $hook_suffix ];
 
@@ -76,8 +77,9 @@ 
 		foreach ( array_diff( $pointers, $dismissed ) as $pointer ) {
 			if ( isset( $caps_required[ $pointer ] ) ) {
 				foreach ( $caps_required[ $pointer ] as $cap ) {
-					if ( ! current_user_can( $cap ) )
-						continue 2;
+					if ( ! current_user_can( $cap ) ) {
+											continue 2;
+					}
 				}
 			}
 
@@ -86,8 +88,9 @@ 
 			$got_pointers = true;
 		}
 
-		if ( ! $got_pointers )
-			return;
+		if ( ! $got_pointers ) {
+					return;
+		}
 
 		// Add pointers script and style to queue
 		wp_enqueue_style( 'wp-pointer' );
@@ -106,8 +109,9 @@ 
 	 * @param array  $args Arguments to be passed to the pointer JS (see wp-pointer.js).
 	 */
 	private static function print_js( $pointer_id, $selector, $args ) {
-		if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) )
-			return;
+		if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) ) {
+					return;
+		}
 
 		?>
 		<script type="text/javascript">

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

Spacing +30 added lines, -30 removed lines

@@ -18,8 +18,8 @@ 
 	 *
 	 * @param array $fields
 	 */
-	public function __construct( $fields = false ) {
-		if ( $fields ) {
+	public function __construct($fields = false) {
+		if ($fields) {
 			$this->db_fields = $fields;
 		}
 	}
@@ -35,8 +35,8 @@ 
 	 * @param int    $depth  Depth of page. Used for padding.
 	 * @param array  $args   Not used.
 	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		$indent = str_repeat( "\t", $depth );
+	public function start_lvl(&$output, $depth = 0, $args = array()) {
+		$indent = str_repeat("\t", $depth);
 		$output .= "\n$indent<ul class='children'>\n";
 	}
 
@@ -51,8 +51,8 @@ 
 	 * @param int    $depth  Depth of page. Used for padding.
 	 * @param array  $args   Not used.
 	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {
-		$indent = str_repeat( "\t", $depth );
+	public function end_lvl(&$output, $depth = 0, $args = array()) {
+		$indent = str_repeat("\t", $depth);
 		$output .= "\n$indent</ul>";
 	}
 
@@ -71,47 +71,47 @@ 
 	 * @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 $_nav_menu_placeholder;
 
-		$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-		$possible_object_id = isset( $item->post_type ) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_nav_menu_placeholder;
-		$possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
+		$_nav_menu_placeholder = (0 > $_nav_menu_placeholder) ? intval($_nav_menu_placeholder) - 1 : -1;
+		$possible_object_id = isset($item->post_type) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_nav_menu_placeholder;
+		$possible_db_id = ( ! empty($item->ID)) && (0 < $possible_object_id) ? (int) $item->ID : 0;
 
-		$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
+		$indent = ($depth) ? str_repeat("\t", $depth) : '';
 
-		$output .= $indent . '<li>';
+		$output .= $indent.'<li>';
 		$output .= '<label class="menu-item-title">';
 		$output .= '<input type="checkbox" class="menu-item-checkbox';
 
-		if ( ! empty( $item->front_or_home ) )
+		if ( ! empty($item->front_or_home))
 			$output .= ' add-to-top';
 
-		$output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="'. esc_attr( $item->object_id ) .'" /> ';
+		$output .= '" name="menu-item['.$possible_object_id.'][menu-item-object-id]" value="'.esc_attr($item->object_id).'" /> ';
 
-		if ( ! empty( $item->label ) ) {
+		if ( ! empty($item->label)) {
 			$title = $item->label;
-		} elseif ( isset( $item->post_type ) ) {
+		} elseif (isset($item->post_type)) {
 			/** This filter is documented in wp-includes/post-template.php */
-			$title = apply_filters( 'the_title', $item->post_title, $item->ID );
-			if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title )
-				$title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $title );
+			$title = apply_filters('the_title', $item->post_title, $item->ID);
+			if ( ! empty($item->front_or_home) && _x('Home', 'nav menu home label') !== $title)
+				$title = sprintf(_x('Home: %s', 'nav menu front page title'), $title);
 		}
 
-		$output .= isset( $title ) ? esc_html( $title ) : esc_html( $item->title );
+		$output .= isset($title) ? esc_html($title) : esc_html($item->title);
  		$output .= '</label>';
 
 		// Menu item hidden fields
-		$output .= '<input type="hidden" class="menu-item-db-id" name="menu-item[' . $possible_object_id . '][menu-item-db-id]" value="' . $possible_db_id . '" />';
-		$output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="'. esc_attr( $item->object ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="'. esc_attr( $item->menu_item_parent ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-type" name="menu-item[' . $possible_object_id . '][menu-item-type]" value="'. esc_attr( $item->type ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-title" name="menu-item[' . $possible_object_id . '][menu-item-title]" value="'. esc_attr( $item->title ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-url" name="menu-item[' . $possible_object_id . '][menu-item-url]" value="'. esc_attr( $item->url ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-target" name="menu-item[' . $possible_object_id . '][menu-item-target]" value="'. esc_attr( $item->target ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-attr_title" name="menu-item[' . $possible_object_id . '][menu-item-attr_title]" value="'. esc_attr( $item->attr_title ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-classes" name="menu-item[' . $possible_object_id . '][menu-item-classes]" value="'. esc_attr( implode( ' ', $item->classes ) ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-xfn" name="menu-item[' . $possible_object_id . '][menu-item-xfn]" value="'. esc_attr( $item->xfn ) .'" />';
+		$output .= '<input type="hidden" class="menu-item-db-id" name="menu-item['.$possible_object_id.'][menu-item-db-id]" value="'.$possible_db_id.'" />';
+		$output .= '<input type="hidden" class="menu-item-object" name="menu-item['.$possible_object_id.'][menu-item-object]" value="'.esc_attr($item->object).'" />';
+		$output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item['.$possible_object_id.'][menu-item-parent-id]" value="'.esc_attr($item->menu_item_parent).'" />';
+		$output .= '<input type="hidden" class="menu-item-type" name="menu-item['.$possible_object_id.'][menu-item-type]" value="'.esc_attr($item->type).'" />';
+		$output .= '<input type="hidden" class="menu-item-title" name="menu-item['.$possible_object_id.'][menu-item-title]" value="'.esc_attr($item->title).'" />';
+		$output .= '<input type="hidden" class="menu-item-url" name="menu-item['.$possible_object_id.'][menu-item-url]" value="'.esc_attr($item->url).'" />';
+		$output .= '<input type="hidden" class="menu-item-target" name="menu-item['.$possible_object_id.'][menu-item-target]" value="'.esc_attr($item->target).'" />';
+		$output .= '<input type="hidden" class="menu-item-attr_title" name="menu-item['.$possible_object_id.'][menu-item-attr_title]" value="'.esc_attr($item->attr_title).'" />';
+		$output .= '<input type="hidden" class="menu-item-classes" name="menu-item['.$possible_object_id.'][menu-item-classes]" value="'.esc_attr(implode(' ', $item->classes)).'" />';
+		$output .= '<input type="hidden" class="menu-item-xfn" name="menu-item['.$possible_object_id.'][menu-item-xfn]" value="'.esc_attr($item->xfn).'" />';
 	}
 
 } // Walker_Nav_Menu_Checklist

Braces +6 added lines, -4 removed lines

@@ -84,8 +84,9 @@ 
 		$output .= '<label class="menu-item-title">';
 		$output .= '<input type="checkbox" class="menu-item-checkbox';
 
-		if ( ! empty( $item->front_or_home ) )
-			$output .= ' add-to-top';
+		if ( ! empty( $item->front_or_home ) ) {
+					$output .= ' add-to-top';
+		}
 
 		$output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="'. esc_attr( $item->object_id ) .'" /> ';
 
@@ -94,8 +95,9 @@ 
 		} elseif ( isset( $item->post_type ) ) {
 			/** This filter is documented in wp-includes/post-template.php */
 			$title = apply_filters( 'the_title', $item->post_title, $item->ID );
-			if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title )
-				$title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $title );
+			if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title ) {
+							$title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $title );
+			}
 		}
 
 		$output .= isset( $title ) ? esc_html( $title ) : esc_html( $item->title );