Index: imagecache_profiles.info
===================================================================
--- imagecache_profiles.info	(revision 79)
+++ imagecache_profiles.info	(working copy)
@@ -1,8 +1,9 @@
 ; $Id: imagecache_profiles.info,v 1.1 2007/12/27 14:57:34 v1nce Exp $
 name = Imagecache Profile Pictures
 description = Utilizes imagecache presets for user profile pictures.
-package = Image
-dependencies = imagecache
+package = ImageCache
+dependencies[] = imagecache
+core = 6.x
 ; Information added by drupal.org packaging script on 2008-06-18
 version = "5.x-1.4"
 project = "imagecache_profiles"
Index: imagecache_profiles.module
===================================================================
--- imagecache_profiles.module	(revision 79)
+++ imagecache_profiles.module	(working copy)
@@ -40,7 +40,7 @@
     }
 
     if ($account->picture && file_exists($account->picture)) {
-      $alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous'))));
+      $alt = t("!user's picture", array('!user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous'))));
       if (isset($size)) {
         $picture = theme('imagecache', $size, $account->picture, $alt, $alt);
       } else {
@@ -57,7 +57,7 @@
 
     if (isset($picture)) {
       if (!empty($account->uid) && user_access('access user profiles')) {
-        $picture = l($picture, "user/$account->uid", array('title' => t('View user profile.')), NULL, NULL, FALSE, TRUE);
+        $picture = l($picture, "user/$account->uid", array('title' => t('View user profile.'), 'html' => TRUE));
       }
 
       return '<div class="picture">'. $picture .'</div>';
@@ -68,11 +68,11 @@
 /**
  * Implementation of hook_form_alter().
  */
-function imagecache_profiles_form_alter($form_id, &$form) {
+function imagecache_profiles_form_alter(&$form, &$form_state, $form_id) {
   switch($form_id) {
-    case 'user_edit':
-      $form['#validate']['imagecache_profiles_user_edit_validate'] = array();
-      $form['#submit']['imagecache_profiles_user_edit_submit'] = array();
+    case 'user_profile_form':
+      $form['#validate'][] = 'imagecache_profiles_user_edit_validate';
+      $form['#submit'][] = 'imagecache_profiles_user_edit_submit';
       break;
     case 'user_admin_settings':
       // Load imagecache presets
@@ -116,7 +116,7 @@
         '#description' => t('Minimum height dimension for picture, in pixels.'),
         '#size' => 10,
       );
-      $form['#submit']['imagecache_profiles_user_admin_settings_submit'] = array();
+      $form['#submit'][] = 'imagecache_profiles_user_admin_settings_submit';
       break;
   }
 }
@@ -124,10 +124,10 @@
 /**
  * Additional form validation for the user_edit form
  */
-function imagecache_profiles_user_edit_validate($form_id, $form_values) {
+function imagecache_profiles_user_edit_validate($form, &$form_state) {
   // Add a minimum size requirement to the image upload form
-  if ($info = file_check_upload('picture_upload')) {
-    $image_info = image_get_info($form_values['picture']);
+  if ($info = file_save_upload('picture_upload')) {
+    $image_info = image_get_info($form_state['values']['picture']);
     if ($image_info['width'] < variable_get('user_picture_imagecache_profiles_min_width', 0) || $image_info['height'] < variable_get('user_picture_imagecache_profiles_min_height', 0)) {
       form_set_error('picture_upload',t('The image must be at least @min_user_picture_width pixels wide and @min_user_picture_height pixels tall (your image was @width x @height pixels).',array('@min_user_picture_width' => check_plain(variable_get('user_picture_imagecache_profiles_min_width', 0)), '@min_user_picture_height' => check_plain(variable_get('user_picture_imagecache_profiles_min_height', 0)), '@width' => $image_info['width'], '@height' => $image_info['height'])));
     }
@@ -137,38 +137,38 @@
 /**
  * Check for new or deleted uploads and clear the imagecache if necessary
  */
-function imagecache_profiles_user_edit_submit($form_id, $form_values) {
-  if (file_check_upload('picture_upload') || $form_values['picture_delete']) {
-    imagecache_image_flush($form_values['picture']);
+function imagecache_profiles_user_edit_submit($form, &$form_state) {
+  if (file_save_upload('picture_upload') || $form_state['values']['picture_delete']) {
+    imagecache_image_flush($form_state['values']['picture']);
   }
 }
 
 /**
  * Check submitted form values and set variables or delete as necessary
  */
-function imagecache_profiles_user_admin_settings_submit($form_id, $form_values) {
-  if ($form_values['user_picture_imagecache_profiles'] != '0') {
-    variable_set('user_picture_imagecache_profiles', check_plain($form_values['user_picture_imagecache_profiles']));
+function imagecache_profiles_user_admin_settings_submit($form, &$form_state) {
+  if ($form_state['values']['user_picture_imagecache_profiles'] != '0') {
+    variable_set('user_picture_imagecache_profiles', check_plain($form_state['values']['user_picture_imagecache_profiles']));
   } else {
     variable_del('user_picture_imagecache_profiles');
   }
-  if ($form_values['user_picture_imagecache_comments'] != '0') {
-    variable_set('user_picture_imagecache_comments', check_plain($form_values['user_picture_imagecache_comments']));
+  if ($form_state['values']['user_picture_imagecache_comments'] != '0') {
+    variable_set('user_picture_imagecache_comments', check_plain($form_state['values']['user_picture_imagecache_comments']));
   } else {
     variable_del('user_picture_imagecache_comments');
   }
-  if ($form_values['user_picture_imagecache_profiles_default'] != '0') {
-    variable_set('user_picture_imagecache_profiles_default', check_plain($form_values['user_picture_imagecache_profiles_default']));
+  if ($form_state['values']['user_picture_imagecache_profiles_default'] != '0') {
+    variable_set('user_picture_imagecache_profiles_default', check_plain($form_state['values']['user_picture_imagecache_profiles_default']));
   } else {
     variable_del('user_picture_imagecache_profiles_default');
   }
-  if ($form_values['user_picture_imagecache_profiles_min_width'] != '') {
-    variable_set('user_picture_imagecache_profiles_min_width', check_plain($form_values['user_picture_imagecache_profiles_min_width']));
+  if ($form_state['values']['user_picture_imagecache_profiles_min_width'] != '') {
+    variable_set('user_picture_imagecache_profiles_min_width', check_plain($form_state['values']['user_picture_imagecache_profiles_min_width']));
   } else {
     variable_del('user_picture_imagecache_profiles_min_width');
   }
-  if ($form_values['user_picture_imagecache_profiles_min_height'] != '') {
-    variable_set('user_picture_imagecache_profiles_min_height', check_plain($form_values['user_picture_imagecache_profiles_min_height']));
+  if ($form_state['values']['user_picture_imagecache_profiles_min_height'] != '') {
+    variable_set('user_picture_imagecache_profiles_min_height', check_plain($form_state['values']['user_picture_imagecache_profiles_min_height']));
   } else {
     variable_del('user_picture_imagecache_profiles_min_height');
   }