Merge pull request #2708 from yashodha/sms-reminder

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

diff --git a/CRM/Contact/BAO/RelationshipType.php b/CRM/Contact/BAO/RelationshipType.php
index 53db380d88373ad1a39ceb94ef034b186dc2fc03..09906576920ecb719b6eca7a192cf640ebd8166f 100644 (file)
--- a/CRM/Contact/BAO/RelationshipType.php
+++ b/CRM/Contact/BAO/RelationshipType.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -92,21 +92,21 @@ class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType
    */
   static function add(&$params, &$ids) {
     //to change name, CRM-3336
-    if (!CRM_Utils_Array::value('label_a_b', $params) && CRM_Utils_Array::value('name_a_b', $params)) {
+    if (empty($params['label_a_b']) && !empty($params['name_a_b'])) {
       $params['label_a_b'] = $params['name_a_b'];
     }
 
-    if (!CRM_Utils_Array::value('label_b_a', $params) && CRM_Utils_Array::value('name_b_a', $params)) {
+    if (empty($params['label_b_a']) && !empty($params['name_b_a'])) {
       $params['label_b_a'] = $params['name_b_a'];
     }
 
     // set label to name if it's not set - but *only* for
     // ADD action. CRM-3336 as part from (CRM-3522)
-    if (!CRM_Utils_Array::value('relationshipType', $ids)) {
-      if (!CRM_Utils_Array::value('name_a_b', $params) && CRM_Utils_Array::value('label_a_b', $params)) {
+    if (empty($ids['relationshipType'])) {
+      if (empty($params['name_a_b']) && !empty($params['label_a_b'])) {
         $params['name_a_b'] = $params['label_a_b'];
       }
-      if (!CRM_Utils_Array::value('name_b_a', $params) && CRM_Utils_Array::value('label_b_a', $params)) {
+      if (empty($params['name_b_a']) && !empty($params['label_b_a'])) {
         $params['name_b_a'] = $params['label_b_a'];
       }
     }
@@ -157,7 +157,7 @@ UPDATE civicrm_membership_type
   SET  relationship_type_id = NULL
  WHERE relationship_type_id = %1
 ";
-    $params = array(1 => array($relationshipTypeId, 'Integer'));
+    $params = array(1 => array(CRM_Core_DAO::VALUE_SEPARATOR . $relationshipTypeId . CRM_Core_DAO::VALUE_SEPARATOR, 'String'));
     CRM_Core_DAO::executeQuery($query, $params);
 
     //fixed for CRM-3323