From a6f5f4e8400c6d242044d409c231ab929ebfe2c9 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 2 Oct 2024 16:42:28 +1300 Subject: [PATCH] API Update references to API which has been renamed --- code/Controllers/CMSMain.php | 2 +- code/Forms/SiteTreeURLSegmentField.php | 5 ----- .../CMS/Controllers/Includes/CMSMain_EditForm.ss | 4 ++-- .../CMS/Controllers/Includes/CMSPageAddController_Content.ss | 4 ++-- templates/SilverStripe/CMS/Search/Includes/SearchForm.ss | 4 ++-- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php index 61f3635a3a..a67c496a77 100644 --- a/code/Controllers/CMSMain.php +++ b/code/Controllers/CMSMain.php @@ -2137,7 +2137,7 @@ public function BatchActionParameters() $formHtml = ''; /** @var FormField $field */ foreach ($fieldList as $field) { - $formHtml .= $field->FieldHolder(); + $formHtml .= $field->renderFieldHolder(); } $forms[$urlSegment] = $formHtml; } diff --git a/code/Forms/SiteTreeURLSegmentField.php b/code/Forms/SiteTreeURLSegmentField.php index 75d582c01a..71ce88d17e 100644 --- a/code/Forms/SiteTreeURLSegmentField.php +++ b/code/Forms/SiteTreeURLSegmentField.php @@ -59,11 +59,6 @@ public function getAttributes() ); } - public function Field($properties = []) - { - return parent::Field($properties); - } - /** * @param HTTPRequest $request * @return string diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss index 3a85076f01..e177b6a1a0 100644 --- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss +++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss @@ -10,7 +10,7 @@
<% if $Legend %>$Legend<% end_if %> <% loop $Fields %> - $FieldHolder + $renderFieldHolder <% end_loop %>
@@ -20,7 +20,7 @@ <% if $Actions %>
<% loop $Actions %> - $FieldHolder + $renderFieldHolder <% end_loop %> <% if $Controller.LinkPreview %> diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss index b8e50ac91e..84d3bb6de7 100644 --- a/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss +++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss @@ -26,7 +26,7 @@
<% if $Legend %>$Legend<% end_if %> <% loop $Fields %> - $FieldHolder + $renderFieldHolder <% end_loop %>
@@ -35,7 +35,7 @@ <% if $Actions %>
<% loop $Actions %> - $Field + $renderField <% end_loop %>
<% end_if %> diff --git a/templates/SilverStripe/CMS/Search/Includes/SearchForm.ss b/templates/SilverStripe/CMS/Search/Includes/SearchForm.ss index 3be1463146..038c20cae0 100644 --- a/templates/SilverStripe/CMS/Search/Includes/SearchForm.ss +++ b/templates/SilverStripe/CMS/Search/Includes/SearchForm.ss @@ -6,10 +6,10 @@ <% end_if %>
<% loop $Fields %> - $FieldHolder + $renderFieldHolder <% end_loop %> <% loop $Actions %> - $Field + $renderField <% end_loop %>