tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-06-29 07:59:31 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: pass $allowHTML through to DatalessField. PATCH via escaped (#4822)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@95199 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
wrossiter 2009-12-14 22:55:18 +00:00 committed by Sam Minnee
parent 2505fbf834
commit 8b8199f1f0
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.mergesources.yml
View File

@ -5,4 +5,14 @@ trunk:
.: /open/phpinstaller/trunk
sapphire: /open/modules/sapphire/trunk
cms: /open/modules/cms/trunk
jsparty: /open/modules/jsparty/trunk
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

4
mysite/_config.php
View File

@ -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();
SiteTree::enable_nested_urls();
MathSpamProtection::setEnabled(true);