aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/log_subscriber.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/log_subscriber.rb b/actionpack/lib/action_view/log_subscriber.rb
index 4a52937c58..443a0eafd1 100644
--- a/actionpack/lib/action_view/log_subscriber.rb
+++ b/actionpack/lib/action_view/log_subscriber.rb
@@ -12,8 +12,9 @@ module ActionView
alias :render_partial :render_template
alias :render_collection :render_template
+ # TODO: Ideally, ActionView should have its own logger so it does not depend on AC.logger
def logger
- ActionController::Base.logger
+ ActionController::Base.logger if defined?(ActionController::Base)
end
protected
@@ -24,4 +25,4 @@ module ActionView
end
end
-ActionView::LogSubscriber.attach_to :action_view \ No newline at end of file
+ActionView::LogSubscriber.attach_to :action_view