Merge pull request #11757 from eileenmcnaughton/manual

[civicrm-core.git] / CRM / Mailing / Page / Common.php

diff --git a/CRM/Mailing/Page/Common.php b/CRM/Mailing/Page/Common.php
index 4260ad501d2df674f4329b2dbb2da6d7f1c4337a..b71b8e978dba732dd525250648dcce9d48f6ef73 100644 (file)
--- a/CRM/Mailing/Page/Common.php
+++ b/CRM/Mailing/Page/Common.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2016                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2016
+ * @copyright CiviCRM LLC (c) 2004-2018
  */
 class CRM_Mailing_Page_Common extends CRM_Core_Page {
   protected $_type = NULL;
@@ -42,9 +42,9 @@ class CRM_Mailing_Page_Common extends CRM_Core_Page {
    * @throws Exception
    */
   public function run() {
-    $job_id = CRM_Utils_Request::retrieve('jid', 'Integer', CRM_Core_DAO::$_nullObject);
-    $queue_id = CRM_Utils_Request::retrieve('qid', 'Integer', CRM_Core_DAO::$_nullObject);
-    $hash = CRM_Utils_Request::retrieve('h', 'String', CRM_Core_DAO::$_nullObject);
+    $job_id = CRM_Utils_Request::retrieve('jid', 'Integer');
+    $queue_id = CRM_Utils_Request::retrieve('qid', 'Integer');
+    $hash = CRM_Utils_Request::retrieve('h', 'String');
 
     if (!$job_id ||
       !$queue_id ||