]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix loading legacy app.php with multi app dir 33277/head
authorArthur Schiwon <blizzz@arthur-schiwon.de>
Mon, 18 Jul 2022 18:19:02 +0000 (20:19 +0200)
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>
Tue, 19 Jul 2022 06:22:19 +0000 (06:22 +0000)
- 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>
lib/private/legacy/OC_App.php

index fef5bec6ab00f29b474de834edbb5d82e23ea823..f6f0e01895fce9a848baf2f7910a6b756ba0bdf0 100644 (file)
@@ -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;