Let autoloader resolve paths under apps lib directory.

diff --git a/lib/base.php b/lib/base.php
index dde994a7e5775b7ee4f01249c5d59369afd40a14..72645d077862695595020fd0003845b701ebee1b 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -97,8 +97,14 @@ class OC {
                        $path = 'public/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
                } elseif (strpos($className, 'OCA\\') === 0) {
                        foreach (self::$APPSROOTS as $appDir) {
-                               $path = $appDir['path'] . '/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
-                               $fullPath = stream_resolve_include_path($path);
+                               $path = strtolower(str_replace('\\', '/', substr($className, 4)) . '.php');
+                               $fullPath = stream_resolve_include_path($appDir['path'] . '/' . $path);
+                               if (file_exists($fullPath)) {
+                                       require_once $fullPath;
+                                       return false;
+                               }
+                               $libpath = substr($path, 0, strpos($path, '/')) . '/lib' . substr($path, strpos($path, '/'));
+                               $fullPath = stream_resolve_include_path($appDir['path'] . '/' . $libpath);
                                if (file_exists($fullPath)) {
                                        require_once $fullPath;
                                        return false;