From 6a4a7c868cb6fa5acff389853355882f7a4c13b8 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 23 Apr 2018 11:30:22 +0200 Subject: [PATCH 1/2] Fix undefined variable - found by Phan Signed-off-by: Morris Jobke --- lib/private/Files/Storage/DAV.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php index 6585dd862e470..8019c4c07582c 100644 --- a/lib/private/Files/Storage/DAV.php +++ b/lib/private/Files/Storage/DAV.php @@ -774,7 +774,7 @@ public function hasUpdated($path, $time) { if ($response === false) { if ($path === '') { // if root is gone it means the storage is not available - throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage()); + throw new StorageNotAvailableException('root is gone'); } return false; } From 57489f10138d99fe69dfafa0bbf3a0081845cf9d Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 23 Apr 2018 11:53:47 +0200 Subject: [PATCH 2/2] Remove a check for an unused variable Left over from a refactoring https://github.com/nextcloud/server/pull/1940 Signed-off-by: Morris Jobke --- lib/private/Installer.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/private/Installer.php b/lib/private/Installer.php index 082840808b856..9036e123ad5c5 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -149,9 +149,7 @@ public function installApp($appId) { } //run appinfo/install.php - if((!isset($data['noinstall']) or $data['noinstall']==false)) { - self::includeAppScript($basedir . '/appinfo/install.php'); - } + self::includeAppScript($basedir . '/appinfo/install.php'); $appData = OC_App::getAppInfo($appId); OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);