From 2648dddd2ac653cc5ce12e5183eeb75debff13a5 Mon Sep 17 00:00:00 2001
From: Rajesh Taneja <rajesh@moodle.com>
Date: Mon, 4 Jul 2016 13:01:17 +0800
Subject: [PATCH] MDL-55043 core_competency: Set proper sort order for each
 field

---
 competency/classes/evidence.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/competency/classes/evidence.php b/competency/classes/evidence.php
index cc8ec05686a..a6a9e92e537 100644
--- a/competency/classes/evidence.php
+++ b/competency/classes/evidence.php
@@ -312,8 +312,10 @@ class evidence extends persistent {
 
         if (!empty($sort)) {
             $sortcolumns = explode(',', $sort);
-            $sortcolumns = array_map('trim', $sortcolumns);
-            $sort = ' ORDER BY e.' . implode(', e.', $sortcolumns) . ' ' . $order;
+            array_walk($sortcolumns, function(&$sortcolumn, $key, $order) {
+                $sortcolumn = trim($sortcolumn) . ' ' . $order;
+            }, $order);
+            $sort = ' ORDER BY e.' . implode(', e.', $sortcolumns);
         }
 
         $sql = 'SELECT e.*