tonyair
/
silverstripe-spamprotection
mirror of https://github.com/silverstripe/silverstripe-spamprotection.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merged

This commit is contained in:
Will Rossiter 2013-04-05 21:13:05 +13:00
parent f4917921ec
commit 4ad952fe99
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
_config.php
View File

@ -9,6 +9,7 @@
* @package spamprotection
*/
<<<<<<< HEAD
/**
* If the comments module is installed then add the spam protection module
* to the comments form via this extension.
@ -16,4 +17,13 @@
* Place this line in your mysite/_config.php
*/
// Object::add_extension('CommentingController', 'CommentSpamProtection');
// Object::add_extension('CommentingController', 'CommentSpamProtection');
=======
if(class_exists('Comment')) {
/**
* If the comments module is installed then add the spam protection module
* to the comments form via this extension
*/
CommentingController::add_extension('CommentSpamProtection');
}
>>>>>>> FIX: 3.1 extension API updates