projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4773 from civicrm/version-fix
[civicrm-core.git]
/
CRM
/
Member
/
Page
/
MembershipStatus.php
diff --git
a/CRM/Member/Page/MembershipStatus.php
b/CRM/Member/Page/MembershipStatus.php
index 07c5b075793c93fefb0c78da56b15c87ac26fb89..b2cbb7fa6de452ff05cc178d7d9b89b37af0bfa8 100644
(file)
--- a/
CRM/Member/Page/MembershipStatus.php
+++ b/
CRM/Member/Page/MembershipStatus.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
6
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | 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_Member_Page_MembershipStatus extends CRM_Core_Page_Basic {
*/
class CRM_Member_Page_MembershipStatus 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
*
@@
-134,7
+136,6
@@
class CRM_Member_Page_MembershipStatus extends CRM_Core_Page_Basic {
* @static
*/
function browse() {
* @static
*/
function browse() {
- CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'js/crm.livePage.js');
// get all custom groups sorted by weight
$membershipStatus = array();
$dao = new CRM_Member_DAO_MembershipStatus();
// get all custom groups sorted by weight
$membershipStatus = array();
$dao = new CRM_Member_DAO_MembershipStatus();
@@
-202,6
+203,8
@@
class CRM_Member_Page_MembershipStatus 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) {