X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FAdmin%2FPage%2FTag.php;h=0214b9e5c11e00cde3d2a8a759c060f19ce3a93e;hb=db89844a9c76000502a24414cbdbe602b389bb4f;hp=fa1cccadfa0642c230bdb9f690211b93943d4aeb;hpb=8960f050bc875db30ec426da1c95a281e5d2bb50;p=civicrm-core.git

diff --git a/CRM/Admin/Page/Tag.php b/CRM/Admin/Page/Tag.php
index fa1cccadfa..0214b9e5c1 100644
--- a/CRM/Admin/Page/Tag.php
+++ b/CRM/Admin/Page/Tag.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | 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.                                    |
  |                                                                    |
@@ -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_Admin_Page_Tag extends CRM_Core_Page_Basic {
 
+  public $useLivePageJS = TRUE;
+
   /**
    * The action links that we need to display for the browse screen
    *
@@ -78,7 +80,6 @@ class CRM_Admin_Page_Tag extends CRM_Core_Page_Basic {
         CRM_Core_Action::FOLLOWUP => array(
           'name' => ts('Merge'),
           'class' => 'merge_tag',
-          'url' => 'javascript:',
           'title' => ts('Merge Tag'),
         ),
       );
@@ -116,6 +117,8 @@ class CRM_Admin_Page_Tag extends CRM_Core_Page_Basic {
   /**
    * Get user context.
    *
+   * @param null $mode
+   *
    * @return string user context.
    */
   function userContext($mode = NULL) {