summaryrefslogtreecommitdiffstats
path: root/lib/private/Share20
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2017-04-23 19:32:15 +0200
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2017-04-24 13:17:46 +0200
commit51e658da2aeab432858146ad5f8f09d8e2d6c850 (patch)
tree2938338ce5aecd23fbc08f933a6cab544ba7a792 /lib/private/Share20
parenta56fb75e690bffcc0c2d35c6748a5778721fe369 (diff)
downloadnextcloud-server-51e658da2aeab432858146ad5f8f09d8e2d6c850.tar.gz
nextcloud-server-51e658da2aeab432858146ad5f8f09d8e2d6c850.zip
Join if block to preceding if chain
If getShareType() returns "email" it can not also return "user", "group" nor "link", so the if block can be added to the preceding if chain. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'lib/private/Share20')
-rw-r--r--lib/private/Share20/Manager.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 7bed012fe8f..3e4d5cc3813 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -731,10 +731,9 @@ class Manager implements IManager {
$this->validateExpirationDate($share);
$expirationDateUpdated = true;
}
- }
+ } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
+ $plainTextPassword = null;
- $plainTextPassword = null;
- if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
// Password updated.
if ($share->getPassword() !== $originalShare->getPassword()) {
//Verify the password