bug #3407235 [interface] Entering the key through a lookup window does not reset NULL
This commit is contained in:
@@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog
|
|||||||
- bug #3425156 [interface] Add column after drop
|
- bug #3425156 [interface] Add column after drop
|
||||||
- [interface] Avoid showing the password in phpinfo()'s output
|
- [interface] Avoid showing the password in phpinfo()'s output
|
||||||
- bug #3441572 [GUI] 'newer version of phpMyAdmin' message not shown in IE8
|
- bug #3441572 [GUI] 'newer version of phpMyAdmin' message not shown in IE8
|
||||||
|
- bug #3407235 [interface] Entering the key through a lookup window does not reset NULL
|
||||||
|
|
||||||
3.4.7.1 (2011-11-10)
|
3.4.7.1 (2011-11-10)
|
||||||
- [security] Fixed possible local file inclusion in XML import
|
- [security] Fixed possible local file inclusion in XML import
|
||||||
|
@@ -104,9 +104,11 @@ require_once './libraries/header_scripts.inc.php';
|
|||||||
|
|
||||||
if (opener && opener.document && opener.document.insertForm) {
|
if (opener && opener.document && opener.document.insertForm) {
|
||||||
var field = 'fields';
|
var field = 'fields';
|
||||||
|
var field_null = 'fields_null';
|
||||||
|
|
||||||
<?php if (isset($rownumber)) { ?>
|
<?php if (isset($rownumber)) { ?>
|
||||||
var element_name = field + '[multi_edit][<?php echo htmlspecialchars($rownumber); ?>][' + fieldmd5 + ']';
|
var element_name = field + '[multi_edit][<?php echo htmlspecialchars($rownumber); ?>][' + fieldmd5 + ']';
|
||||||
|
var null_name = field_null + '[multi_edit][<?php echo htmlspecialchars($rownumber); ?>][' + fieldmd5 + ']';
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
var element_name = field + '[]';
|
var element_name = field + '[]';
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
@@ -120,6 +122,9 @@ require_once './libraries/header_scripts.inc.php';
|
|||||||
if (opener.document.insertForm.elements[element_name]) {
|
if (opener.document.insertForm.elements[element_name]) {
|
||||||
// Edit/Insert form
|
// Edit/Insert form
|
||||||
opener.document.insertForm.elements[element_name].value = key;
|
opener.document.insertForm.elements[element_name].value = key;
|
||||||
|
if (opener.document.insertForm.elements[null_name]) {
|
||||||
|
opener.document.insertForm.elements[null_name].checked = false;
|
||||||
|
}
|
||||||
self.close();
|
self.close();
|
||||||
return false;
|
return false;
|
||||||
} else if (opener.document.insertForm.elements[element_name_alt]) {
|
} else if (opener.document.insertForm.elements[element_name_alt]) {
|
||||||
|
Reference in New Issue
Block a user