mirror of
https://github.com/nextcloud/server.git
synced 2026-04-28 17:48:40 -04:00
Merge pull request #54239 from nextcloud/cleanup-appframework-spreed
refactor(AppFramework): drop unused spreed/Talk fallback
This commit is contained in:
commit
2aa6894c38
1 changed files with 2 additions and 13 deletions
|
|
@ -50,19 +50,8 @@ class App {
|
|||
if (isset($appInfo['namespace'])) {
|
||||
self::$nameSpaceCache[$appId] = trim($appInfo['namespace']);
|
||||
} else {
|
||||
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';
|
||||
}
|
||||
// if the tag is not found, fall back to uppercasing the first letter
|
||||
self::$nameSpaceCache[$appId] = ucfirst($appId);
|
||||
}
|
||||
|
||||
return $topNamespace . self::$nameSpaceCache[$appId];
|
||||
|
|
|
|||
Loading…
Reference in a new issue