From 0d25c0001ca276c3262476ebadcaba4f33bcd54a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 7 May 2013 22:53:07 +0200
Subject: [PATCH] check for setlocale after setting up the paths to prevent
 autoloader confusion

---
 lib/base.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index eb3bd410d3..667202d3ae 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) {