Revert "fix display of contacts' recurring con..."

This reverts the following commits:

3245bcdae93977d210d82020ec43badb79b20d4e
b8d15d544ccc74365328ce59876071c43d848443
fdfd9aefd293c1afe1759d534e862841fd552286

This is apparently fixed elsewhere upstream.

diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php
index 5461161022af7c2ac3f617d114c68c6d595ef56b..24937e2af971e6b1aeba2800128af3f6167b6b9c 100644 (file)
--- a/CRM/Contribute/BAO/ContributionRecur.php
+++ b/CRM/Contribute/BAO/ContributionRecur.php
@@ -454,10 +454,7 @@ INNER JOIN civicrm_contribution       con ON ( con.id = mp.contribution_id )
   public static function getTemplateContribution($id, $overrides = array()) {
     $templateContribution = civicrm_api3('Contribution', 'get', array(
       'contribution_recur_id' => $id,
-      // hackish/flawed fix for ambiguous reference to "id" (multiple tables with "id" column are queried).
-      // https://rt.gnu.org/Ticket/Display.html?id=1176733
-      // - sudoman 2017-01-04 (with some help by quidam)
-      'options' => array('limit' => 1, 'sort' => array('contribution_recur_id DESC')),
+      'options' => array('limit' => 1, 'sort' => array('id DESC')),
       'sequential' => 1,
       'contribution_test' => '',
     ));