CRM-14463 - Fix custom address fields to support location type

[civicrm-core.git] / CRM / Profile / Page / Dynamic.php

diff --git a/CRM/Profile/Page/Dynamic.php b/CRM/Profile/Page/Dynamic.php
index 93131a9b719f416469ac1676888eeae53ee0e9d4..7d9b17ccdbeb21c33869670c5846b18ec525b765 100644 (file)
--- a/CRM/Profile/Page/Dynamic.php
+++ b/CRM/Profile/Page/Dynamic.php
@@ -317,8 +317,16 @@ class CRM_Profile_Page_Dynamic extends CRM_Core_Page {
       $profileFields = array();
       $labels = array();
 
+      //CRM-14338
+      $nullValueIndex = ' ';
       foreach ($fields as $name => $field) {
-        $labels[$field['title']] = preg_replace('/\s+|\W+/', '_', $name);
+        if ( isset($labels[$field['title']]) ) {
+          $labels[$field['title'].$nullValueIndex] = preg_replace('/\s+|\W+/', '_', $name);
+          $nullValueIndex .= $nullValueIndex;
+        }
+        else {
+          $labels[$field['title']] = preg_replace('/\s+|\W+/', '_', $name);
+        }
       }
 
       foreach ($values as $title => $value) {