diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2021-10-13 11:37:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-13 11:37:22 +0200 |
| commit | 4cae2cc06cdaadb797ab6bedc6dc4da8b90f85c9 (patch) | |
| tree | 281c9140c796806a99c591df619c11b1ec4e4fbd /lib | |
| parent | e163d199d810562da8bc959bf8be843ddbeac118 (diff) | |
| parent | 37f40cdd468a2826f6269bacc81ff74d8c606d23 (diff) | |
| download | nextcloud-server-4cae2cc06cdaadb797ab6bedc6dc4da8b90f85c9.tar.gz nextcloud-server-4cae2cc06cdaadb797ab6bedc6dc4da8b90f85c9.zip | |
Merge pull request #29004 from nextcloud/bugfix/noid/fix-translated-app-details
Fix translated app details
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Installer.php | 6 | ||||
| -rw-r--r-- | lib/private/legacy/OC_App.php | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/private/Installer.php b/lib/private/Installer.php index 19e70aad147..f3af74167d1 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -113,9 +113,8 @@ class Installer { throw new \Exception('The appinfo/database.xml file is not longer supported. Used in ' . $appId); } - $info = OC_App::getAppInfo($basedir.'/appinfo/info.xml', true); - $l = \OC::$server->getL10N('core'); + $info = OC_App::getAppInfo($basedir.'/appinfo/info.xml', true, $l->getLanguageCode()); if (!is_array($info)) { throw new \Exception( @@ -163,8 +162,7 @@ class Installer { //run appinfo/install.php self::includeAppScript($basedir . '/appinfo/install.php'); - $appData = OC_App::getAppInfo($appId); - OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']); + OC_App::executeRepairSteps($appId, $info['repair-steps']['install']); //set the installed version \OC::$server->getConfig()->setAppValue($info['id'], 'installed_version', OC_App::getAppVersion($info['id'], false)); diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index 101523fcfe7..1ce3662000e 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -992,13 +992,14 @@ class OC_App { } \OC::$server->getAppManager()->clearAppsCache(); - $appData = self::getAppInfo($appId); + $l = \OC::$server->getL10N('core'); + $appData = self::getAppInfo($appId, false, $l->getLanguageCode()); $ignoreMaxApps = \OC::$server->getConfig()->getSystemValue('app_install_overwrite', []); $ignoreMax = in_array($appId, $ignoreMaxApps, true); \OC_App::checkAppDependencies( \OC::$server->getConfig(), - \OC::$server->getL10N('core'), + $l, $appData, $ignoreMax ); |