Merge branch 'QA_5_2'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

2 files changed, 3 insertions, 4 deletions

diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index 97b46419f2..26b16c1856 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -1664,9 +1664,8 @@ class InsertEdit
         } elseif (
             ! (empty($multiEditFuncs[$key])
                 && isset($multiEditColumnsPrev[$key])
-                && (($currentValue === "'" . $this->dbi->escapeString($multiEditColumnsPrev[$key]) . "'")
-                    || ($currentValue === '0x' . $multiEditColumnsPrev[$key])))
-            && $currentValue
+                && $currentValue === $multiEditColumnsPrev[$key])
+            && $currentValueAsAnArray !== ''
         ) {
             // avoid setting a field to NULL when it's already NULL
             // (field had the null checkbox before the update
diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
index 6e1cd870df..faacb9be32 100644
--- a/libraries/classes/Sql.php
+++ b/libraries/classes/Sql.php
@@ -1431,7 +1431,7 @@ class Sql
             }
         }
 
-        $hasUnique = $table && $this->resultSetContainsUniqueKey($db, $table, $fieldsMeta);
+        $hasUnique = $table !== null && $this->resultSetContainsUniqueKey($db, $table, $fieldsMeta);
 
         $editable = ($hasUnique
             || $GLOBALS['cfg']['RowActionLinksWithoutUnique']