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 #14098 from eileenmcnaughton/event_income
[civicrm-core.git]
/
CRM
/
Core
/
PseudoConstant.php
diff --git
a/CRM/Core/PseudoConstant.php
b/CRM/Core/PseudoConstant.php
index 0af4bd1e105fa78cb1e19915f544dcdc8468fa14..9950cf10f540e0ef8a741bc548373fdf2cfa0401 100644
(file)
--- a/
CRM/Core/PseudoConstant.php
+++ b/
CRM/Core/PseudoConstant.php
@@
-220,14
+220,12
@@
class CRM_Core_PseudoConstant {
if ($options && $flip) {
$options = array_flip($options);
}
if ($options && $flip) {
$options = array_flip($options);
}
- $customField->free();
return $options;
}
// Core field: load schema
$dao = new $daoName();
$fieldSpec = $dao->getFieldSpec($fieldName);
return $options;
}
// Core field: load schema
$dao = new $daoName();
$fieldSpec = $dao->getFieldSpec($fieldName);
- $dao->free();
// Ensure we have the canonical name for this field
$fieldName = CRM_Utils_Array::value('name', $fieldSpec, $fieldName);
// Ensure we have the canonical name for this field
$fieldName = CRM_Utils_Array::value('name', $fieldSpec, $fieldName);
@@
-313,7
+311,6
@@
class CRM_Core_PseudoConstant {
// Get list of fields for the option table
$dao = new $daoName();
$availableFields = array_keys($dao->fieldKeys());
// Get list of fields for the option table
$dao = new $daoName();
$availableFields = array_keys($dao->fieldKeys());
- $dao->free();
$select = "SELECT %1 AS id, %2 AS label";
$from = "FROM %3";
$select = "SELECT %1 AS id, %2 AS label";
$from = "FROM %3";
@@
-375,7
+372,6
@@
class CRM_Core_PseudoConstant {
while ($dao->fetch()) {
$output[$dao->id] = $dao->label;
}
while ($dao->fetch()) {
$output[$dao->id] = $dao->label;
}
- $dao->free();
// Localize results
if (!empty($params['localize']) || $pseudoconstant['table'] == 'civicrm_country' || $pseudoconstant['table'] == 'civicrm_state_province') {
$I18nParams = [];
// Localize results
if (!empty($params['localize']) || $pseudoconstant['table'] == 'civicrm_country' || $pseudoconstant['table'] == 'civicrm_state_province') {
$I18nParams = [];
@@
-411,7
+407,7
@@
class CRM_Core_PseudoConstant {
*
* @param string $baoName
* @param string $fieldName
*
* @param string $baoName
* @param string $fieldName
- * @param string|
I
nt $key
+ * @param string|
i
nt $key
*
* TODO: Accept multivalued input?
*
*
* TODO: Accept multivalued input?
*
@@
-433,7
+429,7
@@
class CRM_Core_PseudoConstant {
*
* @param string $baoName
* @param string $fieldName
*
* @param string $baoName
* @param string $fieldName
- * @param string|
I
nt $key
+ * @param string|
i
nt $key
*
* @return bool|null|string
* FALSE if the given field has no associated option list
*
* @return bool|null|string
* FALSE if the given field has no associated option list
@@
-453,7
+449,7
@@
class CRM_Core_PseudoConstant {
*
* @param string $baoName
* @param string $fieldName
*
* @param string $baoName
* @param string $fieldName
- * @param string|
I
nt $value
+ * @param string|
i
nt $value
*
* @return bool|null|string|int
* FALSE if the given field has no associated option list
*
* @return bool|null|string|int
* FALSE if the given field has no associated option list