kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Jean-Philippe Lang 2008-09-11 17:19:26 +00:00
parent fb151463eb
commit a592d6c40d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redcloth.rb → lib/redcloth3.rb
View File

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

4
lib/redmine/wiki_formatting.rb
View File

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