merge with november_presentation

This commit is contained in:
chris2tof committed 2011-12-20 16:47:17 +08:00
1 parent afbffe37d5
commit a09f8e4551
101 files changed
+891 -10632

No files matched your search

+2 -2
View File
@@ -36,9 +36,9 @@ class ApplicationController < ActionController::Base
end
# Render the page
def render_page
def render_page(url = nil)
if @item
render :text => parse_page(@item)
render :text => parse_page(@item,url)
else
render :text => '404 Not Found'
end