Merge pull request #265 from tractorcow/pulls/fix-parent

BUG Fix BlogPost crashing when created under a non-blog parent
silverstripe · Jun 4, 2015 · 0522b1b · 0522b1b
2 parents 1430018 + 0941b4e
commit 0522b1b
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/code/model/BlogPost.php b/code/model/BlogPost.php
@@ -222,21 +222,30 @@ public function getCMSFields() {
 			$publishDate = DatetimeField::create('PublishDate', _t('BlogPost.PublishDate', 'Publish Date'));
 			$publishDate->getDateField()->setConfig('showcalendar', true);
 
+			// Get categories and tags
+			$parent = $self->Parent();
+			$categories = $parent instanceof Blog
+				? $parent->Categories()
+				: BlogCategory::get();
+			$tags = $parent instanceof Blog
+				? $parent->Tags()
+				: BlogTag::get();
+
 			$options = BlogAdminSidebar::create(
 				$publishDate,
 				$urlSegment,
 				TagField::create(
 					'Categories',
 					_t('BlogPost.Categories', 'Categories'),
-					$self->Parent()->Categories(),
+					$categories,
 					$self->Categories()
 				)
 					->setCanCreate($self->canCreateCategories())
 					->setShouldLazyLoad(true),
 				TagField::create(
 					'Tags',
 					_t('BlogPost.Tags', 'Tags'),
-					$self->Parent()->Tags(),
+					$tags,
 					$self->Tags()
 				)
 					->setCanCreate($self->canCreateTags())