diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-25 23:25:32 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-11-25 23:25:32 -0200 |
| commit | fc3629f6ca2b43693f5447a1fb43881f1814e117 (patch) | |
| tree | 724226a073a5f454fc8c2d28ff8bc85bd031fa40 /activesupport | |
| parent | 41e607dee20b15d8dc71dc16a08d4bbe9e36ac70 (diff) | |
| parent | 02c3c9dfbcec05e3b0cecc062da8acd0cf7c53e0 (diff) | |
| download | rails-fc3629f6ca2b43693f5447a1fb43881f1814e117.tar.gz rails-fc3629f6ca2b43693f5447a1fb43881f1814e117.tar.bz2 rails-fc3629f6ca2b43693f5447a1fb43881f1814e117.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/logger.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/logger.rb b/activesupport/lib/active_support/core_ext/logger.rb index e4df8fe338..22749229a3 100644 --- a/activesupport/lib/active_support/core_ext/logger.rb +++ b/activesupport/lib/active_support/core_ext/logger.rb @@ -137,10 +137,10 @@ class Logger attr_writer :formatter public :formatter= - alias old_format_datetime format_datetime if method_defined?(:format_datetime) + alias old_format_datetime format_datetime def format_datetime(datetime) datetime end - alias old_msg2str msg2str if method_defined?(:msg2str) + alias old_msg2str msg2str def msg2str(msg) msg end end end |