lockedit: Detect if no authentication plugins are enabled, and die with an error...

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 29729a4147412a3a6d423d0403e6b21f9f80f1b1..401852513d1fbe8d14fe4ebfbf38cadd781c410d 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -209,7 +209,7 @@ sub preprocess_inline (@) {
                if ($params{show}) {
                        $num=$params{show};
                }
                if ($params{show}) {
                        $num=$params{show};
                }

-               if ($params{feedshow} && $num < $params{feedshow}) {
+               if ($params{feedshow} && $num < $params{feedshow} && $num > 0) {

                        $num=$params{feedshow};
                }
                if ($params{skip} && $num) {
                        $num=$params{feedshow};
                }
                if ($params{skip} && $num) {


@@ -357,9 +357,9 @@ 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}) {

-                                               if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
+                                               if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&

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

-                                                    exists $links{$page."/".$config{discussionpage}})) {
+                                                    exists $pagesources{$page."/".lc($config{discussionpage})})) {

                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,
                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,


@@ -369,9 +369,12 @@ sub preprocess_inline (@) {
                                                                        forcesubpage => 1));
                                                }
                                        }
                                                                        forcesubpage => 1));
                                                }
                                        }

-                                       if (length $config{cgiurl} && defined $type) {
+                                       if (length $config{cgiurl} &&
+                                           defined $type &&
+                                           IkiWiki->can("cgi_editpage")) {

                                                $template->param(have_actions => 1);
                                                $template->param(editurl => cgiurl(do => "edit", page => $page));
                                                $template->param(have_actions => 1);
                                                $template->param(editurl => cgiurl(do => "edit", page => $page));

+

                                        }
                                }
        
                                        }
                                }