Changeset 11388

Timestamp:

12/17/2021 10:00:57 PM (3 years ago)

Author:

iandunn

Message:

WordPress.org Base Theme: Enable new global header/footer behind flag.

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

Location:

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

Files:

• footer-wporg.php (modified) (1 diff)
• footer.php (modified) (1 diff)
• header-wporg.php (modified) (1 diff)
• header.php (modified) (1 diff)

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

@@ -12 +12 @@
 namespace WordPressdotorg\Theme;
 
-require WPORGPATH . 'footer.php';
+if ( FEATURE_2021_GLOBAL_HEADER_FOOTER ) {
+    echo do_blocks( '<!-- wp:wporg/global-footer /-->' );
+} else {
+    require WPORGPATH . 'footer.php';
+}

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

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

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

@@ -12 +12 @@
 namespace WordPressdotorg\Theme;
 
-require WPORGPATH . 'header.php';
+if ( FEATURE_2021_GLOBAL_HEADER_FOOTER ) {
+    echo do_blocks( '<!-- wp:wporg/global-header /-->' );
+} else {
+    require WPORGPATH . 'header.php';
+}

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

@@ -12 +12 @@
 namespace WordPressdotorg\Theme;
 
-global $wporg_global_header_options;
-if ( !isset( $wporg_global_header_options['in_wrapper'] ) )
-    $wporg_global_header_options['in_wrapper'] = '';
-$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#content">' . esc_html__( 'Skip to content', 'wporg' ) . '</a>';
+if ( ! FEATURE_2021_GLOBAL_HEADER_FOOTER ) {
+    global $wporg_global_header_options;
+
+    if ( ! isset( $wporg_global_header_options['in_wrapper'] ) ) {
+        $wporg_global_header_options['in_wrapper'] = '';
+    }
+    $wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#content">' . esc_html__( 'Skip to content', 'wporg' ) . '</a>';
+}
 
 get_template_part( 'header', 'wporg' );
 ?>
+
 <div id="page" class="site">
     <div id="content" class="site-content row gutters">