diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-10-27 16:33:10 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-10-27 16:33:10 +0200 |
| commit | 894d44e796bf99882383fcee42f754c5d9d6828b (patch) | |
| tree | 848094d3e67f86a337b9be332108fe571334303c /lib/base.php | |
| parent | c1c76539cc2878c058de15892dd05d6dd8b4b9a5 (diff) | |
| parent | b2b84f3a6f3c98005f80c6c7c558a33b4ea36193 (diff) | |
| download | nextcloud-server-894d44e796bf99882383fcee42f754c5d9d6828b.tar.gz nextcloud-server-894d44e796bf99882383fcee42f754c5d9d6828b.zip | |
Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'
Conflicts:
lib/base.php
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php index 15dc34f63d2..f810b1f186e 100644 --- a/lib/base.php +++ b/lib/base.php @@ -100,6 +100,9 @@ class OC{ elseif(strpos($className, 'Symfony\\Component\\Routing\\')===0) { $path = 'symfony/routing/'.str_replace('\\', '/', $className) . '.php'; } + elseif(strpos($className, 'Sabre\\VObject')===0) { + $path = str_replace('\\', '/', $className) . '.php'; + } elseif(strpos($className, 'Test_')===0) { $path = 'tests/lib/'.strtolower(str_replace('_', '/', substr($className, 5)) . '.php'); }else{ |