Merge pull request pkp#4321 from jonasraoni/bugfix-stable-3_4_0-8592-…

…fix-notification_subscription_settings-integrity Bugfix stable 3 4 0 8592 fix notification subscription settings integrity
jonasraoni · Jun 19, 2024 · 6ab8b9d · 6ab8b9d
2 parents be89fe6 + 05ec63c
commit 6ab8b9d
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/classes/migration/upgrade/v3_4_0/I9813_QuickSubmitSubmissionProgressType.php b/classes/migration/upgrade/v3_4_0/I9813_QuickSubmitSubmissionProgressType.php
@@ -31,7 +31,7 @@ public function up(): void
             return;
         }
         if ($installedQuickSubmitPluginVersion->compare($thresholdVersion) === 0) {
-            $this->_installer->log('WARNING: You are using an old version of the QuickSubmit plugin, that is not supported any more. Please upgrade the QuickSubmit plugin via plugin gallery immediatelly after this upgrade.');
+            $this->_installer->log('WARNING: You are using an old version of the QuickSubmit plugin, that is not supported anymore. Please upgrade the QuickSubmit plugin via plugin gallery immediately after this upgrade.');
         }
 
         foreach ($this->getStepMap() as $oldValue => $newValue) {

diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
@@ -226,7 +226,13 @@
 		<migration class="PKP\migration\upgrade\v3_4_0\I9830_FixEmptyUserLocales"/>
 	</upgrade>
 
+	<upgrade minversion="3.4.0.0" maxversion="3.4.0.5">
+		<!-- Only new 3.4 installations need this fix -->
+		<migration class="PKP\migration\upgrade\v3_4_0\I8592_SiteNotificationSubscriptions"/>
+	</upgrade>
+
 	<upgrade minversion="3.4.0.0" maxversion="3.4.9.9">
+		<!-- Needs to be re-executed on every minor upgrade, the user might still be using an outdated plugin -->
 		<migration class="APP\migration\upgrade\v3_4_0\I9813_QuickSubmitSubmissionProgressType"/>
 	</upgrade>
 

diff --git a/lib/pkp b/lib/pkp
diff --git a/lib/ui-library b/lib/ui-library
diff --git a/plugins/generic/acron b/plugins/generic/acron
diff --git a/plugins/generic/citationStyleLanguage b/plugins/generic/citationStyleLanguage
diff --git a/plugins/generic/googleAnalytics b/plugins/generic/googleAnalytics
diff --git a/plugins/generic/googleScholar b/plugins/generic/googleScholar
+3 −5		classes/context/ContextDAO.php
+4 −1		classes/mail/Mailable.php
+1 −1		classes/migration/install/CommonMigration.php
+1 −0		classes/services/PKPContextService.php
+2 −0		classes/services/PKPSchemaService.php
+4 −4		locale/eu/common.po
+9 −2		locale/eu/default.po
+6 −3		locale/eu/submission.po
+6 −6		locale/eu/user.po
+78 −53		locale/ja/common.po
+5 −5		locale/ja/default.po
+48 −40		locale/ja/editor.po
+276 −152		locale/ja/emails.po
+10 −10		locale/ja/grid.po
+30 −23		locale/ja/manager.po
+208 −140		locale/ja/submission.po
+24 −19		locale/ja/user.po
+347 −133		locale/nl/emails.po
+1 −2		locale/pt_BR/emails.po
+6 −3		locale/pt_BR/user.po
+9 −5		locale/ru/user.po
+27 −26		templates/install/install.tpl
+17 −0		locale/eu/locale.po
+47 −3		locale/fr_FR/locale.po
+52 −4		locale/nb/locale.po
+14 −14		locale/ca/locale.po
+13 −13		locale/es/locale.po
+13 −13		locale/fr_FR/locale.po