Replace remaining calls to gravatar_tag.

app/views/admin/feedback/_ham.html.erb

@@ -1,7 +1,7 @@
 <td><input class= "feedback_check" type="checkbox" name="feedback_check[<%= comment.id %>]"/></td>
 <td class='<%= comment_class comment.state.to_s.downcase %>'><%= comment.state %></td>
 <td>
-  <%= gravatar_tag(comment.email, {:size => 32}) unless comment.email.nil? %>
+  <%= avatar_tag(:email => comment.email, :url => comment.url, :size => 32) %>
   <div class='comment_content'>
     <strong><%= mail_to h(comment.email), h(comment.author), {:class => 'noborder'} %></strong><br />
     <%= link_to "#{h(comment.url)}<br />".html_safe, comment.url, {:class => 'noborder'} unless comment.url.blank? %>

app/views/admin/feedback/_spam.html.erb

@@ -1,4 +1,4 @@
 <td colspan='5'>
-  <%= gravatar_tag(comment.email, {:size => 25}) unless comment.email.nil? %>
+  <%= avatar_tag(:email => comment.email, :url => comment.url, :size => 25) %>
   <%= _("This comment by <strong>%s</strong> was flagged as spam, %s?", comment.author, link_to_remote('Cancel', :url => {:action => 'change_state', :id => comment.id})) %>
 </td>

app/views/articles/comment_preview.html.erb

@@ -1,3 +1,3 @@
-<%= gravatar_tag(@comment.email) if this_blog.use_gravatar and @comment.email %>
+<%= avatar_tag(:email => comment.email, :url => comment.url) %>
 <cite><strong><%=h @comment[:author] %></strong></cite>  <%= _("is about to say")%>:<br />
 <%= @comment.html %>

app/views/comments/show.html.erb

@@ -1,6 +1,6 @@
 <div class="comment" id="comment-<%= @comment.id %>">
   <div class="author">
-    <%= content_tag(:div, gravatar_tag(@comment.email)) if this_blog.use_gravatar and @comment.email %>
+    <%= avatar_tag(:email => comment.email, :url => comment.url) %>
     <cite><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url).nofollowify %></cite>
     <abbr title="<%= @comment.created_at.xmlschema %>"><%= distance_of_time_in_words @comment.article.published_at, @comment.created_at %> later:</abbr>
   </div>

test/mocks/themes/typographic/views/articles/_comment.html.erb

@@ -1,6 +1,6 @@
 <li class="comment" id="comment-<%= comment.id %>">
   <div class="author">
-    <%= content_tag(:div, gravatar_tag(comment.email)) if this_blog.use_gravatar and comment.email %>
+    <%= avatar_tag(:email => comment.email, :url => comment.url) %>
     <cite><%= (comment.url.blank?) ? h(comment.author) : link_to(h(comment.author), comment.url) %></cite>
     <abbr title="<%= comment.created_at.xmlschema %>"><%= distance_of_time_in_words comment.article.published_at, comment.created_at %> <%= _("later")%>:</abbr>
   </div>

test/mocks/themes/typographic/views/articles/comment_preview.html.erb

@@ -1,6 +1,6 @@
 <div class="comment preview">
   <div class="author">
-    <%= content_tag(:div, gravatar_tag(@comment.email)) if this_blog.use_gravatar and @comment.email %>
+    <%= avatar_tag(:email => comment.email, :url => comment.url) %>
     <cite><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></cite>
     <abbr><%= _("is about to say")%></abbr>
   </div>

themes/dirtylicious/views/articles/comment_preview.html.erb

@@ -1,6 +1,6 @@
 <div class="comment preview">
   <div class="author">
-    <%= content_tag(:div, gravatar_tag(@comment.email)) if this_blog.use_gravatar and @comment.email %>
+    <%= avatar_tag(:email => comment.email, :url => comment.url) %>
     <cite><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></cite>
     <abbr>is about to say</abbr>
   </div>

themes/scribbish/views/articles/comment_preview.html.erb

@@ -1,6 +1,6 @@
 <div class="comment preview">
   <div class="author">
-    <%= content_tag(:div, gravatar_tag(@comment.email)) if this_blog.use_gravatar and @comment.email %>
+    <%= avatar_tag(:email => comment.email, :url => comment.url) %>
     <cite><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></cite>
     <abbr><%= _("is about to say") %></abbr>
   </div>

themes/standard_issue/views/articles/comment_preview.html.erb

@@ -1,6 +1,6 @@
 <div class="comment preview">
   <div class="author">
-    <%= content_tag(:div, gravatar_tag(@comment.email)) if this_blog.use_gravatar and @comment.email %>
+    <%= avatar_tag(:email => comment.email, :url => comment.url) %>
     <cite><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></cite>
     <abbr><%= _("is about to say")%></abbr>
   </div>

themes/true-blue-3/views/articles/comment_preview.html.erb

@@ -1,6 +1,6 @@
 <div class="comment preview">
   <div class="author">
-    <%= content_tag(:div, gravatar_tag(@comment.email)) if this_blog.use_gravatar and @comment.email %>
+    <%= avatar_tag(:email => comment.email, :url => comment.url) %>
     <cite><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></cite>
     <abbr>is about to say</abbr>
   </div>

themes/typographic/views/articles/comment_preview.html.erb

@@ -1,6 +1,6 @@
 <div class="comment preview">
   <div class="author">
-    <%= content_tag(:div, gravatar_tag(@comment.email)) if this_blog.use_gravatar and @comment.email %>
+    <%= avatar_tag(:email => comment.email, :url => comment.url) %>
     <cite><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></cite>
     <abbr><%= _("is about to say")%></abbr>
   </div>