INFRA-132 batch 2 cleanup

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

diff --git a/CRM/Mailing/Page/Common.php b/CRM/Mailing/Page/Common.php
index 5fb5140d208d5a7d4a2acf34fb0307d2721e0194..419ada767c5ffa2ae260f49900fac8e416ba98ac 100644 (file)
--- a/CRM/Mailing/Page/Common.php
+++ b/CRM/Mailing/Page/Common.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -35,10 +35,14 @@
 class CRM_Mailing_Page_Common extends CRM_Core_Page {
   protected $_type = NULL;
 
-  function run() {
-    $job_id   = CRM_Utils_Request::retrieve('jid', 'Integer', CRM_Core_DAO::$_nullObject);
+  /**
+   * @return string
+   * @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);
+    $hash = CRM_Utils_Request::retrieve('h', 'String', CRM_Core_DAO::$_nullObject);
 
     if (!$job_id ||
       !$queue_id ||
@@ -47,7 +51,6 @@ class CRM_Mailing_Page_Common extends CRM_Core_Page {
       CRM_Core_Error::fatal(ts("Missing input parameters"));
     }
 
-
     // verify that the three numbers above match
     $q = CRM_Mailing_Event_BAO_Queue::verify($job_id, $queue_id, $hash);
     if (!$q) {
@@ -122,4 +125,3 @@ class CRM_Mailing_Page_Common extends CRM_Core_Page {
     return parent::run();
   }
 }
-