X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FAutoLoader.php;h=02c92df8c5c61803fb7fda46da85cf82745d5b5c;hb=6a3bc6294a1b5b42a4d0f7062152d892e0aed1d3;hp=3e08e74d2252ca78098607837426e3b0358a1e9c;hpb=660019e71a1e76adfaa7f080931d83b87928e20b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 3e08e74d22..02c92df8c5 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -475,6 +475,7 @@ $wgAutoloadLocalClasses = array(
 	'DatabaseBase' => 'includes/db/Database.php',
 	'DatabaseMssql' => 'includes/db/DatabaseMssql.php',
 	'DatabaseMysql' => 'includes/db/DatabaseMysql.php',
+	'DatabaseMysqlBase' => 'includes/db/DatabaseMysqlBase.php',
 	'DatabaseOracle' => 'includes/db/DatabaseOracle.php',
 	'DatabasePostgres' => 'includes/db/DatabasePostgres.php',
 	'DatabaseSqlite' => 'includes/db/DatabaseSqlite.php',
@@ -504,8 +505,8 @@ $wgAutoloadLocalClasses = array(
 	'LoadMonitor_Null' => 'includes/db/LoadMonitor.php',
 	'MssqlField' => 'includes/db/DatabaseMssql.php',
 	'MssqlResult' => 'includes/db/DatabaseMssql.php',
-	'MySQLField' => 'includes/db/DatabaseMysql.php',
-	'MySQLMasterPos' => 'includes/db/DatabaseMysql.php',
+	'MySQLField' => 'includes/db/DatabaseMysqlBase.php',
+	'MySQLMasterPos' => 'includes/db/DatabaseMysqlBase.php',
 	'ORAField' => 'includes/db/DatabaseOracle.php',
 	'ORAResult' => 'includes/db/DatabaseOracle.php',
 	'ORMIterator' => 'includes/db/ORMIterator.php',
@@ -657,9 +658,9 @@ $wgAutoloadLocalClasses = array(
 	# includes/job
 	'Job' => 'includes/job/Job.php',
 	'JobQueue' => 'includes/job/JobQueue.php',
-	'JobQueueAggregator' => 'includes/job/JobQueueAggregator.php',
-	'JobQueueAggregatorMemc' => 'includes/job/JobQueueAggregatorMemc.php',
-	'JobQueueAggregatorRedis' => 'includes/job/JobQueueAggregatorRedis.php',
+	'JobQueueAggregator' => 'includes/job/aggregator/JobQueueAggregator.php',
+	'JobQueueAggregatorMemc' => 'includes/job/aggregator/JobQueueAggregatorMemc.php',
+	'JobQueueAggregatorRedis' => 'includes/job/aggregator/JobQueueAggregatorRedis.php',
 	'JobQueueDB' => 'includes/job/JobQueueDB.php',
 	'JobQueueGroup' => 'includes/job/JobQueueGroup.php',
 	'JobQueueFederated' => 'includes/job/JobQueueFederated.php',
@@ -1169,12 +1170,4 @@ class AutoLoader {
 	}
 }
 
-if ( function_exists( 'spl_autoload_register' ) ) {
-	spl_autoload_register( array( 'AutoLoader', 'autoload' ) );
-} else {
-	function __autoload( $class ) {
-		AutoLoader::autoload( $class );
-	}
-
-	ini_set( 'unserialize_callback_func', '__autoload' );
-}
+spl_autoload_register( array( 'AutoLoader', 'autoload' ) );