Skip to content

Commit 47c8177

Browse files
authored
Replace Date Format String Literals With Existing Constants (OpenMage#2592)
1 parent 8641467 commit 47c8177

File tree

15 files changed

+26
-18
lines changed

15 files changed

+26
-18
lines changed

app/code/core/Mage/AdminNotification/Model/Feed.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function checkUpdate()
103103
*/
104104
public function getDate($rssDate)
105105
{
106-
return gmdate('Y-m-d H:i:s', strtotime($rssDate));
106+
return gmdate(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT, strtotime($rssDate));
107107
}
108108

109109
/**

app/code/core/Mage/AdminNotification/Model/Inbox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function add($severity, $title, $description, $url = '', $isInternal = tr
128128
if (is_array($description)) {
129129
$description = '<ul><li>' . implode('</li><li>', $description) . '</li></ul>';
130130
}
131-
$date = date('Y-m-d H:i:s');
131+
$date = date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT);
132132
$this->parse([[
133133
'severity' => $severity,
134134
'date_added' => $date,

app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ class Mage_Adminhtml_Block_Sitemap_Grid_Renderer_Time extends Mage_Adminhtml_Blo
3535
*/
3636
public function render(Varien_Object $row)
3737
{
38-
return date('Y-m-d H:i:s', strtotime($row->getSitemapTime()) + Mage::getSingleton('core/date')->getGmtOffset());
38+
return date(
39+
Varien_Date::DATETIME_PHP_FORMAT,
40+
strtotime($row->getSitemapTime()) + Mage::getSingleton('core/date')->getGmtOffset()
41+
);
3942
}
4043
}

app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public function render()
149149
protected function _getRandomDate()
150150
{
151151
$timestamp = mktime(rand(0, 23), rand(0, 59), 0, rand(1, 11), rand(1, 28), rand(2006, 2007));
152-
return date('Y-m-d H:i:s', $timestamp);
152+
return date(Varien_Date::DATETIME_PHP_FORMAT, $timestamp);
153153
}
154154

155155
public function save()

app/code/core/Mage/Core/Model/Date.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function calculateOffset($timezone = null)
9898
public function gmtDate($format = null, $input = null)
9999
{
100100
if (is_null($format)) {
101-
$format = 'Y-m-d H:i:s';
101+
$format = Varien_Date::DATETIME_PHP_FORMAT;
102102
}
103103

104104
$date = $this->gmtTimestamp($input);
@@ -121,7 +121,7 @@ public function gmtDate($format = null, $input = null)
121121
public function date($format = null, $input = null)
122122
{
123123
if (is_null($format)) {
124-
$format = 'Y-m-d H:i:s';
124+
$format = Varien_Date::DATETIME_PHP_FORMAT;
125125
}
126126

127127
return date($format, $this->timestamp($input));

app/code/core/Mage/Core/Model/Flag.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ protected function _beforeSave()
6767
}
6868

6969
$this->setFlagCode($this->_flagCode);
70-
$this->setLastUpdate(date('Y-m-d H:i:s'));
70+
$this->setLastUpdate(date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT));
7171

7272
return parent::_beforeSave();
7373
}

app/code/core/Mage/Core/Model/Locale.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ public function storeTimeStamp($store = null)
591591
$timezone = Mage::app()->getStore($store)->getConfig(self::XML_PATH_DEFAULT_TIMEZONE);
592592
$currentTimezone = @date_default_timezone_get();
593593
@date_default_timezone_set($timezone);
594-
$date = date('Y-m-d H:i:s');
594+
$date = date(Varien_Date::DATETIME_PHP_FORMAT);
595595
@date_default_timezone_set($currentTimezone);
596596
return strtotime($date);
597597
}

app/code/core/Mage/Core/Model/Observer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function addSynchronizeNotification(Varien_Event_Observer $observer)
6767
$description = Mage::helper('adminhtml')->__('Synchronization of media storages has been successfully completed.');
6868
}
6969

70-
$date = date('Y-m-d H:i:s');
70+
$date = date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT);
7171
Mage::getModel('adminnotification/inbox')->parse([
7272
[
7373
'severity' => $severity,

app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function loadFile()
7272
$uploader->save($path);
7373
if ($uploadFile = $uploader->getUploadedFileName()) {
7474
$session = Mage::getModel('dataflow/session');
75-
$session->setCreatedDate(date('Y-m-d H:i:s'));
75+
$session->setCreatedDate(date(Varien_Date::DATETIME_PHP_FORMAT));
7676
$session->setDirection('import');
7777
$session->setUserId(Mage::getSingleton('admin/session')->getUser()->getId());
7878
$session->save();

app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function load()
4545
$uploader->save($path);
4646
if ($uploadFile = $uploader->getUploadedFileName()) {
4747
$session = Mage::getModel('dataflow/session');
48-
$session->setCreatedDate(date('Y-m-d H:i:s'));
48+
$session->setCreatedDate(date(Varien_Date::DATETIME_PHP_FORMAT));
4949
$session->setDirection('import');
5050
$session->setUserId(Mage::getSingleton('admin/session')->getUser()->getId());
5151
$session->save();

0 commit comments

Comments
 (0)