diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-07 08:04:13 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-07 08:04:13 -0800 |
| commit | f2fbfbc665b90dbd23c0a353b07fad7c67176a6a (patch) | |
| tree | 888f56a4ccaff8e078f3edb6e242487b6cd7ae73 | |
| parent | 3abe4c3e88a25271657038c36d6680801246db21 (diff) | |
| parent | e0bd7e145cb23823c430114f314ffef939877e09 (diff) | |
| download | nextcloud-server-f2fbfbc665b90dbd23c0a353b07fad7c67176a6a.tar.gz nextcloud-server-f2fbfbc665b90dbd23c0a353b07fad7c67176a6a.zip | |
Merge pull request #6642 from owncloud/update-SabreDAV
Update sabre dav to 1.7.9
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | lib/base.php | 8 |
2 files changed, 6 insertions, 2 deletions
diff --git a/3rdparty b/3rdparty -Subproject 42efd966284debadf83b761367e529bc45f806d +Subproject 0faf6063ac55d3bc82d2a781548ad0f00e77360 diff --git a/lib/base.php b/lib/base.php index d3e483f4948..a8e9e901847 100644 --- a/lib/base.php +++ b/lib/base.php @@ -410,8 +410,6 @@ class OC { self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib'); self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing'); self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console'); - self::$loader->registerPrefix('Sabre\\VObject', '3rdparty'); - self::$loader->registerPrefix('Sabre_', '3rdparty'); self::$loader->registerPrefix('Patchwork', '3rdparty'); spl_autoload_register(array(self::$loader, 'load')); @@ -479,6 +477,12 @@ class OC { } OC_Util::isSetLocaleWorking(); + // setup 3rdparty autoloader + $vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php'; + if (file_exists($vendorAutoLoad)) { + require_once $vendorAutoLoad; + } + // set debug mode if an xdebug session is active if (!defined('DEBUG') || !DEBUG) { if (isset($_COOKIE['XDEBUG_SESSION'])) { |