Merged r16823 (#26445).

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16824 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3409bb7be6355b2986594d84e9213309737aac26..b8cb965c7bb299b1331a09f088a81f1d436292aa 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -651,7 +651,7 @@ module ApplicationHelper
     if options[:formatting] == false
       text = h(text)
     else
-      formatting = options[:formatting] || Setting.text_formatting
+      formatting = Setting.text_formatting
       text = Redmine::WikiFormatting.to_html(formatting, text, :object => obj, :attribute => attr)
     end
 

diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 020b4636c96c47ed4813f77a1b3b0737b762c380..3bb018be1707aa1b1b635ce91f00cce1c0279123 100644 (file)
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -1297,6 +1297,14 @@ RAW
     end
   end
 
+  def test_textilizable_with_formatting_set_to_false_should_not_format_text
+    assert_equal '*text*', textilizable("*text*", :formatting => false)
+  end
+
+  def test_textilizable_with_formatting_set_to_true_should_format_text
+    assert_equal '<p><strong>text</strong></p>', textilizable("*text*", :formatting => true)
+  end
+
   def test_parse_redmine_links_should_handle_a_tag_without_attributes
     text = '<a>http://example.com</a>'
     expected = text.dup