From: David Monllao <davidm@moodle.com>
Date: Tue, 13 Nov 2018 15:07:14 +0000 (+0100)
Subject: Merge branch 'MDL-63882-master' of git://github.com/damyon/moodle
X-Git-Tag: v3.6.0-beta~36
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=50d37636b68d46c89dab537b758dee633284ad6a

Merge branch 'MDL-63882-master' of git://github.com/damyon/moodle
---

50d37636b68d46c89dab537b758dee633284ad6a
diff --cc message/externallib.php
index 8cc5d80935a,ce580deb320..d2007782b6c
--- a/message/externallib.php
+++ b/message/externallib.php
@@@ -700,19 -626,15 +700,19 @@@ class core_message_external extends ext
          $context = context_system::instance();
          self::validate_context($context);
  
-         $capability = 'moodle/site:manageallmessaging';
-         if (($USER->id != $userid) && !has_capability($capability, $context)) {
-             throw new required_capability_exception($context, $capability, 'nopermissions', '');
-         }
- 
 -        $params = ['userid' => $userid];
 +        $params = [
 +            'userid' => $userid,
 +            'limitfrom' => $limitfrom,
 +            'limitnum' => $limitnum
 +        ];
          $params = self::validate_parameters(self::get_contact_requests_parameters(), $params);
  
+         $capability = 'moodle/site:manageallmessaging';
+         if (($USER->id != $params['userid']) && !has_capability($capability, $context)) {
+             throw new required_capability_exception($context, $capability, 'nopermissions', '');
+         }
+ 
 -        return \core_message\api::get_contact_requests($params['userid']);
 +        return \core_message\api::get_contact_requests($params['userid'], $params['limitfrom'], $params['limitnum']);
      }
  
      /**