Merge pull request #9437 from JMAConsulting/CRM-19681

CRM-19681, fixed code to respect date filters passed from url for report
civicrm · Nov 24, 2016 · 109fb78 · 109fb78
2 parents 05b465b + dd56d5d
commit 109fb78
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/CRM/Report/Utils/Get.php b/CRM/Report/Utils/Get.php
@@ -66,9 +66,12 @@ public static function dateParam($fieldName, &$field, &$defaults) {
     $from = self::getTypedValue("{$fieldName}_from", $type);
     $to = self::getTypedValue("{$fieldName}_to", $type);
 
-    $relative = CRM_Utils_Array::value("{$fieldName}_relative", $_GET);
+    $relative = self::getTypedValue("{$fieldName}_relative", CRM_Utils_Type::T_STRING);
+    if ($relative !== NULL) {
+      $defaults["{$fieldName}_relative"] = $relative;
+    }
     if ($relative) {
-      list($from, $to) = CRM_Report_Form::getFromTo($relative, NULL, NULL);
+      list($from, $to) = CRM_Utils_Date::getFromTo($relative, NULL, NULL);
       $from = substr($from, 0, 8);
       $to = substr($to, 0, 8);
     }