From c20788e75a4c048b645a7281166dedcdfab9a016 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Thu, 17 Sep 2009 04:24:21 +0000
Subject: [PATCH] MINOR: merged r86573 into trunk

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@86574 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/sitefeatures/PageCommentInterface.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index 6e8e1086..a8602a6e 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -182,15 +182,8 @@ class PageCommentInterface extends RequestHandler {
 		
 		// Optional Spam Protection.
 		if(class_exists('SpamProtectorManager')) {
-			// Update the form to add the protecter field to it
-			$protecter = SpamProtectorManager::update_form($form);
-			if($protecter) {
-				$protecter->setFieldMapping('Name', 'Comment');
-				
-				// Because most of the Spam Protection will need to query another service
-				// disable ajax commenting
-				self::set_use_ajax_commenting(false);
-			}
+			SpamProtectorManager::update_form($form, null, array('Name', 'CommenterURL', 'Comment'));
+			self::set_use_ajax_commenting(false);
 		}
 		
 		// Shall We use AJAX?
@@ -205,7 +198,7 @@ class PageCommentInterface extends RequestHandler {
 		$form->loadDataFrom(array(
 			"Name" => Cookie::get("PageCommentInterface_Name"),
 			"Comment" => Cookie::get("PageCommentInterface_Comment"),
-			"URL" => Cookie::get("PageCommentInterface_CommenterURL")	
+			"CommenterURL" => Cookie::get("PageCommentInterface_CommenterURL")	
 		));
 		
 		return $form;