From ae93de89d0732c03524813c97eaf2337020b1e3a Mon Sep 17 00:00:00 2001 From: Kirtan Gajjar <8456197+kirtangajjar@users.noreply.github.com> Date: Sat, 15 Jun 2024 14:27:14 +0530 Subject: [PATCH 1/2] Fix strpos first arg null warning in php 8.1 --- includes/settings.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/settings.php b/includes/settings.php index afee92722..31ea9826b 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -125,7 +125,8 @@ 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 ( 0 === strpos( $parent_base, 'distributor' ) ) { if ( Utils\is_development_version() ) { ?>
From 045da70e377ebf94e19083db0520a683de19f3b6 Mon Sep 17 00:00:00 2001 From: Faisal Alvi Date: Wed, 3 Jul 2024 17:00:33 +0530 Subject: [PATCH 2/2] Update includes/settings.php Co-authored-by: Peter Wilson <519727+peterwilsoncc@users.noreply.github.com> --- includes/settings.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/includes/settings.php b/includes/settings.php index 31ea9826b..1acd0df39 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -125,7 +125,10 @@ function update_notice( $plugin_file, $plugin_data, $status ) { * @since 1.2 */ function maybe_notice() { - $parent_base = get_current_screen()->parent_base ?? ''; + $parent_base = get_current_screen()->parent_base; + if ( ! $parent_base ) { + return; + } if ( 0 === strpos( $parent_base, 'distributor' ) ) { if ( Utils\is_development_version() ) { ?>