---
 app/models/user.rb                     |   18 ++++++------------
 app/views/users/_edit.html.erb         |    2 --
 app/views/users/show.html.erb          |    2 --
 public/images/icons/default_avatar.gif |  Bin 0 -> 10150 bytes
 test/unit/user_test.rb                 |    2 +-
 5 files changed, 7 insertions(+), 17 deletions(-)
 create mode 100644 public/images/icons/default_avatar.gif

diff --git a/app/models/user.rb b/app/models/user.rb
index 862cbbf..8532072 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -116,20 +116,14 @@ class User < ActiveRecord::Base
     (id == project.owner.id) || privileges.admin_projects
   end
 
-  # Returns whether the user has an avatar or not.
-  def avatar?
-    use_gravatar || (!url_for_avatar.nil? && !url_for_avatar.empty?)
-  end
-
-  # Returns the user's avatar url, or +nil+ if none was defined.
+  # Returns the user's avatar url, or the default avatar url if none was defined.
   def avatar_url
-    result = nil
-
-    if !use_gravatar && !url_for_avatar.nil? && !url_for_avatar.empty?
+    if use_gravatar
+      result = gravatar_url(!url_for_avatar.blank? ? url_for_avatar : email)
+    elsif !use_gravatar && !url_for_avatar.blank?
       result = url_for_avatar
-    elsif use_gravatar
-      result = (!url_for_avatar.nil? && !url_for_avatar.empty?) ? url_for_avatar : email
-      result = gravatar_url(result)
+    else
+      result = ConfigProperty.fetch('users.default_avatar_url', '/images/icons/default_avatar.gif')
     end
 
     return result
diff --git a/app/views/users/_edit.html.erb b/app/views/users/_edit.html.erb
index 14ab203..5ad9989 100644
--- a/app/views/users/_edit.html.erb
+++ b/app/views/users/_edit.html.erb
@@ -61,11 +61,9 @@
         <%= form.text_field :url_for_avatar %>
       </td>
     </tr>
-    <% if @this_user.avatar? %>
     <tr>
       <td /><td id="current_avatar"><%= image_tag @this_user.avatar_url %></td>
     </tr>
-    <% end %>
 
         <tr>
           <td class="label">Introduction</td>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index e32ce69..a30d853 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -26,11 +26,9 @@
       <td colspan="2" class="user_details">
     <dl>
       <dt><%= "#{@this_user.display_name}" %></dt>
-      <% if @this_user.avatar? %>
       <dd>
         <%= image_tag @this_user.avatar_url %>
       </dd>
-      <% end %>
       <dd>
         <%= RedCloth.new(@this_user.introduction).to_html %>
       </dd>
diff --git a/public/images/icons/default_avatar.gif b/public/images/icons/default_avatar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..28379b4b553bcc3d18eb97744c68f7307f21e4a4
GIT binary patch
literal 10150
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

literal 0
HcmV?d00001

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 063517c..63dc478 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -63,7 +63,7 @@ class UserTest < ActiveSupport::TestCase
 
   # Ensures that a user with no avatar returns the right value when queries.
   def test_avatar_reports_no
-    flunk "User should not say he has an avatar." if @user_with_no_avatar.avatar?
+    flunk "User should not say he has an avatar." unless @user_with_no_avatar.avatar_url == ConfigProperty.fetch('users.default_avatar_url')
   end
 
   # Ensures that a user with an avatar URL returns the right URL.
--
1.6.1