MDL-19690 fix some breakage.

diff --git a/course/lib.php b/course/lib.php
index cc6f7b20cbcb0ec1c9d0d5124e314855f9507d65..98897e95bbe7f663966a39d07d03a69e1f30995a 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1333,9 +1333,9 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
                 if (!empty($customicon)) {
                     if (substr($customicon, 0, 4) === 'mod/') {
                         list($modname, $iconname) = explode('/', substr($customicon, 4), 2);
-                        $icon = $OUTPUT->mod_icon_url($iconname, $modname);
+                        $icon = $OUTPUT->mod_icon_url(str_replace(array('.gif', '.png'), '', $iconname), $modname);
                     } else {
-                        $icon = $OUTPUT->old_icon_url($customicon);
+                        $icon = $OUTPUT->old_icon_url(str_replace(array('.gif', '.png'), '', $customicon));
                     }
                 } else {
                     $icon = "" . $OUTPUT->mod_icon_url('icon', $mod->modname) . "";

diff --git a/files/index.php b/files/index.php
index 96e1c4b0908b52ee8c2e93660dfceb8b0806c7fa..0ebb046dfb25ce08736aa5dfd2cdefa07c359f3c 100644 (file)
--- a/files/index.php
+++ b/files/index.php
@@ -207,7 +207,7 @@ function print_cell($alignment='center', $text=' ', $class='') {
 }
 
 function displaydir($file_info) {
-    global $CFG;
+    global $CFG, $OUTPUT;
 
     $children = $file_info->get_children();
     $parent_info = $file_info->get_parent();

diff --git a/question/category_class.php b/question/category_class.php
index 5bfca76f2432933f9e4efcd5e3f611c7e40e9b7f..95275559fa73446aaea879925c1470ba40546c89 100644 (file)
--- a/question/category_class.php
+++ b/question/category_class.php
@@ -84,8 +84,7 @@ class question_category_list_item extends list_item {
         }
     }
     public function item_html($extraargs = array()){
-        global $CFG;
-        $pixpath = $CFG->pixpath;
+        global $CFG, $OUTPUT;
         $str = $extraargs['str'];
         $category = $this->item;
 
@@ -101,7 +100,7 @@ class question_category_list_item extends list_item {
 
         if (count($this->parentlist->records)!=1){ // don't allow delete if this is the last category in this context.
             $item .=  '<a title="' . $str->delete . '" href="'.$this->parentlist->pageurl->out_action(array('delete'=>$this->id)).'">
-                    <img src="' . $pixpath . '/t/delete.gif" class="iconsmall" alt="' .$str->delete. '" /></a>';
+                    <img src="' . $OUTPUT->old_icon_url('t/delete.gif') . '" class="iconsmall" alt="' .$str->delete. '" /></a>';
         }
 
         return $item;
@@ -118,7 +117,6 @@ class question_category_list_item extends list_item {
 class question_category_object {
 
     var $str;
-    var $pixpath;
     /**
      * Nested lists to display categories.
      *
@@ -173,7 +171,6 @@ class question_category_object {
         $this->str->cancel         = get_string('cancel');
         $this->str->editcategories = get_string('editcategories', 'quiz');
         $this->str->page           = get_string('page');
-        $this->pixpath = $CFG->pixpath;
 
         $this->pageurl = $pageurl;