L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-60039_32' of git://github.com/dmonllao/moodle into MOODLE_32_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2017-09-12 11:24:21 +01:00
parent cc15eb08e7 8aab2713e9
commit dff980ab44
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+10
View File
@@ -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;
}
message/classes/search/message_received.php
+2 -2
View File
@@ -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');
}
/**
message/classes/search/message_sent.php
+2 -2
View File
@@ -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');
}
/**
version.php
+1 -1
View File
@@ -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.