summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers/BootmenuController.php
diff options
context:
space:
mode:
authormichael pereira2011-04-12 15:21:10 +0200
committermichael pereira2011-04-12 15:21:10 +0200
commit32facd77364daac6318b2ae4eadb9486eb0e7ea2 (patch)
treead6655bf425c90caf497a2e6af5595b12c246465 /application/modules/user/controllers/BootmenuController.php
parentdefault tgz in kcl (diff)
downloadpbs2-32facd77364daac6318b2ae4eadb9486eb0e7ea2.tar.gz
pbs2-32facd77364daac6318b2ae4eadb9486eb0e7ea2.tar.xz
pbs2-32facd77364daac6318b2ae4eadb9486eb0e7ea2.zip
bootmenu anzeige fix
Diffstat (limited to 'application/modules/user/controllers/BootmenuController.php')
-rw-r--r--application/modules/user/controllers/BootmenuController.php10
1 files changed, 6 insertions, 4 deletions
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)