From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 12 Nov 2014 22:00:30 +0000 (+0000)
Subject: Merge "Enable profiling via xhprof"
X-Git-Tag: 1.31.0-rc.0~13320
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22brouteur%22%2C%28%24id_rubrique%20?a=commitdiff_plain;h=0e2a9baff3817f656116699f3383ef61051c4d26;p=lhc%2Fweb%2Fwiklou.git

Merge "Enable profiling via xhprof"
---

0e2a9baff3817f656116699f3383ef61051c4d26
diff --cc includes/AutoLoader.php
index af86c99f4e,ffd361c999..8a9dd1fa62
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -699,18 -700,9 +699,19 @@@ $wgAutoloadLocalClasses = array
  	'SwiftVirtualRESTService' => 'includes/libs/virtualrest/SwiftVirtualRESTService.php',
  	'VirtualRESTService' => 'includes/libs/virtualrest/VirtualRESTService.php',
  	'VirtualRESTServiceClient' => 'includes/libs/virtualrest/VirtualRESTServiceClient.php',
+ 	'Xhprof' => 'includes/libs/Xhprof.php',
  	'XmlTypeCheck' => 'includes/libs/XmlTypeCheck.php',
  
 +	# includes/libs/cdb
 +	'CdbException' => 'includes/libs/cdb/CdbException.php',
 +	'CdbFunctions' => 'includes/libs/cdb/CdbFunctions.php',
 +	'CdbReader' => 'includes/libs/cdb/CdbReader.php',
 +	'CdbReaderDBA' => 'includes/libs/cdb/CdbReaderDBA.php',
 +	'CdbReaderPHP' => 'includes/libs/cdb/CdbReaderPHP.php',
 +	'CdbWriter' => 'includes/libs/cdb/CdbWriter.php',
 +	'CdbWriterDBA' => 'includes/libs/cdb/CdbWriterDBA.php',
 +	'CdbWriterPHP' => 'includes/libs/cdb/CdbWriterPHP.php',
 +
  	# includes/libs/lessphp
  	'lessc' => 'includes/libs/lessc.inc.php',
  	'lessc_parser' => 'includes/libs/lessc.inc.php',