mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-21 01:48:45 +01:00
Code Issues Projects Releases Wiki Activity

Added a check for isset($this->resource->reference) to prevent warnings in resource_ims

Browse Source 
Added a check for is_object($item) to prevent warnings in ims_generate_toc
Restored use of textlib in ims_generate_toc
This commit is contained in:
wildgirl 2006-04-20 06:51:55 +00:00
parent 8c9814f9d8
commit 676fb87edc
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mod/resource/type/ims/resource.class.php
View File

@ -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) {