-- CRM-9288 - Website type improvements: allow multiple websites in Profiles, respect...

[civicrm-core.git] / CRM / Contact / BAO / Contact.php

diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index 89009fff3ae551d26ef9027b95885a32fcf2b338..5b5d0985cfb29f406ca1b3dafca052ae92f6ea83 100644 (file)
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -1166,6 +1166,7 @@ WHERE id={$id}; ";
 
       //website fields
       $fields = array_merge($fields, CRM_Core_DAO_Website::import());
+      $fields['url']['hasWebsiteType'] = TRUE;
 
       if ($contactType != 'All') {
         $fields = array_merge($fields,
@@ -2062,12 +2063,8 @@ ORDER BY civicrm_email.is_primary DESC";
       else {
         if (substr($key, 0, 4) === 'url-') {
           $websiteField = explode('-', $key);
-          if (isset($websiteField[2])) {
-            $data['website'][$websiteField[1]]['website_type_id'] = $value;
-          }
-          else {
-            $data['website'][$websiteField[1]]['url'] = $value;
-          }
+          $data['website'][$websiteField[1]]['website_type_id'] = $websiteField[1];
+          $data['website'][$websiteField[1]]['url'] = $value;
         }
         elseif (in_array($key, self::$_greetingTypes, TRUE)) {
           //save email/postal greeting and addressee values if any, CRM-4575