Index: imagecache_profiles.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagecache_profiles/imagecache_profiles.module,v
retrieving revision 1.3
diff -u -r1.3 imagecache_profiles.module
--- imagecache_profiles.module	11 Jan 2008 21:09:35 -0000	1.3
+++ imagecache_profiles.module	24 Jan 2008 04:10:03 -0000
@@ -20,16 +20,23 @@
   if (variable_get('user_pictures', 0)) {
     if (variable_get('user_picture_imagecache_profiles_default', 0)) {
       // Define default user picture size
-      $defaultquery = db_query('SELECT presetname FROM {imagecache_preset} WHERE presetid = %s', variable_get('user_picture_imagecache_profiles_default', 0));
+      $defaultquery = db_query("SELECT presetname FROM {imagecache_preset} WHERE presetid = '%s'", variable_get('user_picture_imagecache_profiles_default', 0));
       $size = db_result($defaultquery, '0');  
     }
     if (variable_get('user_picture_imagecache_profiles', 0)) {  
       // If on user profile page
       if (arg(0) == 'user' && is_numeric(arg(1))) {
-        $query = db_query('SELECT presetname FROM {imagecache_preset} WHERE presetid = %s', variable_get('user_picture_imagecache_profiles', 0));
+        $query = db_query("SELECT presetname FROM {imagecache_preset} WHERE presetid = '%s'", variable_get('user_picture_imagecache_profiles', 0));
         $size = db_result($query, '0');
       }
     }
+    if (variable_get('user_picture_imagecache_comments', 0)) {  
+      // If viewing a comment
+      if ($account->cid) {
+        $query = db_query("SELECT presetname FROM {imagecache_preset} WHERE presetid = '%s'", variable_get('user_picture_imagecache_comments', 0));
+        $size = db_result($query, '0');
+      }
+    }  
     // Display the user's photo
     if ($account->picture && file_exists($account->picture)) {
       if (isset($size)) {
@@ -42,6 +49,9 @@
           $picture = l($picture, "user/$account->uid", array('title' => t('View user profile.')), NULL, NULL, FALSE, TRUE);
         }
       }
+      if (isset($size) && $account->cid) {
+        $picture = l(theme('imagecache', $size, $account->picture), 'user/'. $account->uid, array('title' => t('View user profile.')), NULL, NULL, FALSE, TRUE);
+      }
     }
     elseif (variable_get('user_picture_default', '')) {
       if (isset($size)) {
@@ -82,6 +92,13 @@
         '#options' => $presets,
         '#description' => t("This will set the picture size when viewing a user's profile page."),
       );
+      $form['pictures']['user_picture_imagecache_comments'] = array(
+        '#type' => 'select',
+        '#title' => t('Set the user picture size within comments with this ImageCache preset'),
+        '#default_value' => variable_get('user_picture_imagecache_comments', ''),
+        '#options' => $presets,
+        '#description' => t("This will set the picture size when viewing a comment post."),
+      );
       $form['pictures']['user_picture_imagecache_profiles_default'] = array(
         '#type' => 'select',
         '#title' => t('Set default user picture size with this ImageCache preset'),
@@ -139,6 +156,11 @@
   } 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']));
+  } 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']));
   } else {