<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.5 |
+ | CiviCRM version 4.6 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
*
* @return object
*/
- static function &singleton($force = FALSE) {
+ public static function &singleton($force = FALSE) {
if ($force || self::$_singleton === NULL) {
self::$_singleton = new CRM_Core_ClassLoader();
}
/**
* Registers this instance as an autoloader.
*
- * @param Boolean $prepend Whether to prepend the autoloader or not
+ * @param bool $prepend
+ * Whether to prepend the autoloader or not.
*
* @api
*/
- function register($prepend = FALSE) {
+ public function register($prepend = FALSE) {
if ($this->_registered) {
return;
}
$civicrm_base_path = dirname(dirname(__DIR__));
- require_once dirname(dirname(__DIR__)) . '/packages/vendor/autoload.php';
+ require_once dirname(dirname(__DIR__)) . '/vendor/autoload.php';
// 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
$include_paths = array(
'.',
$civicrm_base_path,
- $packages_path
+ $packages_path,
);
$include_paths = implode(PATH_SEPARATOR, $include_paths);
set_include_path($include_paths . PATH_SEPARATOR . get_include_path());
- require_once "$civicrm_base_path/packages/vendor/autoload.php";
+ require_once "$civicrm_base_path/vendor/autoload.php";
}
- function initHtmlPurifier($prepend) {
+ public function initHtmlPurifier($prepend) {
if (class_exists('HTMLPurifier_Bootstrap')) {
// HTMLPurifier is already initialized, e.g. by the Drupal module.
return;
/**
* @param $class
*/
- function loadClass($class) {
+ public function loadClass($class) {
if (
// Only load classes that clearly belong to CiviCRM.
// Note: api/v3 does not use classes, but api_v3's test-suite does
$file = strtr($class, '_', '/') . '.php';
// There is some question about the best way to do this.
// "require_once" is nice because it's simple and throws
- // intelligible errors. The down side is that autoloaders
- // down the chain cannot try to find the file if we fail.
- require_once ($file);
+ // intelligible errors.
+ if (FALSE != stream_resolve_include_path($file)) {
+ require_once $file;
+ }
}
}
+
}