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 #19225 from colemanw/select2Tweak
[civicrm-core.git]
/
CRM
/
Core
/
Invoke.php
diff --git
a/CRM/Core/Invoke.php
b/CRM/Core/Invoke.php
index b0262dfda7f7bc9a0f86344dcd769e6f506a8689..bcb6da8a9892b2a76e7be557bd6978f90e309f88 100644
(file)
--- a/
CRM/Core/Invoke.php
+++ b/
CRM/Core/Invoke.php
@@
-102,7
+102,7
@@
class CRM_Core_Invoke {
return CRM_Utils_System::redirect();
}
else {
return CRM_Utils_System::redirect();
}
else {
- CRM_Core_Error::
fatal
('You do not have permission to execute this url');
+ CRM_Core_Error::
statusBounce
('You do not have permission to execute this url');
}
}
}
}
}
}
@@
-224,7
+224,7
@@
class CRM_Core_Invoke {
if (!array_key_exists('page_callback', $item)) {
CRM_Core_Error::debug('Bad item', $item);
if (!array_key_exists('page_callback', $item)) {
CRM_Core_Error::debug('Bad item', $item);
- CRM_Core_Error::
fatal
(ts('Bad menu record in database'));
+ CRM_Core_Error::
statusBounce
(ts('Bad menu record in database'));
}
// check that we are permissioned to access this page
}
// check that we are permissioned to access this page
@@
-277,11
+277,11
@@
class CRM_Core_Invoke {
if (is_array($item['page_callback']) || strpos($item['page_callback'], ':')) {
$result = call_user_func(Civi\Core\Resolver::singleton()->get($item['page_callback']));
}
if (is_array($item['page_callback']) || strpos($item['page_callback'], ':')) {
$result = call_user_func(Civi\Core\Resolver::singleton()->get($item['page_callback']));
}
- elseif (str
str($item['page_callback'], '_Form')
) {
+ elseif (str
pos($item['page_callback'], '_Form') !== FALSE
) {
$wrapper = new CRM_Utils_Wrapper();
$result = $wrapper->run(
$wrapper = new CRM_Utils_Wrapper();
$result = $wrapper->run(
-
CRM_Utils_Array::value('page_callback', $item)
,
-
CRM_Utils_Array::value('title', $item)
,
+
$item['page_callback'] ?? NULL
,
+
$item['title'] ?? NULL
,
$pageArgs ?? NULL
);
}
$pageArgs ?? NULL
);
}
@@
-307,7
+307,7
@@
class CRM_Core_Invoke {
$object = new $item['page_callback']($title, TRUE, $mode, NULL, $addSequence);
}
else {
$object = new $item['page_callback']($title, TRUE, $mode, NULL, $addSequence);
}
else {
-
CRM_Core_Error::fatal(
);
+
throw new CRM_Core_Exception('Execute supplied menu action'
);
}
$result = $object->run($newArgs, $pageArgs);
}
}
$result = $object->run($newArgs, $pageArgs);
}