Merge branch 'MDL-63945_master' of git://github.com/markn86/moodle

message/externallib.php

@@ -1051,6 +1051,7 @@ class core_message_external extends external_api {
             'showonlinestatus' => new external_value(PARAM_BOOL, 'Show the user\'s online status?'),
             'isblocked' => new external_value(PARAM_BOOL, 'If the user has been blocked'),
             'iscontact' => new external_value(PARAM_BOOL, 'Is the user a contact?'),
+            'isdeleted' => new external_value(PARAM_BOOL, 'Is the user deleted?'),
             'canmessage' => new external_value(PARAM_BOOL, 'If the user can be messaged'),
             'requirescontact' => new external_value(PARAM_BOOL, 'If the user requires to be contacts'),
         ];

message/tests/api_test.php

@@ -1089,6 +1089,7 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
                 $this->assertObjectHasAttribute('showonlinestatus', $member);
                 $this->assertObjectHasAttribute('isblocked', $member);
                 $this->assertObjectHasAttribute('iscontact', $member);
+                $this->assertObjectHasAttribute('isdeleted', $member);
                 $this->assertObjectHasAttribute('canmessage', $member);
                 $this->assertObjectHasAttribute('requirescontact', $member);
                 $this->assertObjectHasAttribute('contactrequests', $member);

message/tests/externallib_test.php

@@ -4812,6 +4812,7 @@ class core_message_externallib_testcase extends externallib_advanced_testcase {
                 $this->assertArrayHasKey('showonlinestatus', $member);
                 $this->assertArrayHasKey('isblocked', $member);
                 $this->assertArrayHasKey('iscontact', $member);
+                $this->assertArrayHasKey('isdeleted', $member);
                 $this->assertArrayHasKey('canmessage', $member);
                 $this->assertArrayHasKey('requirescontact', $member);
                 $this->assertArrayHasKey('contactrequests', $member);