Commit 9eb18cc2 authored by dsnopek's avatar dsnopek

Revert "Attempt to avoid using autoloader if we can already autoload CiviCRM classes"

This reverts commit 51d83d026e835e4d4d95c984a1403af687f2c507.
parent 9aa662d1
......@@ -36,14 +36,12 @@ function civicrm_setup($filesDirectory) {
global $crmPath, $sqlPath, $pkgPath, $tplPath;
global $compileDir;
// Setup classloader, but try to avoid doing it twice.
if (!class_exists('CRM_Core_ClassLoader')) {
// This is needed to allow CiviCRM to be installed by drush.
// TODO: move to civicrm.drush.inc drush_civicrm_install()
global $crmPath;
require_once $crmPath . '/CRM/Core/ClassLoader.php';
CRM_Core_ClassLoader::singleton()->register();
}
// Setup classloader
// This is needed to allow CiviCRM to be installed by drush.
// TODO: move to civicrm.drush.inc drush_civicrm_install()
global $crmPath;
require_once $crmPath . '/CRM/Core/ClassLoader.php';
CRM_Core_ClassLoader::singleton()->register();
$sqlPath = $crmPath . DIRECTORY_SEPARATOR . 'sql';
$tplPath = $crmPath . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . 'CRM' . DIRECTORY_SEPARATOR . 'common' . DIRECTORY_SEPARATOR;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment