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

Fixed javascript error in server monitor

Browse Source 
Fixes #13628

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2017-08-29 15:33:08 +02:00
parent f2cb155ed1
commit e781cf0c76
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
4.7.5 (not yet released)
- issue #13615 Avoid problems with browsing unknown query types
- issue #13612 Integrate tooltip into datetime pickers
- issue #13628 Fixed javascript error in server monitor
4.7.4 (2017-08-23)
- issue #13415 Remove shadow from the logo

2
js/server_status_monitor.js
View File

@ -362,7 +362,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
};
// Server is localhost => We can add cpu/memory/swap to the default chart
if (server_db_isLocal) {
if (server_db_isLocal && typeof presetCharts.cpu !== 'undefined') {
defaultChartGrid.c3 = presetCharts.cpu;
defaultChartGrid.c4 = presetCharts.memory;
defaultChartGrid.c5 = presetCharts.swap;