From: Heather Killam <heather.killam.kw@gmail.com>
Date: Mon, 6 Jun 2016 14:33:06 +0000 (-0600)
Subject: Update Contact.php
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=92ab8b2475546c05982007fd5dd654da8031e2bf;p=civicrm-core.git

Update Contact.php
---

diff --git a/CRM/Contact/Form/Contact.php b/CRM/Contact/Form/Contact.php
index b94c37c783..412491bcc8 100644
--- a/CRM/Contact/Form/Contact.php
+++ b/CRM/Contact/Form/Contact.php
@@ -1290,8 +1290,11 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form {
             $streetAddress .= ' ';
           }
           // CRM-17619 - if the street number suffix begins with a number, add a space
-          if ($fld === 'street_number_suffix' && ctype_digit(substr(CRM_Utils_Array::value($fld, $address), 0, 1))) {
-            $streetAddress .= ' ';
+          $thesuffix = CRM_Utils_Array::value('street_number_suffix', $address);
+          if ($fld === 'street_number_suffix' && $thesuffix) {
+            if (ctype_digit(substr($thesuffix, 0, 1))) {
+              $streetAddress .= ' ';
+            }
           }
           $streetAddress .= CRM_Utils_Array::value($fld, $address);
         }