Index: branches/5.1.x/core/install/upgrades.sql
===================================================================
diff -u -N -r13773 -r13780
--- branches/5.1.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 13773)
+++ branches/5.1.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 13780)
@@ -1623,7 +1623,7 @@
 # ===== v 5.0.2 =====
 
 # ===== v 5.0.3-B1 =====
-ALTER TABLE	PermCache ADD INDEX (ACL);
+ALTER TABLE PermCache ADD INDEX (ACL);
 
 INSERT INTO ConfigurationAdmin VALUES ('cms_DefaultTrackingCode', 'la_section_SettingsWebsite', 'la_config_DefaultTrackingCode', 'textarea', NULL, 'COLS=40 ROWS=5', 10.10, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'cms_DefaultTrackingCode', '', 'In-Portal', 'in-portal:configure_advanced');
@@ -1669,7 +1669,9 @@
 );
 
 UPDATE Events SET Description = l1_Description;
-ALTER TABLE Events DROP l1_Description;
+ALTER TABLE Events
+	DROP l1_Description,
+	CHANGE Description Description TEXT NULL;
 
 DELETE FROM Phrase WHERE Phrase LIKE 'la_event_%';
 DELETE FROM PersistantSessionData WHERE VariableName = 'phrases_columns_.';
@@ -1708,7 +1710,7 @@
   KEY DomainId (DomainId)
 );
 
-INSERT INTO ConfigurationAdmin VALUES ('CacheHandler', 'la_section_SettingsCaching', 'la_config_CacheHandler', 'select', NULL, 'Fake=la_None,Memcache=+Memcached,Apc=+Alternative PHP Cache,XCache=+XCache', 80.01, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('CacheHandler', 'la_section_SettingsCaching', 'la_config_CacheHandler', 'select', NULL, 'Fake=la_None||Memcache=+Memcached||Apc=+Alternative PHP Cache||XCache=+XCache', 80.01, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CacheHandler', 'Fake', 'In-Portal', 'in-portal:configure_advanced');
 
 ALTER TABLE ConfigurationValues
@@ -1877,21 +1879,6 @@
 UPDATE ConfigurationValues SET ValueList = NULL, DisplayOrder = 20.02 WHERE VariableName = 'Config_Site_Time';
 UPDATE ConfigurationValues SET VariableValue = '' WHERE VariableName = 'Config_Site_Time' AND VariableValue = 14;
 
-ALTER TABLE Events
-	ADD AllowChangingSender TINYINT NOT NULL DEFAULT '0' AFTER ReplacementTags ,
-	ADD CustomSender TINYINT NOT NULL DEFAULT '0' AFTER AllowChangingSender ,
-	ADD SenderName VARCHAR(255) NOT NULL DEFAULT '' AFTER CustomSender ,
-	ADD SenderAddressType TINYINT NOT NULL DEFAULT '0' AFTER SenderName ,
-	ADD SenderAddress VARCHAR(255) NOT NULL DEFAULT '' AFTER SenderAddressType ,
-	ADD AllowChangingRecipient TINYINT NOT NULL DEFAULT '0' AFTER SenderAddress ,
-	ADD CustomRecipient TINYINT NOT NULL DEFAULT '0' AFTER AllowChangingRecipient ,
-	ADD Recipients TEXT AFTER CustomRecipient,
-	ADD INDEX (AllowChangingSender),
-	ADD INDEX (CustomSender),
-	ADD INDEX (SenderAddressType),
-	ADD INDEX (AllowChangingRecipient),
-	ADD INDEX (CustomRecipient);
-
 UPDATE Events SET AllowChangingSender = 1, AllowChangingRecipient = 1;
 UPDATE Events SET Module = 'Core' WHERE Module LIKE 'Core:%';