Fix inline editing of empty cells

diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index 046f557f2d8c6a492d11c129cb930dce3079587d..19a598c72b832a0a0f350794c039bb52f1ff8562 100644 (file)
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.6.3";
+$VERSION = "4.6.4-dev";

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index ea88c229f85392d3a49d60d7d5361f55d8b4e28e..ce2dddbf59e24ce0cdb5ab6a4a2ea2a1e02ef852 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -143,7 +143,7 @@ function selectValue(select) {
 */
 function isTag(el, tag) {
        var re = new RegExp('^(' + tag + ')$', 'i');
-       return re.test(el.tagName);
+       return el && re.test(el.tagName);
 }
 
 /** Get parent node with specified tag name
@@ -702,7 +702,7 @@ function selectClick(event, text, warning) {
                }
        };
        var pos = event.rangeOffset;
-       var value = td.firstChild.alt || td.textContent || td.innerText;
+       var value = (td.firstChild && td.firstChild.alt) || td.textContent || td.innerText;
        input.style.width = Math.max(td.clientWidth - 14, 20) + 'px'; // 14 = 2 * (td.border + td.padding + input.border)
        if (text) {
                var rows = 1;

diff --git a/changes.txt b/changes.txt
index b11d023093f4b3b22a0548e29ec3d3b95e1302ab..af1990edd62533503b5fe22f5feca3435f1c115d 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,6 @@
+Adminer 4.6.4-dev:
+Fix inline editing of empty cells (regression from 4.6.3)
+
 Adminer 4.6.3 (released 2018-06-28):
 Disallow using password-less databases
 Copy triggers when copying table