diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-09-11 17:19:26 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-09-11 17:19:26 +0000 |
| commit | a592d6c40dd8406296ae332dbe3b2dd152648449 (patch) | |
| tree | 855905ecf1c2c19ec2423584fca9e3c93dcd88dc /lib | |
| parent | fb151463ebf8cddccb32630cbdc46bfaa1760778 (diff) | |
| download | redmine-a592d6c40dd8406296ae332dbe3b2dd152648449.tar.gz redmine-a592d6c40dd8406296ae332dbe3b2dd152648449.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redcloth3.rb (renamed from lib/redcloth.rb) | 2 | ||||
| -rw-r--r-- | lib/redmine/wiki_formatting.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/redcloth.rb b/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] |