Merge pull request #5035 from TeNNoX/master

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

diff --git a/CRM/Mailing/Page/Common.php b/CRM/Mailing/Page/Common.php
index 1fd680c354797f11faab95039e19674ae09917d9..6863aa338a5ad53eb79f0a471a5a932b3471d36c 100644 (file)
--- a/CRM/Mailing/Page/Common.php
+++ b/CRM/Mailing/Page/Common.php
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -36,13 +36,17 @@ class CRM_Mailing_Page_Common extends CRM_Core_Page {
   protected $_type = NULL;
 
   /**
+   * Run page.
+   *
+   * This includes assigning smarty variables and other page processing.
+   *
    * @return string
    * @throws Exception
    */
   public function run() {
-    $job_id   = CRM_Utils_Request::retrieve('jid', 'Integer', CRM_Core_DAO::$_nullObject);
+    $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 ||
@@ -51,7 +55,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) {
@@ -125,4 +128,5 @@ class CRM_Mailing_Page_Common extends CRM_Core_Page {
 
     return parent::run();
   }
+
 }