summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers/BootmenuController.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/BootmenuController.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/BootmenuController.php')
-rw-r--r--application/modules/user/controllers/BootmenuController.php5
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);