From 73416ad0f65c45feedb6a9561d7df34c36806d66 Mon Sep 17 00:00:00 2001
From: monishdeb <monish.deb@webaccessglobal.com>
Date: Tue, 29 Sep 2015 02:19:16 +0530
Subject: [PATCH] Merge forward miss

---
 CRM/Financial/Page/AJAX.php                   | 2 +-
 tests/phpunit/CRM/Financial/Page/AjaxTest.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php
index 65be2bc70d..0db7ee5ccf 100644
--- a/CRM/Financial/Page/AJAX.php
+++ b/CRM/Financial/Page/AJAX.php
@@ -269,7 +269,7 @@ class CRM_Financial_Page_AJAX {
    *
    * @return string
    */
-  public static function getFinancialTransactionsList($return = FALSE) {
+  public static function getFinancialTransactionsList() {
     $sortMapper = array(
       0 => '',
       1 => '',
diff --git a/tests/phpunit/CRM/Financial/Page/AjaxTest.php b/tests/phpunit/CRM/Financial/Page/AjaxTest.php
index 6871423864..30735b2225 100644
--- a/tests/phpunit/CRM/Financial/Page/AjaxTest.php
+++ b/tests/phpunit/CRM/Financial/Page/AjaxTest.php
@@ -46,7 +46,8 @@ class CRM_Financial_Page_AjaxTest extends CiviUnitTestCase {
    ");
     $_REQUEST['sEcho'] = 1;
     $_REQUEST['entityID'] = $batch['id'];
-    $json = CRM_Financial_Page_AJAX::getFinancialTransactionsList(TRUE);
+    $_REQUEST['return'] = TRUE;
+    $json = CRM_Financial_Page_AJAX::getFinancialTransactionsList();
     $this->assertEquals($json, '{"sEcho": 1, "iTotalRecords": 1, "iTotalDisplayRecords": 1, "aaData": [ ["","<a href=\"/index.php?q=civicrm/profile/view&amp;reset=1&amp;gid=7&amp;id=3&amp;snippet=4\" class=\"crm-summary-link\"><div'
     . ' class=\"icon crm-icon Individual-icon\"></div></a>","<a href=/index.php?q=civicrm/contact/view&amp;reset=1&amp;cid=3>Anderson, Anthony</a>","$ 100.00","12345","' . CRM_Utils_Date::customFormat(date('Ymd')) . ' 12:00 AM",'
     . '"Credit Card","Completed","Donation","<span><a href=\"http://FIX ME/index.php?q=civicrm/contact/view/contribution&amp;reset=1&amp;id=1&amp;cid=3&amp;action=view&amp;context=contribution&amp;'
-- 
2.25.1