Merge branch 'MDL-53104-master' of git://github.com/lameze/moodle

lang/en/role.php

@@ -81,8 +81,6 @@ $string['badges:viewbadges'] = 'View available badges without earning them';
 $string['badges:viewotherbadges'] = 'View public badges in other users\' profiles';
 $string['block:edit'] = 'Edit a block\'s settings';
 $string['block:view'] = 'View block';
-$string['blog:associatecourse'] = 'This capability is deprecated and does nothing.';
-$string['blog:associatemodule'] = 'This capability is deprecated and does nothing.';
 $string['blog:create'] = 'Create new blog entries';
 $string['blog:manageentries'] = 'Edit and manage entries';
 $string['blog:manageexternal'] = 'Edit and manage external blogs';

lib/db/access.php

@@ -1188,21 +1188,6 @@ $capabilities = array(
         )
     ),
 
-    // TODO: Remove 'moodle/blog:associatecourse' and 'moodle/blog:associatemodule' after a few releases.
-    'moodle/blog:associatecourse' => array(
-
-        'captype' => 'write',
-        'contextlevel' => CONTEXT_COURSE,
-        'archetypes' => array()
-    ),
-
-    'moodle/blog:associatemodule' => array(
-
-        'captype' => 'write',
-        'contextlevel' => CONTEXT_MODULE,
-        'archetypes' => array()
-    ),
-
     'moodle/calendar:manageownentries' => array( // works in CONTEXT_SYSTEM only
 
         'riskbitmask' => RISK_SPAM,

lib/upgrade.txt

@@ -3,6 +3,7 @@ information provided here is intended especially for developers.
 
 === 3.1 ===
 
+* The moodle/blog:associatecourse and moodle/blog:associatemodule capabilities has been removed.
 * The google api library has been updated to version 1.1.7. There was some important changes
   on the SSL handling. Now the SSL version will be determined by the underlying library.
   For more information see https://github.com/google/google-api-php-client/pull/644

version.php

@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2016040500.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2016040501.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.