apache config details

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index e7d6f250e5cfee1d563bfb40bdf8d541cb7aad1e..704fa711d543947f6bddb2a9f6538bb2798c70b6 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}) {
-
                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);
        }
@@ -373,15 +371,14 @@ sub preprocess_inline (@) {
                                        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} ||
-                                                    exists $links{$page."/".$discussionlink})) {
+                                                    exists $links{$page."/".$config{discussionpage}})) {
                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,
                                                                        $params{destpage},
-                                                                       gettext("Discussion"),
+                                                                       $config{discussionpage},
                                                                        noimageinline => 1,
                                                                        forcesubpage => 1));
                                                }