Merge branch 'hotfix/pb-1073-deprecated-fix'

upsellpl · Jun 7, 2024 · a352b63 · a352b63
2 parents e0dd348 + 469faba
commit a352b63
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/includes/admin/admin-pages.php b/includes/admin/admin-pages.php
@@ -39,7 +39,7 @@ function edd_add_options_link() {
 	$edd_settings_page      = add_submenu_page( 'edit.php?post_type=download', __( 'Easy Digital Download Settings', 'easy-digital-downloads' ), __( 'Settings', 'easy-digital-downloads' ), 'manage_shop_settings', 'edd-settings', 'edd_options_page' );
 	$edd_tools_page         = add_submenu_page( 'edit.php?post_type=download', __( 'Easy Digital Download Info and Tools', 'easy-digital-downloads' ), __( 'Tools', 'easy-digital-downloads' ), 'manage_shop_settings', 'edd-tools', 'edd_tools_page' );
 	$edd_add_ons_page       = add_submenu_page( 'edit.php?post_type=download', __( 'Easy Digital Download Extensions', 'easy-digital-downloads' ), __( 'Extensions', 'easy-digital-downloads' ), 'manage_shop_settings', 'edd-addons', 'edd_add_ons_page' );
-	$edd_upgrades_screen    = add_submenu_page( null, __( 'EDD Upgrades', 'easy-digital-downloads' ), __( 'EDD Upgrades', 'easy-digital-downloads' ), 'manage_shop_settings', 'edd-upgrades', 'edd_upgrades_screen' );
+	$edd_upgrades_screen    = add_submenu_page( '', __( 'EDD Upgrades', 'easy-digital-downloads' ), __( 'EDD Upgrades', 'easy-digital-downloads' ), 'manage_shop_settings', 'edd-upgrades', 'edd_upgrades_screen' );
 
 }
 add_action( 'admin_menu', 'edd_add_options_link', 10 );

diff --git a/includes/payments/functions.php b/includes/payments/functions.php
@@ -1706,6 +1706,8 @@ function edd_remove_payment_notes_in_comment_counts( $stats, $post_id ) {
     if ( false !== $stats )
         return $stats;
 
+    $stats = [];
+
     $where = 'WHERE comment_type != "edd_payment_note"';
 
     if ( $post_id > 0 )