]> source.dussan.org Git - nextcloud-server.git/commitdiff
don't throw errors in the autoloader when a class doesn't exist
authorRobin Appelman <icewind@owncloud.com>
Fri, 31 Aug 2012 23:46:31 +0000 (01:46 +0200)
committerRobin Appelman <icewind@owncloud.com>
Sat, 1 Sep 2012 00:50:27 +0000 (02:50 +0200)
lib/base.php

index 1798bf09b95b94d89a63098588a155b9ba7e4b3c..f9adefd8b660bba65bdea2e322b4a233eeb5949f 100644 (file)
@@ -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(){