From a012224c798932076f25a2230549c5a4cb4e9ed9 Mon Sep 17 00:00:00 2001 From: Matthias Frick Date: Tue, 13 Jan 2015 17:36:11 +0100 Subject: [PATCH] changed a few missing files: filters to actions --- app/controllers/base_controller.rb | 4 ++-- app/controllers/password_resets_controller.rb | 4 ++-- app/models/user.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/base_controller.rb b/app/controllers/base_controller.rb index 6d7b6fde..1a780de7 100755 --- a/app/controllers/base_controller.rb +++ b/app/controllers/base_controller.rb @@ -8,7 +8,7 @@ class BaseController < ApplicationController include LocalizedApplication include BaseHelper - around_filter :set_locale + around_action :set_locale skip_before_action :verify_authenticity_token, :only => :footer_content before_action :initialize_header_tabs before_action :initialize_admin_tabs @@ -77,7 +77,7 @@ def self.uses_tiny_mce(options = {}, &block) c.instance_variable_set(:@uses_tiny_mce, true) end - before_filter p, options + before_action p, options end diff --git a/app/controllers/password_resets_controller.rb b/app/controllers/password_resets_controller.rb index d1779c1c..6ca41d21 100644 --- a/app/controllers/password_resets_controller.rb +++ b/app/controllers/password_resets_controller.rb @@ -1,6 +1,6 @@ class PasswordResetsController < BaseController - before_filter :require_no_user - before_filter :load_user_using_perishable_token, :only => [ :edit, :update ] + before_action :require_no_user + before_action :load_user_using_perishable_token, :only => [ :edit, :update ] def new end diff --git a/app/models/user.rb b/app/models/user.rb index 2e87b4b2..adc3e92a 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -447,7 +447,7 @@ def make_activation_code self.activation_code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join ) end - # before filters + # before actions def whitelist_attributes self.login = self.login.strip self.description = white_list(self.description )