sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18862 from nextcloud/bugfix/talk-2663/register-with-potentially-updated-namespace 

Register with potentially updated namespace
pull/18838/head
Roeland Jago Douma 2020-01-14 08:37:09 +07:00 committed by GitHub
parent e7b308cf0a df9edf0108
commit bda67669bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/legacy/app.php
Unescape Escape View File

@ -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')) {