From 487312515c09c5dbc7306329805f2eebfed1d630 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Wed, 17 Jun 2009 12:36:15 -0700
Subject: RJS doesn't render with an HTML layout by default

---
 actionpack/lib/action_controller/base/compatibility.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack/lib/action_controller/base')

diff --git a/actionpack/lib/action_controller/base/compatibility.rb b/actionpack/lib/action_controller/base/compatibility.rb
index 085db284e4..cd4b72b1c6 100644
--- a/actionpack/lib/action_controller/base/compatibility.rb
+++ b/actionpack/lib/action_controller/base/compatibility.rb
@@ -124,6 +124,7 @@ module ActionController
       super
     rescue ActionView::MissingTemplate
       _find_by_parts(_layout({}), {})
+      nil
     end
 
     def performed?
-- 
cgit v1.2.3