mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-55082-master' of git://github.com/merrill-oakland/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-07-11 15:20:48 +01:00
commit 64ec975e19
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
course/classes/search/mycourse.php
View File

@ -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');
}
/**

2
mod/glossary/classes/search/entry.php
View File

@ -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));
}

3
mod/survey/classes/search/activity.php
View File

@ -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');
}
}

3
search/classes/area/base_activity.php
View File

@ -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');
}
/**

4
search/tests/fixtures/mock_search_area.php vendored
View File

@ -47,8 +47,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()) {