Merge 1.3.0beta3 from HEAD

1 files changed, 5 insertions, 5 deletions

diff --git a/includes/BlockCache.php b/includes/BlockCache.php
index 135d206d9bec..8b49a0142c13 100644
--- a/includes/BlockCache.php
+++ b/includes/BlockCache.php
@@ -7,15 +7,15 @@ class BlockCache
 {
 	var $mData = false, $mMemcKey;
 
-	function BlockCache( $deferLoad = false, $dbName = "" )
+	function BlockCache( $deferLoad = false, $dbName = '' )
 	{
 		global $wgDBname;
 
-		if ( $dbName == "" ) {
+		if ( $dbName == '' ) {
 			$dbName = $wgDBname;
 		}
 
-		$this->mMemcKey = "$dbName:ipblocks";
+		$this->mMemcKey = $dbName.':ipblocks';
 
 		if ( !$deferLoad ) {
 			$this->load();
@@ -39,7 +39,7 @@ class BlockCache
 			if ( !is_array( $this->mData ) ) {
 				# Load from DB
 				$this->mData = array();
-				Block::enumBlocks( "wfBlockCacheInsert", "" ); # Calls $this->insert()
+				Block::enumBlocks( 'wfBlockCacheInsert', '' ); # Calls $this->insert()
 			}
 			
 			if ( $saveMemc ) {
@@ -78,7 +78,7 @@ class BlockCache
 		if ( $blocked ) {
 			# Clear low order bits
 			if ( $networkBits != 32 ) {
-				$ip .= "/$networkBits";
+				$ip .= '/'.$networkBits;
 				$ip = Block::normaliseRange( $ip );
 			}
 			$block = new Block();