From 3971a24d682bad183eccba98ec289712280ab59d Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Thu, 6 Apr 2017 16:44:38 +0200
Subject: [PATCH] Add avatar fallback for avatar next to publisher

closes #7414
---
 Changelog.md                         | 1 +
 app/assets/javascripts/app/router.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 2ea388d95..293e08f69 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -17,6 +17,7 @@
 * Fix sharing indicator on profile page for blocked users [#7382](https://github.com/diaspora/diaspora/pull/7382)
 * Remove post only after a successful deletion on the server [#7385](https://github.com/diaspora/diaspora/pull/7385)
 * Fix an issue where pod admins could get logged out when using sidekiq-web [#7395](https://github.com/diaspora/diaspora/pull/7395)
+* Add avatar fallback for typeahead and conversations [#7414](https://github.com/diaspora/diaspora/pull/7414)
 
 ## Features
 * Add links to liked and commented pages [#5502](https://github.com/diaspora/diaspora/pull/5502)
diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js
index ed8ec9d9a..b189cad86 100644
--- a/app/assets/javascripts/app/router.js
+++ b/app/assets/javascripts/app/router.js
@@ -217,6 +217,7 @@ app.Router = Backbone.Router.extend({
     app.shortcuts = app.shortcuts || new app.views.StreamShortcuts({el: $(document)});
     if ($("#publisher").length !== 0) {
       app.publisher = app.publisher || new app.views.Publisher({collection: app.stream.items});
+      app.page.setupAvatarFallback($(".main-stream-publisher"));
     }
 
     $("#main_stream").html(app.page.render().el);