Fix: Calendar block: Always show current month for non post types on …

…the editor
WordPress · Feb 14, 2019 · 5ae3e6d · 5ae3e6d
1 parent c6255ed
commit 5ae3e6d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packages/block-library/src/calendar/edit.js b/packages/block-library/src/calendar/edit.js
@@ -61,7 +61,16 @@ class CalendarEdit extends Component {
 }
 
 export default withSelect( ( select ) => {
+	const {
+		getEditedPostAttribute,
+	} = select( 'core/editor' );
+	const postType = getEditedPostAttribute( 'type' );
+	// Dates are used to overwrite year and month used on the calendar.
+	// This overwrite should only happen for 'post' post types.
+	// For other post types the calendar always displays the current month.
 	return {
-		date: select( 'core/editor' ).getEditedPostAttribute( 'date' ),
+		date: postType === 'post' ?
+			getEditedPostAttribute( 'date' ) :
+			undefined,
 	};
 } )( CalendarEdit );
diff --git a/packages/block-library/src/calendar/index.php b/packages/block-library/src/calendar/index.php
@@ -13,7 +13,7 @@
  * @return string Returns the block content.
  */
 function render_block_core_calendar( $attributes ) {
-	global $monthnum, $year, $post;
+	global $monthnum, $year;
 	$previous_monthnum = $monthnum;
 	$previous_year     = $year;