summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers
diff options
context:
space:
mode:
authormichael pereira2011-04-25 14:37:56 +0200
committermichael pereira2011-04-25 14:37:56 +0200
commitcb4d45fc156e4f2440edc8c0d7432ce9660f9e35 (patch)
tree68c2f218a1dba7fb7b37cbb09e274a447447ae61 /application/modules/user/controllers
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-cb4d45fc156e4f2440edc8c0d7432ce9660f9e35.tar.gz
pbs2-cb4d45fc156e4f2440edc8c0d7432ce9660f9e35.tar.xz
pbs2-cb4d45fc156e4f2440edc8c0d7432ce9660f9e35.zip
bootmenuentry fix
Diffstat (limited to 'application/modules/user/controllers')
-rw-r--r--application/modules/user/controllers/BootmenuController.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index 1b0490c..f4b2638 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -96,7 +96,8 @@ class user_BootmenuController extends Zend_Controller_Action
if($bootmenuentry->getKclappend() == null)
$bootmenuentry->setKclappend("none (edit Bootmenuentry to set KCL-Append)");
$bootmenuentry->setBootosID("[".$bootmenuentry->getBootosID()."] ".$bootosMapper->find($bootmenuentry->getBootosID())->getTitle());
- $bootmenuentry->setConfigID("[".$bootmenuentry->getConfigID()."] ".$configMapper->find($bootmenuentry->getConfigID())->getTitle());
+ if($bootmenuentry->getConfigID() != null)
+ $bootmenuentry->setConfigID("[".$bootmenuentry->getConfigID()."] ".$configMapper->find($bootmenuentry->getConfigID())->getTitle());
}
}
}else{
@@ -115,7 +116,8 @@ class user_BootmenuController extends Zend_Controller_Action
if($bootmenuentry->getKclappend() == null)
$bootmenuentry->setKclappend("none");
$bootmenuentry->setBootosID("[".$bootmenuentry->getBootosID()."] ".$bootosMapper->find($bootmenuentry->getBootosID())->getTitle());
- $bootmenuentry->setConfigID("[".$bootmenuentry->getConfigID()."] ".$configMapper->find($bootmenuentry->getConfigID())->gettitle());
+ if($bootmenuentry->getConfigID() != null)
+ $bootmenuentry->setConfigID("[".$bootmenuentry->getConfigID()."] ".$configMapper->find($bootmenuentry->getConfigID())->gettitle());
}
}
}