Merge branch '5.0' into 5

silverstripe · Dec 12, 2024 · 7722449 · 7722449
2 parents ce73457 + 439cb19
commit 7722449
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/Model/Blog.php b/src/Model/Blog.php
@@ -142,7 +142,7 @@ class Blog extends Page implements PermissionProvider
 
     private static $class_description = 'Adds a blog to your website.';
 
-    private static $icon_class = 'font-icon-p-posts';
+    private static $cms_icon_class = 'font-icon-p-posts';
 
     /**
      * {@inheritdoc}

diff --git a/src/Model/BlogPost.php b/src/Model/BlogPost.php
@@ -51,10 +51,7 @@ class BlogPost extends Page
      */
     private static $table_name = 'BlogPost';
 
-    /**
-     * @var string
-     */
-    private static $icon_class = 'font-icon-p-post';
+    private static $cms_icon_class = 'font-icon-p-post';
 
     /**
      * @var array

diff --git a/yarn.lock b/yarn.lock
@@ -2172,9 +2172,9 @@ cosmiconfig@^9.0.0:
     parse-json "^5.2.0"
 
 cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.5.tgz#910aac880ff5243da96b728bc6521a5f6c2f2f82"
-  integrity sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"