From f14e2db66baccf86883b29ec000fd785e028adc6 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 4 Mar 2007 15:42:16 +0000 Subject: [PATCH] added support for links [[page name|displayed text]] git-svn-id: http://redmine.rubyforge.org/svn/branches/work@296 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- wiki/app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/app/helpers/application_helper.rb b/wiki/app/helpers/application_helper.rb index 1fcdb8382..09afadc61 100644 --- a/wiki/app/helpers/application_helper.rb +++ b/wiki/app/helpers/application_helper.rb @@ -94,7 +94,7 @@ module ApplicationHelper def textilizable(text) # turn wiki links in textile links: "text":url - text = text.gsub(/\[\[([^\]]+)\]\]/) {|m| "\"#{$1}\":/wiki/#{@project.id}/#{Wiki.titleize($1)}" } if @project + text = text.gsub(/\[\[([^\]\|]+)(\|([^\]\|]+))?\]\]/) {|m| "\"#{$3 || $1}\":/wiki/#{@project.id}/#{Wiki.titleize($1)}" } if @project text = (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize") ? auto_link(RedCloth.new(text, [:filter_html]).to_html) : simple_format(auto_link(h(text))) # turn "#id" patterns into links to issues text = text.gsub(/#(\d+)([^;\d])/, "#\\1\\2")