htmltidy: Print a warning message if tidy fails. Closes: #543722

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index e7d6f250e5cfee1d563bfb40bdf8d541cb7aad1e..a501566b554d11cd1894878637aaf5d2204089d4 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -186,7 +186,6 @@ sub preprocess_inline (@) {
        my @list;
 
        if (exists $params{pagenames}) {
        my @list;
 
        if (exists $params{pagenames}) {

-

                foreach my $p (qw(sort pages)) {
                        if (exists $params{$p}) {
                                error sprintf(gettext("the %s and %s parameters cannot be used together"),
                foreach my $p (qw(sort pages)) {
                        if (exists $params{$p}) {
                                error sprintf(gettext("the %s and %s parameters cannot be used together"),


@@ -194,9 +193,8 @@ sub preprocess_inline (@) {
                        }
                }
 
                        }
                }
 

-               @list = split ' ', $params{pagenames};
-               my $_;
-               @list = map { bestlink($params{page}, $_) } @list;
+               @list = map { bestlink($params{page}, $_) }
+                       split ' ', $params{pagenames};

 
                $params{pages} = join(" or ", @list);
        }
 
                $params{pages} = join(" or ", @list);
        }


@@ -253,10 +251,12 @@ sub preprocess_inline (@) {
        # Explicitly add all currently displayed pages as dependencies, so
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.
        # Explicitly add all currently displayed pages as dependencies, so
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.

-       add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist));
+       foreach my $p ($#list >= $#feedlist ? @list : @feedlist) {
+               add_depends($params{page}, $p);
+       }

        
        if ($feeds && exists $params{feedpages}) {
        
        if ($feeds && exists $params{feedpages}) {

-               @feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;
+               @feedlist=pagespec_match_list(\@feedlist, $params{feedpages}, location => $params{page});

        }
 
        my ($feedbase, $feednum);
        }
 
        my ($feedbase, $feednum);


@@ -373,15 +373,14 @@ 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}) {

-                                               my $discussionlink=lc(gettext("Discussion"));
-                                               if ($page !~ /.*\/\Q$discussionlink\E$/ &&
+                                               if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&

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

-                                                    exists $links{$page."/".$discussionlink})) {
+                                                    exists $links{$page."/".$config{discussionpage}})) {

                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,
                                                                        $params{destpage},
                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,
                                                                        $params{destpage},

-                                                                       gettext("Discussion"),
+                                                                       $config{discussionpage},

                                                                        noimageinline => 1,
                                                                        forcesubpage => 1));
                                                }
                                                                        noimageinline => 1,
                                                                        forcesubpage => 1));
                                                }