From 9c68cf8038b73196f1311235ebe346ea38327be8 Mon Sep 17 00:00:00 2001 From: Peter Szalatnay Date: Mon, 22 Jul 2024 21:57:37 +1000 Subject: [PATCH 1/2] Update EmailRule.php --- libraries/src/Form/Rule/EmailRule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Form/Rule/EmailRule.php b/libraries/src/Form/Rule/EmailRule.php index c23461f21f847..e78943c2c5b1a 100644 --- a/libraries/src/Form/Rule/EmailRule.php +++ b/libraries/src/Form/Rule/EmailRule.php @@ -164,7 +164,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry $query = $db->getQuery(true); // Get the extra field check attribute. - $userId = ($form instanceof Form) ? (int) $form->getValue('id') : 0; + $userId = ($input instanceof Registry) ? $input->get('id') : 0; // Build the query. $query->select('COUNT(*)') From 16b59a2aefeae836054399d94fa3009f744ac69f Mon Sep 17 00:00:00 2001 From: Peter Szalatnay Date: Wed, 14 Aug 2024 21:48:27 +1000 Subject: [PATCH 2/2] Update EmailRule.php --- libraries/src/Form/Rule/EmailRule.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/src/Form/Rule/EmailRule.php b/libraries/src/Form/Rule/EmailRule.php index e78943c2c5b1a..37334ba6fc0cc 100644 --- a/libraries/src/Form/Rule/EmailRule.php +++ b/libraries/src/Form/Rule/EmailRule.php @@ -164,7 +164,9 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry $query = $db->getQuery(true); // Get the extra field check attribute. - $userId = ($input instanceof Registry) ? $input->get('id') : 0; + $userId = ($form instanceof Form) && $form->getValue('id') + ? (int) $form->getValue('id') + : (($input instanceof Registry) ? (int) $input->get('id') : 0); // Build the query. $query->select('COUNT(*)')