aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-02-20 08:57:09 +0100
committerPratik Naik <pratiknaik@gmail.com>2009-02-20 08:57:09 +0100
commit8a9ef83372bb36b901daef88a21d27b74e9b1414 (patch)
treebd52b2d4d14dcda6b53312757c7fb211c52fe6fc
parent74fe58add5d6d83038e7db3c79024b6789a2ec25 (diff)
downloadrails-8a9ef83372bb36b901daef88a21d27b74e9b1414.tar.gz
rails-8a9ef83372bb36b901daef88a21d27b74e9b1414.tar.bz2
rails-8a9ef83372bb36b901daef88a21d27b74e9b1414.zip
Fix the fucking rake task
-rw-r--r--railties/guides/rails_guides.rb1
-rw-r--r--railties/guides/rails_guides/generator.rb2
-rw-r--r--railties/guides/source/credits.erb.textile2
3 files changed, 3 insertions, 2 deletions
diff --git a/railties/guides/rails_guides.rb b/railties/guides/rails_guides.rb
index 7617dff5a3..a5a4fdb079 100644
--- a/railties/guides/rails_guides.rb
+++ b/railties/guides/rails_guides.rb
@@ -3,6 +3,7 @@ $: << pwd
$: << File.join(pwd, "../../activesupport/lib")
$: << File.join(pwd, "../../actionpack/lib")
+require "action_controller"
require "action_view"
# Require rubygems after loading Action View
diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb
index 28aab4bada..95e7add8ef 100644
--- a/railties/guides/rails_guides/generator.rb
+++ b/railties/guides/rails_guides/generator.rb
@@ -37,7 +37,7 @@ module RailsGuides
if guide =~ /\.erb\.textile/
# Generate the erb pages with textile formatting - e.g. index/authors
- result = view.render(:layout => 'layout', :file => guide)
+ result = view.render(:layout => 'layout', :file => name)
f.write textile(result)
else
body = File.read(File.join(view_path, guide))
diff --git a/railties/guides/source/credits.erb.textile b/railties/guides/source/credits.erb.textile
index 91e3473cc7..441ea60ffe 100644
--- a/railties/guides/source/credits.erb.textile
+++ b/railties/guides/source/credits.erb.textile
@@ -26,7 +26,7 @@ p. We'd like to thank the following people for their tireless contributions to t
<% end %>
<% author('Pratik Naik', 'lifo') do %>
- Pratik Naik is a Ruby on Rails consultant with "ActionRails":http://www.actionrails.com and also a member of the "Rails core team":http://rubyonrails.com/core. He blogs semi-regularly at "has_many :bugs, :through => :rails":http://m.onkey.org and has an active "twitter account":http://twitter.com/lifo.
+ Pratik Naik is a Ruby on Rails consultant with "ActionRails":http://www.actionrails.com and also a member of the "Rails core team":http://rubyonrails.com/core. He maintains a blog at "has_many :bugs, :through => :rails":http://m.onkey.org and has an active "twitter account":http://twitter.com/lifo.
<% author('Emilio Tagua', 'miloops') do %>
Emilio Tagua -- a.k.a. miloops -- is an Argentinian entrepreneur, developer, open source contributor and Rails evangelist. Cofounder of "Eventioz":http://www.eventioz.com. He has been using Rails since 2006 and contributing since early 2008. Can be found at gmail, twitter, freenode, everywhere as miloops.