projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bulk comment fix
[civicrm-core.git]
/
CRM
/
Admin
/
Page
/
Tag.php
diff --git
a/CRM/Admin/Page/Tag.php
b/CRM/Admin/Page/Tag.php
index fa1cccadfa0642c230bdb9f690211b93943d4aeb..0214b9e5c11e00cde3d2a8a759c060f19ce3a93e 100644
(file)
--- a/
CRM/Admin/Page/Tag.php
+++ b/
CRM/Admin/Page/Tag.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id$
*
*/
* $Id$
*
*/
@@
-38,6
+38,8
@@
*/
class CRM_Admin_Page_Tag extends CRM_Core_Page_Basic {
*/
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
*
/**
* 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',
CRM_Core_Action::FOLLOWUP => array(
'name' => ts('Merge'),
'class' => 'merge_tag',
- 'url' => 'javascript:',
'title' => ts('Merge Tag'),
),
);
'title' => ts('Merge Tag'),
),
);
@@
-116,6
+117,8
@@
class CRM_Admin_Page_Tag extends CRM_Core_Page_Basic {
/**
* Get user context.
*
/**
* Get user context.
*
+ * @param null $mode
+ *
* @return string user context.
*/
function userContext($mode = NULL) {
* @return string user context.
*/
function userContext($mode = NULL) {