#1663 Update time formating for profiles

GetLuna · Jun 12, 2018 · f2c2b5f · f2c2b5f
1 parent 79700d5
commit f2c2b5f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/include/functions.php b/include/functions.php
@@ -1135,19 +1135,24 @@ function is_subforum($id, $self_subforum = '0') {
 //
 // Format a time string according to $time_format and time zones
 //
-function format_time($timestamp, $date_only = false, $date_format = null, $time_format = null, $time_only = false, $no_text = false) {
+function format_time($timestamp, $date_only = false, $date_format = null, $time_format = null, $time_only = false, $no_text = false, $user = null) {
 	global $luna_config, $luna_user, $forum_date_formats, $forum_time_formats;
 
 	if ($timestamp == '')
 		return __('Never', 'luna');
 
+	if (is_null($user))
+		$user = $pun_user;
+
+	$diff = ($user['timezone'] + $user['dst']) * 3600; 
+
 	$now = time();
 
 	if(is_null($date_format))
-		$date_format = $forum_date_formats[$luna_user['date_format']];
+		$date_format = $forum_date_formats[$user['date_format']];
 
 	if(is_null($time_format))
-		$time_format = $forum_time_formats[$luna_user['time_format']];
+		$time_format = $forum_time_formats[$user['time_format']];
 
 	$date = date($date_format, $timestamp);
 	$today = date($date_format, $now);

diff --git a/themes/Fifteen/views/settings.php b/themes/Fifteen/views/settings.php
@@ -431,7 +431,7 @@
 								echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
 								if ($user['time_format'] == $key)
 									echo ' selected';
-								echo '>'. format_time(time(), false, null, $time_format, true, true);
+								echo '>'. format_time(time(), false, null, $time_format, true, true, $user);
 								if ($key == 0)
 									echo ' ('.__('Default', 'luna').')';
 								echo "</option>\n";
@@ -449,7 +449,7 @@
 								echo "\t\t\t\t\t\t\t\t".'<option value="'.$key.'"';
 								if ($user['date_format'] == $key)
 									echo ' selected';
-								echo '>'. format_time(time(), true, $date_format, null, false, true);
+								echo '>'. format_time(time(), true, $date_format, null, false, true, $user);
 								if ($key == 0)
 									echo ' ('.__('Default', 'luna').')';
 								echo "</option>\n";