From 28847160a0925160c33d3ba62c6d6b6c4a2ca270 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Wed, 20 Mar 2024 23:28:07 +0000 Subject: [PATCH] v1.4.14 take two --- .github/workflows/sync-wporg-assets.yml | 5 +---- includes/Admin/Updaters/Pro_Plugin_Updater.php | 12 ++++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sync-wporg-assets.yml b/.github/workflows/sync-wporg-assets.yml index dcc79c2..240ea75 100644 --- a/.github/workflows/sync-wporg-assets.yml +++ b/.github/workflows/sync-wporg-assets.yml @@ -1,10 +1,7 @@ name: Sync assets with wordpress.org on: - push: - paths: - - 'readme.txt' - - '.wordpress-org/**' + workflow_dispatch: jobs: run: diff --git a/includes/Admin/Updaters/Pro_Plugin_Updater.php b/includes/Admin/Updaters/Pro_Plugin_Updater.php index 36a72b3..0631f07 100644 --- a/includes/Admin/Updaters/Pro_Plugin_Updater.php +++ b/includes/Admin/Updaters/Pro_Plugin_Updater.php @@ -542,6 +542,12 @@ public function plugin_information() { */ private function maybe_add_upgrade_notice() { $license_status = $this->check_license_status(); + + // Check if $update_data is an object and convert to an array if so. + if ( is_object( $license_status ) ) { + $license_status = get_object_vars( $license_status ); + } + $active = isset( $license_status['activated'] ) && $license_status['activated']; $inactive = isset( $license_status['activated'] ) && ! $license_status['activated']; $expired = isset( $license_status['expired'] ) && $license_status['expired']; @@ -575,6 +581,12 @@ private function maybe_add_upgrade_notice() { */ public function license_status_notice() { $license_status = $this->check_license_status(); + + // Check if $update_data is an object and convert to an array if so. + if ( is_object( $license_status ) ) { + $license_status = get_object_vars( $license_status ); + } + $active = isset( $license_status['activated'] ) && $license_status['activated']; $inactive = isset( $license_status['activated'] ) && ! $license_status['activated']; $expired = isset( $license_status['expired'] ) && $license_status['expired'];