diff --git a/ChangeLog b/ChangeLog index 61fd63b74..031c065aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [lang] Lithuanian update, thanks to Rytis Slatkevicius - rytis_s + [auth] New setting AllowNoPassword (supercedes AllowNoPasswordRoot) that applies to all accounts (even the anonymous user) +- patch #2652972 [relation] Missing code with hashing for relationship + editing, thanks to knittl - knittl 3.1.4.0 (not yet released) + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ, diff --git a/tbl_relation.php b/tbl_relation.php index 94f361f18..a4cac0dd1 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -92,11 +92,21 @@ if ($cfgRelation['displaywork']) { $disp = PMA_getDisplayField($db, $table); } +// will be used in the logic for internal relations and foreign keys: +$me_fields_name + isset($_REQUEST['fields_name']) + ? $_REQUEST['fields_name'] + : null; + // u p d a t e s f o r I n t e r n a l r e l a t i o n s if (isset($destination) && $cfgRelation['relwork']) { - foreach ($destination as $master_field => $foreign_string) { + foreach ($destination as $master_field_md5 => $foreign_string) { $upd_query = false; + + // Map the fieldname's md5 back to its real name + $master_field = $me_fields_name[$master_field_md5]; + if (! empty($foreign_string)) { $foreign_string = trim($foreign_string, '`'); list($foreign_db, $foreign_table, $foreign_field) = @@ -138,11 +148,6 @@ if (isset($destination) && $cfgRelation['relwork']) { // I use $sql_query to be able to display directly the query via // PMA_showMessage() -$me_fields_name = - isset($_REQUEST['fields_name']) - ? $_REQUEST['fields_name'] - : null; - if (isset($_REQUEST['destination_foreign'])) { $display_query = ''; $seen_error = false;