moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Sara Arjona 2020-12-01 08:00:38 +01:00
commit 0bdfb78bfd
3 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/forum/classes/local/exporters/post.php
View file

@ -106,6 +106,7 @@ class post extends exporter {
'null' => NULL_ALLOWED 'null' => NULL_ALLOWED
], ],
'timecreated' => ['type' => PARAM_INT], 'timecreated' => ['type' => PARAM_INT],
'timemodified' => ['type' => PARAM_INT],
'unread' => [ 'unread' => [
'type' => PARAM_BOOL, 'type' => PARAM_BOOL,
'optional' => true, 'optional' => true,
@ -437,6 +438,7 @@ class post extends exporter {
'hasparent' => $post->has_parent(), 'hasparent' => $post->has_parent(),
'parentid' => $post->has_parent() ? $post->get_parent_id() : null, 'parentid' => $post->has_parent() ? $post->get_parent_id() : null,
'timecreated' => $timecreated, 'timecreated' => $timecreated,
'timemodified' => $post->get_time_modified(),
'unread' => ($loadcontent && $readreceiptcollection) ? !$readreceiptcollection->has_user_read_post($user, $post) : null, 'unread' => ($loadcontent && $readreceiptcollection) ? !$readreceiptcollection->has_user_read_post($user, $post) : null,
'isdeleted' => $isdeleted, 'isdeleted' => $isdeleted,
'isprivatereply' => $isprivatereply, 'isprivatereply' => $isprivatereply,

6
mod/forum/tests/externallib_test.php
View file

@ -685,6 +685,7 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
'parentid' => $discussion1reply2->parent, 'parentid' => $discussion1reply2->parent,
'hasparent' => true, 'hasparent' => true,
'timecreated' => $discussion1reply2->created, 'timecreated' => $discussion1reply2->created,
'timemodified' => $discussion1reply2->modified,
'subject' => $discussion1reply2->subject, 'subject' => $discussion1reply2->subject,
'replysubject' => get_string('re', 'mod_forum') . " {$discussion1reply2->subject}", 'replysubject' => get_string('re', 'mod_forum') . " {$discussion1reply2->subject}",
'message' => $message, 'message' => $message,
@ -742,6 +743,7 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
'parentid' => $discussion1reply1->parent, 'parentid' => $discussion1reply1->parent,
'hasparent' => true, 'hasparent' => true,
'timecreated' => $discussion1reply1->created, 'timecreated' => $discussion1reply1->created,
'timemodified' => $discussion1reply1->modified,
'subject' => $discussion1reply1->subject, 'subject' => $discussion1reply1->subject,
'replysubject' => get_string('re', 'mod_forum') . " {$discussion1reply1->subject}", 'replysubject' => get_string('re', 'mod_forum') . " {$discussion1reply1->subject}",
'message' => $message, 'message' => $message,
@ -2761,6 +2763,7 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
'parentid' => $discussion1reply1->parent, 'parentid' => $discussion1reply1->parent,
'hasparent' => true, 'hasparent' => true,
'timecreated' => $discussion1reply1->created, 'timecreated' => $discussion1reply1->created,
'timemodified' => $discussion1reply1->modified,
'subject' => $discussion1reply1->subject, 'subject' => $discussion1reply1->subject,
'replysubject' => get_string('re', 'mod_forum') . " {$discussion1reply1->subject}", 'replysubject' => get_string('re', 'mod_forum') . " {$discussion1reply1->subject}",
'message' => file_rewrite_pluginfile_urls($discussion1reply1->message, 'pluginfile.php', 'message' => file_rewrite_pluginfile_urls($discussion1reply1->message, 'pluginfile.php',
@ -2825,6 +2828,7 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
'parentid' => null, 'parentid' => null,
'hasparent' => false, 'hasparent' => false,
'timecreated' => $discussion1firstpostobject->created, 'timecreated' => $discussion1firstpostobject->created,
'timemodified' => $discussion1firstpostobject->modified,
'subject' => $discussion1firstpostobject->subject, 'subject' => $discussion1firstpostobject->subject,
'replysubject' => get_string('re', 'mod_forum') . " {$discussion1firstpostobject->subject}", 'replysubject' => get_string('re', 'mod_forum') . " {$discussion1firstpostobject->subject}",
'message' => file_rewrite_pluginfile_urls($discussion1firstpostobject->message, 'pluginfile.php', 'message' => file_rewrite_pluginfile_urls($discussion1firstpostobject->message, 'pluginfile.php',
@ -2900,6 +2904,7 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
'parentid' => $discussion2reply1->parent, 'parentid' => $discussion2reply1->parent,
'hasparent' => true, 'hasparent' => true,
'timecreated' => $discussion2reply1->created, 'timecreated' => $discussion2reply1->created,
'timemodified' => $discussion2reply1->modified,
'subject' => $discussion2reply1->subject, 'subject' => $discussion2reply1->subject,
'replysubject' => get_string('re', 'mod_forum') . " {$discussion2reply1->subject}", 'replysubject' => get_string('re', 'mod_forum') . " {$discussion2reply1->subject}",
'message' => file_rewrite_pluginfile_urls($discussion2reply1->message, 'pluginfile.php', 'message' => file_rewrite_pluginfile_urls($discussion2reply1->message, 'pluginfile.php',
@ -2964,6 +2969,7 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
'parentid' => null, 'parentid' => null,
'hasparent' => false, 'hasparent' => false,
'timecreated' => $discussion2firstpostobject->created, 'timecreated' => $discussion2firstpostobject->created,
'timemodified' => $discussion2firstpostobject->modified,
'subject' => $discussion2firstpostobject->subject, 'subject' => $discussion2firstpostobject->subject,
'replysubject' => get_string('re', 'mod_forum') . " {$discussion2firstpostobject->subject}", 'replysubject' => get_string('re', 'mod_forum') . " {$discussion2firstpostobject->subject}",
'message' => file_rewrite_pluginfile_urls($discussion2firstpostobject->message, 'pluginfile.php', 'message' => file_rewrite_pluginfile_urls($discussion2firstpostobject->message, 'pluginfile.php',

8
mod/forum/upgrade.txt
View file

@ -1,6 +1,14 @@
This files describes API changes in /mod/forum/*, This files describes API changes in /mod/forum/*,
information provided here is intended especially for developers. information provided here is intended especially for developers.
=== 3.11 ===
* The forum post exporter now includes a "timemodified" field for each post, which is included in several WS methods:
* mod_forum_get_discussion_posts
* get_discussion_posts_by_userid
* get_discussion_post
* add_discussion_post
=== 3.10 === === 3.10 ===
* Changes in external function mod_forum_external::get_discussion_posts_by_userid * Changes in external function mod_forum_external::get_discussion_posts_by_userid