Merge branch 'hotfix/0.21.0.6'0.21.0.6

Conflicts:
	config/initializers/alaveteli.rb

1 files changed, 4 insertions, 3 deletions

diff --git a/app/helpers/public_body_helper.rb b/app/helpers/public_body_helper.rb
index 332e93284..57c90a9ba 100644
--- a/app/helpers/public_body_helper.rb
+++ b/app/helpers/public_body_helper.rb
@@ -38,12 +38,13 @@ module PublicBodyHelper
   #
   # Returns a string
   def type_of_authority(public_body)
-      types = public_body.tags.each_with_index.map do |tag, index|
+      first = true
+      types = public_body.tags.each.map do |tag|
           if PublicBodyCategory.get().by_tag().include?(tag.name)
               desc = PublicBodyCategory.get().singular_by_tag()[tag.name]
-
-              if index.zero?
+              if first
                   desc = desc.sub(/\S/) { |m| Unicode.upcase(m) }
+                  first = false
               end
               link_to(desc, list_public_bodies_path(tag.name))
           end