From cb869abf0d576567b0f1e85f5d77f0baf4a07e26 Mon Sep 17 00:00:00 2001
From: Alexey Verkhovsky
diff --git a/app/views/file/file.rhtml b/app/views/file/file.rhtml
index 4216a9ed..9f67b9b8 100644
--- a/app/views/file/file.rhtml
+++ b/app/views/file/file.rhtml
@@ -5,7 +5,8 @@
<%= error_messages_for 'file' %>
-<%= form_tag({:controller => 'file', :web => @web_name, :action => 'file'}, {:multipart => true}) %>
+<%= form_tag({ :controller => 'file', :web => @web_name, :action => 'file' },
+ { 'multipart' => true , 'accept-charset' => 'utf-8' }) %>
<%= hidden_field 'file', 'file_name' %>
-<%= form_tag({}, {:multipart => true}) %>
+<%= form_tag({}, { 'multipart' => true, 'accept-charset' => 'utf-8' }) %>
File to upload:
diff --git a/app/views/navigation.rhtml b/app/views/navigation.rhtml
index 45bd413b..5735b472 100644
--- a/app/views/navigation.rhtml
+++ b/app/views/navigation.rhtml
@@ -17,7 +17,7 @@ end
<%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by RSS' %> |
<%= list_item 'Export', {:action => 'export'}, 'Download a zip with all the pages in this wiki', 'X' %> |
<%= form_tag({ :controller => 'wiki', :action => 'search', :web => @web.address},
- {'id' => 'navigationSearchForm', 'method' => 'get'}) %>
+ {'id' => 'navigationSearchForm', 'method' => 'get', 'accept-charset' => 'utf-8' }) %>
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 0c5bb596..6eda2570 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -9,8 +9,9 @@
<%= render 'wiki_words_help' %>
diff --git a/app/views/wiki/login.rhtml b/app/views/wiki/login.rhtml index 1885052e..ca277edc 100644 --- a/app/views/wiki/login.rhtml +++ b/app/views/wiki/login.rhtml @@ -2,7 +2,7 @@
<%= form_tag({ :controller => 'wiki', :action => 'authenticate', :web => @web.address}, - { 'name' => 'loginForm', 'id' => 'loginForm', 'method' => 'post'}) + { 'name' => 'loginForm', 'id' => 'loginForm', 'method' => 'post', 'accept-charset' => 'utf-8' }) %>
This web is password-protected. Please enter the password. diff --git a/app/views/wiki/new.rhtml b/app/views/wiki/new.rhtml index 95136007..fe09a91b 100644 --- a/app/views/wiki/new.rhtml +++ b/app/views/wiki/new.rhtml @@ -9,8 +9,9 @@ <%= render 'wiki_words_help' %> -<%= form_tag({ :action => 'save', :web => @web.address, :id => @page_name}, - {'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();'}) +<%= form_tag({ :action => 'save', :web => @web.address, :id => @page_name }, + { 'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();', + 'accept-charset' => 'utf-8' }) %>
diff --git a/app/views/wiki/rollback.rhtml b/app/views/wiki/rollback.rhtml index 410cc5d5..82daab5c 100644 --- a/app/views/wiki/rollback.rhtml +++ b/app/views/wiki/rollback.rhtml @@ -7,7 +7,8 @@ <%= "
Please correct the error that caused this error in rendering:
#{@params["msg"]}