From b0b5fea3f5bd68e2bd87006291f5e57feab29db9 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Sat, 29 Oct 2011 17:10:02 +1300 Subject: [PATCH] MINOR: Removed use of deprecated securityTokenEnable. --- forms/FormField.php | 4 +++- forms/TableListField.php | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/forms/FormField.php b/forms/FormField.php index 8343e1460..054663ef3 100644 --- a/forms/FormField.php +++ b/forms/FormField.php @@ -334,7 +334,9 @@ class FormField extends RequestHandler { * @return bool */ public function securityTokenEnabled() { - return $this->getForm() && $this->getForm()->securityTokenEnabled(); + $form = $this->getForm(); + if(!$form) return false; + return $form->getSecurityToken()->isEnabled(); } /** diff --git a/forms/TableListField.php b/forms/TableListField.php index 876cdbefd..bf95343d8 100644 --- a/forms/TableListField.php +++ b/forms/TableListField.php @@ -1177,7 +1177,7 @@ JS $parentUrlParts = parse_url(parent::Link($action)); $queryPart = (isset($parentUrlParts['query'])) ? '?' . $parentUrlParts['query'] : null; // Ensure that URL actions not routed through Form->httpSubmission() are protected against CSRF attacks. - if($form->securityTokenEnabled()) $queryPart = $token->addtoUrl($queryPart); + if($token->isEnabled()) $queryPart = $token->addtoUrl($queryPart); return Controller::join_links($parentUrlParts['path'], $queryPart); } else { // allow for instanciation of this FormField outside of a controller/form @@ -1416,7 +1416,7 @@ class TableListField_Item extends ViewableData { $parentUrlParts = parse_url($this->parent->Link()); $queryPart = (isset($parentUrlParts['query'])) ? '?' . $parentUrlParts['query'] : null; // Ensure that URL actions not routed through Form->httpSubmission() are protected against CSRF attacks. - if($form->securityTokenEnabled()) $queryPart = $token->addtoUrl($queryPart); + if($token->isEnabled()) $queryPart = $token->addtoUrl($queryPart); return Controller::join_links($parentUrlParts['path'], 'item', $this->item->ID, $action, $queryPart); } else { // allow for instanciation of this FormField outside of a controller/form