X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=api%2Fapi.php;h=8b55d97347e26335c6a7e5a35d93db3ac4556a8d;hb=63f63f5a548ec1293e4daf26fd84349f72e2e6c4;hp=4f53c542fc0324b54e6361ee65a70ba28f963cc5;hpb=65742a3ed0f9444378e73bdab10469176f07ce49;p=civicrm-core.git

diff --git a/api/api.php b/api/api.php
index 4f53c542fc..8b55d97347 100644
--- a/api/api.php
+++ b/api/api.php
@@ -158,6 +158,10 @@ function _civicrm_api_replace_variables(&$params, &$parentResult, $separator = '
           $count = count($stringParts);
         }
       }
+      // CRM-16168 If we have failed to swap it out we should unset it rather than leave the placeholder.
+      if (substr($params[$field], 0, 6) == '$value') {
+        $params[$field] = NULL;
+      }
     }
   }
 }