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 #20239 from eileenmcnaughton/act
[civicrm-core.git]
/
CRM
/
Admin
/
Page
/
AJAX.php
diff --git
a/CRM/Admin/Page/AJAX.php
b/CRM/Admin/Page/AJAX.php
index 79e2ec3b8ba47c30822387cb02cb0b263afe7464..d47b9caf05563f1198b6a8b8ba47fe20b8621cac 100644
(file)
--- a/
CRM/Admin/Page/AJAX.php
+++ b/
CRM/Admin/Page/AJAX.php
@@
-341,7
+341,7
@@
class CRM_Admin_Page_AJAX {
* Used by jstree to incrementally load tags
*/
public static function getTagTree() {
* Used by jstree to incrementally load tags
*/
public static function getTagTree() {
- $parent = CRM_Utils_Type::escape(
CRM_Utils_Array::value('parent_id', $_GET,
0), 'Integer');
+ $parent = CRM_Utils_Type::escape(
($_GET['parent_id'] ??
0), 'Integer');
$substring = CRM_Utils_Type::escape(CRM_Utils_Array::value('str', $_GET), 'String');
$result = [];
$substring = CRM_Utils_Type::escape(CRM_Utils_Array::value('str', $_GET), 'String');
$result = [];
@@
-380,7
+380,7
@@
class CRM_Admin_Page_AJAX {
}
}
else {
}
}
else {
- $hasChildTags =
empty($childTagIDs[$dao->id]) ? FALSE : TRUE
;
+ $hasChildTags =
!empty($childTagIDs[$dao->id])
;
$usedFor = (array) explode(',', $dao->used_for);
$tag = [
'id' => $dao->id,
$usedFor = (array) explode(',', $dao->used_for);
$tag = [
'id' => $dao->id,