Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index b408dfcac1faf5af44bd03c1c0e4ced5b832107e..c2a8da29f853ec5f13e8fab959773751cc86ada9 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -140,15 +140,24 @@ sub filltemplate ($$) {
        $template->param(name => $page);
 
        if ($template->query(name => 'uuid')) {
        $template->param(name => $page);
 
        if ($template->query(name => 'uuid')) {

-               eval {
-                       require UUID::Tiny;
-                       UUID::Tiny->import(':std');
-                       my $uuid;
-                       $uuid = create_uuid_as_string(UUID_V4());
-                       $template->param(uuid => $uuid);
-               };
+               my $uuid;
+               if (open(my $fh, "<", "/proc/sys/kernel/random/uuid")) {
+                       $uuid = <$fh>;
+                       chomp $uuid;
+                       close $fh;
+               }
+               else {
+                       eval {
+                               require UUID::Tiny;
+                               $uuid = UUID::Tiny::create_uuid_as_string(UUID::Tiny::UUID_V4());
+                       };
+               }
+               $template->param(uuid => $uuid);

        }
 
        }
 

+       my $time = time();
+       $template->param(time => IkiWiki::date_3339($time));
+

        return $template->output;
 }
 
        return $template->output;
 }