Upgrade to Rails 2.0.2
Upgraded to Rails 2.0.2, except that we maintain vendor/rails/actionpack/lib/action_controller/routing.rb from Rail 1.2.6 (at least for now), so that Routes don't change. We still get to enjoy Rails's many new features. Also fixed a bug in Chunk-handling: disable WikiWord processing in tags (for real this time).
This commit is contained in:
parent
0f6889e09f
commit
6873fc8026
1083 changed files with 52810 additions and 41058 deletions
|
@ -150,7 +150,7 @@ module ActionController
|
|||
def send_not_modified(controller)
|
||||
controller.logger.info "Send Not Modified"
|
||||
controller.response.headers['ETag'] = %{"#{MD5.new(fragment_body(controller)).to_s}"}
|
||||
controller.render(:text => "", :status => 304)
|
||||
controller.send(:render, {:text => "", :status => 304})
|
||||
end
|
||||
|
||||
def client_has_latest?(cache_entry, controller)
|
||||
|
|
|
@ -105,7 +105,12 @@ module MaRuKu
|
|||
|
||||
xml = ""
|
||||
if (content_only)
|
||||
body.write(xml,indent,transitive=true,ie_hack);
|
||||
if $rexml_new_version
|
||||
formatter = REXML::Formatters::Default.new(ie_hack)
|
||||
formatter.write(body, xml)
|
||||
else
|
||||
body.write(xml,indent,transitive=true,ie_hack);
|
||||
end
|
||||
else
|
||||
doc2 = Document.new("<div>"+S5_external+"</div>",{:respect_whitespace =>:all})
|
||||
doc2.root.children.each{ |child| head << child }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue