mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-28 00:04:37 +02:00
Controlled unhandled exceptions in index and some fixes in Module class while item is being deleted
This commit is contained in:
parent
b0e3b0aa24
commit
a98a72354b
@ -228,8 +228,10 @@ class Module extends Entity
|
|||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->nombre() === 'delete_pending') {
|
if ($this->nombre() === 'delete_pending'
|
||||||
return null;
|
|| $this->nombre() === 'pendingdelete'
|
||||||
|
) {
|
||||||
|
throw new \Exception('Object is pending to be deleted', 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($link_agent === true) {
|
if ($link_agent === true) {
|
||||||
|
@ -1124,9 +1124,15 @@ if ($searchPage) {
|
|||||||
include 'general/noaccess.php';
|
include 'general/noaccess.php';
|
||||||
} else {
|
} else {
|
||||||
$sec = $main_sec;
|
$sec = $main_sec;
|
||||||
if (file_exists($page)) {
|
if (file_exists($page) === true) {
|
||||||
if (! extensions_is_extension($page)) {
|
if ((bool) extensions_is_extension($page) === false) {
|
||||||
include_once $page;
|
try {
|
||||||
|
include_once $page;
|
||||||
|
} catch (Exception $e) {
|
||||||
|
ui_print_error_message(
|
||||||
|
$e->getMessage().' in '.$e->getFile().':'.$e->getLine()
|
||||||
|
);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
if ($sec[0] == 'g') {
|
if ($sec[0] == 'g') {
|
||||||
extensions_call_godmode_function(basename($page));
|
extensions_call_godmode_function(basename($page));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user