Changeset 12674

Timestamp:

06/22/2023 03:40:17 AM (2 years ago)

Author:

dd32

Message:

Main Theme: Remove the hreflang pages from rosetta news pages and any custom rosetta pages that wouldn't exist elsewhere.

Fixes #7084.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main

Files:

• functions.php (modified) (2 diffs)
• page-hosting.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/functions.php

@@ -171 +171 @@
  */
 function body_class( $classes ) {
-    if ( is_page() ) {
+    if ( is_page() && get_queried_object() ) {
         $page = get_queried_object();
 
@@ -292 +292 @@
 
 /**
+ * Disables hreflang tags on instances of this theme, unless it's a page that has localised variants.
+ *
+ * This takes the reverse approach of the function name.
+ * Instead of maybe removing it, it removes it unless a specific criteria is met.
+ * 
+ * The criteria is that...
+ *  - It's a page
+ *  - It's not the hosting page
+ *  - It's not a rosetta page owned by anyone other than wordpressdotorg (These are the globally synced pages).
+ */
+function maybe_remove_hreflang_tags() {
+    if (
+        ! is_page() ||
+        is_page( 'hosting' ) ||
+        // Exclude custom localised pages.
+        // Only include posts authored by `wordPressdotorg` which are using a page template.
+        (
+            defined( 'IS_ROSETTA_NETWORK' ) && IS_ROSETTA_NETWORK &&
+            get_user_by( 'slug', 'wordpressdotorg' )->ID != get_post()->post_author
+        )
+    ) {
+        remove_action( 'wp_head', 'WordPressdotorg\Theme\hreflang_link_attributes' );
+    }
+}
+add_action( 'wp_head', __NAMESPACE__ . '\maybe_remove_hreflang_tags', 1 );
+
+/**
  * Custom template tags.
  */

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-hosting.php

@@ -13 +13 @@
     return new \WP_Error();
 } );
-
-// Disable hreflangs, this page has no localised variants.
-remove_action( 'wp_head', 'WordPressdotorg\Theme\hreflang_link_attributes' );
 
 /* See inc/page-meta-descriptions.php for the meta description for this page. */