summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authormichael pereira2011-04-26 20:08:10 +0200
committermichael pereira2011-04-26 20:08:10 +0200
commit3605f4c83501bc2108aadf55ff05ea4dc3cab27b (patch)
tree146efbee91bdfef05803ef7e4159952e5bb48ff5 /application
parentusb home (diff)
parentfix startcounter in user BootMenu (diff)
downloadpbs2-3605f4c83501bc2108aadf55ff05ea4dc3cab27b.tar.gz
pbs2-3605f4c83501bc2108aadf55ff05ea4dc3cab27b.tar.xz
pbs2-3605f4c83501bc2108aadf55ff05ea4dc3cab27b.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application')
-rw-r--r--application/modules/user/controllers/GroupController.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php
index d3afec9..a8c6b00 100644
--- a/application/modules/user/controllers/GroupController.php
+++ b/application/modules/user/controllers/GroupController.php
@@ -457,7 +457,7 @@ class User_GroupController extends Zend_Controller_Action
$membershipID = $this->_request->getParam('membershipID');
$rr = $this->membershipMapper->find($membershipID);
- if(($rr->getGroupID() == $this->membership->getGroupID && Pbs_Acl::checkRight('gdmo') ) || ( $rr->getGroupID() != $this->membership->getGroupID && Pbs_Acl::checkRight('gdmog'))){
+ if(($rr->getGroupID() == $this->membership->getGroupID() && Pbs_Acl::checkRight('gdmo') ) || ( $rr->getGroupID() != $this->membership->getGroupID() && Pbs_Acl::checkRight('gdmog'))){
if(isset($membershipID)) {
$membership = $this->membershipMapper->find($membershipID);
if(isset($membership)) {