Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

This commit is contained in:
Weblate 2013-06-02 12:19:11 +02:00
commit 7dffcc8f8e
2 changed files with 3 additions and 1 deletions

View File

@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
4.0.4.0 (not yet released)
- bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click
4.0.3.0 (not yet released)
- bug #3941 Recent tables list always empty

View File

@ -29,7 +29,8 @@ class Node_Database extends Node
parent::__construct($name, $type, $is_group);
$this->icon = PMA_Util::getImage('s_db.png');
$this->links = array(
'text' => 'db_structure.php?server=' . $GLOBALS['server']
'text' => $GLOBALS['cfg']['DefaultTabDatabase']
. '?server=' . $GLOBALS['server']
. '&db=%1$s&token=' . $GLOBALS['token'],
'icon' => 'db_operations.php?server=' . $GLOBALS['server']
. '&db=%1$s&token=' . $GLOBALS['token']