From 62f79ceef75365e6012581fb3588faae1dc5f8ca Mon Sep 17 00:00:00 2001
From: Heather Killam <heather.killam.kw@gmail.com>
Date: Mon, 6 Jun 2016 20:12:09 -0600
Subject: [PATCH] Update Address.php

---
 CRM/Contact/Form/Edit/Address.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CRM/Contact/Form/Edit/Address.php b/CRM/Contact/Form/Edit/Address.php
index effbc4224e..c2dd280f80 100644
--- a/CRM/Contact/Form/Edit/Address.php
+++ b/CRM/Contact/Form/Edit/Address.php
@@ -354,6 +354,12 @@ class CRM_Contact_Form_Edit_Address {
             ))) {
               $streetAddress .= ' ';
             }
+            // CRM-17619 - if the street number suffix begins with a number, add a space
+            if ($fld === 'street_number_suffix' && !empty(CRM_Utils_Array::value($fld, $address))) {
+              if (ctype_digit(substr(CRM_Utils_Array::value($fld, $address), 0, 1))) {
+                $streetAddress .= ' ';
+              }
+            }
             $streetAddress .= CRM_Utils_Array::value($fld, $address);
           }
           $streetAddress = trim($streetAddress);
-- 
2.25.1