From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Mon, 18 Jul 2022 18:19:02 +0000 (+0200)
Subject: fix loading legacy app.php with multi app dir
X-Git-Tag: v23.0.8rc1~25^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F33277%2Fhead;p=nextcloud-server.git

fix loading legacy app.php with multi app dir

- requireAppFile() only appends /appinfo/app.php
- without the absolute path, require_once looks into include_path
- the first match in inlcude_path however migth be different from appPath
- fixed by providing the tested(!), full path to the app


Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---

diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php
index fef5bec6ab0..f6f0e01895f 100644
--- a/lib/private/legacy/OC_App.php
+++ b/lib/private/legacy/OC_App.php
@@ -183,7 +183,7 @@ class OC_App {
 			]);
 			\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
 			try {
-				self::requireAppFile($app);
+				self::requireAppFile($appPath);
 			} catch (Throwable $ex) {
 				if ($ex instanceof ServerNotAvailableException) {
 					throw $ex;