Merge branch 'MDL-64656-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 11 Apr 2019 18:12:13 +0000 (20:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 11 Apr 2019 18:12:13 +0000 (20:12 +0200)
1  2 
course/externallib.php
lib/db/services.php
mod/forum/externallib.php
mod/forum/tests/externallib_test.php
mod/forum/upgrade.txt
version.php

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -9,8 -9,7 +9,8 @@@ information provided here is intended e
    * The get_forum_discussion_posts web service has been deprecated in favour of get_discussion_posts.
    * The forum_count_replies function has been deprecated in favour of get_reply_count_for_post_id_in_discussion_id in
      the Post vault.
-   * External function get_forums_by_courses now returns two additional fields "duedate" and "cutoffdate" containing the due date and the cutoff date
-     for posting to the forums respectively.
++  * External function get_forums_by_courses now returns two additional fields "duedate" and "cutoffdate" containing the due date and the cutoff date for posting to the forums respectively.
+   * External function get_forum_discussion_posts now returns an additional field "tags" returning the post tags.
  
  === 3.6 ===
  
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2019041000.03;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2019040600.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2019041000.04;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.