← All changes | admin/class-plugin-conflict.php +7 -5 18.9 → 28.5 View file →

		@@ -19,9 +19,9 @@
19	19	* It's possible to check for each section if there are conflicting plugin.
20	20	*
21	21	* NOTE: when changing this array, be sure to update the array in Conflicting_Plugins_Service too.
22	22	*
23		- * @var array
	23	+ * @var array<string, array<string>>
24	24	*/
25	25	protected $plugins = [
26	26	// The plugin which are writing OG metadata.
27	27	'open_graph' => Conflicting_Plugins::OPEN_GRAPH_PLUGINS,
		@@ -36,9 +36,9 @@
36	36	* @param string $class_name Optional class name.
37	37	*
38	38	* @return Yoast_Plugin_Conflict
39	39	*/
40		- public static function get_instance( $class_name = __CLASS__ ) {
	40	+ public static function get_instance( $class_name = self::class ) {
41	41	return parent::get_instance( $class_name );
42	42	}
43	43
44	44	/**
		@@ -46,8 +46,10 @@
46	46	*
47	47	* If the activated plugin is conflicting with ours a notice will be shown.
48	48	*
49	49	* @param string|bool $plugin Optional plugin basename to check.
	50	+ *
	51	+ * @return void
50	52	*/
51	53	public static function hook_check_for_plugin_conflicts( $plugin = false ) {
52	54	// The instance of the plugin.
53	55	$instance = self::get_instance();
		@@ -61,11 +63,11 @@
61	63
62	64	// Only check for open graph problems when they are enabled.
63	65	if ( WPSEO_Options::get( 'opengraph' ) ) {
64	66	/* translators: %1$s expands to Yoast SEO, %2$s: 'Facebook' plugin name of possibly conflicting plugin with regard to creating OpenGraph output. */
65		- $plugin_sections['open_graph'] = __( 'Both %1$s and %2$s create Open Graph output, which might make Facebook, Twitter, LinkedIn and other social networks use the wrong texts and images when your pages are being shared.', 'wordpress-seo' )
	67	+ $plugin_sections['open_graph'] = __( 'Both %1$s and %2$s create Open Graph output, which might make Facebook, X, LinkedIn and other social networks use the wrong texts and images when your pages are being shared.', 'wordpress-seo' )
66	68	. '<br/><br/>'
67		- . '<a class="button" href="' . admin_url( 'admin.php?page=wpseo_social#top#facebook' ) . '">'
	69	+ . '<a class="button" href="' . admin_url( 'admin.php?page=wpseo_page_settings#/site-features#card-wpseo_social-opengraph' ) . '">'
68	70	/* translators: %1$s expands to Yoast SEO. */
69	71	. sprintf( __( 'Configure %1$s\'s Open Graph settings', 'wordpress-seo' ), 'Yoast SEO' )
70	72	. '</a>';
71	73	}
		@@ -74,9 +76,9 @@
74	76	if ( WPSEO_Options::get( 'enable_xml_sitemap' ) ) {
75	77	/* translators: %1$s expands to Yoast SEO, %2$s: 'Google XML Sitemaps' plugin name of possibly conflicting plugin with regard to the creation of sitemaps. */
76	78	$plugin_sections['xml_sitemaps'] = __( 'Both %1$s and %2$s can create XML sitemaps. Having two XML sitemaps is not beneficial for search engines and might slow down your site.', 'wordpress-seo' )
77	79	. '<br/><br/>'
78		- . '<a class="button" href="' . admin_url( 'admin.php?page=wpseo_dashboard#top#features' ) . '">'
	80	+ . '<a class="button" href="' . admin_url( 'admin.php?page=wpseo_page_settings#/site-features#card-wpseo-enable_xml_sitemap' ) . '">'
79	81	/* translators: %1$s expands to Yoast SEO. */
80	82	. sprintf( __( 'Toggle %1$s\'s XML Sitemap', 'wordpress-seo' ), 'Yoast SEO' )
81	83	. '</a>';
82	84	}