Made current main base set up more early

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

diff --git a/html/main.php b/html/main.php
index e43f2aaeb104149ffc1c5b3d6bc85e9e71146f32..efd6806d6ef629a076eb1238f9f8645f3533eb42 100644 (file)
--- a/html/main.php
+++ b/html/main.php
@@ -148,6 +148,11 @@ bindtextdomain($domain, "$BASE_DIR/locale");
 textdomain($domain);
 @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, "Setting language to");
 
+/* Preset current main base */
+if(!isset($_SESSION['CurrentMainBase'])){
+  $_SESSION['CurrentMainBase']= get_base_from_people($ui->dn);
+}
+
 /* Prepare plugin list */
 if (!isset($_SESSION['plist'])){
   $_SESSION['plist']= new pluglist($config, $ui);

diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc
index a26337785ec3f7ea52d7fda4473a6b39591f27b1..6cb52c0f6651490c0c0d14a20502b9fd1726cc26 100644 (file)
--- a/include/class_MultiSelectWindow.inc
+++ b/include/class_MultiSelectWindow.inc
@@ -80,11 +80,6 @@ class MultiSelectWindow{
                $this->filterName                       = $filterName;
 
                /* Set default base, to users base  */
-    $ui   = get_userinfo();
-    $base = get_base_from_people($ui->dn);
-               if(!isset($_SESSION['CurrentMainBase'])){
-                       $_SESSION['CurrentMainBase'] = $base;
-               }
                $this->selectedBase = $_SESSION['CurrentMainBase'];
 
     /* Check default values for SaveAdditionalVars */