From 5101acab02ce6414558c2f8d7d2d06848c2d68a9 Mon Sep 17 00:00:00 2001
From: Stephen Palmstrom <stephen.palmstrom@missionassist.org.uk>
Date: Wed, 11 Jan 2023 17:42:37 +0000
Subject: [PATCH] Issue 1984 - make caches ID specific.

---
 CRM/Core/BAO/UFGroup.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php
index c7d1b83e46..03c38ba36c 100644
--- a/CRM/Core/BAO/UFGroup.php
+++ b/CRM/Core/BAO/UFGroup.php
@@ -918,12 +918,11 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup implements \Civi\Core\Ho
 
         $template = CRM_Core_Smarty::singleton();
 
-        // Hide CRM error messages if they are displayed using drupal form_set_error.
-        if (!empty($_POST) && CRM_Core_Config::singleton()->userFramework == 'Drupal') {
-          if (arg(0) == 'user' || (arg(0) == 'admin' && arg(1) == 'people')) {
-            $template->assign('suppressForm', TRUE);
+        // Hide CRM error messages if they are set by the CMS.
+        if (!empty($_POST)) {
+          $supressForm = CRM_Core_Config::singleton()->userSystem->suppressProfileFormErrors();
+          $template->assign('suppressForm', $supressForm);
           }
-        }
 
         $templateFile = "CRM/Profile/Form/{$profileID}/Dynamic.tpl";
         if (!$template->template_exists($templateFile)) {
-- 
2.25.1