if an inlined page has the same copyright or license as the page it's

inlined into, don't display them twice

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index a4dd541f982eda7ef884395692f55a48baa85e83..273be135ae32d0980c41a8fcc96e47352010ac9b 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -128,6 +128,7 @@ sub preprocess (@) { #{{{
 sub pagetemplate (@) { #{{{
        my %params=@_;
         my $page=$params{page};
+        my $destpage=$params{destpage};
         my $template=$params{template};
 
        $template->param(meta => $meta{$page})
@@ -142,11 +143,17 @@ sub pagetemplate (@) { #{{{
                if exists $author{$page} && $template->query(name => "author");
        $template->param(authorurl => $authorurl{$page})
                if exists $authorurl{$page} && $template->query(name => "authorurl");
-       $template->param(license => $license{$page})
-               if exists $license{$page} && $template->query(name => "license");
-       $template->param(copyright => $copyright{$page})
-               if exists $copyright{$page} && $template->query(name => "copyright");
-       
+
+       if (exists $license{$page} && $template->query(name => "license") &&
+           ($page ne $destpage || ! exists $license{$destpage} ||
+             $license{$page} ne $license{$destpage})) {
+               $template->param(license => $license{$page})
+       }
+       if (exists $copyright{$page} && $template->query(name => "copyright") &&
+           ($page ne $destpage || ! exists $copyright{$destpage} ||
+             $copyright{$page} ne $copyright{$destpage})) {
+               $template->param(copyright => $copyright{$page})
+       }
 } # }}}
 
 1