Merge branch 'MDL-72585-master' of git://github.com/dpalou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 15 Oct 2021 01:53:19 +0000 (09:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 15 Oct 2021 01:53:19 +0000 (09:53 +0800)
1  2 
message/externallib.php
message/tests/externallib_test.php

@@@ -1989,9 -1988,9 +1989,9 @@@ class core_message_external extends ext
       * @param  int      $limitnum       limit num
       * @return external_description
       */
 -    public static function get_messages($useridto, $useridfrom = 0, $type = 'both', $read = true,
 +    public static function get_messages($useridto, $useridfrom = 0, $type = 'both', $read = MESSAGE_GET_READ,
                                          $newestfirst = true, $limitfrom = 0, $limitnum = 0) {
-         global $CFG, $USER;
+         global $CFG, $USER, $PAGE;
  
          $warnings = array();
  
Simple merge