<!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>[7350] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main: Main: phpcs updates</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/7350">7350</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/7350","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-06-29 20:57:02 +0000 (Fri, 29 Jun 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: phpcs updates</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/functions.php</a></li>
<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_htmlwpcontentthemespubwporgmainincpagemetadescriptionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincprivacyfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/privacy-functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincrecaptchaphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/recaptcha.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutaccessibilityphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-accessibility.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutdomainsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-domains.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutetiquettephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-etiquette.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutfeaturesphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-features.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageabouthistoryphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-history.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutlicensephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-license.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutlogosphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-logos.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutphilosophyphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-philosophy.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacycookiesphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-cookies.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacydataerasurerequestphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacydataexportrequestphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-export-request.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacyphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutrequirementsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-requirements.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutroadmapphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-roadmap.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutsecurityphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-security.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutstatsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-stats.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutswagphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-swag.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageabouttestimonialsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-testimonials.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpagegetphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-get.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainfunctionsphp"></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/functions.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/functions.php      2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/functions.php        2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_page( 'stats' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                wp_enqueue_script( 'google-charts', 'https://www.gstatic.com/charts/loader.js', [], null, true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp_enqueue_script( 'wporg-page-stats', get_theme_file_uri( '/js/page-stats.js' ), [ 'jquery', 'google-charts'], 1, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         wp_enqueue_script( 'wporg-page-stats', get_theme_file_uri( '/js/page-stats.js' ), [ 'jquery', 'google-charts' ], 1, true );
</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_localize_script( 'wporg-page-stats', 'wporgPageStats', [
</span><span class="cx" style="display: block; padding: 0 10px">                        'trunk'         => number_format( WP_CORE_STABLE_BRANCH + 0.1, 1 ), /* trunk */
</span><span class="cx" style="display: block; padding: 0 10px">                        'beta'          => number_format( WP_CORE_STABLE_BRANCH + 0.2, 1 ), /* trunk w/ beta-tester plugin */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,11 +158,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $parent = get_post( $page->post_parent );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // We want it before page-{page_name}.php but after {Page Template}.php.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $page_name_index = array_search( "page-{$page->post_name}.php", $templates );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $page_name_index = array_search( "page-{$page->post_name}.php", $templates, true );
</ins><span class="cx" style="display: block; padding: 0 10px">                 $top             = array_slice( $templates, 0, $page_name_index );
</span><span class="cx" style="display: block; padding: 0 10px">                $bottom          = array_slice( $templates, $page_name_index );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $templates = array_merge( $top, ["page-{$parent->post_name}-{$page->post_name}.php"], $bottom );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $templates = array_merge( $top, [ "page-{$parent->post_name}-{$page->post_name}.php" ], $bottom );
</ins><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">        return $templates;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,18 +186,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'theme_page_templates', __NAMESPACE__ . '\rosetta_page_templates' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Passes SEO-optimized title and description to embeds.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function use_opengraph_data_for_embed_template() {
</span><span class="cx" style="display: block; padding: 0 10px">        global $post;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( 'page' != $post->post_type || ! $post->page_template || 'default' == $post->page_template ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+       if ( 'page' !== $post->post_type || ! $post->page_template || 'default' === $post->page_template ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 return;
</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">        $meta = custom_open_graph_tags();
</span><span class="cx" style="display: block; padding: 0 10px">        if ( $meta ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_filter( 'the_title', function( $title ) use( $meta ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_filter( 'the_title', function( $title ) use ( $meta ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         return $meta['og:title'] ?? $title;
</span><span class="cx" style="display: block; padding: 0 10px">                } );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_filter( 'the_content', function( $content ) use( $meta ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_filter( 'the_content', function( $content ) use ( $meta ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         return $meta['og:description'] ?? $content;
</span><span class="cx" style="display: block; padding: 0 10px">                } );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,19 +211,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Custom template tags.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require_once get_stylesheet_directory() . '/inc/template-tags.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once __DIR__ . '/inc/template-tags.php';
</ins><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">  * Custom meta descriptions for page templates.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require_once get_stylesheet_directory() . '/inc/page-meta-descriptions.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once __DIR__ . '/inc/page-meta-descriptions.php';
</ins><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">  * Include reCAPTCHA functions for privacy requests.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-include __DIR__ . '/inc/recaptcha.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once __DIR__ . '/inc/recaptcha.php';
</ins><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">  * Include the Privacy request functions.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-include __DIR__ . '/inc/privacy-functions.php';
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once __DIR__ . '/inc/privacy-functions.php';
</ins></span></pre></div>
<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-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/header-child-page.php        2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,6 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        $active_item = false;
</span><span class="cx" style="display: block; padding: 0 10px">                                                        // The last found menu item that patches is the one that's shown as active.
</span><span class="cx" style="display: block; padding: 0 10px">                                                        foreach ( $menu_items as $path => $text ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                // phpcs:ignore WordPress.VIP
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 if ( false !== strpos( $_SERVER['REQUEST_URI'], $path ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                                                        $active_item = $path;
</span><span class="cx" style="display: block; padding: 0 10px">                                                                }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincpagemetadescriptionsphp"></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/inc/page-meta-descriptions.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/inc/page-meta-descriptions.php     2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php       2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">        switch ( $post->page_template ) {
</span><span class="cx" style="display: block; padding: 0 10px">                default:
</span><span class="cx" style="display: block; padding: 0 10px">                        return $tags;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        break;
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                case 'page-about-domains.php':
</span><span class="cx" style="display: block; padding: 0 10px">                        $title = esc_html__( 'WordPress Domains', 'wporg' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,13 +43,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                case 'page-about-features.php':
</span><span class="cx" style="display: block; padding: 0 10px">                        $title = esc_html__( 'WordPress Features', 'wporg' );
</span><span class="cx" style="display: block; padding: 0 10px">                        /* translators: 1: WordPress market share: 30 - Note: The following percent sign is '%%' for escaping purposes; 2: Number of WordPress.org hosted plugins; */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $desc  = sprintf( esc_html__( 'Discover why WordPress powers more than %1$s%% of the web. WordPress is a simple, flexible, user-friendly platform, with key features that include media management, SEO, and endless options for customization. More than %2$s plugins extend the core functionality of WordPress even more. Build your site today.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ), number_format_i18n( 50000 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $desc = sprintf( esc_html__( 'Discover why WordPress powers more than %1$s%% of the web. WordPress is a simple, flexible, user-friendly platform, with key features that include media management, SEO, and endless options for customization. More than %2$s plugins extend the core functionality of WordPress even more. Build your site today.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ), number_format_i18n( 50000 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                         break;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                case 'page-about-history.php':
</span><span class="cx" style="display: block; padding: 0 10px">                        $title = esc_html__( 'The History of WordPress', 'wporg' );
</span><span class="cx" style="display: block; padding: 0 10px">                        /* translators: WordPress market share: 30 - Note: The following percent sign is '%%' for escaping purposes; */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $desc  = sprintf( esc_html__( 'WordPress currently powers more than %s%% of the web. How did it grow to become the world&#8217;s leading web publishing platform? Learn about the history of WordPress: an open source software project built by an active community of contributors who are passionate about collaboration, empowerment, and the open web.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $desc = sprintf( esc_html__( 'WordPress currently powers more than %s%% of the web. How did it grow to become the world&#8217;s leading web publishing platform? Learn about the history of WordPress: an open source software project built by an active community of contributors who are passionate about collaboration, empowerment, and the open web.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                         break;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                case 'page-about-license.php':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +59,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                case 'page-about-logos.php':
</span><span class="cx" style="display: block; padding: 0 10px">                        $title = esc_html__( 'Graphics &amp; Logos', 'wporg' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $desc  = sprintf( __( 'When you need the official WordPress logo for a web site or publication, please use one of the following. Please only use logos in accordance with the <a href="%s">WordPress trademark&nbsp;policy</a>.', 'wporg' ), esc_url( 'http://wordpressfoundation.org/trademark-policy/' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /* translators: Link to foundation trademark policy ; */
+                       $desc = sprintf( __( 'When you need the official WordPress logo for a web site or publication, please use one of the following. Please only use logos in accordance with the <a href="%s">WordPress trademark&nbsp;policy</a>.', 'wporg' ), esc_url( 'http://wordpressfoundation.org/trademark-policy/' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                         break;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                case 'page-about-philosophy.php':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                case 'page-about-security.php':
</span><span class="cx" style="display: block; padding: 0 10px">                        $title = esc_html__( 'WordPress is Secure', 'wporg' );
</span><span class="cx" style="display: block; padding: 0 10px">                        /* translators: WordPress market share: 30 - Note: The following percent sign is '%%' for escaping purposes; */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $desc  = sprintf( esc_html__( 'Why is WordPress recommended as a secure website-building solution? With a passionate open source community and an extensible, easy-to-use platform, WordPress provides flexible and secure options for all levels of users, from beginners to pros. Learn how WordPress guarantees the security of %s%% of the web.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $desc = sprintf( esc_html__( 'Why is WordPress recommended as a secure website-building solution? With a passionate open source community and an extensible, easy-to-use platform, WordPress provides flexible and secure options for all levels of users, from beginners to pros. Learn how WordPress guarantees the security of %s%% of the web.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                         break;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                case 'page-about-stats.php':
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincprivacyfunctionsphp"></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/inc/privacy-functions.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/inc/privacy-functions.php  2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/privacy-functions.php    2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,42 +1,51 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Functions for the Privacy Tools - Exports and Erasures.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @package WordPressdotorg\MainTheme
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+// phpcs:disable WordPress.VIP.SuperGlobalInputUsage.AccessDetected, WordPress.VIP.ValidatedSanitizedInput
+
</ins><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\MainTheme;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\GDPR\Main as GDPR_Main;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Processes privacy requests.
+ *
+ * @param string $type Type of request.
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function privacy_process_request( $type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $email = $error_message = $success = false;
-       $nonce_action = 'request_' . $type;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email         = false;
+       $error_message = false;
+       $success       = false;
+       $nonce_action  = 'request_' . $type;
</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( $_POST['email'] ) || ! $type || ! in_array( $type, [ 'erase', 'export' ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_POST['email'] ) || ! $type || ! in_array( $type, [ 'erase', 'export' ], true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 return compact( 'email', 'error_message', 'success', 'nonce_action' );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $email = trim( wp_unslash( $_POST['email'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
+       $email           = trim( wp_unslash( $_POST['email'] ) );
+       $requesting_user = is_user_logged_in() ? wp_get_current_user()->user_login : false;
+       $email_user      = get_user_by( 'email', $email );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $requesting_user = false;
-       if ( is_user_logged_in() ) {
-               $requesting_user = wp_get_current_user()->user_login;
-       }
-
</del><span class="cx" style="display: block; padding: 0 10px">         // Currently only enabled for special accounts.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( 'export' === $type && ( ! is_user_logged_in() || ! wporg_user_has_restricted_password() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'export' === $type && ( ! is_user_logged_in() || ! function_exists( 'wporg_user_has_restricted_password' ) || ! wporg_user_has_restricted_password() ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $error_message = 'This form is currently unavailable.';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } else
-
-       if ( ! reCAPTCHA\check_status() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! reCAPTCHA\check_status() ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $error_message = esc_html__( 'Your form session has expired. Please try again.', 'wporg' );
</span><span class="cx" style="display: block; padding: 0 10px">        } elseif (
</span><span class="cx" style="display: block; padding: 0 10px">                is_user_logged_in() &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ! wp_verify_nonce( $_POST['_wpnonce'], $nonce_action )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ! wp_verify_nonce( wp_unslash( $_POST['_wpnonce'] ), $nonce_action )
</ins><span class="cx" style="display: block; padding: 0 10px">         ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $error_message = esc_html__( 'Your form session has expired. Please try again.', 'wporg' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">         } elseif (
</span><span class="cx" style="display: block; padding: 0 10px">                // Check if a user account exists for this email before processing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                false != ( $email_user = get_user_by( 'email', $email ) ) &&
-               $email_user->user_login !== $requesting_user
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         false !== $email_user && $email_user->user_login !== $requesting_user
</ins><span class="cx" style="display: block; padding: 0 10px">         ) {
</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_user_logged_in() ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $error_message = sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,11 +60,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                wp_login_url( get_permalink() )
</span><span class="cx" style="display: block; padding: 0 10px">                        );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">         } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( 'export' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( 'export' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $api_method = 'create-data-export-request';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } elseif ( 'erase' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } elseif ( 'erase' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $api_method = 'create-account-erasure-request';
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,15 +80,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_wp_error( $api_request ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $error_message = $api_request->get_error_message();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( 'duplicate_request' == $api_request->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( 'duplicate_request' === $api_request->get_error_code() ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 // TODO This should never have to be displayed to an end user. See API for details.
</span><span class="cx" style="display: block; padding: 0 10px">                                $error_message = esc_html__( 'A request for this email address already exists. Please check your spam folder for your confirmation email.', 'wporg' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        } elseif ( 'invalid_identifier' == $api_request->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 } elseif ( 'invalid_identifier' === $api_request->get_error_code() ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $error_message = esc_html__( 'The provided email was invalid. Please check the address and try again.', 'wporg' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } elseif ( !empty( $api_request['created'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } elseif ( ! empty( $api_request['created'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $success = true;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincrecaptchaphp"></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/inc/recaptcha.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/inc/recaptcha.php  2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/recaptcha.php    2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Functions for reCAPTCHA.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @package WordPressdotorg\MainTheme
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\MainTheme\reCAPTCHA;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Enqueues reCAPTCHA scripts.
+ *
+ * @param mixed $form_id Form ID.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function enqueue_script( $form_id ) {
</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! defined( 'RECAPTCHA_INVIS_PUBKEY' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,9 +18,15 @@
</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">        wp_enqueue_script( 'recaptcha-api', 'https://www.google.com/recaptcha/api.js', array(), '2' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        wp_add_inline_script( 'recaptcha-api', 'function reCAPTCHAPostSubmit(token) { document.getElementById(' . json_encode( (string)$form_id ) . ').submit(); }' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_add_inline_script( 'recaptcha-api', 'function reCAPTCHAPostSubmit(token) { document.getElementById(' . wp_json_encode( (string) $form_id ) . ').submit(); }' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Displays a submit button.
+ *
+ * @param string $submit_text Button text.
+ * @param string $classes     CSS classes.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function display_submit_button( $submit_text = 'Submit', $classes = 'button' ) {
</span><span class="cx" style="display: block; padding: 0 10px">        echo '<input' .
</span><span class="cx" style="display: block; padding: 0 10px">                ' data-sitekey=' . esc_attr( RECAPTCHA_INVIS_PUBKEY ) . '"' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,6 +38,13 @@
</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"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// phpcs:disable WordPress.VIP, WordPress.CSRF.NonceVerification.NoNonceVerification
+
+/**
+ * Response status.
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function check_status() {
</span><span class="cx" style="display: block; padding: 0 10px">        // If reCAPTCHA is not setup, skip it.
</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! defined( 'RECAPTCHA_INVIS_PUBKEY' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,13 +57,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        $verify = array(
</span><span class="cx" style="display: block; padding: 0 10px">                'secret'   => RECAPTCHA_INVIS_PRIVKEY,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'remoteip' => $_SERVER['REMOTE_ADDR'],
-               'response' => $_POST['g-recaptcha-response'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'remoteip' => wp_unslash( $_SERVER['REMOTE_ADDR'] ),
+               'response' => wp_unslash( $_POST['g-recaptcha-response'] ),
</ins><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">        $resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', array( 'body' => $verify ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( is_wp_error( $resp ) || 200 != wp_remote_retrieve_response_code( $resp ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $resp ) || 200 !== wp_remote_retrieve_response_code( $resp ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 return false;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,4 +70,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">        $result = json_decode( wp_remote_retrieve_body( $resp ), true );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        return (bool) $result['success'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutaccessibilityphp"></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-about-accessibility.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-about-accessibility.php       2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-accessibility.php 2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,40 +38,47 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="entry-content row">
</span><span class="cx" style="display: block; padding: 0 10px">                                <section class="col-8">
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php _e( 'The WordPress community and the open source WordPress project is committed to being as inclusive and accessible as possible. We want users, regardless of device or ability, to be able to publish content and maintain a website or application built with WordPress.', 'wporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p><?php esc_html_e( 'The WordPress community and the open source WordPress project is committed to being as inclusive and accessible as possible. We want users, regardless of device or ability, to be able to publish content and maintain a website or application built with WordPress.', 'wporg' ); ?></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">-                                        <p><?php _e( 'WordPress aims to make the WordPress Admin and bundled themes fully WCAG 2.0 AA compliant where possible.', 'wporg' ); ?></p>
-                                       <p><?php
-                                               /* translators: 1: Link to the Core Handbook Accessibility Standards; 2: Link to Core Trac Accessibility focus. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p><?php esc_html_e( 'WordPress aims to make the WordPress Admin and bundled themes fully WCAG 2.0 AA compliant where possible.', 'wporg' ); ?></p>
+                                       <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        __( 'All new and updated code released in WordPress must conform with these guidelines as per the <a href="%1$s">WordPress Accessibility Coding Standards</a>. Some current features and functionality in development may not yet fully comply, and known issues are listed in the <a href="%2$s">WordPress Trac &#8220;accessibility&#8221; focus</a>.', 'wporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 /* translators: 1: Link to the Core Handbook Accessibility Standards; 2: Link to Core Trac Accessibility focus. */
+                                                       wp_kses_post( __( 'All new and updated code released in WordPress must conform with these guidelines as per the <a href="%1$s">WordPress Accessibility Coding Standards</a>. Some current features and functionality in development may not yet fully comply, and known issues are listed in the <a href="%2$s">WordPress Trac &#8220;accessibility&#8221; focus</a>.', 'wporg' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         'https://make.wordpress.org/core/handbook/best-practices/coding-standards/accessibility-coding-standards/',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'https://core.trac.wordpress.org/focus/accessibility'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </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">-                                        <p><?php
-                                               /* translators: 1: Link to the Theme Directory Accessible Themes; 2: Link to Accessibility Handbook requirements. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        __( 'While the WordPress project cannot guarantee that all Themes are compliant, the <a href="%1$s">accessibility-ready themes</a> have been checked by the Theme Review Team to ensure that these themes pass their <a href="%2$s">basic accessibility requirements</a>.', 'wporg' ),
-                                                       site_url( '/themes/tags/accessibility-ready/' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 /* translators: 1: Link to the Theme Directory Accessible Themes; 2: Link to Accessibility Handbook requirements. */
+                                                       wp_kses_post( __( 'While the WordPress project cannot guarantee that all Themes are compliant, the <a href="%1$s">accessibility-ready themes</a> have been checked by the Theme Review Team to ensure that these themes pass their <a href="%2$s">basic accessibility requirements</a>.', 'wporg' ) ),
+                                                       esc_url( site_url( '/themes/tags/accessibility-ready/' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         'https://make.wordpress.org/themes/handbook/review/accessibility/required/'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </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">-                                        <h3><?php _e( 'The Accessibility Team', 'wporg' ); ?></h3>
-                                       <p><?php
-                                               /* translators: %s: Link to the Accessibility team P2 */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <h3><?php esc_html_e( 'The Accessibility Team', 'wporg' ); ?></h3>
+                                       <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        __( 'The <a href="%s">WordPress Accessibility Team</a> provides accessibility expertise across the project to improve the accessibility of WordPress core and resources.', 'wporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 /* translators: %s: Link to the Accessibility team P2 */
+                                                       wp_kses_post( __( 'The <a href="%s">WordPress Accessibility Team</a> provides accessibility expertise across the project to improve the accessibility of WordPress core and resources.', 'wporg' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         'https://make.wordpress.org/accessibility/'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </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">-                                        <p><?php
-                                               /* translators: 1: Link to the Accessibility handbook; 2: Link to the Accessibility handbook's Best Practices; 3: Link to the Accessibility handbook's Useful Tools; 4: Link to the Accessibility handbook's Audits & Testing; 5: Link to the Accessibility handbook's Get Involved */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        __( 'The <a href="%1$s">Accessibility Handbook</a> shares the <a href="%2$s">best practices</a> for web accessibility, a list of <a href="%3$s">accessibility tools</a>, the <a href="%4$s">testing we do</a> to improve WordPress, themes, and plugins, and <a href="%5$s">how to get involved</a> in WordPress accessibility.', 'wporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 /* translators: 1: Link to the Accessibility handbook; 2: Link to the Accessibility handbook's Best Practices; 3: Link to the Accessibility handbook's Useful Tools; 4: Link to the Accessibility handbook's Audits & Testing; 5: Link to the Accessibility handbook's Get Involved */
+                                                       wp_kses_post( __( 'The <a href="%1$s">Accessibility Handbook</a> shares the <a href="%2$s">best practices</a> for web accessibility, a list of <a href="%3$s">accessibility tools</a>, the <a href="%4$s">testing we do</a> to improve WordPress, themes, and plugins, and <a href="%5$s">how to get involved</a> in WordPress accessibility.', 'wporg' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         'https://make.wordpress.org/accessibility/handbook/',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'https://make.wordpress.org/accessibility/handbook/best-practices/',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'https://make.wordpress.org/accessibility/handbook/which-tools-can-i-use/useful-tools/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,19 +85,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'https://make.wordpress.org/accessibility/handbook/get-involved/audits-and-testing/',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'https://make.wordpress.org/accessibility/handbook/get-involved/'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </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">-                                        <p><?php
-                                               /* translators: %s: Link to the Accessibility handbook's Reporting Issues */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        __( 'To report an Accessibility issue you’ve encountered in WordPress or on WordPress.org, please see the Accessibility Handbook on <a href="%s">Reporting Accessibility Issues</a>.', 'wporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 /* translators: %s: Link to the Accessibility handbook's Reporting Issues */
+                                                       wp_kses_post( __( 'To report an Accessibility issue you’ve encountered in WordPress or on WordPress.org, please see the Accessibility Handbook on <a href="%s">Reporting Accessibility Issues</a>.', 'wporg' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         'https://make.wordpress.org/accessibility/handbook/reporting-issues/'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                </section>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- .entry-content -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                 </article><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        </main><!-- #main -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutdomainsphp"></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-about-domains.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-about-domains.php     2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-domains.php       2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page.*/
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'If they&#8217;re not WordPress.com, WordPress.net, WordPress.org, WordPress.tv, or WordPressFoundation.org, they&#8217;re not allowed, and you should contact the owner with a pointer to this page. We see this most frequently with spammy sites distributing plugins and themes with malware in them, which you probably don&#8217;t want to be associated with.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                </section>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- .entry-content -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                 </article><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        </main><!-- #main -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutetiquettephp"></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-about-etiquette.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-about-etiquette.php   2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-etiquette.php     2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        </p>
</span><span class="cx" style="display: block; padding: 0 10px">                                </section>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- .entry-content -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                 </article><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        </main><!-- #main -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutfeaturesphp"></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-about-features.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-about-features.php    2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-features.php      2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,105 +39,105 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                <section class="col-8">
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p>
</span><span class="cx" style="display: block; padding: 0 10px">                                                <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                /* translators: WordPress market share: 30 - Note: The following percent sign is '%%' for escaping purposes; */
-                                               printf( esc_html__( 'WordPress powers more than %s%% of the web &mdash; a figure that rises every day. Everything from simple websites, to blogs, to complex portals and enterprise websites, and even applications, are built with WordPress.', 'wporg' ), number_format_i18n( WP_MARKET_SHARE ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         printf(
+                                                       /* translators: WordPress market share: 30 - Note: The following percent sign is '%%' for escaping purposes; */
+                                                       esc_html__( 'WordPress powers more than %s%% of the web &mdash; a figure that rises every day. Everything from simple websites, to blogs, to complex portals and enterprise websites, and even applications, are built with WordPress.', 'wporg' ),
+                                                       esc_html( number_format_i18n( WP_MARKET_SHARE ) )
+                                               );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                        </p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                                         <p><?php esc_html_e( 'WordPress combines simplicity for users and publishers with under-the-hood complexity for developers. This makes it flexible while still being easy-to-use.', 'wporg' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                                         <p><?php esc_html_e( 'The following is a list of some of the features that come as standard with WordPress; however, there are literally thousands of plugins that extend what WordPress does, so the actual functionality is nearly limitless. You are also free to do whatever you like with the WordPress code, extend it or modify in any way or use it for commercial projects without any licensing fees. That is the beauty of free software, free refers not only to price but also the freedom to have complete control over it.', 'wporg' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                                         <p><?php esc_html_e( 'Here are some of the features that we think that you&#8217;ll love.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Simplicity', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Simplicity', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'Simplicity makes it possible for you to get online and get publishing, quickly. Nothing should get in the way of you getting your website up and your content out there. WordPress is built to make that happen.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Flexibility', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Flexibility', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'With WordPress, you can create any type of website you want: a personal blog or website, a photoblog, a business website, a professional portfolio, a government website, a magazine or news website, an online community, even a network of websites. You can make your website beautiful with themes, and extend it with plugins. You can even build your very own application.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Publish with Ease', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Publish with Ease', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'If you&#8217;ve ever created a document, you&#8217;re already a whizz at creating content with WordPress. You can create Posts and Pages, format them easily, insert media, and with the click of a button your content is live and on the web.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Publishing Tools', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Publishing Tools', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'WordPress makes it easy for you to manage your content. Create drafts, schedule publication, and look at your post revisions. Make your content public or private, and secure posts and pages with a password.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'User Management', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'User Management', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'Not everyone requires the same access to your website. Administrators manage the site, editors work with content, authors and contributors write that content, and subscribers have a profile that they can manage. This lets you have a variety of contributors to your website, and let others simply be part of your community.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Media Management', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Media Management', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'They say a picture says a thousand words, which is why it&#8217;s important for you to be able to quickly and easily upload images and media to WordPress. Drag and drop your media into the uploader to add it to your website. Add alt text, captions, and titles, and insert images and galleries into your content. We&#8217;ve even added a few image editing tools you can have fun with.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Full Standards Compliance', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Full Standards Compliance', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'Every piece of WordPress generated code is in full compliance with the standards set by the W3C. This means that your website will work in today&#8217;s browser, while maintaining forward compatibility with the next generation of browser. Your website is a beautiful thing, now and in the future.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Easy Theme System', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Easy Theme System', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'WordPress comes bundled with two default themes, but if they aren&#8217;t for you there&#8217;s a theme directory with thousands of themes for you to create a beautiful website. None of those to your taste? Upload your own theme with the click of a button. It only takes a few seconds for you to give your website a complete makeover.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Extend with Plugins', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Extend with Plugins', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'WordPress comes packed full of features for every user, for every other feature there&#8217;s a plugin directory with thousands of plugins. Add complex galleries, social networking, forums, social media widgets, spam protection, calendars, fine-tune controls for search engine optimization, and forms.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Built-in Comments', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Built-in Comments', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'Your blog is your home, and comments provide a space for your friends and followers to engage with your content. WordPress&#8217;s comment tools give you everything you need to be a forum for discussion and to moderate that discussion.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Search Engine Optimized', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Search Engine Optimized', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: Link to Plugin Directory search for SEO */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        printf( wp_kses_post( __( 'WordPress is optimized for search engines right out of the box. For more fine-grained SEO control, there are plenty of <a href="%s">SEO plugins</a> to take care of that for you.', 'wporg' ) ), esc_url( home_url( '/plugins/search/SEO/' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">                                                        ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Multilingual', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Multilingual', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: Link to polyglots teams */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        printf( wp_kses_post( __( 'WordPress is available in more than 70 languages. If you or the person you&#8217;re building the website for would prefer to use WordPress in a language other than English, <a href="%s">that&#8217;s easy to do</a>.', 'wporg' ) ), esc_url( 'https://make.wordpress.org/polyglots/teams/' ) );
</span><span class="cx" style="display: block; padding: 0 10px">                                                        ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Easy Installation and Upgrades', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Easy Installation and Upgrades', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'WordPress has always been easy to install and upgrade. If you&#8217;re happy using an FTP program, you can create a database, upload WordPress using FTP, and run the installer. Not familiar with FTP? Plenty of web hosts offer one-click WordPress installers that let you install WordPress with, well, just one click!', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Importers', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Importers', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'Using blog or website software that you aren&#8217;t happy with? Running your blog on a hosted service that&#8217;s about to shut down? WordPress comes with importers for blogger, LiveJournal, Movable Type, TypePad, Tumblr, and WordPress. If you&#8217;re ready to make the move, we&#8217;ve made it easy for you.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Own Your Data', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Own Your Data', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'Hosted services come and go. If you&#8217;ve ever used a service that disappeared, you know how traumatic that can be. If you&#8217;ve ever seen adverts appear on your website, you&#8217;ve probably been pretty annoyed. Using WordPress means no one has access to your content. Own your data, all of it &mdash; your website, your content, your data.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Freedom', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Freedom', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'WordPress is licensed under the GPL which was created to protect your freedoms. You are free to use WordPress in any way you choose: install it, use it, modify it, distribute it. Software freedom is the foundation that WordPress is built on.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Community', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Community', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'As the most popular open source CMS on the web, WordPress has a vibrant and supportive community. Ask a question on the support forums and get help from a volunteer, attend a WordCamp or Meetup to learn more about WordPress, read blogs posts and tutorials about WordPress. Community is at the heart of WordPress, making it what it is today.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Contribute', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Contribute', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'You can be WordPress too! Help to build WordPress, answer questions on the support forums, write documentation, translate WordPress into your language, speak at a WordCamp, write about WordPress on your blog. Whatever your skill, we&#8217;d love to have you!', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><span class="cx" style="display: block; padding: 0 10px">                                        </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <h3><?php _ex( 'Developer Features', 'Features page: Section Header', 'wporg' ); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <h3><?php echo esc_html_x( 'Developer Features', 'Features page: Section Header', 'wporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <p><?php esc_html_e( 'For developers, we&#8217;ve got lots of goodies packed under the hood that you can use to extend WordPress in whatever direction takes your fancy.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Plugin System', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Plugin System', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: Link to Codex page about APIs; 2: Link to Plugin Directory */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        printf( wp_kses_post( __( 'The <a href="%1$s">WordPress APIs</a> make it possible for you to create plugins to extend WordPress. WordPress&#8217;s extensibility lies in the thousands of hooks at your disposal. Once you&#8217;ve created your plugin, we&#8217;ve even got a <a href="%2$s">plugin repository</a> for you to host it on.', 'wporg' ) ), esc_url( 'https://codex.wordpress.org/WordPress_APIs' ), esc_url( home_url( '/plugins/' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">                                                        ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Theme System', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Theme System', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: Link to Codex page about APIs; 2: Link to Theme Directory */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        printf( wp_kses_post( __( 'Create WordPress themes for clients, other WordPress users, or yourself. The <a href="%1$s">WordPress API</a> provides the extensibility to create themes as simple or as complex as you wish. If you want to give your theme away for free you can give it to users in the <a href="%2$s">Theme Repository</a>', 'wporg' ) ), esc_url( 'https://codex.wordpress.org/WordPress_APIs' ), esc_url( home_url( '/themes/' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">                                                        ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Application Framework', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Application Framework', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php esc_html_e( 'If you want to build an application, WordPress can help with that too. Under the hood WordPress provides a lot of the features that your app will need, things like translations, user management, HTTP requests, databases, URL routing and much, much more.', 'wporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'Custom Content Types', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'Custom Content Types', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: Link to Codex page about Custom Post Types; 2: Link to Codex page about Custom Taxonomies; 3: Link to Codex page about Custom Fields */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        printf( wp_kses_post( __( 'WordPress comes with default content types, but for more flexibility you can add a few lines of code to create your own <a href="%1$s">custom post types</a>, <a href="%2$s">taxonomies</a>, and <a href="%3$s">metadata</a>. Take WordPress in whatever direction you wish.', 'wporg' ) ), esc_url( 'https://codex.wordpress.org/Post_Types#Custom_Post_Types' ), esc_url( 'https://codex.wordpress.org/Taxonomies#Custom_Taxonomies' ), esc_url( 'https://codex.wordpress.org/Custom_Fields' ) );
</span><span class="cx" style="display: block; padding: 0 10px">                                                        ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><strong><?php _ex( 'The Latest Libraries', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li><strong><?php echo esc_html_x( 'The Latest Libraries', 'Features page: Section Header', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <?php
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: Link to Developer Handbook page about default scripts */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        printf( wp_kses_post( __( 'WordPress comes with the <a href="%s">latest script libraries</a> for you to make use of. These include jQuery, Plupload, Underscore.js and Backbone.js. We&#8217;re always on the lookout for new tools that developers can use to make a better experience for our users.', 'wporg' ) ), esc_url( 'https://developer.wordpress.org/reference/functions/wp_enqueue_script/#default-scripts-included-and-registered-by-wordpress' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        </ul>
</span><span class="cx" style="display: block; padding: 0 10px">                                </section>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- .entry-content -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                 </article><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        </main><!-- #main -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageabouthistoryphp"></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-about-history.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-about-history.php     2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-history.php       2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutlicensephp"></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-about-license.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-about-license.php     2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-license.php       2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutlogosphp"></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-about-logos.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-about-logos.php       2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-logos.php 2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutphilosophyphp"></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-about-philosophy.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-about-philosophy.php  2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-philosophy.php    2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacycookiesphp"></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-about-privacy-cookies.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-about-privacy-cookies.php     2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-cookies.php       2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\MainTheme;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['menu_items'] = [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        'about/privacy'                      => _x( 'Privacy Policy',       'Page title', 'wporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'about/privacy' => _x( 'Privacy Policy', 'Page title', 'wporg' ),
</ins><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"> // Prevent Jetpack from looking for a non-existent featured image.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</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"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,10 +40,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="entry-content row">
</span><span class="cx" style="display: block; padding: 0 10px">                                <section class="col-8">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <h3><?php esc_html_e( '', 'wporg' ); ?></h3>
-                                       <p><?php esc_html_e( '', 'wporg' ); ?></p>
-                                       <p><?php echo wp_kses_post( __( '', 'wporg' ) ); ?></p>
-
</del><span class="cx" style="display: block; padding: 0 10px">                                         <h3><?php esc_html_e( 'Cookies', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'Our Privacy Policy explains our principles when it comes to the collection, processing, and storage of your information. This policy specifically explains how we, our partners, and users of our services deploy cookies, as well as the options you have to control them.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        <tr>
</span><span class="cx" style="display: block; padding: 0 10px">                                                                <th>trac_form_token</th>
</span><span class="cx" style="display: block; padding: 0 10px">                                                                <td><?php esc_html_e( 'Session', 'wporg' ); ?></td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                <td><?php esc_html_e( '', 'wporg' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         <td></td>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 <td><?php esc_html_e( 'Used to check whether the current visitor is a logged in WordPress.org user.', 'wporg' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px">                                                        </tr>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </tbody>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacydataerasurerequestphp"></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-about-privacy-data-erasure-request.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-about-privacy-data-erasure-request.php        2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php  2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,9 +10,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\MainTheme;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['menu_items'] = [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        'about/privacy'                      => _x( 'Privacy Policy',       'Page title', 'wporg' ),
-       #'about/privacy/data-export-request'  => _x( 'Data Export Request',  'Page title', 'wporg' ),
-       'about/privacy/data-erasure-request' => _x( 'Data Erasure Request', 'Page title', 'wporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'about/privacy'                      => esc_html_x( 'Privacy Policy', 'Page title', 'wporg' ),
+       // 'about/privacy/data-export-request'  => esc_html_x( 'Data Export Request', 'Page title', 'wporg' ),
+       'about/privacy/data-erasure-request' => esc_html_x( 'Data Erasure Request', 'Page title', 'wporg' ),
</ins><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"> // Prevent Jetpack from looking for a non-existent featured image.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,27 +42,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">        $email = wp_get_current_user()->user_email;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', function() {
</span><span class="cx" style="display: block; padding: 0 10px">        // TODO: Move to Theme once styled.
</span><span class="cx" style="display: block; padding: 0 10px">        echo '<style>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                p.error {
-                       border: 1px solid red;
-                       border-left: 4px solid red;
-                       padding: 6px;
-               }
-               p.success {
-                       border: 1px solid green;
-                       border-left: 4px solid green;
-                       padding: 6px;
-               }
-               div.alert {
-                       border: 1px solid red;
-                       border-left: 4px solid red;
-                       padding: 6px;
-                       margin-bottom: 2rem;
-               }       
</del><span class="cx" style="display: block; padding: 0 10px">                 form.request-form label {
</span><span class="cx" style="display: block; padding: 0 10px">                        display: block;
</span><span class="cx" style="display: block; padding: 0 10px">                        color: #555;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,58 +80,63 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'The following form will allow you to request deletion of your account and relevant personal and private data. You will be required to authenticate ownership of that address, and may be asked to provide additional identification or information necessary to verify the request.', 'wporg' ); ?></p>
</span><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="alert">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <div class="notice notice-info notice-alt">
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 <h5><?php esc_html_e( 'Important!', 'wporg' ); ?></h5>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <p><?php printf( wp_kses_post( __( 'This will request permanent deletion of your <strong>WordPress.org</strong> account, and relevant personal or private data stored on <strong>%s</strong>, and other related domains and sites.', 'wporg') ), 'WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org' ); ?></p>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <p>
+                                                       <?php
+                                                       printf(
+                                                               /* translators: List of sites that use WordPress.org account. */
+                                                               wp_kses_post( __( 'This will request permanent deletion of your <strong>WordPress.org</strong> account, and relevant personal or private data stored on <strong>%s</strong>, and other related domains and sites.', 'wporg' ) ),
+                                                               'WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org'
+                                                       );
+                                                       ?>
+                                               </p>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 <p><?php esc_html_e( 'Please note that we cannot remove or provide access to data stored on WordPress sites hosted or administered by third parties.', 'wporg' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-                                               <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <p>
+                                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                                /* translators: link to privacy policy. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                wp_kses_post( __('Not all data can be erased, please review the <a href="%s">Privacy Policy</a> for details.', 'wporg' ) ),
-                                                               'https://wordpress.org/about/privacy/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         wp_kses_post( __( 'Not all data can be erased, please review the <a href="%s">Privacy Policy</a> for details.', 'wporg' ) ),
+                                                               esc_url( home_url( '/about/privacy/' ) )
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 ?>
+                                               </p>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php if ( $error_message ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <p class="error">
-                                                       <strong><?php esc_html_e( 'An error occurred with your request:', 'wporg' ); ?></strong><br>
-                                                       <?php echo $error_message; ?>
-                                               </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <div class="notice notice-error notice-alt">
+                                                       <p><?php echo esc_html( $error_message ); ?></p>
+                                               </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <?php elseif ( $success ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <p class="success"><strong><?php esc_html_e( 'Please check your email for a confirmation link, and follow the instructions to authenticate your request.', 'wporg' ); ?></strong></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <div class="notice notice-success notice-alt">
+                                                       <p><?php esc_html_e( 'Please check your email for a confirmation link, and follow the instructions to authenticate your request.', 'wporg' ); ?></p>
+                                               </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <?php endif; ?>
</span><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 ( !$success ) : ?>
-                                       <form id="erase-request-form" class="request-form" method="POST" action="#">
-                                               <label for="email">
-                                                       <?php esc_html_e( 'Email Address', 'wporg' ); ?>
-                                               </label>
-                                               <input
-                                                       type="email"
-                                                       name="email" id="email"
-                                                       placeholder="<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php if ( ! $success ) : ?>
+                                               <form id="erase-request-form" class="request-form" method="POST" action="#">
+                                                       <label for="email"><?php esc_html_e( 'Email Address', 'wporg' ); ?></label>
+                                                       <?php
+                                                       printf( '<input type="email" name="email" id="email" placeholder="%1$s" required value="%2$s" />',
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 /* translators: Example placeholder email address */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                esc_attr_e( 'you@example.com', 'wporg' )
-                                                       ?>"
-                                                       required
-                                                       value="<?php echo esc_attr( $email ); ?>"
-                                               >
-                                               <p><?php esc_html_e( 'By submitting this form, you declare that you are the individual owner of the specified email address and its associated accounts; and that all submitted information including any supplemental details necessary to verify your identity are true. You also declare that it is your intention for accounts associated with that email address to be permanently deleted.', 'wporg' ); ?></p>
-                                               <?php reCAPTCHA\display_submit_button( __( 'Accept Declaration and Request Permanent Account Deletion', 'wporg' ) ); ?>
-                                               <?php if ( is_user_logged_in() ) wp_nonce_field( $nonce_action ); ?>
-                                       </form>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         esc_attr__( 'you@example.com', 'wporg' ),
+                                                               esc_attr( $email )
+                                                       );
+                                                       ?>
+                                                       <p><?php esc_html_e( 'By submitting this form, you declare that you are the individual owner of the specified email address and its associated accounts; and that all submitted information including any supplemental details necessary to verify your identity are true. You also declare that it is your intention for accounts associated with that email address to be permanently deleted.', 'wporg' ); ?></p>
+                                                       <?php
+                                                       reCAPTCHA\display_submit_button( __( 'Accept Declaration and Request Permanent Account Deletion', 'wporg' ) );
+                                                       if ( is_user_logged_in() ) :
+                                                               wp_nonce_field( $nonce_action );
+                                                       endif;
+                                                       ?>
+                                               </form>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 <p><?php esc_html_e( 'Please Note: Before we can begin processing your request, we&#8217;ll require that you verify ownership of the email address. If the email address is associated with an account, we&#8217;ll also require you to log in to that account first.', 'wporg' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                                         <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                </section>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- .entry-content -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                 </article><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        </main><!-- #main -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacydataexportrequestphp"></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-about-privacy-data-export-request.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-about-privacy-data-export-request.php 2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-export-request.php   2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,9 +10,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\MainTheme;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['menu_items'] = [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        'about/privacy'                      => _x( 'Privacy Policy',       'Page title', 'wporg' ),
-       'about/privacy/data-export-request'  => _x( 'Data Export Request',  'Page title', 'wporg' ),
-       'about/privacy/data-erasure-request' => _x( 'Data Erasure Request', 'Page title', 'wporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'about/privacy'                      => esc_html_x( 'Privacy Policy', 'Page title', 'wporg' ),
+       'about/privacy/data-export-request'  => esc_html_x( 'Data Export Request', 'Page title', 'wporg' ),
+       'about/privacy/data-erasure-request' => esc_html_x( 'Data Erasure Request', 'Page title', 'wporg' ),
</ins><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"> // Prevent Jetpack from looking for a non-existent featured image.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,22 +42,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">        $email = wp_get_current_user()->user_email;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', function() {
</span><span class="cx" style="display: block; padding: 0 10px">        // TODO: Move to Theme once styled.
</span><span class="cx" style="display: block; padding: 0 10px">        echo '<style>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                p.error {
-                       border: 1px solid red;
-                       border-left: 4px solid red;
-                       padding: 6px;
-               }
-               p.success {
-                       border: 1px solid green;
-                       border-left: 4px solid green;
-                       padding: 6px;
-               }
-
</del><span class="cx" style="display: block; padding: 0 10px">                 form.request-form label {
</span><span class="cx" style="display: block; padding: 0 10px">                        display: block;
</span><span class="cx" style="display: block; padding: 0 10px">                        color: #555;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,46 +76,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'The following form will allow you to request an export of any data linked to your email address. You will be required to authenticate ownership of that address, and may be asked to provide additional identification or information necessary to verify the request and search our records.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php esc_html_e( 'This export will contain relevant personal or private data stored on WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org, and other related domains and sites.', 'wporg'); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p><?php esc_html_e( 'This export will contain relevant personal or private data stored on WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org, and other related domains and sites.', 'wporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php if ( $error_message ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <p class="error">
-                                                       <strong><?php esc_html_e( 'An error occured with your request:', 'wporg' ); ?></strong><br>
-                                                       <?php echo $error_message; ?>
-                                               </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <div class="notice notice-error notice-alt">
+                                                       <p><?php echo esc_html( $error_message ); ?></p>
+                                               </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <?php elseif ( $success ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p class="success"><strong><?php esc_html_e( 'Please check your email for a confirmation link, and follow the instructions to authenticate your request.', 'wporg' ); ?></strong></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <div class="notice notice-success notice-alt">
+                                               <p><?php esc_html_e( 'Please check your email for a confirmation link, and follow the instructions to authenticate your request.', 'wporg' ); ?></p>
+                                       </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p class="error"><strong>This is currently disabled unless you have a 'special' WordPress.org account.</strong></p>
-                                       <?php if ( is_user_logged_in() && wporg_user_has_restricted_password() ) : ?>
-                                               <p class="success">PS: You have a special account.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <div class="notice notice-error notice-alt">
+                                               <p>This is currently disabled unless you have a 'special' WordPress.org account.</p>
+                                       </div>
+                                       <?php if ( is_user_logged_in() && function_exists( 'wporg_user_has_restricted_password' ) && wporg_user_has_restricted_password() ) : ?>
+                                               <div class="notice notice-info notice-alt"><p>PS: You have a special account.</p></div>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <form id="export-request-form" class="request-form" method="POST" action="#">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <label for="email">
-                                                       <?php esc_html_e( 'Email Address', 'wporg' ); ?>
-                                               </label>
-                                               <input
-                                                       type="email"
-                                                       name="email" id="email"
-                                                       placeholder="<?php
-                                                               /* translators: Example placeholder email address */
-                                                               esc_attr_e( 'you@example.com', 'wporg' )
-                                                       ?>"
-                                                       required
-                                                       value="<?php echo esc_attr( $email ); ?>"
-                                               >
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <label for="email"><?php esc_html_e( 'Email Address', 'wporg' ); ?></label>
+                                               <?php
+                                               printf( '<input type="email" name="email" id="email" placeholder="%1$s" required value="%2$s" />',
+                                                       /* translators: Example placeholder email address */
+                                                       esc_attr__( 'you@example.com', 'wporg' ),
+                                                       esc_attr( $email )
+                                               );
+                                               ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 <p><?php esc_html_e( 'By submitting this form, you declare that you are the individual owner of the specified email address and its associated accounts; and that all submitted information including any supplemental details necessary to verify your identity are true.', 'wporg' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <?php reCAPTCHA\display_submit_button( __( 'Accept Declaration and Request Export', 'wporg' ) ); ?>
-                                               <?php if ( is_user_logged_in() ) wp_nonce_field( $nonce_action ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php
+                                               reCAPTCHA\display_submit_button( __( 'Accept Declaration and Request Export', 'wporg' ) );
+                                               if ( is_user_logged_in() ) :
+                                                       wp_nonce_field( $nonce_action );
+                                               endif;
+                                               ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         </form>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-                                       <p><?php esc_html_e( "Please Note: Before we can begin processing your request, we'll require that you verify ownership of the email address. If the email address is associated with an account, we'll also require you to log in to that account first.", 'wporg' ); ?></p>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p><?php esc_html_e( 'Please Note: Before we can begin processing your request, we&#8217;ll require that you verify ownership of the email address. If the email address is associated with an account, we&#8217;ll also require you to log in to that account first.', 'wporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">                                 </section>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- .entry-content -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                 </article><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        </main><!-- #main -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacyphp"></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-about-privacy.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-about-privacy.php     2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy.php       2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,10 +72,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'Access to data', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'You have the right to request a copy of the information we hold about you. If you would like a copy of some or all your personal information, please follow the instructions at the end of this policy.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'All WordCamp attendee-provided data can be viewed and changed by the attendee via the Access Token URL that is emailed to confirm a successful ticket purchase.', 'wporg' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php echo wp_kses_post( __( 'WordPress.org user accounts can be edited by following these steps:<br/>
-1) Visit <a href="https://login.wordpress.org/">https://login.wordpress.org</a>, and then enter your username and password.<br/>
-2) You will be redirected to https://profiles.wordpress.org/your_username.<br/>
-3) Click the &#8220;Edit&#8221; link next to your username.', 'wporg' ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p><?php esc_html_e( 'WordPress.org user accounts can be edited by following these steps:', 'wporg' ); ?></p>
+                                       <ol>
+                                               <li>
+                                                       <?php
+                                                       printf(
+                                                               /* translators: Login URL */
+                                                               wp_kses_post( __( 'Visit <a href="%s">https://login.wordpress.org</a>, and enter your username and password.', 'wporg' ) ),
+                                                               esc_url( 'https://login.wordpress.org/' )
+                                                       );
+                                                       ?>
+                                               </li>
+                                               <li><?php esc_html_e( 'You will be redirected to https://profiles.wordpress.org/your_username.', 'wporg' ); ?></li>
+                                               <li><?php esc_html_e( 'Click the &#8220;Edit&#8221; link next to your username.', 'wporg' ); ?></li>
+                                       </ol>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'Retention of personal information', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'We will retain your personal information on our systems only for as long as we need to, for the success of the WordPress open source project and the programs that support WordPress.org. We keep contact information (such as mailing list information) until a user unsubscribes or requests that we delete that information from our live systems. If you choose to unsubscribe from a mailing list, we may keep certain limited information about you so that we may honor your request.', 'wporg' ); ?></p>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutrequirementsphp"></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-about-requirements.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-about-requirements.php        2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-requirements.php  2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                        </p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                               <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: PHP Version including; 2: MySQL Version */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        wp_kses_post( __( 'Note: If you are in a legacy environment where you only have older PHP or MySQL versions, WordPress also works with PHP %1$s+ and MySQL %2$s+, but these versions have reached official End Of Life and as such <strong>may expose your site to security vulnerabilities</strong>.', 'wporg' ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +75,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '5.2.4',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '5.0'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'Ask for it', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,14 +86,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                <p><?php esc_html_e( 'I&#8217;m interested in running the open-source WordPress &lt;https://wordpress.org/&gt; web software and I was wondering if my account supported the following:', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                                <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        <li><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <li>
+                                                               <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 /* translators: PHP Version */
</span><span class="cx" style="display: block; padding: 0 10px">                                                                printf( esc_html__( 'PHP %s or greater', 'wporg' ), '7.2' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        ?></li>
-                                                       <li><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         ?>
+                                                       </li>
+                                                       <li>
+                                                               <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 /* translators: 1: MySQL version; 2: MariaDB Version */
</span><span class="cx" style="display: block; padding: 0 10px">                                                                printf( esc_html__( 'MySQL %1$s or greater OR MariaDB %2$s or greater', 'wporg' ), '5.6', '10.0' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         ?>
+                                                       </li>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <li><?php esc_html_e( 'Nginx or Apache with mod_rewrite module', 'wporg' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px">                                                        <li><?php esc_html_e( 'HTTPS support', 'wporg' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </ul>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutroadmapphp"></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-about-roadmap.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-about-roadmap.php     2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-roadmap.php       2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutsecurityphp"></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-about-security.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-about-security.php    2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-security.php      2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><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 contents of this page was last sync'd to the following commit:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,13 +42,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="entry-content row">
</span><span class="cx" style="display: block; padding: 0 10px">                                <section class="col-8">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: URL to English PDF */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        wp_kses_post( __( 'Learn more about WordPress core software security in this free white paper. You can also download it in <a href="%s">PDF format</a>.', 'wporg' ) ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'https://github.com/WordPress/Security-White-Paper/blob/master/WordPressSecurityWhitePaper.pdf?raw=true'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <img src="//s.w.org/about/images/logos/wordpress-logo-stacked-rgb.png" class="aligncenter" />
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,13 +60,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'The information in this document is up-to-date for the latest stable release of the software, WordPress 4.7 at time of publication, but should be considered relevant also to the most recent versions of the software as backwards compatibility is a strong focus for the WordPress development team. Specific security measures and changes will be noted as they have been added to the core software in specific releases. It is strongly encouraged to always be running the latest stable version of WordPress to ensure the most secure experience possible.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h2><?php esc_html_e( 'Executive Summary', 'wporg' ); ?></h2>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: WordPress Market share - 30. Note the following % sign is escaped as %%. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'WordPress is a dynamic open-source content management system which is used to power millions of websites, web applications, and blogs. It currently powers more than %s%% of the top 10 million websites on the Internet. WordPress&#8217; usability, extensibility, and mature development community make it a popular and secure choice for websites of all sizes.', 'wporg' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        WP_MARKET_SHARE
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 esc_html( WP_MARKET_SHARE )
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'Since its inception in 2003, WordPress has undergone continual hardening so its core software can address and mitigate common security threats, including the Top 10 list identified by The Open Web Application Security Project (OWASP) as common security vulnerabilities, which are discussed in this document.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,16 +76,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'Site developers and administrators should pay particular attention to the correct use of core APIs and underlying server configuration which have been the source of common vulnerabilities, as well as ensuring all users employ strong passwords to access WordPress.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h2><?php esc_html_e( 'An Overview of WordPress', 'wporg' ); ?></h2>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: WordPress Market share - 30. Note the following % sign is escaped as %%. 2: Footnote 3: Market Penetration - 60.  Note the following % sign is escaped as %%. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        esc_html__( 'WordPress is a free and open source content management system (CMS). It is the most widely-used CMS software in the world and it powers more than %1$s%% of the top 10 million websites%2$s, giving it an estimated %3$s%% market share of all sites
-using a CMS.', 'wporg' ),
-                                                       WP_MARKET_SHARE,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 esc_html__( 'WordPress is a free and open source content management system (CMS). It is the most widely-used CMS software in the world and it powers more than %1$s%% of the top 10 million websites%2$s, giving it an estimated %3$s%% market share of all sites using a CMS.', 'wporg' ),
+                                                       esc_html( WP_MARKET_SHARE ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         '<sup id="ref1"><a href="#footnote1">1</a></a></sup>',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        60
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'WordPress is licensed under the General Public License (GPLv2 or later) which provides four core freedoms, and can be considered as the WordPress &#8220;bill of rights&#8221;:', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <ol>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,13 +106,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'The WordPress Release Cycle', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'Each WordPress release cycle is led by one or more of the core WordPress developers. A release cycle usually lasts around 4 months from the initial scoping meeting to launch of the version.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote*/
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'A release cycle follows the following pattern%s:', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref2"><a href="#footnote2">2</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <ul>
</span><span class="cx" style="display: block; padding: 0 10px">                                                <li><?php esc_html_e( 'Phase 1: Planning and securing team leads. This is done in the #core chat room on Slack. The release lead discusses features for the next release of WordPress. WordPress contributors get involved with that discussion. The release lead will identify team leads for each of the features.', 'wporg' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px">                                                <li><?php esc_html_e( 'Phase 2: Development work begins. Team leads assemble teams and work on their assigned features. Regular chats are scheduled to ensure the development keeps moving forward.', 'wporg' ); ?></li>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,19 +127,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'Major releases may add new user features and developer APIs. Though typically in the software world, a &#8220;major&#8221; version means you can break backwards compatibility, WordPress strives to never break backwards compatibility. Backwards compatibility is one of the project&#8217;s most important philosophies, with the aim of making updates much easier on users and developers alike.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'A minor WordPress version is dictated by the third sequence. Version 3.5.1 is a minor release, as is 3.4.2%s. A minor release is reserved for fixing security vulnerabilities and addressing critical bugs only. Since new versions of WordPress are released so frequently &mdash; the aim is every 4-5 months for a major release, and minor releases happen as needed &mdash; there is only a need for major and minor releases.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref3"><a href="#footnote3">3</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'Version Backwards Compatibility', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'The WordPress project has a strong commitment to backwards compatibility. This commitment means that themes, plugins, and custom code continues to function when WordPress core software is updated, encouraging site owners to keep their WordPress version updated to the latest secure release.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h2><?php esc_html_e( 'WordPress and Security', 'wporg' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'The WordPress Security Team', 'wporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: Number - 50; 2: Footnote*/
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'The WordPress Security Team is made up of approximately %1$s experts including lead developers and security researchers &mdash; about half are employees of Automattic (makers of WordPress.com, the earliest and largest WordPress hosting platform on the web), and a number work in the web security field. The team consults with well-known and trusted security researchers and hosting companies%2$s.', 'wporg' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,17 +149,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        50,
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup><a href="#footnote3">3</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </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">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'The WordPress Security Team often collaborates with other security teams to address issues in common dependencies, such as resolving the vulnerability in the PHP XML parser, used by the XML-RPC API that ships with WordPress, in WordPress 3.9.2%s. This vulnerability resolution was a result of a joint effort by both WordPress and Drupal security teams.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref4"><a href="#footnote4">4</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <h3><?php esc_html_e( 'WordPress Security Risks, Process, and History', 'wporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: HackerOne URL 2: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        wp_kses_post( __( 'The WordPress Security Team believes in Responsible Disclosure by alerting the security team immediately of any potential vulnerabilities. Potential security vulnerabilities can be signaled to the Security Team via the <a href="%1$s">WordPress HackerOne</a>%2$s. The Security Team communicates amongst itself via a private Slack channel, and works on a walled-off, private Trac for tracking, testing, and fixing bugs and security problems.', 'wporg' ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,54 +170,64 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'https://hackerone.com/wordpress',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref5"><a href="#footnote5">5</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'Each security report is acknowledged upon receipt, and the team works to verify the vulnerability and determine its severity. If confirmed, the security team then plans for a patch to fix the problem which can be committed to an upcoming release of the WordPress software or it can be pushed as an immediate security release, depending on the severity of the issue.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'For an immediate security release, an advisory is published by the Security Team to the WordPress.org News site%s announcing the release and detailing the changes. Credit for the responsible disclosure of a vulnerability is given in the advisory to encourage and reinforce continued responsible reporting in the future.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref6"><a href="#footnote6">6</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'Administrators of the WordPress software see a notification on their site dashboard to upgrade when a new release is available, and following the manual upgrade users are redirected to the About WordPress screen which details the changes. If administrators have automatic background updates enabled, they will receive an email after an upgrade has been completed.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'Automatic Background Updates for Security Releases', 'wporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'Starting with version 3.7, WordPress introduced automated background updates for all minor releases%s, such as 3.7.1 and 3.7.2. The WordPress Security Team can identify, fix, and push out automated security enhancements for WordPress without the site owner needing to do anything on their end, and the security update will install automatically.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref7"><a href="#footnote7">7</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'When a security update is pushed for the current stable release of WordPress, the core team will also push security updates for all the releases that are capable of background updates (since WordPress 3.7), so these older but still recent versions of WordPress will receive security enhancements.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'Individual site owners can opt to remove automatic background updates through a simple change in their configuration file, but keeping the functionality is strongly recommended by the core team, as well as running the latest stable release of WordPress.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( '2013 OWASP Top 10', 'wporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'The Open Web Application Security Project (OWASP) is an online community dedicated to web application security. The OWASP Top 10 list%s focuses on identifying the most serious application security risks for a broad array of organizations. The Top 10 items are selected and prioritized in combination with consensus estimates of exploitability, detectability, and impact estimates.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref8"><a href="#footnote8">8</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'The following sections discuss the APIs, resources, and policies that WordPress uses to strengthen the core software and 3rd party plugins and themes against these potential risks.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h4><?php esc_html_e( 'A1 - Injection', 'wporg' ); ?></h4>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'There is a set of functions and APIs available in WordPress to assist developers in making sure unauthorized code cannot be injected, and help them validate and sanitize data. Best practices and documentation are available%s on how to use these APIs to protect, validate, or sanitize input and output data in HTML, URLs, HTTP headers, and when interacting with the database and filesystem. Administrators can also further restrict the types of file which can be uploaded via filters.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref9"><a href="#footnote9">9</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <h4><?php esc_html_e( 'A2 - Broken Authentication and Session Management', 'wporg' ); ?></h4>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'WordPress core software manages user accounts and authentication and details such as the user ID, name, and password are managed on the server-side, as well as the authentication cookies. Passwords are protected in the database using standard salting and stretching techniques. Existing sessions are destroyed upon logout for versions of WordPress after 4.0.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h4><?php esc_html_e( 'A3 - Cross Site Scripting (XSS)', 'wporg' ); ?></h4>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: Footnote, 2: wp_kses() */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'WordPress provides a range of functions which can help ensure that user-supplied data is safe%1$s. Trusted users, that is administrators and editors on a single WordPress installation, and network administrators only in WordPress Multisite, can post unfiltered HTML or JavaScript as they need to, such as inside a post or page. Untrusted users and user-submitted content is filtered by default to remove dangerous entities, using the KSES library through the %2$s function.', 'wporg' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,71 +234,86 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref10"><a href="#footnote10">10</a></sup>',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<code>wp_kses</code>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </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">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: the_search_query() */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'As an example, the WordPress core team noticed before the release of WordPress 2.3 that the function %s was being misused by most theme authors, who were not escaping the function&#8217;s output for use in HTML. In a very rare case of slightly breaking backward compatibility, the function&#8217;s output was changed in WordPress 2.3 to be pre-escaped.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<code>the_search_query()</code>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <h4><?php esc_html_e( 'A4 - Insecure Direct Object Reference', 'wporg' ); ?></h4>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'WordPress often provides direct object reference, such as unique numeric identifiers of user accounts or content available in the URL or form fields. While these identifiers disclose direct system information, WordPress&#8217; rich permissions and access control system prevent unauthorized requests.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h4><?php esc_html_e( 'A5 - Security Misconfiguration', 'wporg' ); ?></h4>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'The majority of the WordPress security configuration operations are limited to a single authorized administrator. Default settings for WordPress are continually evaluated at the core team level, and the WordPress core team provides documentation and best practices to tighten security for server configuration for running a WordPress site%s.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref11"><a href="#footnote11">11</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <h4><?php esc_html_e( 'A6 - Sensitive Data Exposure', 'wporg' ); ?></h4>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'WordPress user account passwords are salted and hashed based on the Portable PHP Password Hashing Framework%s. WordPress&#8217; permission system is used to control access to private information such an registered users&#8217; PII, commenters&#8217; email addresses, privately published content, etc. In WordPress 3.7, a password strength meter was included in the core software providing additional information to users setting their passwords and hints on increasing strength. WordPress also has an optional configuration setting for requiring HTTPS.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref12"><a href="#footnote12">12</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h4><?php esc_html_e( 'A7 - Missing Function Level Access Control', 'wporg' ); ?></h4>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'WordPress checks for proper authorization and permissions for any function level access requests prior to the action being executed. Access or visualization of administrative URLs, menus, and pages without proper authentication is tightly integrated with the authentication system to prevent access from unauthorized users.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h4><?php esc_html_e( 'A8 - Cross Site Request Forgery (CSRF)', 'wporg' ); ?></h4>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'WordPress uses cryptographic tokens, called nonces%s, to validate intent of action requests from authorized users to protect against potential CSRF threats. WordPress provides an API for the generation of these tokens to create and verify unique and temporary tokens, and the token is limited to a specific user, a specific action, a specific object, and a specific time period, which can be added to forms and URLs as needed. Additionally, all nonces are invalidated upon logout.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref13"><a href="#footnote13">13</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h4><?php esc_html_e( 'A9 - Using Components with Known Vulnerabilities', 'wporg' ); ?></h4>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'The WordPress core team closely monitors the few included libraries and frameworks WordPress integrates with for core functionality. In the past the core team has made contributions to several third-party components to make them more secure, such as the update to fix a cross-site vulnerability in TinyMCE in WordPress 3.5.2%s.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref14"><a href="#footnote14">14</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </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">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'If necessary, the core team may decide to fork or replace critical external components, such as when the SWFUpload library was officially replaced by the Plupload library in 3.5.2, and a secure fork of SWFUpload was made available by the security team<%s for those plugins who continued to use SWFUpload in the short-term.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref15"><a href="#footnote15">15</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h4><?php esc_html_e( 'A10 - Unvalidated Redirects and Forwards', 'wporg' ); ?></h4>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        wp_kses_post( __( 'WordPress&#8217; internal access control and authentication system will protect against attempts to direct users to unwanted destinations or automatic redirects. This functionality is also made available to plugin developers via an API, <code>wp_safe_redirect()</code>%s.', 'wporg' ) ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref16"><a href="#footnote16">16</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <h3><?php esc_html_e( 'Further Security Risks and Concerns', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h4><?php esc_html_e( 'XXE (XML eXternal Entity) processing attacks', 'wporg' ); ?></h4>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'When processing XML, WordPress disables the loading of custom XML entities to prevent both External Entity and Entity Expansion attacks. Beyond PHP&#8217;s core functionality, WordPress does not provide additional secure XML processing API for plugin authors.', 'wporg' ); ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,29 +321,35 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'HTTP requests issued by WordPress are filtered to prevent access to loopback and private IP addresses. Additionally, access is only allowed to certain standard HTTP ports.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h2><?php esc_html_e( 'WordPress Plugin and Theme Security', 'wporg' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'The Default Theme', 'wporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: The latest Core Theme release - Currently Twenty Seventeen */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'WordPress requires a theme to be enabled to render content visible on the frontend. The default theme which ships with core WordPress (currently "%s") has been vigorously reviewed and tested for security reasons by both the team of theme developers plus the core development team.', 'wporg' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        wp_get_theme( 'core/' . WP_CORE_DEFAULT_THEME )->display( 'Name' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 esc_html( wp_get_theme( 'core/' . WP_CORE_DEFAULT_THEME )->display( 'Name' ) )
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'The default theme can serve as a starting point for custom theme development, and site developers can create a child theme which includes some customization but falls back on the default theme for most functionality and security. The default theme can be easily removed by an administrator if not needed.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'WordPress.org Theme and Plugin Repositories', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: Number of plugins - 50,000; 2: Number of themes - 5,000 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        esc_html__( 'There are approximately %1$s+ plugins and %2$s+ themes listed on the WordPress.org site. These themes and plugins are submitted for inclusion and are manually reviewed by volunteers before making them available on the repository.', 'wporg'
-),
-                                                       number_format_i18n( 50000 ),
-                                                       number_format_i18n( 5000 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 esc_html__(
+                                                               'There are approximately %1$s+ plugins and %2$s+ themes listed on the WordPress.org site. These themes and plugins are submitted for inclusion and are manually reviewed by volunteers before making them available on the repository.', 'wporg'
+                                                       ),
+                                                       esc_html( number_format_i18n( 50000 ) ),
+                                                       esc_html( number_format_i18n( 5000 ) )
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </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">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: Footnote; 2: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'Inclusion of plugins and themes in the repository is not a guarantee that they are free from security vulnerabilities. Guidelines are provided for plugin authors to consult prior to submission for inclusion in the repository%1$s, and extensive documentation about how to do WordPress theme development%2$s is provided on the WordPress.org site.', 'wporg' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,13 +356,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref17"><a href="#footnote17">17</a></sup>',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref18"><a href="#footnote18">18</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'Each plugin and theme has the ability to be continually developed by the plugin or theme owner, and any subsequent fixes or feature development can be uploaded to the repository and made available to users with that plugin or theme installed with a description of that change. Site administrators are notified of plugins which need to be updated via their administration dashboard.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'When a plugin vulnerability is discovered by the WordPress Security Team, they contact the plugin author and work together to fix and release a secure version of the plugin. If there is a lack of response from the plugin author or if the vulnerability is severe, the plugin/theme is pulled from the public directory, and in some cases, fixed and updated directly by the Security Team.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'The Theme Review Team', 'wporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: Footnote; 2: Footnote; 3: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'The Theme Review Team is a group of volunteers, led by key and established members of the WordPress community, who review and approve themes submitted to be included in the official WordPress Theme directory. The Theme Review Team maintains the official Theme Review Guidelines%1$s, the Theme Unit Test Datas%2$s, and the Theme Check Plugins%3$s, and attempts to engage and educate the WordPress Theme developer community regarding development best practices. Inclusion in the group is moderated by core committers of the WordPress development team.', 'wporg' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,42 +372,50 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref20"><a href="#footnote20">20</a></sup>',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref21"><a href="#footnote21">21</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <h2><?php esc_html_e( 'The Role of the Hosting Provider in WordPress Security', 'wporg' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'WordPress can be installed on a multitude of platforms. Though WordPress core software provides many provisions for operating a secure web application, which were covered in this document, the configuration of the operating system and the underlying web server hosting the software is equally important to keep the WordPress applications secure.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'A Note about WordPress.com and WordPress security', 'wporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'WordPress.com is the largest WordPress installation in the world, and is owned and managed by Automattic, Inc., which was founded by Matt Mullenweg, the WordPress project co-creator. WordPress.com runs on the core WordPress software, and has its own security processes, risks, and solutions%s. This document refers to security regarding the self-hosted, downloadable open source WordPress software available from WordPress.org and installable on any server in the world.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref22"><a href="#footnote22">22</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <h2><?php esc_html_e( 'Appendix', 'wporg' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'Core WordPress APIs', 'wporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'The WordPress Core Application Programming Interface (API) is comprised of several individual APIs%s, each one covering the functions involved in, and use of, a given set of functionality. Together, these form the project interface which allows plugins and themes to interact with, alter, and extend WordPress core functionality safely and securely.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref23"><a href="#footnote23">23</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'While each WordPress API provides best practices and standardized ways to interact with and extend WordPress core software, the following WordPress APIs are the most pertinent to enforcing and hardening WordPress security:', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'Database API', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'The Database API%s, added in WordPress 0.71, provides the correct method for accessing data as named values which are stored in the database layer.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref24"><a href="#footnote24">24</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'Filesystem API', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: Footnote; 2: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'The Filesystem API%1$s, added in WordPress 2.6%2$s, was originally created for WordPress&#8217; own automatic updates feature. The Filesystem API abstracts out the functionality needed for reading and writing local files to the filesystem to be done securely, on a variety of host types.', 'wporg' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,13 +422,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref25"><a href="#footnote25">25</a></sup>',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref26"><a href="#footnote26">26</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php echo wp_kses_post( __( 'It does this through the <code>WP_Filesystem_Base</code> class, and several subclasses which implement different ways of connecting to the local filesystem, depending on individual host support. Any theme or plugin that needs to write files locally should do so using the WP_Filesystem family of classes.', 'wporg' ) ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'HTTP API', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: Footnote; 2: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'The HTTP API%1$s, added in WordPress 2.7%2$s and extended further in WordPress 2.8, standardizes the HTTP requests for WordPress. The API handles cookies, gzip encoding and decoding, chunk decoding (if HTTP 1.1), and various other HTTP protocol implementations. The API standardizes requests, tests each method prior to sending, and, based on your server configuration, uses the appropriate method to make the request.', 'wporg' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,19 +437,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref27"><a href="#footnote27">27</a></sup>',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref28"><a href="#footnote28">28</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <h3><?php esc_html_e( 'Permissions and current user API', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Footnote */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_html__( 'The permissions and current user API%s is a set of functions which will help verify the current user&#8217;s permissions and authority to perform any task or operation being requested, and can protect further against unauthorized users accessing or performing functions beyond their permitted capabilities.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<sup id="ref29"><a href="#footnote29">29</a></sup>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <h3><?php esc_html_e( 'White paper content License', 'wporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: Link to WordPress Foundation Trademark Polocy (English); 2: Link to Creative Commons CC0 license (English) */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        wp_kses_post( __( 'The text in this document (not including the WordPress logo or <a href="%1$s">trademark</a>) is licensed under <a href="%2$s">CC0 1.0 Universal (CC0 1.0) Public Domain Dedication</a>. You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.', 'wporg' ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,38 +460,47 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'http://wordpressfoundation.org/trademark-policy/',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'https://creativecommons.org/publicdomain/zero/1.0/'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </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">-                                        <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <p>
+                                       <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Link to the Drupal Security Whitepaper (english). */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        wp_kses_post( __( '<em>A special thank you to Drupal&#8217;s </em><a href="%s"><em>security white paper</em></a><em>, which provided some inspiration. </em>', 'wporg' ) ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'http://drupalsecurityreport.org/'
</span><span class="cx" style="display: block; padding: 0 10px">                                                );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <h3><?php esc_html_e( 'Additional Reading', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li>
+                                               <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                                /* translators: %s: Link to News Blog including the <a> tags. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                                esc_html__( 'WordPress News %s', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                                '<a href="https://wordpress.org/news/">https://wordpress.org/news/</a>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                        );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                ?></li>
-                                               <li><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         ?>
+                                               </li>
+                                               <li>
+                                               <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                                /* translators: %s: Link to News Blog Security Release Archive including the <a> tags. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                                esc_html__( 'WordPress Security releases %s', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                                '<a href="https://wordpress.org/news/category/security/">https://wordpress.org/news/category/security/</a>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                        );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                ?></li>
-                                               <li><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         ?>
+                                               </li>
+                                               <li>
+                                               <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                                /* translators: %s: Link to Developer.WordPress.org including the <a> tags. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                                esc_html__( 'WordPress Developer Resources %s', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                                '<a href="https://developer.wordpress.org/">https://developer.wordpress.org/</a>'
</span><span class="cx" style="display: block; padding: 0 10px">                                                        );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         ?>
+                                               </li>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <hr />
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutstatsphp"></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-about-stats.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-about-stats.php       2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-stats.php 2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <div id="locales" class="wporg-stats-chart loading"></div>
</span><span class="cx" style="display: block; padding: 0 10px">                                </section>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div><!-- .entry-content -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                 </article><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        </main><!-- #main -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutswagphp"></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-about-swag.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-about-swag.php        2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-swag.php  2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'child-page' );
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,11 +54,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                printf( wp_kses_post( __( 'So show the love and spread the word &mdash; get your <a href="%s">WordPress swag</a> today.', 'wporg' ) ), esc_url( 'https://mercantile.wordpress.org' ) );
</span><span class="cx" style="display: block; padding: 0 10px">                                                ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                        </p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                                 </section>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                         </div><!-- .entry-content -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                 </article><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        </main><!-- #main -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageabouttestimonialsphp"></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-about-testimonials.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-about-testimonials.php        2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-testimonials.php  2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,6 +7,8 @@
</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 class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// phpcs:disable WordPress.VIP.RestrictedFunctions
+
</ins><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\MainTheme;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['menu_items'] = [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,25 +24,33 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Pull list of testimonial URLs from the news page holding them
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Pull list of testimonial URLs from the news page holding them.
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( 8 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$testpage = get_page_by_path( 'testimonials' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$testimonials_post = get_page_by_path( 'testimonials' );
</ins><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// we only need the URLs in the post_content
-preg_match_all( '|https://\S+|', $testpage->post_content, $testimonials );
-$testimonials = $testimonials[0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $testimonials_post instanceof \WP_Post ) {
+       // We only need the URLs in the post_content.
+       preg_match_all( '|https://\S+|', $testimonials_post->post_content, $testimonials );
+       $testimonials = $testimonials[0];
+} else {
+       $testimonials = [];
+}
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// separate out the twiiter from the WPs
-$embed_tweets = array_values( array_filter( $testimonials, function ($t) { return strpos( $t, 'https://twitter.com' ) === 0; } ) );
-$embed_wps    = array_values( array_filter( $testimonials, function ($t) { return strpos( $t, 'https://twitter.com' ) !== 0; } ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Separate out the twitter from the WPs.
+$embed_tweets = array_values( array_filter( $testimonials, function( $t ) {
+       return strpos( $t, 'https://twitter.com' ) === 0;
+} ) );
+$embed_wps = array_values( array_filter( $testimonials, function( $t ) {
+       return strpos( $t, 'https://twitter.com' ) !== 0;
+} ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Randomize the tweet order
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Randomize the tweet order.
</ins><span class="cx" style="display: block; padding: 0 10px"> shuffle( $embed_tweets );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Strip out everything but the Tweet ID
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Strip out everything but the Tweet ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> array_walk( $embed_tweets, function ( &$tweet ) {
</span><span class="cx" style="display: block; padding: 0 10px">        $tweet = preg_replace( '|https?://twitter.com/.*/status/([0-9]+)|', '$1', $tweet );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +79,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                align: 'left',
</span><span class="cx" style="display: block; padding: 0 10px">                                conversation: 'none',
</span><span class="cx" style="display: block; padding: 0 10px">                                cards: 'hidden',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                margin: 0, width: 372
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         margin: 0, 
+                               width: 372
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px">                ).then( function() {
</span><span class="cx" style="display: block; padding: 0 10px">                        embed_holder_masonry.masonry('reloadItems').masonry();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script( 'twitter-widgets', $custom_js );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script( 'twitter-widgets', 'embeds', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        'tweets' => $embed_tweets,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'tweets'   => $embed_tweets,
</ins><span class="cx" style="display: block; padding: 0 10px">         'wpembeds' => $embed_wps,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,16 +117,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        </header><!-- .entry-header -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="entry-content row">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                                 <section class="col-8">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <h3><?php _e( 'Share your WordPress story', 'wporg' ); ?></h3>
-
-                                       <p><?php _e( 'Want to have your story featured on this page?', 'wporg' ); ?></p>
-
-                                       <p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <h3><?php esc_html_e( 'Share your WordPress story', 'wporg' ); ?></h3>
+                                       <p><?php esc_html_e( 'Want to have your story featured on this page?', 'wporg' ); ?></p>
+                                       <p>
+                                               <?php
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 /* translators: Link to the twitter #ilovewp feed */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                printf( __( "Make a blog post with your story and tweet a link to it using the <a href='%s'>#ilovewp</a> hashtag. We'll select the best ones and feature them here!", 'wporg' ), 'https://twitter.com/search?q=%23ilovewp' );
-                                       ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         printf( wp_kses_post( __( 'Make a blog post with your story and tweet a link to it using the <a href="%s">#ilovewp</a> hashtag. We&#8217;ll select the best ones and feature them here!', 'wporg' ) ), 'https://twitter.com/search?q=%23ilovewp' );
+                                               ?>
+                                       </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p>
</span><span class="cx" style="display: block; padding: 0 10px">                                                <a href="https://twitter.com/intent/tweet?button_hashtag=ilovewp" class="twitter-hashtag-button" data-size="large" data-related="WordPress" data-dnt="true">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,13 +135,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </a>
</span><span class="cx" style="display: block; padding: 0 10px">                                        </p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                                 </section>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <section class="col-10" id="embeds">
-                               </section>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <section class="col-10" id="embeds"></section>
</ins><span class="cx" style="display: block; padding: 0 10px">                         </div><!-- .entry-content -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                 </article><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        </main><!-- #main -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutphp"></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-about.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-about.php     2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about.php       2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return new \WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* See inc/page-meta-descriptions.php for the meta description for this page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header();
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p>
</span><span class="cx" style="display: block; padding: 0 10px">                                                <?php
</span><span class="cx" style="display: block; padding: 0 10px">                                                /* translators: 1: Link to b2/cafelog; 2: WordPress market share: 30 - Note: The following percent sign is '%%' for escaping purposes; */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                printf( wp_kses_post( __( 'WordPress started in 2003 when Mike Little and Matt Mullenweg created a <a href="%1$s">fork of b2/cafelog</a>. The need for an elegant, well-architected personal publishing system was clear even then. Today, WordPress is built on PHP and MySQL, and licensed under the GPLv2. It is also the platform of choice for over %2$s%% of all sites across the web.', 'wporg' ) ), esc_url( 'https://www.whoishostingthis.com/resources/b2-cafelog/' ), number_format_i18n( WP_MARKET_SHARE ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         printf( wp_kses_post( __( 'WordPress started in 2003 when Mike Little and Matt Mullenweg created a <a href="%1$s">fork of b2/cafelog</a>. The need for an elegant, well-architected personal publishing system was clear even then. Today, WordPress is built on PHP and MySQL, and licensed under the GPLv2. It is also the platform of choice for over %2$s%% of all sites across the web.', 'wporg' ) ), esc_url( 'https://www.whoishostingthis.com/resources/b2-cafelog/' ), esc_html( number_format_i18n( WP_MARKET_SHARE ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                        </p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'The WordPress open source project has evolved in progressive ways over time &#8212; supported by skilled, enthusiastic developers, designers, scientists, bloggers, and more. WordPress provides the opportunity for anyone to create and share, from handcrafted personal anecdotes to world-changing movements. People with a limited tech experience can use it &#8220;out of the box&#8221;, and more tech-savvy folks can customize it in remarkable ways.', 'wporg' ); ?></p>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpagegetphp"></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-get.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-get.php       2018-06-29 14:51:26 UTC (rev 7349)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-get.php 2018-06-29 20:57:02 UTC (rev 7350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,11 +45,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                <a class="button button-primary button-xl" href="<?php echo esc_url( home_url( 'latest.zip' ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px">                                                        <span class="dashicons-before dashicons-download">
</span><span class="cx" style="display: block; padding: 0 10px">                                                                <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                echo apply_filters( 'no_orphans', sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         echo esc_html( apply_filters( 'no_orphans', sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                         /* translators: WordPress version. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                        esc_html__( 'Download WordPress %s', 'wporg' ),
-                                                                       esc_html( WP_CORE_LATEST_RELEASE )
-                                                               ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                 __( 'Download WordPress %s', 'wporg' ),
+                                                                       WP_CORE_LATEST_RELEASE
+                                                               ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                        </span>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </a>
</span></span></pre>
</div>
</div>

</body>
</html>