fixed - unable to disable blocks; merged from MOODLE_16_STABLE

diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
index 35ce2bb22724a56ca8f093516e021574cd66f992..cc4b441286c2fe8d0dca43ce98daade1c277338f 100644 (file)
--- a/mod/resource/type/html/resource.class.php
+++ b/mod/resource/type/html/resource.class.php
@@ -32,6 +32,8 @@ function add_instance($resource) {
 
     if (isset($resource->blockdisplay)) {
         $resource->options = 'showblocks';
+    } else {
+        $resource->options = '';
     }
 
     if (isset($resource->parametersettingspref)) {
@@ -70,6 +72,8 @@ function update_instance($resource) {
 
     if (isset($resource->blockdisplay)) {
         $resource->options = 'showblocks';
+    } else {
+        $resource->options = '';
     }
 
     if (isset($resource->parametersettingspref)) {