summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-04 20:57:13 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-04 20:57:13 +0000
commit83618add817c1b405d67801d49b6937f0101bace (patch)
treec10dafc5bd2b7f8f45b227f4c484d30963c2d009
parentb8be74be61bddae508802203685903061dd5b4ed (diff)
* Fix a bug that caused link(foo) to succeed if page foo did not exist.
-rw-r--r--IkiWiki.pm1
-rw-r--r--debian/changelog3
-rw-r--r--doc/patchqueue.mdwn8
3 files changed, 7 insertions, 5 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index c272a294e..8f9bd990a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1027,6 +1027,7 @@ sub match_link ($$$) { #{{{
my $links = $IkiWiki::links{$page} or return undef;
return 0 unless @$links;
my $bestlink = IkiWiki::bestlink($from, $link);
+ return 0 unless length $bestlink;
foreach my $p (@$links) {
return 1 if $bestlink eq IkiWiki::bestlink($page, $p);
}
diff --git a/debian/changelog b/debian/changelog
index ee7af7399..0b8c28d1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,9 @@ ikiwiki (1.49) UNRELEASED; urgency=low
tracked properly.
* Make the OpenID library a reccommendation of the Debian package, rather
than just a suggests, since OpenID is enabled by default.
+ * Fix a bug that caused link(foo) to succeed if page foo did not exist.
- -- Joey Hess <joeyh@debian.org> Tue, 03 Apr 2007 20:40:27 -0400
+ -- Joey Hess <joeyh@debian.org> Wed, 04 Apr 2007 16:55:36 -0400
ikiwiki (1.48) unstable; urgency=low
diff --git a/doc/patchqueue.mdwn b/doc/patchqueue.mdwn
index 27025693e..09a63cae5 100644
--- a/doc/patchqueue.mdwn
+++ b/doc/patchqueue.mdwn
@@ -1,8 +1,8 @@
Since we have enough people working on ikiwiki to be dangerous, or at least
-to duplicate work without coordination, and since Joey is still the only
-one committing directly to the tree, here's a queue of suggested patches.
+to duplicate work without coordination, and since few people have direct
+commit access to the tree, here's a queue of suggested patches.
Feel free to either copy the patch inline, or link to one elsewhere (or nag
-Joey to open up anonymous svn access to this wiki so you can check in the
+[[Joey]] to open up anonymous svn access to this wiki so you can check in the
patches directly).
-[[inline pages="patchqueue/* and !patchqueue/done and !link(patchqueue/done) and !*/Discussion" rootpage="patchqueue" archive="yes"]]
+[[inline pages="patchqueue/* and !*/Discussion" rootpage="patchqueue" archive="yes"]]