From 9f0b99cd17376c8a7a87da81431a4818f6ee41b3 Mon Sep 17 00:00:00 2001
From: goodkiller <markopraakli@gmail.com>
Date: Tue, 14 Oct 2014 01:18:45 +0300
Subject: [PATCH] Update group.php

Here is fox for my LDAP users OW 7.0.2
---
 lib/private/group.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/private/group.php b/lib/private/group.php
index 49f683c411..010c614bf9 100644
--- a/lib/private/group.php
+++ b/lib/private/group.php
@@ -282,7 +282,8 @@ class OC_Group {
 				$displayNames
 			);
 			if ($diff) {
-				$displayNames = array_merge($diff, $displayNames);
+				// A fix for LDAP users. array_merge loses keys...
+				$displayNames = $diff + $displayNames;
 			}
 		}
 		return $displayNames;