diff options
| author | Max Kostikov <max@kostikov.co> | 2020-03-31 19:54:20 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-03-31 19:54:20 +0200 |
| commit | 5a2c62466e773ce043a1b39bd2f1e7003a53d9f2 (patch) | |
| tree | 363847c74a9068f3c8cf5110a5ac377c5d40fba1 /include/text.php | |
| parent | c2b691fd0153f0b468f9014b4ca1f0f2b339c617 (diff) | |
| parent | b739f91caa1522522a4ce093d7c63f0f4c777085 (diff) | |
| download | volse-hubzilla-5a2c62466e773ce043a1b39bd2f1e7003a53d9f2.tar.gz volse-hubzilla-5a2c62466e773ce043a1b39bd2f1e7003a53d9f2.tar.bz2 volse-hubzilla-5a2c62466e773ce043a1b39bd2f1e7003a53d9f2.zip | |
Merge branch 'dev' into 'dev'
Sync dev
See merge request kostikov/core!2
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php index 3c1d4c996..5d1cf6eff 100644 --- a/include/text.php +++ b/include/text.php @@ -1881,7 +1881,7 @@ function format_poll($item,$s,$opts) { } } if ($item['comments_closed'] > NULL_DATE) { - $t = datetime_convert('UTC',date_default_timezone_get(), $item['comments_closed'], 'Y-m-d h:i'); + $t = datetime_convert('UTC',date_default_timezone_get(), $item['comments_closed'], 'Y-m-d H:i'); $closed = ((datetime_convert() > $item['comments_closed']) ? true : false); if ($closed) { $message = t('Poll has ended.'); |