From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Sun, 5 Mar 2017 07:07:52 +0000 (+0530)
Subject: CRM-20193, moved set of code into if condition for better readability
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e7003513a2e58c478cc5007fe1d903f2c71a4e60;p=civicrm-core.git

CRM-20193, moved set of code into if condition for better readability

----------------------------------------
* CRM-20193: Draw currency from better table on Batch Transaction form
  https://issues.civicrm.org/jira/browse/CRM-20193
---

diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php
index 568139db8b..cd9f06f509 100644
--- a/CRM/Batch/BAO/Batch.php
+++ b/CRM/Batch/BAO/Batch.php
@@ -725,13 +725,8 @@ LEFT JOIN civicrm_contribution_soft ON civicrm_contribution_soft.contribution_id
       $where = implode(' AND ', $query->_where[0]) .
         " AND civicrm_entity_batch.batch_id IS NULL ";
       $where = str_replace('civicrm_contribution.payment_instrument_id', 'civicrm_financial_trxn.payment_instrument_id', $where);
-      $searchValue = TRUE;
     }
     else {
-      $searchValue = FALSE;
-    }
-
-    if (!$searchValue) {
       if (!$notPresent) {
         $where = " civicrm_entity_batch.batch_id = {$entityID} ";
       }