Merge pull request #2163 from Hafsa-Naeem/i10962-stable-3_5_0-fix

I10962 stable 3 5 0 fix

Author: Hafsa-Naeem

classes/emailTemplate/DAO.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file classes/emailTemplate/DAO.php
  *
@@ -21,9 +22,10 @@ class DAO extends \PKP\emailTemplate\DAO
     protected function variablesToRename(): array
     {
         return [
-            'contextName' => 'pressName',
-            'contextUrl' => 'pressUrl',
-            'contextSignature' => 'pressSignature',
+            'pressName' => 'contextName',
+            'pressUrl' => 'contextUrl',
+            'pressSignature' => 'contextSignature',
+            'pressAcronym' => 'contextAcronym'
         ];
     }
 }

classes/mail/variables/ContextEmailVariable.php

@@ -20,24 +20,6 @@
 
 class ContextEmailVariable extends PKPContextEmailVariable
 {
-    public const CONTEXT_NAME = 'pressName';
-    public const CONTEXT_URL = 'pressUrl';
-    public const CONTEXT_SIGNATURE = 'pressSignature';
-    public const CONTEXT_ACRONYM = 'contextAcronym';
-
-    /**
-     * @copydoc Variable::descriptions()
-     */
-    public static function descriptions(): array
-    {
-        return array_merge(
-            parent::descriptions(),
-            [
-                static::CONTEXT_ACRONYM => __('emailTemplate.variable.context.contextAcronym'),
-            ]
-        );
-    }
-
     /**
      * @copydoc Variable::values()
      */
@@ -48,7 +30,6 @@ public function values(string $locale): array
         // Pass the values into the context signature so variables
         // used in the signature can be rendered.
         $values[static::CONTEXT_SIGNATURE] = $this->getContextSignature($values);
-        $values[static::CONTEXT_ACRONYM] = htmlspecialchars($this->context->getLocalizedData('acronym'));
 
         return $values;
     }

classes/migration/upgrade/v3_4_0/InstallEmailTemplates.php

@@ -47,10 +47,6 @@ protected function getEmailTemplateKeys(): array
 
     protected function getAppVariableNames(): array
     {
-        return [
-            'contextName' => 'pressName',
-            'contextUrl' => 'pressUrl',
-            'contextSignature' => 'pressSignature',
-        ];
+        return [];
     }
 }

dbscripts/xml/upgrade.xml

@@ -97,6 +97,7 @@
 		<migration class="PKP\migration\upgrade\v3_4_0\I7249_UpdateUsersUniqueIndex"/>
 	</upgrade>
 
+
 	<upgrade minversion="3.1.0.0" maxversion="3.4.0.1">
 		<migration class="PKP\migration\upgrade\v3_4_0\I9136_MigrateUniqueSiteId"/>
 		<migration class="APP\migration\upgrade\v3_4_0\I9231_FixMetricsIndexes"/>
@@ -117,6 +118,10 @@
 		<migration class="APP\migration\upgrade\v3_4_0\I9822_ChangeUsageStatsTemporaryTablesIndexes"/>
 	</upgrade>
 
+	<upgrade minversion="3.5.0.0" maxversion="3.5.9.9">
+		<migration class="PKP\migration\upgrade\v3_5_0\I10962_UpdateEmailTemplateVariables"/>
+	</upgrade>
+
 	<upgrade minversion="3.1.0.0" maxversion="3.4.9.9">
 		<migration class="PKP\migration\upgrade\v3_5_0\PreflightCheckMigration" fallback="3.4.9.9" />
 		<migration class="APP\migration\upgrade\v3_5_0\I8333_AddMissingForeignKeys" />
@@ -163,6 +168,7 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\I11238_PrepareDBForStructuredCitations"/>
 		<migration class="APP\migration\upgrade\v3_5_0\I11241_MissingDecisionConstantsUpdate"/>
 		<migration class="APP\migration\upgrade\v3_5_0\I11125_UpdateEmailTemplateVariables"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I10962_UpdateEmailTemplateVariables"/>
 		<code function="downloadIPGeoDB"/>
 		<note file="docs/release-notes/README-3.5.0" />
 	</upgrade>