From eda32fed22d82e0b3766e7ef350c292d3605aa91 Mon Sep 17 00:00:00 2001 From: Sorin Marta Date: Thu, 29 Oct 2026 11:15:16 +0200 Subject: [PATCH 1/2] Avoid duplicate canonical tag when Yoast SEO is active Fixes Strategy11/awpcp#536 Let Yoast SEO print the only canonical and use the listing URL on the Show Ad page. --- .../class-yoast-seo-plugin-integration.php | 61 +++++++++++++++++++ includes/compatibility/compatibility.php | 3 + requires.php | 1 + 3 files changed, 65 insertions(+) create mode 100644 includes/compatibility/class-yoast-seo-plugin-integration.php diff --git a/includes/compatibility/class-yoast-seo-plugin-integration.php b/includes/compatibility/class-yoast-seo-plugin-integration.php new file mode 100644 index 000000000..49fe3bd3b --- /dev/null +++ b/includes/compatibility/class-yoast-seo-plugin-integration.php @@ -0,0 +1,61 @@ +setup(); + $integration = new AWPCP_YoastSEOPluginIntegration(); + $integration->setup(); + $integration = awpcp_navxt_plugin_integration(); $integration->setup(); diff --git a/requires.php b/requires.php index 2fbe9d5ce..e0589d240 100644 --- a/requires.php +++ b/requires.php @@ -61,6 +61,7 @@ require_once AWPCP_DIR . '/includes/compatibility/class-wp-members-plugin-integration.php'; require_once AWPCP_DIR . '/includes/compatibility/class-seo-framework-plugin-integration.php'; require_once AWPCP_DIR . '/includes/compatibility/class-seopress-plugin-integration.php'; +require_once AWPCP_DIR . '/includes/compatibility/class-yoast-seo-plugin-integration.php'; require_once AWPCP_DIR . '/includes/compatibility/class-navxt-plugin-integration.php'; require_once AWPCP_DIR . '/includes/form-fields/class-form-field.php'; From 6bbd0bf639cc5e665991fa1c7f3e3fe469ec06be Mon Sep 17 00:00:00 2001 From: Sorin Marta Date: Thu, 29 Oct 2026 11:33:29 +0200 Subject: [PATCH 2/2] Replace finfo_close() and imagedestroy() with unset() Both functions have been no-ops since PHP 8.0 and are deprecated in PHP 8.5, which fails the PHPCS inspection. --- includes/functions/deprecated.php | 3 +-- includes/media/class-mime-types.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/includes/functions/deprecated.php b/includes/functions/deprecated.php index 955f4177a..3e6c3a9c3 100644 --- a/includes/functions/deprecated.php +++ b/includes/functions/deprecated.php @@ -830,8 +830,7 @@ function awpcp_resizer($filename, $dir) { break; } - imagedestroy($src); - imagedestroy($tmp); + unset( $src, $tmp ); return true; } diff --git a/includes/media/class-mime-types.php b/includes/media/class-mime-types.php index 65e5aa26c..82131fc95 100644 --- a/includes/media/class-mime-types.php +++ b/includes/media/class-mime-types.php @@ -39,7 +39,7 @@ private function get_file_mime_type_with_fileinfo( $filepath ) { $fileinfo = finfo_open( defined( 'FILEINFO_MIME_TYPE' ) ? FILEINFO_MIME_TYPE : FILEINFO_MIME ); $mime_type = finfo_file( $fileinfo, $filepath ); $mime_type_parts = explode( ';', $mime_type ); - finfo_close( $fileinfo ); + unset( $fileinfo ); return array_shift( $mime_type_parts ); }