aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-07-13 20:19:34 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-07-13 20:19:34 +0000
commiteabe03fb5bcb06b950d25e6c1e7881a441ab284d (patch)
tree35ac940e9afe98754ef7cb36a1ff6b228fdd97d2
parenta323aabd9a5cccdbcb552964af243911b2c46f80 (diff)
downloadikiwiki-eabe03fb5bcb06b950d25e6c1e7881a441ab284d.tar
ikiwiki-eabe03fb5bcb06b950d25e6c1e7881a441ab284d.tar.gz
* Fix links to stylesheets when usedirs is enabled.
-rw-r--r--IkiWiki/Plugin/meta.pm2
-rw-r--r--debian/changelog3
-rw-r--r--po/ikiwiki.pot2
3 files changed, 4 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 184146cfe..f498398a2 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -87,7 +87,7 @@ sub preprocess (@) { #{{{
if (! length $stylesheet) {
return "[[meta ".gettext("stylesheet not found")."]]";
}
- $meta{$page}.='<link href="'.$stylesheet.
+ $meta{$page}.='<link href="'.urlto($stylesheet, $page).
'" rel="'.encode_entities($rel).
'" title="'.encode_entities($title).
"\" style=\"text/css\" />\n";
diff --git a/debian/changelog b/debian/changelog
index e891ee161..72775cf54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ ikiwiki (2.4) UNRELEASED; urgency=low
* Support building on systems that lack asprintf.
* mercurial getctime is currently broken, apparently by some change in
mercurial version 0.9.4. Turn the failing test case into a TODO test case.
+ * Fix links to stylesheets when usedirs is enabled.
- -- Joey Hess <joeyh@debian.org> Wed, 11 Jul 2007 12:23:41 -0400
+ -- Joey Hess <joeyh@debian.org> Fri, 13 Jul 2007 16:18:34 -0400
ikiwiki (2.3) unstable; urgency=low
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index d70864ed2..9cdfb88ce 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: 2007-07-11 12:49-0400\n"
+"POT-Creation-Date: 2007-07-13 16:19-0400\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"