From: wildgirl <wildgirl>
Date: Thu, 20 Apr 2006 06:51:55 +0000 (+0000)
Subject: Added a check for isset($this->resource->reference) to prevent warnings in resource_ims
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=676fb87edccc35ec4292538998680e38041be955;p=moodle.git

Added a check for isset($this->resource->reference) to prevent warnings in resource_ims
Added a check for is_object($item) to prevent warnings in ims_generate_toc
Restored use of textlib in ims_generate_toc
---

diff --git a/mod/resource/type/ims/resource.class.php b/mod/resource/type/ims/resource.class.php
index 0d516c876c..2ebcebc60e 100644
--- a/mod/resource/type/ims/resource.class.php
+++ b/mod/resource/type/ims/resource.class.php
@@ -64,14 +64,19 @@ class resource_ims extends resource_base {
             $this->parameters->skipsubmenus = 1;
         }
         
+        //echo "<pre>"; print_r($this->resource); echo "</pre>";
+        
     /// Is it in the repository material or not?
-        $file = $this->resource->reference;
-        if ($file[0] == '#') {
-            $this->isrepository = true;
-            $file = ltrim($file, '#');
-            $this->resource->reference = $file;
-        }
-        else {
+        if (isset($this->resource->reference)) {
+            $file = $this->resource->reference;
+            if ($file[0] == '#') {
+                $this->isrepository = true;
+                $file = ltrim($file, '#');
+                $this->resource->reference = $file;
+            } else {
+                $this->isrepository = false;
+            }
+        } else {
             $this->isrepository = false;
         }
     }
@@ -803,10 +808,13 @@ class resource_ims extends resource_base {
         $currorder = 0;
         $endlevel  = 0;
         foreach ($items as $item) {
+            if (!is_object($item)) {
+                continue;
+            }
         /// Convert text from UTF-8 to current charset if needed
             if (empty($CFG->unicodedb)) {
-////                $textlib = textlib_get_instance();
-////                $item->title = $textlib->convert($item->title, 'UTF-8', current_charset());
+                $textlib = textlib_get_instance();
+                $item->title = $textlib->convert($item->title, 'UTF-8', current_charset());
             }
         /// Skip pages until we arrive to $page
             if ($item->id < $page) {