Merge branch '5' into 6

silverstripe · Nov 14, 2024 · b77d664 · b77d664
2 parents cce5110 + d3cbca7
commit b77d664
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/Models/BaseElement.php b/src/Models/BaseElement.php
@@ -63,9 +63,12 @@ class BaseElement extends DataObject implements CMSPreviewable
      *
      * @config
      * @var string
+     * @deprecated 5.4.0 use class_description instead.
      */
     private static $description = 'Base element class';
 
+    private static $class_description = 'Base element class';
+
     /**
      * List of fields to exclude from CMS SiteTree seatch
      * @see ElementSiteTreeFilterSearch::applyDefaultFilters()

diff --git a/src/Models/ElementContent.php b/src/Models/ElementContent.php
@@ -23,8 +23,13 @@ class ElementContent extends BaseElement
 
     private static $plural_name = 'content blocks';
 
+    /**
+     * @deprecated 5.4.0 use class_description instead.
+     */
     private static $description = 'HTML text block';
 
+    private static $class_description = 'HTML text block';
+
     /**
      * Re-title the HTML field to Content
      *