Merge branch 'develop' into do/bump-wp-env

10up · Jul 14, 2024 · 16ff6bc · 16ff6bc
2 parents b5aa31d + 61331d1
commit 16ff6bc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/assets/js/gutenberg-plugin.js b/assets/js/gutenberg-plugin.js
@@ -153,45 +153,47 @@ const DistributorIcon = () => (
  * Add the Distributor panel to Gutenberg
  */
 const DistributorPlugin = () => {
-	// Ensure the user has proper permissions
-	if (
-		dtGutenberg.noPermissions &&
-		1 === parseInt( dtGutenberg.noPermissions )
-	) {
-		return null;
-	}
-
-	// eslint-disable-next-line no-shadow, react-hooks/rules-of-hooks -- permission checks are needed.
+	// eslint-disable-next-line no-shadow
 	const postType = useSelect( ( select ) =>
 		select( 'core/editor' ).getCurrentPostType()
 	);
 
-	// eslint-disable-next-line no-shadow, react-hooks/rules-of-hooks -- permission checks are needed.
+	// eslint-disable-next-line no-shadow
 	const postStatus = useSelect( ( select ) =>
 		select( 'core/editor' ).getCurrentPostAttribute( 'status' )
 	);
 
-	// Ensure we are on a supported post type
-	if (
-		dtGutenberg.supportedPostTypes &&
-		dtGutenberg.supportedPostTypes[ postType ] === undefined
-	) {
-		return null;
-	}
-
+	// eslint-disable-next-line @wordpress/no-unused-vars-before-return
 	const distributorTopMenu = document.querySelector(
 		'#wp-admin-bar-distributor'
 	);
 
-	// eslint-disable-next-line no-shadow, react-hooks/rules-of-hooks -- permission checks are needed.
+	// eslint-disable-next-line no-shadow
 	const post = useSelect( ( select ) =>
 		select( 'core/editor' ).getCurrentPost()
 	);
+
+	// Ensure the user has proper permissions.
+	if (
+		dtGutenberg.noPermissions &&
+		1 === parseInt( dtGutenberg.noPermissions )
+	) {
+		return null;
+	}
+
+	// Ensure we are on a supported post type.
+	if (
+		dtGutenberg.supportedPostTypes &&
+		dtGutenberg.supportedPostTypes[ postType ] === undefined
+	) {
+		return null;
+	}
+
 	// Make the post title and status available to the top menu.
 	dt.postTitle = post.title;
 	dt.postStatus = post.status;
 
-	// If we are on a non-supported post status, change what we show
+	// If we are on a non-supported post status, change what we show.
 	if (
 		dtGutenberg.supportedPostStati &&
 		! dtGutenberg.supportedPostStati.includes( postStatus )

diff --git a/includes/settings.php b/includes/settings.php
@@ -125,7 +125,11 @@ function update_notice( $plugin_file, $plugin_data, $status ) {
  * @since 1.2
  */
 function maybe_notice() {
-	if ( 0 === strpos( get_current_screen()->parent_base, 'distributor' ) ) {
+	$parent_base = get_current_screen()->parent_base;
+	if ( ! $parent_base ) {
+		return;
+	}
+	if ( 0 === strpos( $parent_base, 'distributor' ) ) {
 		if ( Utils\is_development_version() ) {
 			?>
 			<div class="notice notice-warning">