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 #4004 from civicrm/4.4
[civicrm-core.git]
/
CRM
/
Group
/
Page
/
Group.php
diff --git
a/CRM/Group/Page/Group.php
b/CRM/Group/Page/Group.php
index 0aef79cab8cb21646d52fcb331e87d4bab3a2568..c0d6ef5ae732047ca4f54549477a59d3f0d5ec06 100644
(file)
--- a/
CRM/Group/Page/Group.php
+++ b/
CRM/Group/Page/Group.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,13
+28,16
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id$
*
*/
class CRM_Group_Page_Group extends CRM_Core_Page_Basic {
protected $_sortByCharacter;
* $Id$
*
*/
class CRM_Group_Page_Group extends CRM_Core_Page_Basic {
protected $_sortByCharacter;
+ /**
+ * @return string
+ */
function getBAOName() {
return 'CRM_Contact_BAO_Group';
}
function getBAOName() {
return 'CRM_Contact_BAO_Group';
}
@@
-80,6
+83,8
@@
class CRM_Group_Page_Group extends CRM_Core_Page_Basic {
/**
* return user context uri to return to
*
/**
* return user context uri to return to
*
+ * @param null $mode
+ *
* @return string
* @access public
*/
* @return string
* @access public
*/
@@
-90,6
+95,8
@@
class CRM_Group_Page_Group extends CRM_Core_Page_Basic {
/**
* return user context uri params
*
/**
* return user context uri params
*
+ * @param null $mode
+ *
* @return string
* @access public
*/
* @return string
* @access public
*/
@@
-100,8
+107,10
@@
class CRM_Group_Page_Group extends CRM_Core_Page_Basic {
/**
* make sure that the user has permission to access this group
*
/**
* make sure that the user has permission to access this group
*
- * @param int $id the id of the object
- * @param int $name the name or title of the object
+ * @param int $id the id of the object
+ * @param int $title
+ *
+ * @internal param int $name the name or title of the object
*
* @return string the permission that the user has (or null)
* @access public
*
* @return string the permission that the user has (or null)
* @access public
@@
-136,6
+145,14
@@
class CRM_Group_Page_Group extends CRM_Core_Page_Basic {
}
$this->assign('showOrgInfo', $showOrgInfo);
}
$this->assign('showOrgInfo', $showOrgInfo);
+ // Refresh smart group cache
+ if (!empty($_GET['update_smart_groups'])) {
+ CRM_Contact_BAO_GroupContactCache::loadAll();
+ }
+ else {
+ CRM_Contact_BAO_GroupContactCache::fillIfEmpty();
+ }
+
$this->search();
}
$this->search();
}