Merge pull request #5051 from eileenmcnaughton/comments

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

diff --git a/CRM/Mailing/Page/Component.php b/CRM/Mailing/Page/Component.php
index 0299158dd6a8595ec062c6bf0644f7343ee691f5..625081fbd29799b9928a24af2ce5545909814d18 100644 (file)
--- a/CRM/Mailing/Page/Component.php
+++ b/CRM/Mailing/Page/Component.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        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -43,25 +43,26 @@ class CRM_Mailing_Page_Component extends CRM_Core_Page_Basic {
    * The action links that we need to display for the browse screen
    *
    * @var array
-   * @static
    */
   static $_links = NULL;
 
   /**
    * Get BAO Name
    *
-   * @return string Classname of BAO.
+   * @return string
+   *   Classname of BAO.
    */
-  function getBAOName() {
+  public function getBAOName() {
     return 'CRM_Mailing_BAO_Component';
   }
 
   /**
    * Get action Links
    *
-   * @return array (reference) of action links
+   * @return array
+   *   (reference) of action links
    */
-  function &links() {
+  public function &links() {
     if (!(self::$_links)) {
       self::$_links = array(
         CRM_Core_Action::UPDATE => array(
@@ -88,18 +89,20 @@ class CRM_Mailing_Page_Component extends CRM_Core_Page_Basic {
   /**
    * Get name of edit form
    *
-   * @return string Classname of edit form.
+   * @return string
+   *   Classname of edit form.
    */
-  function editForm() {
+  public function editForm() {
     return 'CRM_Mailing_Form_Component';
   }
 
   /**
    * Get edit form name
    *
-   * @return string name of this page.
+   * @return string
+   *   name of this page.
    */
-  function editName() {
+  public function editName() {
     return 'Mailing Components';
   }
 
@@ -108,9 +111,10 @@ class CRM_Mailing_Page_Component extends CRM_Core_Page_Basic {
    *
    * @param null $mode
    *
-   * @return string user context.
+   * @return string
+   *   user context.
    */
-  function userContext($mode = NULL) {
+  public function userContext($mode = NULL) {
     return CRM_Utils_System::currentPath();
   }
 
@@ -119,8 +123,8 @@ class CRM_Mailing_Page_Component extends CRM_Core_Page_Basic {
    * @param null $pageArgs
    * @param null $sort
    */
-  function run($args = NULL, $pageArgs = NULL, $sort = NULL) {
+  public function run($args = NULL, $pageArgs = NULL, $sort = NULL) {
     return parent::run($args, $pageArgs, "component_type, is_default desc, name");
   }
-}
 
+}