// Merge -> revision 8800

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8808 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-27 14:30:06 +00:00
parent 05fde82c53
commit 1b6d0d1be3
110 changed files with 1240 additions and 1066 deletions
@@ -187,7 +187,7 @@ class MRGetRelayPoint implements IMondialRelayWSMethod
unset($result['STAT']);
// Clean Content
foreach($result as &$relayPoint)
foreach($result as $num => $relayPoint)
{
$totalEmptyFields = 0;
foreach ($relayPoint as $key => &$value)
@@ -197,11 +197,10 @@ class MRGetRelayPoint implements IMondialRelayWSMethod
++$totalEmptyFields;
}
if ($totalEmptyFields == count($relayPoint))
{
$errors[] = $this->_mondialRelay->l('MondialRelay can\'t find any relay point near your address. Maybe your address isn\'t properly filled ?');
break;
unset($result[$num]);
}
}
if (!count($result))
$errors[] = $this->_mondialRelay->l('MondialRelay can\'t find any relay point near your address. Maybe your address isn\'t properly filled ?');
$success = $result;
}
$this->_resultList['error'] = $errors;