projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4892 from colemanw/INFRA-132
[civicrm-core.git]
/
CRM
/
Core
/
BAO
/
Tag.php
diff --git
a/CRM/Core/BAO/Tag.php
b/CRM/Core/BAO/Tag.php
index 4625c39ec544e4035850b6f53d21e48b61a9c16c..475bb5f6ff9f83e448eeaa65899cd532ce837a96 100644
(file)
--- a/
CRM/Core/BAO/Tag.php
+++ b/
CRM/Core/BAO/Tag.php
@@
-126,7
+126,8
@@
class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
*
* @return array
*/
*
* @return array
*/
- public static function getTagsUsedFor($usedFor = array('civicrm_contact'),
+ public static function getTagsUsedFor($usedFor = array(
+ 'civicrm_contact'),
$buildSelect = TRUE,
$all = FALSE,
$parentId = NULL
$buildSelect = TRUE,
$all = FALSE,
$parentId = NULL
@@
-196,7
+197,8
@@
class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
*
* @return array
*/
*
* @return array
*/
- static function getTags($usedFor = 'civicrm_contact',
+ static function getTags(
+ $usedFor = 'civicrm_contact',
&$tags = array(),
$parentId = NULL,
$separator = ' ',
&$tags = array(),
$parentId = NULL,
$separator = ' ',
@@
-302,7
+304,7
@@
class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
$formattedTags = array();
foreach ($tags as $key => $tag) {
if (!empty($tag[2])) {
$formattedTags = array();
foreach ($tags as $key => $tag) {
if (!empty($tag[2])) {
- $key = $tag[2]. "-" . $key;
+ $key = $tag[2]
. "-" . $key;
}
$formattedTags[$key] = $tag[0] . $tag[1];
}
}
$formattedTags[$key] = $tag[0] . $tag[1];
}
@@
-445,7
+447,8
@@
class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
/**
* Get the tags that are not children of a tagset.
*
/**
* Get the tags that are not children of a tagset.
*
- * @return array $tags associated array of tag name and id@access public
+ * @return array $tags associated array of tag name and id
+ * @access public
* @static
*/
public static function getTagsNotInTagset() {
* @static
*/
public static function getTagsNotInTagset() {