Merge branch 'QA_4_3'
This commit is contained in:
commit
36f2f91c1a
@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
|
||||
- bug #4614 Separator between "Show All" and "Number of rows" disappears
|
||||
- bug #4615 SQL highlighting in process list breaks on auto refresh
|
||||
- bug #4616 Warning in db structure print view page
|
||||
- bug Undefined index navwork
|
||||
|
||||
4.3.0.0 (not yet released)
|
||||
+ rfe #1502 Smart sorting for int keys
|
||||
|
||||
@ -747,7 +747,7 @@ class Node
|
||||
public function getNavigationHidingData()
|
||||
{
|
||||
$cfgRelation = PMA_getRelationsParam();
|
||||
if ($cfgRelation['navwork']) {
|
||||
if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) {
|
||||
$navTable = PMA_Util::backquote($cfgRelation['db'])
|
||||
. "." . PMA_Util::backquote($cfgRelation['navigationhiding']);
|
||||
$sqlQuery = "SELECT `db_name`, COUNT(*) AS `count` FROM " . $navTable
|
||||
|
||||
Loading…
Reference in New Issue
Block a user