Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.938
diff -u -p -r1.938 user.module
--- modules/user/user.module  20 Nov 2008 06:56:17 -0000  1.938
+++ modules/user/user.module  21 Nov 2008 08:08:35 -0000
@@ -1523,7 +1523,14 @@ function user_edit_form(&$form_state, $u
     else {
       $form['picture']['picture_delete'] = array('#type' => 'hidden');
     }
-    $form['picture']['picture_upload'] = array('#type' => 'file', '#title' => t('Upload picture'), '#size' => 48, '#description' => t('Your virtual face or picture. Maximum dimensions are %dimensions and the maximum size is %size kB.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85'), '%size' => variable_get('user_picture_file_size', '30'))) . ' ' . variable_get('user_picture_guidelines', ''));
+
+    $form['picture']['picture_upload'] = array(
+      '#type' => 'file',
+      '#title' => t('Upload picture'),
+      '#size' => 48,
+      '#description' => t(image_get_toolkit() ? 'Your virtual face or picture. Images larger than %dimensions will be resized to these dimensions. The maximum size is %size kB.' : 'Your virtual face or picture. Maximum dimensions are %dimensions and the maximum size is %size kB.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85'), '%size' => variable_get('user_picture_file_size', '30'))) . ' ' . variable_get('user_picture_guidelines', '')
+    );
+
     $form['#validate'][] = 'user_validate_picture';
   }
   $form['#uid'] = $uid;