From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Tue, 20 Feb 2007 01:49:52 +0000 (+0000)
Subject: fix a bug
X-Git-Tag: 1.44~156
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1081aa1ee5cf8b0bf64b1b0a804091b48b620c39;p=ikiwiki.git

fix a bug
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2392c787b..d2fde957c 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -455,6 +455,7 @@ sub htmllink ($$$;$$$) { #{{{
 	if (! $noimageinline && isinlinableimage($bestlink)) {
 		return "<img src=\"$bestlink\" alt=\"$linktext\" />";
 	}
+
 	return "<a href=\"$bestlink\">$linktext</a>";
 } #}}}
 
@@ -489,8 +490,9 @@ sub linkify ($$$) { #{{{
 	my $content=shift;
 
 	$content =~ s{(\\?)$config{wiki_link_regexp}}{
-		$2 ? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
-		   : ( $1 ? "[[$3]]" :    htmllink($lpage, $page, titlepage($3)))
+		defined $2
+			? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
+			: ( $1 ? "[[$3]]"    : htmllink($lpage, $page, titlepage($3)))
 	}eg;
 	
 	return $content;
diff --git a/debian/changelog b/debian/changelog
index 2e5f1b990..30cdc6524 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (1.44) UNRELEASED; urgency=low
     http://openid.net/login-bg.gif into their wiki.
   * Allow setting NOTAINT=1 when building the wiki to remove taint checking
     flags, which can be useful on some hosting providers.
+  * Fix a bug that made links like [[0|foo]] use "foo" as the link text,
+    instead of "0".
 
  -- Joey Hess <joeyh@debian.org>  Mon, 19 Feb 2007 20:08:24 -0500