Updated filter definitions

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

diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index 1a058950aae1775c2f796ce939f42cbf61f99e31..30f3cf29194faf4181929a1c2f0d1b788ddeafc4 100644 (file)
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -54,11 +54,11 @@ class filter {
     $contents = file_get_contents($filename);
     $this->xmlData= xml::xml2array($contents, 1);
 
-    if (!isset($this->xmlData['filter'])) {
+    if (!isset($this->xmlData['filterdef'])) {
       return false;
     }
 
-    $this->xmlData= $this->xmlData["filter"];
+    $this->xmlData= $this->xmlData["filterdef"];
 
     // Load filter
     if (isset($this->xmlData['search'])) {

diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index 8dbe2590d7e1153f2fa0e6aabbb17e9d78418fe3..ba15bcb9ee69aaaa78ff5e42963091e1c25b671f 100644 (file)
--- a/gosa-core/plugins/admin/users/user-filter.xml
+++ b/gosa-core/plugins/admin/users/user-filter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<filter>
+<filterdef>
   <definition>
     <category>users</category>
     <template>user-filter.tpl</template>
@@ -114,4 +114,4 @@
     </autocomplete>
    </element>
 
-</filter>
+</filterdef>