<!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>[13910] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024: Learn: Sync with git WordPress/learn@eca015d</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/13910">13910</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/13910","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>renyot</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-07-18 07:33:41 +0000 (Thu, 18 Jul 2024)</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'>Learn: Sync with git WordPress/learn@eca015d</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2024functionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2024incblockconfigphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/inc/block-config.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2024stylecss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/style.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2024incheadphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/inc/head.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2024functionsphp"></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-2024/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-2024/functions.php 2024-07-18 05:35:35 UTC (rev 13909)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/functions.php 2024-07-18 07:33:41 UTC (rev 13910)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once __DIR__ . '/inc/block-config.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once __DIR__ . '/inc/block-hooks.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once __DIR__ . '/inc/query.php';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once __DIR__ . '/inc/head.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"> * Actions and filters.
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2024incblockconfigphp"></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-2024/inc/block-config.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-2024/inc/block-config.php 2024-07-18 05:35:35 UTC (rev 13909)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/inc/block-config.php 2024-07-18 07:33:41 UTC (rev 13910)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,6 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\Theme\Learn_2024\Block_Config;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> use function WPOrg_Learn\Post_Meta\{get_available_post_type_locales};
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use Sensei_Learner;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wporg_query_filter_options_language', __NAMESPACE__ . '\get_language_options' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wporg_query_filter_options_archive_language', __NAMESPACE__ . '\get_language_options_by_post_type' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,6 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'query_vars', __NAMESPACE__ . '\add_student_course_filter_query_vars' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wporg_query_filter_options_student_course', __NAMESPACE__ . '\get_student_course_options' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wporg_query_filter_in_form', __NAMESPACE__ . '\inject_other_filters' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'query_loop_block_query_vars', __NAMESPACE__ . '\modify_course_query' );
</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"> * Get the current URL.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -557,3 +559,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<input type="hidden" name="s" value="%s" />', esc_attr( $wp_query->query['s'] ) );
</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">+
+/**
+ * Modify the course query on the 'My Courses' page to display courses according to the filter status.
+ * Corresponds to https://github.com/Automattic/sensei/blob/trunk/includes/blocks/course-list/class-sensei-course-list-student-course-filter.php#L95
+ *
+ * @param array $query The course query.
+ * @return array The modified course query.
+ */
+function modify_course_query( $query ) {
+ if ( get_the_ID() === Sensei()->settings->get_my_courses_page_id() ) {
+ $key = get_student_course_filter_query_var_name();
+ $selected_option = isset( $_GET[ $key ] ) ? sanitize_text_field( wp_unslash( $_GET[ $key ] ) ) : '';
+
+ // The courses query with 'active' and 'completed' statuses have already been filtered in Sensei LMS, and can correctly display the course lists.
+ // See https://github.com/Automattic/sensei/blob/trunk/includes/blocks/course-list/class-sensei-course-list-student-course-filter.php#L114-L123.
+ if ( ! empty( $selected_option ) && ( 'active' === $selected_option || 'completed' === $selected_option ) ) {
+ return $query;
+ }
+
+ $learner_manager = Sensei_Learner::instance();
+ $user_id = get_current_user_id();
+ $args = array(
+ 'posts_per_page' => -1,
+ 'fields' => 'ids',
+ );
+
+ // The courses query with 'all' or any other statuses.
+ $courses_query = $learner_manager->get_enrolled_courses_query( $user_id, $args );
+ $course_ids = $courses_query->posts;
+
+ $query['post__in'] = $course_ids;
+ }
+
+ return $query;
+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2024incheadphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/inc/head.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-2024/inc/head.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/inc/head.php 2024-07-18 07:33:41 UTC (rev 13910)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,59 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * HTML head markup and customizations.
+ */
+
+namespace WordPressdotorg\Theme\Learn_2024\Head;
+
+add_action( 'init', __NAMESPACE__ . '\init' );
+
+/**
+ * Handles adding/removing hooks as needed.
+ */
+function init() {
+ add_filter( 'document_title_parts', __NAMESPACE__ . '\document_title' );
+ add_filter( 'document_title_separator', __NAMESPACE__ . '\document_title_separator' );
+}
+
+/**
+ * Filters document title to add context based on what is being viewed.
+ *
+ * @param array $parts The document title parts.
+ * @return array The document title parts.
+ */
+function document_title( $parts ) {
+ global $wp_query;
+
+ $parts['site'] = __( 'Learn.WordPress.org', 'wporg-learn' );
+ $post_type = get_query_var( 'post_type' );
+ $sep = '–';
+
+ if ( is_singular() ) {
+ // Add post type to title if it's a parsed item.
+ if ( get_post_type_object( $post_type ) ) {
+ $parts['title'] .= " $sep " . get_post_type_object( $post_type )->labels->singular_name;
+ }
+ }
+
+ // If results are paged and the max number of pages is known.
+ if ( is_paged() && $wp_query->max_num_pages ) {
+ $parts['page'] = sprintf(
+ // translators: 1: current page number, 2: total number of pages
+ __( 'Page %1$s of %2$s', 'wporg-learn' ),
+ get_query_var( 'paged' ),
+ $wp_query->max_num_pages
+ );
+ }
+
+ return $parts;
+}
+
+/**
+ * Customizes the document title separator.
+ *
+ * @param string $separator Current document title separator.
+ * @return string
+ */
+function document_title_separator( $separator ) {
+ return '|';
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/inc/head.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2024stylecss"></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-2024/style.css</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-2024/style.css 2024-07-18 05:35:35 UTC (rev 13909)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/style.css 2024-07-18 07:33:41 UTC (rev 13910)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Author: WordPress.org
</span><span class="cx" style="display: block; padding: 0 10px"> * Author URI: http://wordpress.org/
</span><span class="cx" style="display: block; padding: 0 10px"> * Description: A theme for learn.wordpress.org, built in 2024.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Version: 1.0.0-23754c1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Version: 1.0.0-fea1e5b
</ins><span class="cx" style="display: block; padding: 0 10px"> * License: GNU General Public License v2 or later
</span><span class="cx" style="display: block; padding: 0 10px"> * License URI: http://www.gnu.org/licenses/gpl-2.0.html
</span><span class="cx" style="display: block; padding: 0 10px"> * Text Domain: wporg-learn
</span></span></pre>
</div>
</div>
</body>
</html>