Merge pull request #1395 from realityking/legacyfix

We have to prefer the main libraries over the legacy libraries.
joomla · Jul 21, 2012 · 25bb650 · 25bb650
2 parents c69cbfd + 7640a15
commit 25bb650
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/libraries/import.legacy.php b/libraries/import.legacy.php
@@ -41,12 +41,12 @@
 
 class_exists('JLoader') or die;
 
-// Register the legacy library base path for deprecated or legacy libraries.
-JLoader::registerPrefix('J', JPATH_PLATFORM . '/legacy');
-
 // Setup the autoloaders.
 JLoader::setup();
 
+// Register the legacy library base path for deprecated or legacy libraries.
+JLoader::registerPrefix('J', JPATH_PLATFORM . '/legacy');
+
 // Import the Joomla Factory.
 JLoader::import('joomla.factory');
 
@@ -70,10 +70,6 @@ class_exists('JLoader') or die;
 
 // Register classes where the names have been changed to fit the autoloader rules
 // @deprecated  12.3
-JLoader::register('JDatabaseQueryMySQL', JPATH_PLATFORM . '/joomla/database/query/mysql.php');
-JLoader::register('JDatabaseQueryMySQLi', JPATH_PLATFORM . '/joomla/database/query/mysqli.php');
-JLoader::register('JDatabaseQuerySQLAzure', JPATH_PLATFORM . '/joomla/database/query/sqlazure.php');
-JLoader::register('JDatabaseQuerySQLSrv', JPATH_PLATFORM . '/joomla/database/query/sqlsrv.php');
 JLoader::register('JToolBar', JPATH_PLATFORM . '/legacy/toolbar/toolbar.php');
 JLoader::register('JSimpleCrypt', JPATH_PLATFORM . '/legacy/simplecrypt/simplecrypt.php');
 JLoader::register('JTree', JPATH_PLATFORM . '/legacy/base/tree.php');