<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[7367] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main: Main: Update page templates to work as templates</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/7367">7367</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/7367","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-07-03 18:16:13 +0000 (Tue, 03 Jul 2018)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Main: Update page templates to work as templates

Includes changes that makes the releases page template usable on child pages as well.

See <a href="http://meta.trac.wordpress.org/ticket/3673">#3673</a>..</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainheaderchildpagephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/header-child-page.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpagedownloadbetanightlyphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-download-beta-nightly.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpagedownloadsourcephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-download-source.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpagereleasesphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-releases.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainheaderchildpagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/header-child-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/header-child-page.php      2018-07-03 18:15:02 UTC (rev 7366)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/header-child-page.php        2018-07-03 18:16:13 UTC (rev 7367)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,6 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="site-branding">
</span><span class="cx" style="display: block; padding: 0 10px">                                <p class="site-title"><a href="<?php echo esc_url( get_permalink( get_post()->post_parent ) ); ?>" rel="bookmark"><?php echo get_the_title( get_post()->post_parent ); ?></a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                <?php if ( ! empty( $menu_items ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <nav id="site-navigation" class="main-navigation" role="navigation">
</span><span class="cx" style="display: block; padding: 0 10px">                                        <button class="menu-toggle dashicons dashicons-arrow-down-alt2" aria-controls="primary-menu" aria-expanded="false" aria-label="<?php esc_attr_e( 'Primary Menu', 'wporg' ); ?>"></button>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <div id="primary-menu" class="menu">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,5 +46,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                </ul>
</span><span class="cx" style="display: block; padding: 0 10px">                                        </div>
</span><span class="cx" style="display: block; padding: 0 10px">                                </nav><!-- #site-navigation -->
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                         </div><!-- .site-branding -->
</span><span class="cx" style="display: block; padding: 0 10px">                </header><!-- #masthead -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpagedownloadbetanightlyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-download-beta-nightly.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-download-beta-nightly.php     2018-07-03 18:15:02 UTC (rev 7366)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-download-beta-nightly.php       2018-07-03 18:16:13 UTC (rev 7367)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Template Name: About -> Stats
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Template Name: Download -> Beta/Nightly
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Page template for displaying the Stats page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Page template for displaying the Beta/Nightly page.
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @package WordPressdotorg\MainTheme
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpagedownloadsourcephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-download-source.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-download-source.php   2018-07-03 18:15:02 UTC (rev 7366)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-download-source.php     2018-07-03 18:16:13 UTC (rev 7367)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Template Name: About -> Stats
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Template Name: About -> Source Code
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Page template for displaying the Stats page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Page template for displaying the Source Code page.
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @package WordPressdotorg\MainTheme
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpagereleasesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-releases.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-releases.php  2018-07-03 18:15:02 UTC (rev 7366)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-releases.php    2018-07-03 18:16:13 UTC (rev 7367)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,6 +9,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\MainTheme;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( get_post()->post_parent ) {
+$GLOBALS['menu_items'] = [
+       'download/releases'     => _x( 'Releases', 'Page title', 'wporg' ),
+       'download/beta-nightly' => _x( 'Beta/Nightly', 'Page title', 'wporg' ),
+       'download/counter'      => _x( 'Counter', 'Page title', 'wporg' ),
+       'download/source'       => _x( 'Source Code', 'Page title', 'wporg' ),
+];
+}
+
+// Prevent Jetpack from looking for a non-existent featured image.
+add_filter( 'jetpack_images_pre_get_images', function() {
+       return new \WP_Error();
+} );
+
+add_filter( 'body_class', function( $classes ) {
+       $classes[] = 'page-child';
+       return $classes;
+} );
+
+/* See inc/page-meta-descriptions.php for the meta description for this page. */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'IS_ROSETTA_NETWORK' ) && IS_ROSETTA_NETWORK ) {
</span><span class="cx" style="display: block; padding: 0 10px">        $releases = $GLOBALS['rosetta']->rosetta->get_releases_breakdown();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,138 +37,142 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-get_header();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+get_header( 'child-page' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        <main id="main" class="site-main col-12" role="main">
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <article id="post-<?php the_ID(); ?>" <?php post_class( 'col-12' ); ?> role="main">
-               <header class="entry-header">
-                       <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
-               </header><!-- .entry-header -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <article id="post-<?php the_ID(); ?>" <?php post_class(); ?> role="main">
+                       <header class="entry-header">
+                               <?php the_title( '<h1 class="entry-title col-8">', '</h1>' ); ?>
+                       </header><!-- .entry-header -->
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <div class="entry-content">
-                       <p>
-                               <strong><?php esc_html_e( 'This is an archive of every release we’ve done that we have a record of.', 'wporg' ); ?></strong><br />
-                               <?php
-                               printf(
-                                       /* translators: Stable branch */
-                                       wp_kses_post( __( 'None of these are safe to use, except the <strong>latest</strong> in the %s series, which is actively maintained.', 'wporg' ) ),
-                                       esc_html( WP_CORE_STABLE_BRANCH )
-                               );
-                               ?>
-                       </p>
-                       <p>
-                               <?php
-                               printf(
-                                       /* translators: Roadmap URL */
-                                       wp_kses_post( __( 'Curious about which jazzers we highlighted for each release? <a href="%s">It’s on the roadmap</a>.', 'wporg' ) ),
-                                       esc_url( home_url( '/about/roadmap/' ) )
-                               );
-                               ?>
-                       </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <div class="entry-content row">
+                               <section class="col-8">
+                                       <p>
+                                               <?php esc_html_e( 'This is an archive of every release we’ve done that we have a record of.', 'wporg' ); ?><br />
+                                               <?php
+                                               printf(
+                                                       /* translators: Stable branch */
+                                                       wp_kses_post( __( 'None of these are safe to use, except the <strong>latest</strong> in the %s series, which is actively maintained.', 'wporg' ) ),
+                                                       esc_html( WP_CORE_STABLE_BRANCH )
+                                               );
+                                               ?>
+                                       </p>
+                                       <p>
+                                               <?php
+                                               printf(
+                                                       /* translators: Roadmap URL */
+                                                       wp_kses_post( __( 'Curious about which jazzers we highlighted for each release? <a href="%s">It’s on the roadmap</a>.', 'wporg' ) ),
+                                                       esc_url( home_url( '/about/roadmap/' ) )
+                                               );
+                                               ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php
-                       if ( ! empty( $releases ) ) :
-                               if ( isset( $releases['latest'] ) ) :
-                                       ?>
-                                       <h3 id="latest"><?php esc_html_e( 'Latest release', 'wporg' ); ?></h3>
-                                       <table class="releases latest">
-                                               <col width="15%" />
-                                               <col width="25%" />
-                                               <col width="15%" />
-                                               <col width="15%" />
-                                               <col width="15%" />
-                                               <?php release_row( $releases['latest'] ); ?>
-                                       </table>
</del><span class="cx" style="display: block; padding: 0 10px">                                         <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 if ( ! empty( $releases ) ) :
+                                               if ( isset( $releases['latest'] ) ) :
+                                                       ?>
+                                                       <h3 id="latest"><?php esc_html_e( 'Latest release', 'wporg' ); ?></h3>
+                                                       <table class="releases latest">
+                                                               <col width="15%" />
+                                                               <col width="25%" />
+                                                               <col width="15%" />
+                                                               <col width="15%" />
+                                                               <col width="15%" />
+                                                               <?php release_row( $releases['latest'] ); ?>
+                                                       </table>
+                                                       <?php
+                                               endif;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( ! empty( $releases['branches'] ) ) :
-                                       echo '<a name="older" id="older"></a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         if ( ! empty( $releases['branches'] ) ) :
+                                                       echo '<a name="older" id="older"></a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        foreach ( $releases['branches'] as $branch => $branch_release ) :
-                                               ?>
-                                               <h3>
-                                                       <?php
-                                                       printf(
-                                                               /* translators: Version number. */
-                                                               esc_html__( '%s Branch', 'wporg' ),
-                                                               esc_html( $branch )
-                                                       );
-                                                       ?>
-                                               </h3>
-                                               <table class="releases">
-                                                       <col width="15%" />
-                                                       <col width="25%" />
-                                                       <col width="15%" />
-                                                       <col width="15%" />
-                                                       <col width="15%" />
-                                                       <?php
-                                                       foreach ( $branch_release as $release ) :
-                                                               release_row( $release );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 foreach ( $releases['branches'] as $branch => $branch_release ) :
+                                                               ?>
+                                                               <h3>
+                                                                       <?php
+                                                                       printf(
+                                                                               /* translators: Version number. */
+                                                                               esc_html__( '%s Branch', 'wporg' ),
+                                                                               esc_html( $branch )
+                                                                       );
+                                                                       ?>
+                                                               </h3>
+                                                               <table class="releases">
+                                                                       <col width="15%" />
+                                                                       <col width="25%" />
+                                                                       <col width="15%" />
+                                                                       <col width="15%" />
+                                                                       <col width="15%" />
+                                                                       <?php
+                                                                       foreach ( $branch_release as $release ) :
+                                                                               release_row( $release );
+                                                                       endforeach;
+                                                                       ?>
+                                                               </table>
+                                                               <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         endforeach;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                endif; // Any branches.
+
+                                               if ( ! empty( $releases['betas'] ) ) :
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                </table>
-                                               <?php
-                                       endforeach;
-                               endif; // Any branches.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <h3 id="betas"><?php esc_html_e( 'Beta &amp; RC releases', 'wporg' ); ?></h3>
+                                                       <p><?php esc_html_e( 'These were testing releases and are only available here for archival purposes.', 'wporg' ); ?></p>
+                                                       <table id="beta" class="releases">
+                                                               <col width="15%" />
+                                                               <col width="25%" />
+                                                               <col width="15%" />
+                                                               <col width="15%" />
+                                                               <col width="15%" />
+                                                               <?php
+                                                               foreach ( $releases['betas'] as $release ) :
+                                                                       release_row( $release );
+                                                               endforeach;
+                                                               ?>
+                                                       </table>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( ! empty( $releases['betas'] ) ) :
-                                       ?>
-                                       <h3 id="betas"><?php esc_html_e( 'Beta &amp; RC releases', 'wporg' ); ?></h3>
-                                       <p><?php esc_html_e( 'These were testing releases and are only available here for archival purposes.', 'wporg' ); ?></p>
-                                       <table id="beta" class="releases">
-                                               <col width="15%" />
-                                               <col width="25%" />
-                                               <col width="15%" />
-                                               <col width="15%" />
-                                               <col width="15%" />
-                                               <?php
-                                               foreach ( $releases['betas'] as $release ) :
-                                                       release_row( $release );
-                                               endforeach;
-                                               ?>
-                                       </table>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <?php
+                                               endif; // Any betas.
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php
-                               endif; // Any betas.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         if ( ! empty( $releases['mu'] ) ) :
+                                                       ?>
+                                                       <h3 id="mu"><?php esc_html_e( 'MU releases', 'wporg' ); ?></h3>
+                                                       <p><?php esc_html_e( 'WordPress MU releases made prior to MU being merged into WordPress 3.0', 'wporg' ); ?></p>
+                                                       <table class="releases">
+                                                               <col width="15%" />
+                                                               <col width="30%" />
+                                                               <col width="15%" />
+                                                               <col width="15%" />
+                                                               <col width="15%" />
+                                                               <?php
+                                                               foreach ( $releases['mu'] as $release ) :
+                                                                       release_row( $release );
+                                                               endforeach;
+                                                               ?>
+                                                       </table>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( ! empty( $releases['mu'] ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <?php
+                                               endif; // Any MUs.
+                                       else : // No releases.
+                                               echo '<p>' . esc_html__( 'There are no releases, yet.', 'wporg' ) . '</p>';
+                                       endif; // if releases.
</ins><span class="cx" style="display: block; padding: 0 10px">                                         ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <h3 id="mu"><?php esc_html_e( 'MU releases', 'wporg' ); ?></h3>
-                                       <p><?php esc_html_e( 'WordPress MU releases made prior to MU being merged into WordPress 3.0', 'wporg' ); ?></p>
-                                       <table class="releases">
-                                               <col width="15%" />
-                                               <col width="30%" />
-                                               <col width="15%" />
-                                               <col width="15%" />
-                                               <col width="15%" />
-                                               <?php
-                                               foreach ( $releases['mu'] as $release ) :
-                                                       release_row( $release );
-                                               endforeach;
-                                               ?>
-                                       </table>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         </section>
+                       </div><!-- .entry-content -->
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php
-                               endif; // Any MUs.
-                       else : // No releases.
-                               echo '<p>' . esc_html__( 'There are no releases, yet.', 'wporg' ) . '</p>';
-                       endif; // if releases.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php
+                       edit_post_link(
+                               sprintf(
+                                       /* translators: %s: Name of current post */
+                                       esc_html__( 'Edit %s', 'wporg' ),
+                                       the_title( '<span class="screen-reader-text">"', '"</span>', false )
+                               ),
+                               '<footer class="entry-footer"><span class="edit-link">',
+                               '</span></footer><!-- .entry-footer -->'
+                       );
</ins><span class="cx" style="display: block; padding: 0 10px">                         ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </div><!-- .entry-content -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         </article><!-- #post-## -->
+       </main><!-- #main -->
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php
-               edit_post_link(
-                       sprintf(
-                               /* translators: %s: Name of current post */
-                               esc_html__( 'Edit %s', 'wporg' ),
-                               the_title( '<span class="screen-reader-text">"', '"</span>', false )
-                       ),
-                       '<footer class="entry-footer"><span class="edit-link">',
-                       '</span></footer><!-- .entry-footer -->'
-               );
-               ?>
-       </article><!-- #post-## -->
-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> get_footer();
</span></span></pre>
</div>
</div>

</body>
</html>