Check if namespaced and non-namespaced trait exists before loading traits

n7studios · n7studios · commit 732d244f8427 · 2026-03-31T08:00:01.000+08:00
diff --git a/integrate-convertkit-wpforms.php b/integrate-convertkit-wpforms.php
@@ -33,7 +33,7 @@
 define( 'INTEGRATE_CONVERTKIT_WPFORMS_OAUTH_REDIRECT_URI', 'https://app.kit.com/wordpress/redirect' );
 
 // Load shared classes, if they have not been included by another ConvertKit Plugin.
-if ( ! trait_exists( 'ConvertKit_API\ConvertKit_API_Traits' ) ) {
+if ( ! trait_exists( 'ConvertKit_API_Traits' ) && ! trait_exists( 'ConvertKit_API\ConvertKit_API_Traits' ) ) {
 	require_once INTEGRATE_CONVERTKIT_WPFORMS_PATH . '/vendor/convertkit/convertkit-wordpress-libraries/src/class-convertkit-api-traits.php';
 }
 if ( ! class_exists( 'ConvertKit_API_V4' ) ) {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`define( 'INTEGRATE_CONVERTKIT_WPFORMS_OAUTH_REDIRECT_URI', 'https://app.kit.com/wordpress/redirect' );`
`34`	`34`
`35`	`35`	`// Load shared classes, if they have not been included by another ConvertKit Plugin.`
`36`		`-if ( ! trait_exists( 'ConvertKit_API\ConvertKit_API_Traits' ) ) {`
	`36`	`+if ( ! trait_exists( 'ConvertKit_API_Traits' ) && ! trait_exists( 'ConvertKit_API\ConvertKit_API_Traits' ) ) {`
`37`	`37`	`require_once INTEGRATE_CONVERTKIT_WPFORMS_PATH . '/vendor/convertkit/convertkit-wordpress-libraries/src/class-convertkit-api-traits.php';`
`38`	`38`	`}`
`39`	`39`	`if ( ! class_exists( 'ConvertKit_API_V4' ) ) {`