BugTrack2/25: Fix format_date() returns incorrect order of date string

'2005-03-06 08:29:04 (week)' => '2005-03-06 (week) 08:29:04'
(Patched by Mizar)

diff --git a/lib/func.php b/lib/func.php
index a9b1dfa..9761b06 100644 (file)
--- a/lib/func.php
+++ b/lib/func.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: func.php,v 1.31 2005/02/20 12:50:06 henoheno Exp $
+// $Id: func.php,v 1.32 2005/03/05 14:31:12 henoheno Exp $
 //
 // General functions
 
@@ -425,8 +425,9 @@ function format_date($val, $paren = FALSE)
 
        $val += ZONETIME;
 
-       $date = date($date_format . ' ' . $time_format, $val) .
-               ' ' . '(' . $weeklabels[date('w', $val)] . ')';
+       $date = date($date_format, $val) .
+               ' (' . $weeklabels[date('w', $val)] . ') ' .
+               date($time_format, $val);
 
        return $paren ? '(' . $date . ')' : $date;
 }