diff options
-rw-r--r-- | IkiWiki.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index a81e34c3d..cc1e89acc 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1597,8 +1597,6 @@ sub rcs_receive () { } sub globlist_to_pagespec ($) { - print STDERR "warning: deprecated GlobList style PageSpec \"$_[0]\" will stop working in ikiwiki version 3.0\n"; - my @globlist=split(' ', shift); my (@spec, @skip); @@ -1626,7 +1624,10 @@ sub globlist_to_pagespec ($) { sub is_globlist ($) { my $s=shift; - return ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" ); + my $ret= ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" ); + print STDERR "warning: deprecated GlobList style PageSpec \"$s\" will stop working in ikiwiki version 3.0\n" + if $ret && $s !~ /TMPL_VAR/; # hack alert + return $ret; } sub safequote ($) { |