From f7d3978d8d23ed8f9f28b25a30a755640565290d Mon Sep 17 00:00:00 2001 From: David Monllao Date: Wed, 6 Sep 2017 13:50:53 +0200 Subject: [PATCH 1/2] MDL-60039 messaging: global search index using timeread --- message/classes/search/message_received.php | 4 ++-- message/classes/search/message_sent.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/message/classes/search/message_received.php b/message/classes/search/message_received.php index f57dc9fe248..009451f468d 100644 --- a/message/classes/search/message_received.php +++ b/message/classes/search/message_received.php @@ -47,8 +47,8 @@ class message_received extends base_message { // We don't want to index messages received from noreply and support users. $params = array('modifiedfrom' => $modifiedfrom, 'noreplyuser' => \core_user::NOREPLY_USER, 'supportuser' => \core_user::SUPPORT_USER); - return $DB->get_recordset_select('message_read', 'timecreated >= :modifiedfrom AND - useridto != :noreplyuser AND useridto != :supportuser', $params, 'timecreated ASC'); + return $DB->get_recordset_select('message_read', 'timeread >= :modifiedfrom AND + useridto != :noreplyuser AND useridto != :supportuser', $params, 'timeread ASC'); } /** diff --git a/message/classes/search/message_sent.php b/message/classes/search/message_sent.php index f0ab8d3ba8a..07373d85974 100644 --- a/message/classes/search/message_sent.php +++ b/message/classes/search/message_sent.php @@ -46,8 +46,8 @@ class message_sent extends base_message { // We don't want to index messages sent by noreply and support users. $params = array('modifiedfrom' => $modifiedfrom, 'noreplyuser' => \core_user::NOREPLY_USER, 'supportuser' => \core_user::SUPPORT_USER); - return $DB->get_recordset_select('message_read', 'timecreated >= :modifiedfrom AND - useridfrom != :noreplyuser AND useridfrom != :supportuser', $params, 'timecreated ASC'); + return $DB->get_recordset_select('message_read', 'timeread >= :modifiedfrom AND + useridfrom != :noreplyuser AND useridfrom != :supportuser', $params, 'timeread ASC'); } /** From 8aab2713e99721b55a996f4d40f8ead3d7072aec Mon Sep 17 00:00:00 2001 From: David Monllao Date: Wed, 6 Sep 2017 14:00:56 +0200 Subject: [PATCH 2/2] MDL-60039 search: Force messaging search areas to be reindexed --- lib/db/upgrade.php | 10 ++++++++++ version.php | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 0faa58b77c4..f09a596cc38 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -2602,5 +2602,15 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2016120504.08); } + if ($oldversion < 2016120505.01) { + + // Force all messages to be reindexed. + set_config('core_message_message_sent_lastindexrun', '0', 'core_search'); + set_config('core_message_message_received_lastindexrun', '0', 'core_search'); + + // Main savepoint reached. + upgrade_main_savepoint(true, 2016120505.01); + } + return true; } diff --git a/version.php b/version.php index a0a592ef66b..8ab99743764 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2016120505.00; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2016120505.01; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes.