MDL-19690 - Eliminate all remaining $CFG->modpixpath apart from mod/scorm

diff --git a/course/lib.php b/course/lib.php
index d193e7b90394600d3e08f792816b516c8c69d3bb..cc6f7b20cbcb0ec1c9d0d5124e314855f9507d65 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1332,9 +1332,10 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
                 $customicon = $modinfo->cms[$modnumber]->icon;
                 if (!empty($customicon)) {
                     if (substr($customicon, 0, 4) === 'mod/') {
-                        $icon = "$CFG->modpixpath/".substr($customicon, 4);
+                        list($modname, $iconname) = explode('/', substr($customicon, 4), 2);
+                        $icon = $OUTPUT->mod_icon_url($iconname, $modname);
                     } else {
-                        $icon = "$CFG->pixpath/".$customicon;
+                        $icon = $OUTPUT->old_icon_url($customicon);
                     }
                 } else {
                     $icon = "" . $OUTPUT->mod_icon_url('icon', $mod->modname) . "";

diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php
index 4297db1e2efe144673a33583da3229931f3291ac..56a034398118284e8b0d534dbf04bc47616f6a7b 100644 (file)
--- a/lib/ajax/ajaxlib.php
+++ b/lib/ajax/ajaxlib.php
@@ -41,7 +41,6 @@ function setup_core_javascript(page_requirements_manager $requires) {
     $config = array(
         'wwwroot' => $CFG->httpswwwroot, // Yes, really. See above.
         'pixpath' => $CFG->pixpath,
-        'modpixpath' => $CFG->modpixpath,
         'sesskey' => sesskey(),
     );
     if (debugging('', DEBUG_DEVELOPER)) {

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 36027e0e4a7d12f3598ef1f247086e1d273155cf..fd5608712945fd240213d7312a8015deaec156ed 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -429,10 +429,10 @@ class data_field_base {     // Base class for Database Field Types (see field/*/
      * @return string
      */
     function image() {
-        global $CFG;
+        global $OUTPUT;
 
         $str = '<a href="field.php?d='.$this->data->id.'&amp;fid='.$this->field->id.'&amp;mode=display&amp;sesskey='.sesskey().'">';
-        $str .= '<img src="'.$CFG->modpixpath.'/data/field/'.$this->type.'/icon.gif" ';
+        $str .= '<img src="'.$OUTPUT->mod_icon_url('/field/' . $this->type . '/icon', 'data') . '" ';
         $str .= 'height="'.$this->iconheight.'" width="'.$this->iconwidth.'" alt="'.$this->type.'" title="'.$this->type.'" /></a>';
         return $str;
     }