<!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>[11400] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020: WordPress.org Learn: Sync with GitHub</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/11400">11400</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/11400","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-12-22 18:17:43 +0000 (Wed, 22 Dec 2021)</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'>WordPress.org Learn: Sync with GitHub</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020functionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020headerphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020functionsphp"></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-learn-2020/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-learn-2020/functions.php 2021-12-22 09:44:34 UTC (rev 11399)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php 2021-12-22 18:17:43 UTC (rev 11400)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_learn_get_lesson_plan_taxonomy_data( $post_id, $context ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'icon' => 'clock',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'duration',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,6 +251,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => wporg_learn_get_taxonomy_terms( $post_id, 'instruction_type', $context ),
</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">+
+ $versions = wporg_learn_get_taxonomy_terms( $post_id, 'wporg_wp_version', $context );
+ if ( $versions ) {
+ $data[] = array(
+ 'icon' => 'wordpress',
+ 'slug' => 'wp_version',
+ 'label' => wporg_label_with_colon( get_taxonomy_labels( get_taxonomy( 'wporg_wp_version' ) )->singular_name ),
+ 'value' => $versions,
+ );
+ }
+
+ return $data;
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,39 +460,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $filters = filter_input_array(
</span><span class="cx" style="display: block; padding: 0 10px"> INPUT_GET,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'search' => FILTER_SANITIZE_STRING,
- 'captions' => FILTER_SANITIZE_STRING,
- 'language' => FILTER_SANITIZE_STRING,
- 'audience' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'search' => FILTER_SANITIZE_STRING,
+ 'captions' => FILTER_SANITIZE_STRING,
+ 'language' => FILTER_SANITIZE_STRING,
+ 'audience' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => FILTER_VALIDATE_INT,
</span><span class="cx" style="display: block; padding: 0 10px"> 'flags' => FILTER_REQUIRE_ARRAY,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'duration' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'duration' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => FILTER_VALIDATE_INT,
</span><span class="cx" style="display: block; padding: 0 10px"> 'flags' => FILTER_REQUIRE_ARRAY,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'level' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'level' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => FILTER_VALIDATE_INT,
</span><span class="cx" style="display: block; padding: 0 10px"> 'flags' => FILTER_REQUIRE_ARRAY,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'series' => FILTER_VALIDATE_INT,
- 'topic' => FILTER_VALIDATE_INT,
- 'type' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'series' => FILTER_VALIDATE_INT,
+ 'topic' => FILTER_VALIDATE_INT,
+ 'type' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter' => FILTER_VALIDATE_INT,
</span><span class="cx" style="display: block; padding: 0 10px"> 'flags' => FILTER_REQUIRE_ARRAY,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp_version' => array(
+ 'filter' => FILTER_VALIDATE_INT,
+ 'flags' => FILTER_FORCE_ARRAY,
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> false
</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"> $entity_map = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'captions' => 'video_caption_language',
- 'language' => 'video_language',
- 'audience' => 'audience',
- 'duration' => 'duration',
- 'level' => 'level',
- 'topic' => 'topic',
- 'type' => 'instruction_type',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'captions' => 'video_caption_language',
+ 'language' => 'video_language',
+ 'audience' => 'audience',
+ 'duration' => 'duration',
+ 'level' => 'level',
+ 'topic' => 'topic',
+ 'type' => 'instruction_type',
+ 'wp_version' => 'wporg_wp_version',
</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"> $series_slug = wporg_learn_get_series_taxonomy_slug( $query->get( 'post_type' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,6 +552,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'series':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'topic':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'type':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'wp_version':
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $tax_query ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tax_query['relation'] = 'AND';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020headerphp"></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-learn-2020/header.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-learn-2020/header.php 2021-12-22 09:44:34 UTC (rev 11399)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/header.php 2021-12-22 18:17:43 UTC (rev 11400)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,12 +13,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> use function WPOrg_Learn\Locale\{ locale_notice };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-global $wporg_global_header_options;
-if ( ! isset( $wporg_global_header_options['in_wrapper'] ) ) {
- $wporg_global_header_options['in_wrapper'] = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( FEATURE_2021_GLOBAL_HEADER_FOOTER ) {
+ echo do_blocks( '<!-- wp:wporg/global-header /-->' );
+} else {
+ global $wporg_global_header_options;
+ if ( ! isset( $wporg_global_header_options['in_wrapper'] ) ) {
+ $wporg_global_header_options['in_wrapper'] = '';
+ }
+ $wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#content">' . esc_html__( 'Skip to content', 'wporg-learn' ) . '</a>';
+ wporg_get_global_header();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#content">' . esc_html__( 'Skip to content', 'wporg-learn' ) . '</a>';
-wporg_get_global_header();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '/workshops/' => __( 'Workshops', 'wporg-learn' ),
</span></span></pre>
</div>
</div>
</body>
</html>