? .project
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.96
diff -u -p -r1.96 user.admin.inc
--- modules/user/user.admin.inc	14 Jan 2010 04:04:30 -0000	1.96
+++ modules/user/user.admin.inc	16 Jan 2010 09:55:10 -0000
@@ -389,14 +389,28 @@ function user_admin_settings() {
       '#description' => t('The style selected will be used on display, while the original image is retained. Styles may be configured in the <a href="!url">Image styles</a> administration area.', array('!url' => url('admin/config/media/image-styles'))),
     );
   }
+  $user_picture_dimensions = explode('x', variable_get('user_picture_dimensions', '85x85')) + array('', '');
   $form['personalization']['pictures']['user_picture_dimensions'] = array(
-    '#type' => 'textfield',
     '#title' => t('Picture upload dimensions'),
-    '#default_value' => variable_get('user_picture_dimensions', '85x85'),
-    '#size' => 10,
-    '#maxlength' => 10,
+    '#element_validate' => array('_image_field_resolution_validate'),
+    '#theme_wrappers' => array('form_element'),
+    '#description' => t('Maximum allowed dimensions for uploaded pictures as WIDTHxHEIGHT (e.g. 85x85).'),
+  );
+  $form['personalization']['pictures']['user_picture_dimensions']['x'] = array(
+    '#type' => 'textfield',
+    '#default_value' => $user_picture_dimensions[0],
+    '#size' => 5,
+    '#maxlength' => 5,
+    '#field_suffix' => ' x ',
+    '#theme_wrappers' => array(),
+  );
+  $form['personalization']['pictures']['user_picture_dimensions']['y'] = array(
+    '#type' => 'textfield',
+    '#default_value' => $user_picture_dimensions[1],
+    '#size' => 5,
+    '#maxlength' => 5,
     '#field_suffix' => ' ' . t('pixels'),
-    '#description' => t('Maximum allowed dimensions for uploaded pictures.'),
+    '#theme_wrappers' => array(),
   );
   $form['personalization']['pictures']['user_picture_file_size'] = array(
     '#type' => 'textfield',