Merge branch 'MDL-38230' of git://github.com/jmvedrine/moodle

rudivdme · Aug 5, 2015 · f72a201 · f72a201
2 parents b167057 + a001c11
commit f72a201
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/mod/quiz/classes/plugininfo/quizaccess.php b/mod/quiz/classes/plugininfo/quizaccess.php
@@ -30,6 +30,7 @@
 
 class quizaccess extends base {
     public function is_uninstall_allowed() {
-        return false;
+        // Only allow uninstall of non-core access rules.
+        return !$this->is_standard();
     }
 }
diff --git a/mod/quiz/version.php b/mod/quiz/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2015051100;
+$plugin->version   = 2015072900;
 $plugin->requires  = 2015050500;
 $plugin->component = 'mod_quiz';
 $plugin->cron      = 60;