diff --git a/js/error_report.js b/js/error_report.js index 431f0f3e2a..e42bd09e9c 100644 --- a/js/error_report.js +++ b/js/error_report.js @@ -24,7 +24,7 @@ var ErrorReport = { exception.name = ErrorReport.extractExceptionName(exception); } ErrorReport.lastException = exception; - $.post('index.php?route=/error_report', { + $.post('index.php?route=/error-report', { 'ajax_request': true, 'server': CommonParams.get('server'), 'get_settings': true, @@ -42,7 +42,7 @@ var ErrorReport = { 'send_error_report': true, 'automatic': true }); - $.post('index.php?route=/error_report', postData, function (data) { + $.post('index.php?route=/error-report', postData, function (data) { if (data.success === false) { // in the case of an error, show the error message returned. Functions.ajaxShowMessage(data.error, false); @@ -79,7 +79,7 @@ var ErrorReport = { 'description': $('#report_description').val(), 'always_send': $('#always_send_checkbox')[0].checked }); - $.post('index.php?route=/error_report', postData, function (data) { + $.post('index.php?route=/error-report', postData, function (data) { $dialog.dialog('close'); if (data.success === false) { // in the case of an error, show the error message returned. @@ -94,7 +94,7 @@ var ErrorReport = { $(this).dialog('close'); }; - $.post('index.php?route=/error_report', reportData, function (data) { + $.post('index.php?route=/error-report', reportData, function (data) { if (data.success === false) { // in the case of an error, show the error message returned. Functions.ajaxShowMessage(data.error, false); diff --git a/js/functions.js b/js/functions.js index 0ccdecf26c..3d7e42d1b0 100644 --- a/js/functions.js +++ b/js/functions.js @@ -4842,7 +4842,7 @@ Functions.ignorePhpErrors = function (clearPrevErrors) { ) { clearPrevious = false; } - // send AJAX request to /error_report with send_error_report=0, exception_type=php & token. + // send AJAX request to /error-report with send_error_report=0, exception_type=php & token. // It clears the prev_errors stored in session. if (clearPrevious) { var $pmaReportErrorsForm = $('#pma_report_errors_form'); diff --git a/libraries/classes/ErrorHandler.php b/libraries/classes/ErrorHandler.php index 70849b2533..8888e063e5 100644 --- a/libraries/classes/ErrorHandler.php +++ b/libraries/classes/ErrorHandler.php @@ -353,7 +353,7 @@ class ErrorHandler && $this->countErrors() != $this->countUserErrors() ) { // add report button. - $retval .= '
get(ErrorReportController::class); -$controller->index(); diff --git a/libraries/routes.php b/libraries/routes.php index cf77e1c9e9..1e53dd286f 100644 --- a/libraries/routes.php +++ b/libraries/routes.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Controllers\CheckRelationsController; use PhpMyAdmin\Controllers\Database\DataDictionaryController; use PhpMyAdmin\Controllers\Database\MultiTableQueryController; use PhpMyAdmin\Controllers\Database\StructureController; +use PhpMyAdmin\Controllers\ErrorReportController; use PhpMyAdmin\Controllers\HomeController; use PhpMyAdmin\Controllers\Server\BinlogController; use PhpMyAdmin\Controllers\Server\CollationsController; @@ -208,8 +209,10 @@ return function (RouteCollector $routes) use ($containerBuilder, $response) { require_once ROOT_PATH . 'libraries/entry_points/database/triggers.php'; }); }); - $routes->addRoute(['GET', 'POST'], '/error_report', function () { - require_once ROOT_PATH . 'libraries/entry_points/error_report.php'; + $routes->addRoute(['GET', 'POST'], '/error-report', function () use ($containerBuilder) { + /** @var ErrorReportController $controller */ + $controller = $containerBuilder->get(ErrorReportController::class); + $controller->index(); }); $routes->addRoute(['GET', 'POST'], '/export', function () { require_once ROOT_PATH . 'libraries/entry_points/export.php'; diff --git a/templates/error/report_form.twig b/templates/error/report_form.twig index 60ef79f2b5..a6cf14ed47 100644 --- a/templates/error/report_form.twig +++ b/templates/error/report_form.twig @@ -1,4 +1,4 @@ -