Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index 29330f29fd5666c75a7bead7e4fcbbcf394ea3b0..0f02142b06812cb7bb11bc0b5a98cde3e13f8526 100644 (file)
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -46,16 +46,20 @@ sub import { #{{{
 
 sub getsetup () { #{{{
        return
 
 sub getsetup () { #{{{
        return

+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },

                prettydateformat => {
                        type => "string",
                prettydateformat => {
                        type => "string",

-                       default => '%X, %B %o, %Y',
+                       example => '%X, %B %o, %Y',

                        description => "format to use to display date",
                        description => "format to use to display date",

+                       advanced => 1,

                        safe => 1,
                        rebuild => 1,
                },
                timetable => {
                        safe => 1,
                        rebuild => 1,
                },
                timetable => {

-                       type => undef, # don't try to show in interface
-                       default => '%X, %B %o, %Y',
+                       type => "internal",

                        description => "array of time descriptions",
                        safe => 1,
                        rebuild => 1,
                        description => "array of time descriptions",
                        safe => 1,
                        rebuild => 1,


@@ -80,7 +84,7 @@ sub checkconfig () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-sub IkiWiki::displaytime ($;$) { #{{{
+sub IkiWiki::formattime ($;$) { #{{{

        my $time=shift;
        my $format=shift;
        if (! defined $format) {
        my $time=shift;
        my $format=shift;
        if (! defined $format) {