Skip to content
This repository has been archived by the owner on Nov 26, 2017. It is now read-only.

We have to prefer the main libraries over the legacy libraries. #1395

Merged
merged 2 commits into from Jul 21, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 3 additions & 7 deletions libraries/import.legacy.php
Expand Up @@ -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');

Expand All @@ -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');
Expand Down
12 changes: 0 additions & 12 deletions libraries/legacy/database/sqlsrvquery.php

This file was deleted.