[REF] Fix a couple of functions triggering deprecation notices in php8.0 where by...

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index c8b69996635ab6609b9cc0f6b2d0d5b9cba4e937..80271dd4496d8742a425135d0bc59696adb68576 100644 (file)
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -2011,7 +2011,7 @@ SELECT contact_id
    * @return object
    *   an object of type referenced by daoName
    */
-  public static function commonRetrieveAll($daoName, $fieldIdName = 'id', $fieldId, &$details, $returnProperities = NULL) {
+  public static function commonRetrieveAll($daoName, $fieldIdName, $fieldId, &$details, $returnProperities = NULL) {
     require_once str_replace('_', DIRECTORY_SEPARATOR, $daoName) . ".php";
     $object = new $daoName();
     $object->$fieldIdName = $fieldId;

diff --git a/CRM/Core/OptionValue.php b/CRM/Core/OptionValue.php
index 765cedd17f19289eb3c4191f47bd5e2f3e1cf780..79e6216c555c8ab74f985532f10a8db86449ec15 100644 (file)
--- a/CRM/Core/OptionValue.php
+++ b/CRM/Core/OptionValue.php
@@ -251,7 +251,7 @@ class CRM_Core_OptionValue {
    * @return bool
    *   true if object exists
    */
-  public static function optionExists($value, $daoName, $daoID, $optionGroupID, $fieldName = 'name', $domainSpecific) {
+  public static function optionExists($value, $daoName, $daoID, $optionGroupID, $fieldName, $domainSpecific) {
     $object = new $daoName();
     $object->$fieldName = $value;
     $object->option_group_id = $optionGroupID;