<!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>[12276] sites/trunk/wordpress.org/public_html/wp-content: Learn: Sync with git WordPress/learn@032e753</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/12276">12276</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/12276","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>2022-11-23 21:41:46 +0000 (Wed, 23 Nov 2022)</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@032e753</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincadminphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/admin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincblocksphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/blocks.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincformphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/form.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincpostmetaphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/post-meta.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnviewsmetaboxworkshopdetailsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/views/metabox-workshop-details.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_htmlwpcontentthemespubwporglearn2020templatepartscomponentworkshopfiltersphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-workshop-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincadminphp"></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/admin.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/admin.php 2022-11-23 19:03:09 UTC (rev 12275)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/admin.php 2022-11-23 21:41:46 UTC (rev 12276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,9 +90,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_workshop_list_table_columns( $columns ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $columns = array_slice( $columns, 0, -2, true )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- + array( 'video_language' => __( 'Video Language', 'wporg-learn' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ + array( 'language' => __( 'Language', 'wporg-learn' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> + array( 'video_caption_language' => __( 'Subtitles', 'wporg-learn' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- + array( 'language' => __( 'Language', 'wporg-learn' ) )
</del><span class="cx" style="display: block; padding: 0 10px"> + array_slice( $columns, -2, 2, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $columns;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,13 +149,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( $language )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'video_language':
- printf(
- '%s [%s]',
- esc_html( get_locale_name_from_code( $post->video_language, 'english' ) ),
- esc_html( $post->video_language )
- );
- break;
</del><span class="cx" style="display: block; padding: 0 10px"> case 'video_caption_language':
</span><span class="cx" style="display: block; padding: 0 10px"> $captions = get_post_meta( $post->ID, 'video_caption_language' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +217,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 add_workshop_list_table_sortable_columns( $sortable_columns ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sortable_columns['video_language'] = 'video_language';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sortable_columns['language'] = 'language';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $sortable_columns;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +235,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $available_locales = get_available_workshop_locales( 'video_language', 'english', false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $available_locales = get_available_workshop_locales( 'language', 'english', false );
</ins><span class="cx" style="display: block; padding: 0 10px"> $language = filter_input( INPUT_GET, 'language', FILTER_SANITIZE_STRING );
</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">@@ -251,7 +243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php esc_html_e( 'Filter by language', 'wporg-learn' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <select id="filter-by-language" name="language">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value=""<?php selected( ! $language ); ?>><?php esc_html_e( 'Any video language', 'wporg-learn' ); ?></option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value=""<?php selected( ! $language ); ?>><?php esc_html_e( 'Any language', 'wporg-learn' ); ?></option>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $available_locales as $code => $name ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $code ); ?>"<?php selected( $code, $language ); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +291,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"> $meta_query[] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => 'video_language',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'key' => 'language',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'value' => $language,
</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">@@ -306,8 +298,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'meta_query', $meta_query );
</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">- if ( 'video_language' === $query->get( 'orderby' ) ) {
- $query->set( 'meta_key', 'video_language' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'language' === $query->get( 'orderby' ) ) {
+ $query->set( 'meta_key', 'language' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'orderby', 'meta_value' );
</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_htmlwpcontentpluginswporglearnincblocksphp"></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/blocks.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/blocks.php 2022-11-23 19:03:09 UTC (rev 12275)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/blocks.php 2022-11-23 21:41:46 UTC (rev 12276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,8 +226,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'language' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Language', 'wporg-learn' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'param' => array( $post->video_language ),
- 'value' => array( esc_html( get_locale_name_from_code( $post->video_language, 'native' ) ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'param' => array( $post->language ),
+ 'value' => array( esc_html( get_locale_name_from_code( $post->language, 'native' ) ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'captions' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Subtitles', 'wporg-learn' ),
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincformphp"></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/form.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/form.php 2022-11-23 19:03:09 UTC (rev 12275)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/form.php 2022-11-23 21:41:46 UTC (rev 12276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,7 +264,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => $validated['description-short'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => $content,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_input' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'video_language' => $validated['language'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'language' => $validated['language'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'original_application' => $validated,
</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_htmlwpcontentpluginswporglearnincpostmetaphp"></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/post-meta.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/post-meta.php 2022-11-23 19:03:09 UTC (rev 12275)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/post-meta.php 2022-11-23 21:41:46 UTC (rev 12276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,19 +119,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_meta(
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'video_language',
- array(
- 'description' => __( 'The language that the workshop is presented in.', 'wporg_learn' ),
- 'type' => 'string',
- 'single' => true,
- 'default' => 'en_US',
- 'sanitize_callback' => __NAMESPACE__ . '\sanitize_locale',
- 'show_in_rest' => true,
- )
- );
-
- register_post_meta(
- $post_type,
</del><span class="cx" style="display: block; padding: 0 10px"> 'video_caption_language',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'A language for which subtitles are available for the workshop video.', 'wporg_learn' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,9 +466,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_id, 'duration', $duration );
</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">- $video_language = filter_input( INPUT_POST, 'video-language' );
- update_post_meta( $post_id, 'video_language', $video_language );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $captions = filter_input( INPUT_POST, 'video-caption-language', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $post_id, 'video_caption_language' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $captions ) ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnviewsmetaboxworkshopdetailsphp"></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/views/metabox-workshop-details.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/views/metabox-workshop-details.php 2022-11-23 19:03:09 UTC (rev 12275)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/views/metabox-workshop-details.php 2022-11-23 21:41:46 UTC (rev 12276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,17 +66,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'workshop-metaboxes', 'workshop-metabox-nonce' ); ?>
</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">- <label for="workshop-video-language"><?php esc_html_e( 'Video Language', 'wporg_learn' ); ?></label>
- <select id="workshop-video-language" name="video-language" style="width: 100%;">
- <?php foreach ( $locales as $code => $label ) : ?>
- <option value="<?php echo esc_attr( $code ); ?>" <?php selected( $code, $post->video_language ); ?>>
- <?php echo esc_html( $label ); ?>
- </option>
- <?php endforeach; ?>
- </select>
-</p>
-
-<p>
</del><span class="cx" style="display: block; padding: 0 10px"> <label for="workshop-video-caption-language"><?php esc_html_e( 'Subtitles', 'wporg_learn' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <select id="workshop-video-caption-language" name="video-caption-language[]" style="width: 100%;" multiple>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $locales as $code => $label ) : ?>
</span></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 2022-11-23 19:03:09 UTC (rev 12275)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php 2022-11-23 21:41:46 UTC (rev 12276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,7 +460,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * After:
</span><span class="cx" style="display: block; padding: 0 10px"> * SELECT SQL_CALC_FOUND_ROWS wp_posts.*,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * MAX( IF( pmeta.meta_key = 'video_language' AND pmeta.meta_value LIKE 'art_%', 1, 0 ) ) AS has_language,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * MAX( IF( pmeta.meta_key = 'language' AND pmeta.meta_value LIKE 'art_%', 1, 0 ) ) AS has_language,
</ins><span class="cx" style="display: block; padding: 0 10px"> * MAX( IF( pmeta.meta_key = 'video_caption_language' AND pmeta.meta_value LIKE 'art_%', 1, 0 ) ) AS has_caption
</span><span class="cx" style="display: block; padding: 0 10px"> * FROM wp_posts
</span><span class="cx" style="display: block; padding: 0 10px"> * INNER JOIN wp_postmeta pmeta ON ( wp_posts.ID = pmeta.post_id )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,7 +494,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * grouping, there would be a separate row for each postmeta value for each workshop post.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $clauses['fields'] .= ",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- MAX( IF( pmeta.meta_key = 'video_language' AND pmeta.meta_value LIKE '{$locale_root}%', 1, 0 ) ) AS has_language
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ MAX( IF( pmeta.meta_key = 'language' AND pmeta.meta_value LIKE '{$locale_root}%', 1, 0 ) ) AS has_language
</ins><span class="cx" style="display: block; padding: 0 10px"> ";
</span><span class="cx" style="display: block; padding: 0 10px"> $clauses['fields'] .= ",
</span><span class="cx" style="display: block; padding: 0 10px"> MAX( IF( pmeta.meta_key = 'video_caption_language' AND pmeta.meta_value LIKE '{$locale_root}%', 1, 0 ) ) AS has_caption
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -554,7 +554,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $entity_map = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'captions' => 'video_caption_language',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'language' => 'video_language',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'language' => 'language',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'audience' => 'audience',
</span><span class="cx" style="display: block; padding: 0 10px"> 'duration' => 'duration',
</span><span class="cx" style="display: block; padding: 0 10px"> 'level' => 'level',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -725,7 +725,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'icon' => 'admin-site-alt3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Language:', 'wporg-learn' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'value' => \WordPressdotorg\Locales\get_locale_name_from_code( $post->video_language, 'native' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'value' => \WordPressdotorg\Locales\get_locale_name_from_code( $post->language, 'native' ),
</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"> break;
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscomponentworkshopfiltersphp"></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/template-parts/component-workshop-filters.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/template-parts/component-workshop-filters.php 2022-11-23 19:03:09 UTC (rev 12275)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-workshop-filters.php 2022-11-23 21:41:46 UTC (rev 12276)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Language', 'wporg-learn' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'language',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'items' => \WPOrg_Learn\Post_Meta\get_available_workshop_locales( 'video_language', 'native' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'items' => \WPOrg_Learn\Post_Meta\get_available_workshop_locales( 'language', 'native' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Subtitles', 'wporg-learn' ),
</span></span></pre>
</div>
</div>
</body>
</html>