MDL-20787 removed mod_icon_url() completely

diff --git a/admin/modules.php b/admin/modules.php
index 371695a2d51efa7f29d7e62a1a35d99d05927066..c6af968d666cd9da96c6b61aff2015c3df205899 100644 (file)
--- a/admin/modules.php
+++ b/admin/modules.php
@@ -129,7 +129,7 @@
     foreach ($modulebyname as $modulename => $module) {
 
         // took out hspace="\10\", because it does not validate. don't know what to replace with.
-        $icon = "<img src=\"" . $OUTPUT->mod_icon_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
+        $icon = "<img src=\"" . $OUTPUT->old_icon_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
 
         $delete = "<a href=\"modules.php?delete=$module->name&amp;sesskey=".sesskey()."\">$strdelete</a>";
 

diff --git a/blocks/activity_modules/block_activity_modules.php b/blocks/activity_modules/block_activity_modules.php
index b3010cbdaae348a1c35da3931b7613a42cb74719..3b8a8206992f1a426765fc8f8180aaf4d82dca2d 100644 (file)
--- a/blocks/activity_modules/block_activity_modules.php
+++ b/blocks/activity_modules/block_activity_modules.php
@@ -54,7 +54,7 @@ class block_activity_modules extends block_list {
                 $this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('f/html') . '" class="icon" alt="" />';
             } else {
                 $this->content->items[] = '<a href="'.$CFG->wwwroot.'/mod/'.$modname.'/index.php?id='.$course->id.'">'.$modfullname.'</a>';
-                $this->content->icons[] = '<img src="'.$OUTPUT->mod_icon_url('icon', $modname) . '" class="icon" alt="" />';
+                $this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('icon', $modname) . '" class="icon" alt="" />';
             }
         }
 

diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php
index 15c3fd7fad15b3559a082ec43131a6009be1b2fb..14d802ad1153526db0c19b9515ee8877f0e7aa5a 100644 (file)
--- a/blocks/site_main_menu/block_site_main_menu.php
+++ b/blocks/site_main_menu/block_site_main_menu.php
@@ -52,7 +52,7 @@ class block_site_main_menu extends block_list {
                         if (!empty($cm->icon)) {
                             $icon = $OUTPUT->old_icon_url($cm->icon);
                         } else {
-                            $icon = $OUTPUT->mod_icon_url('icon', $cm->modname);
+                            $icon = $OUTPUT->old_icon_url('icon', $cm->modname);
                         }
                         $this->content->icons[] = '<img src="'.$icon.'" class="icon" alt="" />';
                     }
