? .DS_Store
? .cache
? .git
? .project
? .settings
? empty
? hook_file_6.patch
? logs
? includes/tests/file.test
? sites/all/modules
? sites/default/files
? sites/default/settings.php
? sites/default/test
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.919
diff -u -p -r1.919 user.module
--- modules/user/user.module	8 Sep 2008 15:44:57 -0000	1.919
+++ modules/user/user.module	9 Sep 2008 02:28:47 -0000
@@ -1504,7 +1504,7 @@ 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;