summaryrefslogtreecommitdiffstats
path: root/application/modules/user
diff options
context:
space:
mode:
authorSimon2011-03-28 15:33:38 +0200
committerSimon2011-03-28 15:33:38 +0200
commitfc14745fad31d7c68fa50079e26deea17e608c2b (patch)
treee27847ff93686c42ab4e7ba5a3e78c0eab2b13ba /application/modules/user
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
parentMembership Select im fbgui module (diff)
downloadpbs2-fc14745fad31d7c68fa50079e26deea17e608c2b.tar.gz
pbs2-fc14745fad31d7c68fa50079e26deea17e608c2b.tar.xz
pbs2-fc14745fad31d7c68fa50079e26deea17e608c2b.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user')
-rw-r--r--application/modules/user/controllers/AuthController.php1
-rw-r--r--application/modules/user/forms/MembershipSelect.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/application/modules/user/controllers/AuthController.php b/application/modules/user/controllers/AuthController.php
index db47f44..13ad7f4 100644
--- a/application/modules/user/controllers/AuthController.php
+++ b/application/modules/user/controllers/AuthController.php
@@ -74,6 +74,7 @@ class User_AuthController extends Zend_Controller_Action
$auth = Zend_Auth::getInstance();
$auth->clearIdentity();
Zend_Session::namespaceUnset('userIDs');
+ Zend_Session::forgetMe();
$this->_helper->redirector('login', 'auth');
return;
}
diff --git a/application/modules/user/forms/MembershipSelect.php b/application/modules/user/forms/MembershipSelect.php
index fbf8b8a..fe6870a 100644
--- a/application/modules/user/forms/MembershipSelect.php
+++ b/application/modules/user/forms/MembershipSelect.php
@@ -33,7 +33,7 @@ class user_Form_MembershipSelect extends Zend_Form
$this->addElement('submit', 'selectmembership', array(
'required' => false,
'ignore' => true,
- 'label' => 'Select Group',
+ 'label' => 'Select Membership',
));
}