[debian-edu-commits] debian-edu/pkg-team/ 01/06: debian/patches: Add 1018_no-item-multiplication-on-duplicate-search-results.patch. Don't return items more than once when found during consecutive search queries.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit ba466e04098381972710fa4953c5616cfa2d49d2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 13 16:18:47 2015 +0200

    debian/patches: Add 1018_no-item-multiplication-on-duplicate-search-results.patch. Don't return items more than once when found during consecutive search queries.
---
 ...o-item-multiplication-on-duplicate-search-results.patch | 14 ++++++++++++++
 debian/patches/series                                      |  1 +
 2 files changed, 15 insertions(+)

diff --git a/debian/patches/1018_no-item-multiplication-on-duplicate-search-results.patch b/debian/patches/1018_no-item-multiplication-on-duplicate-search-results.patch
new file mode 100644
index 0000000..9314d67
--- /dev/null
+++ b/debian/patches/1018_no-item-multiplication-on-duplicate-search-results.patch
@@ -0,0 +1,14 @@
+Description: Don't return objects more than once if found by consecutive search queries
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/gosa-core/include/class_filter.inc
++++ b/gosa-core/include/class_filter.inc
+@@ -274,7 +274,7 @@
+                 $filter= preg_replace("/\\$/", "*".normalizeLdap($this->value)."*", $filter);
+             }
+ 
+-            $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $this->attributes, $this->category, $this->objectStorage));
++            $result= array_unique(array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $this->attributes, $this->category, $this->objectStorage)), SORT_REGULAR);
+         }
+ 
+         return ($result);
diff --git a/debian/patches/series b/debian/patches/series
index 0d2e931..8be639b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,6 +20,7 @@
 1015_allow-iso8601-date-format-in-user-API.patch
 1016_allow-same-user-ids-as-adduser.patch
 1017_get-ogroups-ou-fix.patch
+1018_no-item-multiplication-on-duplicate-search-results.patch
 2001_fix-smarty-location.patch
 2002_fix-template-location.patch
 2003_fix-class-mapping.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git