diff options
author | rvelices <rv-github@modusoptimus.com> | 2009-02-04 02:42:17 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2009-02-04 02:42:17 +0000 |
commit | 52281b5f44f000ea3b10c32a7039a32669d0b47b (patch) | |
tree | 327dc0aed9a8174dfa61ff0a9b8f367c01598f68 /include/functions.inc.php | |
parent | 9428613b2da6132ef507e92461535283d48ecdc1 (diff) |
merge r3122 from trunk
- removed second parameter $type from function format_date
git-svn-id: http://piwigo.org/svn/branches/2.0@3123 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | include/functions.inc.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php index 0607f550a..1902acdac 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -569,12 +569,11 @@ INSERT INTO '.HISTORY_TABLE.' } // format_date returns a formatted date for display. The date given in -// argument can be a unixdate (number of seconds since the 01.01.1970) or an -// american format (2003-09-15). By option, you can show the time. The -// output is internationalized. +// argument must be an american format (2003-09-15). By option, you can show the time. +// The output is internationalized. // -// format_date( "2003-09-15", 'us', true ) -> "Monday 15 September 2003 21:52" -function format_date($date, $type = 'us', $show_time = false) +// format_date( "2003-09-15", true ) -> "Monday 15 September 2003 21:52" +function format_date($date, $show_time = false) { global $lang; |