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

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
70efee1b · Jean-Philippe Lang · 8cf3d7a4 · 70efee1b · 70efee1b
Commit 70efee1b authored Feb 10, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

application_helper.rb app/helpers/application_helper.rb +1 -1

application_helper_test.rb test/unit/helpers/application_helper_test.rb +3 -0

No files found.
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -418,7 +418,7 @@ module ApplicationHelper
                                   :class => ('wiki-page' + (wiki_page ? '' : ' new')))
        else
          # project or wiki doesn't exist
-          title || page
+          all
        end
      else
        all

--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -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>',
      # escaping
      '![[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)
    to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }