Download as
Browse Code »

Commit 6d8fd953a32d1a9595be087192cce688a1540c96

Authored by Braulio Bhavamitra
1 parent c50ccd6e
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails4: fix login invalidation

Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @6d8fd95
@@ -8,6 +8,8 @@ class ApplicationController < ActionController::Base @@ -8,6 +8,8 @@ class ApplicationController < ActionController::Base
8 before_filter :init_noosfero_plugins 8 before_filter :init_noosfero_plugins
9 before_filter :allow_cross_domain_access 9 before_filter :allow_cross_domain_access
10 10
  11 + # AuthenticatedSystem filters must come before login_from_cookie
  12 + include AuthenticatedSystem
11 before_filter :login_from_cookie 13 before_filter :login_from_cookie
12 before_filter :login_required, :if => :private_environment? 14 before_filter :login_required, :if => :private_environment?
13 15
@@ -65,7 +67,6 @@ class ApplicationController < ActionController::Base @@ -65,7 +67,6 @@ class ApplicationController < ActionController::Base
65 helper :language 67 helper :language
66 68
67 include DesignHelper 69 include DesignHelper
68 - include AuthenticatedSystem  
69 include PermissionCheck 70 include PermissionCheck
70 71
71 before_filter :set_locale 72 before_filter :set_locale