Correcting an issue that was preventing new media page creation.

nglasl · Aug 24, 2016 · 17e6ad2 · 17e6ad2
1 parent 7a5c027
commit 17e6ad2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/code/pages/MediaPage.php b/code/pages/MediaPage.php
@@ -178,7 +178,7 @@ public function getCMSFields() {
 					$fields->insertAfter('Date', $custom = DateField::create(
 						"{$attribute->ID}_MediaAttribute",
 						$attribute->Title,
-						date('d/m/Y', strtotime($attribute->Content))
+						$attribute->Content ? date('d/m/Y', strtotime($attribute->Content)) : null
 					)->setConfig('showcalendar', true)->setConfig('dateformat', 'dd/MM/YYYY'));
 				}
 				else {
@@ -236,7 +236,7 @@ public function validate() {
 
 		// The URL segment will conflict with a year/month/day/media format when numeric.
 
-		if(is_numeric($this->URLSegment) || !($parent instanceof MediaHolder) || ($parent->MediaTypeID != $this->MediaTypeID)) {
+		if(is_numeric($this->URLSegment) || !($parent instanceof MediaHolder) || ($this->MediaTypeID && ($parent->MediaTypeID != $this->MediaTypeID))) {
 
 			// Customise a validation error message.