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

phpmyadmin · Jan 8, 2015 · 612e191 · 612e191
2 parents 656e5ad + c2afea9
commit 612e191
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 4.3.7.0 (not yet released)
 - bug #4694 js error on marking table as favorite in Safari (in private mode)
+- bug #4695 Changing $cfg['DefaultTabTable'] doesn't update link and title
 
 4.3.6.0 (2015-01-07)
 - bug       Undefined index notices while configuring recent and favorite tables

diff --git a/js/navigation.js b/js/navigation.js
@@ -359,7 +359,9 @@ $(function () {
         var storage = window.sessionStorage;
         // remove tree from storage if Navi_panel config form is submitted
         $(document).on('submit', 'form.config-form', function(event) {
-            if ($(this).attr('action').indexOf('form=Navi_panel') >= 0) {
+            if ($(this).attr('action').indexOf('form=Navi_panel') >= 0 ||
+                $(this).attr('action').indexOf('form=Main_panel') >= 0
+            ) {
                 storage.removeItem('navTree');
             }
         });

diff --git a/libraries/navigation/Nodes/Node.class.php b/libraries/navigation/Nodes/Node.class.php
@@ -90,6 +90,11 @@ class Node
      */
     public $links;
 
+    /**
+     * @var string HTML title
+     */
+    public $title;
+
     /**
      * @var string Extra CSS classes for the node
      */

diff --git a/libraries/navigation/Nodes/Node_Table.class.php b/libraries/navigation/Nodes/Node_Table.class.php
@@ -48,6 +48,23 @@ public function __construct($name, $type = Node::OBJECT, $is_group = false)
             $this->icon  = PMA_Util::getImage('b_browse.png', __('Browse'));
             break;
         }
+        switch($GLOBALS['cfg']['DefaultTabTable']) {
+        case 'tbl_structure.php':
+            $this->title = __('Structure');
+            break;
+        case 'tbl_select.php':
+            $this->title = __('Search');
+            break;
+        case 'tbl_change.php':
+            $this->title = __('Insert');
+            break;
+        case 'tbl_sql.php':
+            $this->title = __('SQL');
+            break;
+        case 'sql.php':
+            $this->title = __('Browse');
+            break;
+        }
         $this->links = array(
             'text' => $GLOBALS['cfg']['DefaultTabTable']
                     . '?server=' . $GLOBALS['server']
@@ -57,7 +74,7 @@ public function __construct($name, $type = Node::OBJECT, $is_group = false)
                     . '?server=' . $GLOBALS['server']
                     . '&amp;db=%2$s&amp;table=%1$s&amp;token='
                     . $_SESSION[' PMA_token '],
-            'title' => __('Browse')
+            'title' => $this->title
         );
         $this->classes = 'table';
     }