* finish task #6166,#6149,6139

This commit is contained in:
jinianlan
2019-07-29 15:54:08 +08:00
parent d187bc8515
commit c90aac3512
68 changed files with 106 additions and 102 deletions
+1 -1
View File
@@ -1052,7 +1052,7 @@ class actionModel extends model
foreach($actions as $action)
{
$timeStamp = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date);
$date = common::checkEnLang() ? date('M d', $timeStamp) : date(DT_DATE4, $timeStamp);
$date = common::checkNotCN() ? date('M d', $timeStamp) : date(DT_DATE4, $timeStamp);
$action->time = date(DT_TIME2, $timeStamp);
$dateGroup[$date][] = $action;
}