X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FHistoryBlob.php;h=55c2ae5e99ffe6b68333c8dc86fc80db17a53aab;hb=97aee3863fcfdd985ef7180f5ecc4e68cd8203ee;hp=bb8ec5e3ddfdf4c0602968d4329faf17f962f9cc;hpb=5fb8b9619529453f05c243538fce6cf82a559298;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/HistoryBlob.php b/includes/HistoryBlob.php
index bb8ec5e3dd..55c2ae5e99 100644
--- a/includes/HistoryBlob.php
+++ b/includes/HistoryBlob.php
@@ -19,10 +19,10 @@
  *
  * @file
  */
- 
+
 /**
- * Base class for general text storage via the "object" flag in old_flags, or 
- * two-part external storage URLs. Used for represent efficient concatenated 
+ * Base class for general text storage via the "object" flag in old_flags, or
+ * two-part external storage URLs. Used for represent efficient concatenated
  * storage, and migration-related pointer objects.
  */
 interface HistoryBlob
@@ -178,7 +178,7 @@ class ConcatenatedGzipHistoryBlob implements HistoryBlob
 	 * @return bool
 	 */
 	public function isHappy() {
-		return $this->mSize < $this->mMaxSize 
+		return $this->mSize < $this->mMaxSize
 			&& count( $this->mItems ) < $this->mMaxCount;
 	}
 }
@@ -232,8 +232,6 @@ class HistoryBlobStub {
 	 * @return string
 	 */
 	function getText() {
-		$fname = 'HistoryBlobStub::getText';
-
 		if( isset( self::$blobCache[$this->mOldId] ) ) {
 			$obj = self::$blobCache[$this->mOldId];
 		} else {
@@ -244,10 +242,9 @@ class HistoryBlobStub {
 			}
 			$flags = explode( ',', $row->old_flags );
 			if( in_array( 'external', $flags ) ) {
-				$url=$row->old_text;
+				$url = $row->old_text;
 				$parts = explode( '://', $url, 2 );
 				if ( !isset( $parts[1] ) || $parts[1] == '' ) {
-					wfProfileOut( $fname );
 					return false;
 				}
 				$row->old_text = ExternalStore::fetchFromUrl($url);
@@ -341,12 +338,12 @@ class DiffHistoryBlob implements HistoryBlob {
 	/** Total uncompressed size */
 	var $mSize = 0;
 
-	/** 
-	 * Array of diffs. If a diff D from A to B is notated D = B - A, and Z is 
+	/**
+	 * Array of diffs. If a diff D from A to B is notated D = B - A, and Z is
 	 * an empty string:
 	 *
 	 *              { item[map[i]] - item[map[i-1]]   where i > 0
-	 *    diff[i] = { 
+	 *    diff[i] = {
 	 *              { item[map[i]] - Z                where i = 0
 	 */
 	var $mDiffs;
@@ -379,7 +376,7 @@ class DiffHistoryBlob implements HistoryBlob {
 	 * The maximum number of text items before the object becomes sad
 	 */
 	var $mMaxCount = 100;
-	
+
 	/** Constants from xdiff.h */
 	const XDL_BDOP_INS = 1;
 	const XDL_BDOP_CPY = 2;
@@ -433,7 +430,7 @@ class DiffHistoryBlob implements HistoryBlob {
 	 * @throws MWException
 	 */
 	function compress() {
-		if ( !function_exists( 'xdiff_string_rabdiff' ) ){ 
+		if ( !function_exists( 'xdiff_string_rabdiff' ) ){
 			throw new MWException( "Need xdiff 1.5+ support to write DiffHistoryBlob\n" );
 		}
 		if ( isset( $this->mDiffs ) ) {
@@ -534,7 +531,7 @@ class DiffHistoryBlob implements HistoryBlob {
 		# Pure PHP implementation
 
 		$header = unpack( 'Vofp/Vcsize', substr( $diff, 0, 8 ) );
-		
+
 		# Check the checksum if hash/mhash is available
 		$ofp = $this->xdiffAdler32( $base );
 		if ( $ofp !== false && $ofp !== substr( $diff, 0, 4 ) ) {
@@ -545,7 +542,7 @@ class DiffHistoryBlob implements HistoryBlob {
 			wfDebug( __METHOD__. ": incorrect base length\n" );
 			return false;
 		}
-		
+
 		$p = 8;
 		$out = '';
 		while ( $p < strlen( $diff ) ) {
@@ -579,7 +576,7 @@ class DiffHistoryBlob implements HistoryBlob {
 	}
 
 	/**
-	 * Compute a binary "Adler-32" checksum as defined by LibXDiff, i.e. with 
+	 * Compute a binary "Adler-32" checksum as defined by LibXDiff, i.e. with
 	 * the bytes backwards and initialised with 0 instead of 1. See bug 34428.
 	 *
 	 * Returns false if no hashing library is available
@@ -589,8 +586,8 @@ class DiffHistoryBlob implements HistoryBlob {
 		if ( $init === null ) {
 			$init = str_repeat( "\xf0", 205 ) . "\xee" . str_repeat( "\xf0", 67 ) . "\x02";
 		}
-		// The real Adler-32 checksum of $init is zero, so it initialises the 
-		// state to zero, as it is at the start of LibXDiff's checksum 
+		// The real Adler-32 checksum of $init is zero, so it initialises the
+		// state to zero, as it is at the start of LibXDiff's checksum
 		// algorithm. Appending the subject string then simulates LibXDiff.
 		if ( function_exists( 'hash' ) ) {
 			$hash = hash( 'adler32', $init . $s, true );
@@ -664,7 +661,7 @@ class DiffHistoryBlob implements HistoryBlob {
 		if ( isset( $info['base'] ) ) {
 			// Old format
 			$this->mDiffMap = range( 0, count( $this->mDiffs ) - 1 );
-			array_unshift( $this->mDiffs, 
+			array_unshift( $this->mDiffs,
 				pack( 'VVCV', 0, 0, self::XDL_BDOP_INSB, strlen( $info['base'] ) ) .
 				$info['base'] );
 		} else {
@@ -687,7 +684,7 @@ class DiffHistoryBlob implements HistoryBlob {
 	 * @return bool
 	 */
 	function isHappy() {
-		return $this->mSize < $this->mMaxSize 
+		return $this->mSize < $this->mMaxSize
 			&& count( $this->mItems ) < $this->mMaxCount;
 	}