tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

MINOR: Removed use of deprecated securityTokenEnable.

Browse Source
This commit is contained in:
Sam Minnee 2011-10-29 17:10:02 +13:00
parent 42b8d3da04
commit b0b5fea3f5
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
forms/FormField.php
View File

@ -334,7 +334,9 @@ class FormField extends RequestHandler {
* @return bool * @return bool
*/ */
public function securityTokenEnabled() { public function securityTokenEnabled() {
return $this->getForm() && $this->getForm()->securityTokenEnabled(); $form = $this->getForm();
if(!$form) return false;
return $form->getSecurityToken()->isEnabled();
} }
/** /**

4
forms/TableListField.php
View File

@ -1177,7 +1177,7 @@ JS
$parentUrlParts = parse_url(parent::Link($action)); $parentUrlParts = parse_url(parent::Link($action));
$queryPart = (isset($parentUrlParts['query'])) ? '?' . $parentUrlParts['query'] : null; $queryPart = (isset($parentUrlParts['query'])) ? '?' . $parentUrlParts['query'] : null;
// Ensure that URL actions not routed through Form->httpSubmission() are protected against CSRF attacks. // 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); return Controller::join_links($parentUrlParts['path'], $queryPart);
} else { } else {
// allow for instanciation of this FormField outside of a controller/form // 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()); $parentUrlParts = parse_url($this->parent->Link());
$queryPart = (isset($parentUrlParts['query'])) ? '?' . $parentUrlParts['query'] : null; $queryPart = (isset($parentUrlParts['query'])) ? '?' . $parentUrlParts['query'] : null;
// Ensure that URL actions not routed through Form->httpSubmission() are protected against CSRF attacks. // 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); return Controller::join_links($parentUrlParts['path'], 'item', $this->item->ID, $action, $queryPart);
} else { } else {
// allow for instanciation of this FormField outside of a controller/form // allow for instanciation of this FormField outside of a controller/form