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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-02-14 15:26:14 +01:00
commit 869972e9da
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/codemirror/lib/codemirror.js vendored
View File

@ -1,4 +1,4 @@
// CodeMirror version 2.37
// CodeMirror version 2.38
//
// All functions that need access to the editor's state live inside
// the CodeMirror function. Below that, at the bottom of the file,
@ -3186,7 +3186,7 @@ window.CodeMirror = (function() {
for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
})();
CodeMirror.version = "2.37";
CodeMirror.version = "2.38";
return CodeMirror;
})();

2
server_databases.php
View File

@ -155,7 +155,7 @@ if ($server > 0) {
$databases = PMA_DBI_get_databases_full(
null, $dbstats, null, $sort_by, $sort_order, $pos, true
);
$databases_count = count($GLOBALS['pma']->databases);
$databases_count = count($databases);
} else {
$databases_count = 0;
}