Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
  • Loading branch information
distler committed Aug 14, 2012
2 parents 1156728 + d027731 commit 133eca2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/page_renderer.rb
Expand Up @@ -102,7 +102,7 @@ def find_wiki_words(rendering_result)
the_wiki_words = wiki_links(rendering_result)
# Exclude backslash-escaped wiki words, such as \WikiWord, as well as links to files
# and pictures, such as [[foo.txt:file]] or [[foo.jpg:pic]]
the_wiki_words.delete_if { |link| link.escaped? or [:pic, :file, :audio, :video, :delete].include?(link.link_type) }
the_wiki_words.delete_if { |link| link.escaped? or [:pic, :file, :cdf, :audio, :video, :delete].include?(link.link_type) }
# convert to the list of unique page names
the_wiki_words.map { |link| ( link.page_name ) }.uniq
end
Expand All @@ -114,7 +114,7 @@ def wiki_files

def find_wiki_files(rendering_result)
the_wiki_files = wiki_links(rendering_result)
the_wiki_files.delete_if { |link| ![:pic, :file, :audio, :video].include?(link.link_type) }
the_wiki_files.delete_if { |link| ![:pic, :file, :cdf, :audio, :video].include?(link.link_type) }
the_wiki_files.map { |link| ( link.page_name ) }.uniq
end

Expand Down

0 comments on commit 133eca2

Please sign in to comment.