summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorYOSHITANI Mitsuhiro <luckval@gmail.com>2013-07-10 17:11:59 (GMT)
committerYOSHITANI Mitsuhiro <luckval@gmail.com>2013-07-10 17:11:59 (GMT)
commitd86f0fcd81bc05e2e728e79387280c5bcc2ed105 (patch)
treec85b4283a90c274f017d3ee92281c5acf1823407 /app
parentf6b0edc91ec7db777da3821bac1d3b855bf985c0 (diff)
downloadwiki_external_filter-d86f0fcd81bc05e2e728e79387280c5bcc2ed105.zip
wiki_external_filter-d86f0fcd81bc05e2e728e79387280c5bcc2ed105.tar.gz
wiki_external_filter-d86f0fcd81bc05e2e728e79387280c5bcc2ed105.tar.bz2
fix header hijacking
Diffstat (limited to 'app')
-rw-r--r--app/helpers/wiki_external_filter_helper.rb6
-rw-r--r--app/views/wiki_external_filter/_headers.html.erb (renamed from app/views/wiki_external_filter/headers.html.erb)0
-rw-r--r--app/views/wiki_external_filter/_macro_flash-video.html.erb (renamed from app/views/wiki_external_filter/macro_flash-video.html.erb)0
-rw-r--r--app/views/wiki_external_filter/_macro_image.html.erb (renamed from app/views/wiki_external_filter/macro_image.html.erb)0
-rw-r--r--app/views/wiki_external_filter/_macro_svg.html.erb (renamed from app/views/wiki_external_filter/macro_svg.html.erb)0
-rw-r--r--app/views/wiki_external_filter/_macro_text.html.erb (renamed from app/views/wiki_external_filter/macro_text.html.erb)0
6 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/wiki_external_filter_helper.rb b/app/helpers/wiki_external_filter_helper.rb
index 598cbfc..9af8c43 100644
--- a/app/helpers/wiki_external_filter_helper.rb
+++ b/app/helpers/wiki_external_filter_helper.rb
@@ -151,17 +151,17 @@ module WikiExternalFilterHelper
result[:render_type] = 'block'
result[:wiki_name] = wiki_name
result[:inside] = render_common(result)
- html = render_to_string(:template => 'wiki_external_filter/block', :layout => false, :locals => result).chop
+ html = render_to_string(:partial=> 'wiki_external_filter/block', :locals => result).chop
html << headers_common(result).chop
html
end
def render_common(result)
- render_to_string :template => "wiki_external_filter/macro_#{result[:template]}", :layout => false, :locals => result
+ render_to_string :partial => "wiki_external_filter/macro_#{result[:template]}", :locals => result
end
def headers_common(result)
- render_to_string :template => 'wiki_external_filter/headers', :layout => false, :locals => result
+ render_to_string :partial => 'wiki_external_filter/headers', :locals => result
end
class Macro
diff --git a/app/views/wiki_external_filter/headers.html.erb b/app/views/wiki_external_filter/_headers.html.erb
index 8354618..8354618 100644
--- a/app/views/wiki_external_filter/headers.html.erb
+++ b/app/views/wiki_external_filter/_headers.html.erb
diff --git a/app/views/wiki_external_filter/macro_flash-video.html.erb b/app/views/wiki_external_filter/_macro_flash-video.html.erb
index 48d5f93..48d5f93 100644
--- a/app/views/wiki_external_filter/macro_flash-video.html.erb
+++ b/app/views/wiki_external_filter/_macro_flash-video.html.erb
diff --git a/app/views/wiki_external_filter/macro_image.html.erb b/app/views/wiki_external_filter/_macro_image.html.erb
index dfb52fd..dfb52fd 100644
--- a/app/views/wiki_external_filter/macro_image.html.erb
+++ b/app/views/wiki_external_filter/_macro_image.html.erb
diff --git a/app/views/wiki_external_filter/macro_svg.html.erb b/app/views/wiki_external_filter/_macro_svg.html.erb
index ee9f751..ee9f751 100644
--- a/app/views/wiki_external_filter/macro_svg.html.erb
+++ b/app/views/wiki_external_filter/_macro_svg.html.erb
diff --git a/app/views/wiki_external_filter/macro_text.html.erb b/app/views/wiki_external_filter/_macro_text.html.erb
index a1628b4..a1628b4 100644
--- a/app/views/wiki_external_filter/macro_text.html.erb
+++ b/app/views/wiki_external_filter/_macro_text.html.erb