X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContact%2FBAO%2FRelationshipType.php;h=131e47e3e75a370c3d098818fafcc41b2a4b20d8;hb=66efdbfea116d74a20496139dd284925a6ceb9cf;hp=6711f5c99601e499f7ee0358a158f92cab4f75c5;hpb=a335f6b228626e3e1b2f1549c8ddcbb9232b3c6b;p=civicrm-core.git diff --git a/CRM/Contact/BAO/RelationshipType.php b/CRM/Contact/BAO/RelationshipType.php index 6711f5c996..131e47e3e7 100644 --- a/CRM/Contact/BAO/RelationshipType.php +++ b/CRM/Contact/BAO/RelationshipType.php @@ -1,9 +1,9 @@ copyValues($params); if ($relationshipType->find(TRUE)) { @@ -63,30 +63,31 @@ class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType } /** - * Update the is_active flag in the db + * Update the is_active flag in the db. * - * @param int $id id of the database record - * @param boolean $is_active value we want to set the is_active field + * @param int $id + * Id of the database record. + * @param bool $is_active + * Value we want to set the is_active field. * - * @return Object DAO object on sucess, null otherwise - * @static + * @return Object + * DAO object on sucess, null otherwise */ - static function setIsActive($id, $is_active) { + public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Contact_DAO_RelationshipType', $id, 'is_active', $is_active); } /** - * Add the relationship type in the db + * Add the relationship type in the db. * - * @param array $params (reference ) an assoc array of name/value pairs - * @param array $ids the array that holds all the db ids + * @param array $params + * (reference ) an assoc array of name/value pairs. + * @param array $ids + * The array that holds all the db ids. * * @return CRM_Contact_DAO_RelationshipType - * @access public - * @static - * */ - static function add(&$params, &$ids) { + public static function add(&$params, &$ids) { //to change name, CRM-3336 if (empty($params['label_a_b']) && !empty($params['name_a_b'])) { $params['label_a_b'] = $params['name_a_b']; @@ -131,15 +132,14 @@ class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType } /** - * Delete Relationship Types + * Delete Relationship Types. * * @param int $relationshipTypeId * * @throws CRM_Core_Exception * @return mixed - * @static */ - static function del($relationshipTypeId) { + public static function del($relationshipTypeId) { // make sure relationshipTypeId is an integer // @todo review this as most delete functions rely on the api & form layer for this // or do a find first & throw error if no find @@ -147,7 +147,6 @@ class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType throw new CRM_Core_Exception(ts('Invalid relationship type')); } - //check dependencies // delete all relationships @@ -161,7 +160,12 @@ UPDATE civicrm_membership_type SET relationship_type_id = NULL WHERE relationship_type_id = %1 "; - $params = array(1 => array(CRM_Core_DAO::VALUE_SEPARATOR . $relationshipTypeId . CRM_Core_DAO::VALUE_SEPARATOR, 'String')); + $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 @@ -176,5 +180,5 @@ UPDATE civicrm_membership_type $relationshipType->id = $relationshipTypeId; return $relationshipType->delete(); } -} +}