Merge pull request #4696 from colemanw/CRM-15669

[civicrm-core.git] / CRM / Campaign / Page / Campaign.php

diff --git a/CRM/Campaign/Page/Campaign.php b/CRM/Campaign/Page/Campaign.php
index d17f23ec3bbf278a3403071ccf920f66e29ae329..bee0234590031e9b27130826681a42565588bb36 100644 (file)
--- a/CRM/Campaign/Page/Campaign.php
+++ b/CRM/Campaign/Page/Campaign.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -38,6 +38,8 @@
  */
 class CRM_Campaign_Page_Campaign extends CRM_Core_Page {
 
+  public $useLivePageJS = TRUE;
+
   /**
    * The action links that we need to display for the browse screen
    *
@@ -51,7 +53,7 @@ class CRM_Campaign_Page_Campaign extends CRM_Core_Page {
    * @return array $_actionLinks
    *
    */
-  function &actionLinks() {
+  public function &actionLinks() {
     // check if variable _actionsLinks is populated
     if (!isset(self::$_actionLinks)) {
       $deleteExtra = ts('Are you sure you want to delete this Campaign?');
@@ -83,8 +85,7 @@ class CRM_Campaign_Page_Campaign extends CRM_Core_Page {
     return self::$_actionLinks;
   }
 
-  function browse() {
-    CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'js/crm.livePage.js');
+  public function browse() {
 
     $campaigns = CRM_Campaign_BAO_Campaign::getCampaignSummary();
 
@@ -123,7 +124,10 @@ class CRM_Campaign_Page_Campaign extends CRM_Core_Page {
     $this->assign('addCampaignUrl', CRM_Utils_System::url('civicrm/campaign/add', 'reset=1&action=add'));
   }
 
-  function run() {
+  /**
+   * @return string
+   */
+  public function run() {
     if (!CRM_Core_Permission::check('administer CiviCampaign')) {
       CRM_Utils_System::permissionDenied();
     }
@@ -137,4 +141,3 @@ class CRM_Campaign_Page_Campaign extends CRM_Core_Page {
     return parent::run();
   }
 }
-