gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Error reporting now fails gracefully on dev builds

Browse Source
This commit is contained in:
Mohamed Ashraf 2013-09-21 00:42:00 +02:00
parent b33f0419df
commit c5d2d51007
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
error_report.php
View File

@ -10,8 +10,30 @@ require_once 'libraries/error_report.lib.php';
$response = PMA_Response::getInstance();
// Fail sgracefully if this is not a release version of phpMyAdmin
if(!$GLOBALS['PMA_Config']->isGitRevision()) {
$response->addJSON('message', PMA_Message::error(
__('An error has been detected however you seem to be running on a git '
. 'version of phpMyAdmin.')
. __('Automatic report submission cannot be used. Please submit a '
. 'manual error report on the bug tracker.')
. '<br />'
. __('You may want to refresh the page.')));
$response->isSuccess(false);
exit;
} elseif (!defined('LINE_COUNTS')) {
$response->addJSON('message', PMA_Message::error(
__('An error has been detected however the js line counts file does not '
. 'seam to exist in this phpMyAdmin installation. ')
. __('Automatic report submission cannot be used. Please submit a '
. 'manual error report on the bug tracker.')
. '<br />'
. __('You may want to refresh the page.')));
$response->isSuccess(false);
exit;
}
if ($_REQUEST['send_error_report'] == true) {
$response->addJSON('test', PMA_sendErrorReport(PMA_getReportData(false)));
if ($_REQUEST['automatic'] === "true") {
$response->addJSON('message', PMA_Message::error(
__('An error has been detected and an error report has been '

6
js/error_report.js
View File

@ -21,7 +21,11 @@ var ErrorReport = {
token: PMA_commonParams.get('token'),
get_settings: true,
}, function(data) {
if(data.report_setting == "ask") {
if (!data.success === true) {
PMA_ajaxShowMessage(data.error, false);
return;
}
if (data.report_setting == "ask") {
ErrorReport._showErrorNotification();
} else if(data.report_setting == "always") {
report_data = ErrorReport._get_report_data(exception);