From d548d9338e78f68146df8688c914e7d7468f7bba Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 24 May 2014 16:33:13 +0000
Subject: [PATCH] Merged r13105 (#16669).

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13158 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/wiki_formatting/markdown/formatter.rb           | 3 ++-
 test/unit/lib/redmine/wiki_formatting/markdown_formatter.rb | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/redmine/wiki_formatting/markdown/formatter.rb b/lib/redmine/wiki_formatting/markdown/formatter.rb
index c340fc1ff..22c22c82b 100644
--- a/lib/redmine/wiki_formatting/markdown/formatter.rb
+++ b/lib/redmine/wiki_formatting/markdown/formatter.rb
@@ -127,7 +127,8 @@ module Redmine
             :space_after_headers => true,
             :tables => true,
             :strikethrough => true,
-            :superscript => true
+            :superscript => true,
+            :no_intra_emphasis => true
           )
         end
       end
diff --git a/test/unit/lib/redmine/wiki_formatting/markdown_formatter.rb b/test/unit/lib/redmine/wiki_formatting/markdown_formatter.rb
index 458bc43bd..98a55eb5f 100644
--- a/test/unit/lib/redmine/wiki_formatting/markdown_formatter.rb
+++ b/test/unit/lib/redmine/wiki_formatting/markdown_formatter.rb
@@ -28,6 +28,10 @@ class Redmine::WikiFormatting::MarkdownFormatterTest < ActionView::TestCase
     assert_equal "<p><strong>foo</strong></p>", @formatter.new("**foo**").to_html.strip
   end
 
+  def test_not_set_intra_emphasis
+    assert_equal "<p>foo_bar_baz</p>", @formatter.new("foo_bar_baz").to_html.strip
+  end
+
   def test_wiki_links_should_be_preserved
     text = 'This is a wiki link: [[Foo]]'
     assert_include '[[Foo]]', @formatter.new(text).to_html
-- 
2.39.5