diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-09-13 10:50:10 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-09-13 10:50:10 +0000 |
| commit | b261c980c71112fb74541e4c93901ae12449b0d0 (patch) | |
| tree | 87612bf2a346d8d04cdc90cf2471ab207aa77859 | |
| parent | 182f890110f86ced32177dde2ac2fc2437bb2305 (diff) | |
| download | nextcloud-server-b261c980c71112fb74541e4c93901ae12449b0d0.tar.gz nextcloud-server-b261c980c71112fb74541e4c93901ae12449b0d0.zip | |
Fix autoloader merge conflict
| -rw-r--r-- | lib/base.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 0da33b4d0ff..2b05fd7f9ea 100644 --- a/lib/base.php +++ b/lib/base.php @@ -95,11 +95,13 @@ class OC{ $path = str_replace('_', '/', $className) . '.php'; } elseif(strpos($className,'Symfony\\')===0){ - require_once str_replace('\\','/',$className) . '.php'; + $path = str_replace('\\','/',$className) . '.php'; } elseif(strpos($className,'Test_')===0){ - require_once 'tests/lib/'.strtolower(str_replace('_','/',substr($className,5)) . '.php'); + $path = 'tests/lib/'.strtolower(str_replace('_','/',substr($className,5)) . '.php'); + } else { + return false; } if($fullPath = stream_resolve_include_path($path)) { |