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 #5983 from relldoesphp/CRM-16544
[civicrm-core.git]
/
CRM
/
Core
/
OptionGroup.php
diff --git
a/CRM/Core/OptionGroup.php
b/CRM/Core/OptionGroup.php
index 9a25dfe25b9a4712e47d1ded2238b634b0270123..7770090bd2bd7a72af7db7dd5be9af361664e53b 100644
(file)
--- a/
CRM/Core/OptionGroup.php
+++ b/
CRM/Core/OptionGroup.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 4.6 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 4.6 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
4
|
+ | Copyright CiviCRM LLC (c) 2004-201
5
|
+--------------------------------------------------------------------+
| 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
4
+ * @copyright CiviCRM LLC (c) 2004-201
5
* $Id$
*
*/
* $Id$
*
*/
@@
-591,12
+591,14
@@
SELECT v.label
* @param string $field
* @param string $fieldType
* @param bool $active
* @param string $field
* @param string $fieldType
* @param bool $active
+ * @param bool $localize
+ * if true, localize the results before returning.
*
* @return array
*/
public static function getRowValues(
$groupName, $fieldValue, $field = 'name',
*
* @return array
*/
public static function getRowValues(
$groupName, $fieldValue, $field = 'name',
- $fieldType = 'String', $active = TRUE
+ $fieldType = 'String', $active = TRUE
, $localize = FALSE
) {
$query = "
SELECT v.id, v.label, v.value, v.name, v.weight, v.description
) {
$query = "
SELECT v.id, v.label, v.value, v.name, v.weight, v.description
@@
-631,6
+633,13
@@
WHERE v.option_group_id = g.id
$row[$fld] = $dao->$fld;
}
}
$row[$fld] = $dao->$fld;
}
}
+
+ if ($localize) {
+ foreach (array('label', 'description') as $f) {
+ $row[$f] = ts($row[$f]);
+ }
+ }
+
return $row;
}
return $row;
}