tonyair/silverstripe-spamprotection
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-spamprotection.git synced 2024-10-22 14:05:59 +02:00
Code Issues Projects Releases Wiki Activity

Merged

Browse Source
This commit is contained in:
Will Rossiter 2013-04-05 21:13:26 +13:00
parent 4ad952fe99
commit bd5e778d4f
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
_config.php
View File

@ -9,7 +9,6 @@
* @package spamprotection * @package spamprotection
*/ */
<<<<<<< HEAD
/** /**
* If the comments module is installed then add the spam protection module * If the comments module is installed then add the spam protection module
* to the comments form via this extension. * to the comments form via this extension.
@ -17,13 +16,4 @@
* Place this line in your mysite/_config.php * Place this line in your mysite/_config.php
*/ */
// Object::add_extension('CommentingController', 'CommentSpamProtection'); // CommentingController::add_extension('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

5
composer.json
View File

@ -9,9 +9,8 @@
}, { }, {
"name": "Will Rossiter", "name": "Will Rossiter",
"email": "will@fullscreen.io" "email": "will@fullscreen.io"
} }],
],
"require": { "require": {
"silverstripe/framework": "3.*" "silverstripe/framework": "3.1.*"
} }
} }