From: daniel <daniel.kinzler@wikimedia.de>
Date: Wed, 29 Aug 2012 13:36:13 +0000 (+0200)
Subject: merged master some more
X-Git-Tag: 1.31.0-rc.0~22097^2^2~36
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/supprimer.php?a=commitdiff_plain;h=72952a082cdd438d0605cf77f1db0330a821ceb2;p=lhc%2Fweb%2Fwiklou.git

merged master some more

Change-Id: I53f349e42336ce0426ea1aff939853b3cd728aeb
---

72952a082cdd438d0605cf77f1db0330a821ceb2
diff --cc includes/AutoLoader.php
index 6c56e3c279,9d78dbdc38..cb7432cc75
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -1072,14 -1056,6 +1072,13 @@@ $wgAutoloadLocalClasses = array
  	'TestFileIterator' => 'tests/testHelpers.inc',
  	'TestRecorder' => 'tests/testHelpers.inc',
  
 +	# tests/phpunit
 +	'RevisionStorageTest' => 'tests/phpunit/includes/RevisionStorageTest.php',
 +	'WikiPageTest' => 'tests/phpunit/includes/WikiPageTest.php',
 +	'WikitextContentTest' => 'tests/phpunit/includes/WikitextContentTest.php',
 +	'JavascriptContentTest' => 'tests/phpunit/includes/JavascriptContentTest.php',
 +	'DummyContentHandlerForTesting' => 'tests/phpunit/includes/ContentHandlerTest.php',
 +	'DummyContentForTesting' => 'tests/phpunit/includes/ContentHandlerTest.php',
- 	
  	# tests/phpunit/includes
  	'GenericArrayObjectTest' => 'tests/phpunit/includes/libs/GenericArrayObjectTest.php',
  
diff --cc includes/GlobalFunctions.php
index 3af85efdec,4ff258d2d5..8667b672bf
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@@ -976,8 -1061,9 +976,10 @@@ function wfLogDBError( $text ) 
  		} else {
  			$d = date_create( "now", $logDBErrorTimeZoneObject );
  		}
 +		$date = $d->format( 'D M j G:i:s T Y' );
  
+ 		$date = $d->format( 'D M j G:i:s T Y' );
+ 
  		$text = "$date\t$host\t$wiki\t$text";
  		wfErrorLog( $text, $wgDBerrorLog );
  	}