← All changes | includes/seo/class-schema-management-system.php +162 -43 2.7.0 → 2.14.1 View file →

		@@ -201,13 +201,43 @@
201	201	'WebPage' => [
202	202	'name' => 'WebPage',
203	203	'description' => 'Individual web pages',
204	204	'required_properties' => ['name', 'url'],
	205	+ // 'post' as well as 'page': the per-page selector reaches this for
	206	+ // any post type, and a registry limited to 'page' silently produced
	207	+ // nothing for the rest (#624).
205	208	'recommended_properties' => ['description', 'author', 'datePublished', 'breadcrumb'],
206	209	'rich_snippets' => ['webpage', 'breadcrumb'],
207		- 'context_types' => ['page'],
	210	+ 'context_types' => ['page', 'post'],
208	211	'priority' => 'medium'
209	212	],
	213	+ 'AboutPage' => [
	214	+ 'name' => 'AboutPage',
	215	+ 'description' => 'A page describing the organisation or person behind the site',
	216	+ 'required_properties' => ['name', 'url'],
	217	+ 'recommended_properties' => ['description', 'author', 'datePublished', 'breadcrumb'],
	218	+ 'rich_snippets' => ['webpage', 'breadcrumb'],
	219	+ 'context_types' => ['page', 'post'],
	220	+ 'priority' => 'medium'
	221	+ ],
	222	+ 'ContactPage' => [
	223	+ 'name' => 'ContactPage',
	224	+ 'description' => 'A page giving contact details',
	225	+ 'required_properties' => ['name', 'url'],
	226	+ 'recommended_properties' => ['description', 'author', 'datePublished', 'breadcrumb'],
	227	+ 'rich_snippets' => ['webpage', 'breadcrumb'],
	228	+ 'context_types' => ['page', 'post'],
	229	+ 'priority' => 'medium'
	230	+ ],
	231	+ 'ProfilePage' => [
	232	+ 'name' => 'ProfilePage',
	233	+ 'description' => 'A page about a single person or organisation',
	234	+ 'required_properties' => ['name', 'url'],
	235	+ 'recommended_properties' => ['description', 'author', 'datePublished', 'breadcrumb'],
	236	+ 'rich_snippets' => ['webpage', 'breadcrumb'],
	237	+ 'context_types' => ['page', 'post'],
	238	+ 'priority' => 'medium'
	239	+ ],
