upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Restore loadApp() autoload registration

Browse source 
Also changes the autoloader validRoots into a hashmap to try and reduce
duplicate entries
This commit is contained in:
Robin McCorkell 2015-09-16 10:47:46 +01:00
parent 41e79675c3
commit 862afd80b3
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/autoloader.php
View file

@ -51,7 +51,9 @@ class Autoloader {
* @param string[] $validRoots
*/
public function __construct(array $validRoots) {
$this->validRoots = $validRoots;
foreach ($validRoots as $root) {
$this->validRoots[$root] = true;
}
}
/**
@ -60,7 +62,8 @@ class Autoloader {
* @param string $root
*/
public function addValidRoot($root) {
$this->validRoots[] = stream_resolve_include_path($root);
$root = stream_resolve_include_path($root);
$this->validRoots[$root] = true;
}
/**
@ -126,7 +129,7 @@ class Autoloader {
}
protected function isValidPath($fullPath) {
foreach ($this->validRoots as $root) {
foreach ($this->validRoots as $root => $true) {
if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {
return true;
}

1
lib/private/app.php
View file

@ -131,6 +131,7 @@ class OC_App {
*/
public static function loadApp($app, $checkUpgrade = true) {
self::$loadedApps[] = $app;
\OC::$loader->addValidRoot(self::getAppPath($app)); // in case someone calls loadApp() directly
if (is_file(self::getAppPath($app) . '/appinfo/app.php')) {
\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
if ($checkUpgrade and self::shouldUpgrade($app)) {