Download as
Browse Code »

Commit 6d8fd953a32d1a9595be087192cce688a1540c96

Authored by Braulio Bhavamitra
1 parent c50ccd6e
Exists in staging and in 39 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

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