nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

foreign key browser: encoding mixups, thanks to Thijs Kinkhorst

Browse Source
This commit is contained in:
Marc Delisle
2007-08-15 16:46:47 +00:00
parent 1c5cd48b45
commit 3ebe4def03
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -101,6 +101,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
thanks to Juergen Wind thanks to Juergen Wind
+ [lang] Catalan update, thanks to Xavier Navarro + [lang] Catalan update, thanks to Xavier Navarro
- bug #1751553 Drop-down instead of input when editing - bug #1751553 Drop-down instead of input when editing
- [data] foreign key browser: encoding mixups, thanks to Thijs Kinkhorst
2.10.3.0 (2007-07-20) 2.10.3.0 (2007-07-20)

15
browse_foreigners.php
View File

@@ -17,7 +17,6 @@ require_once './libraries/ob.lib.php';
PMA_outBufferPre(); PMA_outBufferPre();
require_once './libraries/header_http.inc.php'; require_once './libraries/header_http.inc.php';
$field = urldecode($field);
/** /**
* Displays the frame * Displays the frame
@@ -44,7 +43,7 @@ require './libraries/get_foreign.lib.php';
if (isset($pk)) { if (isset($pk)) {
$pk_uri = '&pk=' . urlencode($pk); $pk_uri = '&pk=' . urlencode($pk);
?> ?>
<input type="hidden" name="pk" value="<?php echo urlencode($pk); ?>" /> <input type="hidden" name="pk" value="<?php echo htmlspecialchars($pk); ?>" />
<?php <?php
} else { } else {
$pk_uri = ''; $pk_uri = '';
@@ -69,8 +68,8 @@ if (isset($disp_row) && is_array($disp_row)) {
'browse_foreigners.php?field=' . urlencode($field) . 'browse_foreigners.php?field=' . urlencode($field) .
'&amp;' . PMA_generate_common_url($db, $table) '&amp;' . PMA_generate_common_url($db, $table)
. $pk_uri . . $pk_uri .
'&amp;fieldkey=' . (isset($fieldkey) ? $fieldkey : '') . '&amp;fieldkey=' . (isset($fieldkey) ? urlencode($fieldkey) : '') .
'&amp;foreign_filter=' . (isset($foreign_filter) ? htmlspecialchars($foreign_filter) : '') . '&amp;foreign_filter=' . (isset($foreign_filter) ? urlencode($foreign_filter) : '') .
'&amp;', '&amp;',
$session_max_rows, $session_max_rows,
$pageNow, $pageNow,
@@ -106,7 +105,7 @@ if (isset($disp_row) && is_array($disp_row)) {
var field = 'field_' + field; var field = 'field_' + field;
<?php if (isset($pk)) { ?> <?php if (isset($pk)) { ?>
var element_name = field + '[multi_edit][<?php echo urlencode($pk); ?>][]'; var element_name = field + '[multi_edit][<?php echo htmlspecialchars($pk); ?>][]';
<?php } else { ?> <?php } else { ?>
var element_name = field + '[]'; var element_name = field + '[]';
<?php } ?> <?php } ?>
@@ -141,11 +140,11 @@ if (isset($disp_row) && is_array($disp_row)) {
<form action="browse_foreigners.php" method="post"> <form action="browse_foreigners.php" method="post">
<fieldset> <fieldset>
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<input type="hidden" name="field" value="<?php echo urlencode($field); ?>" /> <input type="hidden" name="field" value="<?php echo htmlspecialchars($field); ?>" />
<input type="hidden" name="fieldkey" <input type="hidden" name="fieldkey"
value="<?php echo isset($fieldkey) ? $fieldkey : ''; ?>" /> value="<?php echo isset($fieldkey) ? htmlspecialchars($fieldkey) : ''; ?>" />
<?php if (isset($pk)) { ?> <?php if (isset($pk)) { ?>
<input type="hidden" name="pk" value="<?php echo urlencode($pk); ?>" /> <input type="hidden" name="pk" value="<?php echo htmlspecialchars($pk); ?>" />
<?php } ?> <?php } ?>
<span class="formelement"> <span class="formelement">
<label for="input_foreign_filter"><?php echo $strSearch . ':'; ?></label> <label for="input_foreign_filter"><?php echo $strSearch . ':'; ?></label>