Use classloader to add packages

diff --git a/install/civicrm.php b/install/civicrm.php
index b0220a87547011611643b04d0729d932f9a36683..ec423a1938c2e4cb31618f7243d262c105ee148d 100644 (file)
--- a/install/civicrm.php
+++ b/install/civicrm.php
@@ -36,12 +36,12 @@ function civicrm_setup($filesDirectory) {
   global $crmPath, $sqlPath, $pkgPath, $tplPath;
   global $compileDir;
 
+  // Setup classloader
   // This is needed to allow CiviCRM to be installed by drush.
-  $pkgPath = $crmPath . DIRECTORY_SEPARATOR . 'packages';
-  set_include_path($crmPath . PATH_SEPARATOR .
-      $pkgPath . PATH_SEPARATOR .
-      get_include_path()
-  );
+  // 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;