MDL-47689 user: Add duplicate field check to avoid oracle db error.

moodle · Oct 24, 2014 · 368f0bf · 368f0bf
1 parent 7a811fb
commit 368f0bf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/user/index.php b/user/index.php
@@ -410,9 +410,9 @@
 $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";