MDL-19690 - 4 more $CFG->pixpath to $OUTPUT->old_icon_url

diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index a39433f5ab8614677315ba946e36cb5d8cec471e..2b8a8e08e2d63a42f0178a64be48dc6561375e38 100644 (file)
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -151,7 +151,7 @@ foreach ($columns as $column) {
     } else {
         $columndir = $dir == "ASC" ? "DESC" : "ASC";
         $columnicon = $dir == "ASC" ? "down" : "up";
-        $columnicon = " <img src=\"$CFG->pixpath/t/$columnicon.gif\" alt=\"\" />";
+        $columnicon = " <img src=\"" . $OUTPUT->old_icon_url('t/' . $columnicon) . "\" alt=\"\" />";
     }
     $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
 }

diff --git a/admin/report/configlog/index.php b/admin/report/configlog/index.php
index 9f630d9ae85c1b5bcaf512875b844b7ca797e305..ee567dea8f196a466ee6394b77e1e3baa593183e 100644 (file)
--- a/admin/report/configlog/index.php
+++ b/admin/report/configlog/index.php
@@ -46,7 +46,7 @@ foreach ($columns as $column=>$strcolumn) {
         } else {
             $columnicon = $dir == 'ASC' ? 'down':'up';
         }
-        $columnicon = " <img src=\"$CFG->pixpath/t/$columnicon.gif\" alt=\"\" />";
+        $columnicon = " <img src=\"" . $OUTPUT->old_icon_url('t/' . $columnicon) . "\" alt=\"\" />";
 
     }
     $hcolumns[$column] = "<a href=\"index.php?sort=$column&amp;dir=$columndir&amp;page=$page&amp;perpage=$perpage\">".$strcolumn."</a>$columnicon";

diff --git a/admin/user.php b/admin/user.php
index ca37610b0129d49bede125bf6708b01e53d2cc84..f42ff6847ffda1664cebd474bc3cff756db14384 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -140,7 +140,7 @@
             } else {
                 $columnicon = $dir == "ASC" ? "down":"up";
             }
-            $columnicon = " <img src=\"$CFG->pixpath/t/$columnicon.gif\" alt=\"\" />";
+            $columnicon = " <img src=\"" . $OUTPUT->old_icon_url('t/' . $columnicon) . "\" alt=\"\" />";
 
         }
         $$column = "<a href=\"user.php?sort=$column&amp;dir=$columndir\">".$string[$column]."</a>$columnicon";

diff --git a/lib/weblib.php b/lib/weblib.php
index e9ec3324ee41a28e5b8d3acda58f96920a99d244..98c36c8f2d5d7ff45bf1c31ea93bd82f61342432 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -3267,7 +3267,7 @@ function print_file_picture($path, $courseid=0, $height='', $width='', $link='',
  * @return string|void String or nothing, depending on $return.
  */
 function print_user_picture($user, $courseid, $picture=NULL, $size=0, $return=false, $link=true, $target='', $alttext=true) {
-    global $CFG, $DB;
+    global $CFG, $DB, $OUTPUT;
 
     $needrec = false;
     // only touch the DB if we are missing data...
@@ -3332,7 +3332,7 @@ function print_user_picture($user, $courseid, $picture=NULL, $size=0, $return=fa
         $src = get_file_url($user->id.'/'.$file.'.jpg', null, 'user');
     } else {         // Print default user pictures (use theme version if available)
         $class .= " defaultuserpic";
-        $src =  "$CFG->pixpath/u/$file.png";
+        $src =  $OUTPUT->old_icon_url('u/' . $file);
     }
     $imagealt = '';
     if ($alttext) {