Merge branch 'master' into feature/add-communities-page

[rails.git] / app / controllers / traces_controller.rb

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index b800d305e03fc495f9bc9a7bdf5752a2ebd83bcf..b4853c6b8f7c5c1c91367cf98c14ced1c8253d90 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -67,7 +67,6 @@ class TracesController < ApplicationController
 
     # final helper vars for view
     @target_user = target_user
 
     # final helper vars for view
     @target_user = target_user

-    @display_name = target_user.display_name if target_user

   end
 
   def mine
   end
 
   def mine


@@ -317,7 +316,7 @@ class TracesController < ApplicationController
   end
 
   def offline_redirect
   end
 
   def offline_redirect

-    redirect_to :action => :offline if Settings.status == "gpx_offline"
+    render :action => :offline if Settings.status == "gpx_offline"

   end
 
   def default_visibility
   end
 
   def default_visibility