From 32facd77364daac6318b2ae4eadb9486eb0e7ea2 Mon Sep 17 00:00:00 2001 From: michael pereira Date: Tue, 12 Apr 2011 15:21:10 +0200 Subject: bootmenu anzeige fix --- application/modules/user/controllers/BootmenuController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'application/modules/user/controllers/BootmenuController.php') diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php index d2e3508..5082aaf 100644 --- a/application/modules/user/controllers/BootmenuController.php +++ b/application/modules/user/controllers/BootmenuController.php @@ -77,8 +77,9 @@ class user_BootmenuController extends Zend_Controller_Action $bootmenuID = $bm->getID(); $bootmenuentries[$bootmenuID] = $this->bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID)); foreach ($bootmenuentries[$bootmenuID] as $bootmenuentry){ - if($bootmenuentry->getKcl()) - $bootmenuentry->setKcl($bootosMapper->find($bootmenuentry->getBootosID())->getDefaultkcl()); + $kcl = $bootosMapper->find($bootmenuentry->getBootosID())->getDefaultkcl(); + if($bootmenuentry->getKcl() && $kcl != null) + $bootmenuentry->setKcl($kcl); else $bootmenuentry->setKcl("deactivated (edit Bootmenuentry to activate)"); if($bootmenuentry->getKclappend() == null) @@ -95,8 +96,9 @@ class user_BootmenuController extends Zend_Controller_Action $bootmenuID = $bootmenu[0]->getID(); $bootmenuentries[$bootmenuID] = $this->bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID)); foreach ($bootmenuentries[$bootmenuID] as $bootmenuentry){ - if($bootmenuentry->getKcl()) - $bootmenuentry->setKcl($bootosMapper->find($bootmenuentry->getBootosID())->getDefaultkcl()); + $kcl = $bootosMapper->find($bootmenuentry->getBootosID())->getDefaultkcl(); + if($bootmenuentry->getKcl() && $kcl != null) + $bootmenuentry->setKcl($kcl); else $bootmenuentry->setKcl("deactivated (edit Bootmenuentry to activate)"); if($bootmenuentry->getKclappend() == null) -- cgit v1.2.3-55-g7522