Fixed missing avatar

diff --git a/files/lib/data/conversation/UserConversationList.class.php b/files/lib/data/conversation/UserConversationList.class.php
index 261405d947bf2f07343ecf0fbbd705be7ea03354..a5a060101baf887fd8674bf5194c74cfe85fdcc4 100644 (file)
--- a/files/lib/data/conversation/UserConversationList.class.php
+++ b/files/lib/data/conversation/UserConversationList.class.php
@@ -90,7 +90,7 @@ class UserConversationList extends ConversationList {
                
                if (!empty($this->sqlSelects)) $this->sqlSelects .= ',';
                $this->sqlSelects .= "lastposter_avatar.avatarID AS lastPosterAvatarID, lastposter_avatar.avatarName AS lastPosterAvatarName, lastposter_avatar.avatarExtension AS lastPosterAvatarExtension, lastposter_avatar.width AS lastPosterAvatarWidth, lastposter_avatar.height AS lastPosterAvatarHeight,";
-               $this->sqlSelects .= "lastposter.email AS lastPosterEmail, lastposter.disableAvatar AS lastPosterDisableAvatar";
+               $this->sqlSelects .= "lastposter.email AS lastPosterEmail, lastposter.disableAvatar AS lastPosterDisableAvatar, lastposter.enableGravatar AS lastPosterEnableGravatar";
                $this->sqlJoins .= " LEFT JOIN wcf".WCF_N."_user lastposter ON (lastposter.userID = conversation.lastPosterID)";
                $this->sqlJoins .= " LEFT JOIN wcf".WCF_N."_user_avatar lastposter_avatar ON (lastposter_avatar.avatarID = lastposter.avatarID)";
        }

diff --git a/files/lib/data/conversation/ViewableConversation.class.php b/files/lib/data/conversation/ViewableConversation.class.php
index e5dfa5640f507a5cde2cf48573a4c02b89e4c79f..4f73a6b0d0423cdd13fa7eae0bd13a208ae206ec 100644 (file)
--- a/files/lib/data/conversation/ViewableConversation.class.php
+++ b/files/lib/data/conversation/ViewableConversation.class.php
@@ -81,7 +81,8 @@ class ViewableConversation extends DatabaseObjectDecorator {
                                        'width' => $this->lastPosterAvatarWidth,
                                        'height' => $this->lastPosterAvatarHeight,
                                        'email' => $this->lastPosterEmail,
-                                       'disableAvatar' => $this->lastPosterDisableAvatar
+                                       'disableAvatar' => $this->lastPosterDisableAvatar,
+                                       'enableGravatar' => $this->lastPosterEnableGravatar
                                )));
                        }
                }