PMCORE-3971 (apply changes from feature branch/PMCORE-3871 that were reverted to avoid conflicts) 3.8.x: Solve the conflicts to merge this epic into develop

This commit is contained in:
Roly Gutierrez
2022-09-13 11:32:56 -04:00
parent ea7ca8fb67
commit ab84ba5a2e
5 changed files with 2687 additions and 2006 deletions

View File

@@ -140,15 +140,14 @@ class Capsule {
}
}
@ini_set('track_errors', true);
include $__template;
@ini_restore('track_errors');
// restore the include path
ini_set('include_path', $__old_inc_path);
if (!empty($php_errormsg)) {
throw new Exception("Unable to parse template " . $__template . ": " . $php_errormsg);
$lastError = error_get_last();
if (!empty($lastError['message'])) {
throw new Exception("Unable to parse template " . $__template . ": " . $lastError['message']);
}
}