<!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>[13901] sites/trunk/wordpress.org/public_html/wp-content: Learn: Sync with git WordPress/learn@33af4b9</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/13901">13901</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/13901","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>adamwood</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-07-12 03:41:39 +0000 (Fri, 12 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@33af4b9</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearninclocalephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/locale.php</a></li>
<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_htmlwpcontentthemespubwporglearn2024stylecss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearninclocalephp"></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/plugins/wporg-learn/inc/locale.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/plugins/wporg-learn/inc/locale.php 2024-07-12 03:39:38 UTC (rev 13900)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/locale.php 2024-07-12 03:41:39 UTC (rev 13901)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,6 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\register_assets' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wporg_locale_switcher_options', __NAMESPACE__ . '\locale_switcher_options' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_headers', __NAMESPACE__ . '\disable_caching' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'posts_clauses', __NAMESPACE__ . '\wporg_archive_query_prioritize_locale', 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_next_scheduled( 'wporg_learn_update_locale_data' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event( time(), 'hourly', 'wporg_learn_update_locale_data' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,3 +157,179 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $headers;
</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 post type archive queries to prioritize content in the user's locale.
+ *
+ * @param array $clauses
+ * @param WP_Query $query
+ *
+ * @return array
+ */
+function wporg_archive_query_prioritize_locale( $clauses, $query ) {
+ if ( is_admin() || is_feed() ) {
+ return $clauses;
+ }
+
+ $locale = get_locale();
+
+ if ( ! $locale ) {
+ return $clauses;
+ }
+
+ if ( $query->is_post_type_archive( 'wporg_workshop' ) ) {
+ return wporg_tutorials_query_prioritize_locale( $clauses, $locale );
+ }
+
+ $current_theme = wp_get_theme();
+ $theme_slug = $current_theme->get_stylesheet();
+
+ if ( 'pub/wporg-learn-2020' === $theme_slug ) {
+ return $clauses;
+ }
+
+ if ( $query->is_post_type_archive( 'course' ) || $query->is_post_type_archive( 'lesson' ) || $query->is_post_type_archive( 'lesson-plan' ) ) {
+ return wporg_query_prioritize_locale( $clauses, $locale );
+ }
+
+ return $clauses;
+}
+
+/**
+ * Modify the workshop post type archive query to prioritize workshops in the user's locale.
+ * DEPRECATED: this function has been superseded by wporg_query_prioritize_locale, which handles language post meta being empty or null.
+ *
+ * In order to show all workshops, but with the ones that are presented/captioned in the user's locale shown first, we
+ * need to modify the posts query in ways that can't be done through the WP_Query or WP_Meta_Query APIs. Instead, here,
+ * we're filtering the individual clauses of the query to add the pieces we need.
+ *
+ * Examples, slightly truncated for simplicity:
+ *
+ * Before:
+ * SELECT SQL_CALC_FOUND_ROWS wp_posts.ID
+ * FROM wp_posts
+ * WHERE 1=1
+ * AND wp_posts.post_type = 'wporg_workshop'
+ * ORDER BY wp_posts.post_date DESC
+ *
+ * After:
+ * SELECT SQL_CALC_FOUND_ROWS wp_posts.*,
+ * MAX( IF( pmeta.meta_key = 'language' AND pmeta.meta_value LIKE 'art_%', 1, 0 ) ) AS has_language,
+ * MAX( IF( pmeta.meta_key = 'video_caption_language' AND pmeta.meta_value LIKE 'art_%', 1, 0 ) ) AS has_caption
+ * FROM wp_posts
+ * INNER JOIN wp_postmeta pmeta ON ( wp_posts.ID = pmeta.post_id )
+ * WHERE 1=1
+ * AND wp_posts.post_type = 'wporg_workshop'
+ * GROUP BY wp_posts.ID
+ * ORDER BY has_language DESC, has_caption DESC, wp_posts.post_date DESC
+ *
+ * @param array $clauses
+ * @param string $locale
+ *
+ * @return array
+ */
+function wporg_tutorials_query_prioritize_locale( $clauses, $locale ) {
+ global $wpdb;
+
+ $locale_root = preg_replace( '#^([a-z]{2,3}_?)[a-zA-Z_-]*#', '$1', $locale, -1, $count );
+
+ if ( $count ) {
+ /**
+ * $clauses['fields'] contains the SELECT part of the query.
+ *
+ * The extra fields clauses are calculated fields that will contain a `1` if the workshop post row has a postmeta
+ * value that matches the locale root. The MAX() and the groupby clause below ensure that all the rows for a
+ * given workshop are consolidated into one with the highest value in the calculated column. Without the
+ * grouping, there would be a separate row for each postmeta value for each workshop post.
+ */
+ $clauses['fields'] .= ",
+ MAX( IF( pmeta.meta_key = 'language' AND pmeta.meta_value LIKE '{$locale_root}%', 1, 0 ) ) AS has_language
+ ";
+ $clauses['fields'] .= ",
+ MAX( IF( pmeta.meta_key = 'video_caption_language' AND pmeta.meta_value LIKE '{$locale_root}%', 1, 0 ) ) AS has_caption
+ ";
+ $clauses['join'] .= " INNER JOIN {$wpdb->postmeta} pmeta ON ( {$wpdb->posts}.ID = pmeta.post_id )";
+ // This orderby clause ensures that the workshops are sorted by the values in the calculated columns first.
+ $clauses['orderby'] = 'has_language DESC, has_caption DESC, ' . $clauses['orderby'];
+
+ if ( false === strpos( $clauses['groupby'], "{$wpdb->posts}.ID" ) ) {
+ $clauses['groupby'] = "{$wpdb->posts}.ID";
+ }
+ }
+
+ return $clauses;
+}
+
+/**
+ * Modify the post type archive query to prioritize posts in the user's locale.
+ *
+ * In order to show all posts, but with the ones that are presented in the user's locale shown first, we
+ * need to modify the posts query in ways that can't be done through the WP_Query or WP_Meta_Query APIs. Instead, here,
+ * we're filtering the individual clauses of the query to add the pieces we need.
+ *
+ * Handles cases where the language post meta is empty or null and treats them as being english, if the locale is english.
+ * This matches the default value for the language post meta field.
+ *
+ * Examples, slightly truncated for simplicity:
+ *
+ * Before:
+ * SELECT SQL_CALC_FOUND_ROWS wp_posts.ID
+ * FROM wp_posts
+ * WHERE 1=1
+ * AND wp_posts.post_type = 'lesson'
+ * ORDER BY wp_posts.post_date DESC
+ *
+ * After:
+ * SELECT SQL_CALC_FOUND_ROWS wp_posts.*,
+ * MAX(
+ * CASE
+ * WHEN pmeta.meta_key = 'language' AND pmeta.meta_value LIKE 'en_%' THEN 1
+ * WHEN (pmeta.meta_key = 'language' AND pmeta.meta_value = '') OR pmeta.meta_key IS NULL THEN 1
+ * ELSE 0
+ * END
+ * ) AS has_language,
+ * FROM wp_posts
+ * LEFT JOIN wp_postmeta pmeta ON ( wp_posts.ID = pmeta.post_id AND pmeta.meta_key = 'language' )
+ * WHERE 1=1
+ * AND wp_posts.post_type = 'lesson'
+ * ORDER BY has_language DESC, wp_posts.post_date DESC
+ * GROUP BY wp_posts.ID
+ *
+ * @param array $clauses
+ * @param string $locale
+ *
+ * @return array
+ */
+function wporg_query_prioritize_locale( $clauses, $locale ) {
+ global $wpdb;
+
+ $locale_root = preg_replace( '#^([a-z]{2,3}_?)[a-zA-Z_-]*#', '$1', $locale, -1, $count );
+
+ if ( $count ) {
+ /**
+ * $clauses['fields'] contains the SELECT part of the query.
+ *
+ * The extra fields clause is calculated, and will contain a `1` if the post row has a postmeta
+ * value that matches the locale root, or if the locale is english and the postmeta value is empty or null.
+ * The MAX() and the groupby clause below ensure that all the rows for a given post are consolidated into
+ * one, with the highest value in the calculated column.
+ * Without the grouping, there would be a separate row for each postmeta value for each post.
+ */
+ $is_english = strpos( $locale_root, 'en_' ) === 0;
+
+ $clauses['fields'] .= ",
+ MAX(
+ CASE
+ WHEN pmeta.meta_key = 'language' AND pmeta.meta_value LIKE '{$locale_root}%' THEN 1
+ WHEN (pmeta.meta_key = 'language' AND pmeta.meta_value = '') OR pmeta.meta_key IS NULL THEN " . ( $is_english ? '1' : '0' ) . '
+ ELSE 0
+ END
+ ) AS has_language
+ ';
+ $clauses['join'] .= " LEFT JOIN {$wpdb->postmeta} pmeta ON ( {$wpdb->posts}.ID = pmeta.post_id AND pmeta.meta_key = 'language' )";
+ $clauses['orderby'] = 'has_language DESC, ' . $clauses['orderby'];
+ $clauses['groupby'] = "{$wpdb->posts}.ID";
+ }
+
+ return $clauses;
+}
</ins></span></pre></div>
<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 2024-07-12 03:39:38 UTC (rev 13900)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php 2024-07-12 03:41:39 UTC (rev 13901)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,76 +445,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'posts_orderby', 'wporg_archive_orderby', 10, 2 );
</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">- * Modify the workshop post type archive query to prioritize workshops in the user's locale.
- *
- * In order to show all workshops, but with the ones that are presented/captioned in the user's locale shown first, we
- * need to modify the posts query in ways that can't be done through the WP_Query or WP_Meta_Query APIs. Instead, here,
- * we're filtering the individual clauses of the query to add the pieces we need.
- *
- * Examples, slightly truncated for simplicity:
- *
- * Before:
- * SELECT SQL_CALC_FOUND_ROWS wp_posts.ID
- * FROM wp_posts
- * WHERE 1=1
- * AND wp_posts.post_type = 'wporg_workshop'
- * ORDER BY wp_posts.post_date DESC
- *
- * After:
- * SELECT SQL_CALC_FOUND_ROWS wp_posts.*,
- * MAX( IF( pmeta.meta_key = 'language' AND pmeta.meta_value LIKE 'art_%', 1, 0 ) ) AS has_language,
- * MAX( IF( pmeta.meta_key = 'video_caption_language' AND pmeta.meta_value LIKE 'art_%', 1, 0 ) ) AS has_caption
- * FROM wp_posts
- * INNER JOIN wp_postmeta pmeta ON ( wp_posts.ID = pmeta.post_id )
- * WHERE 1=1
- * AND wp_posts.post_type = 'wporg_workshop'
- * GROUP BY wp_posts.ID
- * ORDER BY has_language DESC, has_caption DESC, wp_posts.post_date DESC
- *
- * @param array $clauses
- * @param WP_Query $query
- *
- * @return array
- */
-function wporg_archive_query_prioritize_locale( $clauses, $query ) {
- if ( ! $query->is_post_type_archive( 'wporg_workshop' ) || is_admin() || is_feed() ) {
- return $clauses;
- }
-
- global $wpdb;
-
- $locale = get_locale();
- $locale_root = preg_replace( '#^([a-z]{2,3}_?)[a-zA-Z_-]*#', '$1', $locale, -1, $count );
-
- if ( $count ) {
- /**
- * $clauses['fields'] contains the SELECT part of the query.
- *
- * The extra fields clauses are calculated fields that will contain a `1` if the workshop post row has a postmeta
- * value that matches the locale root. The MAX() and the groupby clause below ensure that all the rows for a
- * given workshop are consolidated into one with the highest value in the calculated column. Without the
- * grouping, there would be a separate row for each postmeta value for each workshop post.
- */
- $clauses['fields'] .= ",
- MAX( IF( pmeta.meta_key = 'language' AND pmeta.meta_value LIKE '{$locale_root}%', 1, 0 ) ) AS has_language
- ";
- $clauses['fields'] .= ",
- MAX( IF( pmeta.meta_key = 'video_caption_language' AND pmeta.meta_value LIKE '{$locale_root}%', 1, 0 ) ) AS has_caption
- ";
- $clauses['join'] .= " INNER JOIN {$wpdb->postmeta} pmeta ON ( {$wpdb->posts}.ID = pmeta.post_id )";
- // This orderby clause ensures that the workshops are sorted by the values in the calculated columns first.
- $clauses['orderby'] = 'has_language DESC, has_caption DESC, ' . $clauses['orderby'];
-
- if ( false === strpos( $clauses['groupby'], "{$wpdb->posts}.ID" ) ) {
- $clauses['groupby'] = "{$wpdb->posts}.ID";
- }
- }
-
- return $clauses;
-}
-add_filter( 'posts_clauses', 'wporg_archive_query_prioritize_locale', 10, 2 );
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Update a query object if filter parameters are present.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Query $query Query object, passed by reference.
</span></span></pre></div>
<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-12 03:39:38 UTC (rev 13900)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2024/style.css 2024-07-12 03:41:39 UTC (rev 13901)
</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-dd3cc36
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Version: 1.0.0-a4426a2
</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>