Skip to content

Commit ed92e90

Browse files
committed
fallback to logo id from rest index
1 parent 85d8ceb commit ed92e90

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

packages/block-library/src/site-logo/edit.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -267,13 +267,15 @@ export default function LogoEdit( {
267267
const _siteLogo = siteSettings?.site_logo;
268268
const _readOnlyLogo = siteData?.site_logo;
269269
const _canUserEdit = canUser( 'update', 'settings' );
270-
const _siteLogoId = _canUserEdit ? _siteLogo : _readOnlyLogo;
271-
const mediaItem = select( coreStore ).getEntityRecord(
272-
'root',
273-
'media',
274-
_siteLogoId,
275-
{ context: 'view' }
276-
);
270+
const _siteLogoId = _siteLogo || _readOnlyLogo;
271+
const mediaItem =
272+
_siteLogoId &&
273+
select( coreStore ).getEntityRecord(
274+
'root',
275+
'media',
276+
_siteLogoId,
277+
{ context: 'view' }
278+
);
277279
return {
278280
siteLogoId: _siteLogoId,
279281
canUserEdit: _canUserEdit,

0 commit comments

Comments
 (0)