projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bulk comment fix
[civicrm-core.git]
/
CRM
/
Contact
/
BAO
/
Contact
/
Location.php
diff --git
a/CRM/Contact/BAO/Contact/Location.php
b/CRM/Contact/BAO/Contact/Location.php
index 152b01311ef8875286769f9d7aa4e93e3977ffd2..72fcf7b4512e7233205d3b14bc2701ff2c25e75c 100644
(file)
--- a/
CRM/Contact/BAO/Contact/Location.php
+++ b/
CRM/Contact/BAO/Contact/Location.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id$
*
*/
* $Id$
*
*/
@@
-37,7
+37,10
@@
class CRM_Contact_BAO_Contact_Location {
/**
* function to get the display name, primary email, location type and location id of a contact
*
/**
* function to get the display name, primary email, location type and location id of a contact
*
- * @param int $id id of the contact
+ * @param int $id id of the contact
+ *
+ * @param bool $isPrimary
+ * @param null $locationTypeID
*
* @return array of display_name, email, location type and location id if found, or (null,null,null, null)
* @static
*
* @return array of display_name, email, location type and location id if found, or (null,null,null, null)
* @static
@@
-75,7
+78,9
@@
WHERE civicrm_contact.id = %1";
/**
* function to get the sms number and display name of a contact
*
/**
* function to get the sms number and display name of a contact
*
- * @param int $id id of the contact
+ * @param int $id id of the contact
+ *
+ * @param null $type
*
* @return array tuple of display_name and sms if found, or (null,null)
* @static
*
* @return array tuple of display_name and sms if found, or (null,null)
* @static
@@
-111,9
+116,12
@@
LEFT JOIN civicrm_phone ON ( civicrm_phone.contact_id = civicrm_contact.id )
/**
* function to get the information to map a contact
*
/**
* function to get the information to map a contact
*
- * @param array
$ids
the list of ids for which we want map info
+ * @param array
$ids
the list of ids for which we want map info
* $param int $locationTypeID
*
* $param int $locationTypeID
*
+ * @param null $locationTypeID
+ * @param bool $imageUrlOnly
+ *
* @return null|string display name of the contact if found
* @static
* @access public
* @return null|string display name of the contact if found
* @static
* @access public