|
@@ -261,7 +261,7 @@ |
|
|
block discarded – undo |
|
261
|
261
|
return $this->mergeEntity($entity, $attr); |
|
262
|
262
|
|
|
263
|
263
|
// try to load the customer with the given increment ID and the website id |
|
264
|
|
- } elseif (!empty($attr[MemberNames::INCREMENT_ID]) && $entity = $this->loadCustomerByWebsiteIdAndIncrementId($attr[MemberNames::WEBSITE_ID], $attr[MemberNames::INCREMENT_ID])) { |
|
|
264
|
+ } elseif (!empty($attr[MemberNames::INCREMENT_ID]) && $entity = $this->loadCustomerByWebsiteIdAndIncrementId($attr[MemberNames::WEBSITE_ID], $attr[MemberNames::INCREMENT_ID])) { |
|
265
|
265
|
// clear row elements that are not allowed to be updated |
|
266
|
266
|
$attr = $this->clearRowData($attr, true); |
|
267
|
267
|
|
Please login to merge, or discard this patch.