From 0a92b0c46ff15e2e59a99e7c6fc25ef63e3acc09 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Thu, 16 Jan 2025 15:53:54 -0400 Subject: [PATCH 1/3] Improve inbox count function logic --- classes/helpers/FrmEntriesHelper.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/classes/helpers/FrmEntriesHelper.php b/classes/helpers/FrmEntriesHelper.php index 55ae5764e2..bc70b5f1e7 100644 --- a/classes/helpers/FrmEntriesHelper.php +++ b/classes/helpers/FrmEntriesHelper.php @@ -867,7 +867,7 @@ public static function get_entry_statuses() { return $existing_entry_statuses; } - /** + /** * @since 6.17 * * @return int @@ -878,17 +878,20 @@ public static function get_visible_unread_inbox_count() { return 0; } - if ( FrmAppHelper::pro_is_installed() && is_callable( 'FrmProAppHelper::get_settings' ) ) { - $settings = FrmProAppHelper::get_settings(); - $inbox_badge_off = ! empty( $settings->inbox ) && ! isset( $settings->inbox['badge'] ); + $inbox = new FrmInbox(); + $inbox_count = count( $inbox->unread() ); + + if ( ! $inbox_count ) { + return 0; + } - if ( $inbox_badge_off ) { - // When the badge is disabled, the unread count is not included in the menu name. + if ( is_callable( 'FrmProSettingsController::inbox_badge' ) ) { + $inbox_count = FrmProSettingsController::inbox_badge( $inbox_count ); + if ( ! $inbox_count ) { return 0; } } - $inbox = new FrmInbox(); - return count( $inbox->unread() ); + return $inbox_count; } } From 16a757615121f2f6dcea7fb8e38099e2fb1821f9 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Thu, 16 Jan 2025 15:54:42 -0400 Subject: [PATCH 2/3] Spacing fix --- classes/helpers/FrmEntriesHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/helpers/FrmEntriesHelper.php b/classes/helpers/FrmEntriesHelper.php index bc70b5f1e7..4d8341bec3 100644 --- a/classes/helpers/FrmEntriesHelper.php +++ b/classes/helpers/FrmEntriesHelper.php @@ -867,7 +867,7 @@ public static function get_entry_statuses() { return $existing_entry_statuses; } - /** + /** * @since 6.17 * * @return int From b27bef0b63acefa3f71fe7efd66c002552f6a72c Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Thu, 16 Jan 2025 15:56:16 -0400 Subject: [PATCH 3/3] Add stubg --- stubs.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/stubs.php b/stubs.php index bce0038996..b82cfde206 100644 --- a/stubs.php +++ b/stubs.php @@ -416,6 +416,14 @@ class FrmTransListsController { public static function payment_columns( $columns = array() ) { } } + class FrmProSettingsController { + /** + * @param string $count + * @return string + */ + public static function inbox_badge( $count ) { + } + } } namespace Elementor {