From 4508f1ca91239d6a258e4374730beba6b6eb8993 Mon Sep 17 00:00:00 2001
From: Nicolas Chuche <nicolas.chuche@barna.be>
Date: Sun, 14 Sep 2008 15:32:30 +0000
Subject: [PATCH]  r18536@gaspard (orig r1800):  jplang | 2008-09-11 19:19:26
 +0200  Renames bundled RedCloth to RedCloth3 to avoid RedCloth 4 to be loaded
 instead (#1754).

git-svn-id: http://redmine.rubyforge.org/svn/branches/nbc@1836 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/{redcloth.rb => redcloth3.rb} | 2 +-
 lib/redmine/wiki_formatting.rb    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/{redcloth.rb => redcloth3.rb} (99%)

diff --git a/lib/redcloth.rb b/lib/redcloth3.rb
similarity index 99%
rename from lib/redcloth.rb
rename to lib/redcloth3.rb
index df19de22d..b2e44359e 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth3.rb
@@ -164,7 +164,7 @@
 #
 #  class RedCloth::Textile.new( str )
 
-class RedCloth < String
+class RedCloth3 < String
 
     VERSION = '3.0.4'
     DEFAULT_RULES = [:textile, :markdown]
diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 8c18d547f..649edfeff 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -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]