* Add support for links of the form [[../foo]], this links to the page

* Fix code to make absolute urls for rss feeds, was missing some urls.
* Fix double-escaping of html entities in titles etc in rss feeds
  that occured if escaped characters were present in the page filename.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 499d3a71f773951e7700aea3ec668d8950b7c733..54bb1826cfb4178ad82e84cb6125e1f870cb2569 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -327,10 +327,18 @@ sub isinlinableimage ($) { #{{{
        $file=~/\.(png|gif|jpg|jpeg)$/i;
 } #}}}
 
        $file=~/\.(png|gif|jpg|jpeg)$/i;
 } #}}}
 

-sub pagetitle ($) { #{{{
+sub pagetitle ($;$) { #{{{

        my $page=shift;
        my $page=shift;

-       $page=~s/__(\d+)__/&#$1;/g;
+       my $unescaped=shift;
+
+       if ($unescaped) {
+               $page=~s/__(\d+)__/chr($1)/eg;
+       }
+       else {
+               $page=~s/__(\d+)__/&#$1;/g;
+       }

        $page=~y/_/ /;
        $page=~y/_/ /;

+

        return $page;
 } #}}}
 
        return $page;
 } #}}}
 

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 78a8813a3fe62903e20b4431544805bac16e135b..70b353ec5ef5970852677cf8ae02e4070641fdf4 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -37,7 +37,6 @@ sub checkconfig () { #{{{
                error("Must specify url to wiki with --url when using --rss or --atom");
        }
        if ($config{rss}) {
                error("Must specify url to wiki with --url when using --rss or --atom");
        }
        if ($config{rss}) {

-               print STDERR "!!\n";

                push @{$config{wiki_file_prune_regexps}}, qr/\.rss$/;
        }
        if ($config{atom}) {
                push @{$config{wiki_file_prune_regexps}}, qr/\.rss$/;
        }
        if ($config{atom}) {


@@ -265,8 +264,8 @@ sub absolute_urls ($$) { #{{{
        $url=~s/[^\/]+$//;
        
        $content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(#[^"]+)"/$1 href="$baseurl$2"/ig;
        $url=~s/[^\/]+$//;
        
        $content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(#[^"]+)"/$1 href="$baseurl$2"/ig;

-       $content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(?![^:]+:\/\/)([^"]+)"/$1 href="$url$2"/ig;
-       $content=~s/(<img(?:\s+(?:class|id)="?\w+"?)?)\s+src="(?![^:]+:\/\/)([^"]+)"/$1 src="$url$2"/ig;
+       $content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(?!\w+:\/\/)([^"]+)"/$1 href="$url$2"/ig;
+       $content=~s/(<img(?:\s+(?:class|id)="?\w+"?)?)\s+src="(?!\w+:\/\/)([^"]+)"/$1 src="$url$2"/ig;

        return $content;
 } #}}}
 
        return $content;
 } #}}}
 


@@ -300,7 +299,7 @@ sub genfeed ($$$$@) { #{{{
                my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
 
                $itemtemplate->param(
                my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
 
                $itemtemplate->param(

-                       title => pagetitle(basename($p)),
+                       title => pagetitle(basename($p), 1),

                        url => $u,
                        permalink => $u,
                        date_822 => date_822($pagectime{$p}),
                        url => $u,
                        permalink => $u,
                        date_822 => date_822($pagectime{$p}),


@@ -344,7 +343,7 @@ sub genfeed ($$$$@) { #{{{
 
        my $template=template($feedtype."page.tmpl", blind_cache => 1);
        $template->param(
 
        my $template=template($feedtype."page.tmpl", blind_cache => 1);
        $template->param(

-               title => $page ne "index" ? pagetitle($page) : $config{wikiname},
+               title => $page ne "index" ? pagetitle($page, 1) : $config{wikiname},

                wikiname => $config{wikiname},
                pageurl => $url,
                content => $content,
                wikiname => $config{wikiname},
                pageurl => $url,
                content => $content,


@@ -384,14 +383,14 @@ sub pingurl (@) { #{{{
        IkiWiki::unlockwiki();
 
        foreach my $page (keys %toping) {
        IkiWiki::unlockwiki();
 
        foreach my $page (keys %toping) {

-               my $title=pagetitle(basename($page));
+               my $title=pagetitle(basename($page), 0);

                my $url="$config{url}/".htmlpage($page);
                foreach my $pingurl (@{$config{pingurl}}) {
                        debug("Pinging $pingurl for $page");
                        eval {
                                my $client = RPC::XML::Client->new($pingurl);
                                my $req = RPC::XML::request->new('weblogUpdates.ping',
                my $url="$config{url}/".htmlpage($page);
                foreach my $pingurl (@{$config{pingurl}}) {
                        debug("Pinging $pingurl for $page");
                        eval {
                                my $client = RPC::XML::Client->new($pingurl);
                                my $req = RPC::XML::request->new('weblogUpdates.ping',

-                               $title, $url);
+                                       $title, $url);

                                my $res = $client->send_request($req);
                                if (! ref $res) {
                                        debug("Did not receive response to ping");
                                my $res = $client->send_request($req);
                                if (! ref $res) {
                                        debug("Did not receive response to ping");

diff --git a/debian/changelog b/debian/changelog
index 17c88df0736c9d6111b2d5755f05569d2fb46912..5c64cd84c0d3be1bbd26a7917332a5e093d969dd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,11 +18,14 @@ ikiwiki (1.36) UNRELEASED; urgency=low
     like, if you want.
   * Patch from Emanuele Aina to fix modification time code in mercurual
     backend.
     like, if you want.
   * Patch from Emanuele Aina to fix modification time code in mercurual
     backend.

-  * Add support for links of the form [[../foo]], this links to the page 
+  * Add support for links of the form [[../foo]], this links to the page

     foo a level higher in the directory hierarchy than the one it would link
     to by default.
     foo a level higher in the directory hierarchy than the one it would link
     to by default.

+  * Fix code to make absolute urls for rss feeds, was missing some urls.
+  * Fix double-escaping of html entities in titles etc in rss feeds
+    that occured if escaped characters were present in the page filename.

 
 

- -- Joey Hess <joeyh@debian.org>  Thu, 21 Dec 2006 15:10:03 -0500
+ -- Joey Hess <joeyh@debian.org>  Thu, 21 Dec 2006 16:28:54 -0500

 
 ikiwiki (1.35) unstable; urgency=low
 
 
 ikiwiki (1.35) unstable; urgency=low