Merge branch 'sprint/fix-92' into 'master'

* Fix GH-92: Uncaught TypeError: Unsupported operand types: array + null. See merge request easycorp/zentaopms!5745
2022-10-13 04:13:42 +00:00
parent beeba2ec80 261c3a0217
commit 2721b934bf
1 changed files with 2 additions and 1 deletions
@@ -488,7 +488,8 @@ class block extends control
                return true;
            }

-            $blocks     = json_decode($blocks, true);
+            $blocks = json_decode($blocks, true);
+            if(empty($blocks)) $blocks = array();
            $blockPairs = array('' => '') + $blocks;

            echo '<div class="form-group">';