From 48ee59e39365b27983eaf6acf446c58828e5f01f Mon Sep 17 00:00:00 2001 From: Jacques Distler Date: Wed, 10 Jun 2009 20:49:48 -0500 Subject: [PATCH] Fix a WikiReference Bug Wikilinks to redirected pages are valid links. --- app/models/wiki_reference.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/models/wiki_reference.rb b/app/models/wiki_reference.rb index ba5ba8c3..f94463c2 100644 --- a/app/models/wiki_reference.rb +++ b/app/models/wiki_reference.rb @@ -13,10 +13,8 @@ class WikiReference < ActiveRecord::Base validates_inclusion_of :link_type, :in => [LINKED_PAGE, WANTED_PAGE, REDIRECTED_PAGE, INCLUDED_PAGE, CATEGORY, AUTHOR, FILE, WANTED_FILE] def self.link_type(web, page_name) - if web.has_page?(page_name) + if web.has_page?(page_name) || self.page_that_redirects_for(web, page_name) LINKED_PAGE - elsif self.page_that_redirects_for(web, page_name) - REDIRECTED_PAGE else WANTED_PAGE end