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

Merge pull request #759 from roccivic/4117

Browse Source 
Fixes bug #4117
This commit is contained in:
Marc Delisle 2013-11-18 14:19:19 -08:00
commit 3d9e591389
1 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
js/error_report.js
View File

@ -206,40 +206,22 @@ var ErrorReport = {
* @return object
*/
_get_report_data: function (exception) {
var token = PMA_commonParams.get('token');
var report_data = {
"ajax_request": true,
"token": token,
"token": PMA_commonParams.get('token'),
"exception": exception,
"current_url": window.location.href,
"microhistory": ErrorReport._get_microhistory(),
"scripts": AJAX.cache.pages[AJAX.cache.current - 1].scripts.map(
"microhistory": ErrorReport._get_microhistory()
};
if (typeof AJAX.cache.pages[this.current - 1] === 'undefined') {
report_data.scripts = AJAX.cache.pages[AJAX.cache.current - 1].scripts.map(
function (script) {
return script.name;
}
)
};
);
}
return report_data;
},
/**
* Returns the exception after removing the url of the script file and
* concatenating the context
*
* @param object exception info
*
* @return object
*/
_simplify_exception: function (exception) {
exception.stack = exception.stack.map(function (level) {
if (/get_scripts\.js\.php/.test(level.url)) {
level.url = "get_scripts.js.php";
}
//level.context = level.context.join("\n");
return level;
});
return exception;
},
/**
* Wraps all global functions that start with PMA_
*