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

1 files changed, 3 insertions, 2 deletions

diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index 38b278c..e0b27e6 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -79,6 +79,7 @@ class user_BootmenuController extends Zend_Controller_Action
 		$bootosMapper = new Application_Model_BootOsMapper();
 		$configMapper = new Application_Model_ConfigMapper();
 
+		$bootmenuentries = array();
 		if($this->type =='group' && Pbs_Acl::checkRight('booai')){
 			$this->view->type = 'group';
 			$bootmenu = $this->bootmenuMapper->findBy(array('groupID' => $this->membership->getGroupID()));
@@ -143,7 +144,7 @@ class user_BootmenuController extends Zend_Controller_Action
 		$this->view->page 		= $pagination->getRequestPage();
 
 		$this->view->bootmenulist = $bootmenu;
-		@$this->view->bootmenuentrylist = $bootmenuentries;
+		$this->view->bootmenuentrylist = $bootmenuentries;
 
 	}
 
@@ -283,7 +284,7 @@ class user_BootmenuController extends Zend_Controller_Action
 				
 			if($bootmenu->getDefaultbootmenu() == false){
 				 
-				@list($defaultbootmenu) = $this->bootmenuMapper->findBy(array('defaultbootmenu' => '1'));
+				list($defaultbootmenu) = $this->bootmenuMapper->findBy(array('defaultbootmenu' => '1'));
 				if($defaultbootmenu != null){
 					$defaultbootmenu->setDefaultbootmenu(false);
 					$this->bootmenuMapper->save($defaultbootmenu);