web commit by JoshTriplett: Add the h5 and h6 header levels, so people know that...

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 43ef67e8c9ce6ea4824977528a602533962cd47c..42d607b0dcbc66b5aa8b24e1bade33a2212e569b 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -636,18 +636,35 @@ sub saveindex () { #{{{
        close OUT;
 } #}}}
 
+sub template_file ($) { #{{{
+       my $template=shift;
+
+       foreach my $dir ($config{templatedir}, "$installdir/share/ikiwiki/templates") {
+               return "$dir/$template" if -e "$dir/$template";
+       }
+       return undef;
+} #}}}
+
 sub template_params (@) { #{{{
-       my $filename=shift;
-       
+       my $filename=template_file(shift);
+
+       if (! defined $filename) {
+               return if wantarray;
+               return "";
+       }
+
        require HTML::Template;
-       return filter => sub {
+       my @ret=(
+               filter => sub {
                        my $text_ref = shift;
                        $$text_ref=&Encode::decode_utf8($$text_ref);
                },
-               filename => "$config{templatedir}/$filename",
+               filename => $filename,
                loop_context_vars => 1,
                die_on_bad_params => 0,
-               @_;
+               @_
+       );
+       return wantarray ? @ret : {@ret};
 } #}}}
 
 sub template ($;@) { #{{{
@@ -821,8 +838,15 @@ sub gettext { #{{{
        # Only use gettext in the rare cases it's needed.
        if (exists $ENV{LANG} || exists $ENV{LC_ALL} || exists $ENV{LC_MESSAGES}) {
                if (! $gettext_obj) {
-                       eval q{use Locale::gettext ''};
-                       $gettext_obj=Locale::gettext->domain('ikiwiki');
+                       $gettext_obj=eval q{
+                               use Locale::gettext q{textdomain};
+                               Locale::gettext->domain('ikiwiki')
+                       };
+                       if ($@) {
+                               print STDERR "$@";
+                               $gettext_obj=undef;
+                               return shift;
+                       }
                }
                return $gettext_obj->get(shift);
        }