The branch, master has been updated
via 103aed54d932caf536fcb5f2a782fb754706a997 (commit)
via 341dc1296f8e3fe6b80a9b5f5e752cfd868bdb10 (commit)
via dc6c1e8b5cc0d2d116e000cba7752f60be248ffd (commit)
via 3336bf363625d3512da5f32d5d9f276a64dae02b (commit)
via cb043f4365be9b8edec63188d339eda2154401fc (commit)
via 7ecb1abaa49142a7e0b3f6d6e37cb4855e17ddf9 (commit)
via a8caf74fdafdce6b65a411635593f2347ae984ae (commit)
from ffc01b199aa99744a4b21d7b3bdfb24c593bb314 (commit)
- Log -----------------------------------------------------------------
commit 103aed54d932caf536fcb5f2a782fb754706a997
Merge: ffc01b199aa99744a4b21d7b3bdfb24c593bb314
341dc1296f8e3fe6b80a9b5f5e752cfd868bdb10
Author: Michal Čihař <[email protected]>
Date: Tue Jun 21 12:10:29 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
enum_editor.php | 4 ++--
import.php | 2 +-
2 files changed, 3 insertions(+), 3 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'); ?>" />
diff --git a/import.php b/import.php
index cd56bc2..fea35c5 100644
--- a/import.php
+++ b/import.php
@@ -108,7 +108,7 @@ if ($import_type == 'table') {
}
$err_url = $goto
. '?' . $common
- . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' .
urlencode($table) : '');
+ . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' .
htmlspecialchars($table) : '');
$_SESSION['Import_message']['go_back_url'] = $err_url;
}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
