Fixes backslashes escaping when quoting issue description/note (#5129).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3616 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
883e7b1b94
commit
b93cf03483
@ -229,10 +229,13 @@ class IssuesController < ApplicationController
|
|||||||
user = @issue.author
|
user = @issue.author
|
||||||
text = @issue.description
|
text = @issue.description
|
||||||
end
|
end
|
||||||
content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
|
# Replaces pre blocks with [...]
|
||||||
content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
|
text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
|
||||||
|
content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
|
||||||
|
content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
|
||||||
|
|
||||||
render(:update) { |page|
|
render(:update) { |page|
|
||||||
page.<< "$('notes').value = \"#{content}\";"
|
page.<< "$('notes').value = \"#{escape_javascript content}\";"
|
||||||
page.show 'update'
|
page.show 'update'
|
||||||
page << "Form.Element.focus('notes');"
|
page << "Form.Element.focus('notes');"
|
||||||
page << "Element.scrollTo('update');"
|
page << "Element.scrollTo('update');"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user