link to patch

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index d7117b6117a2c8407b8c551eedd77afcc06d59f4..344620ebe9ed3f0fc74f81d0bb94d2242aed4433 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -11,6 +11,7 @@ use URI;
 my %knownfeeds;
 my %page_numfeeds;
 my @inline;
 my %knownfeeds;
 my %page_numfeeds;
 my @inline;

+my $nested=0;

 
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
 
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);


@@ -102,7 +103,7 @@ sub preprocess_inline (@) { #{{{
        my %params=@_;
        
        if (! exists $params{pages}) {
        my %params=@_;
        
        if (! exists $params{pages}) {

-               return "";
+               return "[[inline ".gettext("missing pages parameter")."]]";

        }
        my $raw=yesno($params{raw});
        my $archive=yesno($params{archive});
        }
        my $raw=yesno($params{raw});
        my $archive=yesno($params{archive});


@@ -329,7 +330,7 @@ sub preprocess_inline (@) { #{{{
                }
        }
        
                }
        }
        

-       return $ret if $raw;
+       return $ret if $raw || $nested;

        push @inline, $ret;
        return "<div class=\"inline\" id=\"$#inline\"></div>\n\n";
 } #}}}
        push @inline, $ret;
        return "<div class=\"inline\" id=\"$#inline\"></div>\n\n";
 } #}}}


@@ -350,11 +351,14 @@ sub get_inline_content ($$) { #{{{
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if (defined $type) {
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if (defined $type) {

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

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

+               $nested--;
+               return $ret;

        }
        else {
                return "";
        }
        else {
                return "";