Merge branch 'MDL-36755_master' of git://github.com/markn86/moodle in…

…to MOODLE_24_STABLE Conflicts: blocks/course_overview/version.php
moodle · Dec 10, 2012 · c125bb5 · c125bb5
2 parents 4ac455d + 7428077
commit c125bb5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/blocks/course_overview/db/access.php b/blocks/course_overview/db/access.php
@@ -34,18 +34,5 @@
         ),
 
         'clonepermissionsfrom' => 'moodle/my:manageblocks'
-    ),
+    )
-
-    'block/course_overview:addinstance' => array(
-        'riskbitmask' => RISK_SPAM | RISK_XSS,
-
-        'captype' => 'write',
-        'contextlevel' => CONTEXT_BLOCK,
-        'archetypes' => array(
-            'editingteacher' => CAP_ALLOW,
-            'manager' => CAP_ALLOW
-        ),
-
-        'clonepermissionsfrom' => 'moodle/site:manageblocks'
-    ),
 );
diff --git a/blocks/course_overview/lang/en/block_course_overview.php b/blocks/course_overview/lang/en/block_course_overview.php
@@ -27,7 +27,6 @@
 $string['collapseall'] = 'Collapse All Course Lists';
 $string['configotherexpanded'] = 'If enabled, Other Courses will be expanded by default unless overriden by user preferences.';
 $string['configpreservestates'] = 'If enabled, the collapsed/expanded states set by the user are stored and used on each load.';
-$string['course_overview:addinstance'] = 'Add a new course overview block';
 $string['course_overview:myaddinstance'] = 'Add a new course overview block to the My Moodle page';
 $string['defaultmaxcourses'] = 'Default maximum courses';
 $string['defaultmaxcoursesdesc'] = 'Maximum courses which should be displayed on course overview block, 0 will show all courses';

diff --git a/blocks/course_overview/version.php b/blocks/course_overview/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012112900;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->version   = 2012121000;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2012112900;        // Requires this Moodle version
+$plugin->requires  = 2012121000;        // Requires this Moodle version
-$plugin->component = 'block_course_overview'; // Full name of the plugin (used for diagnostics)
+$plugin->component = 'block_course_overview'; // Full name of the plugin (used for diagnostics)