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

[stable13] Fix undefined variables
This commit is contained in:
Morris Jobke 2018-05-29 17:08:40 +02:00 committed by GitHub
commit 5c9f2dd99f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions

View File

@ -774,7 +774,7 @@ class DAV extends Common {
if ($response === false) { if ($response === false) {
if ($path === '') { if ($path === '') {
// if root is gone it means the storage is not available // 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; return false;
} }

View File

@ -149,9 +149,7 @@ class Installer {
} }
//run appinfo/install.php //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); $appData = OC_App::getAppInfo($appId);
OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']); OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);