Merge pull request #9651 from nextcloud/backport/9271/stable13

[stable13] Fix undefined variables
nextcloud · May 29, 2018 · 5c9f2dd · 5c9f2dd
2 parents b3e9e36 + 57489f1
commit 5c9f2dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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;
 			}

diff --git 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']);