* Fix links to stylesheets when usedirs is enabled.

[ikiwiki.git] / IkiWiki / Plugin / meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index ec7a2d0813337a53f4e884ae41e42a7363ea2df8..f498398a28c13cce404b1ae08e9500e83f678f7c 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::meta;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 my %meta;
 my %title;
 
 my %meta;
 my %title;


@@ -65,7 +65,7 @@ sub preprocess (@) { #{{{
                }
        }
        elsif ($key eq 'title') {
                }
        }
        elsif ($key eq 'title') {

-               $title{$page}=encode_entities($value);
+               $title{$page}=HTML::Entities::encode_numeric($value);

        }
        elsif ($key eq 'permalink') {
                $permalink{$page}=$value;
        }
        elsif ($key eq 'permalink') {
                $permalink{$page}=$value;


@@ -87,10 +87,10 @@ 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).
                        '" rel="'.encode_entities($rel).
                        '" title="'.encode_entities($title).

-                       "style=\"text/css\" />\n";
+                       "\" style=\"text/css\" />\n";

        }
        elsif ($key eq 'openid') {
                if (exists $params{server}) {
        }
        elsif ($key eq 'openid') {
                if (exists $params{server}) {