The branch, master has been updated via a88054dae9a969c0c9ec6477fce130b70a777749 (commit) via 39cb4d4798f495db25bf65dda95fc8c4e9893367 (commit) from 064d399d878f36a0a26f6db890b947bccb3ef8ab (commit)

- Log ----------------------------------------------------------------- commit a88054dae9a969c0c9ec6477fce130b70a777749 Merge: 064d399d878f36a0a26f6db890b947bccb3ef8ab 39cb4d4798f495db25bf65dda95fc8c4e9893367 Author: Rouslan Placella rouslan@placella.com Date: Mon Jul 4 19:04:29 2011 +0100

Merge branch 'QA_3_4'

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

Summary of changes: ChangeLog | 1 + tbl_indexes.php | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 3842abc..ff4f0ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ phpMyAdmin - ChangeLog - bug #3340151 [export] Working SQL query exports error page - bug #3353649 [interface] "Create an index on X columns" form not validated - bug #3350790 [interface] JS error in Table->Structure->Index->Edit +- bug #3353811 [interface] Info message has "error" class

3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/tbl_indexes.php b/tbl_indexes.php index 6491c10..7e9bec6 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -168,7 +168,9 @@ if (isset($_REQUEST['create_index'])) { } ?> </legend> - +<?php +PMA_Message::notice(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))->display(); +?> <div class="formelement"> <label for="input_index_name"><?php echo __('Index name:'); ?></label> <input type="text" name="index[Key_name]" id="input_index_name" size="25" @@ -183,11 +185,7 @@ if (isset($_REQUEST['create_index'])) { <?php echo PMA_showMySQLDocu('SQL-Syntax', 'ALTER_TABLE'); ?> </div>

- -<br class="clearfloat" /> -<?php -PMA_Message::error(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))->display(); -?> +<br class="clearfloat" /><br />

<table id="index_columns"> <thead>

hooks/post-receive