The branch, master has been updated via 1df108de90c48560796afc62f16beaf1ceb9b77e (commit) via 2c7b06f543b591182684ad8fa3fb83c04162d031 (commit) via e27961b1b282677a541f42db17e615525caaf30d (commit) from 634220143bdd5d77d359c19fdd78350f8a40e46c (commit)

- Log ----------------------------------------------------------------- commit 1df108de90c48560796afc62f16beaf1ceb9b77e Author: Marc Delisle marc@infomarc.info Date: Sun Oct 2 07:41:32 2011 -0400

Fix merge conflicts

commit 2c7b06f543b591182684ad8fa3fb83c04162d031 Merge: 6342201 e27961b Author: Marc Delisle marc@infomarc.info Date: Sun Oct 2 07:35:54 2011 -0400

Merge branch 'QA_3_4'

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

Summary of changes: ChangeLog | 1 + server_synchronize.php | 31 +++++++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 5668311..016cbaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ phpMyAdmin - ChangeLog - bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken - bug #3414744 [core] External link fails in 3.4.5 - patch #3314626 [display] CharTextareaRows is not respected +- bug #3417089 [synchronize] Extraneous db choices

3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/server_synchronize.php b/server_synchronize.php index cb04634..83acf6b 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1167,6 +1167,14 @@ if (! isset($_REQUEST['submit_connect']) $databases = PMA_DBI_get_databases_full(null, false, null, 'SCHEMA_NAME', 'ASC', 0, true);

+ $databases_to_hide = array( + 'information_schema', + 'mysql' + ); + if (PMA_DRIZZLE) { + $databases_to_hide[] = 'data_dictionary'; + } + if ($GLOBALS['cfg']['AllowArbitraryServer'] === false) { $possibly_readonly = ' readonly="readonly"'; } else { @@ -1273,23 +1281,22 @@ if (! isset($_REQUEST['submit_connect']) <td><?php echo __('Database'); ?></td> <td> <?php - // these unset() do not complain if the elements do not exist - unset($databases['mysql']); - unset($databases['information_schema']); - if (PMA_DRIZZLE) { - unset($databases['data_dictionary']); + $options_list = ''; + foreach ($databases as $array_key => $db) { + if (in_array($db['SCHEMA_NAME'], $databases_to_hide)) { + unset($databases[$array_key]); + } else { + $options_list .= '<option>' . htmlspecialchars($db['SCHEMA_NAME']) . '</option>'; + } }

if (count($databases) == 0) { echo __('No databases'); } else { - echo ' - <select name="' . $type . '_db_sel"> - '; - foreach ($databases as $db) { - echo ' <option>' . htmlspecialchars($db['SCHEMA_NAME']) . '</option>'; - } - echo '</select>'; + echo '<select name="' . $type . '_db_sel">' + . $options_list + . '</select>'; + unset($options_list); } echo '</td> </tr> </table>';

hooks/post-receive