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 #17310 from agh1/autorenew-active-icon
[civicrm-core.git]
/
CRM
/
Core
/
Permission.php
diff --git
a/CRM/Core/Permission.php
b/CRM/Core/Permission.php
index d560d734f9eb6783db32cce62feb37f7d36841fc..08c978af389b3deb05f32767af0dee3265ae826d 100644
(file)
--- a/
CRM/Core/Permission.php
+++ b/
CRM/Core/Permission.php
@@
-278,7
+278,7
@@
class CRM_Core_Permission {
}
$groups = self::ufGroup($type);
}
$groups = self::ufGroup($type);
- return !empty($groups) && in_array($gid, $groups)
? TRUE : FALSE
;
+ return !empty($groups) && in_array($gid, $groups);
}
/**
}
/**
@@
-465,7
+465,7
@@
class CRM_Core_Permission {
'CiviMail' => 'access CiviMail',
'CiviAuction' => 'add auction items',
];
'CiviMail' => 'access CiviMail',
'CiviAuction' => 'add auction items',
];
- $permissionName =
CRM_Utils_Array::value($module, $editPermissions)
;
+ $permissionName =
$editPermissions[$module] ?? NULL
;
}
if ($module == 'CiviCase' && !$permissionName) {
}
if ($module == 'CiviCase' && !$permissionName) {
@@
-531,7
+531,7
@@
class CRM_Core_Permission {
if (empty($item['access_callback']) ||
is_numeric($item['access_callback'])
) {
if (empty($item['access_callback']) ||
is_numeric($item['access_callback'])
) {
- return (bool
ean
) $item['access_callback'];
+ return (bool) $item['access_callback'];
}
// check whether the following Ajax requests submitted the right key
}
// check whether the following Ajax requests submitted the right key
@@
-1627,7
+1627,7
@@
class CRM_Core_Permission {
* @return bool
*/
public static function isMultisiteEnabled() {
* @return bool
*/
public static function isMultisiteEnabled() {
- return
Civi::settings()->get('is_enabled') ? TRUE : FALSE
;
+ return
(bool) Civi::settings()->get('is_enabled')
;
}
/**
}
/**