Index: branches/5.0.x/core/install/upgrades.php
===================================================================
diff -u -r12299 -r12422
--- branches/5.0.x/core/install/upgrades.php (.../upgrades.php) (revision 12299)
+++ branches/5.0.x/core/install/upgrades.php (.../upgrades.php) (revision 12422)
@@ -1,6 +1,6 @@
Conn->Query($sql);
}
}
+
+ /**
+ * Update to 5.0.1
+ *
+ * @param string $mode when called mode {before, after)
+ */
+ function Upgrade_5_0_1($mode)
+ {
+ if ($mode == 'after') {
+
+ // delete old events
+ $events_to_delete = Array ( '"CATEGORY.MODIFY"', '"CATEGORY.DELETE"' );
+ $sql = 'SELECT EventId
+ FROM ' . TABLE_PREFIX . 'Events
+ WHERE Event IN (' . implode(',', $events_to_delete) . ')';
+ $event_ids = $this->Conn->GetCol($sql);
+
+ if ($event_ids) {
+ $sql = 'DELETE FROM EmailMessages WHERE EventId IN (' . implode(',', $event_ids) . ')';
+ $this->Conn->Query($sql);
+
+ $sql = 'DELETE FROM Events WHERE EventId IN (' . implode(',', $event_ids) . ')';
+ $this->Conn->Query($sql);
+ }
+ }
+ }
+
}
\ No newline at end of file
Index: branches/5.0.x/core/install/upgrades.sql
===================================================================
diff -u -r12419 -r12422
--- branches/5.0.x/core/install/upgrades.sql (.../upgrades.sql) (revision 12419)
+++ branches/5.0.x/core/install/upgrades.sql (.../upgrades.sql) (revision 12422)
@@ -1472,4 +1472,6 @@
ADD BrowserSignature VARCHAR(32) NOT NULL,
ADD INDEX (BrowserSignature);
+DELETE FROM Phrase WHERE Phrase IN ('la_event_category.modify', 'la_event_category_delete');
+
UPDATE Modules SET Version = '5.0.1', Loaded = 1 WHERE Name = 'In-Portal';
\ No newline at end of file
Index: branches/5.0.x/core/install/english.lang
===================================================================
diff -u -r12399 -r12422
--- branches/5.0.x/core/install/english.lang (.../english.lang) (revision 12399)
+++ branches/5.0.x/core/install/english.lang (.../english.lang) (revision 12422)
@@ -20,9 +20,9 @@
RGVsZXRl
RG93bg==
RWRpdA==
- RWRpdCBibG9jaw==
- RWRpdCBjb250ZW50
- RWRpdCBkZXNpZ24=
+ RWRpdCBCbG9jaw==
+ RWRpdCBDb250ZW50
+ RWRpdCBEZXNpZ24=
TW92ZSBEb3du
TW92ZSBVcA==
U2F2ZQ==
@@ -107,7 +107,7 @@
TWVzc2FnZSBIdG1s
TWVzc2FnZSBUZXh0
TWlzc3BlbGxlZCBXb3Jk
- TGFzdCBVcGRhdGVk
+ TW9kaWZpZWQgT24=
TW9kdWxl
TmFtZQ==
TmV4dCBSdW4gT24=
@@ -121,6 +121,7 @@
UGVybWlzc2lvbiBOYW1l
QWNjZXNz
Vmlldw==
+ UGhyYXNl
VHlwZQ==
VXNlciBJRA==
UHJlZml4
@@ -133,8 +134,9 @@
UmF0aW5n
UmVmZXJlcg==
UmVsYXRpb24gVHlwZQ==
- Q29tbWVudCBDb3VudA==
- Q29tbWVudGVkIEJ5
+ UmVzZXQgdG8gZGVmYXVsdA==
+ Q29tbWVudHM=
+ Q3JlYXRlZCBieQ==
Q29tbWVudA==
UnVsZSBUeXBl
UnVuIEludGVydmFs
@@ -146,6 +148,7 @@
U2Vzc2lvbiBMb2cgSUQ=
U2Vzc2lvbiBTdGFydA==
TmFtZQ==
+ U29ydCBieQ==
U3RhdHVz
U3RvcCBXb3Jk
U3ViamVjdA==
@@ -515,12 +518,10 @@
RmllbGQgaXMgcmVxdWlyZWQ=
RmllbGQgdmFsdWUgbXVzdCBiZSB1bmlxdWU=
RmllbGQgaXMgb3V0IG9mIHJhbmdlLCBwb3NzaWJsZSB2YWx1ZXMgZnJvbSAlcyB0byAlcw==
- QWRkIFNlY3Rpb24=
- QWRkIFBlbmRpbmcgU2VjdGlvbg==
- QXBwcm92ZSBTZWN0aW9u
- RGVueSBTZWN0aW9u
- TW9kaWZ5IFNlY3Rpb24=
- RGVsZXRlIFNlY3Rpb24=
+ QWRkIENhdGVnb3J5
+ QWRkIFBlbmRpbmcgQ2F0ZWdvcnk=
+ QXBwcm92ZSBDYXRlZ29yeQ==
+ RGVueSBDYXRlZ29yeQ==
Q29tbW9uIEZvb3RlciBUZW1wbGF0ZQ==
VGhpcyBlLW1haWwgaXMgc2VudCB0byBhIHVzZXIgYWZ0ZXIgZmlsbGluZyBpbiB0aGUgQ29udGFjdCBVcyBmb3Jt
QWRkIExpbms=
@@ -741,7 +742,7 @@
UHJpbWFyeQ==
UHJpbWFyeSBTZWN0aW9u
UHJpbWFyeQ==
- UHJpbWFyeSBUcmFuc2xhdGlvbg==
+ UHJpbWFyeSBMYW5ndWFnZSBQaHJhc2U=
T3JkZXI=
UmF0aW5n
S2V5d29yZA==
@@ -787,7 +788,7 @@
VG8=
VG9w
VHJhY2tpbmcgQ29kZQ==
- VmFsdWU=
+ UGhyYXNl
VHlwZQ==
TWVhc3VyZXMgU3lzdGVt
VXBsb2FkIEZpbGUgRnJvbSBMb2NhbCBQQw==
@@ -814,7 +815,7 @@
Q1NWIEZpbGVz
SW1hZ2UgRmlsZXM=
SG90
- aHRtbA==
+ SFRNTA==
SUQgRmllbGQ=
RW5hYmxpbmcgdGhpcyBvcHRpb24gd2lsbCB1bmRvIGFueSBjaGFuZ2VzIHlvdSBoYXZlIG1hZGUgdG8gZXhpc3RpbmcgcGhyYXNlcw==
SW52YWxpZCBFLU1haWw=
@@ -1119,7 +1120,7 @@
Q2xvbmU=
Q2xvbmU=
Q29udGludWU=
- TW9kaWZ5
+ RWRpdA==
RXhwb3J0
R28gVXA=
SW1wb3J0
@@ -1216,7 +1217,7 @@
U2VjdGlvbnM=
Q2hhbmdlcyBMb2c=
Rm9ybXM=
- Q29tbXVuaXR5
+ VXNlciBNYW5hZ2VtZW50
Q3VzdG9tIEZpZWxkcw==
RS1tYWls
R2VuZXJhbCBTZXR0aW5ncw==
@@ -1360,7 +1361,7 @@
QWRkaXRpb25hbCBQZXJtaXNzaW9ucw==
QWRtaW5pc3RyYXRvcnM=
QWR2YW5jZWQ=
- QWR2YW5jZWQgVmlldw==
+ U2hvd2luZyBhbGwgcmVnYXJkbGVzcyBvZiBTdHJ1Y3R1cmU=
QWdlbnRz
QmFzZSBTdHlsZXM=
QmxvY2sgU3R5bGVz
@@ -1436,7 +1437,7 @@
TmV3IFN0eWxlc2hlZXQ=
Tm8gUGVybWlzc2lvbnM=
UGVybWlzc2lvbnM=
- VHJhbnNsYXRpb25z
+ TGFiZWxzICYgUGhyYXNlcw==
UGxlYXNlIFdhaXQ=
UHJvcGVydGllcw==
UmVsYXRlZCBTZWFyY2hlcw==
@@ -1996,7 +1997,7 @@
VW5zdWJzY3JpcHRpb24gQ29uZmlybWVk
VXNlciBQcm9maWxl
VXNlciBSZWdpc3RyYXRpb24=
- V2VsY29tZSB0byBJbi1Qb3J0YWw=
+ V2VsY29tZSB0byBJbi1Qb3J0YWwh
VG90YWwgQ2F0ZWdvcmllcw==
VW5zdWJzY3JpcHRpb24gQ29uZmlybWF0aW9u
QXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIHVuc3Vic2NyaWJlIGZyb20gb3VyIG1haWxpbmcgbGlzdD8gKFlvdSBjYW4gYWx3YXlzIHN1YnNjcmliZSBhZ2FpbiBieSBlbnRlcmluZyB5b3VyIGVtYWlsIGF0IHRoZSBob21lIHBhZ2Up
@@ -2029,12 +2030,8 @@
U3ViamVjdDogU3VnZ2VzdGVkIENhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIGlzIFBlbmRpbmcKCkEgY2F0ZWdvcnkgIjxpbnAyOmNfRmllbGQgbmFtZT0iTmFtZSIvPiIgaGFzIGJlZW4gYWRkZWQsIHBlbmRpbmcgeW91ciBjb25maXJtYXRpb24uICBQbGVhc2UgcmV2aWV3IHRoZSBjYXRlZ29yeSBhbmQgYXBwcm92ZSBvciBkZW55IGl0Lg==
U3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBhcHByb3ZlZAoKWW91ciBzdWdnZXN0ZWQgY2F0ZWdvcnkgIjxpbnAyOmNfRmllbGQgbmFtZT0iTmFtZSIvPiIgaGFzIGJlZW4gYXBwcm92ZWQu
U3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBhcHByb3ZlZAoKQSBjYXRlZ29yeSAiPGlucDI6Y19GaWVsZCBuYW1lPSJOYW1lIi8+IiBoYXMgYmVlbiBhcHByb3ZlZC4=
- U3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBkZWxldGVkCgpBIGNhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIGhhcyBiZWVuIGRlbGV0ZWQu
- U3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBkZWxldGVkCgpBIGNhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIGhhcyBiZWVuIGRlbGV0ZWQu
U3ViamVjdDogWW91ciBDYXRlZ29yeSAiPGlucDI6Y19GaWVsZCBuYW1lPSJOYW1lIi8+IiBoYXMgYmVlbiBEZW5pZWQKCllvdXIgY2F0ZWdvcnkgc3VnZ2VzdGlvbiAiPGlucDI6Y19GaWVsZCBuYW1lPSJOYW1lIi8+IiBoYXMgYmVlbiBkZW5pZWQu
U3ViamVjdDogQ2F0ZWdvcnkgIjxpbnAyOmNfRmllbGQgbmFtZT0iTmFtZSIvPiIgaGFzIGJlZW4gRGVuaWVkCgpOZXcgY2F0ZWdvcnkgc3VnZ2VzdGlvbiAiPGlucDI6Y19GaWVsZCBuYW1lPSJOYW1lIi8+IiBoYXMgYmVlbiBkZW5pZWQu
- U3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBtb2RpZmllZAoKWW91ciBzdWdnZXN0ZWQgY2F0ZWdvcnkgIjxpbnAyOmNfRmllbGQgbmFtZT0iTmFtZSIvPiIgaGFzIGJlZW4gbW9kaWZpZWQu
- U3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBtb2RpZmllZAoKQSBjYXRlZ29yeSAiPGlucDI6Y19GaWVsZCBuYW1lPSJOYW1lIi8+IiBoYXMgYmVlbiBtb2RpZmllZC4=
U3ViamVjdDogQ29tbW9uIEZvb3RlciBUZW1wbGF0ZQoKPGJyLz48YnIvPg0KDQpTaW5jZXJlbHksPGJyLz48YnIvPg0KDQpXZWJzaXRlIGFkbWluaXN0cmF0aW9uLg==
U3ViamVjdDogVGhhbmsgWW91IGZvciBDb250YWN0aW5nIFVzIQoKPHA+VGhhbmsgeW91IGZvciBjb250YWN0aW5nIHVzLiBXZSdsbCBiZSBpbiB0b3VjaCB3aXRoIHlvdSBzaG9ydGx5ITwvcD4=
U3ViamVjdDogTmV3IGZvcm0gc3VibWlzc2lvbgoKPHA+Rm9ybSBoYXMgYmVlbiBzdWJtaXR0ZWQuIFBsZWFzZSBwcm9jZWVkIHRvIHRoZSBBZG1pbiBDb25zb2xlIHRvIHJldmlldyB0aGUgc3VibWlzc2lvbiE8L3A+
Index: branches/5.0.x/core/install/install_data.sql
===================================================================
diff -u -r12419 -r12422
--- branches/5.0.x/core/install/install_data.sql (.../install_data.sql) (revision 12419)
+++ branches/5.0.x/core/install/install_data.sql (.../install_data.sql) (revision 12422)
@@ -247,10 +247,6 @@
INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category.add.pending', 0);
INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 1, NULL, 'Core:Category', 'la_event_category.add.pending', 1);
INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.ADD', NULL, 1, 1, NULL, 'Core:Category', 'la_event_category.add', 1);
-INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.DELETE', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category_delete', 0);
-INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.DELETE', NULL, 1, 1, NULL, 'Core:Category', 'la_event_category_delete', 1);
-INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.MODIFY', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category.modify', 0);
-INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.MODIFY', NULL, 1, 1, NULL, 'Core:Category', 'la_event_category.modify', 1);
INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.APPROVE', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category.approve', 0);
INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.APPROVE', NULL, 1, 1, NULL, 'Core:Category', 'la_event_category.approve', 1);
INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.DENY', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category.deny', 0);