Consolidate if statement, and update unit test

diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php
index 1ebcdb563a599c1216b7bc04d471378371797c88..6bbb101db3a437c80b42c14ed316564c1e7924eb 100644 (file)
--- a/lib/private/share/helper.php
+++ b/lib/private/share/helper.php
@@ -204,10 +204,8 @@ class Helper extends \OC\Share\Constants {
                        } else {
                                $expires = $userExpireDate;
                        }
-               } else {
-                       if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
-                               $expires = $defaultExpires;
-                       }
+               } else if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+                       $expires = $defaultExpires;
                }
 
                return $expires;

diff --git a/tests/lib/share/helper.php b/tests/lib/share/helper.php
index 367507417a0857033972c6c43fc88e1ae5a23531..32dcb4d9d620f7db144d7a751f046a04f7e37df6 100644 (file)
--- a/tests/lib/share/helper.php
+++ b/tests/lib/share/helper.php
@@ -27,8 +27,8 @@ class Test_Share_Helper extends PHPUnit_Framework_TestCase {
                        array(array('defaultExpireDateSet' => false), 2000000000, 2000010000, 2000010000),
                        // no default expire date and no user defined expire date, return false
                        array(array('defaultExpireDateSet' => false), 2000000000, null, false),
-                       // unenforced expire data and no user defined expire date, take default expire date
-                       array(array('defaultExpireDateSet' => true, 'expireAfterDays' => 1, 'enforceExpireDate' => false), 2000000000, null, 2000086400),
+                       // unenforced expire data and no user defined expire date, return false (because the default is not enforced)
+                       array(array('defaultExpireDateSet' => true, 'expireAfterDays' => 1, 'enforceExpireDate' => false), 2000000000, null, false),
                        // enforced expire date and no user defined expire date, take default expire date
                        array(array('defaultExpireDateSet' => true, 'expireAfterDays' => 1, 'enforceExpireDate' => true), 2000000000, null, 2000086400),
                        // unenforced expire date and user defined date > default expire date, take users expire date
@@ -49,6 +49,4 @@ class Test_Share_Helper extends PHPUnit_Framework_TestCase {
                $result = \OC\Share\Helper::calculateExpireDate($defaultExpireSettings, $creationTime, $userExpireDate);
                $this->assertSame($expected, $result);
        }
-
-
 }