| @@ -266,8 +266,16 @@ | ||
| 266 | 266 | // LLMs_Txt_Manager for the static file) guarantees an explicit UTF-8 |
| 267 | 267 | // charset. Priority 8 keeps it ahead of redirect_canonical(). |
| 268 | 268 | add_action('template_redirect', [$this, 'maybe_serve_llms_txt'], 8); |
| 269 | 269 | |
| 270 | + // Serve the sitemap from PHP on sites whose web root cannot be written. | |
| 271 | + // ThinkRank publishes sitemaps as real files, so where that is possible | |
| 272 | + // the web server answers first and this never runs; where it is not, | |
| 273 | + // this is the only thing that answers at all, and without it the | |
| 274 | + // feature was simply unavailable (#752). Same priority 8, and for the | |
| 275 | + // same reason: ahead of redirect_canonical(). | |
| 276 | + add_action('template_redirect', [$this, 'maybe_serve_sitemap'], 8); | |
| 277 | + | |
| 270 | 278 | // Take WordPress core's own sitemap offline while ThinkRank's is active. |
| 271 | 279 | // Two sitemap indexes on one site is a crawl conflict: core keeps |
| 272 | 280 | // /wp-sitemap.xml served and injects its own "Sitemap:" line into |
| 273 | 281 | // robots.txt (WP_Sitemaps::add_robots, priority 0). Until now that line |
| @@ -369,8 +377,16 @@ | ||
| 369 | 377 | } |
| 370 | 378 | |
| 371 | 379 | // Initialize Global SEO Schema Output and store reference |
| 372 | 380 | $this->global_seo_schema = new Global_SEO_Schema_Output(); |
| 381 | + // Let schema reuse the description this class already resolves, so the | |
| 382 | + // JSON-LD and the meta/og/twitter tags cannot disagree about what the | |
| 383 | + // page is (#766). Passed as a callback rather than a value: schema is | |
| 384 | + // built during wp_head, by which point the request context this | |
| 385 | + // resolution depends on is set, and it must not be captured earlier. | |
| 386 | + $this->global_seo_schema->set_description_resolver( | |
| 387 | + fn (): string => (string) $this->get_meta_description() | |
| 388 | + ); | |
| 373 | 389 | $this->global_seo_schema->init(); |
| 374 | 390 | } |
| 375 | 391 | |
| 376 | 392 | /** |
| @@ -691,9 +707,86 @@ | ||
| 691 | 707 | * |
| 692 | 708 | * @param string $title Resolved title. |
| 693 | 709 | * @return string Title with the page indicator, when there is one. |
| 694 | 710 | */ |
| 711 | + /** | |
| 712 | + * The archive's subject, without the label WordPress prefixes it with. | |
| 713 | + * | |
| 714 | + * `get_the_archive_title()` returns "Month: September 2026", "Archives: | |
| 715 | + * Recipes", "Category: Uncategorized" — the label is core's, aimed at an | |
| 716 | + * archive heading on the page, and it reads badly in a browser tab, an | |
| 717 | + * og:title or a search result. Category, tag and author contexts already | |
| 718 | + * avoid it by using the raw name; the generic archive context did not, so | |
| 719 | + * date, custom-post-type and custom-taxonomy archives carried it (#640). | |
| 720 | + * | |
| 721 | + * Removed through core's own `get_the_archive_title_prefix` filter rather | |
| 722 | + * than by matching the prefix text, because that text is translated and | |
| 723 | + * differs per archive type — a string comparison would work in English and | |
| 724 | + * silently stop working everywhere else. | |
| 725 | + * | |
| 726 | + * A site that wants a prefix can put one in its title template, where it is | |
| 727 | + * visible and editable, instead of inheriting one it cannot see. | |
| 728 | + * | |
| 729 | + * @since 2.7.0 | |
| 730 | + * | |
| 731 | + * @return string Archive subject, with markup and the core prefix removed. | |
| 732 | + */ | |
| 733 | + private static function archive_subject(): string { | |
| 734 | + $drop_prefix = static function (): string { | |
| 735 | + return ''; | |
| 736 | + }; | |
| 737 | + | |
| 738 | + add_filter('get_the_archive_title_prefix', $drop_prefix, 99); | |
| 739 | + | |
| 740 | + $title = (string) get_the_archive_title(); | |
| 741 | + | |
| 742 | + remove_filter('get_the_archive_title_prefix', $drop_prefix, 99); | |
| 743 | + | |
| 744 | + // The <span> core wraps the subject in survives the prefix filter. | |
| 745 | + return trim(wp_strip_all_tags($title)); | |
| 746 | + } | |
| 747 | + | |
| 748 | + /** | |
| 749 | + * Remove HTML from a title that is about to be emitted. | |
| 750 | + * | |
| 751 | + * A title carrying markup is broken twice over, in two different ways, and | |
| 752 | + * both were reaching real pages: inside `<title>` the tags render literally, | |
| 753 | + * because that element is RCDATA and never parses them; inside `og:title` | |
| 754 | + * and `twitter:title` they are attribute-escaped, so the reader sees | |
| 755 | + * `<em>` as visible text (#640). | |
| 756 | + * | |
| 757 | + * Applied at the point of emission rather than at each source, so it covers | |
| 758 | + * every branch that can produce a title — post meta, Global SEO templates, | |
| 759 | + * Site Identity templates — without each having to remember. | |
| 760 | + * | |
| 761 | + * Unconditional rather than a setting: there is no title for which markup is | |
| 762 | + * the correct output. The filter is the escape hatch for anyone who | |
| 763 | + * disagrees, and lets a site keep entities it deliberately encoded. | |
| 764 | + * | |
| 765 | + * @since 2.7.0 | |
| 766 | + * | |
| 767 | + * @param string $title Title about to be emitted. | |
| 768 | + * @return string Title with any markup removed. | |
| 769 | + */ | |
| 770 | + public static function strip_title_tags(string $title): string { | |
| 771 | + /** | |
| 772 | + * Filter whether HTML is stripped from generated titles. | |
| 773 | + * | |
| 774 | + * @since 2.7.0 | |
| 775 | + * | |
| 776 | + * @param bool $strip Whether to strip. Default true. | |
| 777 | + * @param string $title The title being emitted. | |
| 778 | + */ | |
| 779 | + if (!apply_filters('thinkrank_strip_title_tags', true, $title)) { | |
| 780 | + return $title; | |
| 781 | + } | |
| 782 | + | |
| 783 | + return trim(wp_strip_all_tags($title)); | |
| 784 | + } | |
| 785 | + | |
| 695 | 786 | public static function with_page_suffix(string $title): string { |
| 787 | + $title = self::strip_title_tags($title); | |
| 788 | + | |
| 696 | 789 | $page = self::current_page_number(); |
| 697 | 790 | |
| 698 | 791 | if ($page <= 1 || '' === $title) { |
| 699 | 792 | return $title; |
| @@ -784,11 +877,13 @@ | ||
| 784 | 877 | // Output main ThinkRank SEO header comment (only once) |
| 785 | 878 | self::note_opening_comment(); |
| 786 | 879 | |
| 787 | 880 | // Ensure description is within optimal length (150-160 characters) |
| 788 | - if (strlen($description) > 160) { | |
| 789 | - $description = wp_trim_words($description, 25, '...'); | |
| 790 | - } | |
| 881 | + // Measure and cut in CHARACTERS. strlen() counts bytes, so a Thai or | |
| 882 | + // CJK description tripped this limit at a third of its length, and | |
| 883 | + // wp_trim_words() then cut by a unit the locale chooses — 25 words in | |
| 884 | + // English, 25 characters in Thai (#687). | |
| 885 | + $description = \ThinkRank\Core\Seo_Text::trim_to_length($description); | |
| 791 | 886 | |
| 792 | 887 | echo "<!-- ThinkRank SEO Meta Description -->\n"; |
| 793 | 888 | echo '<meta name="description" content="' . esc_attr($description) . '" />' . "\n"; |
| 794 | 889 | echo "<!-- /ThinkRank SEO Meta Description -->\n"; |
| @@ -1300,9 +1395,9 @@ | ||
| 1300 | 1395 | * |
| 1301 | 1396 | * @param array $og_tags Open Graph tags array |
| 1302 | 1397 | * @return void |
| 1303 | 1398 | */ |
| 1304 | - private function output_social_og_tags(array $og_tags): void { | |
| 1399 | + private function output_social_og_tags(array $og_tags, array $extra_images = []): void { | |
| 1305 | 1400 | // Honor the thinkrank_og_type filter here too — this "Enhanced" path is |
| 1306 | 1401 | // the active OG emitter, so add-ons (e.g. Pro's WooCommerce module which |
| 1307 | 1402 | // sets 'product' on product pages) must be applied to it, not only to |
| 1308 | 1403 | // output_open_graph_tags(). |
| @@ -1346,12 +1441,62 @@ | ||
| 1346 | 1441 | echo '<meta property="' . esc_attr($property) . '" content="' . $this->esc_meta_value($property, $content) . '" />' . "\n"; |
| 1347 | 1442 | } |
| 1348 | 1443 | } |
| 1349 | 1444 | |
| 1445 | + // Alternatives, after the primary and everything belonging to it. | |
| 1446 | + // Order is the whole point: a consumer reads og:image tags in document | |
| 1447 | + // order and treats the first as primary, and a structured property | |
| 1448 | + // attaches to the most recently declared image — so each alternative's | |
| 1449 | + // companions have to follow its own URL, not be grouped at the end. | |
| 1450 | + self::output_extra_og_images($extra_images); | |
| 1451 | + | |
| 1350 | 1452 | echo "<!-- /ThinkRank SEO Open Graph Tags -->\n"; |
| 1351 | 1453 | } |
| 1352 | 1454 | |
| 1353 | 1455 | /** |
| 1456 | + * Emit the secondary og:image tags a page offers. | |
| 1457 | + * | |
| 1458 | + * Shared by the enhanced and basic emitters so both describe an | |
| 1459 | + * alternative image the same way (#636). | |
| 1460 | + * | |
| 1461 | + * @since 2.7.0 | |
| 1462 | + * | |
| 1463 | + * @param array $images Each with url, and width/height/type/alt where known. | |
| 1464 | + * @return void | |
| 1465 | + */ | |
| 1466 | + private static function output_extra_og_images(array $images): void { | |
| 1467 | + foreach ($images as $image) { | |
| 1468 | + $url = isset($image['url']) ? (string) $image['url'] : ''; | |
| 1469 | + | |
| 1470 | + if ('' === $url) { | |
| 1471 | + continue; | |
| 1472 | + } | |
| 1473 | + | |
| 1474 | + echo '<meta property="og:image" content="' . esc_url($url) . '" />' . "\n"; | |
| 1475 | + | |
| 1476 | + if (strpos($url, 'https://') === 0) { | |
| 1477 | + echo '<meta property="og:image:secure_url" content="' . esc_url($url) . '" />' . "\n"; | |
| 1478 | + } | |
| 1479 | + | |
| 1480 | + // Only what is actually known: a dimension guessed for a remote | |
| 1481 | + // image is a number a consumer lays a card out with before it has | |
| 1482 | + // fetched the file. | |
| 1483 | + if (!empty($image['width']) && !empty($image['height'])) { | |
| 1484 | + echo '<meta property="og:image:width" content="' . esc_attr((string) $image['width']) . '" />' . "\n"; | |
| 1485 | + echo '<meta property="og:image:height" content="' . esc_attr((string) $image['height']) . '" />' . "\n"; | |
| 1486 | + } | |
| 1487 | + | |
| 1488 | + if (!empty($image['type'])) { | |
| 1489 | + echo '<meta property="og:image:type" content="' . esc_attr((string) $image['type']) . '" />' . "\n"; | |
| 1490 | + } | |
| 1491 | + | |
| 1492 | + if (!empty($image['alt'])) { | |
| 1493 | + echo '<meta property="og:image:alt" content="' . esc_attr((string) $image['alt']) . '" />' . "\n"; | |
| 1494 | + } | |
| 1495 | + } | |
| 1496 | + } | |
| 1497 | + | |
| 1498 | + /** | |
| 1354 | 1499 | * Output social media Twitter Card tags from Social Meta Manager |
| 1355 | 1500 | * |
| 1356 | 1501 | * @param array $twitter_tags Twitter Card tags array |
| 1357 | 1502 | * @return void |
| @@ -1514,9 +1659,12 @@ | ||
| 1514 | 1659 | // The Social Meta Manager ran, so it owns Open Graph output. If OG is |
| 1515 | 1660 | // toggled off, emit nothing — do NOT fall through to the basic |
| 1516 | 1661 | // emitter (which would re-add a full OG block despite the toggle). |
| 1517 | 1662 | if (!empty($social_data['og_enabled'])) { |
| 1518 | - $this->output_social_og_tags($social_data['og_tags']); | |
| 1663 | + $this->output_social_og_tags( | |
| 1664 | + $social_data['og_tags'], | |
| 1665 | + $social_data['og_extra_images'] ?? [] | |
| 1666 | + ); | |
| 1519 | 1667 | } |
| 1520 | 1668 | return; |
| 1521 | 1669 | } |
| 1522 | 1670 | |
| @@ -1584,9 +1732,9 @@ | ||
| 1584 | 1732 | // "There is no excerpt because this is a protected post." placeholder, |
| 1585 | 1733 | // so this is not a leak — but publishing that sentence as the social |
| 1586 | 1734 | // description is worse than publishing none (#363). |
| 1587 | 1735 | if (!$description && !$this->is_content_password_protected()) { |
| 1588 | - $description = is_singular() ? wp_trim_words(get_the_excerpt(), 30) : get_bloginfo('description'); | |
| 1736 | + $description = is_singular() ? \ThinkRank\Core\Seo_Text::trim_words(get_the_excerpt(), 30) : get_bloginfo('description'); | |
| 1589 | 1737 | } |
| 1590 | 1738 | |
| 1591 | 1739 | $url = is_singular() ? get_permalink() : home_url(); |
| 1592 | 1740 | $site_name = $this->site_identity_data && !empty($this->site_identity_data['identity']['site_name']) |
| @@ -1614,11 +1762,11 @@ | ||
| 1614 | 1762 | $og_type = apply_filters('thinkrank_og_type', $og_type); |
| 1615 | 1763 | |
| 1616 | 1764 | echo "<!-- ThinkRank SEO Open Graph Meta Tags -->\n"; |
| 1617 | 1765 | echo "<meta property=\"og:type\" content=\"" . esc_attr($og_type) . "\" />\n"; |
| 1618 | - echo "<meta property=\"og:title\" content=\"" . esc_attr($title) . "\" />\n"; | |
| 1766 | + echo "<meta property=\"og:title\" content=\"" . esc_attr(self::strip_title_tags($title)) . "\" />\n"; | |
| 1619 | 1767 | echo "<meta property=\"og:description\" content=\"" . esc_attr($description) . "\" />\n"; |
| 1620 | - echo "<meta property=\"og:url\" content=\"" . esc_url($url) . "\" />\n"; | |
| 1768 | + echo "<meta property=\"og:url\" content=\"" . esc_url(\ThinkRank\SEO\Url_Scheme::apply($url)) . "\" />\n"; | |
| 1621 | 1769 | echo "<meta property=\"og:site_name\" content=\"" . esc_attr($site_name) . "\" />\n"; |
| 1622 | 1770 | /** |
| 1623 | 1771 | * Filter the og:locale value. |
| 1624 | 1772 | * |
| @@ -1635,14 +1783,17 @@ | ||
| 1635 | 1783 | $og_locale = (string) apply_filters('thinkrank_og_locale', get_locale()); |
| 1636 | 1784 | echo "<meta property=\"og:locale\" content=\"" . esc_attr($og_locale) . "\" />\n"; |
| 1637 | 1785 | |
| 1638 | 1786 | // Add OG image — per-post override > featured image |
| 1787 | + $primary_og_image = ''; | |
| 1639 | 1788 | if (is_singular() && $this->current_post_id) { |
| 1640 | 1789 | if (!empty($og_image_override)) { |
| 1790 | + $primary_og_image = (string) $og_image_override; | |
| 1641 | 1791 | echo "<meta property=\"og:image\" content=\"" . esc_url($og_image_override) . "\" />\n"; |
| 1642 | 1792 | echo "<meta property=\"og:image:secure_url\" content=\"" . esc_url($og_image_override) . "\" />\n"; |
| 1643 | 1793 | } elseif (has_post_thumbnail($this->current_post_id)) { |
| 1644 | 1794 | $image_url = get_the_post_thumbnail_url($this->current_post_id, 'large'); |
| 1795 | + $primary_og_image = (string) $image_url; | |
| 1645 | 1796 | echo "<meta property=\"og:image\" content=\"" . esc_url($image_url) . "\" />\n"; |
| 1646 | 1797 | echo "<meta property=\"og:image:secure_url\" content=\"" . esc_url($image_url) . "\" />\n"; |
| 1647 | 1798 | |
| 1648 | 1799 | // Get image dimensions and alt text |
| @@ -1671,8 +1822,30 @@ | ||
| 1671 | 1822 | echo "<meta property=\"og:image:alt\" content=\"" . esc_attr($image_alt) . "\" />\n"; |
| 1672 | 1823 | } |
| 1673 | 1824 | } |
| 1674 | 1825 | |
| 1826 | + // Alternatives, same as the enhanced emitter above. This path only | |
| 1827 | + // runs when the Social Meta Manager is unavailable, but the issue | |
| 1828 | + // reported against it (#636) and a site that lands here should not | |
| 1829 | + // silently lose a feature it switched on. | |
| 1830 | + if (!empty($primary_og_image)) { | |
| 1831 | + $social_settings = $this->social_manager | |
| 1832 | + ? $this->social_manager->get_settings( | |
| 1833 | + $this->current_context === 'homepage' ? 'site' : $this->current_context, | |
| 1834 | + $this->current_post_id | |
| 1835 | + ) | |
| 1836 | + : []; | |
| 1837 | + | |
| 1838 | + if (!empty($social_settings['og_multiple_images'])) { | |
| 1839 | + self::output_extra_og_images( | |
| 1840 | + \ThinkRank\SEO\Social_Images::additional( | |
| 1841 | + (int) $this->current_post_id, | |
| 1842 | + $primary_og_image | |
| 1843 | + ) | |
| 1844 | + ); | |
| 1845 | + } | |
| 1846 | + } | |
| 1847 | + | |
| 1675 | 1848 | // Add article specific tags for posts only |
| 1676 | 1849 | if ($og_type === 'article') { |
| 1677 | 1850 | echo '<meta property="article:published_time" content="' . esc_attr(get_the_date('c', $this->current_post_id)) . '" />' . "\n"; |
| 1678 | 1851 | echo '<meta property="article:modified_time" content="' . esc_attr(get_the_modified_date('c', $this->current_post_id)) . '" />' . "\n"; |
| @@ -1798,9 +1971,9 @@ | ||
| 1798 | 1971 | // "There is no excerpt because this is a protected post." placeholder, |
| 1799 | 1972 | // so this is not a leak — but publishing that sentence as the social |
| 1800 | 1973 | // description is worse than publishing none (#363). |
| 1801 | 1974 | if (!$description && !$this->is_content_password_protected()) { |
| 1802 | - $description = is_singular() ? wp_trim_words(get_the_excerpt(), 30) : get_bloginfo('description'); | |
| 1975 | + $description = is_singular() ? \ThinkRank\Core\Seo_Text::trim_words(get_the_excerpt(), 30) : get_bloginfo('description'); | |
| 1803 | 1976 | } |
| 1804 | 1977 | |
| 1805 | 1978 | // Determine card type based on image availability |
| 1806 | 1979 | $card_type = 'summary'; |
| @@ -1809,9 +1982,9 @@ | ||
| 1809 | 1982 | } |
| 1810 | 1983 | |
| 1811 | 1984 | echo "<!-- ThinkRank SEO Twitter Card Meta Tags -->\n"; |
| 1812 | 1985 | echo '<meta name="twitter:card" content="' . esc_attr($card_type) . '" />' . "\n"; |
| 1813 | - echo "<meta name=\"twitter:title\" content=\"" . esc_attr($title) . "\" />\n"; | |
| 1986 | + echo "<meta name=\"twitter:title\" content=\"" . esc_attr(self::strip_title_tags($title)) . "\" />\n"; | |
| 1814 | 1987 | echo "<meta name=\"twitter:description\" content=\"" . esc_attr($description) . "\" />\n"; |
| 1815 | 1988 | |
| 1816 | 1989 | // Add Twitter image with proper fallback priority |
| 1817 | 1990 | $twitter_image_url = $this->get_twitter_image_with_fallback(); |
| @@ -1886,8 +2059,13 @@ | ||
| 1886 | 2059 | if (empty($canonical_url)) { |
| 1887 | 2060 | return; |
| 1888 | 2061 | } |
| 1889 | 2062 | |
| 2063 | + // After the filter, so a canonical an add-on supplied is normalized | |
| 2064 | + // too — and a cross-domain one is left alone, since Url_Scheme only | |
| 2065 | + // touches URLs on this site's own host. | |
| 2066 | + $canonical_url = \ThinkRank\SEO\Url_Scheme::apply($canonical_url); | |
| 2067 | + | |
| 1890 | 2068 | echo "<!-- ThinkRank SEO Canonical URL -->\n"; |
| 1891 | 2069 | echo "<link rel=\"canonical\" href=\"" . esc_url($canonical_url) . "\" />\n"; |
| 1892 | 2070 | echo "<!-- /ThinkRank SEO Canonical URL -->\n"; |
| 1893 | 2071 | |
| @@ -1934,9 +2112,9 @@ | ||
| 1934 | 2112 | |
| 1935 | 2113 | if ($current > 1) { |
| 1936 | 2114 | printf( |
| 1937 | 2115 | "<link rel=\"prev\" href=\"%s\" />\n", |
| 1938 | - esc_url(self::with_pagination($base, $current - 1)) | |
| 2116 | + esc_url(\ThinkRank\SEO\Url_Scheme::apply(self::with_pagination($base, $current - 1))) | |
| 1939 | 2117 | ); |
| 1940 | 2118 | } |
| 1941 | 2119 | |
| 1942 | 2120 | if ($current < $total) { |
| @@ -1941,9 +2119,9 @@ | ||
| 1941 | 2119 | |
| 1942 | 2120 | if ($current < $total) { |
| 1943 | 2121 | printf( |
| 1944 | 2122 | "<link rel=\"next\" href=\"%s\" />\n", |
| 1945 | - esc_url(self::with_pagination($base, $current + 1)) | |
| 2123 | + esc_url(\ThinkRank\SEO\Url_Scheme::apply(self::with_pagination($base, $current + 1))) | |
| 1946 | 2124 | ); |
| 1947 | 2125 | } |
| 1948 | 2126 | } |
| 1949 | 2127 | |
| @@ -2443,9 +2621,9 @@ | ||
| 2443 | 2621 | // Stripped: get_the_archive_title() wraps its subject in a |
| 2444 | 2622 | // <span>, and this placeholder feeds the document <title> as |
| 2445 | 2623 | // well as og:title and twitter:title — a date archive rendered |
| 2446 | 2624 | // as "Month: <span>August 2026</span> | Site". |
| 2447 | - $placeholders['%archive_title%'] = wp_strip_all_tags((string) get_the_archive_title()); | |
| 2625 | + $placeholders['%archive_title%'] = self::archive_subject(); | |
| 2448 | 2626 | break; |
| 2449 | 2627 | |
| 2450 | 2628 | case 'homepage': |
| 2451 | 2629 | // The page template resolved for a static posts page needs the |
| @@ -2640,11 +2818,13 @@ | ||
| 2640 | 2818 | if ($description === '') { |
| 2641 | 2819 | return null; |
| 2642 | 2820 | } |
| 2643 | 2821 | |
| 2644 | - if (strlen($description) > 160) { | |
| 2645 | - $description = wp_trim_words($description, 25, '...'); | |
| 2646 | - } | |
| 2822 | + // Measure and cut in CHARACTERS. strlen() counts bytes, so a Thai or | |
| 2823 | + // CJK description tripped this limit at a third of its length, and | |
| 2824 | + // wp_trim_words() then cut by a unit the locale chooses — 25 words in | |
| 2825 | + // English, 25 characters in Thai (#687). | |
| 2826 | + $description = \ThinkRank\Core\Seo_Text::trim_to_length($description); | |
| 2647 | 2827 | |
| 2648 | 2828 | return $description; |
| 2649 | 2829 | } |
| 2650 | 2830 | |
| @@ -2691,11 +2871,13 @@ | ||
| 2691 | 2871 | $description = preg_replace('/\s+/', ' ', $description); |
| 2692 | 2872 | $description = trim($description); |
| 2693 | 2873 | |
| 2694 | 2874 | // Ensure description doesn't exceed recommended length (160 characters) |
| 2695 | - if (strlen($description) > 160) { | |
| 2696 | - $description = wp_trim_words($description, 25, '...'); | |
| 2697 | - } | |
| 2875 | + // Measure and cut in CHARACTERS. strlen() counts bytes, so a Thai or | |
| 2876 | + // CJK description tripped this limit at a third of its length, and | |
| 2877 | + // wp_trim_words() then cut by a unit the locale chooses — 25 words in | |
| 2878 | + // English, 25 characters in Thai (#687). | |
| 2879 | + $description = \ThinkRank\Core\Seo_Text::trim_to_length($description); | |
| 2698 | 2880 | |
| 2699 | 2881 | return $description; |
| 2700 | 2882 | } |
| 2701 | 2883 | |
| @@ -2780,10 +2962,22 @@ | ||
| 2780 | 2962 | $context_type, |
| 2781 | 2963 | $context_id |
| 2782 | 2964 | ); |
| 2783 | 2965 | |
| 2966 | + // A deployed node is a snapshot from Deploy time and outranks | |
| 2967 | + // the automatic node, so page and article types would publish | |
| 2968 | + // a frozen excerpt instead of the description the head | |
| 2969 | + // resolves. Give them the live one, as the automatic node has. | |
| 2970 | + $context_post = get_post($context_id); | |
| 2971 | + | |
| 2784 | 2972 | foreach ($page_specific_schemas as $schema_type => $schema_info) { |
| 2785 | - Schema_Graph::instance()->add_primary($schema_info['data'], (string) $schema_type, 'schema_manager'); | |
| 2973 | + $node = $schema_info['data']; | |
| 2974 | + | |
| 2975 | + if ($this->global_seo_schema && $context_post instanceof \WP_Post) { | |
| 2976 | + $node = $this->global_seo_schema->refresh_deployed_description($node, (string) $schema_type, $context_post); | |
| 2977 | + } | |
| 2978 | + | |
| 2979 | + Schema_Graph::instance()->add_primary($node, (string) $schema_type, 'schema_manager'); | |
| 2786 | 2980 | } |
| 2787 | 2981 | $has_schema_manager_output = true; |
| 2788 | 2982 | } |
| 2789 | 2983 | } |
| @@ -2841,21 +3035,49 @@ | ||
| 2841 | 3035 | 'url' => home_url('/'), |
| 2842 | 3036 | ]; |
| 2843 | 3037 | |
| 2844 | 3038 | $description = !empty($settings['site_description']) ? $settings['site_description'] : get_bloginfo('description'); |
| 3039 | + // The tagline is stored esc_html()'d by sanitize_option(), so a site | |
| 3040 | + // called "Fish & Chips" published `&` literally in its WebSite | |
| 3041 | + // node; nothing decodes JSON-LD downstream. | |
| 3042 | + $description = \ThinkRank\Core\Seo_Text::normalize_schema_text((string) $description); | |
| 2845 | 3043 | if (!empty($description)) { |
| 2846 | 3044 | $schema['description'] = $description; |
| 2847 | 3045 | } |
| 2848 | 3046 | |
| 2849 | - $schema['potentialAction'] = [ | |
| 2850 | - '@type' => 'SearchAction', | |
| 2851 | - 'target' => [ | |
| 2852 | - '@type' => 'EntryPoint', | |
| 2853 | - 'urlTemplate' => home_url('/?s={search_term_string}'), | |
| 2854 | - ], | |
| 2855 | - 'query-input' => 'required name=search_term_string', | |
| 2856 | - ]; | |
| 3047 | + // Site Identity has accepted an alternate name since the setup wizard | |
| 3048 | + // shipped, and the MCP ability describes it as "published as schema | |
| 3049 | + // alternateName" — but no producer ever read it, so the promise was | |
| 3050 | + // false and every imported Yoast/Rank Math value sat unused (#692). | |
| 3051 | + $alternate_name = \ThinkRank\SEO\Site_Identity_Manager::alternate_name_for_schema($settings['alternate_name'] ?? null); | |
| 3052 | + if (null !== $alternate_name) { | |
| 3053 | + $schema['alternateName'] = $alternate_name; | |
| 3054 | + } | |
| 2857 | 3055 | |
| 3056 | + // The sitelinks searchbox switch was honoured only for a deployed | |
| 3057 | + // WebSite row; this live fallback added potentialAction unconditionally, | |
| 3058 | + // so website_enable_search = 0 still shipped the SearchAction (#688). | |
| 3059 | + // Absent means not configured, which stays enabled. | |
| 3060 | + $search_enabled = true; | |
| 3061 | + if ($this->schema_manager) { | |
| 3062 | + $schema_settings = $this->schema_manager->get_settings('site', null); | |
| 3063 | + | |
| 3064 | + if (array_key_exists('website_enable_search', $schema_settings)) { | |
| 3065 | + $search_enabled = !empty($schema_settings['website_enable_search']); | |
| 3066 | + } | |
| 3067 | + } | |
| 3068 | + | |
| 3069 | + if ($search_enabled) { | |
| 3070 | + $schema['potentialAction'] = [ | |
| 3071 | + '@type' => 'SearchAction', | |
| 3072 | + 'target' => [ | |
| 3073 | + '@type' => 'EntryPoint', | |
| 3074 | + 'urlTemplate' => home_url('/?s={search_term_string}'), | |
| 3075 | + ], | |
| 3076 | + 'query-input' => 'required name=search_term_string', | |
| 3077 | + ]; | |
| 3078 | + } | |
| 3079 | + | |
| 2858 | 3080 | return $schema; |
| 2859 | 3081 | } |
| 2860 | 3082 | |
| 2861 | 3083 | /** |
| @@ -3066,8 +3288,22 @@ | ||
| 3066 | 3288 | if (empty($settings['breadcrumbs_enabled'])) { |
| 3067 | 3289 | return; |
| 3068 | 3290 | } |
| 3069 | 3291 | |
| 3292 | + // Schema Manager's own breadcrumb switch. Only Site Identity's | |
| 3293 | + // breadcrumbs_enabled was consulted here, so enable_breadcrumbs_schema | |
| 3294 | + // = 0 removed a deployed BreadcrumbList row and left this live one | |
| 3295 | + // emitting the node anyway (#688). Absent means not configured, which | |
| 3296 | + // stays enabled. | |
| 3297 | + if ($this->schema_manager) { | |
| 3298 | + $schema_settings = $this->schema_manager->get_settings('site', null); | |
| 3299 | + | |
| 3300 | + if (array_key_exists('enable_breadcrumbs_schema', $schema_settings) | |
| 3301 | + && empty($schema_settings['enable_breadcrumbs_schema'])) { | |
| 3302 | + return; | |
| 3303 | + } | |
| 3304 | + } | |
| 3305 | + | |
| 3070 | 3306 | $breadcrumbs = $this->generate_breadcrumbs($settings); |
| 3071 | 3307 | |
| 3072 | 3308 | if (!empty($breadcrumbs['schema'])) { |
| 3073 | 3309 | Schema_Graph::instance()->add_supporting($breadcrumbs['schema'], 'BreadcrumbList'); |
| @@ -3322,8 +3558,102 @@ | ||
| 3322 | 3558 | * @since 1.32.0 |
| 3323 | 3559 | * |
| 3324 | 3560 | * @return void |
| 3325 | 3561 | */ |
| 3562 | + /** | |
| 3563 | + * Serve a ThinkRank sitemap document for this request, when it is one. | |
| 3564 | + * | |
| 3565 | + * Only acts in dynamic delivery mode. In static mode a real file exists and | |
| 3566 | + * the web server returns it without WordPress ever loading, so answering | |
| 3567 | + * here as well would mean two sources for the same bytes. | |
| 3568 | + * | |
| 3569 | + * @since 2.9.0 | |
| 3570 | + * | |
| 3571 | + * @return void | |
| 3572 | + */ | |
| 3573 | + public function maybe_serve_sitemap(): void { | |
| 3574 | + $filename = $this->requested_sitemap_filename(); | |
| 3575 | + if ('' === $filename) { | |
| 3576 | + return; | |
| 3577 | + } | |
| 3578 | + | |
| 3579 | + try { | |
| 3580 | + // Read-only instance: passing false keeps it from registering a | |
| 3581 | + // second copy of the auto-generation hooks. | |
| 3582 | + $generator = new \ThinkRank\SEO\Sitemap_Generator(false); | |
| 3583 | + $settings = $generator->get_settings('site'); | |
| 3584 | + | |
| 3585 | + if (empty($settings['enabled'])) { | |
| 3586 | + return; | |
| 3587 | + } | |
| 3588 | + | |
| 3589 | + if ('dynamic' !== $generator->resolve_delivery_mode($settings)) { | |
| 3590 | + return; | |
| 3591 | + } | |
| 3592 | + | |
| 3593 | + if (!$generator->publishes_document_name($filename, $settings)) { | |
| 3594 | + return; | |
| 3595 | + } | |
| 3596 | + | |
| 3597 | + $xml = $generator->render_document($filename, $settings); | |
| 3598 | + } catch (\Throwable $e) { | |
| 3599 | + // A failed render must not replace the sitemap with a fatal. Leave | |
| 3600 | + // the request alone so WordPress answers as it otherwise would. | |
| 3601 | + return; | |
| 3602 | + } | |
| 3603 | + | |
| 3604 | + if (!is_string($xml) || '' === trim($xml)) { | |
| 3605 | + return; | |
| 3606 | + } | |
| 3607 | + | |
| 3608 | + status_header(200); | |
| 3609 | + header('Content-Type: application/xml; charset=UTF-8'); | |
| 3610 | + header('X-Robots-Tag: noindex, follow', true); | |
| 3611 | + | |
| 3612 | + // Built XML, escaped by the builders as they assemble it; escaping the | |
| 3613 | + // document here would corrupt it. | |
| 3614 | + echo $xml; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 3615 | + exit; | |
| 3616 | + } | |
| 3617 | + | |
| 3618 | + /** | |
| 3619 | + * The sitemap file name this request is asking for, if it looks like one. | |
| 3620 | + * | |
| 3621 | + * Deliberately a cheap shape test. Whether the site actually publishes the | |
| 3622 | + * name is settled by the caller against the generator, so that a request | |
| 3623 | + * for someone else's sitemap is never answered here. | |
| 3624 | + * | |
| 3625 | + * @since 2.9.0 | |
| 3626 | + * | |
| 3627 | + * @return string File name, or '' when this is not a sitemap request. | |
| 3628 | + */ | |
| 3629 | + private function requested_sitemap_filename(): string { | |
| 3630 | + if (empty($_SERVER['REQUEST_URI'])) { | |
| 3631 | + return ''; | |
| 3632 | + } | |
| 3633 | + | |
| 3634 | + $path = wp_parse_url(sanitize_text_field(wp_unslash($_SERVER['REQUEST_URI'])), PHP_URL_PATH); | |
| 3635 | + if (!is_string($path) || '' === $path) { | |
| 3636 | + return ''; | |
| 3637 | + } | |
| 3638 | + | |
| 3639 | + // Strip the install's home path so subdirectory installs match too. | |
| 3640 | + $home_path = (string) wp_parse_url(home_url('/'), PHP_URL_PATH); | |
| 3641 | + if ('' !== $home_path && '/' !== $home_path && 0 === strpos($path, $home_path)) { | |
| 3642 | + $path = substr($path, strlen($home_path)); | |
| 3643 | + } | |
| 3644 | + | |
| 3645 | + $candidate = strtolower(trim($path, '/')); | |
| 3646 | + | |
| 3647 | + // One path segment ending in .xml. Anything nested is not a file we | |
| 3648 | + // publish to the web root. | |
| 3649 | + if ('' === $candidate || strpos($candidate, '/') !== false) { | |
| 3650 | + return ''; | |
| 3651 | + } | |
| 3652 | + | |
| 3653 | + return substr($candidate, -4) === '.xml' ? $candidate : ''; | |
| 3654 | + } | |
| 3655 | + | |
| 3326 | 3656 | public function maybe_serve_llms_txt(): void { |
| 3327 | 3657 | if (!$this->is_llms_txt_request()) { |
| 3328 | 3658 | return; |
| 3329 | 3659 | } |
| @@ -3524,11 +3854,22 @@ | ||
| 3524 | 3854 | // second copy of the save_post/term auto-generation hooks. |
| 3525 | 3855 | $generator = new \ThinkRank\SEO\Sitemap_Generator(false); |
| 3526 | 3856 | $settings = $generator->get_settings('site'); |
| 3527 | 3857 | |
| 3858 | + // "Can ThinkRank actually answer its sitemap URL right now?" In | |
| 3859 | + // static mode that means the file is on disk; in dynamic mode | |
| 3860 | + // maybe_serve_sitemap() answers it, so there is nothing to look | |
| 3861 | + // for. Keeping the file test as the only answer would have left | |
| 3862 | + // core's sitemap in place on every dynamic site, which is the | |
| 3863 | + // crawl conflict this suppression exists to prevent (#752). | |
| 3864 | + // The #346 behaviour is unchanged: a static site with nothing | |
| 3865 | + // published still falls through to core rather than 404ing. | |
| 3866 | + $can_serve = 'dynamic' === $generator->resolve_delivery_mode($settings) | |
| 3867 | + || $generator->primary_sitemap_file_exists($settings); | |
| 3868 | + | |
| 3528 | 3869 | $this->thinkrank_sitemap_enabled = !empty($settings['enabled']) |
| 3529 | 3870 | && !$this->publishes_at_core_sitemap_url($settings) |
| 3530 | - && $generator->primary_sitemap_file_exists($settings); | |
| 3871 | + && $can_serve; | |
| 3531 | 3872 | |
| 3532 | 3873 | if ($this->thinkrank_sitemap_enabled) { |
| 3533 | 3874 | $this->thinkrank_sitemap_url = $generator->get_primary_sitemap_url($settings); |
| 3534 | 3875 | } |
