Merge branch '2160-banned-user-edits' into rails-3-develop

1 files changed, 10 insertions, 2 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index c953e52f2..920c0da46 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -207,7 +207,7 @@ class User < ActiveRecord::Base
         if not name.nil?
             name.strip!
         end
-        if public_banned?
+        if banned?
             # 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. The name returned
             # is not marked as HTML safe so will be escaped automatically in views. We
@@ -294,10 +294,18 @@ class User < ActiveRecord::Base
     def admin_page_links?
         super?
     end
+
     # Is it public that they are banned?
+    def banned?
+      !ban_text.empty?
+    end
+
     def public_banned?
-        !ban_text.empty?
+      warn %q([DEPRECATION] User#public_banned? will be replaced with
+              User#banned? as of 0.22).squish
+      banned?
     end
+
     # Various ways the user can be banned, and text to describe it if failed
     def can_file_requests?
         ban_text.empty? && !exceeded_limit?