Merge branch 'release/0.6.1'0.6.1

2 files changed, 11 insertions, 0 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index cb6615199..278df5a3b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -132,5 +132,9 @@ module ApplicationHelper
         return "#{exact_date} (#{ago_text})"
     end
 
+    def is_admin?
+        return !session[:using_admin].nil? || (!@user.nil? && @user.admin_level == "super")
+    end
+
 end
 
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index f621721b6..1a86333b6 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -96,6 +96,13 @@ module LinkToHelper
     def user_link_absolute(user)
         link_to h(user.name), main_url(user_url(user))
     end
+    def request_user_link_absolute(request)
+        if request.is_external?
+            request.external_user_name || _("Anonymous user")
+        else
+            user_link_absolute(request.user)
+        end
+    end
     def user_or_you_link(user)
         if @user && user == @user
             link_to h("you"), user_url(user)