summaryrefslogtreecommitdiffstats
path: root/app/helpers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-03-24 09:16:33 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-03-24 09:16:33 +0000
commit3cd50da3b0f4ef0ac73484d9c6e2d1ea5a13b673 (patch)
treebb6d75f6049d87b34f8098bfbc59abe4f107ac2b /app/helpers
parent0125ec3b48d1ebd7bf66ee29a4e2cc7d9def732b (diff)
downloadredmine-3cd50da3b0f4ef0ac73484d9c6e2d1ea5a13b673.tar.gz
redmine-3cd50da3b0f4ef0ac73484d9c6e2d1ea5a13b673.zip
text formatting setting cached at controller level
git-svn-id: http://redmine.rubyforge.org/svn/trunk@375 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d1597e8d1..e7b692fc6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -127,7 +127,8 @@ module ApplicationHelper
text = text.gsub(/r(\d+)(?=\b)/) {|m| "\"r#{$1}\":" + url_for(:controller => 'repositories', :action => 'revision', :id => @project.id, :rev => $1) } if @project
# finally textilize text
- text = (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize") ? auto_link(RedCloth.new(text, [:filter_html]).to_html) : simple_format(auto_link(h(text)))
+ @do_textilize ||= (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize")
+ text = @do_textilize ? auto_link(RedCloth.new(text, [:filter_html]).to_html) : simple_format(auto_link(h(text)))
end
def error_messages_for(object_name, options = {})