The branch, master has been updated via 116d1297afb96638650649a644cf59d4774dd66b (commit) via 852ed51c27f35ec942440e0330318775d8e4c91d (commit) via f463b1cc7a87e8a7e69ee67d942cae34f4ac37ff (commit) from f368184a12c2fc619ef442e588e07be58c3c6085 (commit)
- Log ----------------------------------------------------------------- commit 116d1297afb96638650649a644cf59d4774dd66b Merge: f368184a12c2fc619ef442e588e07be58c3c6085 852ed51c27f35ec942440e0330318775d8e4c91d Author: Marc Delisle marc@infomarc.info Date: Tue Jun 29 08:23:47 2010 -0400
solve merge conflicts
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/replication_gui.lib.php | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 7772727..f8f0df5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ $Id$ databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible +- bug [replication] Do not offer information_schema in the list of databases
3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index db41b20..a975bee 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -20,6 +20,9 @@ function PMA_replication_db_multibox() $multi_values .= '<select name="db_select[]" size="6" multiple="multiple" id="db_select">';
foreach ($GLOBALS['pma']->databases as $current_db) { + if ('information_schema' == $current_db) { + continue; + } if (! empty($selectall) || (isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))) { $is_selected = ' selected="selected"'; } else {
hooks/post-receive