From: skodak <skodak>
Date: Tue, 13 Feb 2007 19:53:09 +0000 (+0000)
Subject: MDL-8460 Notice in resource/type/text class revisited
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1bd86308747fdc8c096e4dcbcc1a8c4c7e74b647;p=moodle.git

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 2cba138013..466552e490 100644
--- 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 1e192ab581..e297ddf442 100644
--- 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 e095469378..d851076743 100644
--- 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 = '';