| @@ -74,9 +74,12 @@ | ||
| 74 | 74 | 'image_min_width' => 600, |
| 75 | 75 | 'image_min_height' => 900, |
| 76 | 76 | 'image_recommended_ratio' => 0.67, // 2:3 ratio |
| 77 | 77 | 'title_max_length' => 100, |
| 78 | - 'description_max_length' => 500 | |
| 78 | + // Pinterest has no tag of its own: it reads og:description, which | |
| 79 | + // the frontend caps at max_description_length. Previewing 500 | |
| 80 | + // promised up to 340 characters that are never emitted. | |
| 81 | + 'description_max_length' => 160 | |
| 79 | 82 | ], |
| 80 | 83 | 'whatsapp' => [ |
| 81 | 84 | 'og_required' => ['og:title', 'og:type', 'og:image', 'og:url'], |
| 82 | 85 | 'og_recommended' => ['og:description'], |
| @@ -145,14 +148,23 @@ | ||
| 145 | 148 | // og:title must render the full resolved Open Graph title. The 60-char |
| 146 | 149 | // cap in optimize_title_for_platform() is an SEO-title recommendation for |
| 147 | 150 | // search results and does not apply to the og:title social tag, so use the |
| 148 | 151 | // resolved title verbatim (falling back to the site name when empty). |
| 149 | - $og_tags['og:title'] = ($data['title'] ?? '') !== '' ? $data['title'] : get_bloginfo('name'); | |
| 152 | + // Stripped: a title carrying markup is attribute-escaped into this tag, | |
| 153 | + // so the reader sees a literal `<em>` rather than emphasis (#640). | |
| 154 | + $og_tags['og:title'] = \ThinkRank\Frontend\SEO_Manager::strip_title_tags( | |
| 155 | + ($data['title'] ?? '') !== '' ? (string) $data['title'] : (string) get_bloginfo('name') | |
| 156 | + ); | |
| 150 | 157 | // `?:` rather than `??`: the key is always present, seeded as '', so the |
| 151 | 158 | // null-coalesce could never reach the fallback. og:url was emitted empty |
| 152 | 159 | // and then dropped by the !empty() guard in output_social_og_tags(), |
| 153 | 160 | // which is why archives carried no og:url at all (#388). |
| 154 | - $og_tags['og:url'] = ($data['url'] ?? '') !== '' ? $data['url'] : $this->get_current_url(); | |
| 161 | + // Normalized for the site's scheme preference, so og:url and the | |
| 162 | + // canonical can never disagree about http vs https (#638); the same | |
| 163 | + // consistency #182 was about. | |
| 164 | + $og_tags['og:url'] = \ThinkRank\SEO\Url_Scheme::apply( | |
| 165 | + ($data['url'] ?? '') !== '' ? $data['url'] : $this->get_current_url() | |
| 166 | + ); | |
| 155 | 167 | |
| 156 | 168 | // Image handling with optimization |
| 157 | 169 | if (!empty($data['image'])) { |
| 158 | 170 | $optimized_image = $this->optimize_image_for_platform($data['image'], $platform); |
| @@ -219,9 +231,11 @@ | ||
| 219 | 231 | // to the resolved og:title/SEO title. Render it in full — the length cap |
| 220 | 232 | // in optimize_title_for_platform() is an SEO-title recommendation for |
| 221 | 233 | // search results, not a rule for the twitter:title social tag. |
| 222 | 234 | $twitter_title = ($data['twitter_title'] ?? '') !== '' ? $data['twitter_title'] : ($data['title'] ?? ''); |
| 223 | - $twitter_tags['twitter:title'] = $twitter_title !== '' ? $twitter_title : get_bloginfo('name'); | |
| 235 | + $twitter_tags['twitter:title'] = \ThinkRank\Frontend\SEO_Manager::strip_title_tags( | |
| 236 | + $twitter_title !== '' ? (string) $twitter_title : (string) get_bloginfo('name') | |
| 237 | + ); | |
| 224 | 238 | |
| 225 | 239 | // Recommended tags. Prefer a per-object Twitter-specific description, |
| 226 | 240 | // falling back to the resolved OG/meta description — mirroring the |
| 227 | 241 | // twitter:title cascade above. This lookup did not exist, so a Twitter |
| @@ -954,8 +968,12 @@ | ||
| 954 | 968 | |
| 955 | 969 | $settings = $this->get_settings($context_type, $context_id); |
| 956 | 970 | $output = [ |
| 957 | 971 | 'og_tags' => [], |
| 972 | + // Secondary og:image entries. A separate list because $og_tags is | |
| 973 | + // keyed by property name and so can hold exactly one 'og:image' | |
| 974 | + // (#636); the emitter writes these straight after the primary. | |
| 975 | + 'og_extra_images' => [], | |
| 958 | 976 | 'twitter_tags' => [], |
| 959 | 977 | 'meta_tags' => [], |
| 960 | 978 | 'platform_tags' => [], |
| 961 | 979 | // Per-feature flags so each emitter can honor its own toggle. The |
| @@ -989,8 +1007,18 @@ | ||
| 989 | 1007 | // Add custom OG tags |
| 990 | 1008 | if (!empty($settings['custom_og_tags'])) { |
| 991 | 1009 | $output['og_tags'] = array_merge($output['og_tags'], $settings['custom_og_tags']); |
| 992 | 1010 | } |
| 1011 | + | |
| 1012 | + // Alternatives to offer after the primary image. Collected from the | |
| 1013 | + // resolved primary rather than re-deriving it, so the two can never | |
| 1014 | + // disagree about which image is the main one. | |
| 1015 | + if (!empty($settings['og_multiple_images'])) { | |
| 1016 | + $output['og_extra_images'] = Social_Images::additional( | |
| 1017 | + (int) $context_id, | |
| 1018 | + (string) ($output['og_tags']['og:image'] ?? '') | |
| 1019 | + ); | |
| 1020 | + } | |
| 993 | 1021 | } |
| 994 | 1022 | |
| 995 | 1023 | // Generate Twitter Card tags if enabled |
| 996 | 1024 | if ($twitter_enabled) { |
| @@ -1026,8 +1054,33 @@ | ||
| 1026 | 1054 | 'default_image', |
| 1027 | 1055 | ]; |
| 1028 | 1056 | |
| 1029 | 1057 | /** |
| 1058 | + * Site-wide switches with no per-context equivalent. | |
| 1059 | + * | |
| 1060 | + * Unlike INHERITED_SITE_KEYS above, these must inherit their site value | |
| 1061 | + * even when it is FALSE. The empty()-guarded loop used for images can only | |
| 1062 | + * ever propagate "on", which is right for an image URL (empty means "not | |
| 1063 | + * configured") and wrong for a boolean, where false is a deliberate choice. | |
| 1064 | + * | |
| 1065 | + * Without this the master Open Graph / Twitter Cards switches were honoured | |
| 1066 | + * on the homepage (mapped to the `site` context) and ignored on every post | |
| 1067 | + * and page, which read as though the toggle had worked (#557). | |
| 1068 | + * | |
| 1069 | + * @since 2.2.0 | |
| 1070 | + * @var string[] | |
| 1071 | + */ | |
| 1072 | + private const SITE_ONLY_KEYS = [ | |
| 1073 | + 'enable_open_graph', | |
| 1074 | + 'enable_twitter_cards', | |
| 1075 | + // Same shape as the two above and the same trap: a site-wide switch | |
| 1076 | + // with no per-context equivalent. Left out, it read as on while the | |
| 1077 | + // homepage rendered and as off on every post and page — which is where | |
| 1078 | + // the alternatives it controls actually come from (#636). | |
| 1079 | + 'og_multiple_images', | |
| 1080 | + ]; | |
| 1081 | + | |
| 1082 | + /** | |
| 1030 | 1083 | * Get settings for a context, inheriting the site-wide default images |
| 1031 | 1084 | * |
| 1032 | 1085 | * Two corrections over the generic lookup: |
| 1033 | 1086 | * |
| @@ -1060,8 +1113,18 @@ | ||
| 1060 | 1113 | return $settings; |
| 1061 | 1114 | } |
| 1062 | 1115 | |
| 1063 | 1116 | $site_settings = parent::get_settings('site', null); |
| 1117 | + | |
| 1118 | + // Site-wide switches: the site value is authoritative, false included. | |
| 1119 | + // array_key_exists, not empty() — '' is how a disabled toggle is stored. | |
| 1120 | + foreach (self::SITE_ONLY_KEYS as $key) { | |
| 1121 | + if (array_key_exists($key, $site_settings)) { | |
| 1122 | + $settings[$key] = $site_settings[$key]; | |
| 1123 | + } | |
| 1124 | + } | |
| 1125 | + | |
| 1126 | + // Default images: inherit only when this context has none of its own. | |
| 1064 | 1127 | foreach (self::INHERITED_SITE_KEYS as $key) { |
| 1065 | 1128 | if (empty($settings[$key]) && !empty($site_settings[$key])) { |
| 1066 | 1129 | $settings[$key] = $site_settings[$key]; |
| 1067 | 1130 | } |
| @@ -1097,8 +1160,12 @@ | ||
| 1097 | 1160 | 'og_locale' => '', |
| 1098 | 1161 | 'default_og_image' => '', |
| 1099 | 1162 | 'og_image_width' => 1200, |
| 1100 | 1163 | 'og_image_height' => 630, |
| 1164 | + // Offer alternative og:image tags after the primary one (#636). | |
| 1165 | + // Off by default: a page that shares with one image today must | |
| 1166 | + // keep sharing with that image after an update. | |
| 1167 | + 'og_multiple_images' => false, | |
| 1101 | 1168 | |
| 1102 | 1169 | // Twitter Cards settings |
| 1103 | 1170 | 'enable_twitter_cards' => true, |
| 1104 | 1171 | 'twitter_username' => '', |
| @@ -1138,8 +1205,15 @@ | ||
| 1138 | 1205 | 'fallback_to_excerpt' => true, |
| 1139 | 1206 | 'strip_html_tags' => true, |
| 1140 | 1207 | 'max_description_length' => 160, |
| 1141 | 1208 | |
| 1209 | + // oEmbed card (#637). All three default off: this rewrites what | |
| 1210 | + // other people's sites display, so an upgrade must not silently | |
| 1211 | + // change a card an existing embed has been showing for months. | |
| 1212 | + 'oembed_use_seo_title' => false, | |
| 1213 | + 'oembed_use_social_image' => false, | |
| 1214 | + 'oembed_remove_author' => false, | |
| 1215 | + | |
| 1142 | 1216 | // Legacy format for backward compatibility (only when needed) |
| 1143 | 1217 | 'custom_og_tags' => [], |
| 1144 | 1218 | 'image_optimization' => true, |
| 1145 | 1219 | 'auto_generate' => true |
| @@ -1860,16 +1934,21 @@ | ||
| 1860 | 1934 | if (function_exists('post_password_required') && post_password_required($post)) { |
| 1861 | 1935 | return '' !== $post->post_excerpt ? $post->post_excerpt : get_bloginfo('description'); |
| 1862 | 1936 | } |
| 1863 | 1937 | |
| 1864 | - // Try excerpt first | |
| 1865 | - $description = get_the_excerpt($post); | |
| 1938 | + // Try excerpt first. On a Bricks page core would derive that excerpt | |
| 1939 | + // from the `post_content` Bricks throws away, so the visible body is | |
| 1940 | + // used instead — a hand-written excerpt still wins (#651). | |
| 1941 | + $superseding = Builder_Content::superseding_excerpt_source($post); | |
| 1942 | + $description = '' !== $superseding | |
| 1943 | + ? Pattern_Resolver::derive_excerpt($superseding, 30) | |
| 1944 | + : get_the_excerpt($post); | |
| 1866 | 1945 | |
| 1867 | 1946 | // If no excerpt, generate from content. Shortcodes and block delimiters |
| 1868 | 1947 | // are removed the way core's wp_trim_excerpt() does, so a shortcode-built |
| 1869 | 1948 | // page does not publish its source as og:description (#387). |
| 1870 | 1949 | if (empty($description)) { |
| 1871 | - $description = Pattern_Resolver::derive_excerpt((string) $post->post_content, 30); | |
| 1950 | + $description = Pattern_Resolver::derive_excerpt(Builder_Content::visible_content($post), 30); | |
| 1872 | 1951 | } |
| 1873 | 1952 | |
| 1874 | 1953 | // If still empty, use site description |
| 1875 | 1954 | if (empty($description)) { |
| @@ -2044,16 +2123,13 @@ | ||
| 2044 | 2123 | if (mb_strlen($title) <= $max_length) { |
| 2045 | 2124 | return $title; |
| 2046 | 2125 | } |
| 2047 | 2126 | |
| 2048 | - // Truncate at word boundary | |
| 2049 | - $truncated = wp_trim_words($title, 10, ''); | |
| 2050 | - if (mb_strlen($truncated) <= $max_length) { | |
| 2051 | - return $truncated; | |
| 2052 | - } | |
| 2053 | - | |
| 2054 | - // Hard truncate if necessary | |
| 2055 | - return mb_substr($title, 0, $max_length - 3) . '...'; | |
| 2127 | + // Truncate at a word boundary where there is one, and hard-cut where | |
| 2128 | + // there is not. This used to try wp_trim_words() first, which counts | |
| 2129 | + // CHARACTERS on th/ja/zh_* — so it returned ~10 characters, passed the | |
| 2130 | + // $max_length check below, and that was accepted as the title (#687). | |
| 2131 | + return \ThinkRank\Core\Seo_Text::trim_to_length($title, $max_length); | |
| 2056 | 2132 | } |
| 2057 | 2133 | |
| 2058 | 2134 | /** |
| 2059 | 2135 | * Optimize description for platform requirements |
| @@ -2076,16 +2152,14 @@ | ||
| 2076 | 2152 | if (mb_strlen($description) <= $max_length) { |
| 2077 | 2153 | return $description; |
| 2078 | 2154 | } |
| 2079 | 2155 | |
| 2080 | - // Truncate at word boundary | |
| 2081 | - $truncated = wp_trim_words($description, 25, ''); | |
| 2082 | - if (mb_strlen($truncated) <= $max_length) { | |
| 2083 | - return $truncated; | |
| 2084 | - } | |
| 2085 | - | |
| 2086 | - // Hard truncate if necessary | |
| 2087 | - return mb_substr($description, 0, $max_length - 3) . '...'; | |
| 2156 | + // Truncate at a word boundary where there is one, and hard-cut where | |
| 2157 | + // there is not. This used to try wp_trim_words() first, which counts | |
| 2158 | + // words in English but CHARACTERS in th/ja/zh_* — so on those locales | |
| 2159 | + // it returned ~25 characters, comfortably under $max_length, and that | |
| 2160 | + // was accepted as the answer (#687). | |
| 2161 | + return \ThinkRank\Core\Seo_Text::trim_to_length($description, $max_length); | |
| 2088 | 2162 | } |
| 2089 | 2163 | |
| 2090 | 2164 | /** |
| 2091 | 2165 | * Optimize image for platform requirements |
| @@ -2613,12 +2687,13 @@ | ||
| 2613 | 2687 | private function make_description_catchy(string $description): string { |
| 2614 | 2688 | // TikTok prefers short, catchy descriptions |
| 2615 | 2689 | $catchy_words = ['viral', 'trending', 'must-see', 'epic', 'mind-blowing']; |
| 2616 | 2690 | |
| 2617 | - // Limit to 100 characters for TikTok | |
| 2618 | - if (strlen($description) > 100) { | |
| 2619 | - $description = substr($description, 0, 97) . '...'; | |
| 2620 | - } | |
| 2691 | + // Limit to 100 characters for TikTok. strlen()/substr() count BYTES, | |
| 2692 | + // so this both fired three times too early on Thai/CJK text and cut | |
| 2693 | + // mid-character, emitting a broken UTF-8 sequence rather than a short | |
| 2694 | + // description (#687). | |
| 2695 | + $description = \ThinkRank\Core\Seo_Text::trim_to_length($description, 100); | |
| 2621 | 2696 | |
| 2622 | 2697 | if (!preg_match('/\b(' . implode('|', $catchy_words) . ')\b/i', $description)) { |
| 2623 | 2698 | $description = '🔥 ' . $description; |
| 2624 | 2699 | } |
| @@ -2811,8 +2886,16 @@ | ||
| 2811 | 2886 | private function generate_platform_meta_tags(array $settings): array { |
| 2812 | 2887 | $platform_tags = []; |
| 2813 | 2888 | |
| 2814 | 2889 | $core = \ThinkRank\Core\Settings::instance(); |
| 2890 | + | |
| 2891 | + // One query for all seven instead of one query each. They are | |
| 2892 | + // autoload=off like every thinkrank_* option, so WordPress cannot | |
| 2893 | + // batch them out of `alloptions`, and this runs on every anonymous | |
| 2894 | + // front-end request — on most sites to discover that all seven are | |
| 2895 | + // empty and no tag is emitted at all (#393). | |
| 2896 | + $core->prime(array_keys(self::PLATFORM_META_KEYS)); | |
| 2897 | + | |
| 2815 | 2898 | // Core Settings (decrypted for sensitive keys) wins; the table value is a |
| 2816 | 2899 | // backward-compat fallback for installs that saved these before the UI |
| 2817 | 2900 | // moved to the Social Platforms tab. |
| 2818 | 2901 | $resolve = static function (string $key) use ($core, $settings): string { |
| @@ -2822,51 +2905,36 @@ | ||
| 2822 | 2905 | } |
| 2823 | 2906 | return $value; |
| 2824 | 2907 | }; |
| 2825 | 2908 | |
| 2826 | - // Facebook meta tags | |
| 2827 | - $facebook_app_id = $resolve('facebook_app_id'); | |
| 2828 | - if ('' !== $facebook_app_id) { | |
| 2829 | - $platform_tags['fb:app_id'] = $facebook_app_id; | |
| 2830 | - } | |
| 2909 | + foreach (self::PLATFORM_META_KEYS as $key => $meta_name) { | |
| 2910 | + $value = $resolve($key); | |
| 2831 | 2911 | |
| 2832 | - $facebook_admins = $resolve('facebook_admins'); | |
| 2833 | - if ('' !== $facebook_admins) { | |
| 2834 | - $platform_tags['fb:admins'] = $facebook_admins; | |
| 2912 | + if ('' !== $value) { | |
| 2913 | + $platform_tags[$meta_name] = $value; | |
| 2914 | + } | |
| 2835 | 2915 | } |
| 2836 | 2916 | |
| 2837 | - // Pinterest site verification | |
| 2838 | - $pinterest = $resolve('pinterest_site_verification'); | |
| 2839 | - if ('' !== $pinterest) { | |
| 2840 | - $platform_tags['pinterest-site-verification'] = $pinterest; | |
| 2841 | - } | |
| 2842 | - | |
| 2843 | - // Instagram verification | |
| 2844 | - $instagram = $resolve('instagram_verification'); | |
| 2845 | - if ('' !== $instagram) { | |
| 2846 | - $platform_tags['instagram-site-verification'] = $instagram; | |
| 2847 | - } | |
| 2848 | - | |
| 2849 | - // TikTok verification | |
| 2850 | - $tiktok = $resolve('tiktok_verification'); | |
| 2851 | - if ('' !== $tiktok) { | |
| 2852 | - $platform_tags['tiktok-site-verification'] = $tiktok; | |
| 2853 | - } | |
| 2854 | - | |
| 2855 | - // YouTube channel verification | |
| 2856 | - $youtube = $resolve('youtube_channel_id'); | |
| 2857 | - if ('' !== $youtube) { | |
| 2858 | - $platform_tags['youtube-channel-id'] = $youtube; | |
| 2859 | - } | |
| 2860 | - | |
| 2861 | - // WhatsApp Business verification | |
| 2862 | - $whatsapp = $resolve('whatsapp_business_id'); | |
| 2863 | - if ('' !== $whatsapp) { | |
| 2864 | - $platform_tags['whatsapp-business-id'] = $whatsapp; | |
| 2865 | - } | |
| 2866 | - | |
| 2867 | 2917 | return $platform_tags; |
| 2868 | 2918 | } |
| 2919 | + | |
| 2920 | + /** | |
| 2921 | + * Platform verification settings, mapped to the meta name each is emitted | |
| 2922 | + * under. One list so the batch primed in generate_platform_meta_tags() and | |
| 2923 | + * the keys it then reads cannot drift apart. | |
| 2924 | + * | |
| 2925 | + * @since 2.1.0 | |
| 2926 | + * @var array<string,string> | |
| 2927 | + */ | |
| 2928 | + private const PLATFORM_META_KEYS = [ | |
| 2929 | + 'facebook_app_id' => 'fb:app_id', | |
| 2930 | + 'facebook_admins' => 'fb:admins', | |
| 2931 | + 'pinterest_site_verification' => 'pinterest-site-verification', | |
| 2932 | + 'instagram_verification' => 'instagram-site-verification', | |
| 2933 | + 'tiktok_verification' => 'tiktok-site-verification', | |
| 2934 | + 'youtube_channel_id' => 'youtube-channel-id', | |
| 2935 | + 'whatsapp_business_id' => 'whatsapp-business-id', | |
| 2936 | + ]; | |
| 2869 | 2937 | |
| 2870 | 2938 | /** |
| 2871 | 2939 | * Convert OG, Twitter, and Platform tags to HTML meta tags |
| 2872 | 2940 | * |
