Merge branch 'MDL-67338-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE

message/lib.php

@@ -530,6 +530,20 @@ function translate_message_default_setting($plugindefault, $processorname) {
     return array($permitted, $loggedin, $loggedoff);
 }
 
+/**
+ * Return a list of page types
+ *
+ * @param string $pagetype current page type
+ * @param context|null $parentcontext Block's parent context
+ * @param context|null $currentcontext Current context of block
+ * @return array
+ */
+function message_page_type_list(string $pagetype, ?context $parentcontext, ?context $currentcontext): array {
+    return [
+        'message-*' => get_string('page-message-x', 'message'),
+    ];
+}
+
 /**
  * Get messages sent or/and received by the specified users.
  * Please note that this function return deleted messages too. Besides, only individual conversation messages

message/upgrade.txt

@@ -1,6 +1,11 @@
 This files describes API changes in /message/ messaging system,
 information provided here is intended especially for developers.
 
+=== 3.11.2 ===
+
+* The `message_page_type_list` method was previouly deprecated, however it was still
+  used so has been recreated in message/lib.php
+
 === 3.10 ===
 
 * The following methods have been deprecated and should not be used any more: