From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 30 Sep 2009 13:04:29 +0000 (+0000)
Subject: Update OC cache if someone used a different order of suggested clicks. Closes #710
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=eee89b53040c97d6c6b91a007315d7ae8bfe8cb2;p=gosa.git

Update OC cache if someone used a different order of suggested clicks. Closes #710


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

diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index 832064e34..c696ad4e1 100644
--- a/gosa-core/setup/class_setupStep_Migrate.inc
+++ b/gosa-core/setup/class_setupStep_Migrate.inc
@@ -1051,6 +1051,9 @@ class Step_Migrate extends setup_step
         $this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='create_acls' value='"._("Create")."'>";
       }
     }
+
+    // Reload base OC
+    $this->checkBaseOC();
     return($GOsa_26_found);
   }
 
@@ -2134,8 +2137,10 @@ class Step_Migrate extends setup_step
         if(isset($this->rootOC_details['mods'])){
           $res  = $ldap->modify($this->rootOC_details['mods']);	
           if(!$res){
-            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $source, LDAP_MOD, get_class()));
+            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $cv['base'], LDAP_MOD, get_class()));
           }
+          $this->checkBaseOC();
+          $this->check_administrativeAccount();
           return($res);
         }else{
           trigger_error("No modifications to make... ");