* Fix links to stylesheets when usedirs is enabled.

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 184146cfee5c558a23426a6b36438f8e681b41f9..f498398a28c13cce404b1ae08e9500e83f678f7c 100644 (file)
--- 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")."]]";
                }
                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";
                        '" rel="'.encode_entities($rel).
                        '" title="'.encode_entities($title).
                        "\" style=\"text/css\" />\n";

diff --git a/debian/changelog b/debian/changelog
index e891ee1611cf07d87cab0d91ec35d2706270dbd7..72775cf546a4ee5af9bdbc544224f9b2f44ea1a8 100644 (file)
--- 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.
   * 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
 
 
 ikiwiki (2.3) unstable; urgency=low
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index d70864ed20dc997193ada9b304dfafa612067ba8..9cdfb88ce802f5ae6a3be9189f377e872f3c1250 100644 (file)
--- 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"
 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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"