Commit 7991d8ed authored by dsnopek's avatar dsnopek

Only load autoload.php from local vendor directory if it exists

parent 8fc57118
......@@ -103,9 +103,11 @@ class CRM_Core_ClassLoader {
return;
}
$civicrm_base_path = dirname(dirname(__DIR__));
$composer_autoload = "$civicrm_base_path/vendor/autoload.php";
// @todo: need some way to check if we should register vendor or not
//require_once dirname(dirname(__DIR__)) . '/vendor/autoload.php';
if (file_exists($composer_autoload)) {
require_once $composer_autoload;
}
// we do this to prevent a autoloader errors with joomla / 3rd party packages
// use absolute path since we dont know the content of include_path as yet
......@@ -124,8 +126,10 @@ class CRM_Core_ClassLoader {
);
$include_paths = implode(PATH_SEPARATOR, $include_paths);
set_include_path($include_paths . PATH_SEPARATOR . get_include_path());
// @todo: need some way to check if we should register vendor or not
//require_once "$civicrm_base_path/vendor/autoload.php";
// @todo Why do we need to load this again?
if (file_exists($composer_autoload)) {
require_once $composer_autoload;
}
}
/**
......
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