Merge pull request #6642 from owncloud/update-SabreDAV
Update sabre dav to 1.7.9
This commit is contained in:
commit
f2fbfbc665
2
3rdparty
2
3rdparty
|
@ -1 +1 @@
|
||||||
Subproject commit 42efd966284debadf83b761367e529bc45f806d6
|
Subproject commit 0faf6063ac55d3bc82d2a781548ad0f00e77360c
|
|
@ -410,8 +410,6 @@ class OC {
|
||||||
self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib');
|
self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib');
|
||||||
self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing');
|
self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing');
|
||||||
self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console');
|
self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console');
|
||||||
self::$loader->registerPrefix('Sabre\\VObject', '3rdparty');
|
|
||||||
self::$loader->registerPrefix('Sabre_', '3rdparty');
|
|
||||||
self::$loader->registerPrefix('Patchwork', '3rdparty');
|
self::$loader->registerPrefix('Patchwork', '3rdparty');
|
||||||
spl_autoload_register(array(self::$loader, 'load'));
|
spl_autoload_register(array(self::$loader, 'load'));
|
||||||
|
|
||||||
|
@ -479,6 +477,12 @@ class OC {
|
||||||
}
|
}
|
||||||
OC_Util::isSetLocaleWorking();
|
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
|
// set debug mode if an xdebug session is active
|
||||||
if (!defined('DEBUG') || !DEBUG) {
|
if (!defined('DEBUG') || !DEBUG) {
|
||||||
if (isset($_COOKIE['XDEBUG_SESSION'])) {
|
if (isset($_COOKIE['XDEBUG_SESSION'])) {
|
||||||
|
|
Loading…
Reference in New Issue