diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-05-29 17:08:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-29 17:08:40 +0200 |
| commit | 5c9f2dd99f4da223b02da63a071a8d9c787f17a6 (patch) | |
| tree | 5e5bd90616e17a8281caf6298a143863a471d052 /lib | |
| parent | b3e9e36b14b3ee4785c4d2e0a4964ff771e6c599 (diff) | |
| parent | 57489f10138d99fe69dfafa0bbf3a0081845cf9d (diff) | |
| download | nextcloud-server-5c9f2dd99f4da223b02da63a071a8d9c787f17a6.tar.gz nextcloud-server-5c9f2dd99f4da223b02da63a071a8d9c787f17a6.zip | |
Merge pull request #9651 from nextcloud/backport/9271/stable13
[stable13] Fix undefined variables
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/Storage/DAV.php | 2 | ||||
| -rw-r--r-- | lib/private/Installer.php | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php index 6585dd862e4..8019c4c0758 100644 --- a/lib/private/Files/Storage/DAV.php +++ b/lib/private/Files/Storage/DAV.php @@ -774,7 +774,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 082840808b8..9036e123ad5 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -149,9 +149,7 @@ class Installer { } //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']); |