X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FGlobalFunctions.php;h=e0d70ad786a0400b4230cbb5a15e098d8ad099fb;hb=62d9f172badc3f8ac67b5d7e19e54a4edb9606ba;hp=12c5cd5a06a93823e9209d224251aa0debe5efaf;hpb=5173c6abe05ee7bf5256fa5e68b320458a9b211c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 12c5cd5a06..e0d70ad786 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -224,15 +224,6 @@ function wfArrayDiff2_cmp( $a, $b ) {
 	}
 }
 
-/**
- * Seed Mersenne Twister
- * No-op for compatibility; only necessary in PHP < 4.2.0
- * @deprecated. Remove in 1.18
- */
-function wfSeedRandom() {
-	wfDeprecated(__FUNCTION__);
-}
-
 /**
  * Get a random decimal value between 0 and 1, in a way
  * not likely to give duplicate values for any realistic
@@ -306,7 +297,6 @@ function wfUrlencode( $s ) {
 function wfDebug( $text, $logonly = false ) {
 	global $wgOut, $wgDebugLogFile, $wgDebugComments, $wgProfileOnly, $wgDebugRawPage;
 	global $wgDebugLogPrefix, $wgShowDebug;
-	static $recursion = 0;
 
 	static $cache = array(); // Cache of unoutputted messages
 	$text = wfDebugTimer() . $text;
@@ -319,21 +309,11 @@ function wfDebug( $text, $logonly = false ) {
 	if ( ( $wgDebugComments || $wgShowDebug ) && !$logonly ) {
 		$cache[] = $text;
 
-		if ( !isset( $wgOut ) ) {
-			return;
+		if ( isset( $wgOut ) && StubObject::isRealObject( $wgOut ) ) {
+			// add the message and any cached messages to the output
+			array_map( array( $wgOut, 'debug' ), $cache );
+			$cache = array();
 		}
-		if ( !StubObject::isRealObject( $wgOut ) ) {
-			if ( $recursion ) {
-				return;
-			}
-			$recursion++;
-			$wgOut->_unstub();
-			$recursion--;
-		}
-
-		// add the message and possible cached ones to the output
-		array_map( array( $wgOut, 'debug' ), $cache );
-		$cache = array();
 	}
 	if ( $wgDebugLogFile != '' && !$wgProfileOnly ) {
 		# Strip unprintables; they can switch terminal modes when binary data
@@ -1296,30 +1276,6 @@ function wfEscapeWikiText( $text ) {
 	return $text;
 }
 
-/**
- * @todo document
- */
-function wfQuotedPrintable( $string, $charset = '' ) {
-	# Probably incomplete; see RFC 2045
-	if( empty( $charset ) ) {
-		global $wgInputEncoding;
-		$charset = $wgInputEncoding;
-	}
-	$charset = strtoupper( $charset );
-	$charset = str_replace( 'ISO-8859', 'ISO8859', $charset ); // ?
-
-	$illegal = '\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\xff=';
-	$replace = $illegal . '\t ?_';
-	if( !preg_match( "/[$illegal]/", $string ) ) {
-		return $string;
-	}
-	$out = "=?$charset?Q?";
-	$out .= preg_replace( "/([$replace])/e", 'sprintf("=%02X",ord("$1"))', $string );
-	$out .= '?=';
-	return $out;
-}
-
-
 /**
  * @todo document
  * @return float
@@ -2029,7 +1985,7 @@ function wfTimestamp( $outputtype = TS_UNIX, $ts = 0 ) {
 		$strtime = $ts;
 	} else {
 		# Bogus value; fall back to the epoch...
-		wfDebug("wfTimestamp() fed bogus time value: $outputtype; $ts\n");
+		wfDebug("wfTimestamp() fed bogus time value: TYPE=$outputtype; VALUE=$ts\n");
 		
 		return false;
 	}
@@ -2240,7 +2196,7 @@ function wfGetSiteNotice() {
 
 /**
  * BC wrapper for MimeMagic::singleton()
- * @deprecated No longer needed as of 1.17 (r68836).
+ * @deprecated No longer needed as of 1.17 (r68836). Remove in 1.19.
  */
 function &wfGetMimeMagic() {
 	wfDeprecated( __FUNCTION__ );
@@ -2859,18 +2815,36 @@ function wfMakeUrlIndex( $url ) {
 
 /**
  * Do any deferred updates and clear the list
- * TODO: This could be in Wiki.php if that class made any sense at all
+ *
+ * @param $commit String: set to 'commit' to commit after every update to
+ *                prevent lock contention
  */
-function wfDoUpdates() {
-	global $wgPostCommitUpdateList, $wgDeferredUpdateList;
-	foreach ( $wgDeferredUpdateList as $update ) {
-		$update->doUpdate();
+function wfDoUpdates( $commit = '' ) {
+	global $wgDeferredUpdateList;
+
+	wfProfileIn( __METHOD__ );
+
+	// No need to get master connections in case of empty updates array
+	if ( !count( $wgDeferredUpdateList ) ) {
+		wfProfileOut( __METHOD__ );
+		return;
 	}
-	foreach ( $wgPostCommitUpdateList as $update ) {
+
+	$doCommit = $commit == 'commit';
+	if ( $doCommit ) {
+		$dbw = wfGetDB( DB_MASTER );
+	}
+
+	foreach ( $wgDeferredUpdateList as $update ) {
 		$update->doUpdate();
+
+		if ( $doCommit && $dbw->trxLevel() ) {
+			$dbw->commit();
+		}
 	}
+
 	$wgDeferredUpdateList = array();
-	$wgPostCommitUpdateList = array();
+	wfProfileOut( __METHOD__ );
 }
 
 /**
@@ -3206,7 +3180,7 @@ function wfFindFile( $title, $options = array() ) {
 /**
  * Get an object referring to a locally registered file.
  * Returns a valid placeholder object if the file does not exist.
- * @param $title Title|String
+ * @param $title Title or String
  * @return File, or null if passed an invalid Title
  */
 function wfLocalFile( $title ) {
@@ -3274,9 +3248,10 @@ function wfBoolToStr( $value ) {
 
 /**
  * Load an extension messages file
- * @deprecated in 1.16 (warnings in 1.18, removed in ?)
+ * @deprecated in 1.16, warnings in 1.18, remove in 1.20
  */
 function wfLoadExtensionMessages( $extensionName, $langcode = false ) {
+	wfDeprecated( __FUNCTION__ );
 }
 
 /**
@@ -3582,23 +3557,3 @@ function wfArrayMap( $function, $input ) {
 	}
 	return $ret;
 }
-
-/**
- * Returns the PackageRepository object for interaction with the package repository.
- *
- * TODO: Make the repository type also configurable.
- *
- * @since 1.17
- *
- * @return PackageRepository
- */
-function wfGetRepository() {
-	global $wgRepositoryApiLocation;
-	static $repository = false;
-
-	if ( $repository === false ) {
-		$repository = new DistributionRepository( $wgRepositoryApiLocation );
-	}
-
-	return $repository;
-}