210	240	'FAQPage' => [
211	241	'name' => 'FAQPage',
212	242	'description' => 'Frequently Asked Questions pages',
213	243	'required_properties' => ['mainEntity'],
		@@ -700,8 +730,27 @@
700	730	return $optimization;
701	731	}
702	732
703	733	/**
	734	+ * Deployed types an authoritative deploy takes off the page.
	735	+ *
	736	+ * Everything deployed that the payload left out, except the types the
	737	+ * caller sent but could not deploy: those failed validation, they were not
	738	+ * removed by the user, so their live copy stays. Retiring them took the
	739	+ * site's Organization down behind a success toast (#949).
	740	+ *
	741	+ * @since 2.14.1
	742	+ *
	743	+ * @param string[] $deployed Types deployed for the context now.
	744	+ * @param string[] $payload Types in this deploy.
	745	+ * @param string[] $retain_types Types sent but skipped by validation.
	746	+ * @return string[] Types to retire.
	747	+ */
	748	+ public static function types_to_retire(array $deployed, array $payload, array $retain_types = []): array {
	749	+ return array_values(array_diff($deployed, $payload, $retain_types));
	750	+ }
	751	+
	752	+ /**
704	753	* Deploy schema markup with automated implementation
705	754	*
706	755	* @since 1.0.0
707	756	*
		@@ -735,11 +784,12 @@
735	784	if (!empty($options['authoritative'])) {
736	785	$deployment['retired_schemas'] = $this->retire_schema_types(
737	786	$context_type,
738	787	$context_id,
739		- array_diff(
	788	+ self::types_to_retire(
740	789	array_keys($this->get_deployed_schemas($context_type, $context_id)),
741		- array_keys($schema_data)
	790	+ array_keys($schema_data),
	791	+ (array) ($options['retain_types'] ?? [])
742	792	)
743	793	);
744	794	}
745	795
		@@ -1295,9 +1345,9 @@
1295	1345	$this->cache_manager->invalidate_all_cache();
1296	1346	}
1297	1347
1298	1348	// AUTO-DEPLOY: Automatically regenerate and deploy schema when settings change
1299		- if ($success && !empty($settings['auto_deploy'])) {
	1349	+ if ($success && self::should_auto_deploy($settings, $this->get_settings($context_type, $context_id))) {
1300	1350	$this->auto_deploy_schema_on_settings_change($context_type, $context_id, $settings);
1301	1351	}
1302	1352
1303	1353	return $success;
		@@ -1302,9 +1352,35 @@
1302	1352
1303	1353	return $success;
1304	1354	}
1305	1355
	1356	+
1306	1357	/**
	1358	+ * Whether a save should redeploy the schema it changed.
	1359	+ *
	1360	+ * `auto_deploy` is a stored setting (on by default), not something a save
	1361	+ * restates. Reading it off the incoming patch meant a partial save — which
	1362	+ * is what the admin screen sends, one field at a time — skipped
	1363	+ * auto-deploy on a site that had it switched on, and the deployed snapshot
	1364	+ * the front end serves kept the name, logo and sameAs it was deployed
	1365	+ * with, however often the user saved (#904, the gate #12 left in place).
	1366	+ *
	1367	+ * A patch that does carry the key still wins, so a caller can deploy or
	1368	+ * hold deliberately.
	1369	+ *
	1370	+ * @param array $patch Settings being saved
	1371	+ * @param array $stored Settings as stored, after the save
	1372	+ * @return bool
	1373	+ */
	1374	+ public static function should_auto_deploy(array $patch, array $stored): bool {
	1375	+ if (array_key_exists('auto_deploy', $patch)) {
	1376	+ return !empty($patch['auto_deploy']);
	1377	+ }
	1378	+
	1379	+ return !empty($stored['auto_deploy']);
	1380	+ }
	1381	+
	1382	+ /**
1307	1383	* Auto-deploy schema when settings change
1308	1384	*
1309	1385	* Automatically regenerates and deploys schema markup when organization or other
1310	1386	* schema settings are modified, ensuring the frontend output stays in sync.
		@@ -1599,8 +1675,19 @@
1599	1675	} elseif ($context_id && in_array($context_type, ['post', 'page', 'product'], true)) {
1600	1676	// Post/page/product data
1601	1677	$post = get_post($context_id);
1602	1678	if ($post) {
	1679	+ // Resolve the featured image's URL to its ID here, where the ID
	1680	+ // is in hand, so the schema builder does not query for an
	1681	+ // attachment it was just given (#847). Offered as a hint rather
	1682	+ // than asserted: `post_thumbnail_url` can swap the URL for one
	1683	+ // the featured image does not own.
	1684	+ $thumbnail_url = get_the_post_thumbnail_url($post->ID, 'full');
	1685	+
	1686	+ if ($thumbnail_url) {
	1687	+ Attachment_Lookup::id_from_url((string) $thumbnail_url, (int) get_post_thumbnail_id($post->ID));
	1688	+ }
	1689	+
1603	1690	$content_data = [
1604	1691	'title' => $post->post_title,
1605	1692	'url' => get_permalink($post->ID),
1606	1693	'excerpt' => $post->post_excerpt ?: \ThinkRank\Core\Seo_Text::trim_words($post->post_content, 30),
		@@ -1614,9 +1701,9 @@
1614	1701	// Google rejects as "Invalid value in field datePublished"
1615	1702	// and drops the Article rich result (#465).
1616	1703	'date' => get_the_date('c', $post),
1617	1704	'modified' => get_the_modified_date('c', $post),
1618		- 'image' => get_the_post_thumbnail_url($post->ID, 'full'),
	1705	+ 'image' => $thumbnail_url,
1619	1706	'focus_keywords' => Focus_Keywords::get($post->ID),
1620	1707	'business_data' => $this->get_business_data_from_local_seo(),
1621	1708	'site_data' => $this->get_site_data_for_schema(),
1622	1709	'social_data' => $this->get_social_data_for_schema()
		@@ -2009,12 +2096,10 @@
2009	2096
2010	2097	/**
2011	2098	* Get deployed schemas for frontend integration
2012	2099	*
2013		- * PERFORMANCE OPTIMIZED: This method now uses:
2014		- * 1. Schema caching layer (90% reduction in database queries)
2015		- * 2. Window function approach instead of correlated subquery (80-90% query performance improvement)
2016		- * 3. Composite index: idx_context_schema_active
	2100	+ * Returns the newest active, deployed row of each schema type for the
	2101	+ * context. Results are cached per context (see Schema_Cache_Manager).
2017	2102	*
2018	2103	* @since 1.0.0
2019	2104	*
2020	2105	* @param string $context_type Context type
		@@ -2037,48 +2122,57 @@
2037	2122
2038	2123	// Use existing seo_schema table
2039	2124	$table_name = $wpdb->prefix . 'thinkrank_seo_schema';
2040	2125
2041		- // OPTIMIZED QUERY: Use window function approach to eliminate correlated subquery
2042		- // This leverages the new composite index: idx_context_schema_active (context_type, schema_type, is_active, created_at DESC)
	2126	+ // The newest row per type used to be picked with ROW_NUMBER() OVER
	2127	+ // (PARTITION BY schema_type ...). Window functions need MySQL 8.0 /
	2128	+ // MariaDB 10.2, and WordPress still runs on MySQL 5.7, where that is
	2129	+ // a syntax error on every page view and no deployed schema is ever
	2130	+ // output. A row is the newest of its type when no other row of the
	2131	+ // same context and type outranks it, so NOT EXISTS keeps the
	2132	+ // greatest-per-group in the database, and schema_data — JSON, and
	2133	+ // large — is only transferred for the rows that are output.
	2134	+ //
	2135	+ // `<=>` is NULL-safe equality: the site context stores context_id
	2136	+ // as NULL, and `n.context_id = s.context_id` is never true for it.
	2137	+ // schema_id breaks a same-second tie, which the window function
	2138	+ // left to chance.
	2139	+ $args = [$context_type];
2043	2140	if (null === $context_id) {
2044		- // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching, PluginCheck.Security.DirectDB.UnescapedDBParameter -- Schema retrieval requires direct database access
2045		- $sql = sprintf(
2046		- 'SELECT schema_type, schema_data FROM (SELECT schema_type, schema_data, ROW_NUMBER() OVER (PARTITION BY schema_type ORDER BY created_at DESC) as rn FROM %s WHERE context_type = %%s AND context_id IS NULL AND is_active = 1 AND validation_status IN (\'deployed\', \'valid\')) ranked WHERE rn = 1 ORDER BY schema_type',
2047		- $table_name
2048		- );
2049		- // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, PluginCheck.Security.DirectDB.UnescapedDBParameter -- Schema retrieval requires direct database access
2050		- $deployed_schemas = $wpdb->get_results(
2051		- $wpdb->prepare(
2052		- // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared, PluginCheck.Security.DirectDB.UnescapedDBParameter -- SQL is properly prepared with placeholders
2053		- $sql,
2054		- $context_type
2055		- ),
2056		- ARRAY_A
2057		- );
	2141	+ $context_where = 's.context_id IS NULL';
2058	2142	} else {
2059		- // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching, PluginCheck.Security.DirectDB.UnescapedDBParameter -- Schema retrieval requires direct database access
2060		- $sql = sprintf(
2061		- 'SELECT schema_type, schema_data FROM (SELECT schema_type, schema_data, ROW_NUMBER() OVER (PARTITION BY schema_type ORDER BY created_at DESC) as rn FROM %s WHERE context_type = %%s AND context_id = %%d AND is_active = 1 AND validation_status IN (\'deployed\', \'valid\')) ranked WHERE rn = 1 ORDER BY schema_type',
2062		- $table_name
2063		- );
2064		- // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, PluginCheck.Security.DirectDB.UnescapedDBParameter -- Schema retrieval requires direct database access
2065		- $deployed_schemas = $wpdb->get_results(
2066		- $wpdb->prepare(
2067		- // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared, PluginCheck.Security.DirectDB.UnescapedDBParameter -- SQL is properly prepared with placeholders
2068		- $sql,
2069		- $context_type,
2070		- $context_id
2071		- ),
2072		- ARRAY_A
2073		- );
	2143	+ $context_where = 's.context_id = %d';
	2144	+ $args[] = $context_id;
2074	2145	}
2075	2146
	2147	+ $sql = sprintf(
	2148	+ 'SELECT s.schema_type, s.schema_data FROM %1$s s'
	2149	+ . ' WHERE s.context_type = %%s AND %2$s AND s.is_active = 1 AND s.validation_status IN (\'deployed\', \'valid\')'
	2150	+ . ' AND NOT EXISTS ('
	2151	+ . 'SELECT 1 FROM %1$s n'
	2152	+ . ' WHERE n.context_type = s.context_type AND n.context_id <=> s.context_id AND n.schema_type = s.schema_type'
	2153	+ . ' AND n.is_active = 1 AND n.validation_status IN (\'deployed\', \'valid\')'
	2154	+ . ' AND (n.created_at > s.created_at OR (n.created_at = s.created_at AND n.schema_id > s.schema_id))'
	2155	+ . ')'
	2156	+ . ' ORDER BY s.schema_type',
	2157	+ $table_name,
	2158	+ $context_where
	2159	+ );
	2160	+
	2161	+ // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, PluginCheck.Security.DirectDB.UnescapedDBParameter -- Schema retrieval requires direct database access
	2162	+ $deployed_schemas = $wpdb->get_results(
	2163	+ $wpdb->prepare(
	2164	+ // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared, PluginCheck.Security.DirectDB.UnescapedDBParameter -- SQL is properly prepared with placeholders
	2165	+ $sql,
	2166	+ ...$args
	2167	+ ),
	2168	+ ARRAY_A
	2169	+ );
	2170	+
2076	2171	// Deliberately no early return on an empty result: it has to reach the
2077	2172	// cache write below. Most URLs have no deployed schema, so gating the
2078	2173	// write on a non-empty result made the majority of front-end requests
2079		- // permanent cache misses, re-running a ROW_NUMBER() OVER (PARTITION BY
2080		- // ...) query with two filesorts on every pageview (#392).
	2174	+ // permanent cache misses, re-running the query on every pageview (#392).
2081	2175	$deployed_schemas = $deployed_schemas ?: [];
2082	2176
2083	2177	// Process schemas for return
2084	2178	$processed_schemas = [];
		@@ -2258,9 +2352,12 @@
2258	2352	}
2259	2353
2260	2354	$type = $schema['@type'] ?? '';
2261	2355	$type = is_array($type) ? reset($type) : $type;
2262		- $is_entity = in_array((string) $type, self::ENTITY_URL_TYPES, true);
	2356	+ // A LocalBusiness is deployed under the subtype the site chose, so the
	2357	+ // exemption has to cover every subtype, not only the literal root.
	2358	+ $is_entity = in_array((string) $type, self::ENTITY_URL_TYPES, true)
	2359	+ || \ThinkRank\Config\Local_Business_Types_Config::is_local_business($type);
2263	2360
2264	2361	if (isset($schema['url']) && !$is_entity) {
2265	2362	$schema['url'] = $permalink;
2266	2363	}
		@@ -2288,9 +2385,15 @@
2288	2385	* Covers non-ISO-8601 dates (#465) and WP locales in inLanguage, which must
2289	2386	* be a BCP-47 tag — en-US, not en_US (#473). Walks nested nodes so values
2290	2387	* inside author/publisher/@graph entries are covered too.
2291	2388	*
	2389	+ * Also decodes HTML entities in plain-text properties. Schema_Builder
	2390	+ * stored the block editor's `&amp;` as-is until 2.10.0, and nothing
	2391	+ * decodes JSON-LD downstream, so every deployed node built from post text
	2392	+ * published the entity literally.
	2393	+ *
2292	2394	* @since 1.16.0
	2395	+ * @since 2.10.0 Decodes entities in plain-text properties.
2293	2396	*
2294	2397	* @param array $schema Decoded schema data.
2295	2398	* @return array Normalised schema.
2296	2399	*/
		@@ -2299,8 +2402,16 @@
