Merge branch 'master' into recentchanges

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index bb160ac4de949058cc62be656686058d717bb71b..796cf2cf6eb794b3ce59436d351987c3a595a672 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -14,7 +14,7 @@ my %page_numfeeds;
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);

-       hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi);
+       hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);

        hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",
        hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",


@@ -152,7 +152,12 @@ sub preprocess_inline (@) { #{{{
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.
        add_depends($params{page}, join(" or ", @list));
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.
        add_depends($params{page}, join(" or ", @list));

-       
+       # Force a scan of this page so any metadata that appears after this
+       # inline directive is available when inlining. The page normally 
+       # wouldn't be scanned if it's only being rebuilt because of a
+       # depedency.
+       IkiWiki::scan($pagesources{$params{page}});
+

        my $feednum="";
 
        my $feedid=join("\0", map { $_."\0".$params{$_} } sort keys %params);
        my $feednum="";
 
        my $feedid=join("\0", map { $_."\0".$params{$_} } sort keys %params);


@@ -161,16 +166,20 @@ sub preprocess_inline (@) { #{{{
        }
        else {
                if (exists $page_numfeeds{$params{destpage}}) {
        }
        else {
                if (exists $page_numfeeds{$params{destpage}}) {

-                       $feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+                       if ($feeds) {
+                               $feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+                       }

                }
                else {
                        $feednum=$knownfeeds{$feedid}="";
                }
                else {
                        $feednum=$knownfeeds{$feedid}="";

-                       $page_numfeeds{$params{destpage}}=1;
+                       if ($feeds) {
+                               $page_numfeeds{$params{destpage}}=1;
+                       }

                }
        }
 
                }
        }
 

-       my $rssurl=basename(rsspage($params{destpage}).$feednum);
-       my $atomurl=basename(atompage($params{destpage}).$feednum);
+       my $rssurl=basename(rsspage($params{destpage}).$feednum) if $feeds && $rss;
+       my $atomurl=basename(atompage($params{destpage}).$feednum) if $feeds && $atom;

        my $ret="";
 
        if ($config{cgiurl} && (exists $params{rootpage} ||
        my $ret="";
 
        if ($config{cgiurl} && (exists $params{rootpage} ||


@@ -221,7 +230,9 @@ sub preprocess_inline (@) { #{{{
                                }
                                $template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
                                $template->param(title => pagetitle(basename($page)));
                                }
                                $template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
                                $template->param(title => pagetitle(basename($page)));

-                               $template->param(ctime => displaytime($pagectime{$page}));
+                               $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
+                               $template->param(first => 1) if $page eq $list[0];
+                               $template->param(last => 1) if $page eq $list[$#list];

        
                                if ($actions) {
                                        my $file = $pagesources{$page};
        
                                if ($actions) {
                                        my $file = $pagesources{$page};