diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-02-27 19:37:09 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-02-27 19:37:09 -0800 |
| commit | 9510070f7859d00b1e47b62c1e06dbf21fca1b9b (patch) | |
| tree | feaed42ceefdf573fced4d24a14de98863d82770 /actionpack/lib | |
| parent | c16c7a8de4e543a92de10a138bdd7caa5ac902d7 (diff) | |
| download | rails-9510070f7859d00b1e47b62c1e06dbf21fca1b9b.tar.gz rails-9510070f7859d00b1e47b62c1e06dbf21fca1b9b.tar.bz2 rails-9510070f7859d00b1e47b62c1e06dbf21fca1b9b.zip | |
Fixes multiple conditions
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/abstract/callbacks.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/abstract/callbacks.rb b/actionpack/lib/action_controller/abstract/callbacks.rb index 0add363552..a88d4c1567 100644 --- a/actionpack/lib/action_controller/abstract/callbacks.rb +++ b/actionpack/lib/action_controller/abstract/callbacks.rb @@ -17,11 +17,11 @@ module AbstractController module ClassMethods def _normalize_callback_options(options) if only = options[:only] - only = Array(only).map {|o| "action_name == :#{o}"}.join(" && ") + only = Array(only).map {|o| "action_name == :#{o}"}.join(" || ") options[:per_key] = {:if => only} end if except = options[:except] - except = Array(except).map {|e| "action_name == :#{e}"}.join(" && ") + except = Array(except).map {|e| "action_name == :#{e}"}.join(" || ") options[:per_key] = {:unless => except} end end |