From 0d4121812b664813280ba50fb19953d3e1c94844 Mon Sep 17 00:00:00 2001
From: Erik Hanson <erik@erikhanson.dev>
Date: Fri, 31 Jan 2025 14:21:44 -0800
Subject: [PATCH 1/2] pkp/pkp-lib#10819 Unable to update OAuth scope for
 authenticated ORCIDs

---
 config.TEMPLATE.inc.php     | 4 ++--
 dbscripts/xml/upgrade.xml   | 1 +
 registry/emailTemplates.xml | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config.TEMPLATE.inc.php b/config.TEMPLATE.inc.php
index c24deb8754..c8e270154d 100644
--- a/config.TEMPLATE.inc.php
+++ b/config.TEMPLATE.inc.php
@@ -162,8 +162,8 @@
 [cache]
 
 ; Default driver for Laravel-based caching. Currently supports opcache and file drivers.
-; By default, the opcache is used.
-; default = opcache
+; By default, the file is used.
+; default = file
 
 ; Path to store cache contents for file or opcode based caches.
 ; path = cache/opcache
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 4d3e3e158f..d747f1a82e 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -145,6 +145,7 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\I7135_CreateAuthorAffiliationsTables"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I7135_CreateNewRorRegistryCacheTables"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I10759_AddReviewAssignmentSettings"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I10819_OrcidOauthScopeMail"/>
 		<note file="docs/release-notes/README-3.5.0" />
 	</upgrade>
 
diff --git a/registry/emailTemplates.xml b/registry/emailTemplates.xml
index 6c8780294b..88fdf952b0 100644
--- a/registry/emailTemplates.xml
+++ b/registry/emailTemplates.xml
@@ -36,4 +36,5 @@
 	<email key="ORCID_REQUEST_AUTHOR_AUTHORIZATION" name="orcidProfile.orcidRequestAuthorAuthorization.name"  subject="emails.orcidRequestAuthorAuthorization.subject" body="emails.orcidRequestAuthorAuthorization.body"/>
 	<email key="USER_ROLE_ASSIGNMENT_INVITATION" name="mailable.userRoleAssignmentInvitationNotify.name" subject="emails.userRoleAssignmentInvitationNotify.subject" body="emails.userRoleAssignmentInvitationNotify.body"/>
 	<email key="USER_ROLE_END" name="mailable.userRoleEndNotify.name" subject="emails.userRoleEndNotify.subject" body="emails.userRoleEndNotify.body"/>
+	<email key="ORCID_REQUEST_UPDATE_SCOPE" name="orcid.orcidRequestUpdateScope.name"  subject="emails.orcidRequestUpdateScope.subject" body="emails.orcidRequestUpdateScope.body"/>
 </emails>

From f8f70f297edee7a8806e2519bb57a9c46e1273f2 Mon Sep 17 00:00:00 2001
From: Erik Hanson <erik@erikhanson.dev>
Date: Fri, 7 Feb 2025 10:46:47 -0800
Subject: [PATCH 2/2] Submodule update ##ewhanson/i10819##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index 71356ea556..922eb775df 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 71356ea556f5a94d134dc0cc3d4f659a0015588f
+Subproject commit 922eb775dfa9a43d7f7fcbdcc3a19e4c557f920e