diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 83d6c4e17..a182a01c9 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -52,7 +52,7 @@ module WelcomeHelper end def topic_last_time topic - return topic.event_datetime unless topic.methods.to_s =~ %r[last_reply] + return topic.event_datetime if ( !(topic.methods.to_s =~ %r[last_reply]) && topic.last_reply.nil? ) topic.last_reply.event_datetime end