mirror of
https://github.com/silverstripe/silverstripe-spamprotection.git
synced 2024-10-22 14:05:59 +02:00
Merged
This commit is contained in:
parent
f4917921ec
commit
4ad952fe99
10
_config.php
10
_config.php
@ -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.
|
||||
@ -17,3 +18,12 @@
|
||||
*/
|
||||
|
||||
// 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
|
||||
|
Loading…
Reference in New Issue
Block a user