app/controllers/admin/welcome_controller.rb in trusty-cms-2.0.2 vs app/controllers/admin/welcome_controller.rb in trusty-cms-2.0.3.pre.beta

- old
+ new

@@ -2,11 +2,11 @@ no_login_required before_filter :never_cache skip_before_filter :verify_authenticity_token def index - redirect_to admin_pages_path + redirect_to admin_pages_url end def login if request.post? @username_or_email = params[:username_or_email] @@ -16,20 +16,20 @@ if current_user if params[:remember_me] current_user.remember_me set_session_cookie end - redirect_to(session[:return_to] || welcome_path) + redirect_to(session[:return_to] || welcome_url) session[:return_to] = nil end end def logout request.cookies[:session_token] = { :expires => 1.day.ago.utc } self.current_user.forget_me if self.current_user self.current_user = nil announce_logged_out - redirect_to login_path + redirect_to login_url end private def never_cache