Index: wp-admin/admin.php
===================================================================
--- wp-admin/admin.php	(revision 17378)
+++ wp-admin/admin.php	(working copy)
@@ -12,16 +12,16 @@
  * @since 2.3.2
  */
 if ( ! defined('WP_ADMIN') )
-	define('WP_ADMIN', TRUE);
+	define('WP_ADMIN', true);
 
 if ( ! defined('WP_NETWORK_ADMIN') )
-	define('WP_NETWORK_ADMIN', FALSE);
+	define('WP_NETWORK_ADMIN', false);
 
 if ( ! defined('WP_USER_ADMIN') )
-	define('WP_USER_ADMIN', FALSE);
+	define('WP_USER_ADMIN', false);
 
 if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
-	define('WP_BLOG_ADMIN', TRUE);
+	define('WP_BLOG_ADMIN', true);
 }
 
 if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
Index: wp-admin/includes/class-ftp-pure.php
===================================================================
--- wp-admin/includes/class-ftp-pure.php	(revision 17378)
+++ wp-admin/includes/class-ftp-pure.php	(working copy)
@@ -27,11 +27,11 @@
  */
 class ftp extends ftp_base {
 
-	function ftp($verb=FALSE, $le=FALSE) {
+	function ftp($verb=false, $le=false) {
 		$this->__construct($verb, $le);
 	}
 
-	function __construct($verb=FALSE, $le=FALSE) {
+	function __construct($verb=false, $le=false) {
 		parent::__construct(false, $verb, $le);
 	}
 
@@ -43,9 +43,9 @@
 		if(!@stream_set_timeout($sock, $this->_timeout)) {
 			$this->PushError('_settimeout','socket set send timeout');
 			$this->_quit();
-			return FALSE;
+			return false;
 		}
-		return TRUE;
+		return true;
 	}
 
 	function _connect($host, $port) {
@@ -53,7 +53,7 @@
 		$sock = @fsockopen($host, $port, $errno, $errstr, $this->_timeout);
 		if (!$sock) {
 			$this->PushError('_connect','socket connect failed', $errstr." (".$errno.")");
-			return FALSE;
+			return false;
 		}
 		$this->_connected=true;
 		return $sock;
@@ -62,7 +62,7 @@
 	function _readmsg($fnction="_readmsg"){
 		if(!$this->_connected) {
 			$this->PushError($fnction, 'Connect first');
-			return FALSE;
+			return false;
 		}
 		$result=true;
 		$this->_message="";
@@ -86,29 +86,29 @@
 	function _exec($cmd, $fnction="_exec") {
 		if(!$this->_ready) {
 			$this->PushError($fnction,'Connect first');
-			return FALSE;
+			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');
-			return FALSE;
+			return false;
 		}
 		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
-		return TRUE;
+		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();
-				return FALSE;
+				return false;
 			}
 			if(!$this->_checkCode()) {
 				$this->_data_close();
-				return FALSE;
+				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];
@@ -118,14 +118,14 @@
 			if(!$this->_ftp_data_sock) {
 				$this->PushError("_data_prepare","fsockopen fails", $errstr." (".$errno.")");
 				$this->_data_close();
-				return FALSE;
+				return false;
 			}
 			else $this->_ftp_data_sock;
 		} else {
 			$this->SendMSG("Only passive connections available!");
-			return FALSE;
+			return false;
 		}
-		return TRUE;
+		return true;
 	}
 
 	function _data_read($mode=FTP_ASCII, $fp=NULL) {
@@ -133,7 +133,7 @@
 		else $out="";
 		if(!$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
-			return FALSE;
+			return false;
 		}
 		while (!feof($this->_ftp_data_sock)) {
 			$block=fread($this->_ftp_data_sock, $this->_ftp_buff_size);
@@ -149,7 +149,7 @@
 		else $out="";
 		if(!$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
-			return FALSE;
+			return false;
 		}
 		if(is_resource($fp)) {
 			while(!feof($fp)) {
@@ -157,15 +157,15 @@
 				if(!$this->_data_write_block($mode, $block)) return false;
 			}
 		} elseif(!$this->_data_write_block($mode, $fp)) return false;
-		return TRUE;
+		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);
 		do {
-			if(($t=@fwrite($this->_ftp_data_sock, $block))===FALSE) {
+			if(($t=@fwrite($this->_ftp_data_sock, $block))===false) {
 				$this->PushError("_data_write","Can't write to socket");
-				return FALSE;
+				return false;
 			}
 			$block=substr($block, $t);
 		} while(!empty($block));
@@ -175,10 +175,10 @@
 	function _data_close() {
 		@fclose($this->_ftp_data_sock);
 		$this->SendMSG("Disconnected data from remote host");
-		return TRUE;
+		return true;
 	}
 
-	function _quit($force=FALSE) {
+	function _quit($force=false) {
 		if($this->_connected or $force) {
 			@fclose($this->_ftp_control_sock);
 			$this->_connected=false;
Index: wp-admin/includes/class-ftp-sockets.php
===================================================================
--- wp-admin/includes/class-ftp-sockets.php	(revision 17378)
+++ wp-admin/includes/class-ftp-sockets.php	(working copy)
@@ -27,11 +27,11 @@
  */
 class ftp extends ftp_base {
 
-	function ftp($verb=FALSE, $le=FALSE) {
+	function ftp($verb=false, $le=false) {
 		$this->__construct($verb, $le);
 	}
 
-	function __construct($verb=FALSE, $le=FALSE) {
+	function __construct($verb=false, $le=false) {
 		parent::__construct(true, $verb, $le);
 	}
 
@@ -43,12 +43,12 @@
 		if(!@socket_set_option($sock, SOL_SOCKET, SO_RCVTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
 			$this->PushError('_connect','socket set receive timeout',socket_strerror(socket_last_error($sock)));
 			@socket_close($sock);
-			return FALSE;
+			return false;
 		}
 		if(!@socket_set_option($sock, SOL_SOCKET , SO_SNDTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
 			$this->PushError('_connect','socket set send timeout',socket_strerror(socket_last_error($sock)));
 			@socket_close($sock);
-			return FALSE;
+			return false;
 		}
 		return true;
 	}
@@ -57,14 +57,14 @@
 		$this->SendMSG("Creating socket");
 		if(!($sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) {
 			$this->PushError('_connect','socket create failed',socket_strerror(socket_last_error($sock)));
-			return FALSE;
+			return false;
 		}
-		if(!$this->_settimeout($sock)) return FALSE;
+		if(!$this->_settimeout($sock)) return false;
 		$this->SendMSG("Connecting to \"".$host.":".$port."\"");
 		if (!($res = @socket_connect($sock, $host, $port))) {
 			$this->PushError('_connect','socket connect failed',socket_strerror(socket_last_error($sock)));
 			@socket_close($sock);
-			return FALSE;
+			return false;
 		}
 		$this->_connected=true;
 		return $sock;
@@ -73,7 +73,7 @@
 	function _readmsg($fnction="_readmsg"){
 		if(!$this->_connected) {
 			$this->PushError($fnction,'Connect first');
-			return FALSE;
+			return false;
 		}
 		$result=true;
 		$this->_message="";
@@ -97,39 +97,39 @@
 	function _exec($cmd, $fnction="_exec") {
 		if(!$this->_ready) {
 			$this->PushError($fnction,'Connect first');
-			return FALSE;
+			return false;
 		}
 		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
 		$status=@socket_write($this->_ftp_control_sock, $cmd.CRLF);
 		if($status===false) {
 			$this->PushError($fnction,'socket write failed', socket_strerror(socket_last_error($this->stream)));
-			return FALSE;
+			return false;
 		}
 		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
-		return TRUE;
+		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;
 		$this->SendMSG("Creating data socket");
 		$this->_ftp_data_sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 		if ($this->_ftp_data_sock < 0) {
 			$this->PushError('_data_prepare','socket create failed',socket_strerror(socket_last_error($this->_ftp_data_sock)));
-			return FALSE;
+			return false;
 		}
 		if(!$this->_settimeout($this->_ftp_data_sock)) {
 			$this->_data_close();
-			return FALSE;
+			return false;
 		}
 		if($this->_passive) {
 			if(!$this->_exec("PASV", "pasv")) {
 				$this->_data_close();
-				return FALSE;
+				return false;
 			}
 			if(!$this->_checkCode()) {
 				$this->_data_close();
-				return FALSE;
+				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];
@@ -138,40 +138,40 @@
 			if(!@socket_connect($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
 				$this->PushError("_data_prepare","socket_connect", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
-				return FALSE;
+				return false;
 			}
 			else $this->_ftp_temp_sock=$this->_ftp_data_sock;
 		} else {
 			if(!@socket_getsockname($this->_ftp_control_sock, $addr, $port)) {
 				$this->PushError("_data_prepare","can't get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock)));
 				$this->_data_close();
-				return FALSE;
+				return false;
 			}
 			if(!@socket_bind($this->_ftp_data_sock,$addr)){
 				$this->PushError("_data_prepare","can't bind data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
-				return FALSE;
+				return false;
 			}
 			if(!@socket_listen($this->_ftp_data_sock)) {
 				$this->PushError("_data_prepare","can't listen data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
-				return FALSE;
+				return false;
 			}
 			if(!@socket_getsockname($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
 				$this->PushError("_data_prepare","can't get data socket information", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
-				return FALSE;
+				return false;
 			}
 			if(!$this->_exec('PORT '.str_replace('.',',',$this->_datahost.'.'.($this->_dataport>>8).'.'.($this->_dataport&0x00FF)), "_port")) {
 				$this->_data_close();
-				return FALSE;
+				return false;
 			}
 			if(!$this->_checkCode()) {
 				$this->_data_close();
-				return FALSE;
+				return false;
 			}
 		}
-		return TRUE;
+		return true;
 	}
 
 	function _data_read($mode=FTP_ASCII, $fp=NULL) {
@@ -181,10 +181,10 @@
 		if(!$this->_passive) {
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
 			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
-			if($this->_ftp_temp_sock===FALSE) {
+			if($this->_ftp_temp_sock===false) {
 				$this->PushError("_data_read","socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
 				$this->_data_close();
-				return FALSE;
+				return false;
 			}
 		}
 
@@ -204,7 +204,7 @@
 		if(!$this->_passive) {
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
 			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
-			if($this->_ftp_temp_sock===FALSE) {
+			if($this->_ftp_temp_sock===false) {
 				$this->PushError("_data_write","socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
 				$this->_data_close();
 				return false;
@@ -222,10 +222,10 @@
 	function _data_write_block($mode, $block) {
 		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
 		do {
-			if(($t=@socket_write($this->_ftp_temp_sock, $block))===FALSE) {
+			if(($t=@socket_write($this->_ftp_temp_sock, $block))===false) {
 				$this->PushError("_data_write","socket_write", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
 				$this->_data_close();
-				return FALSE;
+				return false;
 			}
 			$block=substr($block, $t);
 		} while(!empty($block));
@@ -236,7 +236,7 @@
 		@socket_close($this->_ftp_temp_sock);
 		@socket_close($this->_ftp_data_sock);
 		$this->SendMSG("Disconnected data from remote host");
-		return TRUE;
+		return true;
 	}
 
 	function _quit() {
Index: wp-admin/includes/class-ftp.php
===================================================================
--- wp-admin/includes/class-ftp.php	(revision 17378)
+++ wp-admin/includes/class-ftp.php	(working copy)
@@ -121,11 +121,11 @@
 	var $AutoAsciiExt;
 
 	/* Constructor */
-	function ftp_base($port_mode=FALSE) {
+	function ftp_base($port_mode=false) {
 		$this->__construct($port_mode);
 	}
 
-	function __construct($port_mode=FALSE, $verb=FALSE, $le=FALSE) {
+	function __construct($port_mode=false, $verb=false, $le=false) {
 		$this->LocalEcho=$le;
 		$this->Verbose=$verb;
 		$this->_lastaction=NULL;
@@ -134,11 +134,11 @@
 		$this->AuthorizedTransferMode=array(FTP_AUTOASCII, FTP_ASCII, FTP_BINARY);
 		$this->OS_FullName=array(FTP_OS_Unix => 'UNIX', FTP_OS_Windows => 'WINDOWS', FTP_OS_Mac => 'MACOS');
 		$this->AutoAsciiExt=array("ASP","BAT","C","CPP","CSS","CSV","JS","H","HTM","HTML","SHTML","INI","LOG","PHP3","PHTML","PL","PERL","SH","SQL","TXT");
-		$this->_port_available=($port_mode==TRUE);
+		$this->_port_available=($port_mode==true);
 		$this->SendMSG("Staring FTP client class".($this->_port_available?"":" without PORT mode support"));
-		$this->_connected=FALSE;
-		$this->_ready=FALSE;
-		$this->_can_restore=FALSE;
+		$this->_connected=false;
+		$this->_ready=false;
+		$this->_can_restore=false;
 		$this->_code=0;
 		$this->_message="";
 		$this->_ftp_buff_size=4096;
@@ -228,32 +228,32 @@
 			echo $message.($crlf?CRLF:"");
 			flush();
 		}
-		return TRUE;
+		return true;
 	}
 
 	function SetType($mode=FTP_AUTOASCII) {
 		if(!in_array($mode, $this->AuthorizedTransferMode)) {
 			$this->SendMSG("Wrong type");
-			return FALSE;
+			return false;
 		}
 		$this->_type=$mode;
 		$this->SendMSG("Transfer type: ".($this->_type==FTP_BINARY?"binary":($this->_type==FTP_ASCII?"ASCII":"auto ASCII") ) );
-		return TRUE;
+		return true;
 	}
 
 	function _settype($mode=FTP_ASCII) {
 		if($this->_ready) {
 			if($mode==FTP_BINARY) {
 				if($this->_curtype!=FTP_BINARY) {
-					if(!$this->_exec("TYPE I", "SetType")) return FALSE;
+					if(!$this->_exec("TYPE I", "SetType")) return false;
 					$this->_curtype=FTP_BINARY;
 				}
 			} elseif($this->_curtype!=FTP_ASCII) {
-				if(!$this->_exec("TYPE A", "SetType")) return FALSE;
+				if(!$this->_exec("TYPE A", "SetType")) return false;
 				$this->_curtype=FTP_ASCII;
 			}
-		} else return FALSE;
-		return TRUE;
+		} else return false;
+		return true;
 	}
 
 	function Passive($pasv=NULL) {
@@ -261,18 +261,18 @@
 		else $this->_passive=$pasv;
 		if(!$this->_port_available and !$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
-			$this->_passive=TRUE;
-			return FALSE;
+			$this->_passive=true;
+			return false;
 		}
 		$this->SendMSG("Passive mode ".($this->_passive?"on":"off"));
-		return TRUE;
+		return true;
 	}
 
 	function SetServer($host, $port=21, $reconnect=true) {
 		if(!is_long($port)) {
 	        $this->verbose=true;
     	    $this->SendMSG("Incorrect port syntax");
-			return FALSE;
+			return false;
 		} else {
 			$ip=@gethostbyname($host);
 	        $dns=@gethostbyaddr($host);
@@ -283,7 +283,7 @@
 	        $ipaslong = ip2long($ip);
 			if ( ($ipaslong == false) || ($ipaslong === -1) ) {
 				$this->SendMSG("Wrong host name/address \"".$host."\"");
-				return FALSE;
+				return false;
 			}
 	        $this->_host=$ip;
 	        $this->_fullhost=$dns;
@@ -294,26 +294,26 @@
 		if($reconnect){
 			if($this->_connected) {
 				$this->SendMSG("Reconnecting");
-				if(!$this->quit(FTP_FORCE)) return FALSE;
-				if(!$this->connect()) return FALSE;
+				if(!$this->quit(FTP_FORCE)) return false;
+				if(!$this->connect()) return false;
 			}
 		}
-		return TRUE;
+		return true;
 	}
 
 	function SetUmask($umask=0022) {
 		$this->_umask=$umask;
 		umask($this->_umask);
 		$this->SendMSG("UMASK 0".decoct($this->_umask));
-		return TRUE;
+		return true;
 	}
 
 	function SetTimeout($timeout=30) {
 		$this->_timeout=$timeout;
 		$this->SendMSG("Timeout ".$this->_timeout);
 		if($this->_connected)
-			if(!$this->_settimeout($this->_ftp_control_sock)) return FALSE;
-		return TRUE;
+			if(!$this->_settimeout($this->_ftp_control_sock)) return false;
+		return true;
 	}
 
 	function connect($server=NULL) {
@@ -324,12 +324,12 @@
 	    $this->SendMsg('Local OS : '.$this->OS_FullName[$this->OS_local]);
 		if(!($this->_ftp_control_sock = $this->_connect($this->_host, $this->_port))) {
 			$this->SendMSG("Error : Cannot connect to remote host \"".$this->_fullhost." :".$this->_port."\"");
-			return FALSE;
+			return false;
 		}
 		$this->SendMSG("Connected to remote host \"".$this->_fullhost.":".$this->_port."\". Waiting for greeting.");
 		do {
-			if(!$this->_readmsg()) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+			if(!$this->_readmsg()) return false;
+			if(!$this->_checkCode()) return false;
 			$this->_lastaction=time();
 		} while($this->_code<200);
 		$this->_ready=true;
@@ -344,18 +344,18 @@
 		}
 		if(!$this->features()) $this->SendMSG("Can't get features list. All supported - disabled");
 		else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
-		return TRUE;
+		return true;
 	}
 
 	function quit($force=false) {
 		if($this->_ready) {
-			if(!$this->_exec("QUIT") and !$force) return FALSE;
-			if(!$this->_checkCode() and !$force) return FALSE;
+			if(!$this->_exec("QUIT") and !$force) return false;
+			if(!$this->_checkCode() and !$force) return false;
 			$this->_ready=false;
 			$this->SendMSG("Session finished");
 		}
 		$this->_quit();
-		return TRUE;
+		return true;
 	}
 
 	function login($user=NULL, $pass=NULL) {
@@ -363,76 +363,76 @@
 		else $this->_login="anonymous";
 		if(!is_null($pass)) $this->_password=$pass;
 		else $this->_password="anon@anon.com";
-		if(!$this->_exec("USER ".$this->_login, "login")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("USER ".$this->_login, "login")) return false;
+		if(!$this->_checkCode()) return false;
 		if($this->_code!=230) {
-			if(!$this->_exec((($this->_code==331)?"PASS ":"ACCT ").$this->_password, "login")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+			if(!$this->_exec((($this->_code==331)?"PASS ":"ACCT ").$this->_password, "login")) return false;
+			if(!$this->_checkCode()) return false;
 		}
 		$this->SendMSG("Authentication succeeded");
 		if(empty($this->_features)) {
 			if(!$this->features()) $this->SendMSG("Can't get features list. All supported - disabled");
 			else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
 		}
-		return TRUE;
+		return true;
 	}
 
 	function pwd() {
-		if(!$this->_exec("PWD", "pwd")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("PWD", "pwd")) return false;
+		if(!$this->_checkCode()) return false;
 		return ereg_replace("^[0-9]{3} \"(.+)\".+", "\\1", $this->_message);
 	}
 
 	function cdup() {
-		if(!$this->_exec("CDUP", "cdup")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("CDUP", "cdup")) return false;
+		if(!$this->_checkCode()) return false;
 		return true;
 	}
 
 	function chdir($pathname) {
-		if(!$this->_exec("CWD ".$pathname, "chdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
-		return TRUE;
+		if(!$this->_exec("CWD ".$pathname, "chdir")) return false;
+		if(!$this->_checkCode()) return false;
+		return true;
 	}
 
 	function rmdir($pathname) {
-		if(!$this->_exec("RMD ".$pathname, "rmdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
-		return TRUE;
+		if(!$this->_exec("RMD ".$pathname, "rmdir")) return false;
+		if(!$this->_checkCode()) return false;
+		return true;
 	}
 
 	function mkdir($pathname) {
-		if(!$this->_exec("MKD ".$pathname, "mkdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
-		return TRUE;
+		if(!$this->_exec("MKD ".$pathname, "mkdir")) return false;
+		if(!$this->_checkCode()) return false;
+		return true;
 	}
 
 	function rename($from, $to) {
-		if(!$this->_exec("RNFR ".$from, "rename")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("RNFR ".$from, "rename")) return false;
+		if(!$this->_checkCode()) return false;
 		if($this->_code==350) {
-			if(!$this->_exec("RNTO ".$to, "rename")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
-		} else return FALSE;
-		return TRUE;
+			if(!$this->_exec("RNTO ".$to, "rename")) return false;
+			if(!$this->_checkCode()) return false;
+		} else return false;
+		return true;
 	}
 
 	function filesize($pathname) {
 		if(!isset($this->_features["SIZE"])) {
 			$this->PushError("filesize", "not supported by server");
-			return FALSE;
+			return false;
 		}
-		if(!$this->_exec("SIZE ".$pathname, "filesize")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("SIZE ".$pathname, "filesize")) return false;
+		if(!$this->_checkCode()) return false;
 		return ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\1", $this->_message);
 	}
 
 	function abort() {
-		if(!$this->_exec("ABOR", "abort")) return FALSE;
+		if(!$this->_exec("ABOR", "abort")) return false;
 		if(!$this->_checkCode()) {
-			if($this->_code!=426) return FALSE;
-			if(!$this->_readmsg("abort")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+			if($this->_code!=426) return false;
+			if(!$this->_readmsg("abort")) return false;
+			if(!$this->_checkCode()) return false;
 		}
 		return true;
 	}
@@ -440,10 +440,10 @@
 	function mdtm($pathname) {
 		if(!isset($this->_features["MDTM"])) {
 			$this->PushError("mdtm", "not supported by server");
-			return FALSE;
+			return false;
 		}
-		if(!$this->_exec("MDTM ".$pathname, "mdtm")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("MDTM ".$pathname, "mdtm")) return false;
+		if(!$this->_checkCode()) return false;
 		$mdtm = ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\1", $this->_message);
 		$date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d");
 		$timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]);
@@ -451,46 +451,46 @@
 	}
 
 	function systype() {
-		if(!$this->_exec("SYST", "systype")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("SYST", "systype")) return false;
+		if(!$this->_checkCode()) return false;
 		$DATA = explode(" ", $this->_message);
 		return array($DATA[1], $DATA[3]);
 	}
 
 	function delete($pathname) {
-		if(!$this->_exec("DELE ".$pathname, "delete")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
-		return TRUE;
+		if(!$this->_exec("DELE ".$pathname, "delete")) return false;
+		if(!$this->_checkCode()) return false;
+		return true;
 	}
 
 	function site($command, $fnction="site") {
-		if(!$this->_exec("SITE ".$command, $fnction)) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
-		return TRUE;
+		if(!$this->_exec("SITE ".$command, $fnction)) return false;
+		if(!$this->_checkCode()) return false;
+		return true;
 	}
 
 	function chmod($pathname, $mode) {
-		if(!$this->site( sprintf('CHMOD %o %s', $mode, $pathname), "chmod")) return FALSE;
-		return TRUE;
+		if(!$this->site( sprintf('CHMOD %o %s', $mode, $pathname), "chmod")) return false;
+		return true;
 	}
 
 	function restore($from) {
 		if(!isset($this->_features["REST"])) {
 			$this->PushError("restore", "not supported by server");
-			return FALSE;
+			return false;
 		}
 		if($this->_curtype!=FTP_BINARY) {
 			$this->PushError("restore", "can't restore in ASCII mode");
-			return FALSE;
+			return false;
 		}
-		if(!$this->_exec("REST ".$from, "resore")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
-		return TRUE;
+		if(!$this->_exec("REST ".$from, "resore")) return false;
+		if(!$this->_checkCode()) return false;
+		return true;
 	}
 
 	function features() {
-		if(!$this->_exec("FEAT", "features")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("FEAT", "features")) return false;
+		if(!$this->_checkCode()) return false;
 		$f=preg_split("/[".CRLF."]+/", preg_replace("/[0-9]{3}[ -].*[".CRLF."]+/", "", $this->_message), -1, PREG_SPLIT_NO_EMPTY);
 		$this->_features=array();
 		foreach($f as $k=>$v) {
@@ -514,9 +514,9 @@
 
 	function file_exists($pathname) {
 		$exists=true;
-		if(!$this->_exec("RNFR ".$pathname, "rename")) $exists=FALSE;
+		if(!$this->_exec("RNFR ".$pathname, "rename")) $exists=false;
 		else {
-			if(!$this->_checkCode()) $exists=FALSE;
+			if(!$this->_checkCode()) $exists=false;
 			$this->abort();
 		}
 		if($exists) $this->SendMSG("Remote file ".$pathname." exists");
@@ -530,21 +530,21 @@
 		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
 		else $mode=FTP_BINARY;
 		if(!$this->_data_prepare($mode)) {
-			return FALSE;
+			return false;
 		}
 		if($this->_can_restore and $rest!=0) $this->restore($rest);
 		if(!$this->_exec("RETR ".$remotefile, "get")) {
 			$this->_data_close();
-			return FALSE;
+			return false;
 		}
 		if(!$this->_checkCode()) {
 			$this->_data_close();
-			return FALSE;
+			return false;
 		}
 		$out=$this->_data_read($mode, $fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_readmsg()) return false;
+		if(!$this->_checkCode()) return false;
 		return $out;
 	}
 
@@ -554,7 +554,7 @@
 		$fp = @fopen($localfile, "w");
 		if (!$fp) {
 			$this->PushError("get","can't open local file", "Cannot create \"".$localfile."\"");
-			return FALSE;
+			return false;
 		}
 		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
 		$pi=pathinfo($remotefile);
@@ -562,24 +562,24 @@
 		else $mode=FTP_BINARY;
 		if(!$this->_data_prepare($mode)) {
 			fclose($fp);
-			return FALSE;
+			return false;
 		}
 		if($this->_can_restore and $rest!=0) $this->restore($rest);
 		if(!$this->_exec("RETR ".$remotefile, "get")) {
 			$this->_data_close();
 			fclose($fp);
-			return FALSE;
+			return false;
 		}
 		if(!$this->_checkCode()) {
 			$this->_data_close();
 			fclose($fp);
-			return FALSE;
+			return false;
 		}
 		$out=$this->_data_read($mode, $fp);
 		fclose($fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_readmsg()) return false;
+		if(!$this->_checkCode()) return false;
 		return $out;
 	}
 
@@ -589,21 +589,21 @@
 		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
 		else $mode=FTP_BINARY;
 		if(!$this->_data_prepare($mode)) {
-			return FALSE;
+			return false;
 		}
 		if($this->_can_restore and $rest!=0) $this->restore($rest);
 		if(!$this->_exec("STOR ".$remotefile, "put")) {
 			$this->_data_close();
-			return FALSE;
+			return false;
 		}
 		if(!$this->_checkCode()) {
 			$this->_data_close();
-			return FALSE;
+			return false;
 		}
 		$ret=$this->_data_write($mode, $fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_readmsg()) return false;
+		if(!$this->_checkCode()) return false;
 		return $ret;
 	}
 
@@ -611,13 +611,13 @@
 		if(is_null($remotefile)) $remotefile=$localfile;
 		if (!file_exists($localfile)) {
 			$this->PushError("put","can't open local file", "No such file or directory \"".$localfile."\"");
-			return FALSE;
+			return false;
 		}
 		$fp = @fopen($localfile, "r");
 
 		if (!$fp) {
 			$this->PushError("put","can't open local file", "Cannot read file \"".$localfile."\"");
-			return FALSE;
+			return false;
 		}
 		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
 		$pi=pathinfo($localfile);
@@ -625,24 +625,24 @@
 		else $mode=FTP_BINARY;
 		if(!$this->_data_prepare($mode)) {
 			fclose($fp);
-			return FALSE;
+			return false;
 		}
 		if($this->_can_restore and $rest!=0) $this->restore($rest);
 		if(!$this->_exec("STOR ".$remotefile, "put")) {
 			$this->_data_close();
 			fclose($fp);
-			return FALSE;
+			return false;
 		}
 		if(!$this->_checkCode()) {
 			$this->_data_close();
 			fclose($fp);
-			return FALSE;
+			return false;
 		}
 		$ret=$this->_data_write($mode, $fp);
 		fclose($fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_readmsg()) return false;
+		if(!$this->_checkCode()) return false;
 		return $ret;
 	}
 
@@ -650,11 +650,11 @@
 		$local=realpath($local);
 		if(!@file_exists($local)) {
 			$this->PushError("mput","can't open local folder", "Cannot stat folder \"".$local."\"");
-			return FALSE;
+			return false;
 		}
 		if(!is_dir($local)) return $this->put($local, $remote);
 		if(empty($remote)) $remote=".";
-		elseif(!$this->file_exists($remote) and !$this->mkdir($remote)) return FALSE;
+		elseif(!$this->file_exists($remote) and !$this->mkdir($remote)) return false;
 		if($handle = opendir($local)) {
 			$list=array();
 			while (false !== ($file = readdir($handle))) {
@@ -663,15 +663,15 @@
 			closedir($handle);
 		} else {
 			$this->PushError("mput","can't open local folder", "Cannot read folder \"".$local."\"");
-			return FALSE;
+			return false;
 		}
-		if(empty($list)) return TRUE;
+		if(empty($list)) return true;
 		$ret=true;
 		foreach($list as $el) {
 			if(is_dir($local."/".$el)) $t=$this->mput($local."/".$el, $remote."/".$el);
 			else $t=$this->put($local."/".$el, $remote."/".$el);
 			if(!$t) {
-				$ret=FALSE;
+				$ret=false;
 				if(!$continious) break;
 			}
 		}
@@ -683,13 +683,13 @@
 		$list=$this->rawlist($remote, "-lA");
 		if($list===false) {
 			$this->PushError("mget","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents");
-			return FALSE;
+			return false;
 		}
 		if(empty($list)) return true;
 		if(!@file_exists($local)) {
 			if(!@mkdir($local)) {
 				$this->PushError("mget","can't create local folder", "Cannot create folder \"".$local."\"");
-				return FALSE;
+				return false;
 			}
 		}
 		foreach($list as $k=>$v) {
@@ -757,8 +757,8 @@
 	}
 
 	function mmkdir($dir, $mode = 0777) {
-		if(empty($dir)) return FALSE;
-		if($this->is_exists($dir) or $dir == "/" ) return TRUE;
+		if(empty($dir)) return false;
+		if($this->is_exists($dir) or $dir == "/" ) return true;
 		if(!$this->mmkdir(dirname($dir), $mode)) return false;
 		$r=$this->mkdir($dir, $mode);
 		$this->chmod($dir,$mode);
@@ -855,19 +855,19 @@
 		if(!$this->_data_prepare()) return false;
 		if(!$this->_exec($cmd.$arg, $fnction)) {
 			$this->_data_close();
-			return FALSE;
+			return false;
 		}
 		if(!$this->_checkCode()) {
 			$this->_data_close();
-			return FALSE;
+			return false;
 		}
 		$out="";
 		if($this->_code<200) {
 			$out=$this->_data_read();
 			$this->_data_close();
-			if(!$this->_readmsg()) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
-			if($out === FALSE ) return FALSE;
+			if(!$this->_readmsg()) return false;
+			if(!$this->_checkCode()) return false;
+			if($out === false ) return false;
 			$out=preg_split("/[".CRLF."]+/", $out, -1, PREG_SPLIT_NO_EMPTY);
 //			$this->SendMSG(implode($this->_eol_code[$this->OS_local], $out));
 		}
@@ -896,10 +896,10 @@
 	}
 }
 
-$mod_sockets=TRUE;
+$mod_sockets=true;
 if (!extension_loaded('sockets')) {
 	$prefix = (PHP_SHLIB_SUFFIX == 'dll') ? 'php_' : '';
-	if(!@dl($prefix . 'sockets.' . PHP_SHLIB_SUFFIX)) $mod_sockets=FALSE;
+	if(!@dl($prefix . 'sockets.' . PHP_SHLIB_SUFFIX)) $mod_sockets=false;
 }
 
 require_once "class-ftp-".($mod_sockets?"sockets":"pure").".php";
Index: wp-admin/includes/class-pclzip.php
===================================================================
--- wp-admin/includes/class-pclzip.php	(revision 17378)
+++ wp-admin/includes/class-pclzip.php	(working copy)
@@ -277,7 +277,7 @@
 
     // ----- Set default values
     $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+    $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
 
     // ----- Look for variable options arguments
     $v_size = func_num_args();
@@ -460,7 +460,7 @@
 
     // ----- Set default values
     $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+    $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
 
     // ----- Look for variable options arguments
     $v_size = func_num_args();
@@ -720,7 +720,7 @@
     $v_size = func_num_args();
 
     // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
 
     // ----- Look for arguments
     if ($v_size > 0) {
@@ -877,7 +877,7 @@
     $v_size = func_num_args();
 
     // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
 
     // ----- Look for arguments
     if ($v_size > 1) {
@@ -930,7 +930,7 @@
           $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
         }
         if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
         }
         else {
         }
@@ -1456,7 +1456,7 @@
           }
 
           // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], false);
           $i++;
         break;
 
@@ -1523,7 +1523,7 @@
           // ----- Get the value
           if (   is_string($p_options_list[$i+1])
               && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], false);
             $i++;
           }
           else {
@@ -3884,7 +3884,7 @@
             // ----- Decompress the file
             $v_file_content = @gzinflate($v_buffer);
             unset($v_buffer);
-            if ($v_file_content === FALSE) {
+            if ($v_file_content === false) {
 
               // ----- Change the file status
               // TBC
@@ -4212,7 +4212,7 @@
           $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
 
           // ----- Decompress the file
-          if (($p_string = @gzinflate($v_data)) === FALSE) {
+          if (($p_string = @gzinflate($v_data)) === false) {
               // TBC
           }
         }
@@ -5474,11 +5474,11 @@
     // ----- Look for path beginning by ./
     if (   ($p_dir == '.')
         || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
+      $p_dir = PclZipUtilTranslateWinPath(getcwd(), false).'/'.substr($p_dir, 1);
     }
     if (   ($p_path == '.')
         || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
+      $p_path = PclZipUtilTranslateWinPath(getcwd(), false).'/'.substr($p_path, 1);
     }
 
     // ----- Explode dir and path by directory separator
Index: wp-admin/includes/image.php
===================================================================
--- wp-admin/includes/image.php	(revision 17378)
+++ wp-admin/includes/image.php	(working copy)
@@ -104,7 +104,7 @@
 		global $_wp_additional_image_sizes;
 
 		foreach ( get_intermediate_image_sizes() as $s ) {
-			$sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => FALSE );
+			$sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => false );
 			if ( isset( $_wp_additional_image_sizes[$s]['width'] ) )
 				$sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); // For theme-added sizes
 			else
Index: wp-admin/includes/taxonomy.php
===================================================================
--- wp-admin/includes/taxonomy.php	(revision 17378)
+++ wp-admin/includes/taxonomy.php	(working copy)
@@ -146,7 +146,7 @@
  * @since 2.0.0
  *
  * @param array $catarr The 'cat_ID' value is required.  All other keys are optional.
- * @return int|bool The ID number of the new or updated Category on success. Zero or FALSE on failure.
+ * @return int|bool The ID number of the new or updated Category on success. Zero or false on failure.
  */
 function wp_update_category($catarr) {
 	$cat_ID = (int) $catarr['cat_ID'];
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 17378)
+++ wp-admin/includes/template.php	(working copy)
@@ -1258,7 +1258,7 @@
  * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
  * @return array Array of settings errors
  */
-function get_settings_errors( $setting = '', $sanitize = FALSE ) {
+function get_settings_errors( $setting = '', $sanitize = false ) {
 	global $wp_settings_errors;
 
 	// If $sanitize is true, manually re-run the sanitizisation for this option
@@ -1310,7 +1310,7 @@
  * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
  * @param boolean $hide_on_update If set to true errors will not be shown if the settings page has already been submitted.
  */
-function settings_errors( $setting = '', $sanitize = FALSE, $hide_on_update = FALSE ) {
+function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) {
 
 	if ($hide_on_update AND $_GET['settings-updated']) return;
 
Index: wp-admin/includes/upgrade.php
===================================================================
--- wp-admin/includes/upgrade.php	(revision 17378)
+++ wp-admin/includes/upgrade.php	(working copy)
@@ -1330,7 +1330,7 @@
 		$option = preg_replace('|/+$|', '', $option);
 
 	@ $kellogs = unserialize($option);
-	if ($kellogs !== FALSE)
+	if ($kellogs !== false)
 		return $kellogs;
 	else
 		return $option;
Index: wp-admin/network/admin.php
===================================================================
--- wp-admin/network/admin.php	(revision 17378)
+++ wp-admin/network/admin.php	(working copy)
@@ -7,7 +7,7 @@
  * @since 3.1.0
  */
 
-define( 'WP_NETWORK_ADMIN', TRUE );
+define( 'WP_NETWORK_ADMIN', true );
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
Index: wp-admin/theme-editor.php
===================================================================
--- wp-admin/theme-editor.php	(revision 17378)
+++ wp-admin/theme-editor.php	(working copy)
@@ -82,7 +82,7 @@
 	if (is_writeable($file)) {
 		//is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
 		$f = fopen($file, 'w+');
-		if ($f !== FALSE) {
+		if ($f !== false) {
 			fwrite($f, $newcontent);
 			fclose($f);
 			$location = "theme-editor.php?file=$file&theme=$theme&a=te&scrollto=$scrollto";
Index: wp-admin/user/admin.php
===================================================================
--- wp-admin/user/admin.php	(revision 17378)
+++ wp-admin/user/admin.php	(working copy)
@@ -7,7 +7,7 @@
  * @since 3.1.0
  */
 
-define('WP_USER_ADMIN', TRUE);
+define('WP_USER_ADMIN', true);
 
 require_once( dirname(dirname(__FILE__)) . '/admin.php');
 
Index: wp-includes/canonical.php
===================================================================
--- wp-includes/canonical.php	(revision 17378)
+++ wp-includes/canonical.php	(working copy)
@@ -355,7 +355,7 @@
 		$requested_url = preg_replace_callback('|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url);
 	}
 
-	// Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning FALSE
+	// Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning false
 	$redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url);
 
 	if ( !$redirect_url || $redirect_url == $requested_url ) // yes, again -- in case the filter aborted the request
Index: wp-includes/class-http.php
===================================================================
--- wp-includes/class-http.php	(revision 17378)
+++ wp-includes/class-http.php	(working copy)
@@ -1801,7 +1801,7 @@
 	 * @since 2.8.0
 	 *
 	 * @param string $url URL you intend to send this cookie to
-	 * @return boolean TRUE if allowed, FALSE otherwise.
+	 * @return boolean true if allowed, false otherwise.
 	 */
 	function test( $url ) {
 		// Expires - if expired then nothing else matters
Index: wp-includes/class-phpass.php
===================================================================
--- wp-includes/class-phpass.php	(revision 17378)
+++ wp-includes/class-phpass.php	(working copy)
@@ -49,7 +49,7 @@
 
 		$this->portable_hashes = $portable_hashes;
 
-		$this->random_state = microtime() . uniqid(rand(), TRUE); // removed getmypid() for compability reasons
+		$this->random_state = microtime() . uniqid(rand(), true); // removed getmypid() for compability reasons
 	}
 
 	function get_random_bytes($count)
@@ -134,9 +134,9 @@
 		# consequently in lower iteration counts and hashes that are
 		# quicker to crack (by non-PHP code).
 		if (PHP_VERSION >= '5') {
-			$hash = md5($salt . $password, TRUE);
+			$hash = md5($salt . $password, true);
 			do {
-				$hash = md5($hash . $password, TRUE);
+				$hash = md5($hash . $password, true);
 			} while (--$count);
 		} else {
 			$hash = pack('H*', md5($salt . $password));
Index: wp-includes/class-pop3.php
===================================================================
--- wp-includes/class-pop3.php	(revision 17378)
+++ wp-includes/class-pop3.php	(working copy)
@@ -35,14 +35,14 @@
 
     var $MAILSERVER = '';       // Set this to hard code the server name
 
-    var $DEBUG      = FALSE;    // set to true to echo pop3
+    var $DEBUG      = false;    // set to true to echo pop3
                                 // commands and responses to error_log
                                 // this WILL log passwords!
 
     var $BANNER     = '';       //  Holds the banner returned by the
                                 //  pop server - used for apop()
 
-    var $ALLOWAPOP  = FALSE;    //  Allow or disallow apop()
+    var $ALLOWAPOP  = false;    //  Allow or disallow apop()
                                 //  This must be set to true
                                 //  manually
 
Index: wp-includes/comment-template.php
===================================================================
--- wp-includes/comment-template.php	(revision 17378)
+++ wp-includes/comment-template.php	(working copy)
@@ -899,10 +899,10 @@
 		$comments_by_type = &$wp_query->comments_by_type;
 	}
 
-	$overridden_cpage = FALSE;
+	$overridden_cpage = false;
 	if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
 		set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
-		$overridden_cpage = TRUE;
+		$overridden_cpage = true;
 	}
 
 	if ( !defined('COMMENTS_TEMPLATE') || !COMMENTS_TEMPLATE)
@@ -1190,7 +1190,7 @@
  * @param string $replytext Optional. Text to display when replying to a comment. Accepts "%s" for the author of the comment being replied to.
  * @param string $linktoparent Optional. Boolean to control making the author's name a link to their comment.
  */
-function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = TRUE ) {
+function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
 	global $comment;
 
 	if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
Index: wp-includes/compat.php
===================================================================
--- wp-includes/compat.php	(revision 17378)
+++ wp-includes/compat.php	(working copy)
@@ -27,7 +27,7 @@
 			$k = $key . '%5B' . $k . '%5D';
 		if ( $v === NULL )
 			continue;
-		elseif ( $v === FALSE )
+		elseif ( $v === false )
 			$v = '0';
 
 		if ( is_array($v) || is_object($v) )
Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 17378)
+++ wp-includes/general-template.php	(working copy)
@@ -2099,7 +2099,7 @@
  * "Intelligently" decides to enqueue or to print the CSS file. If the
  * 'wp_print_styles' action has *not* yet been called, the CSS file will be
  * enqueued. If the wp_print_styles action *has* been called, the CSS link will
- * be printed. Printing may be forced by passing TRUE as the $force_echo
+ * be printed. Printing may be forced by passing true as the $force_echo
  * (second) parameter.
  *
  * For backward compatibility with WordPress 2.3 calling method: If the $file
Index: wp-includes/js/tinymce/plugins/spellchecker/classes/GoogleSpell.php
===================================================================
--- wp-includes/js/tinymce/plugins/spellchecker/classes/GoogleSpell.php	(revision 17378)
+++ wp-includes/js/tinymce/plugins/spellchecker/classes/GoogleSpell.php	(working copy)
@@ -78,7 +78,7 @@
 			curl_setopt($ch, CURLOPT_URL,$url);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $header);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 			$xml = curl_exec($ch);
 			curl_close($ch);
 		} else {
Index: wp-includes/kses.php
===================================================================
--- wp-includes/kses.php	(revision 17378)
+++ wp-includes/kses.php	(working copy)
@@ -766,7 +766,7 @@
 					{
 					$working = 1;
 					$mode = 0;
-					if(FALSE === array_key_exists($attrname, $attrarr)) {
+					if(false === array_key_exists($attrname, $attrarr)) {
 						$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
 					}
 					$attr = preg_replace('/^\s+/', '', $attr);
@@ -783,7 +783,7 @@
 					if ( in_array(strtolower($attrname), $uris) )
 						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-					if(FALSE === array_key_exists($attrname, $attrarr)) {
+					if(false === array_key_exists($attrname, $attrarr)) {
 						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
 					}
 					$working = 1;
@@ -799,7 +799,7 @@
 					if ( in_array(strtolower($attrname), $uris) )
 						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-					if(FALSE === array_key_exists($attrname, $attrarr)) {
+					if(false === array_key_exists($attrname, $attrarr)) {
 						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
 					}
 					$working = 1;
@@ -815,7 +815,7 @@
 					if ( in_array(strtolower($attrname), $uris) )
 						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-					if(FALSE === array_key_exists($attrname, $attrarr)) {
+					if(false === array_key_exists($attrname, $attrarr)) {
 						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
 					}
 					# We add quotes to conform to W3C's HTML spec.
@@ -834,7 +834,7 @@
 		}
 	} # while
 
-	if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr))
+	if ($mode == 1 && false === array_key_exists($attrname, $attrarr))
 		# special case, for when the attribute list ends with a valueless
 		# attribute like "selected"
 		$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
Index: wp-includes/link-template.php
===================================================================
--- wp-includes/link-template.php	(revision 17378)
+++ wp-includes/link-template.php	(working copy)
@@ -2456,7 +2456,7 @@
 		$text = __('This is the short link.');
 
 	if ( empty( $title ) )
-		$title = the_title_attribute( array( 'echo' => FALSE ) );
+		$title = the_title_attribute( array( 'echo' => false ) );
 
 	$shortlink = wp_get_shortlink( $post->ID );
 
Index: wp-includes/pluggable.php
===================================================================
--- wp-includes/pluggable.php	(revision 17378)
+++ wp-includes/pluggable.php	(working copy)
@@ -1449,7 +1449,7 @@
 	if ( empty($wp_hasher) ) {
 		require_once( ABSPATH . 'wp-includes/class-phpass.php');
 		// By default, use the portable hash from phpass
-		$wp_hasher = new PasswordHash(8, TRUE);
+		$wp_hasher = new PasswordHash(8, true);
 	}
 
 	return $wp_hasher->HashPassword($password);
@@ -1497,7 +1497,7 @@
 	if ( empty($wp_hasher) ) {
 		require_once( ABSPATH . 'wp-includes/class-phpass.php');
 		// By default, use the portable hash from phpass
-		$wp_hasher = new PasswordHash(8, TRUE);
+		$wp_hasher = new PasswordHash(8, true);
 	}
 
 	$check = $wp_hasher->CheckPassword($password, $hash);
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 17378)
+++ wp-includes/post.php	(working copy)
@@ -4056,7 +4056,7 @@
  * @return string SQL code that can be added to a where clause.
  */
 function get_private_posts_cap_sql($post_type) {
-	return get_posts_by_author_sql($post_type, FALSE);
+	return get_posts_by_author_sql($post_type, false);
 }
 
 /**
@@ -4070,7 +4070,7 @@
  * @param int $post_author Optional.  Query posts having a single author ID.
  * @return string SQL WHERE code that can be added to a query.
  */
-function get_posts_by_author_sql($post_type, $full = TRUE, $post_author = NULL) {
+function get_posts_by_author_sql($post_type, $full = true, $post_author = NULL) {
 	global $user_ID, $wpdb;
 
 	// Private posts
Index: wp-includes/theme.php
===================================================================
--- wp-includes/theme.php	(revision 17378)
+++ wp-includes/theme.php	(working copy)
@@ -1266,7 +1266,7 @@
  *
  * Does not check the default theme, which is the fallback and should always exist.
  * Will switch theme to the fallback theme if current theme does not validate.
- * You can use the 'validate_current_theme' filter to return FALSE to
+ * You can use the 'validate_current_theme' filter to return false to
  * disable this functionality.
  *
  * @since 1.5.0
Index: wp-includes/user.php
===================================================================
--- wp-includes/user.php	(revision 17378)
+++ wp-includes/user.php	(working copy)
@@ -154,7 +154,7 @@
 function count_user_posts($userid) {
 	global $wpdb;
 
-	$where = get_posts_by_author_sql('post', TRUE, $userid);
+	$where = get_posts_by_author_sql('post', true, $userid);
 
 	$count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts $where" );
 
@@ -846,7 +846,7 @@
 		// Build a CPU-intensive query that will return concise information.
 		$select_count = array();
 		foreach ( $avail_roles as $this_role => $name ) {
-			$select_count[] = "COUNT(NULLIF(`meta_value` LIKE '%" . like_escape($this_role) . "%', FALSE))";
+			$select_count[] = "COUNT(NULLIF(`meta_value` LIKE '%" . like_escape($this_role) . "%', false))";
 		}
 		$select_count = implode(', ', $select_count);
 
Index: wp-login.php
===================================================================
--- wp-login.php	(revision 17378)
+++ wp-login.php	(working copy)
@@ -606,7 +606,7 @@
 		$errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress."));
 
 	// Some parts of this script use the main login form to display a message
-	if		( isset($_GET['loggedout']) && TRUE == $_GET['loggedout'] )
+	if		( isset($_GET['loggedout']) && true == $_GET['loggedout'] )
 		$errors->add('loggedout', __('You are now logged out.'), 'message');
 	elseif	( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
 		$errors->add('registerdisabled', __('User registration is currently not allowed.'));