diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-09-01 01:46:31 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-09-01 02:50:27 +0200 |
| commit | ebd813ae95a52e291576fe24cc8c631126584492 (patch) | |
| tree | 41d06221c23bf1c47f76f5bdaad5d1bb32a61136 | |
| parent | ab090d5277a836667d71e09d1ac5288de85a5434 (diff) | |
| download | nextcloud-server-ebd813ae95a52e291576fe24cc8c631126584492.tar.gz nextcloud-server-ebd813ae95a52e291576fe24cc8c631126584492.zip | |
don't throw errors in the autoloader when a class doesn't exist
| -rw-r--r-- | lib/base.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/base.php b/lib/base.php index 1798bf09b95..f9adefd8b66 100644 --- a/lib/base.php +++ b/lib/base.php @@ -78,20 +78,25 @@ class OC{ require_once $path; } elseif(strpos($className,'OC_')===0){ - require_once strtolower(str_replace('_','/',substr($className,3)) . '.php'); + $path = strtolower(str_replace('_','/',substr($className,3)) . '.php'); } elseif(strpos($className,'OCP\\')===0){ - require_once 'public/'.strtolower(str_replace('\\','/',substr($className,3)) . '.php'); + $path = 'public/'.strtolower(str_replace('\\','/',substr($className,3)) . '.php'); } elseif(strpos($className,'OCA\\')===0){ - require_once 'apps/'.strtolower(str_replace('\\','/',substr($className,3)) . '.php'); + $path = 'apps/'.strtolower(str_replace('\\','/',substr($className,3)) . '.php'); } elseif(strpos($className,'Sabre_')===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'); } + + if($fullPath = stream_resolve_include_path($path)){ + require_once $path; + } + return false; } public static function initPaths(){ |