From 9eb18cc21e99b7d367b8b2b3dc5f337a8ecf71f7 Mon Sep 17 00:00:00 2001 From: David Snopek Date: Mon, 17 Jul 2017 17:07:00 -0500 Subject: [PATCH] Revert "Attempt to avoid using autoloader if we can already autoload CiviCRM classes" This reverts commit 51d83d026e835e4d4d95c984a1403af687f2c507. --- install/civicrm.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/install/civicrm.php b/install/civicrm.php index 05564ba143..50e4271081 100644 --- a/install/civicrm.php +++ b/install/civicrm.php @@ -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; -- 2.25.1