summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-02-27 23:44:16 +0000
committerGo MAEDA <maeda@farend.jp>2019-02-27 23:44:16 +0000
commit0a23eabdce9cff8f7744097a068d9531c6144b1b (patch)
tree805afc60724a3c38ed993d05154f121d3ca84651 /app
parent597f1406c73abaf75589882b51ecd805c8f3bbd0 (diff)
downloadredmine-0a23eabdce9cff8f7744097a068d9531c6144b1b.tar.gz
redmine-0a23eabdce9cff8f7744097a068d9531c6144b1b.zip
Cannot make cross-project wiki link if the project name includes square brackets (#30256).
Patch by Yuichi HARADA. git-svn-id: http://svn.redmine.org/redmine/trunk@17906 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e250c20ee..8fa56ac55 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -787,7 +787,7 @@ module ApplicationHelper
# [[project:mypage]]
# [[project:mypage|mytext]]
def parse_wiki_links(text, project, obj, attr, only_path, options)
- text.gsub!(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
+ text.gsub!(/(!)?(\[\[([^\n\|]+?)(\|([^\n\|]+?))?\]\])/) do |m|
link_project = project
esc, all, page, title = $1, $2, $3, $5
if esc.nil?