Merge pull request #24162 from colemanw/savedSearchLabel

[civicrm-core.git] / CRM / Core / Action.php

diff --git a/CRM/Core/Action.php b/CRM/Core/Action.php
index 2211d6cdb6eedc9c105a0c01e8fa0ceb4bf6e8c9..1267425c59da885d432660ab184fda96e354c053 100644 (file)
--- a/CRM/Core/Action.php
+++ b/CRM/Core/Action.php
@@ -166,7 +166,7 @@ class CRM_Core_Action {
    *
    * @param array $links
    *   The set of link items.
-   * @param int $mask
+   * @param int|null $mask
    *   The mask to be used. a null mask means all items.
    * @param array $values
    *   The array of values for parameter substitution in the link items.
@@ -311,8 +311,8 @@ class CRM_Core_Action {
    *   The mask to be used. a null mask means all items.
    * @param array $values
    *   The array of values for parameter substitution in the link items.
-   * @param null $op
-   * @param null $objectName
+   * @param string|null $op
+   * @param string|null $objectName
    * @param int $objectId
    *
    * @return array|null
@@ -373,7 +373,7 @@ class CRM_Core_Action {
    */
   public static function &replace(&$str, &$values) {
     foreach ($values as $n => $v) {
-      $str = str_replace("%%$n%%", $v, $str);
+      $str = str_replace("%%$n%%", ($v ?? ''), ($str ?? ''));
     }
     return $str;
   }