upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #31882 from nextcloud/backport/31876/stable23

Browse source 
[stable23] Fix \OC_App::getCurrentApp() when being called from CLI or phpunit
This commit is contained in:
Joas Schilling 2022-04-11 12:52:26 +02:00 committed by GitHub
commit 1f5f2fc1b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/private/legacy/OC_App.php
View file

@ -628,11 +628,21 @@ class OC_App {
* @return string
*/
public static function getCurrentApp(): string {
if (\OC::$CLI) {
return '';
}
$request = \OC::$server->getRequest();
$script = substr($request->getScriptName(), strlen(OC::$WEBROOT) + 1);
$topFolder = substr($script, 0, strpos($script, '/') ?: 0);
if (empty($topFolder)) {
$path_info = $request->getPathInfo();
try {
$path_info = $request->getPathInfo();
} catch (Exception $e) {
// Can happen from unit tests because the script name is `./vendor/bin/phpunit` or something a like then.
\OC::$server->get(LoggerInterface::class)->error('Failed to detect current app from script path', ['exception' => $e]);
return '';
}
if ($path_info) {
$topFolder = substr($path_info, 1, strpos($path_info, '/', 1) - 1);
}