From f0a72a68371fe9591ac92125ae56af7109d2dfa0 Mon Sep 17 00:00:00 2001
From: Jon Robson <jdlrobson@gmail.com>
Date: Wed, 24 Apr 2024 17:09:54 -0700
Subject: [PATCH] Wrap sitenotices in core

Depends-On: Ib48b1f54c326a0363841b2f592d8fd4cf7312b9b
Bug: T361966
Change-Id: I28255d9630d2d69ace28fde1954f2a5811feae2a
---
 includes/Skins/SkinMinerva.php | 2 +-
 skin.json                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/Skins/SkinMinerva.php b/includes/Skins/SkinMinerva.php
index a08b87e2f..632ad9b49 100644
--- a/includes/Skins/SkinMinerva.php
+++ b/includes/Skins/SkinMinerva.php
@@ -929,7 +929,7 @@ class SkinMinerva extends SkinMustache {
 	protected function prepareBanners( $siteNotice ) {
 		$banners = [];
 		if ( $siteNotice && $this->getConfig()->get( 'MinervaEnableSiteNotice' ) ) {
-			$banners[] = '<div id="siteNotice">' . $siteNotice . '</div>';
+			$banners[] = $siteNotice;
 		} else {
 			$banners[] = '<div id="siteNotice"></div>';
 		}
diff --git a/skin.json b/skin.json
index 25ac3d764..971115575 100644
--- a/skin.json
+++ b/skin.json
@@ -135,6 +135,7 @@
 					"templateDirectory": "includes/Skins",
 					"templateSectionLinks": "SectionLinks",
 					"tempUserBanner": true,
+					"wrapSiteNotice": true,
 					"scripts": [
 						"skins.minerva.scripts"
 					],