The branch, master has been updated via c8dbed11b2e2ad76c3c7dcd41777f314427f3f32 (commit) via f414a0ec32626c3f0084bd020daba2b4553d244b (commit) from f22a4571998df392e2a5d6817f04fe02da1b111a (commit)
- Log ----------------------------------------------------------------- commit c8dbed11b2e2ad76c3c7dcd41777f314427f3f32 Merge: f22a457 f414a0e Author: Madhura Jayaratne madhura.cj@gmail.com Date: Thu Nov 24 22:48:25 2011 +0530
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + browse_foreigners.php | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog index ec37459..2c6e859 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ phpMyAdmin - ChangeLog - bug #3425156 [interface] Add column after drop - [interface] Avoid showing the password in phpinfo()'s output - 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) - [security] Fixed possible local file inclusion in XML import diff --git a/browse_foreigners.php b/browse_foreigners.php index ab5385c..74e4e99 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -104,9 +104,11 @@ require_once './libraries/header_scripts.inc.php';
if (opener && opener.document && opener.document.insertForm) { var field = 'fields'; + var field_null = 'fields_null';
<?php if (isset($rownumber)) { ?> 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 { ?> var element_name = field + '[]'; <?php } ?> @@ -120,6 +122,9 @@ require_once './libraries/header_scripts.inc.php'; if (opener.document.insertForm.elements[element_name]) { // Edit/Insert form 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(); return false; } else if (opener.document.insertForm.elements[element_name_alt]) {
hooks/post-receive