Merge 035ffaf into e882cdf

fastladder · Mar 4, 2018 · 54b7afe · 54b7afe
2 parents e882cdf + 035ffaf
commit 54b7afe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
@@ -90,7 +90,7 @@ def subs
         link: feed.link.html_escape,
         feedlink: feed.feedlink.html_escape,
         title: feed.title.utf8_roundtrip.html_escape,
-        icon: feed.favicon.blank? ? "/img/icon/default.png" : favicon_path(feed.id),
+        icon: feed.favicon.image.blank? ? "/img/icon/default.png" : favicon_path(feed.id),
         modified_on: modified_on ? modified_on.to_time.to_i : 0,
         subscribers_count: feed.subscribers_count,
       }
@@ -118,7 +118,7 @@ def lite_subs
         link: feed.link.html_escape,
         feedlink: feed.feedlink.html_escape,
         title: feed.title.utf8_roundtrip.html_escape,
-        icon: feed.favicon.blank? ? "/img/icon/default.png" : favicon_path(feed.id),
+        icon: feed.favicon.image.blank? ? "/img/icon/default.png" : favicon_path(feed.id),
         modified_on: modified_on ? modified_on.to_time.to_i : 0,
         subscribers_count: feed.subscribers_count,
       }

diff --git a/app/views/about/_feed.html.erb b/app/views/about/_feed.html.erb
@@ -3,7 +3,7 @@
 <div class="feedinfo">
 	<div class="feed_info">
 	<div class="channel">
-		<h3 style="background-image:url('<%= favicon_path(feed.id) %>')">
+		<h3 style="background-image:url('<%= feed.favicon.image.blank? ? "/img/icon/default.png" : favicon_path(feed.id) %>')">
 			<%= link_to feed.title, feed.link, id: "feed-title" %>
 		</h3>
 		<div class="description"><%= feed.description %></div>