summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@owncloud.com>2013-10-21 14:04:07 +0200
committerAndreas Fischer <bantu@owncloud.com>2013-10-22 11:17:15 +0200
commiteb6637682ec835d9ec50612b59637e8b9ff5f6f6 (patch)
tree1fdad7068899557208db792eb1b7ecefcfe736ff /lib/base.php
parentcadd71ec8a02fc5619a9347109f9e588e13b3e3b (diff)
downloadnextcloud-server-eb6637682ec835d9ec50612b59637e8b9ff5f6f6.tar.gz
nextcloud-server-eb6637682ec835d9ec50612b59637e8b9ff5f6f6.zip
Inject memoryCache into Autoloader. Remove recursion-prevention hack.
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php
index ef574b2d895..53ea28b46b4 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -371,6 +371,11 @@ class OC {
// register autoloader
require_once __DIR__ . '/autoloader.php';
self::$loader = new \OC\Autoloader();
+ spl_autoload_register(array(self::$loader, 'load'));
+ try {
+ self::$loader->setMemoryCache(\OC\Memcache\Factory::createLowLatency('Autoloader'));
+ } catch(\Exception $ex) {
+ }
self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib');
self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib');
self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing');
@@ -378,7 +383,6 @@ class OC {
self::$loader->registerPrefix('Sabre\\VObject', '3rdparty');
self::$loader->registerPrefix('Sabre_', '3rdparty');
self::$loader->registerPrefix('Patchwork', '3rdparty');
- spl_autoload_register(array(self::$loader, 'load'));
// set some stuff
//ob_start();