Merge pull request #9271 from nextcloud/fix-undefined-variable

Fix undefined variable - found by Phan

3 files changed, 3 insertions, 5 deletions

diff --git a/lib/private/Files/ObjectStore/SwiftFactory.php b/lib/private/Files/ObjectStore/SwiftFactory.php
index 85bba573001..d10aaf467ae 100644
--- a/lib/private/Files/ObjectStore/SwiftFactory.php
+++ b/lib/private/Files/ObjectStore/SwiftFactory.php
@@ -199,7 +199,7 @@ class SwiftFactory {
 					'name' => $this->params['container']
 				]);
 			} else {
-				throw new StorageNotAvailableException('Invalid response while trying to get container info', StorageNotAvailableException::STATUS_ERROR, $e);
+				throw new StorageNotAvailableException('Invalid response while trying to get container info', StorageNotAvailableException::STATUS_ERROR, $ex);
 			}
 		} catch (ConnectException $e) {
 			/** @var RequestInterface $request */
diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php
index 1496fda5140..b3c2dc00189 100644
--- a/lib/private/Files/Storage/DAV.php
+++ b/lib/private/Files/Storage/DAV.php
@@ -770,7 +770,7 @@ class DAV extends Common {
 			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;
 			}
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index 1b40b4955d6..391e98171cf 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -141,9 +141,7 @@ class Installer {
 		\OC_App::setupBackgroundJobs($info['background-jobs']);
 
 		//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']);