Merge branch 'master' into wdtk

2 files changed, 17 insertions, 4 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index 6b66e1a8d..37edbe360 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -114,7 +114,9 @@ class User < ActiveRecord::Base
             name.strip!
         end
         if self.public_banned?
-            name = _("{{user_name}} (Account suspended)", :user_name=>name)
+            # Use interpolation to return a string rather than a SafeBuffer so that
+            # gsub can be called on it until we upgrade to Rails 3.2
+            name = "#{_("{{user_name}} (Account suspended)", :user_name=> name)}"
         end
         name
     end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index e31c3f1b5..ec1236a5d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -27,11 +27,22 @@ describe User, "showing the name" do
         @user.name.should == 'Some Name'
     end
 
-    it 'should show if user has been banned' do
-        @user.ban_text = "Naughty user"
-        @user.name.should == 'Some Name (Account suspended)'
+    describe  'if user has been banned' do
+
+        before do
+            @user.ban_text = "Naughty user"
+        end
+
+        it 'should show an "Account suspended" suffix' do
+            @user.name.should == 'Some Name (Account suspended)'
+        end
+
+        it 'should return a string when the user has been banned, not a SafeBuffer' do
+            @user.name.type.should == String
+        end
     end
 
+
 end
 
 describe User, " when authenticating" do