projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure that completed status is selected by default on search contribution form
[civicrm-core.git]
/
CRM
/
Contribute
/
PseudoConstant.php
diff --git
a/CRM/Contribute/PseudoConstant.php
b/CRM/Contribute/PseudoConstant.php
index 8373687ac8807037b686ccef8723139572f8c4df..37433be2e30973858acc38eb65192d90e5bc2801 100644
(file)
--- a/
CRM/Contribute/PseudoConstant.php
+++ b/
CRM/Contribute/PseudoConstant.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
8
|
+ | Copyright CiviCRM LLC (c) 2004-201
9
|
+--------------------------------------------------------------------+
| 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
8
+ * @copyright CiviCRM LLC (c) 2004-201
9
*/
/**
*/
/**
@@
-260,7
+260,7
@@
class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant {
* array of all Premiums if any
*/
public static function products($pageID = NULL) {
* array of all Premiums if any
*/
public static function products($pageID = NULL) {
- $products =
array()
;
+ $products =
[]
;
$dao = new CRM_Contribute_DAO_Product();
$dao->is_active = 1;
$dao->orderBy('id');
$dao = new CRM_Contribute_DAO_Product();
$dao->is_active = 1;
$dao->orderBy('id');
@@
-276,7
+276,7
@@
class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant {
$dao->find(TRUE);
$premiumID = $dao->id;
$dao->find(TRUE);
$premiumID = $dao->id;
- $productID =
array()
;
+ $productID =
[]
;
$dao = new CRM_Contribute_DAO_PremiumsProduct();
$dao->premiums_id = $premiumID;
$dao = new CRM_Contribute_DAO_PremiumsProduct();
$dao->premiums_id = $premiumID;
@@
-285,7
+285,7
@@
class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant {
$productID[$dao->product_id] = $dao->product_id;
}
$productID[$dao->product_id] = $dao->product_id;
}
- $tempProduct =
array()
;
+ $tempProduct =
[]
;
foreach ($products as $key => $value) {
if (!array_key_exists($key, $productID)) {
$tempProduct[$key] = $value;
foreach ($products as $key => $value) {
if (!array_key_exists($key, $productID)) {
$tempProduct[$key] = $value;
@@
-365,10
+365,10
@@
class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant {
*/
public static function &pcpStatus($column = 'label') {
if (NULL === self::$pcpStatus) {
*/
public static function &pcpStatus($column = 'label') {
if (NULL === self::$pcpStatus) {
- self::$pcpStatus =
array()
;
+ self::$pcpStatus =
[]
;
}
if (!array_key_exists($column, self::$pcpStatus)) {
}
if (!array_key_exists($column, self::$pcpStatus)) {
- self::$pcpStatus[$column] =
array()
;
+ self::$pcpStatus[$column] =
[]
;
self::$pcpStatus[$column] = CRM_Core_OptionGroup::values('pcp_status', FALSE,
FALSE, FALSE, NULL, $column
self::$pcpStatus[$column] = CRM_Core_OptionGroup::values('pcp_status', FALSE,
FALSE, FALSE, NULL, $column
@@
-380,6
+380,8
@@
class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant {
/**
* Get financial account for a Financial type.
*
/**
* Get financial account for a Financial type.
*
+ * @deprecated use the alternative with caching
+ * CRM_Financial_BAO_FinancialAccount::getFinancialAccountForFinancialTypeByRelationship
*
* @param int $entityId
* @param string $accountRelationType
*
* @param int $entityId
* @param string $accountRelationType
@@
-388,11
+390,11
@@
class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant {
* @return int
*/
public static function getRelationalFinancialAccount($entityId, $accountRelationType, $entityTable = 'civicrm_financial_type', $returnField = 'financial_account_id') {
* @return int
*/
public static function getRelationalFinancialAccount($entityId, $accountRelationType, $entityTable = 'civicrm_financial_type', $returnField = 'financial_account_id') {
- $params =
array(
- 'return' =>
array($returnField)
,
+ $params =
[
+ 'return' =>
[$returnField]
,
'entity_table' => $entityTable,
'entity_id' => $entityId,
'entity_table' => $entityTable,
'entity_id' => $entityId,
-
)
;
+
]
;
if ($accountRelationType) {
$params['account_relationship.name'] = $accountRelationType;
}
if ($accountRelationType) {
$params['account_relationship.name'] = $accountRelationType;
}