fix test when comments_closed_pagespec is empty

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

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 6e257d1d9b2d21d3da582639c07f5845d09f7fea..0b3007097f77effca18e427b2171051f979c1048 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -529,8 +529,13 @@ sub pagetemplate (@) {
                        $open = length $config{cgiurl} > 0;
                }
 
-               if (pagespec_match($page,
-                               "$config{comments_closed_pagespec} or */$config{comments_pagename}*",
+               if (pagespec_match($page, "*/$config{comments_pagename}*",
+                               location => $page)) {
+                       $shown = 0;
+                       $open = 0;
+               }
+               if (length $config{comments_closed_pagespec} &&
+                   pagespec_match($page, $config{comments_closed_pagespec},
                                location => $page)) {
                        $shown = 0;
                        $open = 0;