Skip to content

Commit c0eef7c

Browse files
committed
Merge pull request #179 from magento-south/BUGS
[South] Bug fixes
2 parents 3e3c76e + 3c23add commit c0eef7c

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function persist(FixtureInterface $fixture = null)
6161
}
6262

6363
$url = 'admin/user_role/roleGrid/sort/role_id/dir/desc/';
64-
$regExpPattern = '/col\-role_id\W*(\d+)<.td><[^<>]*?>' . $data['rolename'] . '/siu';
64+
$regExpPattern = '/col\-role_id[\s\W]*(\d+)\s*<.td>\s*<[^<>]*?>' . $data['rolename'] . '/siu';
6565

6666
$extractor = new Extractor($url, $regExpPattern);
6767

dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function persist(FixtureInterface $fixture = null)
4747
}
4848

4949
$url = 'admin/user/roleGrid/sort/user_id/dir/desc';
50-
$regExpPattern = '/col-user_id\W*(\d+)<.td><[^<>]*?>' . $data['username'] . '/siu';
50+
$regExpPattern = '/col-user_id[\s\W]*(\d+)\s*<.td>\s*<[^<>]*?>' . $data['username'] . '/siu';
5151
$extractor = new Extractor($url, $regExpPattern);
5252

5353
return ['user_id' => $extractor->getData()[1]];

lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,11 @@ public function formatDate($date = null, $format = \IntlDateFormatter::SHORT, $s
197197
public function scopeTimeStamp($scope = null)
198198
{
199199
$timezone = $this->_scopeConfig->getValue($this->getDefaultTimezonePath(), $this->_scopeType, $scope);
200-
return (new \DateTime('now', new \DateTimeZone($timezone ?: 'UTC')))->getTimestamp();
200+
$currentTimezone = @date_default_timezone_get();
201+
@date_default_timezone_set($timezone);
202+
$date = date('Y-m-d H:i:s');
203+
@date_default_timezone_set($currentTimezone);
204+
return strtotime($date);
201205
}
202206

203207
/**

lib/internal/Magento/Framework/View/Template/Html/Minifier.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function minify($file)
116116
'#(?<!]]>)\s+</#',
117117
'</',
118118
preg_replace(
119-
'#((?:<\?php\s+(?!echo|print)[^\?]*)\?>)\s+#',
119+
'#((?:<\?php\s+(?!echo|print|if|elseif|else)[^\?]*)\?>)\s+#',
120120
'$1',
121121
preg_replace(
122122
'#(?<!' . implode('|', $this->inlineHtmlTags) . ')\> \<#',

0 commit comments

Comments
 (0)