diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-05-07 22:53:07 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-05-07 22:53:07 +0200 |
| commit | 0d25c0001ca276c3262476ebadcaba4f33bcd54a (patch) | |
| tree | 9c81adb1c99d2eb7534af880eda2d5d5c6ed768f /lib | |
| parent | 6d903cf7ae30ef3b9fb9faa34ee8b8347ac47e93 (diff) | |
| download | nextcloud-server-0d25c0001ca276c3262476ebadcaba4f33bcd54a.tar.gz nextcloud-server-0d25c0001ca276c3262476ebadcaba4f33bcd54a.zip | |
check for setlocale after setting up the paths to prevent autoloader confusion
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index eb3bd410d3b..667202d3aef 100644 --- a/lib/base.php +++ b/lib/base.php @@ -344,10 +344,14 @@ class OC { public static function init() { // register autoloader - require_once 'autoloader.php'; + require_once __DIR__ . '/autoloader.php'; self::$loader=new \OC\Autoloader(); + self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib'); + self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib'); + self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing'); + self::$loader->registerPrefix('Sabre\\VObject', '3rdparty'); + self::$loader->registerPrefix('Sabre_', '3rdparty'); spl_autoload_register(array(self::$loader, 'load')); - OC_Util::issetlocaleworking(); // set some stuff //ob_start(); @@ -404,6 +408,7 @@ class OC { } self::initPaths(); + OC_Util::issetlocaleworking(); // set debug mode if an xdebug session is active if (!defined('DEBUG') || !DEBUG) { |