Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

2 files changed, 2 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)) {
diff --git a/library/Pbs/NewMember.php b/library/Pbs/NewMember.php
index ed8c86f..3a1e868 100644
--- a/library/Pbs/NewMember.php
+++ b/library/Pbs/NewMember.php
@@ -32,6 +32,7 @@ class Pbs_NewMember{
 			$userBootmenu->setGroupID(null);
 			$userBootmenu->setMembershipID($membership->getID());
 			$userBootmenu->setTitle("BootMenu of ".$personname);
+			$userBootmenu->setStartcounter(300);
 			$userBootmenu->setCreated(time());
 			$userBootmenu->setDefaultbootmenu(0);		
 		$userBootmenuID = $bootmenuMapper->save($userBootmenu);