From c7b815c0e9573004301720b98e01a98a2a6288d6 Mon Sep 17 00:00:00 2001
From: ikkez <ikkez0n3@gmail.com>
Date: Mon, 25 Nov 2019 13:48:28 +0100
Subject: [PATCH] fix broken custom date/time formatting, bcosca/fatfree#1147

---
 base.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/base.php b/base.php
index eb47649c..fcf29f85 100644
--- 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];