Merge branch 'release/0.17'0.17

2 files changed, 32 insertions, 6 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4b603b064..154697377 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -123,5 +123,18 @@ module ApplicationHelper
             yield
         end
     end
+
+    # We only want to cache request lists that have a reasonable chance of not expiring
+    # before they're requested again. Don't cache lists returned from specific searches
+    # or anything except the first page of results, just the first page of the default
+    # views
+    def request_list_cache_key
+        cacheable_param_list = ['controller', 'action', 'locale', 'view']
+        if params.keys.all?{ |key| cacheable_param_list.include?(key) }
+            "request-list-#{@view}-#{@locale}"
+        else
+            nil
+        end
+    end
 end
 
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 8df28f350..405886a85 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -121,24 +121,37 @@ module LinkToHelper
     end
 
     def user_link_absolute(user)
-        link_to h(user.name), user_url(user)
+        link_to user.name, user_url(user)
     end
 
     def user_link(user)
-        link_to h(user.name), user_path(user)
+        link_to user.name, user_path(user)
     end
 
-    def request_user_link_absolute(request)
+    def external_user_link(request, absolute, text)
+        if request.external_user_name
+            request.external_user_name
+        else
+            if absolute
+                url = help_privacy_url(:anchor => 'anonymous')
+            else
+                url = help_privacy_path(:anchor => 'anonymous')
+            end
+            link_to(text, url)
+        end
+    end
+
+    def request_user_link_absolute(request, anonymous_text=_("Anonymous user"))
         if request.is_external?
-            request.external_user_name || _("Anonymous user")
+            external_user_link(request, absolute=true, anonymous_text)
         else
             user_link_absolute(request.user)
         end
     end
 
-    def request_user_link(request)
+    def request_user_link(request, anonymous_text=_("Anonymous user"))
         if request.is_external?
-            request.external_user_name || _("Anonymous user")
+            external_user_link(request, absolute=false, anonymous_text)
         else
             user_link(request.user)
         end