From f22aa514edfb6d24d7552236f335a8625948300a Mon Sep 17 00:00:00 2001 From: Dimitris Efstathiou Date: Fri, 2 Jun 2023 13:26:46 +0300 Subject: [PATCH] pkp/pkp-lib#9047 Missing Variables Fix --- classes/migration/upgrade/v3_4_0/PreflightCheckMigration.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/migration/upgrade/v3_4_0/PreflightCheckMigration.php b/classes/migration/upgrade/v3_4_0/PreflightCheckMigration.php index 8aba344fdb6..aec77163790 100755 --- a/classes/migration/upgrade/v3_4_0/PreflightCheckMigration.php +++ b/classes/migration/upgrade/v3_4_0/PreflightCheckMigration.php @@ -72,7 +72,7 @@ public function up(): void if (!$conflictingEmailKeys->isEmpty()) { foreach ($conflictingEmailKeys as $conflictingEmailKey) { - $exceptionMessage .= 'A row with email_key="' . $conflictingEmailKey->email_key . '" found in table email_templates_default_data which will conflict with other rows specific to the locale key "' . $localeCode . '" after the migration. Please review this row before upgrading. Consider keeping only the ' . $defaultLocale . ' locale in the installation' . PHP_EOL; + $exceptionMessage .= 'A row with email_key="' . $conflictingEmailKey->email_key . '" found in table email_templates_default_data which will conflict with other rows specific to the locale key "' . $localeTarget . '" after the migration. Please review this row before upgrading. Consider keeping only the ' . $localeSource . ' locale in the installation' . PHP_EOL; } } } @@ -106,7 +106,7 @@ public function up(): void if (!$conflictingSettings->isEmpty()) { foreach ($conflictingSettings as $conflictingSetting) { - $settingsExceptionMessage .= 'A row with "' . $entityIdColumnName . '"="' . $conflictingSetting->{$entityIdColumnName} . '" and "setting_name"="' . $conflictingSetting->setting_name . '" found in table "' . $tableName . '" which will conflict with other rows specific to the locale key "' . $localeCode . '" after the migration. Please review this row before upgrading.' . PHP_EOL; + $settingsExceptionMessage .= 'A row with "' . $entityIdColumnName . '"="' . $conflictingSetting->{$entityIdColumnName} . '" and "setting_name"="' . $conflictingSetting->setting_name . '" found in table "' . $tableName . '" which will conflict with other rows specific to the locale key "' . $localeTarget . '" after the migration. Please review this row before upgrading.' . PHP_EOL; } } }