aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-10-21 03:46:13 -0700
committerJosé Valim <jose.valim@gmail.com>2011-10-21 03:46:13 -0700
commite2aaae16292640f2314be205d7782f6eaf2b1cf5 (patch)
tree73b041f522e473249d34b3f1b8ba8a9edfa834da /activesupport/lib/active_support
parentaf1b5c54cfb74caddd6ffab171d26da9a5c885d1 (diff)
parentc495cbcda94bec7a49a88631fc575cc04bde8e88 (diff)
downloadrails-e2aaae16292640f2314be205d7782f6eaf2b1cf5.tar.gz
rails-e2aaae16292640f2314be205d7782f6eaf2b1cf5.tar.bz2
rails-e2aaae16292640f2314be205d7782f6eaf2b1cf5.zip
Merge pull request #3387 from arunagw/tagged_log_nil
Checking blank if tag might coming nil or blank
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/tagged_logging.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index aff416a9eb..a59fc26d5d 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/blank'
require 'logger'
module ActiveSupport
@@ -18,7 +19,7 @@ module ActiveSupport
def tagged(*new_tags)
tags = current_tags
- new_tags = Array.wrap(new_tags).flatten
+ new_tags = Array.wrap(new_tags).flatten.reject(&:blank?)
tags.concat new_tags
yield
ensure