From adaee2cfa8acde7b405ff46247f85a3f39a7c177 Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@a8c.com>
Date: Mon, 7 Sep 2020 11:41:55 +1200
Subject: [PATCH] Fix error with defaultColumnsNumber when attributes.ids is
 not set Make InnerBlocks self closing in save method

---
 packages/block-library/src/gallery/gallery.js | 2 +-
 packages/block-library/src/gallery/shared.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/gallery/gallery.js b/packages/block-library/src/gallery/gallery.js
index 44c943d1bdcb1..2ab4cbba4ae28 100644
--- a/packages/block-library/src/gallery/gallery.js
+++ b/packages/block-library/src/gallery/gallery.js
@@ -48,7 +48,7 @@ export const Gallery = ( props ) => {
 				__experimentalItemCallback={ ( item ) => (
 					<li className="wp-block-gallery__image">{ item }</li>
 				) }
-			></InnerBlocks>
+			/>
 
 			{ mediaPlaceholder }
 			<RichTextVisibilityHelper
diff --git a/packages/block-library/src/gallery/shared.js b/packages/block-library/src/gallery/shared.js
index 616419111bb41..a66a8fc80a867 100644
--- a/packages/block-library/src/gallery/shared.js
+++ b/packages/block-library/src/gallery/shared.js
@@ -4,7 +4,7 @@
 import { get, pick } from 'lodash';
 
 export function defaultColumnsNumber( attributes ) {
-	return Math.min( 3, attributes.ids.length );
+	return attributes?.ids?.length ? Math.min( 3, attributes.ids.length ) : 3;
 }
 
 export const pickRelevantMediaFiles = ( image, sizeSlug = 'large' ) => {