From 3f6e42b6111b45ab4cf7f6b3762fe8dea1f49b95 Mon Sep 17 00:00:00 2001
From: David Monllao <david.monllao@gmail.com>
Date: Tue, 18 Jul 2017 12:12:35 +0200
Subject: [PATCH] MDL-59460 mod_forum: Ensure CFG->forum_subscription is set

---
 mod/forum/lib.php      | 2 +-
 mod/forum/mod_form.php | 9 +++++++--
 mod/forum/settings.php | 2 +-
 version.php            | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 784ad18c7dd..929af39ac1e 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -6813,7 +6813,7 @@ function forum_get_view_actions() {
  *
  * @return array
  */
-function forum_get_subscriptionmode_opions() {
+function forum_get_subscriptionmode_options() {
     $options = array();
     $options[FORUM_CHOOSESUBSCRIBE] = get_string('subscriptionoptional', 'forum');
     $options[FORUM_FORCESUBSCRIBE] = get_string('subscriptionforced', 'forum');
diff --git a/mod/forum/mod_form.php b/mod/forum/mod_form.php
index 31f95032a00..decea410987 100644
--- a/mod/forum/mod_form.php
+++ b/mod/forum/mod_form.php
@@ -90,10 +90,15 @@ class mod_forum_mod_form extends moodleform_mod {
         // Subscription and tracking.
         $mform->addElement('header', 'subscriptionandtrackinghdr', get_string('subscriptionandtracking', 'forum'));
 
-        $options = forum_get_subscriptionmode_opions();
+        $options = forum_get_subscriptionmode_options();
         $mform->addElement('select', 'forcesubscribe', get_string('subscriptionmode', 'forum'), $options);
         $mform->addHelpButton('forcesubscribe', 'subscriptionmode', 'forum');
-        $mform->setDefault('forcesubscribe', $CFG->forum_subscription);
+        if (isset($CFG->forum_subscription)) {
+            $defaultforumsubscription = $CFG->forum_subscription;
+        } else {
+            $defaultforumsubscription = FORUM_CHOOSESUBSCRIBE;
+        }
+        $mform->setDefault('forcesubscribe', $defaultforumsubscription);
 
         $options = array();
         $options[FORUM_TRACKING_OPTIONAL] = get_string('trackingoptional', 'forum');
diff --git a/mod/forum/settings.php b/mod/forum/settings.php
index f26dae07fda..6551c73b401 100644
--- a/mod/forum/settings.php
+++ b/mod/forum/settings.php
@@ -55,7 +55,7 @@ if ($ADMIN->fulltree) {
                        get_string('configmaxattachments', 'forum'), 9, PARAM_INT));
 
     // Default Subscription mode setting.
-    $options = forum_get_subscriptionmode_opions();
+    $options = forum_get_subscriptionmode_options();
     $settings->add(new admin_setting_configselect('forum_subscription', get_string('subscriptionmode', 'forum'),
         get_string('configsubscriptiontype', 'forum'), FORUM_CHOOSESUBSCRIBE, $options));
 
diff --git a/version.php b/version.php
index e5be2188aa5..ab6daa3936a 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2017071400.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2017071400.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.