Updated server service.

[gosa.git] / plugins / admin / mimetypes / class_mimetypeManagement.inc

diff --git a/plugins/admin/mimetypes/class_mimetypeManagement.inc b/plugins/admin/mimetypes/class_mimetypeManagement.inc
index 45f6334254260156d447cdb98c3beaa7e1928210..598027771eacd501d0bf3f50db3682a36a20d28e 100755 (executable)
--- a/plugins/admin/mimetypes/class_mimetypeManagement.inc
+++ b/plugins/admin/mimetypes/class_mimetypeManagement.inc
@@ -499,13 +499,15 @@ class mimetypeManagement extends plugin
     if($SubSearch){
       $Flags    |= GL_SUBSEARCH;  
     }else{
-      $use_base ="ou=mime,".$use_base;
+      if(!$this->enableReleaseManagement){
+        $use_base ="ou=mime,".$use_base;
+      }
     }
   
     /* Get results and create index */ 
     $res= get_list($Filter, "mimetypes", $use_base, array("cn","description","dn","objectClass"), $Flags);
     foreach ($res as $val){
-      $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val;
+      $tmp[strtolower($val['cn'][0]).$val['cn'][0].$val['dn']]=$val;
     }
 
     /* sort entries */
@@ -581,9 +583,9 @@ class mimetypeManagement extends plugin
     }
 
     /* Automatically disable status for pasting */
-    if(!$this->CopyPasteHandler->entries_queued()){
-      $this->start_pasting_copied_objects = FALSE;
-    }
+    #if(!$this->CopyPasteHandler->entries_queued()){
+    #  $this->start_pasting_copied_objects = FALSE;
+    #}
     return("");
   }