diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-28 09:57:24 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-28 09:57:24 +0100 |
| commit | 1d44a99ebb5f00b3b9550f4c281db7519cec3c75 (patch) | |
| tree | 43a6ab3a67421bbf6589f757a97088eb16dff08b /lib/base.php | |
| parent | dbc13cf6ee775745c86f92d97d636f9ed3cf5432 (diff) | |
| parent | 31d83fddc482959d7fb4f7377cc7020c59c30951 (diff) | |
| download | nextcloud-server-1d44a99ebb5f00b3b9550f4c281db7519cec3c75.tar.gz nextcloud-server-1d44a99ebb5f00b3b9550f4c281db7519cec3c75.zip | |
Merge branch 'master' into updater-CSP
Conflicts:
core/templates/update.php
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 402a8af4211..f9818d3514e 100644 --- a/lib/base.php +++ b/lib/base.php @@ -96,7 +96,14 @@ class OC } elseif (strpos($className, 'OCP\\') === 0) { $path = 'public/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); } elseif (strpos($className, 'OCA\\') === 0) { - $path = 'apps/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); + foreach(self::$APPSROOTS as $appDir) { + $path = $appDir['path'] . '/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php'); + $fullPath = stream_resolve_include_path($path); + if (file_exists($fullPath)) { + require_once $fullPath; + return false; + } + } } elseif (strpos($className, 'Sabre_') === 0) { $path = str_replace('_', '/', $className) . '.php'; } elseif (strpos($className, 'Symfony\\Component\\Routing\\') === 0) { |