diff --git a/library/Class/User/Settings.php b/library/Class/User/Settings.php index 639b2069ab7a10abf57d583996d2400cd60eda59..747a2ed287a722650d434a42d1d73ec4a42c359c 100644 --- a/library/Class/User/Settings.php +++ b/library/Class/User/Settings.php @@ -147,7 +147,7 @@ class Class_User_Settings { public function getRedmineLibrary() { - return $lib_id = $this->get(self::REDMINE_LIBRARY) + return ($lib_id = $this->get(self::REDMINE_LIBRARY)) ? Class_Bib::find($lib_id) : $this->getUserLib(); } diff --git a/tests/scenarios/MobileApplication/UserAccountTest.php b/tests/scenarios/MobileApplication/UserAccountTest.php index 44e623289cde1cd66ae3b1dfbc529dcef2d14553..a477bd327a97d6670d7e7dbf2ca825600b0aeff2 100644 --- a/tests/scenarios/MobileApplication/UserAccountTest.php +++ b/tests/scenarios/MobileApplication/UserAccountTest.php @@ -62,6 +62,12 @@ abstract class Scenario_MobileApplication_UserAccountTestCase extends AbstractCo ZendAfi_Auth::getInstance()->clearIdentity(); } + + + public function tearDown() { + unset($_SERVER['HTTPS']); + parent::tearDown(); + } }