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 10e3294e622b751016e85fe0ad611eb69e79be3d..857a82a017bafb7452645b85e69805feca63c29f 100644 (file)
--- 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 fd041b762aad8eed5f15933145a9b86a4de6b269..f6812ef8a6c97023404d3f3379b43fa4a99e53f0 100644 (file)
--- 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 */