fix broken custom date/time formatting, bcosca/fatfree#1147

f3-factory · Nov 25, 2019 · c7b815c · c7b815c
1 parent 45a7c5b
commit c7b815c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/base.php b/base.php
@@ -1026,16 +1026,18 @@ function_exists('money_format'))
 									($frac?strlen($frac)-2:0),
 								$decimal_point,$thousands_sep);
 						case 'date':
-							$prop='%d %B %Y';
 							if (empty($mod) || $mod=='short')
 								$prop='%x';
 							elseif ($mod=='full')
-								$prop='%A, '.$prop;
+								$prop='%A, %d %B %Y';
+							elseif ($mod!='custom')
+								$prop='%d %B %Y';
 							return strftime($prop,$args[$pos]);
 						case 'time':
-							$prop='%r';
 							if (empty($mod) || $mod=='short')
 								$prop='%X';
+							elseif ($mod!='custom')
+								$prop='%r';
 							return strftime($prop,$args[$pos]);
 						default:
 							return $expr[0];