The branch, master has been updated via 2ff1245ae5b1b263f9f6c241f6d1244a231208a9 (commit) via 223d8850cf3d723487d41cb0397869be2d544c84 (commit) via 7aa4aa62dc7b0caa4fd04084f70cf3e0076a21b5 (commit) from 00250a9f596544596e1762819c7ff6990bf3b34b (commit)

- Log ----------------------------------------------------------------- commit 2ff1245ae5b1b263f9f6c241f6d1244a231208a9 Merge: 223d8850cf3d723487d41cb0397869be2d544c84 00250a9f596544596e1762819c7ff6990bf3b34b Author: Herman van Rink rink@initfour.nl Date: Thu Sep 2 14:36:18 2010 +0200

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 223d8850cf3d723487d41cb0397869be2d544c84 Author: Herman van Rink rink@initfour.nl Date: Thu Sep 2 14:35:30 2010 +0200

patch #3055886 [config] Add Left frame table filter visibility config option, thanks to eesau

commit 7aa4aa62dc7b0caa4fd04084f70cf3e0076a21b5 Author: Herman van Rink rink@initfour.nl Date: Thu Sep 2 11:53:53 2010 +0200

bug #3056610 [interface] Removed modification options for information_schema

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 2 ++ Documentation.html | 5 +++++ db_structure.php | 31 +++++++++++++++++-------------- libraries/config.default.php | 7 +++++++ navigation.php | 2 +- 5 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 682a8d6..213f954 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,8 @@ $Id$ + [interface] AJAXification on various pages - [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 5a31aed..ec8412f 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1489,6 +1489,11 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> or in a new one (<tt>new</tt>). Note: use <tt>new</tt> if you are linking to <tt>phpmyadmin.net</tt>.</dd>

+ <dt id="cfg_LeftDisplayTableFilter">$cfg['LeftDisplayTableFilter'] boolean</dt> + <dd>Defines whether or not to display a JavaScript filter box above the + list of tables in the left frame. + Defaults to <tt>TRUE</tt>.</dd> + <dt id="cfg_LeftDisplayServers">$cfg['LeftDisplayServers'] boolean</dt> <dd>Defines whether or not to display a server choice at the top of the left frame. Defaults to FALSE.</dd> diff --git a/db_structure.php b/db_structure.php index 44d732a..dafdcdc 100644 --- a/db_structure.php +++ b/db_structure.php @@ -524,22 +524,25 @@ $checkall_url = 'db_structure.php?' . PMA_generate_common_url($db); <?php echo ' <option value="' . __('With selected:') . '" selected="selected">' . __('With selected:') . '</option>' . "\n"; -echo ' <option value="' . __('Empty') . '" >' - . __('Empty') . '</option>' . "\n"; -echo ' <option value="' . __('Drop') . '" >' - . __('Drop') . '</option>' . "\n"; -echo ' <option value="' . __('Print view') . '" >' - . __('Print view') . '</option>' . "\n"; -echo ' <option value="' . __('Check table') . '" >' - . __('Check table') . '</option>' . "\n"; -echo ' <option value="' . __('Optimize table') . '" >' - . __('Optimize table') . '</option>' . "\n"; -echo ' <option value="' . __('Repair table') . '" >' - . __('Repair table') . '</option>' . "\n"; -echo ' <option value="' . __('Analyze table') . '" >' - . __('Analyze table') . '</option>' . "\n"; echo ' <option value="' . __('Export') . '" >' . __('Export') . '</option>' . "\n"; +echo ' <option value="' . __('Print view') . '" >' + . __('Print view') . '</option>' . "\n"; + +if (!$db_is_information_schema) { + echo ' <option value="' . __('Empty') . '" >' + . __('Empty') . '</option>' . "\n"; + echo ' <option value="' . __('Drop') . '" >' + . __('Drop') . '</option>' . "\n"; + echo ' <option value="' . __('Check table') . '" >' + . __('Check table') . '</option>' . "\n"; + echo ' <option value="' . __('Optimize table') . '" >' + . __('Optimize table') . '</option>' . "\n"; + echo ' <option value="' . __('Repair table') . '" >' + . __('Repair table') . '</option>' . "\n"; + echo ' <option value="' . __('Analyze table') . '" >' + . __('Analyze table') . '</option>' . "\n"; +} ?> </select> <script type="text/javascript"> diff --git a/libraries/config.default.php b/libraries/config.default.php index 466dc2c..92869ac 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -774,6 +774,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 * * @global boolean $cfg['LeftDisplayServers'] diff --git a/navigation.php b/navigation.php index 7d6d66c..bebdb19 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']) { ?> <span id="NavFilter"> <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" value="filter tables by name" />

hooks/post-receive