Changeset 11494

Timestamp:

01/31/2022 09:45:57 PM (3 years ago)

Author:

iandunn

Message:

Translate: Remove code unused after new header/footer launch.

See ​https://github.com/WordPress/wporg-mu-plugins/issues/55

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations

Files:

• inc/class-plugin.php (modified) (2 diffs)
• templates/footer.php (modified) (1 diff)
• templates/header.php (modified) (1 diff)
• templates/helper-functions.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php

@@ -77 +77 @@
             $this->register_cli_commands();
         }
-
-        // @todo temporary for new header/footer launch.
-        add_filter( 'stylesheet', array( $this, 'switch_theme_for_new_header' ) );
-        add_filter( 'template', array( $this, 'switch_theme_for_new_header' ) );
     }
 
@@ -561 +557 @@
         return $content;
     }
-
-    /**
-     * Switch to the `wporg-main` theme once the new header/footer launches.
-     *
-     * TwentyFifteen has a bunch of styles that interfere with the design, and we don't want them enqueued. We
-     * do want to enqueue all the other styles/scripts from Core/plugins, though.
-     * See `blocks/global-header-footer/classic-header.php`.
-     *
-     * @todo This can be removed after launch, but you must permanently switch the theme to `pub/wporg-main`.
-     *
-     * @param string $stylesheet
-     *
-     * @return string
-     */
-    function switch_theme_for_new_header( $stylesheet ) {
-        /*
-         * Otherwise this interferes with `render_global_styles()`, and we don't get all of the CSS variables
-         * from News.
-         */
-        if ( ms_is_switched() ) {
-            return $stylesheet;
-        }
-
-        if ( FEATURE_2021_GLOBAL_HEADER_FOOTER ) {
-            if ( 'stylesheet' === current_filter() ) {
-                $stylesheet = 'pub/wporg-main';
-            } else {
-                /* template */
-                $stylesheet = 'pub/wporg';
-            }
-        } else {
-            $stylesheet = 'core/twentyfifteen';
-        }
-
-        return $stylesheet;
-    }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/footer.php

@@ -3 +3 @@
 <?php
 
-if ( FEATURE_2021_GLOBAL_HEADER_FOOTER ) {
-    echo do_blocks( '<!-- wp:wporg/global-footer /-->' );
-
-} else {
-    require WPORGPATH . 'footer.php';
-}
+echo do_blocks( '<!-- wp:wporg/global-footer /-->' );

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/header.php

@@ -1 +1 @@
 <?php
 
-if ( FEATURE_2021_GLOBAL_HEADER_FOOTER ) {
-    echo do_blocks( '<!-- wp:wporg/global-header /-->' );
-
-} else {
-    require WPORGPATH . 'header.php';
-}
+echo do_blocks( '<!-- wp:wporg/global-header /-->' );
 
 ?>

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/helper-functions.php

@@ -49 +49 @@
 if ( isset( $template ) && 'translations' === $template ) {
     gp_enqueue_script( 'wporg-translate-editor' );
-}
-
-// The new header calls wp_head + gp_head, the old header only calls one or the other, so we must manually add this.
-if ( ! FEATURE_2021_GLOBAL_HEADER_FOOTER ) {
-    add_action( 'gp_head', '_wp_render_title_tag' );
 }