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
/
RelationshipType.php
diff --git
a/CRM/Admin/Page/RelationshipType.php
b/CRM/Admin/Page/RelationshipType.php
index 8034733f58ab127ede9869e1b7aa473ae4f0b5fb..fb9a5d9aa8893e9f0c9d55dd7c43eebecb494d36 100644
(file)
--- a/
CRM/Admin/Page/RelationshipType.php
+++ b/
CRM/Admin/Page/RelationshipType.php
@@
-61,7
+61,9
@@
class CRM_Admin_Page_RelationshipType extends CRM_Core_Page_Basic {
* @return array (reference) of action links
*/
function &links() {
* @return array (reference) of action links
*/
function &links() {
- 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');
+ }
if (!(self::$_links)) {
self::$_links = array(
CRM_Core_Action::VIEW => array(
if (!(self::$_links)) {
self::$_links = array(
CRM_Core_Action::VIEW => array(