| @@ -60,8 +60,9 @@ | ||
| 60 | 60 | if ($this->isPreviousVersionAtLeast('7.1.0')) { |
| 61 | 61 | return; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | + // Welcome and unsubscribe emails have template = 1 for some reason | |
| 64 | 65 | $this->updateQuery( |
| 65 | 66 | 'UPDATE #__acym_mail |
| 66 | 67 | SET `type` = '.acym_escapeDB(MailClass::TYPE_TEMPLATE).' |
| 67 | 68 | WHERE `template` = 1 |
| @@ -314,8 +315,9 @@ | ||
| 314 | 315 | |
| 315 | 316 | $fieldClass = new FieldClass(); |
| 316 | 317 | $dateCustomFields = $fieldClass->getFieldsByType(['date']); |
| 317 | 318 | |
| 319 | + // Convert the already saved data into the new format | |
| 318 | 320 | foreach ($dateCustomFields as $oneField) { |
| 319 | 321 | $oneField->option = json_decode($oneField->option); |
| 320 | 322 | |
| 321 | 323 | $formatToDisplay = explode('%', $oneField->option->format); |
| @@ -328,8 +330,9 @@ | ||
| 328 | 330 | $month = '00'; |
| 329 | 331 | $day = '00'; |
| 330 | 332 | $i = 0; |
| 331 | 333 | foreach ($formatToDisplay as $one) { |
| 334 | + // This is a value stored when the format was "%m%y" for example and the format changed to something else | |
| 332 | 335 | if (!isset($userDate[$i])) continue 2; |
| 333 | 336 | |
| 334 | 337 | if ($one === 'd') { |
| 335 | 338 | $day = $userDate[$i]; |
| @@ -449,9 +452,9 @@ | ||
| 449 | 452 | if ($this->isPreviousVersionAtLeast('7.9.6') || !file_exists(ACYM_ADDONS_FOLDER_PATH.'couryeah')) { |
| 450 | 453 | return; |
| 451 | 454 | } |
| 452 | 455 | |
| 453 | - unlink(ACYM_ADDONS_FOLDER_PATH.'couryeah'); | |
| 456 | + acym_deleteFile(ACYM_ADDONS_FOLDER_PATH.'couryeah'); | |
| 454 | 457 | $this->updateQuery('UPDATE #__acym_configuration SET `name` = "acymailer_domains" WHERE `name` = "couryeah_domains"'); |
| 455 | 458 | } |
| 456 | 459 | |
| 457 | 460 | private function replaceHikaReminder(array $matches): string |
