Merge branch 'wip-mdl-37633-m23' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_23_STABLE
moodle · Feb 12, 2013 · fff248b · fff248b
2 parents 35f7e66 + 37010cc
commit fff248b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/mod/forum/db/access.php b/mod/forum/db/access.php
@@ -341,7 +341,8 @@
         'archetypes' => array(
             'student' => CAP_ALLOW,
             'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW
+            'editingteacher' => CAP_ALLOW,
+            'frontpage' => CAP_ALLOW
         )
     ),
 );

diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php
@@ -53,7 +53,16 @@ function xmldb_forum_upgrade($oldversion) {
     // Moodle v2.3.0 release upgrade line
     // Put any upgrade step following this
 
-
+    // Forcefully assign mod/forum:allowforcesubscribe to frontpage role, as we missed that when
+    // capability was introduced.
+    if ($oldversion < 2012061702) {
+        // If capability mod/forum:allowforcesubscribe is defined then set it for frontpage role.
+        if (get_capability_info('mod/forum:allowforcesubscribe')) {
+            assign_legacy_capabilities('mod/forum:allowforcesubscribe', array('frontpage' => CAP_ALLOW));
+        }
+        // Forum savepoint reached.
+        upgrade_mod_savepoint(true, 2012061702, 'forum');
+    }
     return true;
 }
 

diff --git a/mod/forum/upgrade.txt b/mod/forum/upgrade.txt
@@ -0,0 +1,8 @@
+This files describes API changes in /mod/forum/*,
+information provided here is intended especially for developers.
+
+
+=== 2.3.5 ===
+* mod/forum:allowforcesubscribe capability will be forcefully assigned to frontpage role, as it was mistakenly missed off
+when the capability was initially created. If you don't want users with frontpage role to get forum (with forcesubscribe) emails,
+then please remove this capability for frontpage role.
diff --git a/mod/forum/version.php b/mod/forum/version.php
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$module->version   = 2012061701;       // The current module version (Date: YYYYMMDDXX)
+$module->version   = 2012061702;       // The current module version (Date: YYYYMMDDXX)
 $module->requires  = 2012061700;    // Requires this Moodle version
 $module->component = 'mod_forum';      // Full name of the plugin (used for diagnostics)
 $module->cron      = 60;