From 5d88146861ac237ac89cbed2e90a985b9c3bfdc2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 4 Aug 2010 08:24:47 -0400 Subject: Fixes a bug that prevented matching deleted pages when using the page() PageSpec. --- IkiWiki.pm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'IkiWiki.pm') diff --git a/IkiWiki.pm b/IkiWiki.pm index e08d02922..df8abe2c2 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2439,13 +2439,16 @@ sub match_internal ($$;@) { sub match_page ($$;@) { my $page=shift; my $match=match_glob($page, shift, @_); - if ($match && ! (exists $IkiWiki::pagesources{$page} - && defined IkiWiki::pagetype($IkiWiki::pagesources{$page}))) { - return IkiWiki::FailReason->new("$page is not a page"); - } - else { - return $match; + if ($match) { + my $source=exists $IkiWiki::pagesources{$page} ? + $IkiWiki::pagesources{$page} : + $IkiWiki::delpagesources{$page}; + my $type=defined $source ? IkiWiki::pagetype($source) : undef; + if (! defined $type) { + return IkiWiki::FailReason->new("$page is not a page"); + } } + return $match; } sub match_link ($$;@) { -- cgit v1.2.3 Unnamed repository; edit this file 'description' to name the repository.Jonas Smedegaard
summaryrefslogtreecommitdiff
path: root/tags/a3/a6/2DFC5800-6A7D-4C97-AD11-161E808190B5@kaospilot.dk/unread
diff options
context:
space:
mode:
Diffstat (limited to 'tags/a3/a6/2DFC5800-6A7D-4C97-AD11-161E808190B5@kaospilot.dk/unread')
-rw-r--r--tags/a3/a6/2DFC5800-6A7D-4C97-AD11-161E808190B5@kaospilot.dk/unread0
1 files changed, 0 insertions, 0 deletions