4 files changed, 39 insertions, 6 deletions
diff --git a/railties/generators/scaffold/templates/controller.rb b/railties/generators/scaffold/templates/controller.rb
index 83520f4794..15ade4c49b 100644
--- a/railties/generators/scaffold/templates/controller.rb
+++ b/railties/generators/scaffold/templates/controller.rb
@@ -1,6 +1,5 @@
 class <%= class_name %>Controller < ApplicationController
-  model   :<%= singular_name %>
-  layout  'scaffold'
+  layout 'scaffold'
 
 <% unless suffix -%>
   def index
diff --git a/railties/generators/scaffold/templates/functional_test.rb b/railties/generators/scaffold/templates/functional_test.rb
index b7315cfb84..1bf7d83694 100644
--- a/railties/generators/scaffold/templates/functional_test.rb
+++ b/railties/generators/scaffold/templates/functional_test.rb
@@ -62,7 +62,7 @@ class <%= class_name %>ControllerTest < Test::Unit::TestCase
   end
 
   def test_update<%= suffix %>
-    process :update<%= suffix %>, 'id' => 1
+    process :update<%= suffix %>, '<%= singular_name %>' => { 'id' => 1 }
     assert_redirected_to :action => 'show<%= suffix %>', :id => 1
   end
 
diff --git a/railties/generators/scaffold/templates/style.css b/railties/generators/scaffold/templates/style.css
index 2db43b7fa1..8f512501bf 100644
--- a/railties/generators/scaffold/templates/style.css
+++ b/railties/generators/scaffold/templates/style.css
@@ -15,3 +15,39 @@ pre {
 a { color: #000; }
 a:visited { color: #666; }
 a:hover { color: #fff; background-color:#000; }
+
+.fieldWithErrors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#ErrorExplanation {
+  width: 400px;
+	border: 2px solid #red;
+	padding: 7px;
+	padding-bottom: 12px;
+	margin-bottom: 20px;
+	background-color: #f0f0f0;
+}
+
+#ErrorExplanation h2 {
+	text-align: left;
+	font-weight: bold;
+	padding: 5px 5px 5px 15px;
+	font-size: 12px;
+	margin: -7px;
+	background-color: #c00;
+	color: #fff;
+}
+
+#ErrorExplanation p {
+	color: #333;
+	margin-bottom: 0;
+	padding: 5px;
+}
+
+#ErrorExplanation ul li {
+	font-size: 12px;
+	list-style: square;
+}
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index ceb88f30ba..25a898c530 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -24,9 +24,7 @@
 require 'breakpoint'
 
 class Dispatcher
-  DEFAULT_SESSION_OPTIONS = { :database_manager => CGI::Session::PStore, :prefix => "ruby_sess.", :session_path => "/" }
-
-  def self.dispatch(cgi = CGI.new, session_options = DEFAULT_SESSION_OPTIONS)
+  def self.dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest.DEFAULT_SESSION_OPTIONS)
     Breakpoint.activate_drb("druby://localhost:#{BREAKPOINT_SERVER_PORT}", nil, !defined?(FastCGI)) if defined?(BREAKPOINT_SERVER_PORT)
 
     begin