2299	2402	'datePublished', 'dateModified', 'dateCreated', 'uploadDate',
2300	2403	'startDate', 'endDate', 'validFrom', 'validThrough', 'expires',
2301	2404	];
2302	2405
	2406	+ // Plain text in schema.org. Answer/HowToStep `text` is deliberately
	2407	+ // absent: Google reads Answer.text as HTML, where an entity is correct
	2408	+ // and decoding `&lt;` would turn escaped text into live markup.
	2409	+ static $text_keys = [
	2410	+ 'name', 'headline', 'alternativeHeadline', 'description',
	2411	+ 'reviewBody', 'about', 'abstract', 'caption',
	2412	+ ];
	2413	+
2303	2414	foreach ($schema as $key => $value) {
2304	2415	if (is_array($value)) {
2305	2416	$schema[$key] = $this->normalize_stored_schema($value);
2306	2417	continue;
		@@ -2307,8 +2418,16 @@
2307	2418	}
2308	2419
2309	2420	if ('inLanguage' === $key && is_string($value) && '' !== $value) {
2310	2421	$schema[$key] = str_replace('_', '-', $value);
	2422	+ continue;
	2423	+ }
	2424	+
	2425	+ // Decode only: a snapshot already truncated with an ellipsis must
	2426	+ // keep it, which the full Seo_Text::normalize_schema_text() would
	2427	+ // strip as an excerpt marker.
	2428	+ if (in_array($key, $text_keys, true) && is_string($value) && '' !== $value) {
	2429	+ $schema[$key] = \ThinkRank\Core\Seo_Text::decode_schema_entities($value);
2311	2430	continue;
2312	2431	}
2313	2432
2314	2433	if (!in_array($key, $date_keys, true) || !is_string($value) || '' === $value) {