Merge pull request #9769 from scardinius/crm-19958

[civicrm-core.git] / extern / widget.php

diff --git a/extern/widget.php b/extern/widget.php
index 4d7b04eb71a174391d4d903fc5e4936d10726a38..38c1eec4bfe45faa73783ed6d2b927e58b4dc2b5 100644 (file)
--- a/extern/widget.php
+++ b/extern/widget.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2017
  * $Id$
  */
 require_once '../civicrm.config.php';
@@ -38,10 +38,10 @@ $config = CRM_Core_Config::singleton();
 $template = CRM_Core_Smarty::singleton();
 
 require_once 'CRM/Utils/Request.php';
-$cpageId = CRM_Utils_Request::retrieve('cpageId', 'Positive', CRM_Core_DAO::$_nullObject);
-$widgetId = CRM_Utils_Request::retrieve('widgetId', 'Positive', CRM_Core_DAO::$_nullObject);
-$format = CRM_Utils_Request::retrieve('format', 'Positive', CRM_Core_DAO::$_nullObject);
-$includePending = CRM_Utils_Request::retrieve('includePending', 'Boolean', CRM_Core_DAO::$_nullObject);
+$cpageId = CRM_Utils_Request::retrieve('cpageId', 'Positive');
+$widgetId = CRM_Utils_Request::retrieve('widgetId', 'Positive');
+$format = CRM_Utils_Request::retrieve('format', 'Positive');
+$includePending = CRM_Utils_Request::retrieve('includePending', 'Boolean');
 
 require_once 'CRM/Contribute/BAO/Widget.php';
 
@@ -56,6 +56,10 @@ $output = '
     var ' . $jsonvar . ' = ' . json_encode($data) . ';
 ';
 
-CRM_Core_Page_AJAX::setJsHeaders(60);
+// FIXME: Not using CRM_Core_Page_AJAX::setJsHeaders because CMS is not bootstrapped
+header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 60));
+header('Content-Type: application/javascript');
+header("Cache-Control: max-age=60, public");
+
 echo $output;
 CRM_Utils_System::civiExit();