mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

check for setlocale after setting up the paths to prevent autoloader confusion

This commit is contained in:
Robin Appelman 2013-05-07 22:53:07 +02:00
parent 6d903cf7ae
commit 0d25c0001c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/base.php
View File

@ -344,10 +344,14 @@ class OC {
public static function init() { public static function init() {
// register autoloader // register autoloader
require_once 'autoloader.php'; require_once __DIR__ . '/autoloader.php';
self::$loader=new \OC\Autoloader(); 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')); spl_autoload_register(array(self::$loader, 'load'));
OC_Util::issetlocaleworking();
// set some stuff // set some stuff
//ob_start(); //ob_start();
@ -404,6 +408,7 @@ class OC {
} }
self::initPaths(); self::initPaths();
OC_Util::issetlocaleworking();
// set debug mode if an xdebug session is active // set debug mode if an xdebug session is active
if (!defined('DEBUG') || !DEBUG) { if (!defined('DEBUG') || !DEBUG) {