The branch, QA_3_4 has been updated via 3336bf363625d3512da5f32d5d9f276a64dae02b (commit) via cb043f4365be9b8edec63188d339eda2154401fc (commit) via a8caf74fdafdce6b65a411635593f2347ae984ae (commit) from 7ecb1abaa49142a7e0b3f6d6e37cb4855e17ddf9 (commit)

- Log ----------------------------------------------------------------- commit 3336bf363625d3512da5f32d5d9f276a64dae02b Merge: 7ecb1abaa49142a7e0b3f6d6e37cb4855e17ddf9 cb043f4365be9b8edec63188d339eda2154401fc Author: Michal Čihař mcihar@suse.cz Date: Tue Jun 21 12:05:16 2011 +0200

Merge branch 'MAINT_3_4_3' into QA_3_4

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

Summary of changes: enum_editor.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/enum_editor.php b/enum_editor.php index 586e85e..ab86d73 100644 --- a/enum_editor.php +++ b/enum_editor.php @@ -53,11 +53,11 @@ require_once './libraries/header_meta_style.inc.php'; ?> </div> <p> - <a href="enum_editor.php?token=<?php echo urlencode($_GET['token']); ?>&field=<?php echo urlencode($_GET['field']); ?>&extra_fields=<?php echo $_GET['extra_fields'] + 1; ?>&values=<?php echo urlencode(join(",", $values)); ?>"> + <a href="enum_editor.php<?php echo PMA_generate_common_url(array('field' => $_GET['field'], 'extra_fields' => $_GET['extra_fields'] + 1, 'values' => join(',', $values))); ?>"> <?php echo __('+ Restart insertion and add a new value'); ?> </a> </p> - <input type="hidden" name="token" value="<?php echo htmlspecialchars($_GET['token']); ?>" /> + <?php echo PMA_generate_common_hidden_inputs(); ?> <input type="hidden" name="field" value="<?php echo htmlspecialchars($_GET['field']); ?>" /> <input type="hidden" name="num_fields" value="<?php echo $total_fields; ?>" /> <input type="submit" value="<?php echo __('Go'); ?>" />

hooks/post-receive