From 368f0bf8f6314707764ac7648f1f68a32a87b0a9 Mon Sep 17 00:00:00 2001
From: Dave Cooper <dave@moodle.com>
Date: Thu, 23 Oct 2014 15:08:14 +0800
Subject: [PATCH] MDL-47689 user: Add duplicate field check to avoid oracle db
 error.

---
 user/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user/index.php b/user/index.php
index 5db6f95ff14..c1adf8904b0 100644
--- a/user/index.php
+++ b/user/index.php
@@ -410,9 +410,9 @@ list($esql, $params) = get_enrolled_sql($context, null, $currentgroup, true);
 $joins = array("FROM {user} u");
 $wheres = array();
 
-$mainuserfields = user_picture::fields('u', array('username', 'email', 'city', 'country', 'lang', 'timezone', 'maildisplay'));
-$alreadyretrievedfields = explode(',', $mainuserfields);
-$extrasql = get_extra_user_fields_sql($context, 'u', '', $alreadyretrievedfields);
+$userfields = array('username', 'email', 'city', 'country', 'lang', 'timezone', 'maildisplay');
+$mainuserfields = user_picture::fields('u', $userfields);
+$extrasql = get_extra_user_fields_sql($context, 'u', '', $userfields);
 
 if ($isfrontpage) {
     $select = "SELECT $mainuserfields, u.lastaccess$extrasql";