diff options
author | Joas Schilling <coding@schilljs.com> | 2020-02-14 11:56:23 +0100 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2020-02-14 12:34:13 +0100 |
commit | 3894dcb756e9c5501e063d6c44af9712f3ef44c1 (patch) | |
tree | 12349824df94dc55cc0dddaac9c70bf26c93fb01 /lib/private/AppFramework/App.php | |
parent | f39786660cccaf96f7d1ef2a72e030ccb456be8b (diff) | |
download | nextcloud-server-3894dcb756e9c5501e063d6c44af9712f3ef44c1.tar.gz nextcloud-server-3894dcb756e9c5501e063d6c44af9712f3ef44c1.zip |
Hardcode Talk namespace to fix install due to global route
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/AppFramework/App.php')
-rw-r--r-- | lib/private/AppFramework/App.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php index a36e013cb68..2cbe623bb27 100644 --- a/lib/private/AppFramework/App.php +++ b/lib/private/AppFramework/App.php @@ -68,8 +68,19 @@ class App { if (isset($appInfo['namespace'])) { self::$nameSpaceCache[$appId] = trim($appInfo['namespace']); } else { - // if the tag is not found, fall back to uppercasing the first letter - self::$nameSpaceCache[$appId] = ucfirst($appId); + if ($appId !== 'spreed') { + // if the tag is not found, fall back to uppercasing the first letter + self::$nameSpaceCache[$appId] = ucfirst($appId); + } else { + // For the Talk app (appid spreed) the above fallback doesn't work. + // This leads to a problem when trying to install it freshly, + // because the apps namespace is already registered before the + // app is downloaded from the appstore, because of the hackish + // global route index.php/call/{token} which is registered via + // the core/routes.php so it does not have the app namespace. + // @ref https://github.com/nextcloud/server/pull/19433 + self::$nameSpaceCache[$appId] = 'Talk'; + } } return $topNamespace . self::$nameSpaceCache[$appId]; |