From 55b62370aa8777c8a43de2a42d47e986be656654 Mon Sep 17 00:00:00 2001
From: Eric Merrill <merrill@oakland.edu>
Date: Thu, 30 Jun 2016 11:06:56 -0400
Subject: [PATCH] MDL-55082 search: Update core areas to return results in time
 ASC order

---
 course/classes/search/mycourse.php         | 2 +-
 mod/glossary/classes/search/entry.php      | 2 +-
 mod/survey/classes/search/activity.php     | 3 ++-
 search/classes/area/base_activity.php      | 3 ++-
 search/tests/fixtures/mock_search_area.php | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/course/classes/search/mycourse.php b/course/classes/search/mycourse.php
index 7a5f30be2b7..b75defd94c6 100644
--- a/course/classes/search/mycourse.php
+++ b/course/classes/search/mycourse.php
@@ -49,7 +49,7 @@ class mycourse extends \core_search\area\base {
      */
     public function get_recordset_by_timestamp($modifiedfrom = 0) {
         global $DB;
-        return $DB->get_recordset_select('course', 'timemodified >= ?', array($modifiedfrom));
+        return $DB->get_recordset_select('course', 'timemodified >= ?', array($modifiedfrom), 'timemodified ASC');
     }
 
     /**
diff --git a/mod/glossary/classes/search/entry.php b/mod/glossary/classes/search/entry.php
index e030e4eba42..72f16712159 100644
--- a/mod/glossary/classes/search/entry.php
+++ b/mod/glossary/classes/search/entry.php
@@ -53,7 +53,7 @@ class entry extends \core_search\area\base_mod {
 
         $sql = "SELECT ge.*, g.course FROM {glossary_entries} ge
                   JOIN {glossary} g ON g.id = ge.glossaryid
-                WHERE ge.timemodified >= ?";
+                WHERE ge.timemodified >= ? ORDER BY ge.timemodified ASC";
         return $DB->get_recordset_sql($sql, array($modifiedfrom));
     }
 
diff --git a/mod/survey/classes/search/activity.php b/mod/survey/classes/search/activity.php
index 3cb9ee75b10..f4033ebc54d 100644
--- a/mod/survey/classes/search/activity.php
+++ b/mod/survey/classes/search/activity.php
@@ -46,7 +46,8 @@ class activity extends \core_search\area\base_activity {
     public function get_recordset_by_timestamp($modifiedfrom = 0) {
         global $DB;
         $select = 'course != ? AND ' . static::MODIFIED_FIELD_NAME . ' >= ?';
-        return $DB->get_recordset_select($this->get_module_name(), $select, array(0, $modifiedfrom));
+        return $DB->get_recordset_select($this->get_module_name(), $select, array(0, $modifiedfrom),
+                static::MODIFIED_FIELD_NAME . ' ASC');
     }
 
 }
diff --git a/search/classes/area/base_activity.php b/search/classes/area/base_activity.php
index 0970f6ee457..0f1b3a5b5e1 100644
--- a/search/classes/area/base_activity.php
+++ b/search/classes/area/base_activity.php
@@ -62,7 +62,8 @@ abstract class base_activity extends base_mod {
      */
     public function get_recordset_by_timestamp($modifiedfrom = 0) {
         global $DB;
-        return $DB->get_recordset_select($this->get_module_name(), static::MODIFIED_FIELD_NAME . ' >= ?', array($modifiedfrom));
+        return $DB->get_recordset_select($this->get_module_name(), static::MODIFIED_FIELD_NAME . ' >= ?', array($modifiedfrom),
+                static::MODIFIED_FIELD_NAME . ' ASC');
     }
 
     /**
diff --git a/search/tests/fixtures/mock_search_area.php b/search/tests/fixtures/mock_search_area.php
index 8a638d7a759..1adfeef626e 100644
--- a/search/tests/fixtures/mock_search_area.php
+++ b/search/tests/fixtures/mock_search_area.php
@@ -41,8 +41,8 @@ class mock_search_area extends \core_search\area\base {
     public function get_recordset_by_timestamp($modifiedfrom = 0) {
         global $DB;
 
-        // Filter by capability as we want this quick.
-        return $DB->get_recordset_sql("SELECT * FROM {temp_mock_search_area} WHERE timemodified >= ?", array($modifiedfrom));
+        $sql = "SELECT * FROM {temp_mock_search_area} WHERE timemodified >= ? ORDER BY timemodified ASC";
+        return $DB->get_recordset_sql($sql, array($modifiedfrom));
     }
 
     public function get_document($record, $options = array()) {