← All changes | inc/options/class-wpseo-option-ms.php +49 -23 18.9 → trunk View file →

		@@ -82,26 +82,53 @@
82	82	*/
83	83	public function __construct() {
84	84	$allow_prefix = self::ALLOW_KEY_PREFIX;
85	85	$this->defaults = [
86		- 'access' => 'admin',
87		- 'defaultblog' => '', // Numeric blog ID or empty.
88		- "{$allow_prefix}disableadvanced_meta" => true,
89		- "{$allow_prefix}ryte_indexability" => true,
90		- "{$allow_prefix}content_analysis_active" => true,
91		- "{$allow_prefix}keyword_analysis_active" => true,
92		- "{$allow_prefix}enable_admin_bar_menu" => true,
93		- "{$allow_prefix}enable_cornerstone_content" => true,
94		- "{$allow_prefix}enable_xml_sitemap" => true,
95		- "{$allow_prefix}enable_text_link_counter" => true,
96		- "{$allow_prefix}enable_headless_rest_endpoints" => true,
97		- "{$allow_prefix}enable_metabox_insights" => true,
98		- "{$allow_prefix}enable_link_suggestions" => true,
99		- "{$allow_prefix}tracking" => true,
100		- "{$allow_prefix}enable_enhanced_slack_sharing" => true,
101		- "{$allow_prefix}semrush_integration_active" => true,
102		- "{$allow_prefix}zapier_integration_active" => true,
103		- "{$allow_prefix}wincher_integration_active" => false,
	86	+ 'access' => 'admin',
	87	+ 'defaultblog' => '', // Numeric blog ID or empty.
	88	+ "{$allow_prefix}disableadvanced_meta" => true,
	89	+ "{$allow_prefix}ryte_indexability" => false,
	90	+ "{$allow_prefix}content_analysis_active" => true,
	91	+ "{$allow_prefix}keyword_analysis_active" => true,
	92	+ "{$allow_prefix}inclusive_language_analysis_active" => true,
	93	+ "{$allow_prefix}enable_admin_bar_menu" => true,
	94	+ "{$allow_prefix}enable_cornerstone_content" => true,
	95	+ "{$allow_prefix}enable_xml_sitemap" => true,
	96	+ "{$allow_prefix}enable_text_link_counter" => true,
	97	+ "{$allow_prefix}enable_headless_rest_endpoints" => true,
	98	+ "{$allow_prefix}enable_metabox_insights" => true,
	99	+ "{$allow_prefix}enable_link_suggestions" => true,
	100	+ "{$allow_prefix}tracking" => true,
	101	+ "{$allow_prefix}enable_enhanced_slack_sharing" => true,
	102	+ "{$allow_prefix}semrush_integration_active" => true,
	103	+ "{$allow_prefix}wincher_integration_active" => false,
	104	+ "{$allow_prefix}remove_feed_global" => true,
	105	+ "{$allow_prefix}remove_feed_global_comments" => true,
	106	+ "{$allow_prefix}remove_feed_post_comments" => true,
	107	+ "{$allow_prefix}enable_index_now" => true,
	108	+ "{$allow_prefix}enable_ai_generator" => true,
	109	+ "{$allow_prefix}remove_feed_authors" => true,
	110	+ "{$allow_prefix}remove_feed_categories" => true,
	111	+ "{$allow_prefix}remove_feed_tags" => true,
	112	+ "{$allow_prefix}remove_feed_custom_taxonomies" => true,
	113	+ "{$allow_prefix}remove_feed_post_types" => true,
	114	+ "{$allow_prefix}remove_feed_search" => true,
	115	+ "{$allow_prefix}remove_atom_rdf_feeds" => true,
	116	+ "{$allow_prefix}remove_shortlinks" => true,
	117	+ "{$allow_prefix}remove_rest_api_links" => true,
	118	+ "{$allow_prefix}remove_rsd_wlw_links" => true,
	119	+ "{$allow_prefix}remove_oembed_links" => true,
	120	+ "{$allow_prefix}remove_generator" => true,
	121	+ "{$allow_prefix}remove_emoji_scripts" => true,
	122	+ "{$allow_prefix}remove_powered_by_header" => true,
	123	+ "{$allow_prefix}remove_pingback_header" => true,
	124	+ "{$allow_prefix}clean_campaign_tracking_urls" => true,
	125	+ "{$allow_prefix}clean_permalinks" => true,
	126	+ "{$allow_prefix}search_cleanup" => true,
	127	+ "{$allow_prefix}search_cleanup_emoji" => true,
	128	+ "{$allow_prefix}search_cleanup_patterns" => true,
	129	+ "{$allow_prefix}redirect_search_pretty_urls" => true,
	130	+ "{$allow_prefix}algolia_integration_active" => true,
104	131	];
105	132
106	133	if ( is_multisite() ) {
107	134	parent::__construct();
		@@ -178,14 +205,13 @@
178	205	$this->group_name, // Slug title of the setting.
179	206	$key, // Suffix-ID for the error message box.
180	207	/* translators: %1$s expands to the option name and %2$sexpands to Yoast SEO */
181	208	sprintf( __( '%1$s is not a valid choice for who should be allowed access to the %2$s settings. Value reset to the default.', 'wordpress-seo' ), esc_html( sanitize_text_field( $dirty[ $key ] ) ), 'Yoast SEO' ), // The error message.
182		- 'error' // Message type.
	209	+ 'error', // Message type.
183	210	);
184	211	}
185	212	break;
186	213
187		-
188	214	case 'defaultblog':
189	215	if ( isset( $dirty[ $key ] ) && ( $dirty[ $key ] !== '' && $dirty[ $key ] !== '-' ) ) {
190	216	$int = WPSEO_Utils::validate_int( $dirty[ $key ] );
191	217	if ( $int !== false && $int > 0 ) {
		@@ -202,11 +228,11 @@
202	228	. '<br>'
203	229	. sprintf(
204	230	/* translators: %s is the ID number of a blog. */
205	231	esc_html__( 'This must be an existing blog. Blog %s does not exist or has been marked as deleted.', 'wordpress-seo' ),
206		- '<strong>' . esc_html( sanitize_text_field( $dirty[ $key ] ) ) . '</strong>'
	232	+ '<strong>' . esc_html( sanitize_text_field( $dirty[ $key ] ) ) . '</strong>',
207	233	), // The error message.
208		- 'error' // Message type.
	234	+ 'error', // Message type.
209	235	);
210	236	}
211	237	unset( $exists );
212	238	}
		@@ -214,9 +240,9 @@
214	240	add_settings_error(
215	241	$this->group_name, // Slug title of the setting.
216	242	$key, // Suffix-ID for the error message box.
217	243	esc_html__( 'The default blog setting must be the numeric blog id of the blog you want to use as default.', 'wordpress-seo' ) . '<br>' . esc_html__( 'No numeric value was received.', 'wordpress-seo' ), // The error message.
218		- 'error' // Message type.
	244	+ 'error', // Message type.
219	245	);
220	246	}
221	247	unset( $int );
222	248	}