avoid to set view_medias twice for cached entry. closes nahi#182.

eladmeidar · Jun 22, 2009 · cbb15d1 · cbb15d1
1 parent 110b3f1
commit cbb15d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/helpers/entry_helper.rb b/app/helpers/entry_helper.rb
@@ -223,7 +223,7 @@ def common_content(entry)
   end
 
   def scan_media_from_link(entry)
-    if entry.view_links
+    if entry.view_links and entry.view_medias.empty?
       entry.view_links.each do |link|
         case link
         # http://twitpic.com/api.do#thumbnails

diff --git a/app/views/help/index.html.erb b/app/views/help/index.html.erb
@@ -23,12 +23,11 @@
 <ul>
   <li>[inbox] ... show your entries in 'home' excluding archived entries</li>
   <li>[next] ... start showing page-by-page view</li>
-  <li>[filter] ... show links for filtering; lists, groups and my feeds</li>
   <li>[all] ... show all of your entries in 'home' including archived entries</li>
   <li>[pin] ... show pinned entries</li>
   <li><%= service_icon_tag('http://friendfeed.com/static/images/icons/internal.png', 'FriendFeed', 'FriendFeed') %> ... show filtered entries by specified service</li>
+  <li><%= icon_tag(:group) %> ... show group entries</li>
   <li>(user name) ... show user profile</li>
-  <li><%= icon_tag(:url) %> ... show seach result page of entries which relates to specified link</li>
 </ul>
 
 <h2>Entry Edit Operation</h2>
@@ -66,8 +65,8 @@
 <h2>Others</h2>
 <ul>
   <li><%= icon_tag(:private) %> ... the entry is private</li>
-  <li><%= icon_tag(:group) %> ... the entry is for a group</li>
   <li><%= icon_tag(:go) %> ... link to go source site</li>
+  <li><%= icon_tag(:url) %> ... show seach result page of entries which relates to specified link</li>
   <li><%= icon_tag(:comment) %> ... comment to the entry</li>
 </ul>
 </div>