diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/gui_elements.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/gui_elements.php index e0bffade7..548a32376 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/gui_elements.php +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/gui_elements.php @@ -45,7 +45,8 @@ class Gui_Elements{ } public static function time_elapsed_string($ptime){ - $ptime = DateTime::createFromFormat('m-d-Y H:i:s', $ptime)->getTimestamp(); + global $TIME_FORMAT; + $ptime = DateTime::createFromFormat($TIME_FORMAT, $ptime)->getTimestamp(); $etime = time() - $ptime; diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php index e72a1e216..68293d2f9 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php @@ -110,6 +110,7 @@ class Helpers{ //Time output function for handling the time display function. static public function outputTime($time){ - return date("m-d-Y H:i:s",strtotime($time)); + global $TIME_FORMAT; + return date($TIME_FORMAT,strtotime($time)); } } diff --git a/code/ryzom/tools/server/ryzom_ams/www/config.php b/code/ryzom/tools/server/ryzom_ams/www/config.php index 37590d3c3..49f117a39 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/config.php +++ b/code/ryzom/tools/server/ryzom_ams/www/config.php @@ -41,4 +41,5 @@ $DEFAULT_LANGUAGE = 'en'; $SITEBASE = dirname( __FILE__ ) . '/html/' ; -$TICKET_LOGGING = true; \ No newline at end of file +$TICKET_LOGGING = true; +$TIME_FORMAT = "m-d-Y H:i:s"; \ No newline at end of file