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

Fix merge conflict

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2014-10-21 10:29:14 -04:00
commit 873ffa3ffe
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -6,6 +6,10 @@ phpMyAdmin - ChangeLog
- bug #4552 Incorrect routines display for database due to case insensitive checks
- bug #4259 reCaptcha sound session expired problem
4.2.10.1 (2014-10-21)
- bug #4562 [security] XSS in debug SQL output
- bug #4563 [security] XSS in monitor query analyzer
4.2.10.0 (2014-10-11)
- bug #4361 Can't change font size (when config.inc.php not present)
- bug #4542 Tab key in column name not shown

4
js/server_status_monitor.js
View File

@ -1855,7 +1855,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
if (name == 'user_host') {
return value.replace(/(\[.*?\])+/g, '');
}
return value;
return escapeHtml(value);
};
for (var i = 0, l = rows.length; i < l; i++) {
@ -2011,7 +2011,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
for (i = 0, l = data.explain.length; i < l; i++) {
explain += '<div class="explain-' + i + '"' + (i > 0 ? 'style="display:none;"' : '') + '>';
$.each(data.explain[i], function (key, value) {
value = (value === null) ? 'null' : value;
value = (value === null) ? 'null' : escapeHtml(value);
if (key == 'type' && value.toLowerCase() == 'all') {
value = '<span class="attention">' + value + '</span>';

5
libraries/DatabaseInterface.class.php
View File

@ -139,10 +139,11 @@ class PMA_DatabaseInterface
$_SESSION['debug']['queries'][$hash] = array();
if ($result == false) {
$_SESSION['debug']['queries'][$hash]['error']
= '<b style="color:red">' . mysqli_error($link) . '</b>';
= '<b style="color:red">'
. htmlspecialchars(mysqli_error($link)) . '</b>';
}
$_SESSION['debug']['queries'][$hash]['count'] = 1;
$_SESSION['debug']['queries'][$hash]['query'] = $query;
$_SESSION['debug']['queries'][$hash]['query'] = htmlspecialchars($query);
$_SESSION['debug']['queries'][$hash]['time'] = $time;
}