Index: branches/5.0.x/core/units/general/helpers/geocode_helper.php
===================================================================
diff -u -r12117 -r12277
--- branches/5.0.x/core/units/general/helpers/geocode_helper.php (.../geocode_helper.php) (revision 12117)
+++ branches/5.0.x/core/units/general/helpers/geocode_helper.php (.../geocode_helper.php) (revision 12277)
@@ -1,6 +1,6 @@
Application->ConfigValue('GeoCodeUser');
$pass = $this->Application->ConfigValue('GeoCodePass');
@@ -39,7 +36,7 @@
if ($code == 0) {
$out_data = explode('|', $geo_array[2]);
- include_once(FULL_PATH.'/compat/array_combine.php');
+// include_once(FULL_PATH.'/compat/array_combine.php');
$assoc_data = array_combine(explode('|', $geo_array[1]), $out_data);
$lon = abs($out_data[8]); // set to positive, because required by SQL formula
@@ -83,10 +80,14 @@
$request_url = $this->Application->ConfigValue('GoogleMapsURL').'output=xml&key='.
$this->Application->ConfigValue('GoogleMapsKey').'&q='.urlencode($qaddress);
+ $curl_helper =& $this->Application->recallObject('CurlHelper');
+ /* @var $curl_helper kCurlHelper */
+
$delay = 0;
while (true)
{
- $xml = file_get_contents($request_url);
+ $xml = $curl_helper->Send($request_url);
+
if (strpos($xml, '620
')) {
$delay += 100000;
} elseif (strpos($xml, '200
')) {