Merge branch 'master' into po

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 66fea4369b1326903f0bce26ed019a288e12788e..5df1151047ab2720099625224cc9b325ff0c5d72 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -21,7 +21,7 @@ our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  bestlink htmllink readfile writefile pagetype srcfile pagename
                  displaytime will_render gettext urlto targetpage
                 add_underlay pagetitle titlepage linkpage newpagefile
-                inject
+                inject warning
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
@@ -579,6 +579,10 @@ sub error ($;$) {
        die $message."\n";
 }
 
+sub warning ($) {
+       return log_message(warning => @_);
+}
+
 sub debug ($) {
        return unless $config{verbose};
        return log_message(debug => @_);