Merge pull request #5051 from eileenmcnaughton/comments

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

diff --git a/CRM/Mailing/Page/View.php b/CRM/Mailing/Page/View.php
index 2a2813ecfc22a3d895db528191f0fc2a9b602611..34dcd0a686e76da63a64905e022bcc3d1cdd6a2f 100644 (file)
--- a/CRM/Mailing/Page/View.php
+++ b/CRM/Mailing/Page/View.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -47,7 +47,7 @@ class CRM_Mailing_Page_View extends CRM_Core_Page {
    * Second check for visibility
    * Call a hook to see if hook wants to override visibility setting
    */
-  function checkPermission() {
+  public function checkPermission() {
     if (!$this->_mailing) {
       return FALSE;
     }
@@ -71,16 +71,16 @@ class CRM_Mailing_Page_View extends CRM_Core_Page {
   }
 
   /**
-   * run this page (figure out the action needed and perform it).
+   * Run this page (figure out the action needed and perform it).
    *
-   * @param null $id
-   * @param null $contactID
+   * @param int $id
+   * @param int $contactID
    * @param bool $print
    * @param bool $allowID
    *
    * @return void
    */
-  function run($id = NULL, $contactID = NULL, $print = TRUE, $allowID = FALSE) {
+  public function run($id = NULL, $contactID = NULL, $print = TRUE, $allowID = FALSE) {
     if (is_numeric($id)) {
       $this->_mailingID = $id;
     }
@@ -156,7 +156,7 @@ class CRM_Mailing_Page_View extends CRM_Core_Page {
     }
     else {
       //get tokens that are not contact specific resolved
-      $params  = array('contact_id' => 0);
+      $params = array('contact_id' => 0);
       $details = CRM_Utils_Token::getAnonymousTokenDetails($params,
         $returnProperties,
         TRUE, TRUE, NULL,
@@ -200,5 +200,5 @@ class CRM_Mailing_Page_View extends CRM_Core_Page {
       return $content;
     }
   }
-}
 
+}