X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FReport%2FUtils%2FReport.php;h=1a7d6214ca8c52b3958851a01eeaf9a7483a97fc;hb=6001af1fcbbc0387ed360feafba3153a3f74932a;hp=9f8945d500a4b65c081cfa383695d55084451dfa;hpb=175a59791e34e7ade2e6f35c142fe0efb10d95a5;p=civicrm-core.git diff --git a/CRM/Report/Utils/Report.php b/CRM/Report/Utils/Report.php index 9f8945d500..1a7d6214ca 100644 --- a/CRM/Report/Utils/Report.php +++ b/CRM/Report/Utils/Report.php @@ -103,10 +103,10 @@ WHERE TRIM(BOTH '/' FROM CONCAT(report_id, '/', name)) = %1"; static function getNextUrl($urlValue, $query = 'reset=1', $absolute = FALSE, $instanceID = NULL, $drilldownReport = array()) { if ($instanceID) { $drilldownInstanceID = false; - if (array_key_exists($urlValue, $drilldownReport)) + if (array_key_exists($urlValue, $drilldownReport)) $drilldownInstanceID = CRM_Core_DAO::getFieldValue('CRM_Report_DAO_Instance', $instanceID, 'drilldown_id', 'id'); - if (!$drilldownInstanceID) + if (!$drilldownInstanceID) $drilldownInstanceID = self::getInstanceIDForValue($urlValue); if ($drilldownInstanceID) { @@ -359,11 +359,15 @@ WHERE inst.report_id = %1"; $wrapper = new CRM_Utils_Wrapper(); $arguments['urlToSession'] = array( - array('urlVar' => 'instanceId', + array( + 'urlVar' => 'instanceId', 'type' => 'Positive', 'sessionVar' => 'instanceId', 'default' => 'null', - )); + ), + ); + $arguments['ignoreKey'] = TRUE; + $messages[] = $wrapper->run($templateInfo['name'], NULL, $arguments); } else { @@ -465,7 +469,7 @@ WHERE inst.report_id = %1"; static function getInstanceList($reportUrl) { static $instanceDetails = array(); - + if (!array_key_exists($reportUrl, $instanceDetails )) { $instanceDetails[$reportUrl] = array();