Moved fixes to trunk

[gosa.git] / include / class_MultiSelectWindow.inc

diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc
index 9d3b10008d59553723e9353114984316a412634e..b7d4bb9166f0147f76dd2962075f9132019acf70 100644 (file)
--- a/include/class_MultiSelectWindow.inc
+++ b/include/class_MultiSelectWindow.inc
@@ -81,7 +81,7 @@ class MultiSelectWindow{
                $this->SaveButtonString         = _("Save");
                $this->CloseButtonString        = _("Close");
                $this->filterName                       = $filterName;
-
+    $this->ui = get_userinfo();
                $this->selectedBase = $_SESSION['CurrentMainBase'];
 
     /* Check default values for SaveAdditionalVars */
@@ -470,7 +470,9 @@ class MultiSelectWindow{
     if($s_action=="root"){
       $this->selectedBase=($this->config->current['BASE']);
       $dep_id = $this->ui->get_module_departments($this->module);
-      $this->selectedBase = $dep_id[key($dep_id)];
+      if(isset($dep_id[key($dep_id)])){
+        $this->selectedBase = $dep_id[key($dep_id)];
+      }
     }