From: hickert Date: Mon, 4 Jun 2007 10:25:28 +0000 (+0000) Subject: Applied patches from 2.5 Revision: 6519 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bda4c3aedb1c60fd9945d73a8b589468602bc685;p=gosa.git Applied patches from 2.5 Revision: 6519 git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6531 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index 10e3294e6..857a82a01 100644 --- a/plugins/admin/groups/class_groupApplication.inc +++ b/plugins/admin/groups/class_groupApplication.inc @@ -22,6 +22,7 @@ class appgroup extends plugin var $curbase = ""; var $curCatDir ; var $curCatDepth =0; // + var $Categories; /* attribute list for save action */ var $attributes = array("gosaMemberApplication","gosaApplicationParameter"); diff --git a/plugins/admin/systems/class_printerPPDDialog.inc b/plugins/admin/systems/class_printerPPDDialog.inc index fd041b762..f6812ef8a 100644 --- a/plugins/admin/systems/class_printerPPDDialog.inc +++ b/plugins/admin/systems/class_printerPPDDialog.inc @@ -422,7 +422,13 @@ class printerPPDDialog extends plugin /* Prepare data */ $values = array(); $name = $settings['_name']; - $default = $settings['_default']; + + if (!isset($settings['_default'])){ + $default = ""; + } else { + $default = $settings['_default']; + } + $type = $settings['_type']; /* Add name to table */