From b0869313517879856a3ed7e7bff9b7dc5c58eaea Mon Sep 17 00:00:00 2001 From: Anibal Copitan Date: Tue, 26 Aug 2014 16:37:15 -0500 Subject: [PATCH] merge --- main/exercice/exercise_result.class.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/main/exercice/exercise_result.class.php b/main/exercice/exercise_result.class.php index c4e4d0130c..daef2a42af 100755 --- a/main/exercice/exercise_result.class.php +++ b/main/exercice/exercise_result.class.php @@ -193,10 +193,15 @@ class ExerciseResult $return[$i] = array(); if (empty($user_id)) { $return[$i]['official_code'] = $result['official_code']; - $return[$i]['first_name'] = $result['userpart1']; - $return[$i]['last_name'] = $result['userpart2']; - $return[$i]['user_id'] = $result['excruid']; - $return[$i]['email'] = $result['exemail']; + if (api_is_western_name_order()) { + $return[$i]['first_name'] = $results[$i]['userpart1']; + $return[$i]['last_name'] = $results[$i]['userpart2']; + } else { + $return[$i]['first_name'] = $results[$i]['userpart2']; + $return[$i]['last_name'] = $results[$i]['userpart1']; + } + $return[$i]['user_id'] = $results[$i]['excruid']; + $return[$i]['email'] = $results[$i]['exemail']; } $return[$i]['title'] = $result['extitle']; $return[$i]['start_date'] = api_get_local_time($result['exstart']);