Index: branches/5.2.x/core/install/install_data.sql
===================================================================
diff -u -r14944 -r14964
--- branches/5.2.x/core/install/install_data.sql (.../install_data.sql) (revision 14944)
+++ branches/5.2.x/core/install/install_data.sql (.../install_data.sql) (revision 14964)
@@ -122,8 +122,6 @@
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'User_Default_Registration_Country', '', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_config_DefaultRegistrationCountry', 'select', NULL, '=+||SELECT l%3$s_Name AS OptionName, CountryStateId AS OptionValue FROM CountryStates WHERE Type = 1 ORDER BY OptionName', 10.13, 0, 0, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'AllowSelectGroupOnFront', '0', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_config_AllowSelectGroupOnFront', 'checkbox', NULL, NULL, 10.14, 0, 0, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'DefaultSettingsUserId', '-1', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_prompt_DefaultUserId', 'text', NULL, NULL, 10.15, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'User_Votes_Deny', '5', 'In-Portal:Users', 'in-portal:configure_users', 'la_Text_Restrictions', 'la_users_votes_deny', 'text', '', '', 20.01, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'User_Review_Deny', '5', 'In-Portal:Users', 'in-portal:configure_users', 'la_Text_Restrictions', 'la_users_review_deny', 'text', '', '', 20.02, 0, 1, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'u_MaxImageCount', '5', 'In-Portal:Users', 'in-portal:configure_users', 'la_section_ImageSettings', 'la_config_MaxImageCount', 'text', '', '', 30.01, 0, 0, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'u_ThumbnailImageWidth', '120', 'In-Portal:Users', 'in-portal:configure_users', 'la_section_ImageSettings', 'la_config_ThumbnailImageWidth', 'text', '', '', 30.02, 0, 0, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'u_ThumbnailImageHeight', '120', 'In-Portal:Users', 'in-portal:configure_users', 'la_section_ImageSettings', 'la_config_ThumbnailImageHeight', 'text', '', '', 30.03, 0, 0, NULL);
Index: branches/5.2.x/core/install/upgrades.sql
===================================================================
diff -u -r14954 -r14964
--- branches/5.2.x/core/install/upgrades.sql (.../upgrades.sql) (revision 14954)
+++ branches/5.2.x/core/install/upgrades.sql (.../upgrades.sql) (revision 14964)
@@ -2497,3 +2497,9 @@
UPDATE Phrase
SET l<%PRIMARY_LANGUAGE%>_ColumnTranslation = l<%PRIMARY_LANGUAGE%>_Translation
WHERE PhraseKey IN ('LA_FLD_ADDRESSLINE1', 'LA_FLD_ADDRESSLINE2', 'LA_FLD_CITY', 'LA_FLD_COMPANY', 'LA_FLD_FAX', 'LA_FLD_STATE', 'LA_FLD_ZIP');
+
+DELETE FROM Phrase
+WHERE PhraseKey IN ('LA_TEXT_RESTRICTIONS', 'LA_USERS_REVIEW_DENY', 'LA_USERS_VOTES_DENY');
+
+DELETE FROM ConfigurationValues
+WHERE VariableName IN ('User_Review_Deny', 'User_Votes_Deny');
Index: branches/5.2.x/core/install/english.lang
===================================================================
diff -u -r14954 -r14964
--- branches/5.2.x/core/install/english.lang (.../english.lang) (revision 14954)
+++ branches/5.2.x/core/install/english.lang (.../english.lang) (revision 14964)
@@ -693,7 +693,6 @@
QW5kIHRoZW4gYnk=
T3JkZXIgbGlua3MgYnk=
VVJM
- RGlzcGxheSBsaW5rIFVSTCBpbiBzdGF0dXMgYmFy
TGludXg=
TG9jYWw=
TG9jYWwgSW1hZ2U=
@@ -1204,7 +1203,6 @@
cmVjb3JkcyB1cGRhdGVk
UmVxdWlyZWQgZmllbGRz
SGVyZSB5b3UgY2FuIHJlc3RvcmUgeW91ciBkYXRhYmFzZSBmcm9tIGEgcHJldmlvdXNseSBiYWNrZWQgdXAgc25hcHNob3QuIFJlc3RvcmluZyB5b3VyIGRhdGFiYXNlIHdpbGwgZGVsZXRlIGFsbCBvZiB5b3VyIGN1cnJlbnQgZGF0YSBhbmQgbG9nIHlvdSBvdXQgb2YgdGhlIHN5c3RlbS4=
- UmVzdHJpY3Rpb25z
Q29tbWVudA==
Q29tbWVudHM=
TW9kdWxlIFJvb3QgU2VjdGlvbg==
@@ -1526,9 +1524,7 @@
QXNzaWduIHVzZXJzIG5vdCBsb2dnZWQgaW4gdG8gZ3JvdXA=
QXNzaWduIHJlZ2lzdGVyZWQgdXNlcnMgdG8gZ3JvdXA=
QXNzaWduIHBhc3N3b3JkIGF1dG9tYXRpY2FsbHk=
- TnVtYmVyIG9mIGRheXMgdG8gZGVueSBtdWx0aXBsZSBDb21tZW50cyBmcm9tIHRoZSBzYW1lIHVzZXI=
QXNzaWduIG1haWxpbmcgbGlzdCBzdWJzY3JpYmVycyB0byBncm91cA==
- TnVtYmVyIG9mIGRheXMgdG8gZGVueSBtdWx0aXBsZSB2b3RlcyBmcm9tIHRoZSBzYW1lIHVzZXI=
VVMvVUs=
RS1tYWlsIGFkZHJlc3M=
VmFsdWU=