Renames bundled RedCloth to RedCloth3 to avoid RedCloth 4 to be loaded instead (#1754).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1800 e93f8b46-1217-0410-a6f0-8f06a7374b81
pull/351/head
Jean-Philippe Lang 16 years ago
parent fb151463eb
commit a592d6c40d
  1. 2
      lib/redcloth3.rb
  2. 4
      lib/redmine/wiki_formatting.rb

@ -164,7 +164,7 @@
#
# class RedCloth::Textile.new( str )
class RedCloth < String
class RedCloth3 < String
VERSION = '3.0.4'
DEFAULT_RULES = [:textile, :markdown]

@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require 'redcloth'
require 'redcloth3'
require 'coderay'
module Redmine
@ -23,7 +23,7 @@ module Redmine
private
class TextileFormatter < RedCloth
class TextileFormatter < RedCloth3
# auto_link rule after textile rules so that it doesn't break !image_url! tags
RULES = [:textile, :block_markdown_rule, :inline_auto_link, :inline_auto_mailto, :inline_toc, :inline_macros]

Loading…
Cancel
Save