nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #36257 from nextcloud/fix/noid/single-upgrade-on-custom-apps 

non-static app_dir
This commit is contained in:
Simon L 2023-02-01 17:07:23 +01:00 committed by GitHub
parent 0c5eba3786 4cac49c797
commit 41148acf83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/private/legacy/OC_App.php
View File

@ -477,16 +477,17 @@ class OC_App {
* search for an app in all app-directories
*
* @param string $appId
* @param bool $ignoreCache ignore cache and rebuild it
* @return false|string
*/
public static function findAppInDirectories(string $appId) {
public static function findAppInDirectories(string $appId, bool $ignoreCache = false) {
$sanitizedAppId = self::cleanAppId($appId);
if ($sanitizedAppId !== $appId) {
return false;
}
static $app_dir = [];
if (isset($app_dir[$appId])) {
if (isset($app_dir[$appId]) && !$ignoreCache) {
return $app_dir[$appId];
}
@ -527,15 +528,16 @@ class OC_App {
* @psalm-taint-specialize
*
* @param string $appId
* @param bool $refreshAppPath should be set to true only during install/upgrade
* @return string|false
* @deprecated 11.0.0 use \OC::$server->getAppManager()->getAppPath()
*/
public static function getAppPath(string $appId) {
public static function getAppPath(string $appId, bool $refreshAppPath = false) {
if ($appId === null || trim($appId) === '') {
return false;
}
if (($dir = self::findAppInDirectories($appId)) != false) {
if (($dir = self::findAppInDirectories($appId, $refreshAppPath)) != false) {
return $dir['path'] . '/' . $appId;
}
return false;
@ -973,7 +975,9 @@ class OC_App {
* @return bool
*/
public static function updateApp(string $appId): bool {
$appPath = self::getAppPath($appId);
// for apps distributed with core, we refresh app path in case the downloaded version
// have been installed in custom apps and not in the default path
$appPath = self::getAppPath($appId, true);
if ($appPath === false) {
return false;
}