diff --git a/.mergesources.yml b/.mergesources.yml index bc71aae..d9d7e2e 100644 --- a/.mergesources.yml +++ b/.mergesources.yml @@ -5,4 +5,14 @@ trunk: .: /open/phpinstaller/trunk sapphire: /open/modules/sapphire/trunk cms: /open/modules/cms/trunk - jsparty: /open/modules/jsparty/trunk \ No newline at end of file + jsparty: /open/modules/jsparty/trunk + +wcc: + sapphire: /modules/sapphire/branches/2.4-wcc + cms: /modules/cms/branches/2.4-wcc + jsparty: /modules/jsparty/branches/2.4-wcc + +wc: + sapphire: /modules/sapphire/branches/2.3.1-womenconf + cms: /modules/cms/branches/2.3.1-womenconf + jsparty: /modules/jsparty/branches/2.3.1-womenconf \ No newline at end of file diff --git a/mysite/_config.php b/mysite/_config.php index ba9066a..c1f46e8 100644 --- a/mysite/_config.php +++ b/mysite/_config.php @@ -15,4 +15,6 @@ MySQLDatabase::set_connection_charset('utf8'); SSViewer::set_theme('blackcandy'); // enable nested URLs for this site (e.g. page/sub-page/) -SiteTree::enable_nested_urls(); \ No newline at end of file +SiteTree::enable_nested_urls(); + +MathSpamProtection::setEnabled(true); \ No newline at end of file