Merge pull request #1466 from zixtor/QA_4_3

bug #4710 Nav tree error after filtering the tables

ChangeLog

@@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
 - bug #4719 'only_db' not working
 - bug #4700 Error text: Internal Server Error
 - bug #4722 Incorrect width table summary when favorite tables is disabled
+- bug #4710 Nav tree error after filtering the tables
 
 4.3.7.0 (2015-01-15)
 - bug #4694 js error on marking table as favorite in Safari (in private mode)

js/messages.php

@@ -471,6 +471,7 @@ $js_messages['strHidePanel'] = __('Hide Panel');
 $js_messages['strUnhideNavItem'] = __('Show hidden navigation tree items.');
 $js_messages['linkWithMain'] = __('Link with main panel');
 $js_messages['unlinkWithMain'] = __('Unlink from main panel');
+$js_messages['strHoverFastFilter'] = __('To search all databases on server, press Enter after a search term');
 
 /* microhistory */
 $js_messages['strInvalidPage'] = __('The requested page was not found in the history, it may have expired.');

js/navigation.js

@@ -522,10 +522,15 @@ function loadChildNodes($expandElem, callback) {
         pos: $expandElem.find('span.pos').text(),
         pos2_name: $expandElem.find('span.pos2_name').text(),
         pos2_value: $expandElem.find('span.pos2_value').text(),
-        searchClause: searchClause,
-        searchClause2: searchClause2
+        searchClause: '',
+        searchClause2: ''
     };
 
+    if ($('#pma_navigation_tree').children().first().is('ul')) {
+        params.searchClause = searchClause;
+        params.searchClause2 = searchClause2;
+    }
+
     var url = $('#pma_navigation').find('a.navigation_url').attr('href');
     $.get(url, params, function (data) {
         if (typeof data !== 'undefined' && data.success === true) {