The branch, master has been updated via 9e8e70f0a1d21eaab1b3256c2249721150a93c7e (commit) via c4ecddb5a2df58f26675f0162d8f2335b71bfbd5 (commit) from bc828427c771ccf1197b2e0295dbd4f968e5752c (commit)

- Log ----------------------------------------------------------------- commit 9e8e70f0a1d21eaab1b3256c2249721150a93c7e Merge: bc828427c771ccf1197b2e0295dbd4f968e5752c c4ecddb5a2df58f26675f0162d8f2335b71bfbd5 Author: Rouslan Placella rouslan@placella.com Date: Mon Jul 4 12:32:23 2011 +0100

Merge branch 'QA_3_4'

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

Summary of changes: ChangeLog | 1 + tbl_structure.php | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 25516fe..312e148 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ phpMyAdmin - ChangeLog - bug #3323101 [parser] Invalid escape sequence in SQL parser - bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option - bug #3340151 [export] Working SQL query exports error page +- bug #3353649 [interface] "Create an index on X columns" form not validated

3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/tbl_structure.php b/tbl_structure.php index 10cc8d3..afca2ea 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -723,7 +723,7 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' != $tbl_type) { ?> </div> <form action="./tbl_indexes.php" method="post" - onsubmit="return checkFormElementInRange(this, 'idx_num_fields', + onsubmit="return checkFormElementInRange(this, 'added_fields', '<?php echo str_replace('\'', '\\\'', __('Column count has to be larger than zero.')); ?>', 1)"> <fieldset> @@ -732,11 +732,7 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' != $tbl_type) { echo sprintf(__('Create an index on &nbsp;%s&nbsp;columns'), '<input type="text" size="2" name="added_fields" value="1" />'); ?> - <input type="submit" name="create_index" value="<?php echo __('Go'); ?>" - onclick="return checkFormElementInRange(this.form, - 'idx_num_fields', - '<?php echo str_replace('\'', '\\\'', __('Column count has to be larger than zero.')); ?>', - 1)" /> + <input type="submit" name="create_index" value="<?php echo __('Go'); ?>" /> </fieldset> </form> <br />

hooks/post-receive