@@ -30,13 +30,13 @@ public static function isAddressComplete($address, $includeName = FALSE) {
3030
3131 public static function toSingleLine ($ address , $ language = NULL ) {
3232 $ rc = '' ;
33- if (!Utils::isEmpty ($ address ->name )) $ rc .= ', ' .$ address ->name ;
34- if (!Utils::isEmpty ($ address ->country )) $ rc .= ', ' .I18N ::_ ($ address ->country , $ language );
35- if (!Utils::isEmpty ($ address ->province ))$ rc .= ', ' .$ address ->province ;
36- if (!Utils::isEmpty ($ address ->city )) $ rc .= ', ' .$ address ->city ;
37- if (!Utils::isEmpty ($ address ->zipCode )) $ rc .= ', ' .$ address ->zipCode ;
38- if (!Utils::isEmpty ($ address ->street1 )) $ rc .= ', ' .$ address ->street1 ;
39- if (!Utils::isEmpty ($ address ->street2 )) $ rc .= ', ' .$ address ->street2 ;
33+ if (isset ( $ address -> name ) && !Utils::isEmpty ($ address ->name )) $ rc .= ', ' .$ address ->name ;
34+ if (isset ( $ address -> country ) && !Utils::isEmpty ($ address ->country )) $ rc .= ', ' .I18N ::_ ($ address ->country , $ language );
35+ if (isset ( $ address -> province ) && !Utils::isEmpty ($ address ->province ))$ rc .= ', ' .$ address ->province ;
36+ if (isset ( $ address -> city ) && !Utils::isEmpty ($ address ->city )) $ rc .= ', ' .$ address ->city ;
37+ if (isset ( $ address -> zipCode ) && !Utils::isEmpty ($ address ->zipCode )) $ rc .= ', ' .$ address ->zipCode ;
38+ if (isset ( $ address -> street1 ) && !Utils::isEmpty ($ address ->street1 )) $ rc .= ', ' .$ address ->street1 ;
39+ if (isset ( $ address -> street2 ) && !Utils::isEmpty ($ address ->street2 )) $ rc .= ', ' .$ address ->street2 ;
4040 return substr ($ rc , 2 );
4141 }
4242}
0 commit comments