@@ -124,7 +124,7 @@ class block_site_main_menu extends block_list {
                     if (!empty($modinfo->cms[$modnumber]->icon)) {
                         $icon = $OUTPUT->old_icon_url($modinfo->cms[$modnumber]->icon);
                     } else {
-                        $icon = $OUTPUT->mod_icon_url('icon', $mod->modname);
+                        $icon = $OUTPUT->old_icon_url('icon', $mod->modname);
                     }
 
                     if ($mod->modname == 'label') {

diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php
index 79aa8a1f12ad200898342c485356115fd65cccac..2ed93ade2a834576f886b38d6e81372681ba4f9d 100644 (file)
--- a/blocks/social_activities/block_social_activities.php
+++ b/blocks/social_activities/block_social_activities.php
@@ -54,7 +54,7 @@ class block_social_activities extends block_list {
                         if (!empty($cm->icon)) {
                             $icon = $OUTPUT->old_icon_url($cm->icon);
                         } else {
-                            $icon = $OUTPUT->mod_icon_url('icon', $cm->modname);
+                            $icon = $OUTPUT->old_icon_url('icon', $cm->modname);
                         }
                         $this->content->icons[] = '<img src="'.$icon.'" class="icon" alt="" />';
                     }
@@ -133,7 +133,7 @@ class block_social_activities extends block_list {
                     if (!empty($modinfo->cms[$modnumber]->icon)) {
                         $icon = $OUTPUT->old_icon_url($modinfo->cms[$modnumber]->icon);
                     } else {
-                        $icon = $OUTPUT->mod_icon_url('icon', $mod->modname);
+                        $icon = $OUTPUT->old_icon_url('icon', $mod->modname);
                     }
 
                     if ($mod->modname == 'label') {

diff --git a/blog/locallib.php b/blog/locallib.php
index 7148579d7a6afd8df609d46e4070190c305e212e..d63df1ebcb5ea0f9bd29be8ebe59e00558416e5e 100644 (file)
--- a/blog/locallib.php
+++ b/blog/locallib.php
@@ -262,7 +262,7 @@ class blog_entry {
 
                     $associcon = new moodle_action_icon();
                     $associcon->link->url = new moodle_url($CFG->wwwroot.'/mod/'.$modname.'/view.php', array('id' => $modinfo->id));
-                    $associcon->image->src = $OUTPUT->mod_icon_url('icon', $modname);
+                    $associcon->image->src = $OUTPUT->old_icon_url('icon', $modname);
                     $associcon->linktext = $DB->get_field($modname, 'name', array('id' => $modinfo->instance));
                     $assocstr .= $OUTPUT->action_icon($associcon);
                     $assocstr .= ', ';

diff --git a/calendar/lib.php b/calendar/lib.php
index 118e19056a916559c51dea2e75724dcb103b463b..15c5756c6ba6cf325409e55ec3dfd30328715055 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -247,7 +247,7 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
                 }
                 $event = $events[$eventid];
                 if(!empty($event->modulename)) {
-                    $popupicon = $OUTPUT->mod_icon_url('icon', $event->modulename) . '';
+                    $popupicon = $OUTPUT->old_icon_url('icon', $event->modulename) . '';
                     $popupalt  = $event->modulename;
 
                 } else if ($event->courseid == SITEID) {                                // Site event
@@ -505,7 +505,7 @@ function calendar_add_event_metadata($event) {
 
         $modulename = get_string('modulename', $event->modulename);
         $eventtype = get_string($event->eventtype, $event->modulename);
-        $icon = $OUTPUT->mod_icon_url('icon', $event->modulename) . '';
+        $icon = $OUTPUT->old_icon_url('icon', $event->modulename) . '';
 
         $event->icon = '<img height="16" width="16" src="'.$icon.'" alt="'.$eventtype.'" title="'.$modulename.'" style="vertical-align: middle;" />';
         $event->referer = '<a href="'.$CFG->wwwroot.'/mod/'.$event->modulename.'/view.php?id='.$module->id.'">'.$event->name.'</a>';

diff --git a/course/modedit.php b/course/modedit.php
index b464229c2b15567863996cd8355d9dcb1d79ca8c..d73366cdb3fb35b55e6adb51d448a11bbee76f87 100644 (file)
--- a/course/modedit.php
+++ b/course/modedit.php
@@ -620,7 +620,7 @@
         $helpicon->page = 'mods';
         $helpicon->text = $pageheading;
         $helpicon->module = $module->name;
-        echo $OUTPUT->heading_with_help($helpicon, $OUTPUT->mod_icon_url('icon', $module->name));
+        echo $OUTPUT->heading_with_help($helpicon, $OUTPUT->old_icon_url('icon', $module->name));
 
         $mform->display();
 

diff --git a/course/recent.php b/course/recent.php
index dc0dc547d6d53ef29bed97503424b4cafee4d8b1..f363199284eba6a7a18b57447c2fdea506c18024 100644 (file)
--- a/course/recent.php
+++ b/course/recent.php
@@ -246,7 +246,7 @@ if (!empty($activities)) {
                 $name        = format_string($cm->name);
                 $modfullname = $modnames[$cm->modname];
 
-                $image = "<img src=\"" . $OUTPUT->mod_icon_url('icon', $cm->modname) . "\" class=\"icon\" alt=\"$modfullname\" />";
+                $image = "<img src=\"" . $OUTPUT->old_icon_url('icon', $cm->modname) . "\" class=\"icon\" alt=\"$modfullname\" />";
                 echo "<h4>$image $modfullname".
                      " <a href=\"$CFG->wwwroot/mod/$cm->modname/view.php?id=$cm->id\" $linkformat>$name</a></h4>";
            }

diff --git a/course/report/outline/index.php b/course/report/outline/index.php
index 802949c24a8a18cdd31d02699bfdb128455a4200..985b25f0945159f0f6302279fb0204d13d9659e2 100644 (file)
--- a/course/report/outline/index.php
+++ b/course/report/outline/index.php
@@ -107,7 +107,7 @@
             $activitycell = new html_table_cell();
             $activitycell->add_class('activity');
 
-            $activityicon = html_image::make($OUTPUT->mod_icon_url('icon', $cm->modname));
+            $activityicon = html_image::make($OUTPUT->old_icon_url('icon', $cm->modname));
             $activityicon->add_class('icon');
             $activityicon->alt = $modulename;
 

diff --git a/course/report/progress/index.php b/course/report/progress/index.php
index 0dde0538e79499722b5c1a3b562f289771bf3afb..8318a60f0eb162c0b92e297c11a01fe59475618f 100644 (file)
--- a/course/report/progress/index.php
+++ b/course/report/progress/index.php
@@ -198,7 +198,7 @@ foreach($activities as $activity) {
         print '<th scope="col" class="'.$activity->datepassedclass.'">'.
             '<a href="'.$CFG->wwwroot.'/mod/'.$activity->modname.
             '/view.php?id='.$activity->id.'">'.
-            '<img src="'.$OUTPUT->mod_icon_url('icon', $activity->modname).'/icon.gif" alt="'.
+            '<img src="'.$OUTPUT->old_icon_url('icon', $activity->modname).'/icon.gif" alt="'.
             get_string('modulename',$activity->modname).'" /> <span class="completion-activityname">'.
             format_string($activity->name).'</span></a>';
         if($activity->completionexpected) {

diff --git a/course/user.php b/course/user.php
index bc89ef044209b07a101c472f55a1836551fc4b85..1293ae27a3a30fea9530b2ecbb00edb34a552ade 100644 (file)
--- a/course/user.php
+++ b/course/user.php
@@ -367,7 +367,7 @@ echo $OUTPUT->footer();
 function print_outline_row($mod, $instance, $result) {
     global $OUTPUT;
 
-    $image = "<img src=\"" . $OUTPUT->mod_icon_url('icon', $mod->modname) . "\" class=\"icon\" alt=\"$mod->modfullname\" />";
+    $image = "<img src=\"" . $OUTPUT->old_icon_url('icon', $mod->modname) . "\" class=\"icon\" alt=\"$mod->modfullname\" />";
 
     echo "<tr>";
     echo "<td valign=\"top\">$image</td>";

diff --git a/grade/lib.php b/grade/lib.php
index 45077255c7ef0d34803d80a85c503fafbf8f0fa3..8453e5a2f474807e4615d35cf07807df06d1cbc2 100644 (file)
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -1245,7 +1245,7 @@ class grade_structure {
 
                 } else if ($element['object']->itemtype == 'mod') {
                     $strmodname = get_string('modulename', $element['object']->itemmodule);
-                    return '<img src="'.$OUTPUT->mod_icon_url('icon',
+                    return '<img src="'.$OUTPUT->old_icon_url('icon',
                             $element['object']->itemmodule) . '" ' .
                             'class="icon itemicon" title="' .s($strmodname).
                             '" alt="' .s($strmodname).'"/>';

diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 38473f7f9227280b700f6925ec4a12487aa9ac38..5cbebc94c62a52fd0f2e4acda2351d45c4226443 100644 (file)
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -1092,7 +1092,7 @@ class global_navigation extends navigation_node {
             $icon = null;
             if (!in_array($module->modname, $resources)) {
                 if ($module->icon=='') {
-                    $icon = $OUTPUT->mod_icon_url('icon', $module->modname);
+                    $icon = $OUTPUT->old_icon_url('icon', $module->modname);
                 }
                 $url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
                 $type = navigation_node::TYPE_ACTIVITY;
@@ -1154,7 +1154,7 @@ class global_navigation extends navigation_node {
             $icon = null;
             if (!in_array($module->modname, $resources)) {
                 if ($module->icon=='') {
-                    $icon = $OUTPUT->mod_icon_url('icon', $module->modname);
+                    $icon = $OUTPUT->old_icon_url('icon', $module->modname);
                 }
                 $url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
                 $type = navigation_node::TYPE_ACTIVITY;
@@ -2026,7 +2026,7 @@ class limited_global_navigation extends global_navigation {
             $icon = null;
             if (!in_array($module->modname, $resources)) {
                 if ($module->icon=='') {
-                    $icon = $OUTPUT->mod_icon_url('icon', $module->modname);
+                    $icon = $OUTPUT->old_icon_url('icon', $module->modname);
                 }
                 $url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
                 $type = navigation_node::TYPE_ACTIVITY;

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 3d751054b4c6dd3487d1739435f5f604c8c09d13..c26c2d98786b3f3c7def08e1698fb9ebc8bfc9af 100644 (file)
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -155,12 +155,6 @@ class renderer_base {
         return $url->out(false, array(), $escaped);
     }
 
-    /** OBSOLETED: to be removed soon */
-    public function mod_icon_url($iconname, $component, $escaped=true) {
-        $url = $this->page->theme->image_url($iconname, $component);
-        return $url->out(false, array(), $escaped);
-    }
-
     /**
      * Return the moodle_url for an image
      *

diff --git a/lib/weblib.php b/lib/weblib.php
index 250a7268f54c91b5c400cd84ca667bd4d3dde4c6..22a0f32d0edd93f1e9c47a0f7e2c98a339a6d31d 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2427,7 +2427,7 @@ function navmenulist($course, $sections, $modinfo, $strsection, $strjumpto, $wid
         $class = 'activity '.$mod->modname;
         $class .= ($cmid == $mod->id) ? ' selected' : '';
         $menu[] = '<li class="'.$class.'">'.
-                  '<img src="'.$OUTPUT->mod_icon_url('icon', $mod->modname) . '" alt="" />'.
+                  '<img src="'.$OUTPUT->old_icon_url('icon', $mod->modname) . '" alt="" />'.
                   '<a href="'.$CFG->wwwroot.'/mod/'.$url.'">'.$mod->name.'</a></li>';
     }
 

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 4dcecfc641dbe950d806a55434f301d6f332628f..151627fbde263dc6550b822ff8d5e2773a119af4 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -2897,7 +2897,7 @@ function assignment_print_recent_mod_activity($activity, $courseid, $detail, $mo
     if ($detail) {
         $modname = $modnames[$activity->type];
         echo '<div class="title">';
-        echo "<img src=\"" . $OUTPUT->mod_icon_url('icon', 'assignment') . "\" ".
+        echo "<img src=\"" . $OUTPUT->old_icon_url('icon', 'assignment') . "\" ".
              "class=\"icon\" alt=\"$modname\">";
         echo "<a href=\"$CFG->wwwroot/mod/assignment/view.php?id={$activity->cmid}\">{$activity->name}</a>";
         echo '</div>';

diff --git a/mod/scorm/datamodels/aicclib.php b/mod/scorm/datamodels/aicclib.php
index e6fd331c92fbd87549fdf90d9a80a6e5c24cc678..da9f954ff4ab659aa183bbc52caee3b0903cf53b 100644 (file)
--- a/mod/scorm/datamodels/aicclib.php
+++ b/mod/scorm/datamodels/aicclib.php
@@ -536,8 +536,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
     $result->toc .= "\t</ul>\n";
     if ($scorm->hidetoc == 0) {
         $result->toc .= $PAGE->requires->data_for_js('scormdata', array(
-                'plusicon' => $OUTPUT->mod_icon_url('pix/plus', 'scorm'),
-                'minusicon' => $OUTPUT->mod_icon_url('pix/minus', 'scorm')))->asap();
+                'plusicon' => $OUTPUT->old_icon_url('pix/plus', 'scorm'),
+                'minusicon' => $OUTPUT->old_icon_url('pix/minus', 'scorm')))->asap();
         $result->toc .= $PAGE->requires->js('lib/cookies.js')->asap();
         $result->toc .= $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js')->asap();
     }

diff --git a/mod/scorm/datamodels/scorm_12lib.php b/mod/scorm/datamodels/scorm_12lib.php
index a852df4701bd3c8c948c7002b7acfd6061fbb433..b84f4f3fe0de49416e4645c5f0dd85307466cd41 100644 (file)
--- a/mod/scorm/datamodels/scorm_12lib.php
+++ b/mod/scorm/datamodels/scorm_12lib.php
@@ -318,8 +318,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
     $result->toc .= "\t</ul>\n";
     if ($scorm->hidetoc == 0) {
         $PAGE->requires->data_for_js('scormdata', array(
-                'plusicon' => $OUTPUT->mod_icon_url('pix/plus', 'scorm'),
-                'minusicon' => $OUTPUT->mod_icon_url('pix/minus', 'scorm')));
+                'plusicon' => $OUTPUT->old_icon_url('pix/plus', 'scorm'),
+                'minusicon' => $OUTPUT->old_icon_url('pix/minus', 'scorm')));
         $PAGE->requires->js('lib/cookies.js');
         $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js');
     }

diff --git a/mod/scorm/datamodels/scorm_13lib.php b/mod/scorm/datamodels/scorm_13lib.php
index bee59a9d9288b2bf87274c2d46a8a7839ddd33b3..bd9ba2218b3ebf3519950ef036272db94ac7da6b 100644 (file)
--- a/mod/scorm/datamodels/scorm_13lib.php
+++ b/mod/scorm/datamodels/scorm_13lib.php
@@ -209,8 +209,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
     $result->toc .= "\t</ul>\n";
     if ($scorm->hidetoc == 0) {
         $PAGE->requires->data_for_js('scormdata', array(
-                'plusicon' => $OUTPUT->mod_icon_url('pix/plus', 'scorm'),
-                'minusicon' => $OUTPUT->mod_icon_url('pix/minus', 'scorm')));
+                'plusicon' => $OUTPUT->old_icon_url('pix/plus', 'scorm'),
+                'minusicon' => $OUTPUT->old_icon_url('pix/minus', 'scorm')));
         $PAGE->requires->js('lib/cookies.js');
         $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js');
     }