MDL-16221

The height and width are now included in the user's image.

diff --git a/lib/weblib.php b/lib/weblib.php
index bc3eb81420dc9c61280727f2b347c502af44983c..e7befa8a013cce15e996edbe8c2398849f379017 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1,5 +1,6 @@
 <?php // $Id$
 
+
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
 // NOTICE OF COPYRIGHT                                                   //
@@ -33,7 +34,11 @@
  * - datalib.php - functions that access the database.
  * - moodlelib.php - general-purpose Moodle functions.
  * @author Martin Dougiamas
+<<<<<<< weblib.php
+ * @version  $Id$
+=======
  * @version  $Id$
+>>>>>>> 1.970.2.107
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  * @package moodlecore
  */
@@ -4372,7 +4377,7 @@ function print_user_picture($user, $courseid, $picture=NULL, $size=0, $return=fa
         }
     }
 
-    $output .= '<img class="'.$class.'" src="'.$src.'" alt="'.s($imagealt).'" />';
+    $output .= "<img class=\"$class\" src=\"$src\" height=\"$size\" width=\"$size\" alt=\"".s($imagealt).'"  />';
     if ($link) {
         $output .= '</a>';
     }