Merge branch 'develop' into gli-1532

2024-02-07 12:41:22 +05:30
parent 520444f912 17256b4ccb
commit af23323c10
131 changed files with 1369 additions and 611 deletions
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -881,7 +881,7 @@ class AdminControllerCore extends Controller
                    $key = isset($tmp_tab[1]) ? $tmp_tab[0].'.`'.$tmp_tab[1].'`' : '`'.$tmp_tab[0].'`';

                    // as in database 0 means position 1 in the renderlist
-                    if (isset($field['position'])) {
+                    if (isset($field['position']) && Validate::isInt($value)) {
                        $value -= 1;
                    }