From: Matt Amos <zerebubuth@gmail.com>
Date: Wed, 4 Apr 2012 15:58:28 +0000 (+0100)
Subject: Removed early return from printable name method
X-Git-Tag: live~5570
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ecf767ee4f342f5aa2e1f032771983a8e4ba8c11

Removed early return from printable name method
---

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 0b72040a3..ffc638cdf 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -13,14 +13,17 @@ module BrowseHelper
     if version
       name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
     end
-    # stop here if redacted to avoid giving away redacted version tags.
-    return name if object.redacted?
 
-    if object.tags.include? "name:#{I18n.locale}"
-      name = t 'printable_name.with_name',  :name => object.tags["name:#{I18n.locale}"].to_s, :id => name
-    elsif object.tags.include? 'name'
-      name = t 'printable_name.with_name',  :name => object.tags['name'].to_s, :id => name
+    # don't look at object tags if redacted, so as to avoid giving 
+    # away redacted version tag information.
+    unless object.redacted?
+      if object.tags.include? "name:#{I18n.locale}"
+        name = t 'printable_name.with_name',  :name => object.tags["name:#{I18n.locale}"].to_s, :id => name
+      elsif object.tags.include? 'name'
+        name = t 'printable_name.with_name',  :name => object.tags['name'].to_s, :id => name
+      end
     end
+
     return name
   end