Merge pull request #4634 from giant-rabbit/JobLogCommandListingBug

[civicrm-core.git] / CRM / Report / Page / Options.php

diff --git a/CRM/Report/Page/Options.php b/CRM/Report/Page/Options.php
index a7d54373f03f7990637aa5bdde4417cf73172c01..bd6a1752e42123e3a4d0293f2517055ce54a4aee 100644 (file)
--- a/CRM/Report/Page/Options.php
+++ b/CRM/Report/Page/Options.php
@@ -2,9 +2,9 @@
 
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -29,7 +29,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -39,6 +39,8 @@
  */
 class CRM_Report_Page_Options extends CRM_Core_Page_Basic {
 
+  public $useLivePageJS = TRUE;
+
   /**
    * The action links that we need to display for the browse screen
    *
@@ -165,9 +167,6 @@ class CRM_Report_Page_Options extends CRM_Core_Page_Basic {
    * @static
    */
   function browse() {
-    if (CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'ajax_popups_enabled', NULL, TRUE)) {
-      CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'js/crm.livePage.js');
-    }
     $groupParams = array('name' => self::$_gName);
     $optionValue = CRM_Core_OptionValue::getRows($groupParams, $this->links(), 'weight');
     $gName       = self::$_gName;
@@ -205,6 +204,8 @@ class CRM_Report_Page_Options extends CRM_Core_Page_Basic {
   /**
    * Get user context.
    *
+   * @param null $mode
+   *
    * @return string user context.
    */
   function userContext($mode = NULL) {
@@ -212,7 +213,7 @@ class CRM_Report_Page_Options extends CRM_Core_Page_Basic {
   }
 
   /**
-   * function to get userContext params
+   * Get userContext params
    *
    * @param int $mode mode that we are in
    *