From: Donald A. Lobo Date: Tue, 30 Apr 2013 22:19:30 +0000 (-0700) Subject: formatting fixes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8607c3f2575caaf5f92b2733d750970586ed251e;p=civicrm-core.git formatting fixes --- diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index a3657e445b..377617fac7 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -1368,7 +1368,7 @@ class CRM_Contact_BAO_Query { (substr($values[0], 0, 6) == 'grant_') || (substr($values[0], 0, 7) == 'pledge_') || (substr($values[0], 0, 5) == 'case_') || - (substr($values[0], 0, 10) == 'financial_') + (substr($values[0], 0, 10) == 'financial_') ) { return; } @@ -4849,7 +4849,6 @@ WHERE displayRelType.relationship_type_id = $relType AND displayRelType.is_active = 1 "; } - $this->_qill[0][] = $qillMessage . "'" . $relationshipTypeLabel . "'"; } diff --git a/CRM/Contribute/Form/SearchContribution.php b/CRM/Contribute/Form/SearchContribution.php index a0dbe9d3b3..cc5ac44a69 100644 --- a/CRM/Contribute/Form/SearchContribution.php +++ b/CRM/Contribute/Form/SearchContribution.php @@ -1,28 +1,28 @@ add('text', 'title', ts('Find'), $attributes); - $financial_account = CRM_Contribute_PseudoConstant::financialType( ); - foreach($financial_account as $contributionId => $contributionName) { - $this->addElement('checkbox', "financial_type_id[$contributionId]", 'Financial Type', $contributionName); + $financial_account = CRM_Contribute_PseudoConstant::financialType( ); + foreach($financial_account as $contributionId => $contributionName) { + $this->addElement('checkbox', "financial_type_id[$contributionId]", 'Financial Type', $contributionName); } CRM_Campaign_BAO_Campaign::addCampaignInComponentSearch($this); @@ -68,7 +68,7 @@ class CRM_Contribute_Form_SearchContribution extends CRM_Core_Form { $parent = $this->controller->getParent(); $parent->set('searchResult', 1); if (!empty($params)) { - $fields = array( 'title', 'financial_type_id', 'campaign_id' ); + $fields = array( 'title', 'financial_type_id', 'campaign_id' ); foreach ($fields as $field) { if (isset($params[$field]) && !CRM_Utils_System::isNull($params[$field]) diff --git a/CRM/Contribute/Selector/Search.php b/CRM/Contribute/Selector/Search.php index 7cf3364c89..79f28e0920 100644 --- a/CRM/Contribute/Selector/Search.php +++ b/CRM/Contribute/Selector/Search.php @@ -376,15 +376,15 @@ class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements C ); $row['action'] = CRM_Core_Action::formLink(self::links($componentId, - $componentAction, - $qfKey, - $componentContext - ), - $mask, $actions + $componentAction, + $qfKey, + $componentContext + ), + $mask, $actions ); $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? - $result->contact_sub_type : $result->contact_type, FALSE, $result->contact_id + $result->contact_sub_type : $result->contact_type, FALSE, $result->contact_id ); if (CRM_Utils_Array::value('amount_level', $row)) { @@ -428,7 +428,7 @@ class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements C 'direction' => CRM_Utils_Sort::DONTCARE, ), array('name' => ts('Type'), - 'sort' => 'financial_type_id', + 'sort' => 'financial_type_id', 'direction' => CRM_Utils_Sort::DONTCARE, ), array( @@ -497,5 +497,4 @@ class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements C return $this->_query->summaryContribution($this->_context); } } -//end of class