From 9e24615afd67420044643baffc20ba00e2bc56f2 Mon Sep 17 00:00:00 2001
From: Taslan Graham <gtaslan1@gmail.com>
Date: Tue, 5 Nov 2024 15:56:22 -0500
Subject: [PATCH 1/4] pkp/pkp-lib#10571 WIP: Add checks to limit email template
 access by usergroups

---
 dbscripts/xml/upgrade.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 2f8d11c0096..a28134c0482 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -153,6 +153,9 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\COA75_AddUserRoleEndEmail"/>
 	</upgrade>
 
+	<upgrade minversion="3.5.0.0" maxversion="3.5.0.0">
+		<migration class="PKP\migration\upgrade\v3_5_0\I10403_EmailTemplateUserGroupAccess"/>
+	</upgrade>
 	<!-- update plugin configuration - should be done as the final upgrade task -->
 	<code function="addPluginVersions" />
 </install>

From 0b36be0fc00fb5e324fd9fc2e88a8b8bf48a62aa Mon Sep 17 00:00:00 2001
From: Taslan Graham <gtaslan1@gmail.com>
Date: Tue, 12 Nov 2024 16:57:12 -0500
Subject: [PATCH 2/4] pkp/pkp-lib#10571 Move migration into v3.6 folder

---
 dbscripts/xml/install.xml | 1 +
 dbscripts/xml/upgrade.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dbscripts/xml/install.xml b/dbscripts/xml/install.xml
index ef296cee6dc..5afdd97b9f2 100644
--- a/dbscripts/xml/install.xml
+++ b/dbscripts/xml/install.xml
@@ -47,6 +47,7 @@
 	<migration class="PKP\migration\install\CategoriesMigration" />
 	<migration class="PKP\migration\install\HighlightsMigration" />
 	<migration class="APP\migration\install\MetricsMigration" />
+	<migration class="PKP\migration\install\EmailTemplateUserGroupAccessMigration"/>
 
 	<!-- Other install tasks -->
 	<code function="createData"/>
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index a28134c0482..8dbe55846b0 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -11,7 +11,7 @@
   *
   -->
 
-<install version="3.5.0.0">
+<install version="3.6.0.0">
 	<code function="checkPhpVersion" />
 
 	<upgrade minversion="2.0.0.0" maxversion="3.2.9.9">
@@ -154,7 +154,7 @@
 	</upgrade>
 
 	<upgrade minversion="3.5.0.0" maxversion="3.5.0.0">
-		<migration class="PKP\migration\upgrade\v3_5_0\I10403_EmailTemplateUserGroupAccess"/>
+		<migration class="PKP\migration\upgrade\v3_6_0\I10403_EmailTemplateUserGroupAccess"/>
 	</upgrade>
 	<!-- update plugin configuration - should be done as the final upgrade task -->
 	<code function="addPluginVersions" />

From 4c20db279d37e209a0487f3996337b1c4a83f6a3 Mon Sep 17 00:00:00 2001
From: Taslan Graham <gtaslan1@gmail.com>
Date: Tue, 19 Nov 2024 13:34:48 -0500
Subject: [PATCH 3/4] Fix migrations

---
 dbscripts/xml/install.xml | 2 +-
 dbscripts/xml/upgrade.xml | 4 +++-
 lib/pkp                   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dbscripts/xml/install.xml b/dbscripts/xml/install.xml
index 5afdd97b9f2..df6b7cb45e4 100644
--- a/dbscripts/xml/install.xml
+++ b/dbscripts/xml/install.xml
@@ -10,7 +10,7 @@
   * Installation descriptor file.
   -->
 
-<install version="3.5.0.0">
+<install version="3.6.0.0">
 	<code function="checkPhpVersion" />
 
 	<code function="createDirectories"/>
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 8dbe55846b0..7da5947bc5e 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -153,9 +153,11 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\COA75_AddUserRoleEndEmail"/>
 	</upgrade>
 
-	<upgrade minversion="3.5.0.0" maxversion="3.5.0.0">
+	<upgrade minversion="3.5.0.0" maxversion="3.5.9.9">
+		<migration class="PKP\migration\upgrade\v3_6_0\PreflightCheckMigration" fallback="3.5.9.9" />
 		<migration class="PKP\migration\upgrade\v3_6_0\I10403_EmailTemplateUserGroupAccess"/>
 	</upgrade>
+
 	<!-- update plugin configuration - should be done as the final upgrade task -->
 	<code function="addPluginVersions" />
 </install>
diff --git a/lib/pkp b/lib/pkp
index 55af2f4b334..b2b3d7169ec 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 55af2f4b334e684b0e315dbfb135cbdc396c8094
+Subproject commit b2b3d7169ecfbcf760b93f5a41f769718616ce26

From fe82e697182037ba931ec13f3c644e405aa413cb Mon Sep 17 00:00:00 2001
From: Taslan Graham <gtaslan1@gmail.com>
Date: Tue, 3 Dec 2024 18:06:46 -0500
Subject: [PATCH 4/4] Submodule update

---
 lib/pkp        | 2 +-
 lib/ui-library | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pkp b/lib/pkp
index b2b3d7169ec..1fe352e2fc7 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit b2b3d7169ecfbcf760b93f5a41f769718616ce26
+Subproject commit 1fe352e2fc79ebce41871142fe43022d95a8cd97
diff --git a/lib/ui-library b/lib/ui-library
index 14c7d534390..86888aacc07 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 14c7d534390d774113f11fc2ed9f4f33643dc377
+Subproject commit 86888aacc073c8b2ad9189add69b4c38cfbf422c