From 981683586ec55d4f482f6a1d9f07ab2285cac9a9 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Fri, 5 Feb 2016 21:52:00 +0000
Subject: [PATCH] bug: Fix list assignment order
---
include/ajax.users.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/ajax.users.php b/include/ajax.users.php
index f8b9b78b4..dd01ac1de 100644
--- a/include/ajax.users.php
+++ b/include/ajax.users.php
@@ -83,7 +83,7 @@ class UsersAjaxAPI extends AjaxController {
// Omit already-imported remote users
if ($emails = array_filter($emails)) {
$users->union(User::objects()
- ->values_flat('id', 'name', 'emails__address')
+ ->values_flat('id', 'name', 'default_email__address')
->annotate(array('__relevance__' => new SqlCode(1)))
->filter(array(
'emails__address__in' => $emails
@@ -91,7 +91,7 @@ class UsersAjaxAPI extends AjaxController {
}
foreach ($users as $U) {
- list($id,$email,$name) = $U;
+ list($id, $name, $email) = $U;
foreach ($matches as $i=>$u) {
if ($u['email'] == $email) {
unset($matches[$i]);
--
GitLab