? .svn ? default-picture.txt Index: imagecache_profiles.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/imagecache_profiles/imagecache_profiles.module,v retrieving revision 1.3 diff -u -F^f -r1.3 imagecache_profiles.module --- imagecache_profiles.module 11 Jan 2008 21:09:35 -0000 1.3 +++ imagecache_profiles.module 21 Apr 2008 16:40:41 -0000 @@ -31,6 +31,9 @@ function phptemplate_user_picture($accou } } // Display the user's photo + if (empty($account->picture)) { + $account->picture = variable_get('user_picture_default', ''); + } if ($account->picture && file_exists($account->picture)) { if (isset($size)) { $picture = l(theme('imagecache', $size, $account->picture), 'user/'. $account->uid, array('title' => t('View user profile.')), NULL, NULL, FALSE, TRUE); @@ -43,18 +46,6 @@ function phptemplate_user_picture($accou } } } - elseif (variable_get('user_picture_default', '')) { - if (isset($size)) { - $picture = l(theme('imagecache', $size, variable_get('user_picture_default', '')), 'user/'. $account->uid, array('title' => t('View user profile.')), NULL, NULL, FALSE, TRUE); - } else { - $picture = file_create_url(variable_get('user_picture_default', '')); - $alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous')))); - $picture = theme('image', $picture, $alt, $alt, '', FALSE); - 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); - } - } - } return '