From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 24 Feb 2008 21:40:34 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/d4c7b44ea0cb77b40ffcd0a65d2d6caab0a69e09?hp=012fcf781a13b8abb623101310620ad68f397c3d

Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
---

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index cfb2c0b1d..87cb9c3f3 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -354,9 +354,9 @@ sub cgi_editpage ($$) { #{{{
 		});
 		$form->tmpl_param("page_preview",
 			htmlize($page, $type,
-			linkify($page, "",
-			preprocess($page, $page,
-			filter($page, $page, $content), 0, 1))));
+			linkify($page, "/",
+			preprocess($page, "/",
+			filter($page, "/", $content), 0, 1))));
 		# previewing may have created files on disk
 		saveindex();
 	}
diff --git a/debian/changelog b/debian/changelog
index 093ca0f6c..f0ca4c754 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,7 @@ ikiwiki (2.40) UNRELEASED; urgency=low
     always available. So it was just removed.
   * Disable taint checking for all builds as people keep complaining about it,
     and since all versions of perl seem to be hopelessly broken.
+  * Fix links generated by preprocessor directives when previewing.
 
  -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 13:18:58 -0800
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 1ccb583a7..8be9e2734 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-24 15:37-0500\n"
+"POT-Creation-Date: 2008-02-24 16:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"