Merge branch '3.0' into 3.1

src/Model/BlogController.php

@@ -396,9 +396,9 @@ class BlogController extends PageController
             if ($this->owner->getArchiveDay()) {
                 $date = $this->owner->getArchiveDate()->Nice();
             } elseif ($this->owner->getArchiveMonth()) {
-                $date = $this->owner->getArchiveDate()->format('F, Y');
+                $date = $this->owner->getArchiveDate()->format('MMMM, y');
             } else {
-                $date = $this->owner->getArchiveDate()->format('Y');
+                $date = $this->owner->getArchiveDate()->format('y');
             }
 
             $items[] = _t(

src/Model/BlogMemberExtension.php

@@ -8,6 +8,7 @@ use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\GridField\GridField;
 use SilverStripe\Forms\GridField\GridFieldAddNewButton;
 use SilverStripe\Forms\Tab;
+use SilverStripe\Forms\TextareaField;
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\Security\Member;
 use SilverStripe\View\Parsers\URLSegmentFilter;
@@ -108,7 +109,6 @@ class BlogMemberExtension extends DataExtension
         $fields->removeByName('URLSegment');
 
         // Remove the automatically-generated posts tab.
-
         $fields->removeFieldFromTab('Root', 'BlogPosts');
 
         // Construct a better posts tab.
@@ -131,6 +131,13 @@ class BlogMemberExtension extends DataExtension
 
         $fields->addFieldToTab('Root', $tab);
 
+        // Ensure blog fields are added after defaults
+        $fields->addFieldToTab(
+            'Root.Main',
+            TextareaField::create('BlogProfileSummary'),
+            'BlogProfileImage'
+        );
+
         return $fields;
     }
 }

templates/SilverStripe/Blog/Model/Layout/Blog.ss

@@ -9,9 +9,9 @@
 				<% if $ArchiveDay %>
 					$ArchiveDate.Nice
 				<% else_if $ArchiveMonth %>
-					$ArchiveDate.format('F, Y')
+					$ArchiveDate.format('MMMM, y')
 				<% else %>
-					$ArchiveDate.format('Y')
+					$ArchiveDate.format('y')
 				<% end_if %>
 			<% else_if $CurrentTag %>
 				<%t SilverStripe\\Blog\\Model\\Blog.Tag 'Tag' %>: $CurrentTag.Title