From 223d8850cf3d723487d41cb0397869be2d544c84 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 2 Sep 2010 14:35:30 +0200 Subject: [PATCH] patch #3055886 [config] Add Left frame table filter visibility config option, thanks to eesau --- ChangeLog | 1 + Documentation.html | 5 +++++ libraries/config.default.php | 7 +++++++ navigation.php | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9aecb1712..213f95456 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ $Id$ - [core] Remove last remaining parts of profiling code which was removed in 2006. - bug #3042665 [parser] Add workaround for MySQL way of handling backtick. - bug #3056610 [interface] Removed modification options for information_schema ++ patch #3055886 [config] Add Left frame table filter visibility config option, thanks to eesau 3.3.7.0 (not yet released) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/Documentation.html b/Documentation.html index 5a31aedfe..ec8412ff9 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1489,6 +1489,11 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE or in a new one (new). Note: use new if you are linking to phpmyadmin.net. +
$cfg['LeftDisplayTableFilter'] boolean
+
Defines whether or not to display a JavaScript filter box above the + list of tables in the left frame. + Defaults to TRUE.
+
$cfg['LeftDisplayServers'] boolean
Defines whether or not to display a server choice at the top of the left frame. Defaults to FALSE.
diff --git a/libraries/config.default.php b/libraries/config.default.php index 466dc2c0d..92869ac5d 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -773,6 +773,13 @@ $cfg['LeftLogoLink'] = 'main.php'; */ $cfg['LeftLogoLinkWindow'] = 'main'; +/** + * display a JavaScript table filter in the left frame + * + * @global boolean $cfg['LeftDisplayTableFilter'] + */ +$cfg['LeftDisplayTableFilter'] = true; + /** * display server choice at top of left frame * diff --git a/navigation.php b/navigation.php index 7d6d66c83..bebdb19d0 100644 --- a/navigation.php +++ b/navigation.php @@ -286,7 +286,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { $db_tooltip = $GLOBALS['db']; } - if ($table_count) { + if ($table_count && $GLOBALS['cfg']['LeftDisplayTableFilter']) { ?>