MDL-8460 Notice in resource/type/text class revisited

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index 2cba138013dd71c6ff610c978054749b2ae49514..466552e490c1ac4cf752c9b33027b0170a50b56b 100644 (file)
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -151,10 +151,10 @@ function _postprocess(&$resource) {
         $resource->options = '';
 
     } else {
-        if ($resource->framepage) {
-            $resource->options = 'frame';
-        } else {
+        if (empty($resource->framepage)) {
             $resource->options = '';
+        } else {
+            $resource->options = 'frame';
         }
         unset($resource->framepage);
         $resource->popup = '';

diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
index 1e192ab581b6e3d984b870481db8b464f1e977bd..e297ddf442bfd2553ab38e2e0c18771ceeac8760 100644 (file)
--- a/mod/resource/type/html/resource.class.php
+++ b/mod/resource/type/html/resource.class.php
@@ -33,10 +33,10 @@ function _postprocess(&$resource) {
         $resource->options = '';
 
     } else {
-        if ($resource->blockdisplay) {
-            $resource->options = 'showblocks';
-        } else {
+        if (empty($resource->blockdisplay)) {
             $resource->options = '';
+        } else {
+            $resource->options = 'showblocks';
         }
         unset($resource->blockdisplay);
         $resource->popup = '';

diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php
index e09546937893573cd3c87e6c82d23452868cf7db..d851076743180c4c953c1c687816ba7ec9c24b12 100644 (file)
--- a/mod/resource/type/repository/resource.class.php
+++ b/mod/resource/type/repository/resource.class.php
@@ -156,10 +156,10 @@ function _postprocess(&$resource) {
         $resource->options = '';
 
     } else {
-        if ($resource->framepage) {
-            $resource->options = 'frame';
-        } else {
+        if (empty($resource->framepage)) {
             $resource->options = '';
+        } else {
+            $resource->options = 'frame';
         }
         unset($resource->framepage);
         $resource->popup = '';