Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1

2012-01-02 05:54:18 -08:00 · 2012-01-02 05:54:18 -08:00 · 81fc524fdc
commit 81fc524fdc
parent 912251d49b a65a871e19
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/locomotive/robots_controller.rb
+++ b/app/controllers/locomotive/robots_controller.rb
@ -10,7 +10,7 @@ module Locomotive
    respond_to :txt

    def show
-      template = Liquid::Template.parse(current_site.robots_txt)
+      template = ::Liquid::Template.parse(current_site.robots_txt)
      render :text => template.render('request_host' => self.request.host.downcase)
    end