ntwb / wordpress

src/wp-admin/includes/class-ftp-pure.php

Spacing +67 added lines, -67 removed lines

@@ -27,11 +27,11 @@ 
  */
 class ftp extends ftp_base {
 
-	function __construct($verb=FALSE, $le=FALSE) {
+	function __construct($verb = FALSE, $le = FALSE) {
 		parent::__construct(false, $verb, $le);
 	}
 
-	function ftp($verb=FALSE, $le=FALSE) {
+	function ftp($verb = FALSE, $le = FALSE) {
 		$this->__construct($verb, $le);
 	}
 
@@ -40,8 +40,8 @@ 
 // <!-- --------------------------------------------------------------------------------------- -->
 
 	function _settimeout($sock) {
-		if(!@stream_set_timeout($sock, $this->_timeout)) {
-			$this->PushError('_settimeout','socket set send timeout');
+		if ( ! @stream_set_timeout($sock, $this->_timeout)) {
+			$this->PushError('_settimeout', 'socket set send timeout');
 			$this->_quit();
 			return FALSE;
 		}
@@ -51,72 +51,72 @@ 
 	function _connect($host, $port) {
 		$this->SendMSG("Creating socket");
 		$sock = @fsockopen($host, $port, $errno, $errstr, $this->_timeout);
-		if (!$sock) {
-			$this->PushError('_connect','socket connect failed', $errstr." (".$errno.")");
+		if ( ! $sock) {
+			$this->PushError('_connect', 'socket connect failed', $errstr." (".$errno.")");
 			return FALSE;
 		}
-		$this->_connected=true;
+		$this->_connected = true;
 		return $sock;
 	}
 
-	function _readmsg($fnction="_readmsg"){
-		if(!$this->_connected) {
+	function _readmsg($fnction = "_readmsg") {
+		if ( ! $this->_connected) {
 			$this->PushError($fnction, 'Connect first');
 			return FALSE;
 		}
-		$result=true;
-		$this->_message="";
-		$this->_code=0;
-		$go=true;
+		$result = true;
+		$this->_message = "";
+		$this->_code = 0;
+		$go = true;
 		do {
-			$tmp=@fgets($this->_ftp_control_sock, 512);
-			if($tmp===false) {
-				$go=$result=false;
-				$this->PushError($fnction,'Read failed');
+			$tmp = @fgets($this->_ftp_control_sock, 512);
+			if ($tmp === false) {
+				$go = $result = false;
+				$this->PushError($fnction, 'Read failed');
 			} else {
-				$this->_message.=$tmp;
-				if(preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) $go=false;
+				$this->_message .= $tmp;
+				if (preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) $go = false;
 			}
-		} while($go);
-		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
-		$this->_code=(int)$regs[1];
+		} while ($go);
+		if ($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		$this->_code = (int) $regs[1];
 		return $result;
 	}
 
-	function _exec($cmd, $fnction="_exec") {
-		if(!$this->_ready) {
-			$this->PushError($fnction,'Connect first');
+	function _exec($cmd, $fnction = "_exec") {
+		if ( ! $this->_ready) {
+			$this->PushError($fnction, 'Connect first');
 			return FALSE;
 		}
-		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
-		$status=@fputs($this->_ftp_control_sock, $cmd.CRLF);
-		if($status===false) {
-			$this->PushError($fnction,'socket write failed');
+		if ($this->LocalEcho) echo "PUT > ", $cmd, CRLF;
+		$status = @fputs($this->_ftp_control_sock, $cmd.CRLF);
+		if ($status === false) {
+			$this->PushError($fnction, 'socket write failed');
 			return FALSE;
 		}
-		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
+		$this->_lastaction = time();
+		if ( ! $this->_readmsg($fnction)) return FALSE;
 		return TRUE;
 	}
 
-	function _data_prepare($mode=FTP_ASCII) {
-		if(!$this->_settype($mode)) return FALSE;
-		if($this->_passive) {
-			if(!$this->_exec("PASV", "pasv")) {
+	function _data_prepare($mode = FTP_ASCII) {
+		if ( ! $this->_settype($mode)) return FALSE;
+		if ($this->_passive) {
+			if ( ! $this->_exec("PASV", "pasv")) {
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!$this->_checkCode()) {
+			if ( ! $this->_checkCode()) {
 				$this->_data_close();
 				return FALSE;
 			}
 			$ip_port = explode(",", ereg_replace("^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*".CRLF."$", "\\1", $this->_message));
-			$this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
-            $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
+			$this->_datahost = $ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
+            $this->_dataport = (((int) $ip_port[4]) << 8) + ((int) $ip_port[5]);
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
-			$this->_ftp_data_sock=@fsockopen($this->_datahost, $this->_dataport, $errno, $errstr, $this->_timeout);
-			if(!$this->_ftp_data_sock) {
-				$this->PushError("_data_prepare","fsockopen fails", $errstr." (".$errno.")");
+			$this->_ftp_data_sock = @fsockopen($this->_datahost, $this->_dataport, $errno, $errstr, $this->_timeout);
+			if ( ! $this->_ftp_data_sock) {
+				$this->PushError("_data_prepare", "fsockopen fails", $errstr." (".$errno.")");
 				$this->_data_close();
 				return FALSE;
 			}
@@ -128,47 +128,47 @@ 
 		return TRUE;
 	}
 
-	function _data_read($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
+	function _data_read($mode = FTP_ASCII, $fp = NULL) {
+		if (is_resource($fp)) $out = 0;
+		else $out = "";
+		if ( ! $this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
 		}
-		while (!feof($this->_ftp_data_sock)) {
-			$block=fread($this->_ftp_data_sock, $this->_ftp_buff_size);
-			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
-			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
-			else $out.=$block;
+		while ( ! feof($this->_ftp_data_sock)) {
+			$block = fread($this->_ftp_data_sock, $this->_ftp_buff_size);
+			if ($mode != FTP_BINARY) $block = preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+			if (is_resource($fp)) $out += fwrite($fp, $block, strlen($block));
+			else $out .= $block;
 		}
 		return $out;
 	}
 
-	function _data_write($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
+	function _data_write($mode = FTP_ASCII, $fp = NULL) {
+		if (is_resource($fp)) $out = 0;
+		else $out = "";
+		if ( ! $this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
 		}
-		if(is_resource($fp)) {
-			while(!feof($fp)) {
-				$block=fread($fp, $this->_ftp_buff_size);
-				if(!$this->_data_write_block($mode, $block)) return false;
+		if (is_resource($fp)) {
+			while ( ! feof($fp)) {
+				$block = fread($fp, $this->_ftp_buff_size);
+				if ( ! $this->_data_write_block($mode, $block)) return false;
 			}
-		} elseif(!$this->_data_write_block($mode, $fp)) return false;
+		} elseif ( ! $this->_data_write_block($mode, $fp)) return false;
 		return TRUE;
 	}
 
 	function _data_write_block($mode, $block) {
-		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		if ($mode != FTP_BINARY) $block = preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
 		do {
-			if(($t=@fwrite($this->_ftp_data_sock, $block))===FALSE) {
-				$this->PushError("_data_write","Can't write to socket");
+			if (($t = @fwrite($this->_ftp_data_sock, $block)) === FALSE) {
+				$this->PushError("_data_write", "Can't write to socket");
 				return FALSE;
 			}
-			$block=substr($block, $t);
-		} while(!empty($block));
+			$block = substr($block, $t);
+		} while ( ! empty($block));
 		return true;
 	}
 
@@ -178,10 +178,10 @@ 
 		return TRUE;
 	}
 
-	function _quit($force=FALSE) {
-		if($this->_connected or $force) {
+	function _quit($force = FALSE) {
+		if ($this->_connected or $force) {
 			@fclose($this->_ftp_control_sock);
-			$this->_connected=false;
+			$this->_connected = false;
 			$this->SendMSG("Socket closed");
 		}
 	}

Braces +44 added lines, -16 removed lines

@@ -75,10 +75,14 @@ 
 				$this->PushError($fnction,'Read failed');
 			} else {
 				$this->_message.=$tmp;
-				if(preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) $go=false;
+				if(preg_match("/^([0-9]{3})(-(.*[".CRLF."]{1,2})+\\1)? [^".CRLF."]+[".CRLF."]{1,2}$/", $this->_message, $regs)) {
+					$go=false;
+				}
 			}
 		} while($go);
-		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		if($this->LocalEcho) {
+			echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		}
 		$this->_code=(int)$regs[1];
 		return $result;
 	}
@@ -88,19 +92,25 @@ 
 			$this->PushError($fnction,'Connect first');
 			return FALSE;
 		}
-		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
+		if($this->LocalEcho) {
+			echo "PUT > ",$cmd,CRLF;
+		}
 		$status=@fputs($this->_ftp_control_sock, $cmd.CRLF);
 		if($status===false) {
 			$this->PushError($fnction,'socket write failed');
 			return FALSE;
 		}
 		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
+		if(!$this->_readmsg($fnction)) {
+			return FALSE;
+		}
 		return TRUE;
 	}
 
 	function _data_prepare($mode=FTP_ASCII) {
-		if(!$this->_settype($mode)) return FALSE;
+		if(!$this->_settype($mode)) {
+			return FALSE;
+		}
 		if($this->_passive) {
 			if(!$this->_exec("PASV", "pasv")) {
 				$this->_data_close();
@@ -119,8 +129,9 @@ 
 				$this->PushError("_data_prepare","fsockopen fails", $errstr." (".$errno.")");
 				$this->_data_close();
 				return FALSE;
+			} else {
+				$this->_ftp_data_sock;
 			}
-			else $this->_ftp_data_sock;
 		} else {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
@@ -129,24 +140,35 @@ 
 	}
 
 	function _data_read($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
+		if(is_resource($fp)) {
+			$out=0;
+		} else {
+			$out="";
+		}
 		if(!$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
 		}
 		while (!feof($this->_ftp_data_sock)) {
 			$block=fread($this->_ftp_data_sock, $this->_ftp_buff_size);
-			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
-			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
-			else $out.=$block;
+			if($mode!=FTP_BINARY) {
+				$block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+			}
+			if(is_resource($fp)) {
+				$out+=fwrite($fp, $block, strlen($block));
+			} else {
+				$out.=$block;
+			}
 		}
 		return $out;
 	}
 
 	function _data_write($mode=FTP_ASCII, $fp=NULL) {
-		if(is_resource($fp)) $out=0;
-		else $out="";
+		if(is_resource($fp)) {
+			$out=0;
+		} else {
+			$out="";
+		}
 		if(!$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			return FALSE;
@@ -154,14 +176,20 @@ 
 		if(is_resource($fp)) {
 			while(!feof($fp)) {
 				$block=fread($fp, $this->_ftp_buff_size);
-				if(!$this->_data_write_block($mode, $block)) return false;
+				if(!$this->_data_write_block($mode, $block)) {
+					return false;
+				}
 			}
-		} elseif(!$this->_data_write_block($mode, $fp)) return false;
+		} elseif(!$this->_data_write_block($mode, $fp)) {
+			return false;
+		}
 		return TRUE;
 	}
 
 	function _data_write_block($mode, $block) {
-		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		if($mode!=FTP_BINARY) {
+			$block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		}
 		do {
 			if(($t=@fwrite($this->_ftp_data_sock, $block))===FALSE) {
 				$this->PushError("_data_write","Can't write to socket");

Doc Comments +3 added lines

@@ -94,6 +94,9 @@
 		return $result;
 	}
 
+	/**
+	 * @param string $cmd
+	 */
 	function _exec($cmd, $fnction="_exec") {
 		if(!$this->_ready) {
 			$this->PushError($fnction,'Connect first');

Indentation +12 added lines, -12 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /**
- * PemFTP - A Ftp implementation in pure PHP
- *
- * @package PemFTP
- * @since 2.5.0
- *
- * @version 1.0
- * @copyright Alexey Dotsenko
- * @author Alexey Dotsenko
- * @link http://www.phpclasses.org/browse/package/1743.html Site
- * @license LGPL http://www.opensource.org/licenses/lgpl-license.html
- */
+			 * PemFTP - A Ftp implementation in pure PHP
+			 *
+			 * @package PemFTP
+			 * @since 2.5.0
+			 *
+			 * @version 1.0
+			 * @copyright Alexey Dotsenko
+			 * @author Alexey Dotsenko
+			 * @link http://www.phpclasses.org/browse/package/1743.html Site
+			 * @license LGPL http://www.opensource.org/licenses/lgpl-license.html
+			 */
 
 /**
  * FTP implementation using fsockopen to connect.
@@ -112,7 +112,7 @@ 
 			}
 			$ip_port = explode(",", preg_replace("/^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*$/s", "\\1", $this->_message));
 			$this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
-            $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
+			$this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
 			$this->_ftp_data_sock=@fsockopen($this->_datahost, $this->_dataport, $errno, $errstr, $this->_timeout);
 			if(!$this->_ftp_data_sock) {

src/wp-admin/includes/taxonomy.php

Spacing +48 added lines, -48 removed lines

@@ -21,9 +21,9 @@ 
  * @param int        $parent   Optional. ID of parent term.
  * @return mixed
  */
-function category_exists( $cat_name, $parent = null ) {
+function category_exists($cat_name, $parent = null) {
 	$id = term_exists($cat_name, 'category', $parent);
-	if ( is_array($id) )
+	if (is_array($id))
 		$id = $id['term_id'];
 	return $id;
 }
@@ -36,9 +36,9 @@ 
  * @param int $id
  * @return object
  */
-function get_category_to_edit( $id ) {
-	$category = get_term( $id, 'category', OBJECT, 'edit' );
-	_make_cat_compat( $category );
+function get_category_to_edit($id) {
+	$category = get_term($id, 'category', OBJECT, 'edit');
+	_make_cat_compat($category);
 	return $category;
 }
 
@@ -51,11 +51,11 @@ 
  * @param int        $parent
  * @return int|WP_Error
  */
-function wp_create_category( $cat_name, $parent = 0 ) {
-	if ( $id = category_exists($cat_name, $parent) )
+function wp_create_category($cat_name, $parent = 0) {
+	if ($id = category_exists($cat_name, $parent))
 		return $id;
 
-	return wp_insert_category( array('cat_name' => $cat_name, 'category_parent' => $parent) );
+	return wp_insert_category(array('cat_name' => $cat_name, 'category_parent' => $parent));
 }
 
 /**
@@ -67,17 +67,17 @@ 
  * @param int   $post_id    Optional. The post ID. Default empty.
  * @return List of categories to create for the given post.
  */
-function wp_create_categories( $categories, $post_id = '' ) {
-	$cat_ids = array ();
-	foreach ( $categories as $category ) {
-		if ( $id = category_exists( $category ) ) {
+function wp_create_categories($categories, $post_id = '') {
+	$cat_ids = array();
+	foreach ($categories as $category) {
+		if ($id = category_exists($category)) {
 			$cat_ids[] = $id;
-		} elseif ( $id = wp_create_category( $category ) ) {
+		} elseif ($id = wp_create_category($category)) {
 			$cat_ids[] = $id;
 		}
 	}
 
-	if ( $post_id )
+	if ($post_id)
 		wp_set_post_categories($post_id, $cat_ids);
 
 	return $cat_ids;
@@ -105,47 +105,47 @@ 
  * @return int|object The ID number of the new or updated Category on success. Zero or a WP_Error on failure,
  *                    depending on param $wp_error.
  */
-function wp_insert_category( $catarr, $wp_error = false ) {
-	$cat_defaults = array( 'cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '' );
-	$catarr = wp_parse_args( $catarr, $cat_defaults );
+function wp_insert_category($catarr, $wp_error = false) {
+	$cat_defaults = array('cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '');
+	$catarr = wp_parse_args($catarr, $cat_defaults);
 
-	if ( trim( $catarr['cat_name'] ) == '' ) {
-		if ( ! $wp_error ) {
+	if (trim($catarr['cat_name']) == '') {
+		if ( ! $wp_error) {
 			return 0;
 		} else {
-			return new WP_Error( 'cat_name', __( 'You did not enter a category name.' ) );
+			return new WP_Error('cat_name', __('You did not enter a category name.'));
 		}
 	}
 
 	$catarr['cat_ID'] = (int) $catarr['cat_ID'];
 
 	// Are we updating or creating?
-	$update = ! empty ( $catarr['cat_ID'] );
+	$update = ! empty ($catarr['cat_ID']);
 
 	$name = $catarr['cat_name'];
 	$description = $catarr['category_description'];
 	$slug = $catarr['category_nicename'];
 	$parent = (int) $catarr['category_parent'];
-	if ( $parent < 0 ) {
+	if ($parent < 0) {
 		$parent = 0;
 	}
 
-	if ( empty( $parent )
-		|| ! term_exists( $parent, $catarr['taxonomy'] )
-		|| ( $catarr['cat_ID'] && term_is_ancestor_of( $catarr['cat_ID'], $parent, $catarr['taxonomy'] ) ) ) {
+	if (empty($parent)
+		|| ! term_exists($parent, $catarr['taxonomy'])
+		|| ($catarr['cat_ID'] && term_is_ancestor_of($catarr['cat_ID'], $parent, $catarr['taxonomy']))) {
 		$parent = 0;
 	}
 
 	$args = compact('name', 'slug', 'parent', 'description');
 
-	if ( $update ) {
-		$catarr['cat_ID'] = wp_update_term( $catarr['cat_ID'], $catarr['taxonomy'], $args );
+	if ($update) {
+		$catarr['cat_ID'] = wp_update_term($catarr['cat_ID'], $catarr['taxonomy'], $args);
 	} else {
-		$catarr['cat_ID'] = wp_insert_term( $catarr['cat_name'], $catarr['taxonomy'], $args );
+		$catarr['cat_ID'] = wp_insert_term($catarr['cat_name'], $catarr['taxonomy'], $args);
 	}
 
-	if ( is_wp_error( $catarr['cat_ID'] ) ) {
-		if ( $wp_error ) {
+	if (is_wp_error($catarr['cat_ID'])) {
+		if ($wp_error) {
 			return $catarr['cat_ID'];
 		} else {
 			return 0;
@@ -168,12 +168,12 @@ 
 function wp_update_category($catarr) {
 	$cat_ID = (int) $catarr['cat_ID'];
 
-	if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) )
+	if (isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']))
 		return false;
 
 	// First, get all of the original fields
-	$category = get_term( $cat_ID, 'category', ARRAY_A );
-	_make_cat_compat( $category );
+	$category = get_term($cat_ID, 'category', ARRAY_A);
+	_make_cat_compat($category);
 
 	// Escape data pulled from DB.
 	$category = wp_slash($category);
@@ -209,7 +209,7 @@ 
  * @return array|WP_Error
  */
 function wp_create_tag($tag_name) {
-	return wp_create_term( $tag_name, 'post_tag');
+	return wp_create_term($tag_name, 'post_tag');
 }
 
 /**
@@ -221,8 +221,8 @@ 
  * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'.
  * @return string|bool|WP_Error
  */
-function get_tags_to_edit( $post_id, $taxonomy = 'post_tag' ) {
-	return get_terms_to_edit( $post_id, $taxonomy);
+function get_tags_to_edit($post_id, $taxonomy = 'post_tag') {
+	return get_terms_to_edit($post_id, $taxonomy);
 }
 
 /**
@@ -234,29 +234,29 @@ 
  * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'.
  * @return string|bool|WP_Error
  */
-function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
+function get_terms_to_edit($post_id, $taxonomy = 'post_tag') {
 	$post_id = (int) $post_id;
-	if ( !$post_id )
+	if ( ! $post_id)
 		return false;
 
-	$terms = get_object_term_cache( $post_id, $taxonomy );
-	if ( false === $terms ) {
-		$terms = wp_get_object_terms( $post_id, $taxonomy );
-		wp_cache_add( $post_id, $terms, $taxonomy . '_relationships' );
+	$terms = get_object_term_cache($post_id, $taxonomy);
+	if (false === $terms) {
+		$terms = wp_get_object_terms($post_id, $taxonomy);
+		wp_cache_add($post_id, $terms, $taxonomy.'_relationships');
 	}
 
-	if ( ! $terms ) {
+	if ( ! $terms) {
 		return false;
 	}
-	if ( is_wp_error( $terms ) ) {
+	if (is_wp_error($terms)) {
 		return $terms;
 	}
 	$term_names = array();
-	foreach ( $terms as $term ) {
+	foreach ($terms as $term) {
 		$term_names[] = $term->name;
 	}
 
-	$terms_to_edit = esc_attr( join( ',', $term_names ) );
+	$terms_to_edit = esc_attr(join(',', $term_names));
 
 	/**
 	 * Filter the comma-separated list of terms available to edit.
@@ -268,7 +268,7 @@ 
 	 * @param array  $terms_to_edit An array of terms.
 	 * @param string $taxonomy     The taxonomy for which to retrieve terms. Default 'post_tag'.
 	 */
-	$terms_to_edit = apply_filters( 'terms_to_edit', $terms_to_edit, $taxonomy );
+	$terms_to_edit = apply_filters('terms_to_edit', $terms_to_edit, $taxonomy);
 
 	return $terms_to_edit;
 }
@@ -283,7 +283,7 @@ 
  * @return array|WP_Error
  */
 function wp_create_term($tag_name, $taxonomy = 'post_tag') {
-	if ( $id = term_exists($tag_name, $taxonomy) )
+	if ($id = term_exists($tag_name, $taxonomy))
 		return $id;
 
 	return wp_insert_term($tag_name, $taxonomy);

Braces +18 added lines, -12 removed lines

@@ -23,8 +23,9 @@ 
  */
 function category_exists( $cat_name, $parent = null ) {
 	$id = term_exists($cat_name, 'category', $parent);
-	if ( is_array($id) )
-		$id = $id['term_id'];
+	if ( is_array($id) ) {
+			$id = $id['term_id'];
+	}
 	return $id;
 }
 
@@ -52,8 +53,9 @@ 
  * @return int|WP_Error
  */
 function wp_create_category( $cat_name, $parent = 0 ) {
-	if ( $id = category_exists($cat_name, $parent) )
-		return $id;
+	if ( $id = category_exists($cat_name, $parent) ) {
+			return $id;
+	}
 
 	return wp_insert_category( array('cat_name' => $cat_name, 'category_parent' => $parent) );
 }
@@ -77,8 +79,9 @@ 
 		}
 	}
 
-	if ( $post_id )
-		wp_set_post_categories($post_id, $cat_ids);
+	if ( $post_id ) {
+			wp_set_post_categories($post_id, $cat_ids);
+	}
 
 	return $cat_ids;
 }
@@ -168,8 +171,9 @@ 
 function wp_update_category($catarr) {
 	$cat_ID = (int) $catarr['cat_ID'];
 
-	if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) )
-		return false;
+	if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) ) {
+			return false;
+	}
 
 	// First, get all of the original fields
 	$category = get_term( $cat_ID, 'category', ARRAY_A );
@@ -236,8 +240,9 @@ 
  */
 function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
 	$post_id = (int) $post_id;
-	if ( !$post_id )
-		return false;
+	if ( !$post_id ) {
+			return false;
+	}
 
 	$terms = get_object_term_cache( $post_id, $taxonomy );
 	if ( false === $terms ) {
@@ -283,8 +288,9 @@ 
  * @return array|WP_Error
  */
 function wp_create_term($tag_name, $taxonomy = 'post_tag') {
-	if ( $id = term_exists($tag_name, $taxonomy) )
-		return $id;
+	if ( $id = term_exists($tag_name, $taxonomy) ) {
+			return $id;
+	}
 
 	return wp_insert_term($tag_name, $taxonomy);
 }

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

Braces +16 added lines, -11 removed lines

@@ -48,14 +48,18 @@ 
 
 		$args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
 
-		if ( 'all' != $cat_id )
-			$args['category'] = $cat_id;
-		if ( !empty( $s ) )
-			$args['search'] = $s;
-		if ( !empty( $orderby ) )
-			$args['orderby'] = $orderby;
-		if ( !empty( $order ) )
-			$args['order'] = $order;
+		if ( 'all' != $cat_id ) {
+					$args['category'] = $cat_id;
+		}
+		if ( !empty( $s ) ) {
+					$args['search'] = $s;
+		}
+		if ( !empty( $orderby ) ) {
+					$args['orderby'] = $orderby;
+		}
+		if ( !empty( $order ) ) {
+					$args['order'] = $order;
+		}
 
 		$this->items = get_bookmarks( $args );
 	}
@@ -86,9 +90,10 @@ 
 	protected function extra_tablenav( $which ) {
 		global $cat_id;
 
-		if ( 'top' != $which )
-			return;
-?>
+		if ( 'top' != $which ) {
+					return;
+		}
+		?>
 		<div class="alignleft actions">
 <?php
 			$dropdown_options = array(

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * List Table API: WP_Links_List_Table class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 3.1.0
- */
+	 * List Table API: WP_Links_List_Table class
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 3.1.0
+	 */
 
 /**
  * Core class used to implement displaying links in a list table.

Spacing +61 added lines, -61 removed lines

@@ -27,11 +27,11 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( array(
+	public function __construct($args = array()) {
+		parent::__construct(array(
 			'plural' => 'bookmarks',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 	}
 
 	/**
@@ -39,7 +39,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( 'manage_links' );
+		return current_user_can('manage_links');
 	}
 
 	/**
@@ -52,27 +52,27 @@ 
 	public function prepare_items() {
 		global $cat_id, $s, $orderby, $order;
 
-		wp_reset_vars( array( 'action', 'cat_id', 'link_id', 'orderby', 'order', 's' ) );
+		wp_reset_vars(array('action', 'cat_id', 'link_id', 'orderby', 'order', 's'));
 
-		$args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
+		$args = array('hide_invisible' => 0, 'hide_empty' => 0);
 
-		if ( 'all' != $cat_id )
+		if ('all' != $cat_id)
 			$args['category'] = $cat_id;
-		if ( !empty( $s ) )
+		if ( ! empty($s))
 			$args['search'] = $s;
-		if ( !empty( $orderby ) )
+		if ( ! empty($orderby))
 			$args['orderby'] = $orderby;
-		if ( !empty( $order ) )
+		if ( ! empty($order))
 			$args['order'] = $order;
 
-		$this->items = get_bookmarks( $args );
+		$this->items = get_bookmarks($args);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No links found.' );
+		_e('No links found.');
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		$actions['delete'] = __( 'Delete' );
+		$actions['delete'] = __('Delete');
 
 		return $actions;
 	}
@@ -91,10 +91,10 @@ 
 	 * @global int $cat_id
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		global $cat_id;
 
-		if ( 'top' != $which )
+		if ('top' != $which)
 			return;
 ?>
 		<div class="alignleft actions">
@@ -103,16 +103,16 @@ 
 				'selected' => $cat_id,
 				'name' => 'cat_id',
 				'taxonomy' => 'link_category',
-				'show_option_all' => get_taxonomy( 'link_category' )->labels->all_items,
+				'show_option_all' => get_taxonomy('link_category')->labels->all_items,
 				'hide_empty' => true,
 				'hierarchical' => 1,
 				'show_count' => 0,
 				'orderby' => 'name',
 			);
 
-			echo '<label class="screen-reader-text" for="cat_id">' . __( 'Filter by category' ) . '</label>';
-			wp_dropdown_categories( $dropdown_options );
-			submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+			echo '<label class="screen-reader-text" for="cat_id">'.__('Filter by category').'</label>';
+			wp_dropdown_categories($dropdown_options);
+			submit_button(__('Filter'), 'button', 'filter_action', false, array('id' => 'post-query-submit'));
 ?>
 		</div>
 <?php
@@ -125,12 +125,12 @@ 
 	public function get_columns() {
 		return array(
 			'cb'         => '<input type="checkbox" />',
-			'name'       => _x( 'Name', 'link name' ),
-			'url'        => __( 'URL' ),
-			'categories' => __( 'Categories' ),
-			'rel'        => __( 'Relationship' ),
-			'visible'    => __( 'Visible' ),
-			'rating'     => __( 'Rating' )
+			'name'       => _x('Name', 'link name'),
+			'url'        => __('URL'),
+			'categories' => __('Categories'),
+			'rel'        => __('Relationship'),
+			'visible'    => __('Visible'),
+			'rating'     => __('Rating')
 		);
 	}
 
@@ -167,10 +167,10 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_cb( $link ) {
+	public function column_cb($link) {
 		?>
-		<label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf( __( 'Select %s' ), $link->link_name ); ?></label>
-		<input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr( $link->link_id ); ?>" />
+		<label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf(__('Select %s'), $link->link_name); ?></label>
+		<input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr($link->link_id); ?>" />
 		<?php
 	}
 
@@ -182,12 +182,12 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_name( $link ) {
-		$edit_link = get_edit_bookmark_link( $link );
-		printf( '<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong>',
+	public function column_name($link) {
+		$edit_link = get_edit_bookmark_link($link);
+		printf('<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong>',
 			$edit_link,
 			/* translators: %s: link name */
-			esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $link->link_name ) ),
+			esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $link->link_name)),
 			$link->link_name
 		);
 	}
@@ -200,8 +200,8 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_url( $link ) {
-		$short_url = url_shorten( $link->link_url );
+	public function column_url($link) {
+		$short_url = url_shorten($link->link_url);
 		echo "<a href='$link->link_url'>$short_url</a>";
 	}
 
@@ -215,22 +215,22 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_categories( $link ) {
+	public function column_categories($link) {
 		global $cat_id;
 
 		$cat_names = array();
-		foreach ( $link->link_category as $category ) {
-			$cat = get_term( $category, 'link_category', OBJECT, 'display' );
-			if ( is_wp_error( $cat ) ) {
+		foreach ($link->link_category as $category) {
+			$cat = get_term($category, 'link_category', OBJECT, 'display');
+			if (is_wp_error($cat)) {
 				echo $cat->get_error_message();
 			}
 			$cat_name = $cat->name;
-			if ( $cat_id != $category ) {
+			if ($cat_id != $category) {
 				$cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
 			}
 			$cat_names[] = $cat_name;
 		}
-		echo implode( ', ', $cat_names );
+		echo implode(', ', $cat_names);
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_rel( $link ) {
-		echo empty( $link->link_rel ) ? '<br />' : $link->link_rel;
+	public function column_rel($link) {
+		echo empty($link->link_rel) ? '<br />' : $link->link_rel;
 	}
 
 	/**
@@ -253,11 +253,11 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_visible( $link ) {
-		if ( 'Y' === $link->link_visible ) {
-			_e( 'Yes' );
+	public function column_visible($link) {
+		if ('Y' === $link->link_visible) {
+			_e('Yes');
 		} else {
-			_e( 'No' );
+			_e('No');
 		}
 	}
 
@@ -269,7 +269,7 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_rating( $link ) {
+	public function column_rating($link) {
 		echo $link->link_rating;
 	}
 
@@ -282,7 +282,7 @@ 
 	 * @param object $link        Link object.
 	 * @param string $column_name Current column name.
 	 */
-	public function column_default( $link, $column_name ) {
+	public function column_default($link, $column_name) {
 		/**
 		 * Fires for each registered custom link column.
 		 *
@@ -291,17 +291,17 @@ 
 		 * @param string $column_name Name of the custom column.
 		 * @param int    $link_id     Link ID.
 		 */
-		do_action( 'manage_link_custom_column', $column_name, $link->link_id );
+		do_action('manage_link_custom_column', $column_name, $link->link_id);
 	}
 
 	public function display_rows() {
-		foreach ( $this->items as $link ) {
-			$link = sanitize_bookmark( $link );
-			$link->link_name = esc_attr( $link->link_name );
-			$link->link_category = wp_get_link_cats( $link->link_id );
+		foreach ($this->items as $link) {
+			$link = sanitize_bookmark($link);
+			$link->link_name = esc_attr($link->link_name);
+			$link->link_category = wp_get_link_cats($link->link_id);
 ?>
 		<tr id="link-<?php echo $link->link_id; ?>">
-			<?php $this->single_row_columns( $link ) ?>
+			<?php $this->single_row_columns($link) ?>
 		</tr>
 <?php
 		}
@@ -318,16 +318,16 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row action output for links.
 	 */
-	protected function handle_row_actions( $link, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($link, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
-		$edit_link = get_edit_bookmark_link( $link );
+		$edit_link = get_edit_bookmark_link($link);
 
 		$actions = array();
-		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-		$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm( '" . esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name)) . "' ) ) { return true;}return false;\">" . __('Delete') . "</a>";
-		return $this->row_actions( $actions );
+		$actions['edit'] = '<a href="'.$edit_link.'">'.__('Edit').'</a>';
+		$actions['delete'] = "<a class='submitdelete' href='".wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_'.$link->link_id)."' onclick=\"if ( confirm( '".esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name))."' ) ) { return true;}return false;\">".__('Delete')."</a>";
+		return $this->row_actions($actions);
 	}
 }

src/wp-admin/includes/widgets.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Widgets Administration API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Widgets Administration API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Display list of the available widgets.

Spacing +49 added lines, -49 removed lines

@@ -18,34 +18,34 @@ 
 	global $wp_registered_widgets, $wp_registered_widget_controls;
 
 	$sort = $wp_registered_widgets;
-	usort( $sort, '_sort_name_callback' );
+	usort($sort, '_sort_name_callback');
 	$done = array();
 
-	foreach ( $sort as $widget ) {
-		if ( in_array( $widget['callback'], $done, true ) ) // We already showed this multi-widget
+	foreach ($sort as $widget) {
+		if (in_array($widget['callback'], $done, true)) // We already showed this multi-widget
 			continue;
 
-		$sidebar = is_active_widget( $widget['callback'], $widget['id'], false, false );
+		$sidebar = is_active_widget($widget['callback'], $widget['id'], false, false);
 		$done[] = $widget['callback'];
 
-		if ( ! isset( $widget['params'][0] ) )
+		if ( ! isset($widget['params'][0]))
 			$widget['params'][0] = array();
 
-		$args = array( 'widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template' );
+		$args = array('widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template');
 
-		if ( isset($wp_registered_widget_controls[$widget['id']]['id_base']) && isset($widget['params'][0]['number']) ) {
+		if (isset($wp_registered_widget_controls[$widget['id']]['id_base']) && isset($widget['params'][0]['number'])) {
 			$id_base = $wp_registered_widget_controls[$widget['id']]['id_base'];
 			$args['_temp_id'] = "$id_base-__i__";
 			$args['_multi_num'] = next_widget_id_number($id_base);
 			$args['_add'] = 'multi';
 		} else {
 			$args['_add'] = 'single';
-			if ( $sidebar )
+			if ($sidebar)
 				$args['_hide'] = '1';
 		}
 
-		$args = wp_list_widget_controls_dynamic_sidebar( array( 0 => $args, 1 => $widget['params'][0] ) );
-		call_user_func_array( 'wp_widget_control', $args );
+		$args = wp_list_widget_controls_dynamic_sidebar(array(0 => $args, 1 => $widget['params'][0]));
+		call_user_func_array('wp_widget_control', $args);
 	}
 }
 
@@ -57,8 +57,8 @@ 
  *
  * @return int
  */
-function _sort_name_callback( $a, $b ) {
-	return strnatcasecmp( $a['name'], $b['name'] );
+function _sort_name_callback($a, $b) {
+	return strnatcasecmp($a['name'], $b['name']);
 }
 
 /**
@@ -70,23 +70,23 @@ 
  * @param string $sidebar      Sidebar ID.
  * @param string $sidebar_name Optional. Sidebar name. Default empty.
  */
-function wp_list_widget_controls( $sidebar, $sidebar_name = '' ) {
-	add_filter( 'dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar' );
+function wp_list_widget_controls($sidebar, $sidebar_name = '') {
+	add_filter('dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar');
 
-	$description = wp_sidebar_description( $sidebar );
+	$description = wp_sidebar_description($sidebar);
 
-	echo '<div id="' . esc_attr( $sidebar ) . '" class="widgets-sortables">';
+	echo '<div id="'.esc_attr($sidebar).'" class="widgets-sortables">';
 
-	if ( $sidebar_name ) {
+	if ($sidebar_name) {
 		?>
 		<div class="sidebar-name">
 			<div class="sidebar-name-arrow"><br /></div>
-			<h2><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h2>
+			<h2><?php echo esc_html($sidebar_name); ?> <span class="spinner"></span></h2>
 		</div>
 		<?php
 	}
 
-	if ( ! empty( $description ) ) {
+	if ( ! empty($description)) {
 		?>
 		<div class="sidebar-description">
 			<p class="description"><?php echo $description; ?></p>
@@ -94,7 +94,7 @@ 
 		<?php
 	}
 
-	dynamic_sidebar( $sidebar );
+	dynamic_sidebar($sidebar);
 
 	echo '</div>';
 }
@@ -111,7 +111,7 @@ 
  * @param array $params
  * @return array
  */
-function wp_list_widget_controls_dynamic_sidebar( $params ) {
+function wp_list_widget_controls_dynamic_sidebar($params) {
 	global $wp_registered_widgets;
 	static $i = 0;
 	$i++;
@@ -124,7 +124,7 @@ 
 	$params[0]['after_widget'] = "</div>";
 	$params[0]['before_title'] = "%BEG_OF_TITLE%"; // deprecated
 	$params[0]['after_title'] = "%END_OF_TITLE%"; // deprecated
-	if ( is_callable( $wp_registered_widgets[$widget_id]['callback'] ) ) {
+	if (is_callable($wp_registered_widgets[$widget_id]['callback'])) {
 		$wp_registered_widgets[$widget_id]['_callback'] = $wp_registered_widgets[$widget_id]['callback'];
 		$wp_registered_widgets[$widget_id]['callback'] = 'wp_widget_control';
 	}
@@ -139,12 +139,12 @@ 
  * @param string $id_base
  * @return int
  */
-function next_widget_id_number( $id_base ) {
+function next_widget_id_number($id_base) {
 	global $wp_registered_widgets;
 	$number = 1;
 
-	foreach ( $wp_registered_widgets as $widget_id => $widget ) {
-		if ( preg_match( '/' . $id_base . '-([0-9]+)$/', $widget_id, $matches ) )
+	foreach ($wp_registered_widgets as $widget_id => $widget) {
+		if (preg_match('/'.$id_base.'-([0-9]+)$/', $widget_id, $matches))
 			$number = max($number, $matches[1]);
 	}
 	$number++;
@@ -166,12 +166,12 @@ 
  * @param array $sidebar_args
  * @return array
  */
-function wp_widget_control( $sidebar_args ) {
+function wp_widget_control($sidebar_args) {
 	global $wp_registered_widgets, $wp_registered_widget_controls, $sidebars_widgets;
 
 	$widget_id = $sidebar_args['widget_id'];
 	$sidebar_id = isset($sidebar_args['id']) ? $sidebar_args['id'] : false;
-	$key = $sidebar_id ? array_search( $widget_id, $sidebars_widgets[$sidebar_id] ) : '-1'; // position of widget in sidebar
+	$key = $sidebar_id ? array_search($widget_id, $sidebars_widgets[$sidebar_id]) : '-1'; // position of widget in sidebar
 	$control = isset($wp_registered_widget_controls[$widget_id]) ? $wp_registered_widget_controls[$widget_id] : array();
 	$widget = $wp_registered_widgets[$widget_id];
 
@@ -181,15 +181,15 @@ 
 	$multi_number = isset($sidebar_args['_multi_num']) ? $sidebar_args['_multi_num'] : '';
 	$add_new = isset($sidebar_args['_add']) ? $sidebar_args['_add'] : '';
 
-	$before_form = isset( $sidebar_args['before_form'] ) ? $sidebar_args['before_form'] : '<form method="post">';
-	$after_form = isset( $sidebar_args['after_form'] ) ? $sidebar_args['after_form'] : '</form>';
-	$before_widget_content = isset( $sidebar_args['before_widget_content'] ) ? $sidebar_args['before_widget_content'] : '<div class="widget-content">';
-	$after_widget_content = isset( $sidebar_args['after_widget_content'] ) ? $sidebar_args['after_widget_content'] : '</div>';
+	$before_form = isset($sidebar_args['before_form']) ? $sidebar_args['before_form'] : '<form method="post">';
+	$after_form = isset($sidebar_args['after_form']) ? $sidebar_args['after_form'] : '</form>';
+	$before_widget_content = isset($sidebar_args['before_widget_content']) ? $sidebar_args['before_widget_content'] : '<div class="widget-content">';
+	$after_widget_content = isset($sidebar_args['after_widget_content']) ? $sidebar_args['after_widget_content'] : '</div>';
 
-	$query_arg = array( 'editwidget' => $widget['id'] );
-	if ( $add_new ) {
+	$query_arg = array('editwidget' => $widget['id']);
+	if ($add_new) {
 		$query_arg['addnew'] = 1;
-		if ( $multi_number ) {
+		if ($multi_number) {
 			$query_arg['num'] = $multi_number;
 			$query_arg['base'] = $id_base;
 		}
@@ -202,27 +202,27 @@ 
 	 * We aren't showing a widget control, we're outputting a template
 	 * for a multi-widget control.
 	 */
-	if ( isset($sidebar_args['_display']) && 'template' == $sidebar_args['_display'] && $widget_number ) {
+	if (isset($sidebar_args['_display']) && 'template' == $sidebar_args['_display'] && $widget_number) {
 		// number == -1 implies a template where id numbers are replaced by a generic '__i__'
 		$control['params'][0]['number'] = -1;
 		// With id_base widget id's are constructed like {$id_base}-{$id_number}.
-		if ( isset($control['id_base']) )
-			$id_format = $control['id_base'] . '-__i__';
+		if (isset($control['id_base']))
+			$id_format = $control['id_base'].'-__i__';
 	}
 
 	$wp_registered_widgets[$widget_id]['callback'] = $wp_registered_widgets[$widget_id]['_callback'];
 	unset($wp_registered_widgets[$widget_id]['_callback']);
 
-	$widget_title = esc_html( strip_tags( $sidebar_args['widget_name'] ) );
+	$widget_title = esc_html(strip_tags($sidebar_args['widget_name']));
 	$has_form = 'noform';
 
 	echo $sidebar_args['before_widget']; ?>
 	<div class="widget-top">
 	<div class="widget-title-action">
 		<a class="widget-action hide-if-no-js" href="#available-widgets"></a>
-		<a class="widget-control-edit hide-if-js" href="<?php echo esc_url( add_query_arg( $query_arg ) ); ?>">
-			<span class="edit"><?php _ex( 'Edit', 'widget' ); ?></span>
-			<span class="add"><?php _ex( 'Add', 'widget' ); ?></span>
+		<a class="widget-control-edit hide-if-js" href="<?php echo esc_url(add_query_arg($query_arg)); ?>">
+			<span class="edit"><?php _ex('Edit', 'widget'); ?></span>
+			<span class="add"><?php _ex('Add', 'widget'); ?></span>
 			<span class="screen-reader-text"><?php echo $widget_title; ?></span>
 		</a>
 	</div>
@@ -233,17 +233,17 @@ 
 	<?php echo $before_form; ?>
 	<?php echo $before_widget_content; ?>
 	<?php
-	if ( isset( $control['callback'] ) ) {
-		$has_form = call_user_func_array( $control['callback'], $control['params'] );
+	if (isset($control['callback'])) {
+		$has_form = call_user_func_array($control['callback'], $control['params']);
 	} else {
-		echo "\t\t<p>" . __('There are no options for this widget.') . "</p>\n";
+		echo "\t\t<p>".__('There are no options for this widget.')."</p>\n";
 	}
 	?>
 	<?php echo $after_widget_content; ?>
 	<input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($id_format); ?>" />
 	<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
-	<input type="hidden" name="widget-width" class="widget-width" value="<?php if (isset( $control['width'] )) echo esc_attr($control['width']); ?>" />
-	<input type="hidden" name="widget-height" class="widget-height" value="<?php if (isset( $control['height'] )) echo esc_attr($control['height']); ?>" />
+	<input type="hidden" name="widget-width" class="widget-width" value="<?php if (isset($control['width'])) echo esc_attr($control['width']); ?>" />
+	<input type="hidden" name="widget-height" class="widget-height" value="<?php if (isset($control['height'])) echo esc_attr($control['height']); ?>" />
 	<input type="hidden" name="widget_number" class="widget_number" value="<?php echo esc_attr($widget_number); ?>" />
 	<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
 	<input type="hidden" name="add_new" class="add_new" value="<?php echo esc_attr($add_new); ?>" />
@@ -253,8 +253,8 @@ 
 		<a class="widget-control-remove" href="#remove"><?php _e('Delete'); ?></a> |
 		<a class="widget-control-close" href="#close"><?php _e('Close'); ?></a>
 		</div>
-		<div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
-			<?php submit_button( __( 'Save' ), 'button-primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
+		<div class="alignright<?php if ('noform' === $has_form) echo ' widget-control-noform'; ?>">
+			<?php submit_button(__('Save'), 'button-primary widget-control-save right', 'savewidget', false, array('id' => 'widget-'.esc_attr($id_format).'-savewidget')); ?>
 			<span class="spinner"></span>
 		</div>
 		<br class="clear" />
@@ -263,7 +263,7 @@ 
 	</div>
 
 	<div class="widget-description">
-<?php echo ( $widget_description = wp_widget_description($widget_id) ) ? "$widget_description\n" : "$widget_title\n"; ?>
+<?php echo ($widget_description = wp_widget_description($widget_id)) ? "$widget_description\n" : "$widget_title\n"; ?>
 	</div>
 <?php
 	echo $sidebar_args['after_widget'];

Braces +27 added lines, -12 removed lines

@@ -22,14 +22,17 @@ 
 	$done = array();
 
 	foreach ( $sort as $widget ) {
-		if ( in_array( $widget['callback'], $done, true ) ) // We already showed this multi-widget
+		if ( in_array( $widget['callback'], $done, true ) ) {
+			// We already showed this multi-widget
 			continue;
+		}
 
 		$sidebar = is_active_widget( $widget['callback'], $widget['id'], false, false );
 		$done[] = $widget['callback'];
 
-		if ( ! isset( $widget['params'][0] ) )
-			$widget['params'][0] = array();
+		if ( ! isset( $widget['params'][0] ) ) {
+					$widget['params'][0] = array();
+		}
 
 		$args = array( 'widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template' );
 
@@ -40,8 +43,9 @@ 
 			$args['_add'] = 'multi';
 		} else {
 			$args['_add'] = 'single';
-			if ( $sidebar )
-				$args['_hide'] = '1';
+			if ( $sidebar ) {
+							$args['_hide'] = '1';
+			}
 		}
 
 		$args = wp_list_widget_controls_dynamic_sidebar( array( 0 => $args, 1 => $widget['params'][0] ) );
@@ -144,8 +148,9 @@ 
 	$number = 1;
 
 	foreach ( $wp_registered_widgets as $widget_id => $widget ) {
-		if ( preg_match( '/' . $id_base . '-([0-9]+)$/', $widget_id, $matches ) )
-			$number = max($number, $matches[1]);
+		if ( preg_match( '/' . $id_base . '-([0-9]+)$/', $widget_id, $matches ) ) {
+					$number = max($number, $matches[1]);
+		}
 	}
 	$number++;
 
@@ -206,8 +211,9 @@ 
 		// number == -1 implies a template where id numbers are replaced by a generic '__i__'
 		$control['params'][0]['number'] = -1;
 		// With id_base widget id's are constructed like {$id_base}-{$id_number}.
-		if ( isset($control['id_base']) )
-			$id_format = $control['id_base'] . '-__i__';
+		if ( isset($control['id_base']) ) {
+					$id_format = $control['id_base'] . '-__i__';
+		}
 	}
 
 	$wp_registered_widgets[$widget_id]['callback'] = $wp_registered_widgets[$widget_id]['_callback'];
@@ -242,8 +248,14 @@ 
 	<?php echo $after_widget_content; ?>
 	<input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($id_format); ?>" />
 	<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
-	<input type="hidden" name="widget-width" class="widget-width" value="<?php if (isset( $control['width'] )) echo esc_attr($control['width']); ?>" />
-	<input type="hidden" name="widget-height" class="widget-height" value="<?php if (isset( $control['height'] )) echo esc_attr($control['height']); ?>" />
+	<input type="hidden" name="widget-width" class="widget-width" value="<?php if (isset( $control['width'] )) {
+	echo esc_attr($control['width']);
+}
+?>" />
+	<input type="hidden" name="widget-height" class="widget-height" value="<?php if (isset( $control['height'] )) {
+	echo esc_attr($control['height']);
+}
+?>" />
 	<input type="hidden" name="widget_number" class="widget_number" value="<?php echo esc_attr($widget_number); ?>" />
 	<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
 	<input type="hidden" name="add_new" class="add_new" value="<?php echo esc_attr($add_new); ?>" />
@@ -253,7 +265,10 @@ 
 		<a class="widget-control-remove" href="#remove"><?php _e('Delete'); ?></a> |
 		<a class="widget-control-close" href="#close"><?php _e('Close'); ?></a>
 		</div>
-		<div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
+		<div class="alignright<?php if ( 'noform' === $has_form ) {
+	echo ' widget-control-noform';
+}
+?>">
 			<?php submit_button( __( 'Save' ), 'button-primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
 			<span class="spinner"></span>
 		</div>

src/wp-admin/includes/plugin-install.php

Braces +27 added lines, -18 removed lines

@@ -67,8 +67,9 @@ 
 
 	if ( false === $res ) {
 		$url = $http_url = 'http://api.wordpress.org/plugins/info/1.0/';
-		if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-			$url = set_url_scheme( $url, 'https' );
+		if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
+					$url = set_url_scheme( $url, 'https' );
+		}
 
 		$http_args = array(
 			'timeout' => 15,
@@ -88,8 +89,9 @@ 
 			$res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
 		} else {
 			$res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
-			if ( ! is_object( $res ) && ! is_array( $res ) )
-				$res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+			if ( ! is_object( $res ) && ! is_array( $res ) ) {
+							$res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+			}
 		}
 	} elseif ( !is_wp_error($res) ) {
 		$res->external = true;
@@ -117,13 +119,15 @@ 
  */
 function install_popular_tags( $args = array() ) {
 	$key = md5(serialize($args));
-	if ( false !== ($tags = get_site_transient('poptags_' . $key) ) )
-		return $tags;
+	if ( false !== ($tags = get_site_transient('poptags_' . $key) ) ) {
+			return $tags;
+	}
 
 	$tags = plugins_api('hot_tags', $args);
 
-	if ( is_wp_error($tags) )
-		return $tags;
+	if ( is_wp_error($tags) ) {
+			return $tags;
+	}
 
 	set_site_transient( 'poptags_' . $key, $tags, 3 * HOUR_IN_SECONDS );
 
@@ -278,8 +282,9 @@ 
  */
 function install_plugin_install_status($api, $loop = false) {
 	// This function is called recursively, $loop prevents further loops.
-	if ( is_array($api) )
-		$api = (object) $api;
+	if ( is_array($api) ) {
+			$api = (object) $api;
+	}
 
 	// Default to a "new" plugin
 	$status = 'install';
@@ -297,8 +302,9 @@ 
 				$status = 'update_available';
 				$update_file = $file;
 				$version = $plugin->new_version;
-				if ( current_user_can('update_plugins') )
-					$url = wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=' . $update_file), 'upgrade-plugin_' . $update_file);
+				if ( current_user_can('update_plugins') ) {
+									$url = wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=' . $update_file), 'upgrade-plugin_' . $update_file);
+				}
 				break;
 			}
 		}
@@ -308,8 +314,9 @@ 
 		if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) {
 			$installed_plugin = get_plugins('/' . $api->slug);
 			if ( empty($installed_plugin) ) {
-				if ( current_user_can('install_plugins') )
-					$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+				if ( current_user_can('install_plugins') ) {
+									$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+				}
 			} else {
 				$key = array_keys( $installed_plugin );
 				$key = reset( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
@@ -330,12 +337,14 @@ 
 			}
 		} else {
 			// "install" & no directory with that slug
-			if ( current_user_can('install_plugins') )
-				$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+			if ( current_user_can('install_plugins') ) {
+							$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+			}
 		}
 	}
-	if ( isset($_GET['from']) )
-		$url .= '&amp;from=' . urlencode( wp_unslash( $_GET['from'] ) );
+	if ( isset($_GET['from']) ) {
+			$url .= '&amp;from=' . urlencode( wp_unslash( $_GET['from'] ) );
+	}
 
 	$file = $update_file;
 	return compact( 'status', 'url', 'version', 'file' );

Spacing +184 added lines, -184 removed lines

@@ -98,17 +98,17 @@ 
  *         {@link https://developer.wordpress.org/reference/functions/plugins_api/ function reference article}
  *         for more information on the make-up of possible return values depending on the value of `$action`.
  */
-function plugins_api( $action, $args = array() ) {
+function plugins_api($action, $args = array()) {
 
-	if ( is_array( $args ) ) {
+	if (is_array($args)) {
 		$args = (object) $args;
 	}
 
-	if ( ! isset( $args->per_page ) ) {
+	if ( ! isset($args->per_page)) {
 		$args->per_page = 24;
 	}
 
-	if ( ! isset( $args->locale ) ) {
+	if ( ! isset($args->locale)) {
 		$args->locale = get_locale();
 	}
 
@@ -122,7 +122,7 @@ 
 	 * @param object $args   Plugin API arguments.
 	 * @param string $action The type of information being requested from the Plugin Install API.
 	 */
-	$args = apply_filters( 'plugins_api_args', $args, $action );
+	$args = apply_filters('plugins_api_args', $args, $action);
 
 	/**
 	 * Filter the response for the current WordPress.org Plugin Install API request.
@@ -138,35 +138,35 @@ 
 	 * @param string             $action The type of information being requested from the Plugin Install API.
 	 * @param object             $args   Plugin API arguments.
 	 */
-	$res = apply_filters( 'plugins_api', false, $action, $args );
+	$res = apply_filters('plugins_api', false, $action, $args);
 
-	if ( false === $res ) {
+	if (false === $res) {
 		$url = $http_url = 'http://api.wordpress.org/plugins/info/1.0/';
-		if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-			$url = set_url_scheme( $url, 'https' );
+		if ($ssl = wp_http_supports(array('ssl')))
+			$url = set_url_scheme($url, 'https');
 
 		$http_args = array(
 			'timeout' => 15,
 			'body' => array(
 				'action' => $action,
-				'request' => serialize( $args )
+				'request' => serialize($args)
 			)
 		);
-		$request = wp_remote_post( $url, $http_args );
+		$request = wp_remote_post($url, $http_args);
 
-		if ( $ssl && is_wp_error( $request ) ) {
-			trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
-			$request = wp_remote_post( $http_url, $http_args );
+		if ($ssl && is_wp_error($request)) {
+			trigger_error(__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.').' '.__('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE);
+			$request = wp_remote_post($http_url, $http_args);
 		}
 
-		if ( is_wp_error($request) ) {
-			$res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
+		if (is_wp_error($request)) {
+			$res = new WP_Error('plugins_api_failed', __('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.'), $request->get_error_message());
 		} else {
-			$res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
-			if ( ! is_object( $res ) && ! is_array( $res ) )
-				$res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+			$res = maybe_unserialize(wp_remote_retrieve_body($request));
+			if ( ! is_object($res) && ! is_array($res))
+				$res = new WP_Error('plugins_api_failed', __('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.'), wp_remote_retrieve_body($request));
 		}
-	} elseif ( !is_wp_error($res) ) {
+	} elseif ( ! is_wp_error($res)) {
 		$res->external = true;
 	}
 
@@ -179,7 +179,7 @@ 
 	 * @param string          $action The type of information being requested from the Plugin Install API.
 	 * @param object          $args   Plugin API arguments.
 	 */
-	return apply_filters( 'plugins_api_result', $res, $action, $args );
+	return apply_filters('plugins_api_result', $res, $action, $args);
 }
 
 /**
@@ -190,17 +190,17 @@ 
  * @param array $args
  * @return array
  */
-function install_popular_tags( $args = array() ) {
+function install_popular_tags($args = array()) {
 	$key = md5(serialize($args));
-	if ( false !== ($tags = get_site_transient('poptags_' . $key) ) )
+	if (false !== ($tags = get_site_transient('poptags_'.$key)))
 		return $tags;
 
 	$tags = plugins_api('hot_tags', $args);
 
-	if ( is_wp_error($tags) )
+	if (is_wp_error($tags))
 		return $tags;
 
-	set_site_transient( 'poptags_' . $key, $tags, 3 * HOUR_IN_SECONDS );
+	set_site_transient('poptags_'.$key, $tags, 3 * HOUR_IN_SECONDS);
 
 	return $tags;
 }
@@ -210,34 +210,34 @@ 
  */
 function install_dashboard() {
 	?>
-	<p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format via <a href="%2$s">this page</a>.' ), 'https://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?></p>
+	<p><?php printf(__('Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format via <a href="%2$s">this page</a>.'), 'https://wordpress.org/plugins/', self_admin_url('plugin-install.php?tab=upload')); ?></p>
 
 	<?php display_plugins_table(); ?>
 
-	<h2><?php _e( 'Popular tags' ) ?></h2>
-	<p><?php _e( 'You may also browse based on the most popular tags in the Plugin Directory:' ) ?></p>
+	<h2><?php _e('Popular tags') ?></h2>
+	<p><?php _e('You may also browse based on the most popular tags in the Plugin Directory:') ?></p>
 	<?php
 
 	$api_tags = install_popular_tags();
 
 	echo '<p class="popular-tags">';
-	if ( is_wp_error($api_tags) ) {
+	if (is_wp_error($api_tags)) {
 		echo $api_tags->get_error_message();
 	} else {
 		//Set up the tags in a way which can be interpreted by wp_generate_tag_cloud()
 		$tags = array();
-		foreach ( (array) $api_tags as $tag ) {
-			$url = self_admin_url( 'plugin-install.php?tab=search&type=tag&s=' . urlencode( $tag['name'] ) );
+		foreach ((array) $api_tags as $tag) {
+			$url = self_admin_url('plugin-install.php?tab=search&type=tag&s='.urlencode($tag['name']));
 			$data = array(
-				'link' => esc_url( $url ),
+				'link' => esc_url($url),
 				'name' => $tag['name'],
 				'slug' => $tag['slug'],
-				'id' => sanitize_title_with_dashes( $tag['name'] ),
+				'id' => sanitize_title_with_dashes($tag['name']),
 				'count' => $tag['count']
 			);
-			$tags[ $tag['name'] ] = (object) $data;
+			$tags[$tag['name']] = (object) $data;
 		}
-		echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%s plugin'), 'multiple_text' => __('%s plugins') ) );
+		echo wp_generate_tag_cloud($tags, array('single_text' => __('%s plugin'), 'multiple_text' => __('%s plugins')));
 	}
 	echo '</p><br class="clear" />';
 }
@@ -249,20 +249,20 @@ 
  *
  * @param bool $type_selector
  */
-function install_search_form( $type_selector = true ) {
-	$type = isset($_REQUEST['type']) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-	$term = isset($_REQUEST['s']) ? wp_unslash( $_REQUEST['s'] ) : '';
+function install_search_form($type_selector = true) {
+	$type = isset($_REQUEST['type']) ? wp_unslash($_REQUEST['type']) : 'term';
+	$term = isset($_REQUEST['s']) ? wp_unslash($_REQUEST['s']) : '';
 	$input_attrs = '';
 	$button_type = 'button screen-reader-text';
 
 	// assume no $type_selector means it's a simplified search form
-	if ( ! $type_selector ) {
-		$input_attrs = 'class="wp-filter-search" placeholder="' . esc_attr__( 'Search Plugins' ) . '" ';
+	if ( ! $type_selector) {
+		$input_attrs = 'class="wp-filter-search" placeholder="'.esc_attr__('Search Plugins').'" ';
 	}
 
 	?><form class="search-form search-plugins" method="get">
 		<input type="hidden" name="tab" value="search" />
-		<?php if ( $type_selector ) : ?>
+		<?php if ($type_selector) : ?>
 		<select name="type" id="typeselector">
 			<option value="term"<?php selected('term', $type) ?>><?php _e('Keyword'); ?></option>
 			<option value="author"<?php selected('author', $type) ?>><?php _e('Author'); ?></option>
@@ -272,7 +272,7 @@ 
 		<label><span class="screen-reader-text"><?php _e('Search Plugins'); ?></span>
 			<input type="search" name="s" value="<?php echo esc_attr($term) ?>" <?php echo $input_attrs; ?>/>
 		</label>
-		<?php submit_button( __( 'Search Plugins' ), $button_type, false, false, array( 'id' => 'search-submit' ) ); ?>
+		<?php submit_button(__('Search Plugins'), $button_type, false, false, array('id' => 'search-submit')); ?>
 	</form><?php
 }
 
@@ -285,10 +285,10 @@ 
 <div class="upload-plugin">
 	<p class="install-help"><?php _e('If you have a plugin in a .zip format, you may install it by uploading it here.'); ?></p>
 	<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url('update.php?action=upload-plugin'); ?>">
-		<?php wp_nonce_field( 'plugin-upload' ); ?>
-		<label class="screen-reader-text" for="pluginzip"><?php _e( 'Plugin zip file' ); ?></label>
+		<?php wp_nonce_field('plugin-upload'); ?>
+		<label class="screen-reader-text" for="pluginzip"><?php _e('Plugin zip file'); ?></label>
 		<input type="file" id="pluginzip" name="pluginzip" />
-		<?php submit_button( __( 'Install Now' ), 'button', 'install-plugin-submit', false ); ?>
+		<?php submit_button(__('Install Now'), 'button', 'install-plugin-submit', false); ?>
 	</form>
 </div>
 <?php
@@ -300,15 +300,15 @@ 
  *
  */
 function install_plugins_favorites_form() {
-	$user = ! empty( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
+	$user = ! empty($_GET['user']) ? wp_unslash($_GET['user']) : get_user_option('wporg_favorites');
 	?>
-	<p class="install-help"><?php _e( 'If you have marked plugins as favorites on WordPress.org, you can browse them here.' ); ?></p>
+	<p class="install-help"><?php _e('If you have marked plugins as favorites on WordPress.org, you can browse them here.'); ?></p>
 	<form method="get">
 		<input type="hidden" name="tab" value="favorites" />
 		<p>
-			<label for="user"><?php _e( 'Your WordPress.org username:' ); ?></label>
-			<input type="search" id="user" name="user" value="<?php echo esc_attr( $user ); ?>" />
-			<input type="submit" class="button" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />
+			<label for="user"><?php _e('Your WordPress.org username:'); ?></label>
+			<input type="search" id="user" name="user" value="<?php echo esc_attr($user); ?>" />
+			<input type="submit" class="button" value="<?php esc_attr_e('Get Favorites'); ?>" />
 		</p>
 	</form>
 	<?php
@@ -324,18 +324,18 @@ 
 function display_plugins_table() {
 	global $wp_list_table;
 
-	switch ( current_filter() ) {
+	switch (current_filter()) {
 		case 'install_plugins_favorites' :
-			if ( empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) ) {
+			if (empty($_GET['user']) && ! get_user_option('wporg_favorites')) {
 				return;
 			}
 			break;
 		case 'install_plugins_recommended' :
-			echo '<p>' . __( 'These suggestions are based on the plugins you and other users have installed.' ) . '</p>';
+			echo '<p>'.__('These suggestions are based on the plugins you and other users have installed.').'</p>';
 			break;
 		case 'install_plugins_beta' :
 			printf(
-				'<p>' . __( 'You are using a development version of WordPress. These feature plugins are also under development. <a href="%s">Learn more</a>.' ) . '</p>',
+				'<p>'.__('You are using a development version of WordPress. These feature plugins are also under development. <a href="%s">Learn more</a>.').'</p>',
 				'https://make.wordpress.org/core/handbook/about/release-cycle/features-as-plugins/'
 			);
 			break;
@@ -359,7 +359,7 @@ 
  */
 function install_plugin_install_status($api, $loop = false) {
 	// This function is called recursively, $loop prevents further loops.
-	if ( is_array($api) )
+	if (is_array($api))
 		$api = (object) $api;
 
 	// Default to a "new" plugin
@@ -372,37 +372,37 @@ 
 	 * and has an update awaiting it.
 	 */
 	$update_plugins = get_site_transient('update_plugins');
-	if ( isset( $update_plugins->response ) ) {
-		foreach ( (array)$update_plugins->response as $file => $plugin ) {
-			if ( $plugin->slug === $api->slug ) {
+	if (isset($update_plugins->response)) {
+		foreach ((array) $update_plugins->response as $file => $plugin) {
+			if ($plugin->slug === $api->slug) {
 				$status = 'update_available';
 				$update_file = $file;
 				$version = $plugin->new_version;
-				if ( current_user_can('update_plugins') )
-					$url = wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=' . $update_file), 'upgrade-plugin_' . $update_file);
+				if (current_user_can('update_plugins'))
+					$url = wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin='.$update_file), 'upgrade-plugin_'.$update_file);
 				break;
 			}
 		}
 	}
 
-	if ( 'install' == $status ) {
-		if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) {
-			$installed_plugin = get_plugins('/' . $api->slug);
-			if ( empty($installed_plugin) ) {
-				if ( current_user_can('install_plugins') )
-					$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+	if ('install' == $status) {
+		if (is_dir(WP_PLUGIN_DIR.'/'.$api->slug)) {
+			$installed_plugin = get_plugins('/'.$api->slug);
+			if (empty($installed_plugin)) {
+				if (current_user_can('install_plugins'))
+					$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin='.$api->slug), 'install-plugin_'.$api->slug);
 			} else {
-				$key = array_keys( $installed_plugin );
-				$key = reset( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
-				$update_file = $api->slug . '/' . $key;
-				if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '=') ){
+				$key = array_keys($installed_plugin);
+				$key = reset($key); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
+				$update_file = $api->slug.'/'.$key;
+				if (version_compare($api->version, $installed_plugin[$key]['Version'], '=')) {
 					$status = 'latest_installed';
-				} elseif ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '<') ) {
+				} elseif (version_compare($api->version, $installed_plugin[$key]['Version'], '<')) {
 					$status = 'newer_installed';
-					$version = $installed_plugin[ $key ]['Version'];
+					$version = $installed_plugin[$key]['Version'];
 				} else {
 					//If the above update check failed, Then that probably means that the update checker has out-of-date information, force a refresh
-					if ( ! $loop ) {
+					if ( ! $loop) {
 						delete_site_transient('update_plugins');
 						wp_update_plugins();
 						return install_plugin_install_status($api, true);
@@ -411,15 +411,15 @@ 
 			}
 		} else {
 			// "install" & no directory with that slug
-			if ( current_user_can('install_plugins') )
-				$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+			if (current_user_can('install_plugins'))
+				$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin='.$api->slug), 'install-plugin_'.$api->slug);
 		}
 	}
-	if ( isset($_GET['from']) )
-		$url .= '&amp;from=' . urlencode( wp_unslash( $_GET['from'] ) );
+	if (isset($_GET['from']))
+		$url .= '&amp;from='.urlencode(wp_unslash($_GET['from']));
 
 	$file = $update_file;
-	return compact( 'status', 'url', 'version', 'file' );
+	return compact('status', 'url', 'version', 'file');
 }
 
 /**
@@ -433,12 +433,12 @@ 
 function install_plugin_information() {
 	global $tab;
 
-	if ( empty( $_REQUEST['plugin'] ) ) {
+	if (empty($_REQUEST['plugin'])) {
 		return;
 	}
 
-	$api = plugins_api( 'plugin_information', array(
-		'slug' => wp_unslash( $_REQUEST['plugin'] ),
+	$api = plugins_api('plugin_information', array(
+		'slug' => wp_unslash($_REQUEST['plugin']),
 		'is_ssl' => is_ssl(),
 		'fields' => array(
 			'banners' => true,
@@ -446,67 +446,67 @@ 
 			'downloaded' => false,
 			'active_installs' => true
 		)
-	) );
+	));
 
-	if ( is_wp_error( $api ) ) {
-		wp_die( $api );
+	if (is_wp_error($api)) {
+		wp_die($api);
 	}
 
 	$plugins_allowedtags = array(
-		'a' => array( 'href' => array(), 'title' => array(), 'target' => array() ),
-		'abbr' => array( 'title' => array() ), 'acronym' => array( 'title' => array() ),
+		'a' => array('href' => array(), 'title' => array(), 'target' => array()),
+		'abbr' => array('title' => array()), 'acronym' => array('title' => array()),
 		'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(),
-		'div' => array( 'class' => array() ), 'span' => array( 'class' => array() ),
+		'div' => array('class' => array()), 'span' => array('class' => array()),
 		'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(),
 		'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(),
-		'img' => array( 'src' => array(), 'class' => array(), 'alt' => array() )
+		'img' => array('src' => array(), 'class' => array(), 'alt' => array())
 	);
 
 	$plugins_section_titles = array(
-		'description'  => _x( 'Description',  'Plugin installer section title' ),
-		'installation' => _x( 'Installation', 'Plugin installer section title' ),
-		'faq'          => _x( 'FAQ',          'Plugin installer section title' ),
-		'screenshots'  => _x( 'Screenshots',  'Plugin installer section title' ),
-		'changelog'    => _x( 'Changelog',    'Plugin installer section title' ),
-		'reviews'      => _x( 'Reviews',      'Plugin installer section title' ),
-		'other_notes'  => _x( 'Other Notes',  'Plugin installer section title' )
+		'description'  => _x('Description', 'Plugin installer section title'),
+		'installation' => _x('Installation', 'Plugin installer section title'),
+		'faq'          => _x('FAQ', 'Plugin installer section title'),
+		'screenshots'  => _x('Screenshots', 'Plugin installer section title'),
+		'changelog'    => _x('Changelog', 'Plugin installer section title'),
+		'reviews'      => _x('Reviews', 'Plugin installer section title'),
+		'other_notes'  => _x('Other Notes', 'Plugin installer section title')
 	);
 
 	// Sanitize HTML
-	foreach ( (array) $api->sections as $section_name => $content ) {
-		$api->sections[$section_name] = wp_kses( $content, $plugins_allowedtags );
+	foreach ((array) $api->sections as $section_name => $content) {
+		$api->sections[$section_name] = wp_kses($content, $plugins_allowedtags);
 	}
 
-	foreach ( array( 'version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug' ) as $key ) {
-		if ( isset( $api->$key ) ) {
-			$api->$key = wp_kses( $api->$key, $plugins_allowedtags );
+	foreach (array('version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug') as $key) {
+		if (isset($api->$key)) {
+			$api->$key = wp_kses($api->$key, $plugins_allowedtags);
 		}
 	}
 
-	$_tab = esc_attr( $tab );
+	$_tab = esc_attr($tab);
 
-	$section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; // Default to the Description tab, Do not translate, API returns English.
-	if ( empty( $section ) || ! isset( $api->sections[ $section ] ) ) {
-		$section_titles = array_keys( (array) $api->sections );
-		$section = reset( $section_titles );
+	$section = isset($_REQUEST['section']) ? wp_unslash($_REQUEST['section']) : 'description'; // Default to the Description tab, Do not translate, API returns English.
+	if (empty($section) || ! isset($api->sections[$section])) {
+		$section_titles = array_keys((array) $api->sections);
+		$section = reset($section_titles);
 	}
 
-	iframe_header( __( 'Plugin Install' ) );
+	iframe_header(__('Plugin Install'));
 
 	$_with_banner = '';
 
-	if ( ! empty( $api->banners ) && ( ! empty( $api->banners['low'] ) || ! empty( $api->banners['high'] ) ) ) {
+	if ( ! empty($api->banners) && ( ! empty($api->banners['low']) || ! empty($api->banners['high']))) {
 		$_with_banner = 'with-banner';
-		$low  = empty( $api->banners['low'] ) ? $api->banners['high'] : $api->banners['low'];
-		$high = empty( $api->banners['high'] ) ? $api->banners['low'] : $api->banners['high'];
+		$low  = empty($api->banners['low']) ? $api->banners['high'] : $api->banners['low'];
+		$high = empty($api->banners['high']) ? $api->banners['low'] : $api->banners['high'];
 		?>
 		<style type="text/css">
 			#plugin-information-title.with-banner {
-				background-image: url( <?php echo esc_url( $low ); ?> );
+				background-image: url( <?php echo esc_url($low); ?> );
 			}
 			@media only screen and ( -webkit-min-device-pixel-ratio: 1.5 ) {
 				#plugin-information-title.with-banner {
-					background-image: url( <?php echo esc_url( $high ); ?> );
+					background-image: url( <?php echo esc_url($high); ?> );
 				}
 			}
 		</style>
@@ -517,21 +517,21 @@ 
 	echo "<div id='{$_tab}-title' class='{$_with_banner}'><div class='vignette'></div><h2>{$api->name}</h2></div>";
 	echo "<div id='{$_tab}-tabs' class='{$_with_banner}'>\n";
 
-	foreach ( (array) $api->sections as $section_name => $content ) {
-		if ( 'reviews' === $section_name && ( empty( $api->ratings ) || 0 === array_sum( (array) $api->ratings ) ) ) {
+	foreach ((array) $api->sections as $section_name => $content) {
+		if ('reviews' === $section_name && (empty($api->ratings) || 0 === array_sum((array) $api->ratings))) {
 			continue;
 		}
 
-		if ( isset( $plugins_section_titles[ $section_name ] ) ) {
-			$title = $plugins_section_titles[ $section_name ];
+		if (isset($plugins_section_titles[$section_name])) {
+			$title = $plugins_section_titles[$section_name];
 		} else {
-			$title = ucwords( str_replace( '_', ' ', $section_name ) );
+			$title = ucwords(str_replace('_', ' ', $section_name));
 		}
 
-		$class = ( $section_name === $section ) ? ' class="current"' : '';
-		$href = add_query_arg( array('tab' => $tab, 'section' => $section_name) );
-		$href = esc_url( $href );
-		$san_section = esc_attr( $section_name );
+		$class = ($section_name === $section) ? ' class="current"' : '';
+		$href = add_query_arg(array('tab' => $tab, 'section' => $section_name));
+		$href = esc_url($href);
+		$san_section = esc_attr($section_name);
 		echo "\t<a name='$san_section' href='$href' $class>$title</a>\n";
 	}
 
@@ -541,77 +541,77 @@ 
 	<div id="<?php echo $_tab; ?>-content" class='<?php echo $_with_banner; ?>'>
 	<div class="fyi">
 		<ul>
-		<?php if ( ! empty( $api->version ) ) { ?>
-			<li><strong><?php _e( 'Version:' ); ?></strong> <?php echo $api->version; ?></li>
-		<?php } if ( ! empty( $api->author ) ) { ?>
-			<li><strong><?php _e( 'Author:' ); ?></strong> <?php echo links_add_target( $api->author, '_blank' ); ?></li>
-		<?php } if ( ! empty( $api->last_updated ) ) { ?>
-			<li><strong><?php _e( 'Last Updated:' ); ?></strong>
-				<?php printf( __( '%s ago' ), human_time_diff( strtotime( $api->last_updated ) ) ); ?>
+		<?php if ( ! empty($api->version)) { ?>
+			<li><strong><?php _e('Version:'); ?></strong> <?php echo $api->version; ?></li>
+		<?php } if ( ! empty($api->author)) { ?>
+			<li><strong><?php _e('Author:'); ?></strong> <?php echo links_add_target($api->author, '_blank'); ?></li>
+		<?php } if ( ! empty($api->last_updated)) { ?>
+			<li><strong><?php _e('Last Updated:'); ?></strong>
+				<?php printf(__('%s ago'), human_time_diff(strtotime($api->last_updated))); ?>
 			</li>
-		<?php } if ( ! empty( $api->requires ) ) { ?>
-			<li><strong><?php _e( 'Requires WordPress Version:' ); ?></strong> <?php printf( __( '%s or higher' ), $api->requires ); ?></li>
-		<?php } if ( ! empty( $api->tested ) ) { ?>
-			<li><strong><?php _e( 'Compatible up to:' ); ?></strong> <?php echo $api->tested; ?></li>
-		<?php } if ( ! empty( $api->active_installs ) ) { ?>
-			<li><strong><?php _e( 'Active Installs:' ); ?></strong> <?php
-				if ( $api->active_installs >= 1000000 ) {
-					_ex( '1+ Million', 'Active plugin installs' );
+		<?php } if ( ! empty($api->requires)) { ?>
+			<li><strong><?php _e('Requires WordPress Version:'); ?></strong> <?php printf(__('%s or higher'), $api->requires); ?></li>
+		<?php } if ( ! empty($api->tested)) { ?>
+			<li><strong><?php _e('Compatible up to:'); ?></strong> <?php echo $api->tested; ?></li>
+		<?php } if ( ! empty($api->active_installs)) { ?>
+			<li><strong><?php _e('Active Installs:'); ?></strong> <?php
+				if ($api->active_installs >= 1000000) {
+					_ex('1+ Million', 'Active plugin installs');
 				} else {
-					echo number_format_i18n( $api->active_installs ) . '+';
+					echo number_format_i18n($api->active_installs).'+';
 				}
 			?></li>
-		<?php } if ( ! empty( $api->slug ) && empty( $api->external ) ) { ?>
-			<li><a target="_blank" href="https://wordpress.org/plugins/<?php echo $api->slug; ?>/"><?php _e( 'WordPress.org Plugin Page &#187;' ); ?></a></li>
-		<?php } if ( ! empty( $api->homepage ) ) { ?>
-			<li><a target="_blank" href="<?php echo esc_url( $api->homepage ); ?>"><?php _e( 'Plugin Homepage &#187;' ); ?></a></li>
-		<?php } if ( ! empty( $api->donate_link ) && empty( $api->contributors ) ) { ?>
-			<li><a target="_blank" href="<?php echo esc_url( $api->donate_link ); ?>"><?php _e( 'Donate to this plugin &#187;' ); ?></a></li>
+		<?php } if ( ! empty($api->slug) && empty($api->external)) { ?>
+			<li><a target="_blank" href="https://wordpress.org/plugins/<?php echo $api->slug; ?>/"><?php _e('WordPress.org Plugin Page &#187;'); ?></a></li>
+		<?php } if ( ! empty($api->homepage)) { ?>
+			<li><a target="_blank" href="<?php echo esc_url($api->homepage); ?>"><?php _e('Plugin Homepage &#187;'); ?></a></li>
+		<?php } if ( ! empty($api->donate_link) && empty($api->contributors)) { ?>
+			<li><a target="_blank" href="<?php echo esc_url($api->donate_link); ?>"><?php _e('Donate to this plugin &#187;'); ?></a></li>
 		<?php } ?>
 		</ul>
-		<?php if ( ! empty( $api->rating ) ) { ?>
-		<h3><?php _e( 'Average Rating' ); ?></h3>
-		<?php wp_star_rating( array( 'rating' => $api->rating, 'type' => 'percent', 'number' => $api->num_ratings ) ); ?>
-		<p aria-hidden="true" class="fyi-description"><?php printf( _n( '(based on %s rating)', '(based on %s ratings)', $api->num_ratings ), number_format_i18n( $api->num_ratings ) ); ?></p>
+		<?php if ( ! empty($api->rating)) { ?>
+		<h3><?php _e('Average Rating'); ?></h3>
+		<?php wp_star_rating(array('rating' => $api->rating, 'type' => 'percent', 'number' => $api->num_ratings)); ?>
+		<p aria-hidden="true" class="fyi-description"><?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?></p>
 		<?php }
 
-		if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) { ?>
-			<h3><?php _e( 'Reviews' ); ?></h3>
-			<p class="fyi-description"><?php _e( 'Read all reviews on WordPress.org or write your own!' ); ?></p>
+		if ( ! empty($api->ratings) && array_sum((array) $api->ratings) > 0) { ?>
+			<h3><?php _e('Reviews'); ?></h3>
+			<p class="fyi-description"><?php _e('Read all reviews on WordPress.org or write your own!'); ?></p>
 			<?php
-			foreach ( $api->ratings as $key => $ratecount ) {
+			foreach ($api->ratings as $key => $ratecount) {
 				// Avoid div-by-zero.
-				$_rating = $api->num_ratings ? ( $ratecount / $api->num_ratings ) : 0;
+				$_rating = $api->num_ratings ? ($ratecount / $api->num_ratings) : 0;
 				/* translators: 1: number of stars, 2: number of reviews */
-				$aria_label = esc_attr( sprintf( _n( 'Reviews with %1$d star: %2$d. Opens in a new window.', 'Reviews with %1$d stars: %2$d. Opens in a new window.', $key ),
+				$aria_label = esc_attr(sprintf(_n('Reviews with %1$d star: %2$d. Opens in a new window.', 'Reviews with %1$d stars: %2$d. Opens in a new window.', $key),
 					$key,
-					number_format_i18n( $ratecount )
-				) );
+					number_format_i18n($ratecount)
+				));
 				?>
 				<div class="counter-container">
 					<span class="counter-label"><a href="https://wordpress.org/support/view/plugin-reviews/<?php echo $api->slug; ?>?filter=<?php echo $key; ?>"
-						target="_blank" aria-label="<?php echo $aria_label; ?>"><?php printf( _n( '%d star', '%d stars', $key ), $key ); ?></a></span>
+						target="_blank" aria-label="<?php echo $aria_label; ?>"><?php printf(_n('%d star', '%d stars', $key), $key); ?></a></span>
 					<span class="counter-back">
 						<span class="counter-bar" style="width: <?php echo 92 * $_rating; ?>px;"></span>
 					</span>
-					<span class="counter-count" aria-hidden="true"><?php echo number_format_i18n( $ratecount ); ?></span>
+					<span class="counter-count" aria-hidden="true"><?php echo number_format_i18n($ratecount); ?></span>
 				</div>
 				<?php
 			}
 		}
-		if ( ! empty( $api->contributors ) ) { ?>
-			<h3><?php _e( 'Contributors' ); ?></h3>
+		if ( ! empty($api->contributors)) { ?>
+			<h3><?php _e('Contributors'); ?></h3>
 			<ul class="contributors">
 				<?php
-				foreach ( (array) $api->contributors as $contrib_username => $contrib_profile ) {
-					if ( empty( $contrib_username ) && empty( $contrib_profile ) ) {
+				foreach ((array) $api->contributors as $contrib_username => $contrib_profile) {
+					if (empty($contrib_username) && empty($contrib_profile)) {
 						continue;
 					}
-					if ( empty( $contrib_username ) ) {
-						$contrib_username = preg_replace( '/^.+\/(.+)\/?$/', '\1', $contrib_profile );
+					if (empty($contrib_username)) {
+						$contrib_username = preg_replace('/^.+\/(.+)\/?$/', '\1', $contrib_profile);
 					}
-					$contrib_username = sanitize_user( $contrib_username );
-					if ( empty( $contrib_profile ) ) {
+					$contrib_username = sanitize_user($contrib_username);
+					if (empty($contrib_profile)) {
 						echo "<li><img src='https://wordpress.org/grav-redirect.php?user={$contrib_username}&amp;s=36' width='18' height='18' alt='' />{$contrib_username}</li>";
 					} else {
 						echo "<li><a href='{$contrib_profile}' target='_blank'><img src='https://wordpress.org/grav-redirect.php?user={$contrib_username}&amp;s=36' width='18' height='18' alt='' />{$contrib_username}</a></li>";
@@ -619,26 +619,26 @@ 
 				}
 				?>
 			</ul>
-			<?php if ( ! empty( $api->donate_link ) ) { ?>
-				<a target="_blank" href="<?php echo esc_url( $api->donate_link ); ?>"><?php _e( 'Donate to this plugin &#187;' ); ?></a>
+			<?php if ( ! empty($api->donate_link)) { ?>
+				<a target="_blank" href="<?php echo esc_url($api->donate_link); ?>"><?php _e('Donate to this plugin &#187;'); ?></a>
 			<?php } ?>
 		<?php } ?>
 	</div>
 	<div id="section-holder" class="wrap">
 	<?php
-		if ( ! empty( $api->tested ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->tested ) ), $api->tested, '>' ) ) {
-			echo '<div class="notice notice-warning notice-alt"><p>' . __( '<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.' ) . '</p></div>';
-		} elseif ( ! empty( $api->requires ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->requires ) ), $api->requires, '<' ) ) {
-			echo '<div class="notice notice-warning notice-alt"><p>' . __( '<strong>Warning:</strong> This plugin has <strong>not been marked as compatible</strong> with your version of WordPress.' ) . '</p></div>';
+		if ( ! empty($api->tested) && version_compare(substr($GLOBALS['wp_version'], 0, strlen($api->tested)), $api->tested, '>')) {
+			echo '<div class="notice notice-warning notice-alt"><p>'.__('<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.').'</p></div>';
+		} elseif ( ! empty($api->requires) && version_compare(substr($GLOBALS['wp_version'], 0, strlen($api->requires)), $api->requires, '<')) {
+			echo '<div class="notice notice-warning notice-alt"><p>'.__('<strong>Warning:</strong> This plugin has <strong>not been marked as compatible</strong> with your version of WordPress.').'</p></div>';
 		}
 
-		foreach ( (array) $api->sections as $section_name => $content ) {
-			$content = links_add_base_url( $content, 'https://wordpress.org/plugins/' . $api->slug . '/' );
-			$content = links_add_target( $content, '_blank' );
+		foreach ((array) $api->sections as $section_name => $content) {
+			$content = links_add_base_url($content, 'https://wordpress.org/plugins/'.$api->slug.'/');
+			$content = links_add_target($content, '_blank');
 
-			$san_section = esc_attr( $section_name );
+			$san_section = esc_attr($section_name);
 
-			$display = ( $section_name === $section ) ? 'block' : 'none';
+			$display = ($section_name === $section) ? 'block' : 'none';
 
 			echo "\t<div id='section-{$san_section}' class='section' style='display: {$display};'>\n";
 			echo $content;
@@ -648,24 +648,24 @@ 
 	echo "</div>\n";
 	echo "</div>\n"; // #plugin-information-scrollable
 	echo "<div id='$tab-footer'>\n";
-	if ( ! empty( $api->download_link ) && ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) ) {
-		$status = install_plugin_install_status( $api );
-		switch ( $status['status'] ) {
+	if ( ! empty($api->download_link) && (current_user_can('install_plugins') || current_user_can('update_plugins'))) {
+		$status = install_plugin_install_status($api);
+		switch ($status['status']) {
 			case 'install':
-				if ( $status['url'] ) {
-					echo '<a class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Now' ) . '</a>';
+				if ($status['url']) {
+					echo '<a class="button button-primary right" href="'.$status['url'].'" target="_parent">'.__('Install Now').'</a>';
 				}
 				break;
 			case 'update_available':
-				if ( $status['url'] ) {
-					echo '<a data-slug="' . esc_attr( $api->slug ) . '" data-plugin="' . esc_attr( $status['file'] ) . '" id="plugin_update_from_iframe" class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Update Now' ) .'</a>';
+				if ($status['url']) {
+					echo '<a data-slug="'.esc_attr($api->slug).'" data-plugin="'.esc_attr($status['file']).'" id="plugin_update_from_iframe" class="button button-primary right" href="'.$status['url'].'" target="_parent">'.__('Install Update Now').'</a>';
 				}
 				break;
 			case 'newer_installed':
-				echo '<a class="button button-primary right disabled">' . sprintf( __( 'Newer Version (%s) Installed'), $status['version'] ) . '</a>';
+				echo '<a class="button button-primary right disabled">'.sprintf(__('Newer Version (%s) Installed'), $status['version']).'</a>';
 				break;
 			case 'latest_installed':
-				echo '<a class="button button-primary right disabled">' . __( 'Latest Version Installed' ) . '</a>';
+				echo '<a class="button button-primary right disabled">'.__('Latest Version Installed').'</a>';
 				break;
 		}
 	}

src/wp-admin/includes/update-core.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * WordPress core upgrade functionality.
- *
- * @package WordPress
- * @subpackage Administration
- * @since 2.7.0
- */
+	 * WordPress core upgrade functionality.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 2.7.0
+	 */
 
 /**
  * Stores files to be deleted.

Braces +126 added lines, -88 removed lines

@@ -849,20 +849,23 @@ 
 	$old_wp_version = $wp_version; // The version of WordPress we're updating from
 	$development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' )  ); // a dash in the version indicates a Development release
 	$php_compat     = version_compare( $php_version, $required_php_version, '>=' );
-	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
-		$mysql_compat = true;
-	else
-		$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
+	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
+			$mysql_compat = true;
+	} else {
+			$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
+	}
 
-	if ( !$mysql_compat || !$php_compat )
-		$wp_filesystem->delete($from, true);
+	if ( !$mysql_compat || !$php_compat ) {
+			$wp_filesystem->delete($from, true);
+	}
 
-	if ( !$mysql_compat && !$php_compat )
-		return new WP_Error( 'php_mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) );
-	elseif ( !$php_compat )
-		return new WP_Error( 'php_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ) );
-	elseif ( !$mysql_compat )
-		return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );
+	if ( !$mysql_compat && !$php_compat ) {
+			return new WP_Error( 'php_mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) );
+	} elseif ( !$php_compat ) {
+			return new WP_Error( 'php_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ) );
+	} elseif ( !$mysql_compat ) {
+			return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );
+	}
 
 	/** This filter is documented in wp-admin/includes/update-core.php */
 	apply_filters( 'update_feedback', __( 'Preparing to install the latest version…' ) );
@@ -878,20 +881,26 @@ 
 		$working_dir_local = WP_CONTENT_DIR . '/upgrade/' . basename( $from ) . $distro;
 
 		$checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
-		if ( is_array( $checksums ) && isset( $checksums[ $wp_version ] ) )
-			$checksums = $checksums[ $wp_version ]; // Compat code for 3.7-beta2
+		if ( is_array( $checksums ) && isset( $checksums[ $wp_version ] ) ) {
+					$checksums = $checksums[ $wp_version ];
+		}
+		// Compat code for 3.7-beta2
 		if ( is_array( $checksums ) ) {
 			foreach( $checksums as $file => $checksum ) {
-				if ( 'wp-content' == substr( $file, 0, 10 ) )
-					continue;
-				if ( ! file_exists( ABSPATH . $file ) )
-					continue;
-				if ( ! file_exists( $working_dir_local . $file ) )
-					continue;
-				if ( md5_file( ABSPATH . $file ) === $checksum )
-					$skip[] = $file;
-				else
-					$check_is_writable[ $file ] = ABSPATH . $file;
+				if ( 'wp-content' == substr( $file, 0, 10 ) ) {
+									continue;
+				}
+				if ( ! file_exists( ABSPATH . $file ) ) {
+									continue;
+				}
+				if ( ! file_exists( $working_dir_local . $file ) ) {
+									continue;
+				}
+				if ( md5_file( ABSPATH . $file ) === $checksum ) {
+									$skip[] = $file;
+				} else {
+									$check_is_writable[ $file ] = ABSPATH . $file;
+				}
 			}
 		}
 	}
@@ -904,15 +913,17 @@ 
 			foreach ( $files_not_writable as $relative_file_not_writable => $file_not_writable ) {
 				// If the writable check failed, chmod file to 0644 and try again, same as copy_dir().
 				$wp_filesystem->chmod( $file_not_writable, FS_CHMOD_FILE );
-				if ( $wp_filesystem->is_writable( $file_not_writable ) )
-					unset( $files_not_writable[ $relative_file_not_writable ] );
+				if ( $wp_filesystem->is_writable( $file_not_writable ) ) {
+									unset( $files_not_writable[ $relative_file_not_writable ] );
+				}
 			}
 
 			// Store package-relative paths (the key) of non-writable files in the WP_Error object.
 			$error_data = version_compare( $old_wp_version, '3.7-beta2', '>' ) ? array_keys( $files_not_writable ) : '';
 
-			if ( $files_not_writable )
-				return new WP_Error( 'files_not_writable', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), implode( ', ', $error_data ) );
+			if ( $files_not_writable ) {
+							return new WP_Error( 'files_not_writable', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), implode( ', ', $error_data ) );
+			}
 		}
 	}
 
@@ -928,8 +939,9 @@ 
 	apply_filters( 'update_feedback', __( 'Copying the required files…' ) );
 	// Copy new versions of WP files into place.
 	$result = _copy_dir( $from . $distro, $to, $skip );
-	if ( is_wp_error( $result ) )
-		$result = new WP_Error( $result->get_error_code(), $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );
+	if ( is_wp_error( $result ) ) {
+			$result = new WP_Error( $result->get_error_code(), $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );
+	}
 
 	// Since we know the core files have copied over, we can now copy the version file
 	if ( ! is_wp_error( $result ) ) {
@@ -945,14 +957,17 @@ 
 	$failed = array();
 	if ( isset( $checksums ) && is_array( $checksums ) ) {
 		foreach ( $checksums as $file => $checksum ) {
-			if ( 'wp-content' == substr( $file, 0, 10 ) )
-				continue;
-			if ( ! file_exists( $working_dir_local . $file ) )
-				continue;
-			if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) == $checksum )
-				$skip[] = $file;
-			else
-				$failed[] = $file;
+			if ( 'wp-content' == substr( $file, 0, 10 ) ) {
+							continue;
+			}
+			if ( ! file_exists( $working_dir_local . $file ) ) {
+							continue;
+			}
+			if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) == $checksum ) {
+							$skip[] = $file;
+			} else {
+							$failed[] = $file;
+			}
 		}
 	}
 
@@ -960,8 +975,9 @@ 
 	if ( ! empty( $failed ) ) {
 		$total_size = 0;
 		foreach ( $failed as $file ) {
-			if ( file_exists( $working_dir_local . $file ) )
-				$total_size += filesize( $working_dir_local . $file );
+			if ( file_exists( $working_dir_local . $file ) ) {
+							$total_size += filesize( $working_dir_local . $file );
+			}
 		}
 
 		// If we don't have enough free space, it isn't worth trying again.
@@ -971,18 +987,20 @@ 
 			$result = new WP_Error( 'disk_full', __( 'There is not enough free disk space to complete the update.' ) );
 		} else {
 			$result = _copy_dir( $from . $distro, $to, $skip );
-			if ( is_wp_error( $result ) )
-				$result = new WP_Error( $result->get_error_code() . '_retry', $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );
+			if ( is_wp_error( $result ) ) {
+							$result = new WP_Error( $result->get_error_code() . '_retry', $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );
+			}
 		}
 	}
 
 	// Custom Content Directory needs updating now.
 	// Copy Languages
 	if ( !is_wp_error($result) && $wp_filesystem->is_dir($from . $distro . 'wp-content/languages') ) {
-		if ( WP_LANG_DIR != ABSPATH . WPINC . '/languages' || @is_dir(WP_LANG_DIR) )
-			$lang_dir = WP_LANG_DIR;
-		else
-			$lang_dir = WP_CONTENT_DIR . '/languages';
+		if ( WP_LANG_DIR != ABSPATH . WPINC . '/languages' || @is_dir(WP_LANG_DIR) ) {
+					$lang_dir = WP_LANG_DIR;
+		} else {
+					$lang_dir = WP_CONTENT_DIR . '/languages';
+		}
 
 		if ( !@is_dir($lang_dir) && 0 === strpos($lang_dir, ABSPATH) ) { // Check the language directory exists first
 			$wp_filesystem->mkdir($to . str_replace(ABSPATH, '', $lang_dir), FS_CHMOD_DIR); // If it's within the ABSPATH we can handle it here, otherwise they're out of luck.
@@ -993,8 +1011,9 @@ 
 			$wp_lang_dir = $wp_filesystem->find_folder($lang_dir);
 			if ( $wp_lang_dir ) {
 				$result = copy_dir($from . $distro . 'wp-content/languages/', $wp_lang_dir);
-				if ( is_wp_error( $result ) )
-					$result = new WP_Error( $result->get_error_code() . '_languages', $result->get_error_message(), substr( $result->get_error_data(), strlen( $wp_lang_dir ) ) );
+				if ( is_wp_error( $result ) ) {
+									$result = new WP_Error( $result->get_error_code() . '_languages', $result->get_error_message(), substr( $result->get_error_data(), strlen( $wp_lang_dir ) ) );
+				}
 			}
 		}
 	}
@@ -1022,33 +1041,41 @@ 
 				list($type, $filename) = explode('/', $file, 2);
 
 				// Check to see if the bundled items exist before attempting to copy them
-				if ( ! $wp_filesystem->exists( $from . $distro . 'wp-content/' . $file ) )
-					continue;
+				if ( ! $wp_filesystem->exists( $from . $distro . 'wp-content/' . $file ) ) {
+									continue;
+				}
 
-				if ( 'plugins' == $type )
-					$dest = $wp_filesystem->wp_plugins_dir();
-				elseif ( 'themes' == $type )
-					$dest = trailingslashit($wp_filesystem->wp_themes_dir()); // Back-compat, ::wp_themes_dir() did not return trailingslash'd pre-3.2
-				else
-					continue;
+				if ( 'plugins' == $type ) {
+									$dest = $wp_filesystem->wp_plugins_dir();
+				} elseif ( 'themes' == $type ) {
+									$dest = trailingslashit($wp_filesystem->wp_themes_dir());
+				}
+				// Back-compat, ::wp_themes_dir() did not return trailingslash'd pre-3.2
+				else {
+									continue;
+				}
 
 				if ( ! $directory ) {
-					if ( ! $development_build && $wp_filesystem->exists( $dest . $filename ) )
-						continue;
+					if ( ! $development_build && $wp_filesystem->exists( $dest . $filename ) ) {
+											continue;
+					}
 
-					if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) )
-						$result = new WP_Error( "copy_failed_for_new_bundled_$type", __( 'Could not copy file.' ), $dest . $filename );
+					if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) ) {
+											$result = new WP_Error( "copy_failed_for_new_bundled_$type", __( 'Could not copy file.' ), $dest . $filename );
+					}
 				} else {
-					if ( ! $development_build && $wp_filesystem->is_dir( $dest . $filename ) )
-						continue;
+					if ( ! $development_build && $wp_filesystem->is_dir( $dest . $filename ) ) {
+											continue;
+					}
 
 					$wp_filesystem->mkdir($dest . $filename, FS_CHMOD_DIR);
 					$_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename);
 
 					// If a error occurs partway through this final step, keep the error flowing through, but keep process going.
 					if ( is_wp_error( $_result ) ) {
-						if ( ! is_wp_error( $result ) )
-							$result = new WP_Error;
+						if ( ! is_wp_error( $result ) ) {
+													$result = new WP_Error;
+						}
 						$result->add( $_result->get_error_code() . "_$type", $_result->get_error_message(), substr( $_result->get_error_data(), strlen( $dest ) ) );
 					}
 				}
@@ -1065,8 +1092,9 @@ 
 	// Remove old files
 	foreach ( $_old_files as $old_file ) {
 		$old_file = $to . $old_file;
-		if ( !$wp_filesystem->exists($old_file) )
-			continue;
+		if ( !$wp_filesystem->exists($old_file) ) {
+					continue;
+		}
 		$wp_filesystem->delete($old_file, true);
 	}
 
@@ -1088,10 +1116,11 @@ 
 	$wp_filesystem->delete($from, true);
 
 	// Force refresh of update information
-	if ( function_exists('delete_site_transient') )
-		delete_site_transient('update_core');
-	else
-		delete_option('update_core');
+	if ( function_exists('delete_site_transient') ) {
+			delete_site_transient('update_core');
+	} else {
+			delete_option('update_core');
+	}
 
 	/**
 	 * Fires after WordPress core has been successfully updated.
@@ -1103,8 +1132,9 @@ 
 	do_action( '_core_updated_successfully', $wp_version );
 
 	// Clear the option that blocks auto updates after failures, now that we've been successful.
-	if ( function_exists( 'delete_site_option' ) )
-		delete_site_option( 'auto_core_update_failed' );
+	if ( function_exists( 'delete_site_option' ) ) {
+			delete_site_option( 'auto_core_update_failed' );
+	}
 
 	return $wp_version;
 }
@@ -1137,20 +1167,23 @@ 
 	$to = trailingslashit($to);
 
 	foreach ( (array) $dirlist as $filename => $fileinfo ) {
-		if ( in_array( $filename, $skip_list ) )
-			continue;
+		if ( in_array( $filename, $skip_list ) ) {
+					continue;
+		}
 
 		if ( 'f' == $fileinfo['type'] ) {
 			if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
 				// If copy failed, chmod file to 0644 and try again.
 				$wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
-				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
-					return new WP_Error( 'copy_failed__copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
+									return new WP_Error( 'copy_failed__copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				}
 			}
 		} elseif ( 'd' == $fileinfo['type'] ) {
 			if ( !$wp_filesystem->is_dir($to . $filename) ) {
-				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
-					return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), $to . $filename );
+				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) ) {
+									return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), $to . $filename );
+				}
 			}
 
 			/*
@@ -1159,13 +1192,15 @@ 
 			 */
 			$sub_skip_list = array();
 			foreach ( $skip_list as $skip_item ) {
-				if ( 0 === strpos( $skip_item, $filename . '/' ) )
-					$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+				if ( 0 === strpos( $skip_item, $filename . '/' ) ) {
+									$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+				}
 			}
 
 			$result = _copy_dir($from . $filename, $to . $filename, $sub_skip_list);
-			if ( is_wp_error($result) )
-				return $result;
+			if ( is_wp_error($result) ) {
+							return $result;
+			}
 		}
 	}
 	return true;
@@ -1187,15 +1222,18 @@ 
 function _redirect_to_about_wordpress( $new_version ) {
 	global $wp_version, $pagenow, $action;
 
-	if ( version_compare( $wp_version, '3.4-RC1', '>=' ) )
-		return;
+	if ( version_compare( $wp_version, '3.4-RC1', '>=' ) ) {
+			return;
+	}
 
 	// Ensure we only run this on the update-core.php page. The Core_Upgrader may be used in other contexts.
-	if ( 'update-core.php' != $pagenow )
-		return;
+	if ( 'update-core.php' != $pagenow ) {
+			return;
+	}
 
- 	if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action )
- 		return;
+ 	if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action ) {
+ 	 		return;
+ 	}
 
 	// Load the updated default text localization domain for new strings.
 	load_default_textdomain();

Spacing +170 added lines, -170 removed lines

@@ -739,8 +739,8 @@ 
 );
 
 // If not explicitly defined as false, don't install new default themes.
-if ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || CORE_UPGRADE_SKIP_NEW_BUNDLED ) {
-	$_new_bundled_files = array( 'plugins/akismet/' => '2.0' );
+if ( ! defined('CORE_UPGRADE_SKIP_NEW_BUNDLED') || CORE_UPGRADE_SKIP_NEW_BUNDLED) {
+	$_new_bundled_files = array('plugins/akismet/' => '2.0');
 }
 
 /**
@@ -800,7 +800,7 @@ 
 function update_core($from, $to) {
 	global $wp_filesystem, $_old_files, $_new_bundled_files, $wpdb;
 
-	@set_time_limit( 300 );
+	@set_time_limit(300);
 
 	/**
 	 * Filter feedback messages displayed during the core update process.
@@ -819,20 +819,20 @@ 
 	 *
 	 * @param string $feedback The core update feedback messages.
 	 */
-	apply_filters( 'update_feedback', __( 'Verifying the unpacked files…' ) );
+	apply_filters('update_feedback', __('Verifying the unpacked files…'));
 
 	// Sanity check the unzipped distribution.
 	$distro = '';
-	$roots = array( '/wordpress/', '/wordpress-mu/' );
-	foreach ( $roots as $root ) {
-		if ( $wp_filesystem->exists( $from . $root . 'readme.html' ) && $wp_filesystem->exists( $from . $root . 'wp-includes/version.php' ) ) {
+	$roots = array('/wordpress/', '/wordpress-mu/');
+	foreach ($roots as $root) {
+		if ($wp_filesystem->exists($from.$root.'readme.html') && $wp_filesystem->exists($from.$root.'wp-includes/version.php')) {
 			$distro = $root;
 			break;
 		}
 	}
-	if ( ! $distro ) {
-		$wp_filesystem->delete( $from, true );
-		return new WP_Error( 'insane_distro', __('The update could not be unpacked') );
+	if ( ! $distro) {
+		$wp_filesystem->delete($from, true);
+		return new WP_Error('insane_distro', __('The update could not be unpacked'));
 	}
 
 
@@ -846,122 +846,122 @@ 
 	 */
 	global $wp_version, $required_php_version, $required_mysql_version;
 
-	$versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php';
-	if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) {
-		$wp_filesystem->delete( $from, true );
-		return new WP_Error( 'copy_failed_for_version_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-includes/version.php' );
+	$versions_file = trailingslashit($wp_filesystem->wp_content_dir()).'upgrade/version-current.php';
+	if ( ! $wp_filesystem->copy($from.$distro.'wp-includes/version.php', $versions_file)) {
+		$wp_filesystem->delete($from, true);
+		return new WP_Error('copy_failed_for_version_file', __('The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.'), 'wp-includes/version.php');
 	}
 
-	$wp_filesystem->chmod( $versions_file, FS_CHMOD_FILE );
-	require( WP_CONTENT_DIR . '/upgrade/version-current.php' );
-	$wp_filesystem->delete( $versions_file );
+	$wp_filesystem->chmod($versions_file, FS_CHMOD_FILE);
+	require(WP_CONTENT_DIR.'/upgrade/version-current.php');
+	$wp_filesystem->delete($versions_file);
 
 	$php_version    = phpversion();
 	$mysql_version  = $wpdb->db_version();
 	$old_wp_version = $wp_version; // The version of WordPress we're updating from
-	$development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' )  ); // a dash in the version indicates a Development release
-	$php_compat     = version_compare( $php_version, $required_php_version, '>=' );
-	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+	$development_build = (false !== strpos($old_wp_version.$wp_version, '-')); // a dash in the version indicates a Development release
+	$php_compat     = version_compare($php_version, $required_php_version, '>=');
+	if (file_exists(WP_CONTENT_DIR.'/db.php') && empty($wpdb->is_mysql))
 		$mysql_compat = true;
 	else
-		$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
+		$mysql_compat = version_compare($mysql_version, $required_mysql_version, '>=');
 
-	if ( !$mysql_compat || !$php_compat )
+	if ( ! $mysql_compat || ! $php_compat)
 		$wp_filesystem->delete($from, true);
 
-	if ( !$mysql_compat && !$php_compat )
-		return new WP_Error( 'php_mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) );
-	elseif ( !$php_compat )
-		return new WP_Error( 'php_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ) );
-	elseif ( !$mysql_compat )
-		return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );
+	if ( ! $mysql_compat && ! $php_compat)
+		return new WP_Error('php_mysql_not_compatible', sprintf(__('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version));
+	elseif ( ! $php_compat)
+		return new WP_Error('php_not_compatible', sprintf(__('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version));
+	elseif ( ! $mysql_compat)
+		return new WP_Error('mysql_not_compatible', sprintf(__('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version));
 
 	/** This filter is documented in wp-admin/includes/update-core.php */
-	apply_filters( 'update_feedback', __( 'Preparing to install the latest version…' ) );
+	apply_filters('update_feedback', __('Preparing to install the latest version…'));
 
 	// Don't copy wp-content, we'll deal with that below
 	// We also copy version.php last so failed updates report their old version
-	$skip = array( 'wp-content', 'wp-includes/version.php' );
+	$skip = array('wp-content', 'wp-includes/version.php');
 	$check_is_writable = array();
 
 	// Check to see which files don't really need updating - only available for 3.7 and higher
-	if ( function_exists( 'get_core_checksums' ) ) {
+	if (function_exists('get_core_checksums')) {
 		// Find the local version of the working directory
-		$working_dir_local = WP_CONTENT_DIR . '/upgrade/' . basename( $from ) . $distro;
-
-		$checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
-		if ( is_array( $checksums ) && isset( $checksums[ $wp_version ] ) )
-			$checksums = $checksums[ $wp_version ]; // Compat code for 3.7-beta2
-		if ( is_array( $checksums ) ) {
-			foreach ( $checksums as $file => $checksum ) {
-				if ( 'wp-content' == substr( $file, 0, 10 ) )
+		$working_dir_local = WP_CONTENT_DIR.'/upgrade/'.basename($from).$distro;
+
+		$checksums = get_core_checksums($wp_version, isset($wp_local_package) ? $wp_local_package : 'en_US');
+		if (is_array($checksums) && isset($checksums[$wp_version]))
+			$checksums = $checksums[$wp_version]; // Compat code for 3.7-beta2
+		if (is_array($checksums)) {
+			foreach ($checksums as $file => $checksum) {
+				if ('wp-content' == substr($file, 0, 10))
 					continue;
-				if ( ! file_exists( ABSPATH . $file ) )
+				if ( ! file_exists(ABSPATH.$file))
 					continue;
-				if ( ! file_exists( $working_dir_local . $file ) )
+				if ( ! file_exists($working_dir_local.$file))
 					continue;
-				if ( md5_file( ABSPATH . $file ) === $checksum )
+				if (md5_file(ABSPATH.$file) === $checksum)
 					$skip[] = $file;
 				else
-					$check_is_writable[ $file ] = ABSPATH . $file;
+					$check_is_writable[$file] = ABSPATH.$file;
 			}
 		}
 	}
 
 	// If we're using the direct method, we can predict write failures that are due to permissions.
-	if ( $check_is_writable && 'direct' === $wp_filesystem->method ) {
-		$files_writable = array_filter( $check_is_writable, array( $wp_filesystem, 'is_writable' ) );
-		if ( $files_writable !== $check_is_writable ) {
-			$files_not_writable = array_diff_key( $check_is_writable, $files_writable );
-			foreach ( $files_not_writable as $relative_file_not_writable => $file_not_writable ) {
+	if ($check_is_writable && 'direct' === $wp_filesystem->method) {
+		$files_writable = array_filter($check_is_writable, array($wp_filesystem, 'is_writable'));
+		if ($files_writable !== $check_is_writable) {
+			$files_not_writable = array_diff_key($check_is_writable, $files_writable);
+			foreach ($files_not_writable as $relative_file_not_writable => $file_not_writable) {
 				// If the writable check failed, chmod file to 0644 and try again, same as copy_dir().
-				$wp_filesystem->chmod( $file_not_writable, FS_CHMOD_FILE );
-				if ( $wp_filesystem->is_writable( $file_not_writable ) )
-					unset( $files_not_writable[ $relative_file_not_writable ] );
+				$wp_filesystem->chmod($file_not_writable, FS_CHMOD_FILE);
+				if ($wp_filesystem->is_writable($file_not_writable))
+					unset($files_not_writable[$relative_file_not_writable]);
 			}
 
 			// Store package-relative paths (the key) of non-writable files in the WP_Error object.
-			$error_data = version_compare( $old_wp_version, '3.7-beta2', '>' ) ? array_keys( $files_not_writable ) : '';
+			$error_data = version_compare($old_wp_version, '3.7-beta2', '>') ? array_keys($files_not_writable) : '';
 
-			if ( $files_not_writable )
-				return new WP_Error( 'files_not_writable', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), implode( ', ', $error_data ) );
+			if ($files_not_writable)
+				return new WP_Error('files_not_writable', __('The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.'), implode(', ', $error_data));
 		}
 	}
 
 	/** This filter is documented in wp-admin/includes/update-core.php */
-	apply_filters( 'update_feedback', __( 'Enabling Maintenance mode…' ) );
+	apply_filters('update_feedback', __('Enabling Maintenance mode…'));
 	// Create maintenance file to signal that we are upgrading
-	$maintenance_string = '<?php $upgrading = ' . time() . '; ?>';
-	$maintenance_file = $to . '.maintenance';
+	$maintenance_string = '<?php $upgrading = '.time().'; ?>';
+	$maintenance_file = $to.'.maintenance';
 	$wp_filesystem->delete($maintenance_file);
 	$wp_filesystem->put_contents($maintenance_file, $maintenance_string, FS_CHMOD_FILE);
 
 	/** This filter is documented in wp-admin/includes/update-core.php */
-	apply_filters( 'update_feedback', __( 'Copying the required files&#8230;' ) );
+	apply_filters('update_feedback', __('Copying the required files&#8230;'));
 	// Copy new versions of WP files into place.
-	$result = _copy_dir( $from . $distro, $to, $skip );
-	if ( is_wp_error( $result ) )
-		$result = new WP_Error( $result->get_error_code(), $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );
+	$result = _copy_dir($from.$distro, $to, $skip);
+	if (is_wp_error($result))
+		$result = new WP_Error($result->get_error_code(), $result->get_error_message(), substr($result->get_error_data(), strlen($to)));
 
 	// Since we know the core files have copied over, we can now copy the version file
-	if ( ! is_wp_error( $result ) ) {
-		if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $to . 'wp-includes/version.php', true /* overwrite */ ) ) {
-			$wp_filesystem->delete( $from, true );
-			$result = new WP_Error( 'copy_failed_for_version_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-includes/version.php' );
+	if ( ! is_wp_error($result)) {
+		if ( ! $wp_filesystem->copy($from.$distro.'wp-includes/version.php', $to.'wp-includes/version.php', true /* overwrite */)) {
+			$wp_filesystem->delete($from, true);
+			$result = new WP_Error('copy_failed_for_version_file', __('The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.'), 'wp-includes/version.php');
 		}
-		$wp_filesystem->chmod( $to . 'wp-includes/version.php', FS_CHMOD_FILE );
+		$wp_filesystem->chmod($to.'wp-includes/version.php', FS_CHMOD_FILE);
 	}
 
 	// Check to make sure everything copied correctly, ignoring the contents of wp-content
-	$skip = array( 'wp-content' );
+	$skip = array('wp-content');
 	$failed = array();
-	if ( isset( $checksums ) && is_array( $checksums ) ) {
-		foreach ( $checksums as $file => $checksum ) {
-			if ( 'wp-content' == substr( $file, 0, 10 ) )
+	if (isset($checksums) && is_array($checksums)) {
+		foreach ($checksums as $file => $checksum) {
+			if ('wp-content' == substr($file, 0, 10))
 				continue;
-			if ( ! file_exists( $working_dir_local . $file ) )
+			if ( ! file_exists($working_dir_local.$file))
 				continue;
-			if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) == $checksum )
+			if (file_exists(ABSPATH.$file) && md5_file(ABSPATH.$file) == $checksum)
 				$skip[] = $file;
 			else
 				$failed[] = $file;
@@ -969,99 +969,99 @@ 
 	}
 
 	// Some files didn't copy properly
-	if ( ! empty( $failed ) ) {
+	if ( ! empty($failed)) {
 		$total_size = 0;
-		foreach ( $failed as $file ) {
-			if ( file_exists( $working_dir_local . $file ) )
-				$total_size += filesize( $working_dir_local . $file );
+		foreach ($failed as $file) {
+			if (file_exists($working_dir_local.$file))
+				$total_size += filesize($working_dir_local.$file);
 		}
 
 		// If we don't have enough free space, it isn't worth trying again.
 		// Unlikely to be hit due to the check in unzip_file().
-		$available_space = @disk_free_space( ABSPATH );
-		if ( $available_space && $total_size >= $available_space ) {
-			$result = new WP_Error( 'disk_full', __( 'There is not enough free disk space to complete the update.' ) );
+		$available_space = @disk_free_space(ABSPATH);
+		if ($available_space && $total_size >= $available_space) {
+			$result = new WP_Error('disk_full', __('There is not enough free disk space to complete the update.'));
 		} else {
-			$result = _copy_dir( $from . $distro, $to, $skip );
-			if ( is_wp_error( $result ) )
-				$result = new WP_Error( $result->get_error_code() . '_retry', $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );
+			$result = _copy_dir($from.$distro, $to, $skip);
+			if (is_wp_error($result))
+				$result = new WP_Error($result->get_error_code().'_retry', $result->get_error_message(), substr($result->get_error_data(), strlen($to)));
 		}
 	}
 
 	// Custom Content Directory needs updating now.
 	// Copy Languages
-	if ( !is_wp_error($result) && $wp_filesystem->is_dir($from . $distro . 'wp-content/languages') ) {
-		if ( WP_LANG_DIR != ABSPATH . WPINC . '/languages' || @is_dir(WP_LANG_DIR) )
+	if ( ! is_wp_error($result) && $wp_filesystem->is_dir($from.$distro.'wp-content/languages')) {
+		if (WP_LANG_DIR != ABSPATH.WPINC.'/languages' || @is_dir(WP_LANG_DIR))
 			$lang_dir = WP_LANG_DIR;
 		else
-			$lang_dir = WP_CONTENT_DIR . '/languages';
+			$lang_dir = WP_CONTENT_DIR.'/languages';
 
-		if ( !@is_dir($lang_dir) && 0 === strpos($lang_dir, ABSPATH) ) { // Check the language directory exists first
-			$wp_filesystem->mkdir($to . str_replace(ABSPATH, '', $lang_dir), FS_CHMOD_DIR); // If it's within the ABSPATH we can handle it here, otherwise they're out of luck.
+		if ( ! @is_dir($lang_dir) && 0 === strpos($lang_dir, ABSPATH)) { // Check the language directory exists first
+			$wp_filesystem->mkdir($to.str_replace(ABSPATH, '', $lang_dir), FS_CHMOD_DIR); // If it's within the ABSPATH we can handle it here, otherwise they're out of luck.
 			clearstatcache(); // for FTP, Need to clear the stat cache
 		}
 
-		if ( @is_dir($lang_dir) ) {
+		if (@is_dir($lang_dir)) {
 			$wp_lang_dir = $wp_filesystem->find_folder($lang_dir);
-			if ( $wp_lang_dir ) {
-				$result = copy_dir($from . $distro . 'wp-content/languages/', $wp_lang_dir);
-				if ( is_wp_error( $result ) )
-					$result = new WP_Error( $result->get_error_code() . '_languages', $result->get_error_message(), substr( $result->get_error_data(), strlen( $wp_lang_dir ) ) );
+			if ($wp_lang_dir) {
+				$result = copy_dir($from.$distro.'wp-content/languages/', $wp_lang_dir);
+				if (is_wp_error($result))
+					$result = new WP_Error($result->get_error_code().'_languages', $result->get_error_message(), substr($result->get_error_data(), strlen($wp_lang_dir)));
 			}
 		}
 	}
 
 	/** This filter is documented in wp-admin/includes/update-core.php */
-	apply_filters( 'update_feedback', __( 'Disabling Maintenance mode&#8230;' ) );
+	apply_filters('update_feedback', __('Disabling Maintenance mode&#8230;'));
 	// Remove maintenance file, we're done with potential site-breaking changes
-	$wp_filesystem->delete( $maintenance_file );
+	$wp_filesystem->delete($maintenance_file);
 
 	// 3.5 -> 3.5+ - an empty twentytwelve directory was created upon upgrade to 3.5 for some users, preventing installation of Twenty Twelve.
-	if ( '3.5' == $old_wp_version ) {
-		if ( is_dir( WP_CONTENT_DIR . '/themes/twentytwelve' ) && ! file_exists( WP_CONTENT_DIR . '/themes/twentytwelve/style.css' )  ) {
-			$wp_filesystem->delete( $wp_filesystem->wp_themes_dir() . 'twentytwelve/' );
+	if ('3.5' == $old_wp_version) {
+		if (is_dir(WP_CONTENT_DIR.'/themes/twentytwelve') && ! file_exists(WP_CONTENT_DIR.'/themes/twentytwelve/style.css')) {
+			$wp_filesystem->delete($wp_filesystem->wp_themes_dir().'twentytwelve/');
 		}
 	}
 
 	// Copy New bundled plugins & themes
 	// This gives us the ability to install new plugins & themes bundled with future versions of WordPress whilst avoiding the re-install upon upgrade issue.
 	// $development_build controls us overwriting bundled themes and plugins when a non-stable release is being updated
-	if ( !is_wp_error($result) && ( ! defined('CORE_UPGRADE_SKIP_NEW_BUNDLED') || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {
-		foreach ( (array) $_new_bundled_files as $file => $introduced_version ) {
+	if ( ! is_wp_error($result) && ( ! defined('CORE_UPGRADE_SKIP_NEW_BUNDLED') || ! CORE_UPGRADE_SKIP_NEW_BUNDLED)) {
+		foreach ((array) $_new_bundled_files as $file => $introduced_version) {
 			// If a $development_build or if $introduced version is greater than what the site was previously running
-			if ( $development_build || version_compare( $introduced_version, $old_wp_version, '>' ) ) {
-				$directory = ('/' == $file[ strlen($file)-1 ]);
+			if ($development_build || version_compare($introduced_version, $old_wp_version, '>')) {
+				$directory = ('/' == $file[strlen($file) - 1]);
 				list($type, $filename) = explode('/', $file, 2);
 
 				// Check to see if the bundled items exist before attempting to copy them
-				if ( ! $wp_filesystem->exists( $from . $distro . 'wp-content/' . $file ) )
+				if ( ! $wp_filesystem->exists($from.$distro.'wp-content/'.$file))
 					continue;
 
-				if ( 'plugins' == $type )
+				if ('plugins' == $type)
 					$dest = $wp_filesystem->wp_plugins_dir();
-				elseif ( 'themes' == $type )
+				elseif ('themes' == $type)
 					$dest = trailingslashit($wp_filesystem->wp_themes_dir()); // Back-compat, ::wp_themes_dir() did not return trailingslash'd pre-3.2
 				else
 					continue;
 
-				if ( ! $directory ) {
-					if ( ! $development_build && $wp_filesystem->exists( $dest . $filename ) )
+				if ( ! $directory) {
+					if ( ! $development_build && $wp_filesystem->exists($dest.$filename))
 						continue;
 
-					if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) )
-						$result = new WP_Error( "copy_failed_for_new_bundled_$type", __( 'Could not copy file.' ), $dest . $filename );
+					if ( ! $wp_filesystem->copy($from.$distro.'wp-content/'.$file, $dest.$filename, FS_CHMOD_FILE))
+						$result = new WP_Error("copy_failed_for_new_bundled_$type", __('Could not copy file.'), $dest.$filename);
 				} else {
-					if ( ! $development_build && $wp_filesystem->is_dir( $dest . $filename ) )
+					if ( ! $development_build && $wp_filesystem->is_dir($dest.$filename))
 						continue;
 
-					$wp_filesystem->mkdir($dest . $filename, FS_CHMOD_DIR);
-					$_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename);
+					$wp_filesystem->mkdir($dest.$filename, FS_CHMOD_DIR);
+					$_result = copy_dir($from.$distro.'wp-content/'.$file, $dest.$filename);
 
 					// If a error occurs partway through this final step, keep the error flowing through, but keep process going.
-					if ( is_wp_error( $_result ) ) {
-						if ( ! is_wp_error( $result ) )
+					if (is_wp_error($_result)) {
+						if ( ! is_wp_error($result))
 							$result = new WP_Error;
-						$result->add( $_result->get_error_code() . "_$type", $_result->get_error_message(), substr( $_result->get_error_data(), strlen( $dest ) ) );
+						$result->add($_result->get_error_code()."_$type", $_result->get_error_message(), substr($_result->get_error_data(), strlen($dest)));
 					}
 				}
 			}
@@ -1069,15 +1069,15 @@ 
 	}
 
 	// Handle $result error from the above blocks
-	if ( is_wp_error($result) ) {
+	if (is_wp_error($result)) {
 		$wp_filesystem->delete($from, true);
 		return $result;
 	}
 
 	// Remove old files
-	foreach ( $_old_files as $old_file ) {
-		$old_file = $to . $old_file;
-		if ( !$wp_filesystem->exists($old_file) )
+	foreach ($_old_files as $old_file) {
+		$old_file = $to.$old_file;
+		if ( ! $wp_filesystem->exists($old_file))
 			continue;
 		$wp_filesystem->delete($old_file, true);
 	}
@@ -1090,20 +1090,20 @@ 
 
 	// Upgrade DB with separate request
 	/** This filter is documented in wp-admin/includes/update-core.php */
-	apply_filters( 'update_feedback', __( 'Upgrading database&#8230;' ) );
+	apply_filters('update_feedback', __('Upgrading database&#8230;'));
 	$db_upgrade_url = admin_url('upgrade.php?step=upgrade_db');
 	wp_remote_post($db_upgrade_url, array('timeout' => 60));
 
 	// Clear the cache to prevent an update_option() from saving a stale db_version to the cache
 	wp_cache_flush();
 	// (Not all cache back ends listen to 'flush')
-	wp_cache_delete( 'alloptions', 'options' );
+	wp_cache_delete('alloptions', 'options');
 
 	// Remove working directory
 	$wp_filesystem->delete($from, true);
 
 	// Force refresh of update information
-	if ( function_exists('delete_site_transient') )
+	if (function_exists('delete_site_transient'))
 		delete_site_transient('update_core');
 	else
 		delete_option('update_core');
@@ -1115,11 +1115,11 @@ 
 	 *
 	 * @param string $wp_version The current WordPress version.
 	 */
-	do_action( '_core_updated_successfully', $wp_version );
+	do_action('_core_updated_successfully', $wp_version);
 
 	// Clear the option that blocks auto updates after failures, now that we've been successful.
-	if ( function_exists( 'delete_site_option' ) )
-		delete_site_option( 'auto_core_update_failed' );
+	if (function_exists('delete_site_option'))
+		delete_site_option('auto_core_update_failed');
 
 	return $wp_version;
 }
@@ -1143,7 +1143,7 @@ 
  * @param array $skip_list a list of files/folders to skip copying
  * @return mixed WP_Error on failure, True on success.
  */
-function _copy_dir($from, $to, $skip_list = array() ) {
+function _copy_dir($from, $to, $skip_list = array()) {
 	global $wp_filesystem;
 
 	$dirlist = $wp_filesystem->dirlist($from);
@@ -1151,21 +1151,21 @@ 
 	$from = trailingslashit($from);
 	$to = trailingslashit($to);
 
-	foreach ( (array) $dirlist as $filename => $fileinfo ) {
-		if ( in_array( $filename, $skip_list ) )
+	foreach ((array) $dirlist as $filename => $fileinfo) {
+		if (in_array($filename, $skip_list))
 			continue;
 
-		if ( 'f' == $fileinfo['type'] ) {
-			if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
+		if ('f' == $fileinfo['type']) {
+			if ( ! $wp_filesystem->copy($from.$filename, $to.$filename, true, FS_CHMOD_FILE)) {
 				// If copy failed, chmod file to 0644 and try again.
-				$wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
-				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
-					return new WP_Error( 'copy_failed__copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				$wp_filesystem->chmod($to.$filename, FS_CHMOD_FILE);
+				if ( ! $wp_filesystem->copy($from.$filename, $to.$filename, true, FS_CHMOD_FILE))
+					return new WP_Error('copy_failed__copy_dir', __('Could not copy file.'), $to.$filename);
 			}
-		} elseif ( 'd' == $fileinfo['type'] ) {
-			if ( !$wp_filesystem->is_dir($to . $filename) ) {
-				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
-					return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), $to . $filename );
+		} elseif ('d' == $fileinfo['type']) {
+			if ( ! $wp_filesystem->is_dir($to.$filename)) {
+				if ( ! $wp_filesystem->mkdir($to.$filename, FS_CHMOD_DIR))
+					return new WP_Error('mkdir_failed__copy_dir', __('Could not create directory.'), $to.$filename);
 			}
 
 			/*
@@ -1173,13 +1173,13 @@ 
 			 * of the existing $skip_list.
 			 */
 			$sub_skip_list = array();
-			foreach ( $skip_list as $skip_item ) {
-				if ( 0 === strpos( $skip_item, $filename . '/' ) )
-					$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+			foreach ($skip_list as $skip_item) {
+				if (0 === strpos($skip_item, $filename.'/'))
+					$sub_skip_list[] = preg_replace('!^'.preg_quote($filename, '!').'/!i', '', $skip_item);
 			}
 
-			$result = _copy_dir($from . $filename, $to . $filename, $sub_skip_list);
-			if ( is_wp_error($result) )
+			$result = _copy_dir($from.$filename, $to.$filename, $sub_skip_list);
+			if (is_wp_error($result))
 				return $result;
 		}
 	}
@@ -1199,28 +1199,28 @@ 
  *
  * @param string $new_version
  */
-function _redirect_to_about_wordpress( $new_version ) {
+function _redirect_to_about_wordpress($new_version) {
 	global $wp_version, $pagenow, $action;
 
-	if ( version_compare( $wp_version, '3.4-RC1', '>=' ) )
+	if (version_compare($wp_version, '3.4-RC1', '>='))
 		return;
 
 	// Ensure we only run this on the update-core.php page. The Core_Upgrader may be used in other contexts.
-	if ( 'update-core.php' != $pagenow )
+	if ('update-core.php' != $pagenow)
 		return;
 
- 	if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action )
+ 	if ('do-core-upgrade' != $action && 'do-core-reinstall' != $action)
  		return;
 
 	// Load the updated default text localization domain for new strings.
 	load_default_textdomain();
 
 	// See do_core_upgrade()
-	show_message( __('WordPress updated successfully') );
+	show_message(__('WordPress updated successfully'));
 
 	// self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional.
-	show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.' ), $new_version, 'about.php?updated' ) . '</span>' );
-	show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, 'about.php?updated' ) . '</span>' );
+	show_message('<span class="hide-if-no-js">'.sprintf(__('Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.'), $new_version, 'about.php?updated').'</span>');
+	show_message('<span class="hide-if-js">'.sprintf(__('Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.'), $new_version, 'about.php?updated').'</span>');
 	echo '</div>';
 	?>
 <script type="text/javascript">
@@ -1229,7 +1229,7 @@ 
 	<?php
 
 	// Include admin-footer.php and exit.
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	exit();
 }
 
@@ -1248,30 +1248,30 @@ 
 	$affected_files = array();
 
 	// Themes
-	foreach ( $wp_theme_directories as $directory ) {
-		$affected_theme_files = _upgrade_422_find_genericons_files_in_folder( $directory );
-		$affected_files       = array_merge( $affected_files, $affected_theme_files );
+	foreach ($wp_theme_directories as $directory) {
+		$affected_theme_files = _upgrade_422_find_genericons_files_in_folder($directory);
+		$affected_files       = array_merge($affected_files, $affected_theme_files);
 	}
 
 	// Plugins
-	$affected_plugin_files = _upgrade_422_find_genericons_files_in_folder( WP_PLUGIN_DIR );
-	$affected_files        = array_merge( $affected_files, $affected_plugin_files );
+	$affected_plugin_files = _upgrade_422_find_genericons_files_in_folder(WP_PLUGIN_DIR);
+	$affected_files        = array_merge($affected_files, $affected_plugin_files);
 
-	foreach ( $affected_files as $file ) {
-		$gen_dir = $wp_filesystem->find_folder( trailingslashit( dirname( $file ) ) );
-		if ( empty( $gen_dir ) ) {
+	foreach ($affected_files as $file) {
+		$gen_dir = $wp_filesystem->find_folder(trailingslashit(dirname($file)));
+		if (empty($gen_dir)) {
 			continue;
 		}
 
 		// The path when the file is accessed via WP_Filesystem may differ in the case of FTP
-		$remote_file = $gen_dir . basename( $file );
+		$remote_file = $gen_dir.basename($file);
 
-		if ( ! $wp_filesystem->exists( $remote_file ) ) {
+		if ( ! $wp_filesystem->exists($remote_file)) {
 			continue;
 		}
 
-		if ( ! $wp_filesystem->delete( $remote_file, false, 'f' ) ) {
-			$wp_filesystem->put_contents( $remote_file, '' );
+		if ( ! $wp_filesystem->delete($remote_file, false, 'f')) {
+			$wp_filesystem->put_contents($remote_file, '');
 		}
 	}
 }
@@ -1285,18 +1285,18 @@ 
  * @param string $directory Directory path. Expects trailingslashed.
  * @return array
  */
-function _upgrade_422_find_genericons_files_in_folder( $directory ) {
-	$directory = trailingslashit( $directory );
+function _upgrade_422_find_genericons_files_in_folder($directory) {
+	$directory = trailingslashit($directory);
 	$files     = array();
 
-	if ( file_exists( "{$directory}example.html" ) && false !== strpos( file_get_contents( "{$directory}example.html" ), '<title>Genericons</title>' ) ) {
+	if (file_exists("{$directory}example.html") && false !== strpos(file_get_contents("{$directory}example.html"), '<title>Genericons</title>')) {
 		$files[] = "{$directory}example.html";
 	}
 
-	$dirs = glob( $directory . '*', GLOB_ONLYDIR );
-	if ( $dirs ) {
-		foreach ( $dirs as $dir ) {
-			$files = array_merge( $files, _upgrade_422_find_genericons_files_in_folder( $dir ) );
+	$dirs = glob($directory.'*', GLOB_ONLYDIR);
+	if ($dirs) {
+		foreach ($dirs as $dir) {
+			$files = array_merge($files, _upgrade_422_find_genericons_files_in_folder($dir));
 		}
 	}
 
@@ -1308,7 +1308,7 @@ 
  * @since 4.4.0
  */
 function _upgrade_440_force_deactivate_incompatible_plugins() {
-	if ( defined( 'REST_API_VERSION' ) && version_compare( REST_API_VERSION, '2.0-beta4', '<=' ) ) {
-		deactivate_plugins( array( 'rest-api/plugin.php' ), true );
+	if (defined('REST_API_VERSION') && version_compare(REST_API_VERSION, '2.0-beta4', '<=')) {
+		deactivate_plugins(array('rest-api/plugin.php'), true);
 	}
 }

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

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * WP_Importer base class
- */
+	 * WP_Importer base class
+	 */
 class WP_Importer {
 	/**
 	 * Class Constructor

Spacing +71 added lines, -71 removed lines

@@ -18,7 +18,7 @@ 
 	 * @param string $bid
 	 * @return array
 	 */
-	public function get_imported_posts( $importer_name, $bid ) {
+	public function get_imported_posts($importer_name, $bid) {
 		global $wpdb;
 
 		$hashtable = array();
@@ -28,23 +28,23 @@ 
 
 		// Grab all posts in chunks
 		do {
-			$meta_key = $importer_name . '_' . $bid . '_permalink';
-			$sql = $wpdb->prepare( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '%s' LIMIT %d,%d", $meta_key, $offset, $limit );
-			$results = $wpdb->get_results( $sql );
+			$meta_key = $importer_name.'_'.$bid.'_permalink';
+			$sql = $wpdb->prepare("SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '%s' LIMIT %d,%d", $meta_key, $offset, $limit);
+			$results = $wpdb->get_results($sql);
 
 			// Increment offset
-			$offset = ( $limit + $offset );
+			$offset = ($limit + $offset);
 
-			if ( !empty( $results ) ) {
-				foreach ( $results as $r ) {
+			if ( ! empty($results)) {
+				foreach ($results as $r) {
 					// Set permalinks into array
-					$hashtable[$r->meta_value] = intval( $r->post_id );
+					$hashtable[$r->meta_value] = intval($r->post_id);
 				}
 			}
-		} while ( count( $results ) == $limit );
+		} while (count($results) == $limit);
 
 		// Unset to save memory.
-		unset( $results, $r );
+		unset($results, $r);
 
 		return $hashtable;
 	}
@@ -58,22 +58,22 @@ 
 	 * @param string $bid
 	 * @return int
 	 */
-	public function count_imported_posts( $importer_name, $bid ) {
+	public function count_imported_posts($importer_name, $bid) {
 		global $wpdb;
 
 		$count = 0;
 
 		// Get count of permalinks
-		$meta_key = $importer_name . '_' . $bid . '_permalink';
-		$sql = $wpdb->prepare( "SELECT COUNT( post_id ) AS cnt FROM $wpdb->postmeta WHERE meta_key = '%s'", $meta_key );
+		$meta_key = $importer_name.'_'.$bid.'_permalink';
+		$sql = $wpdb->prepare("SELECT COUNT( post_id ) AS cnt FROM $wpdb->postmeta WHERE meta_key = '%s'", $meta_key);
 
-		$result = $wpdb->get_results( $sql );
+		$result = $wpdb->get_results($sql);
 
-		if ( !empty( $result ) )
-			$count = intval( $result[0]->cnt );
+		if ( ! empty($result))
+			$count = intval($result[0]->cnt);
 
 		// Unset to save memory.
-		unset( $results );
+		unset($results);
 
 		return $count;
 	}
@@ -86,7 +86,7 @@ 
 	 * @param string $bid
 	 * @return array
 	 */
-	public function get_imported_comments( $bid ) {
+	public function get_imported_comments($bid) {
 		global $wpdb;
 
 		$hashtable = array();
@@ -96,28 +96,28 @@ 
 
 		// Grab all comments in chunks
 		do {
-			$sql = $wpdb->prepare( "SELECT comment_ID, comment_agent FROM $wpdb->comments LIMIT %d,%d", $offset, $limit );
-			$results = $wpdb->get_results( $sql );
+			$sql = $wpdb->prepare("SELECT comment_ID, comment_agent FROM $wpdb->comments LIMIT %d,%d", $offset, $limit);
+			$results = $wpdb->get_results($sql);
 
 			// Increment offset
-			$offset = ( $limit + $offset );
+			$offset = ($limit + $offset);
 
-			if ( !empty( $results ) ) {
-				foreach ( $results as $r ) {
+			if ( ! empty($results)) {
+				foreach ($results as $r) {
 					// Explode comment_agent key
-					list ( $ca_bid, $source_comment_id ) = explode( '-', $r->comment_agent );
-					$source_comment_id = intval( $source_comment_id );
+					list ($ca_bid, $source_comment_id) = explode('-', $r->comment_agent);
+					$source_comment_id = intval($source_comment_id);
 
 					// Check if this comment came from this blog
-					if ( $bid == $ca_bid ) {
-						$hashtable[$source_comment_id] = intval( $r->comment_ID );
+					if ($bid == $ca_bid) {
+						$hashtable[$source_comment_id] = intval($r->comment_ID);
 					}
 				}
 			}
-		} while ( count( $results ) == $limit );
+		} while (count($results) == $limit);
 
 		// Unset to save memory.
-		unset( $results, $r );
+		unset($results, $r);
 
 		return $hashtable;
 	}
@@ -127,28 +127,28 @@ 
 	 * @param int $blog_id
 	 * @return int|void
 	 */
-	public function set_blog( $blog_id ) {
-		if ( is_numeric( $blog_id ) ) {
+	public function set_blog($blog_id) {
+		if (is_numeric($blog_id)) {
 			$blog_id = (int) $blog_id;
 		} else {
-			$blog = 'http://' . preg_replace( '#^https?://#', '', $blog_id );
-			if ( ( !$parsed = parse_url( $blog ) ) || empty( $parsed['host'] ) ) {
-				fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" );
+			$blog = 'http://'.preg_replace('#^https?://#', '', $blog_id);
+			if (( ! $parsed = parse_url($blog)) || empty($parsed['host'])) {
+				fwrite(STDERR, "Error: can not determine blog_id from $blog_id\n");
 				exit();
 			}
-			if ( empty( $parsed['path'] ) )
+			if (empty($parsed['path']))
 				$parsed['path'] = '/';
-			$blog = get_blog_details( array( 'domain' => $parsed['host'], 'path' => $parsed['path'] ) );
-			if ( !$blog ) {
-				fwrite( STDERR, "Error: Could not find blog\n" );
+			$blog = get_blog_details(array('domain' => $parsed['host'], 'path' => $parsed['path']));
+			if ( ! $blog) {
+				fwrite(STDERR, "Error: Could not find blog\n");
 				exit();
 			}
 			$blog_id = (int) $blog->blog_id;
 		}
 
-		if ( function_exists( 'is_multisite' ) ) {
-			if ( is_multisite() )
-				switch_to_blog( $blog_id );
+		if (function_exists('is_multisite')) {
+			if (is_multisite())
+				switch_to_blog($blog_id);
 		}
 
 		return $blog_id;
@@ -159,15 +159,15 @@ 
 	 * @param int $user_id
 	 * @return int|void
 	 */
-	public function set_user( $user_id ) {
-		if ( is_numeric( $user_id ) ) {
+	public function set_user($user_id) {
+		if (is_numeric($user_id)) {
 			$user_id = (int) $user_id;
 		} else {
-			$user_id = (int) username_exists( $user_id );
+			$user_id = (int) username_exists($user_id);
 		}
 
-		if ( !$user_id || !wp_set_current_user( $user_id ) ) {
-			fwrite( STDERR, "Error: can not find user\n" );
+		if ( ! $user_id || ! wp_set_current_user($user_id)) {
+			fwrite(STDERR, "Error: can not find user\n");
 			exit();
 		}
 
@@ -181,8 +181,8 @@ 
 	 * @param string $b
 	 * @return int
 	 */
-	public function cmpr_strlen( $a, $b ) {
-		return strlen( $b ) - strlen( $a );
+	public function cmpr_strlen($a, $b) {
+		return strlen($b) - strlen($a);
 	}
 
 	/**
@@ -194,20 +194,20 @@ 
 	 * @param bool   $head
 	 * @return array
 	 */
-	public function get_page( $url, $username = '', $password = '', $head = false ) {
+	public function get_page($url, $username = '', $password = '', $head = false) {
 		// Increase the timeout
-		add_filter( 'http_request_timeout', array( $this, 'bump_request_timeout' ) );
+		add_filter('http_request_timeout', array($this, 'bump_request_timeout'));
 
 		$headers = array();
 		$args = array();
-		if ( true === $head )
+		if (true === $head)
 			$args['method'] = 'HEAD';
-		if ( !empty( $username ) && !empty( $password ) )
-			$headers['Authorization'] = 'Basic ' . base64_encode( "$username:$password" );
+		if ( ! empty($username) && ! empty($password))
+			$headers['Authorization'] = 'Basic '.base64_encode("$username:$password");
 
 		$args['headers'] = $headers;
 
-		return wp_safe_remote_request( $url, $args );
+		return wp_safe_remote_request($url, $args);
 	}
 
 	/**
@@ -216,7 +216,7 @@ 
 	 * @param int $val
 	 * @return int
 	 */
-	public function bump_request_timeout( $val ) {
+	public function bump_request_timeout($val) {
 		return 60;
 	}
 
@@ -226,8 +226,8 @@ 
 	 * @return bool
 	 */
 	public function is_user_over_quota() {
-		if ( function_exists( 'upload_is_user_over_quota' ) ) {
-			if ( upload_is_user_over_quota() ) {
+		if (function_exists('upload_is_user_over_quota')) {
+			if (upload_is_user_over_quota()) {
 				return true;
 			}
 		}
@@ -241,8 +241,8 @@ 
 	 * @param string $string
 	 * @return string
 	 */
-	public function min_whitespace( $string ) {
-		return preg_replace( '|[\r\n\t ]+|', ' ', $string );
+	public function min_whitespace($string) {
+		return preg_replace('|[\r\n\t ]+|', ' ', $string);
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
  * @param bool   $required
  * @return mixed
  */
-function get_cli_args( $param, $required = false ) {
+function get_cli_args($param, $required = false) {
 	$args = $_SERVER['argv'];
 
 	$out = array();
@@ -276,40 +276,40 @@ 
 	$last_arg = null;
 	$return = null;
 
-	$il = sizeof( $args );
+	$il = sizeof($args);
 
-	for ( $i = 1, $il; $i < $il; $i++ ) {
-		if ( (bool) preg_match( "/^--(.+)/", $args[$i], $match ) ) {
-			$parts = explode( "=", $match[1] );
-			$key = preg_replace( "/[^a-z0-9]+/", "", $parts[0] );
+	for ($i = 1, $il; $i < $il; $i++) {
+		if ((bool) preg_match("/^--(.+)/", $args[$i], $match)) {
+			$parts = explode("=", $match[1]);
+			$key = preg_replace("/[^a-z0-9]+/", "", $parts[0]);
 
-			if ( isset( $parts[1] ) ) {
+			if (isset($parts[1])) {
 				$out[$key] = $parts[1];
 			} else {
 				$out[$key] = true;
 			}
 
 			$last_arg = $key;
-		} elseif ( (bool) preg_match( "/^-([a-zA-Z0-9]+)/", $args[$i], $match ) ) {
-			for ( $j = 0, $jl = strlen( $match[1] ); $j < $jl; $j++ ) {
+		} elseif ((bool) preg_match("/^-([a-zA-Z0-9]+)/", $args[$i], $match)) {
+			for ($j = 0, $jl = strlen($match[1]); $j < $jl; $j++) {
 				$key = $match[1]{$j};
 				$out[$key] = true;
 			}
 
 			$last_arg = $key;
-		} elseif ( $last_arg !== null ) {
+		} elseif ($last_arg !== null) {
 			$out[$last_arg] = $args[$i];
 		}
 	}
 
 	// Check array for specified param
-	if ( isset( $out[$param] ) ) {
+	if (isset($out[$param])) {
 		// Set return value
 		$return = $out[$param];
 	}
 
 	// Check for missing required param
-	if ( !isset( $out[$param] ) && $required ) {
+	if ( ! isset($out[$param]) && $required) {
 		// Display message and exit
 		echo "\"$param\" parameter is required but was not specified\n";
 		exit();

Braces +15 added lines, -10 removed lines

@@ -69,8 +69,9 @@ 
 
 		$result = $wpdb->get_results( $sql );
 
-		if ( !empty( $result ) )
-			$count = intval( $result[0]->cnt );
+		if ( !empty( $result ) ) {
+					$count = intval( $result[0]->cnt );
+		}
 
 		// Unset to save memory.
 		unset( $results );
@@ -136,8 +137,9 @@ 
 				fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" );
 				exit();
 			}
-			if ( empty( $parsed['path'] ) )
-				$parsed['path'] = '/';
+			if ( empty( $parsed['path'] ) ) {
+							$parsed['path'] = '/';
+			}
 			$blog = get_blog_details( array( 'domain' => $parsed['host'], 'path' => $parsed['path'] ) );
 			if ( !$blog ) {
 				fwrite( STDERR, "Error: Could not find blog\n" );
@@ -147,8 +149,9 @@ 
 		}
 
 		if ( function_exists( 'is_multisite' ) ) {
-			if ( is_multisite() )
-				switch_to_blog( $blog_id );
+			if ( is_multisite() ) {
+							switch_to_blog( $blog_id );
+			}
 		}
 
 		return $blog_id;
@@ -200,10 +203,12 @@ 
 
 		$headers = array();
 		$args = array();
-		if ( true === $head )
-			$args['method'] = 'HEAD';
-		if ( !empty( $username ) && !empty( $password ) )
-			$headers['Authorization'] = 'Basic ' . base64_encode( "$username:$password" );
+		if ( true === $head ) {
+					$args['method'] = 'HEAD';
+		}
+		if ( !empty( $username ) && !empty( $password ) ) {
+					$headers['Authorization'] = 'Basic ' . base64_encode( "$username:$password" );
+		}
 
 		$args['headers'] = $headers;
 

src/wp-admin/includes/export.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Export Administration API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Export Administration API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Version number for the export format.

Spacing +167 added lines, -167 removed lines

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

Braces +70 added lines, -47 removed lines

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

src/wp-admin/ms-options.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Multisite network settings administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.0.0
- */
+	 * Multisite network settings administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.0.0
+	 */
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 

Spacing +2 added lines, -2 removed lines

@@ -7,6 +7,6 @@
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_redirect( network_admin_url('settings.php') );
+wp_redirect(network_admin_url('settings.php'));