projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-13863 - Whitelist open-inline contribution links
[civicrm-core.git]
/
CRM
/
Admin
/
Page
/
LabelFormats.php
diff --git
a/CRM/Admin/Page/LabelFormats.php
b/CRM/Admin/Page/LabelFormats.php
index b3050f82089f6cd68bc51d3156d22e6d7fe20c62..3fc46604a5b385ec4c86d3182d1df62d339af37b 100644
(file)
--- a/
CRM/Admin/Page/LabelFormats.php
+++ b/
CRM/Admin/Page/LabelFormats.php
@@
-124,7
+124,9
@@
class CRM_Admin_Page_LabelFormats extends CRM_Core_Page_Basic {
* @static
*/
function browse($action = NULL) {
* @static
*/
function browse($action = NULL) {
- CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'js/crm.livePage.js');
+ 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');
+ }
// Get list of configured Label Formats
$labelFormatList= CRM_Core_BAO_LabelFormat::getList();
$nameFormatList= CRM_Core_BAO_LabelFormat::getList(false, 'name_badge');
// Get list of configured Label Formats
$labelFormatList= CRM_Core_BAO_LabelFormat::getList();
$nameFormatList= CRM_Core_BAO_LabelFormat::getList(false, 'name_badge');
@@
-132,7
+134,7
@@
class CRM_Admin_Page_LabelFormats extends CRM_Core_Page_Basic {
// Add action links to each of the Label Formats
foreach ($labelFormatList as & $format) {
$action = array_sum(array_keys($this->links()));
// Add action links to each of the Label Formats
foreach ($labelFormatList as & $format) {
$action = array_sum(array_keys($this->links()));
- if (
CRM_Utils_Array::value('is_reserved', $format
)) {
+ if (
!empty($format['is_reserved']
)) {
$action -= CRM_Core_Action::DELETE;
}
$action -= CRM_Core_Action::DELETE;
}