Backport PR #74 and #79

saucal · Apr 2, 2021 · 5c4c800 · 5c4c800
1 parent e837ab5
commit 5c4c800
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/includes/compats/class-wc-amazon-payments-advanced-multi-currency.php b/includes/compats/class-wc-amazon-payments-advanced-multi-currency.php
@@ -163,8 +163,8 @@ public static function compatible_plugin( $return_name = false ) {
 			$match = false;
 			if ( 0 === strpos( $definition_name, 'global' ) ) {
 				$global_name = str_replace( 'global_', '', $definition_name );
-				global ${$global_name};
-				if ( ${$global_name} ) {
+
+				if ( isset( $GLOBALS[ $global_name ] ) && $GLOBALS[ $global_name ] ) {
 					$match = true;
 				}
 			} elseif ( 0 === strpos( $definition_name, 'class' ) ) {