diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-01-14 08:37:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-14 08:37:09 +0100 |
| commit | bda67669bdd302a00dfd4121395050f09ed434da (patch) | |
| tree | 7f606d5640816d1cc1799fbc93d27924ef5fe79b /lib | |
| parent | e7b308cf0a20f21b804430e86dc1eca3757769ec (diff) | |
| parent | df9edf0108d1374b01c85ade946df85e880dfa9a (diff) | |
| download | nextcloud-server-bda67669bdd302a00dfd4121395050f09ed434da.tar.gz nextcloud-server-bda67669bdd302a00dfd4121395050f09ed434da.zip | |
Merge pull request #18862 from nextcloud/bugfix/talk-2663/register-with-potentially-updated-namespace
Register with potentially updated namespace
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/legacy/app.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index b20fd8543c8..961e51fe736 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -227,10 +227,11 @@ class OC_App { * @internal * @param string $app * @param string $path + * @param bool $force */ - public static function registerAutoloading(string $app, string $path) { + public static function registerAutoloading(string $app, string $path, bool $force = false) { $key = $app . '-' . $path; - if(isset(self::$alreadyRegistered[$key])) { + if (!$force && isset(self::$alreadyRegistered[$key])) { return; } @@ -900,10 +901,11 @@ class OC_App { if($appPath === false) { return false; } - self::registerAutoloading($appId, $appPath); \OC::$server->getAppManager()->clearAppsCache(); $appData = self::getAppInfo($appId); + + self::registerAutoloading($appId, $appPath, true); self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']); if (file_exists($appPath . '/appinfo/database.xml')) { |