Index: branches/5.3.x/core/install/upgrades.sql
===================================================================
diff -u -N -r16545 -r16600
--- branches/5.3.x/core/install/upgrades.sql (.../upgrades.sql) (revision 16545)
+++ branches/5.3.x/core/install/upgrades.sql (.../upgrades.sql) (revision 16600)
@@ -2941,6 +2941,18 @@
SET ClassNamespace = 'InPortal\\Core'
WHERE `Name` IN ('Core', 'In-Portal');
+DELETE FROM CachedUrls;
+
+UPDATE LanguageLabels
+SET l1_Translation = 'Incorrect date format, please use ({format}) ex. ({sample})'
+WHERE PhraseKey = 'LA_ERR_BAD_DATE_FORMAT';
+
+UPDATE LanguageLabels
+SET l1_HintTranslation = REPLACE(l1_HintTranslation, '
This deploy script will reset all caches at once', 'This deploy script will reset all caches at once.\r\nThis deploy script will dump production assets.\r\n')
+WHERE PhraseKey = 'LA_TITLE_SYSTEMTOOLSDEPLOY';
+
+INSERT INTO SystemSettings VALUES(DEFAULT, 'EmailDelivery', '2', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_config_EmailDelivery', 'radio', NULL, '1=la_opt_EmailDeliveryQueue||2=la_opt_EmailDeliveryImmediate', 50.11, 0, 1, NULL);
+
# ===== v 5.3.0-B1 =====
ALTER TABLE ScheduledTasks ADD Settings TEXT NULL;
ALTER TABLE Themes ADD ImageResizeRules TEXT NULL;
@@ -2978,7 +2990,8 @@
SET l1_HintTranslation = '\r\n- This deploy script will apply all Database Changes stored in [module]/project_upgrades.sql to the current website and save applied Revisions in AppliedDBRevisions.
\r\n- This deploy script will create all new language phrases by re-importing [module]/install/english.lang file.
\r\n- This deploy script will reset all caches at once.
\r\n
'
WHERE Phrase = 'la_title_SystemToolsDeploy';
-INSERT INTO SystemSettings VALUES(DEFAULT, 'EmailDelivery', '2', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_config_EmailDelivery', 'radio', NULL, '1=la_opt_EmailDeliveryQueue||2=la_opt_EmailDeliveryImmediate', 50.11, 0, 1, NULL);
+# Backported in http://jira.in-portal.org/browse/INP-1723.
+# INSERT INTO SystemSettings VALUES(DEFAULT, 'EmailDelivery', '2', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_config_EmailDelivery', 'radio', NULL, '1=la_opt_EmailDeliveryQueue||2=la_opt_EmailDeliveryImmediate', 50.11, 0, 1, NULL);
DELETE FROM UserPersistentSessionData WHERE VariableName = 'email-queue[Default]columns_.';