deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2009-06-06 21:09:30 -05:00
commit 2995354b3a
11 changed files with 92 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/page_set.rb
View file

@ -67,8 +67,8 @@ class PageSet < Array
if never_orphans.include? page.name
false
else
references = WikiReference.pages_that_reference(@web, page.name) +
WikiReference.pages_redirected_to(@web, page.name)
references = (WikiReference.pages_that_reference(@web, page.name) +
WikiReference.pages_redirected_to(@web, page.name)).uniq
references.empty? or references == [page.name]
end
}

6
app/models/wiki_reference.rb
View file

@ -63,9 +63,9 @@ class WikiReference < ActiveRecord::Base
redirected_pages = []
page = web.page(page_name)
redirected_pages.concat page.redirects
redirected_pages.concat Thread.current[:page_redirects][page.name] if
Thread.current[:page_redirects] && Thread.current[:page_redirects][page.name]
redirected_pages.uniq.each { |name| names = names + self.pages_that_reference(web, name) }
redirected_pages.concat Thread.current[:page_redirects][page] if
Thread.current[:page_redirects] && Thread.current[:page_redirects][page]
redirected_pages.uniq.each { |name| names.concat self.pages_that_reference(web, name) }
names.uniq
end