update

[git.ikiwiki.info.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index f89209a1b70e07e6bdbc65f95abdb6e685e66dbb..644cb588d6d0283237f62d92208e58011642ee3a 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -49,6 +49,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "core",

                },
                rss => {
                        type => "boolean",
                },
                rss => {
                        type => "boolean",


@@ -209,7 +210,7 @@ sub preprocess_inline (@) {
                if ($params{show}) {
                        $num=$params{show};
                }
                if ($params{show}) {
                        $num=$params{show};
                }

-               if ($params{feedshow} && $num < $params{feedshow}) {
+               if ($params{feedshow} && $num < $params{feedshow} && $num > 0) {

                        $num=$params{feedshow};
                }
                if ($params{skip} && $num) {
                        $num=$params{feedshow};
                }
                if ($params{skip} && $num) {


@@ -357,9 +358,9 @@ sub preprocess_inline (@) {
                                        my $file = $pagesources{$page};
                                        my $type = pagetype($file);
                                        if ($config{discussion}) {
                                        my $file = $pagesources{$page};
                                        my $type = pagetype($file);
                                        if ($config{discussion}) {

-                                               if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
+                                               if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&

                                                    (length $config{cgiurl} ||
                                                    (length $config{cgiurl} ||

-                                                    exists $links{$page."/".$config{discussionpage}})) {
+                                                    exists $pagesources{$page."/".lc($config{discussionpage})})) {

                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,
                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,


@@ -369,9 +370,12 @@ sub preprocess_inline (@) {
                                                                        forcesubpage => 1));
                                                }
                                        }
                                                                        forcesubpage => 1));
                                                }
                                        }

-                                       if (length $config{cgiurl} && defined $type) {
+                                       if (length $config{cgiurl} &&
+                                           defined $type &&
+                                           IkiWiki->can("cgi_editpage")) {

                                                $template->param(have_actions => 1);
                                                $template->param(editurl => cgiurl(do => "edit", page => $page));
                                                $template->param(have_actions => 1);
                                                $template->param(editurl => cgiurl(do => "edit", page => $page));

+

                                        }
                                }
        
                                        }
                                }
        


@@ -423,6 +427,8 @@ sub preprocess_inline (@) {
                }
        }
        
                }
        }
        

+       clear_inline_content_cache();
+

        return $ret if $raw || $nested;
        push @inline, $ret;
        return "<div class=\"inline\" id=\"$#inline\"></div>\n\n";
        return $ret if $raw || $nested;
        push @inline, $ret;
        return "<div class=\"inline\" id=\"$#inline\"></div>\n\n";


@@ -437,25 +443,42 @@ sub pagetemplate_inline (@) {
                if exists $feedlinks{$page} && $template->query(name => "feedlinks");
 }
 
                if exists $feedlinks{$page} && $template->query(name => "feedlinks");
 }
 

+{
+my %inline_content;
+my $cached_destpage="";
+

 sub get_inline_content ($$) {
        my $page=shift;
        my $destpage=shift;
        
 sub get_inline_content ($$) {
        my $page=shift;
        my $destpage=shift;
        

+       if (exists $inline_content{$page} && $cached_destpage eq $destpage) {
+               return $inline_content{$page};
+       }
+

        my $file=$pagesources{$page};
        my $type=pagetype($file);
        my $file=$pagesources{$page};
        my $type=pagetype($file);

+       my $ret="";

        if (defined $type) {
                $nested++;
        if (defined $type) {
                $nested++;

-               my $ret=htmlize($page, $destpage, $type,
+               $ret=htmlize($page, $destpage, $type,

                       linkify($page, $destpage,
                       preprocess($page, $destpage,
                       filter($page, $destpage,
                       readfile(srcfile($file))))));
                $nested--;
                       linkify($page, $destpage,
                       preprocess($page, $destpage,
                       filter($page, $destpage,
                       readfile(srcfile($file))))));
                $nested--;

-               return $ret;

        }
        }

-       else {
-               return "";
+       
+       if ($cached_destpage ne $destpage) {
+               clear_inline_content_cache();
+               $cached_destpage=$destpage;

        }
        }

+       return $inline_content{$page}=$ret;
+}
+
+sub clear_inline_content_cache () {
+       %inline_content=();
+}
+

 }
 
 sub date_822 ($) {
 }
 
 sub date_822 ($) {


@@ -530,7 +553,8 @@ sub genfeed ($$$$$@) {
 
                if (exists $pagestate{$p}) {
                        if (exists $pagestate{$p}{meta}{guid}) {
 
                if (exists $pagestate{$p}) {
                        if (exists $pagestate{$p}{meta}{guid}) {

-                               $itemtemplate->param(guid => $pagestate{$p}{meta}{guid});
+                               eval q{use HTML::Entities};
+                               $itemtemplate->param(guid => HTML::Entities::encode_numeric($pagestate{$p}{meta}{guid}));

                        }
 
                        if (exists $pagestate{$p}{meta}{updated}) {
                        }
 
                        if (exists $pagestate{$p}{meta}{updated}) {