diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-08-08 17:29:29 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-08-08 17:29:29 -0700 |
| commit | 58bf479f4c040ac73ea190d966ffd5408f9908f0 (patch) | |
| tree | a19dece598404b48cca783f89877944fd4538fb1 /modules/gallery/helpers/gallery.php | |
| parent | 1ad1f9517f91875875f2e062bda7d834827c3430 (diff) | |
| parent | acb1faaa594fc5067c4340e073afca3b83f819d4 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers/gallery.php')
| -rw-r--r-- | modules/gallery/helpers/gallery.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php index 54d16322..3f83b23d 100644 --- a/modules/gallery/helpers/gallery.php +++ b/modules/gallery/helpers/gallery.php @@ -60,7 +60,7 @@ class gallery_Core { * @return string */ static function date_time($timestamp) { - return date(module::get_var("gallery", "date_time_format", "Y-M-d H:i:s"), $timestamp); + return date(module::get_var("gallery", "date_time_format"), $timestamp); } /** @@ -69,7 +69,7 @@ class gallery_Core { * @return string */ static function date($timestamp) { - return date(module::get_var("gallery", "date_format", "Y-M-d"), $timestamp); + return date(module::get_var("gallery", "date_format"), $timestamp); } /** |