Skip to content

Commit 71216cd

Browse files
committed
fix-7
1 parent 9e16949 commit 71216cd

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData, $
574574
} catch (InvalidFormatException) {
575575
$valid = false;
576576
}
577+
577578
$valid !== false || preg_match('/^\d{2}.\d{2}.\d{2,4}(?:\s+\d{1,2}.\d{1,2}(?:.\d{1,2})?)?$/', $val);
578579
break;
579580
case 'text':

app/code/core/Mage/Oauth/Model/Resource/Token.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function deleteOldEntries($minutes)
7070
$this->getMainTable(),
7171
$adapter->quoteInto(
7272
'type = "' . Mage_Oauth_Model_Token::TYPE_REQUEST . '" AND created_at <= ?',
73-
Varien_Date::formatDate(Carbon::now()->subMinutes(1)->getTimestamp()),
73+
Varien_Date::formatDate(Carbon::now()->subMinutes($minutes)->getTimestamp()),
7474
),
7575
);
7676
} else {

0 commit comments

Comments
 (0)