X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FGeocode%2FYahoo.php;h=7dd1e82692fb1d3bcbec71ad30957d429a0ad0a1;hb=9d29f5f8596366df6a6ae99b97029da639e03004;hp=99b4a3ba2ad1bad7d7e19f063ab83db60a1cd045;hpb=61ac5f959d775677c6eadffed193fde1d815eac4;p=civicrm-core.git

diff --git a/CRM/Utils/Geocode/Yahoo.php b/CRM/Utils/Geocode/Yahoo.php
index 99b4a3ba2a..7dd1e82692 100644
--- a/CRM/Utils/Geocode/Yahoo.php
+++ b/CRM/Utils/Geocode/Yahoo.php
@@ -1,7 +1,7 @@
 <?php
 /*
   +--------------------------------------------------------------------+
-  | CiviCRM version 4.5                                                |
+  | CiviCRM version 4.6                                                |
   +--------------------------------------------------------------------+
   | Copyright CiviCRM LLC (c) 2004-2014                                |
   +--------------------------------------------------------------------+
@@ -40,7 +40,7 @@
 class CRM_Utils_Geocode_Yahoo {
 
   /**
-   * server to retrieve the lat/long
+   * Server to retrieve the lat/long
    *
    * @var string
    * @static
@@ -48,7 +48,7 @@ class CRM_Utils_Geocode_Yahoo {
   static protected $_server = 'query.yahooapis.com';
 
   /**
-   * uri of service
+   * Uri of service
    *
    * @var string
    * @static
@@ -56,7 +56,7 @@ class CRM_Utils_Geocode_Yahoo {
   static protected $_uri = '/v1/public/yql';
 
   /**
-   * function that takes an address array and gets the latitude / longitude
+   * Function that takes an address array and gets the latitude / longitude
    * and postal code for this address. Note that at a later stage, we could
    * make this function also clean up the address into a more valid format
    *
@@ -66,7 +66,7 @@ class CRM_Utils_Geocode_Yahoo {
    * @return boolean true if we modified the address, false otherwise
    * @static
    */
-  static function format(&$values, $stateName = FALSE) {
+  public static function format(&$values, $stateName = FALSE) {
     CRM_Utils_System::checkPHPVersion(5, TRUE);
 
     $config = CRM_Core_Config::singleton();
@@ -157,7 +157,7 @@ class CRM_Utils_Geocode_Yahoo {
       $values['geo_code_1'] = $ret['latitude'];
       $values['geo_code_2'] = $ret['longitude'];
 
-      if ($ret['postal']) {
+      if (!empty($ret['postal'])) {
         $current_pc = CRM_Utils_Array::value('postal_code', $values);
         $skip_postal = FALSE;