Merge pull request #1439 from yashodha/webtest-fixes

fix Contribution Aggregate by Relationship report

CRM/Report/Form/Contribute/History.php

@@ -683,15 +683,13 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form {
   }
 
   // Override "This Year" $op options
-  static function getOperationPair($type = "string", $fieldName = NULL) {
-      if ($fieldName == 'this_year' || $fieldName == 'other_year') {
-          return array('calendar' => ts('Is Calendar Year'), 'fiscal' => ts('Fiscal Year Starting'));
-      }
-      return parent::getOperationPair($type, $fieldName);
+  function getOperationPair($type = "string", $fieldName = NULL) {
+    if ($fieldName == 'this_year' || $fieldName == 'other_year') {
+      return array('calendar' => ts('Is Calendar Year'), 'fiscal' => ts('Fiscal Year Starting'));
+    }
+    return parent::getOperationPair($type, $fieldName);
   }
 
-
-
   function alterDisplay(&$rows) {
     if (empty($rows)) {
       return;