Fixed name, fixed display of departments

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11598 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index fa59990e053b1fef5d9f436e1efd54513afc60b3..bb67e2698dade915e3d81e45c054eb95260c9384 100644 (file)
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -33,7 +33,7 @@ class MultiSelectWindow{
 
        var $string_Title                         = "";
        var $string_ListHeader  = "";
-  var $string_ListDropDown= "";
+       var $string_ListDropDown= "";
        var $string_Summary                     = "";
        var $string_Information = "";
 
@@ -48,9 +48,11 @@ class MultiSelectWindow{
        var $is_headpage                          = false;      // if true the design changes
        var $filterName                           = "Liste";
        var $DepartmentsAdded           = false;
-  var $Added_Departments  = array();
+       var $Added_Departments  = array();
        var $selectedBase       = "";
 
+       private $departments= array();
+
   var $DivHeight          = "";
 
   var $HideFilterPart     = false;

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index c5d0da140ba65cb384fed5d22c9ab91c97ecbbe8..8d839877c5eec731614953a4f46417164195eea7 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -777,7 +777,7 @@ class config  {
       }
 
       /* Fix name, if it contains a replace tag */
-      $name= @LDAP::fix($name);
+      $name= preg_replace('/\\\\,/', ',', @LDAP::fix($name));
 
       /* Check if current name is too long, then cut it */
       if(mb_strlen($name, 'UTF-8')> $max_size){