diff --git a/ChangeLog b/ChangeLog index 78eda7bf93..6f82417aa6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2565948 [core] Changing the connection collation changed the client charset. + [lang] Romanian update, thanks to Sergiu Bivol - sbivol +- patch #1760205 [data] Insert as new row: BLOB is lost, + thanks to Herman van Rink - helmo 3.1.2.0 (2009-01-19) - bug #1253252 [display] Can't NULL a column with relation defined diff --git a/tbl_replace.php b/tbl_replace.php index 90f9733f54..9386aa59e5 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -202,6 +202,17 @@ foreach ($loop_array as $rowcount => $primary_key) { $primary_field = PMA_BS_GetPrimaryField($GLOBALS['db'], $GLOBALS['table']); + // Fetch the current values of a row to use in case we have a protected field + // @todo possibly move to ./libraries/tbl_replace_fields.inc.php + if ($is_insert && $using_key && isset($me_fields_type) && + is_array($me_fields_type) && isset($primary_key)) { + $prot_result = PMA_DBI_query('SELECT * FROM ' . + PMA_backquote($table) . ' WHERE ' . $primary_key . ';'); + $prot_row = PMA_DBI_fetch_assoc($prot_result); + PMA_DBI_free_result($prot_result); + unset($prot_result); + } + foreach ($me_fields as $key => $val) { require './libraries/tbl_replace_fields.inc.php';