removes merge conflicts in tine20/Courses/translations/de.po
[tine20] / tine20 / Tinebase / Group / ActiveDirectory.php
index 1065fbe..55bd64e 100644 (file)
@@ -318,11 +318,12 @@ class Tinebase_Group_ActiveDirectory extends Tinebase_Group_Ldap
         
         $this->getLdap()->update($dn, $ldapData);
         
-        if ($metaData['cn'] != $ldapData['cn']) {
-            $newDn = "cn={$ldapData['cn']},{$this->_options['baseDn']}";
+        $newDn = "cn={$ldapData['cn']},{$this->_options['baseDn']}";
+        if ($newDn != $dn) {
             $this->_ldap->rename($dn, $newDn);
         }
         
+        
         $group = $this->getGroupByIdFromSyncBackend($_group);
         
         return $group;