summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers/PersonController.php
diff options
context:
space:
mode:
authormichael pereira2011-04-21 14:03:59 +0200
committermichael pereira2011-04-21 14:03:59 +0200
commitdaf6e795d126ec49e25e8b40931470e3c63666a9 (patch)
tree3368e0e2c463bfa9d77478dce2dc142ae7428836 /application/modules/user/controllers/PersonController.php
parentupdates raus (diff)
parentUserpasswort verschlüsselung (diff)
downloadpbs2-daf6e795d126ec49e25e8b40931470e3c63666a9.tar.gz
pbs2-daf6e795d126ec49e25e8b40931470e3c63666a9.tar.xz
pbs2-daf6e795d126ec49e25e8b40931470e3c63666a9.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers/PersonController.php')
-rw-r--r--application/modules/user/controllers/PersonController.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php
index 07a69ee..cc8a1e2 100644
--- a/application/modules/user/controllers/PersonController.php
+++ b/application/modules/user/controllers/PersonController.php
@@ -49,7 +49,7 @@ class user_PersonController extends Zend_Controller_Action
if(isset($this->memberships)) {
foreach($this->memberships as $membership) {
$group = $this->groupMapper->find($membership['groupID']);
- @list($rightroles) = $rightrolesMapper->findBy(array('rightID' => '55', 'roleID' => $membership['roleID']));
+ list($rightroles) = $rightrolesMapper->findBy(array('rightID' => '55', 'roleID' => $membership['roleID']));
$role = $roleMapper->find($membership['roleID']);
if($rightroles != null)
$this->view->apikeys[$group->getID()] = $membership['apikey'];
@@ -228,7 +228,7 @@ class user_PersonController extends Zend_Controller_Action
if($membership['groupID'] == $group->getID()) {
$groupsFound[$count] = true;
} else {
- if(@$groupsFound[$count] != true) {
+ if(isset($groupsFound[$count]) && $groupsFound[$count] != true) {
$groupsFound[$count] = false;
}
}