From eaa5a171318c87bf5d15a7088418e17a594af5ac Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 1 Nov 2021 10:38:57 +1300
Subject: [PATCH] Ensure communityMessages is assigned to the template.

This is a minor code simplification & ensures the parameter is set rather than
handling it not being set at the template level
---
 CRM/Contact/Page/DashBoard.php                | 24 +++++++++++++------
 .../CRM/Contact/Page/DashBoardDashlet.tpl     |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/CRM/Contact/Page/DashBoard.php b/CRM/Contact/Page/DashBoard.php
index 48ea3ac19c..4d6a935a8e 100644
--- a/CRM/Contact/Page/DashBoard.php
+++ b/CRM/Contact/Page/DashBoard.php
@@ -36,13 +36,7 @@ class CRM_Contact_Page_DashBoard extends CRM_Core_Page {
       $this->assign('hookContentPlacement', $contentPlacement);
     }
 
-    $communityMessages = CRM_Core_CommunityMessages::create();
-    if ($communityMessages->isEnabled()) {
-      $message = $communityMessages->pick();
-      if ($message) {
-        $this->assign('communityMessages', $communityMessages->evalMarkup($message['markup']));
-      }
-    }
+    $this->assign('communityMessages', $this->getCommunityMessageOutput());
 
     $loader = Civi::service('angularjs.loader');
     $loader->addModules('crmDashboard');
@@ -95,4 +89,20 @@ class CRM_Contact_Page_DashBoard extends CRM_Core_Page {
     ];
   }
 
+  /**
+   * Get community message output.
+   *
+   * @return string
+   */
+  protected function getCommunityMessageOutput(): string {
+    $communityMessages = CRM_Core_CommunityMessages::create();
+    if ($communityMessages->isEnabled()) {
+      $message = $communityMessages->pick();
+      if ($message) {
+        return $communityMessages->evalMarkup($message['markup']);
+      }
+    }
+    return '';
+  }
+
 }
diff --git a/templates/CRM/Contact/Page/DashBoardDashlet.tpl b/templates/CRM/Contact/Page/DashBoardDashlet.tpl
index aaf2ab62b0..ac2ed7af3f 100644
--- a/templates/CRM/Contact/Page/DashBoardDashlet.tpl
+++ b/templates/CRM/Contact/Page/DashBoardDashlet.tpl
@@ -9,7 +9,7 @@
 *}
 {include file="CRM/common/chart.tpl"}
 {* Alerts for critical configuration settings. *}
-{$communityMessages|default:''}
+{$communityMessages}
 <div class="clear"></div>
 <div class="crm-block crm-content-block">
 
-- 
2.25.1