mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Fix undefined variable - found by Phan
This commit is contained in:
Joas Schilling 2018-04-23 15:51:15 +02:00 committed by GitHub
parent 000f41ba01 4fd697e733
commit 05a6b71a61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Files/ObjectStore/SwiftFactory.php
View File

@ -199,7 +199,7 @@ class SwiftFactory {
'name' => $this->params['container'] 'name' => $this->params['container']
]); ]);
} else { } 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) { } catch (ConnectException $e) {
/** @var RequestInterface $request */ /** @var RequestInterface $request */

2
lib/private/Files/Storage/DAV.php
View File

@ -770,7 +770,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;
} }

4
lib/private/Installer.php
View File

@ -141,9 +141,7 @@ class Installer {
\OC_App::setupBackgroundJobs($info['background-jobs']); \OC_App::setupBackgroundJobs($info['background-jobs']);
//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']);