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

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
a592d6c4 · Jean-Philippe Lang · fb151463 · a592d6c4 · a592d6c4
Commit a592d6c4 authored Sep 11, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

redcloth3.rb lib/redcloth3.rb +1 -1

wiki_formatting.rb lib/redmine/wiki_formatting.rb +2 -2

No files found.
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -164,7 +164,7 @@
 #
 #  class RedCloth::Textile.new( str )

-class RedCloth < String
+class RedCloth3 < String

    VERSION = '3.0.4'
    DEFAULT_RULES = [:textile, :markdown]

--- 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]