diff options
author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2018-02-19 10:28:41 +0100 |
---|---|---|
committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2018-02-19 10:28:41 +0100 |
commit | 1a8916af59d5fd697f9fa1ce7088776d3092c554 (patch) | |
tree | 5a356eb1289beb6caeff679a55ebf38867b30847 /lib | |
parent | b3ca73dc277f7c5b00f2175d5c42919f044631c0 (diff) | |
download | nextcloud-server-1a8916af59d5fd697f9fa1ce7088776d3092c554.tar.gz nextcloud-server-1a8916af59d5fd697f9fa1ce7088776d3092c554.zip |
Fix updating an up
OC_App has been made strict recently and the updater code was not
compatible to this. This adds the array to string conversion of the
Nextcloud version and fixes a typo in OC_App (sstring -> string)
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/Updater.php | 2 | ||||
-rw-r--r-- | lib/private/legacy/app.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 727147e0905..c70113e1c7d 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -385,7 +385,7 @@ class Updater extends BasicEmitter { private function checkAppsRequirements() { $isCoreUpgrade = $this->isCodeUpgrade(); $apps = OC_App::getEnabledApps(); - $version = Util::getVersion(); + $version = implode('.', Util::getVersion()); $disabledApps = []; $appManager = \OC::$server->getAppManager(); foreach ($apps as $app) { diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 4e6ed99f5c3..16e57d43ebc 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -915,7 +915,7 @@ class OC_App { * @param string $appId * @return bool */ - public static function updateApp(sstring $appId): bool { + public static function updateApp(string $appId): bool { $appPath = self::getAppPath($appId); if($appPath === false) { return false; |