show default profile image in showstream

darcs-hash:20080615014742-84dde-d39f4c7744dc430fdb4ad64a172ffe3e909ee4a0.gz

diff --git a/actions/showstream.php b/actions/showstream.php
index 2fc5184c38ece9ae707d4899aa4af06be29e8b74..a9073df86a95b68ab3c4bed266ea1ce323ef3dde 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -113,27 +113,26 @@ class ShowstreamAction extends StreamAction {
        function show_personal($profile) {
 
                $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-               if ($avatar) {
-                       common_element_start('div', array('id' => 'profile_avatar'));
-                       common_element('img', array('src' => $avatar->url,
-                                                                               'class' => 'avatar profile',
-                                                                               'width' => AVATAR_PROFILE_SIZE,
-                                                                               'height' => AVATAR_PROFILE_SIZE,
-                                                                               'alt' => $profile->nickname));
-                       $cur = common_current_user();
-                       if ($cur) {
-                               if ($cur->id != $profile->id) {
-                                       if ($cur->isSubscribed($profile)) {
-                                               $this->show_unsubscribe_form($profile);
-                                       } else {
-                                               $this->show_subscribe_form($profile);
-                                       }
+               common_element_start('div', array('id' => 'profile_avatar'));
+               common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_PROFILE_SIZE),
+                                                                       'class' => 'avatar profile',
+                                                                       'width' => AVATAR_PROFILE_SIZE,
+                                                                       'height' => AVATAR_PROFILE_SIZE,
+                                                                       'alt' => $profile->nickname));
+               $cur = common_current_user();
+               if ($cur) {
+                       if ($cur->id != $profile->id) {
+                               if ($cur->isSubscribed($profile)) {
+                                       $this->show_unsubscribe_form($profile);
+                               } else {
+                                       $this->show_subscribe_form($profile);
                                }
-                       } else {
-                               $this->show_remote_subscribe_form($profile);
                        }
-                       common_element_end('div');
+               } else {
+                       $this->show_remote_subscribe_form($profile);
                }
+               common_element_end('div');
+
                common_element_start('div', array('id' => 'profile_information'));
                
                if ($profile->fullname) {