Skip to content

Commit 02b3a94

Browse files
author
Sergii Kovalenko
committed
MAGETWO-61232: Shipping rates can not be loaded
1 parent 25c3c57 commit 02b3a94

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

app/code/Magento/Customer/Model/Address/AbstractAddress.php

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -304,17 +304,19 @@ protected function _implodeArrayField(array $data)
304304
* @param array $value
305305
* @return string
306306
*/
307-
protected function _implodeArrayValues(array $value)
307+
protected function _implodeArrayValues($value)
308308
{
309-
$isScalar = true;
310-
foreach ($value as $val) {
311-
if (!is_scalar($val)) {
312-
$isScalar = false;
309+
if (is_array($value)) {
310+
$isScalar = true;
311+
foreach ($value as $val) {
312+
if (!is_scalar($val)) {
313+
$isScalar = false;
314+
}
313315
}
314-
}
315316

316-
if ($isScalar) {
317-
$value = trim(implode("\n", $value));
317+
if ($isScalar) {
318+
$value = trim(implode("\n", $value));
319+
}
318320
}
319321

320322
return $value;

0 commit comments

Comments
 (0)