Leave wiki links untouched if target project doesn't exist or have no wiki.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2436 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
8cf3d7a492
commit
70efee1bc5
|
@ -418,7 +418,7 @@ module ApplicationHelper
|
||||||
:class => ('wiki-page' + (wiki_page ? '' : ' new')))
|
:class => ('wiki-page' + (wiki_page ? '' : ' new')))
|
||||||
else
|
else
|
||||||
# project or wiki doesn't exist
|
# project or wiki doesn't exist
|
||||||
title || page
|
all
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
all
|
all
|
||||||
|
|
|
@ -195,6 +195,9 @@ class ApplicationHelperTest < HelperTestCase
|
||||||
'-[[Another page|Page]] link-' => '<del><a href="/projects/ecookbook/wiki/Another_page" class="wiki-page">Page</a> link</del>',
|
'-[[Another page|Page]] link-' => '<del><a href="/projects/ecookbook/wiki/Another_page" class="wiki-page">Page</a> link</del>',
|
||||||
# escaping
|
# escaping
|
||||||
'![[Another page|Page]]' => '[[Another page|Page]]',
|
'![[Another page|Page]]' => '[[Another page|Page]]',
|
||||||
|
# project does not exist
|
||||||
|
'[[unknowproject:Start]]' => '[[unknowproject:Start]]',
|
||||||
|
'[[unknowproject:Start|Page title]]' => '[[unknowproject:Start|Page title]]',
|
||||||
}
|
}
|
||||||
@project = Project.find(1)
|
@project = Project.find(1)
|
||||||
to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
|
to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
|
||||||
|
|
Loading…
Reference in New Issue