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

bug #1699532 Cause of data manipulation issues; still have to work on updating an ENUM value

Browse Source
This commit is contained in:
Marc Delisle
2007-05-14 17:39:40 +00:00
parent a99e088999
commit 501ba4a6b6
3 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -27,6 +27,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1498281 [parser] Wrong primary key used for displaying results
with subquery
- bug #1699772 Visual space bug in table name (in browser)
- bug #1699532 Cause of data manipulation issues: implemented changes
as suggested by crisp_; still have to work on updating an ENUM value
+ [core] added PMA_fatalError() and made use of it
. [core] added PMA_isValid() and PMA_ifSetOr() for variable handling
. [i18n] use generic $strOptions

13
tbl_change.php
View File

@@ -211,11 +211,9 @@ document.onkeydown = onKeyDownArrowsHandler;
<input type="hidden" name="err_url" value="<?php echo htmlspecialchars($err_url); ?>" />
<input type="hidden" name="sql_query" value="<?php echo htmlspecialchars($sql_query); ?>" />
<?php
if (isset($primary_key_array)) {
foreach ($primary_key_array as $primary_key) {
?>
<input type="hidden" name="primary_key[]" value="<?php echo htmlspecialchars(trim($primary_key)); ?>" />
<?php
if (isset($primary_keys)) {
foreach ($primary_key_array as $rowcount => $primary_key) {
echo '<input type="hidden" name="primary_key[' . $rowcount . ']" value="' . htmlspecialchars(trim($primary_key)) . '" />'. "\n";
}
}
echo "\n";
@@ -285,13 +283,8 @@ foreach ($loop_array as $vrowcount => $vrow) {
unset($vrow);
}
if ($insert_mode) {
$jsvkey = $vrowcount;
$browse_foreigners_uri = '&amp;pk=' . $vrowcount;
} else {
$jsvkey = htmlspecialchars(trim($primary_keys[$vrowcount]));
$browse_foreigners_uri = '&amp;pk=' . urlencode(trim($primary_keys[$vrowcount]));
}
$vkey = '[multi_edit][' . $jsvkey . ']';
$vresult = (isset($result) && is_array($result) && isset($result[$vrowcount]) ? $result[$vrowcount] : $result);

30
tbl_replace.php
View File

@@ -179,7 +179,7 @@ $func_no_param = array(
'LAST_INSERT_ID',
);
foreach ($loop_array as $primary_key) {
foreach ($loop_array as $rowcount => $primary_key) {
// skip fields to be ignored
if (! $using_key && isset($_REQUEST['insert_ignore_' . $primary_key])) {
continue;
@@ -190,32 +190,32 @@ foreach ($loop_array as $primary_key) {
// Map multi-edit keys to single-level arrays, dependent on how we got the fields
$me_fields =
isset($_REQUEST['fields']['multi_edit'][$primary_key])
? $_REQUEST['fields']['multi_edit'][$primary_key]
isset($_REQUEST['fields']['multi_edit'][$rowcount])
? $_REQUEST['fields']['multi_edit'][$rowcount]
: array();
$me_fields_prev =
isset($_REQUEST['fields_prev']['multi_edit'][$primary_key])
? $_REQUEST['fields_prev']['multi_edit'][$primary_key]
isset($_REQUEST['fields_prev']['multi_edit'][$rowcount])
? $_REQUEST['fields_prev']['multi_edit'][$rowcount]
: null;
$me_funcs =
isset($_REQUEST['funcs']['multi_edit'][$primary_key])
? $_REQUEST['funcs']['multi_edit'][$primary_key]
isset($_REQUEST['funcs']['multi_edit'][$rowcount])
? $_REQUEST['funcs']['multi_edit'][$rowcount]
: null;
$me_fields_type =
isset($_REQUEST['fields_type']['multi_edit'][$primary_key])
? $_REQUEST['fields_type']['multi_edit'][$primary_key]
isset($_REQUEST['fields_type']['multi_edit'][$rowcount])
? $_REQUEST['fields_type']['multi_edit'][$rowcount]
: null;
$me_fields_null =
isset($_REQUEST['fields_null']['multi_edit'][$primary_key])
? $_REQUEST['fields_null']['multi_edit'][$primary_key]
isset($_REQUEST['fields_null']['multi_edit'][$rowcount])
? $_REQUEST['fields_null']['multi_edit'][$rowcount]
: null;
$me_fields_null_prev =
isset($_REQUEST['fields_null_prev']['multi_edit'][$primary_key])
? $_REQUEST['fields_null_prev']['multi_edit'][$primary_key]
isset($_REQUEST['fields_null_prev']['multi_edit'][$rowcount])
? $_REQUEST['fields_null_prev']['multi_edit'][$rowcount]
: null;
$me_auto_increment =
isset($_REQUEST['auto_increment']['multi_edit'][$primary_key])
? $_REQUEST['auto_increment']['multi_edit'][$primary_key]
isset($_REQUEST['auto_increment']['multi_edit'][$rowcount])
? $_REQUEST['auto_increment']['multi_edit'][$rowcount]
: null;
foreach ($me_fields as $key => $val) {