add id to sql value pool

yakamara · Dec 17, 2023 · dc729e7 · dc729e7
1 parent dfee9a7
commit dc729e7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/lib/yform.php b/lib/yform.php
@@ -452,6 +452,7 @@ public function executeActions()
                 /** @deprecated use 'id' instead of 'ID' */
                 $this->objparams['value_pool']['email']['ID'] = $this->objparams['main_id'];
                 $this->objparams['value_pool']['email']['id'] = $this->objparams['main_id'];
+                $this->objparams['value_pool']['sql']['id'] = $this->objparams['main_id'];
             }
 
             $hasWarnings = 0 != count($this->objparams['warning']);

diff --git a/lib/yform/action/db.php b/lib/yform/action/db.php
@@ -61,7 +61,10 @@ public function executeAction(): void
                     $sql_id->setWhere($where);
                     $sql_id->select('id');
                     $this->params['main_id'] = $sql_id->getValue('id');
+                    /** @deprecated use 'id' instead of 'ID' */
                     $this->params['value_pool']['email']['ID'] = $this->params['main_id'];
+                    $this->params['value_pool']['email']['id'] = $this->params['main_id'];
+                    $this->params['value_pool']['sql']['id'] = $this->params['main_id'];
                 }
             } else {
                 $sql->insert();
@@ -71,6 +74,7 @@ public function executeAction(): void
                 /** @deprecated since 3.4.1 use id (lowercase) instead */
                 $this->params['value_pool']['email']['ID'] = $id;
                 $this->params['value_pool']['email']['id'] = $id;
+                $this->params['value_pool']['sql']['id'] = $id;
             }
         } catch (Exception $e) {
             $this->params['form_show'] = true;

diff --git a/plugins/manager/lib/yform/action/manage_db.php b/plugins/manager/lib/yform/action/manage_db.php
@@ -81,10 +81,11 @@ public function executeAction(): void
             $sql->insert();
             $flag = 'insert';
             $id = $sql->getLastId();
-
+            /** @deprecated use 'id' instead of 'ID' */
             $this->params['value_pool']['email']['ID'] = $id;
+            $this->params['value_pool']['email']['id'] = $id;
             $this->params['main_id'] = $id;
-            // $this->params["value_pool"]["sql"]["ID"] = $id;
+            $this->params["value_pool"]["sql"]["id"] = $id;
             if (0 == $id) {
                 $this->params['form_show'] = true;
                 $this->params['hasWarnings'] = true;