From b059eaeb704ce466e49e3dfbcc1bc74ed5097cb5 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 29 Jul 2010 01:39:32 +0000
Subject: [PATCH] - Patch #27234 by Steve Dondley, rfay, drewish, maartenvg:
 maximum picture size help text in profile no longer needed.

---
 modules/user/user.admin.inc | 4 ++--
 modules/user/user.module    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 9050160548f..1e017cdf879 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -395,7 +395,7 @@ function user_admin_settings() {
     '#size' => 10,
     '#maxlength' => 10,
     '#field_suffix' => ' ' . t('pixels'),
-    '#description' => t('Maximum allowed dimensions for uploaded pictures.'),
+    '#description' => t('Pictures larger than this will be scaled down to this size.'),
   );
   $form['personalization']['pictures']['user_picture_file_size'] = array(
     '#type' => 'textfield',
@@ -404,7 +404,7 @@ function user_admin_settings() {
     '#size' => 10,
     '#maxlength' => 10,
     '#field_suffix' => ' ' . t('KB'),
-    '#description' => t('Maximum allowed file size for uploaded pictures.'),
+    '#description' => t('Maximum allowed file size for uploaded pictures. Upload size is normally limited only by the PHP maximum post and file upload settings, and images are automatically scaled down to the dimensions specified above.'),
   );
   $form['personalization']['pictures']['user_picture_guidelines'] = array(
     '#type' => 'textarea',
diff --git a/modules/user/user.module b/modules/user/user.module
index 8e5e8f8d604..ef2b4b37431 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1113,7 +1113,7 @@ function user_account_form(&$form, &$form_state) {
     '#type' => 'file',
     '#title' => t('Upload picture'),
     '#size' => 48,
-    '#description' => t('Your virtual face or picture. Maximum dimensions are %dimensions pixels and the maximum size is %size kB.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85'), '%size' => variable_get('user_picture_file_size', '30'))) . ' ' . filter_xss_admin(variable_get('user_picture_guidelines', '')),
+    '#description' => t('Your virtual face or picture. Pictures larger than @dimensions pixels will be scaled down.', array('@dimensions' => variable_get('user_picture_dimensions', '85x85'))) . ' ' . filter_xss_admin(variable_get('user_picture_guidelines', '')),
   );
   $form['#validate'][] = 'user_validate_picture';
 }