<!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>[11323] 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/11323">11323</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/11323","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>tellyworth</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-11-11 03:53:36 +0000 (Thu, 11 Nov 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

Props hlashbrooke, ronalfy.

https://github.com/WordPress/learn/compare/b0cc237f6c2787a04f305bfdd28e0bca92b9415a...376c877bea94e328f57a2c288bc4abc7d9ba43d4</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_htmlwpcontentthemespubwporglearn2020singlelessonplanphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/single-lesson-plan.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscontentsinglephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/content-single.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscontentworkshopsinglephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/content-workshop-single.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-11-11 03:43:12 UTC (rev 11322)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php  2021-11-11 03:53:36 UTC (rev 11323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,7 +275,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        'orderby',
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><span class="cx" style="display: block; padding: 0 10px">                                'post_date' => 'DESC',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'ID' => 'ASC',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'ID'        => 'ASC',
</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">@@ -359,13 +359,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 * given workshop are consolidated into one with the highest value in the calculated column. Without the
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $clauses['fields']  .= ",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $clauses['fields'] .= ",
</ins><span class="cx" style="display: block; padding: 0 10px">                         MAX( IF( pmeta.meta_key = 'video_language' AND pmeta.meta_value LIKE '{$locale_root}%', 1, 0 ) ) AS has_language
</span><span class="cx" style="display: block; padding: 0 10px">                ";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $clauses['fields']  .= ",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $clauses['fields'] .= ",
</ins><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="cx" style="display: block; padding: 0 10px">                ";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $clauses['join']    .= " INNER JOIN {$wpdb->postmeta} pmeta ON ( {$wpdb->posts}.ID = pmeta.post_id )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $clauses['join']   .= " INNER JOIN {$wpdb->postmeta} pmeta ON ( {$wpdb->posts}.ID = pmeta.post_id )";
</ins><span class="cx" style="display: block; padding: 0 10px">                 // This orderby clause ensures that the workshops are sorted by the values in the calculated columns first.
</span><span class="cx" style="display: block; padding: 0 10px">                $clauses['orderby'] = 'has_language DESC, has_caption DESC, ' . $clauses['orderby'];
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,6 +431,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        $meta_query = array();
</span><span class="cx" style="display: block; padding: 0 10px">        $tax_query = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">         $is_filtered = false;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_array( $filters ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,10 +512,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @return WP_Query
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_get_archive_query( $post_type, array $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $args = wp_parse_args( $args, array(
-               'post_type'   => $post_type,
-               'post_status' => 'publish',
-       ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = wp_parse_args(
+               $args,
+               array(
+                       'post_type'   => $post_type,
+                       'post_status' => 'publish',
+               )
+       );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        return new WP_Query( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,7 +531,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_card_template_args( $post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $post = get_post( $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post      = get_post( $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px">         $post_type = get_post_type( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -548,7 +552,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">                        if ( is_user_logged_in() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $completed    = count( Sensei()->course->get_completed_lesson_ids( $post_id, get_current_user_id() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $completed = count( Sensei()->course->get_completed_lesson_ids( $post_id, get_current_user_id() ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                $args['meta'][] = array(
</span><span class="cx" style="display: block; padding: 0 10px">                                        'icon'  => ( $lesson_count === $completed ) ? 'awards' : 'edit-large',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -923,6 +927,48 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'syntaxhighlighter_htmlresult', 'wporg_learn_fix_code_entity_encoding', 20 );
</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">+ * Register theme sidebars.
+ */
+function wporg_learn_register_sidebars() {
+       // Register lesson plans sidebar.
+       register_sidebar(
+               array(
+                       'name'          => __( 'Lesson Plans', 'wporg-learn' ),
+                       'id'            => 'wporg-learn-lesson-plans',
+                       'before_widget' => '<div id="%1$s" class="block-widgets %2$s">',
+                       'after_widget'  => '</div>',
+                       'before_title'  => '<h4 class="widget-title">',
+                       'after_title'   => '<h4>',
+               )
+       );
+
+       // Register courses sidebar.
+       register_sidebar(
+               array(
+                       'name'          => __( 'Courses', 'wporg-learn' ),
+                       'id'            => 'wporg-learn-courses',
+                       'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+                       'after_widget'  => '</aside>',
+                       'before_title'  => '<h4 class="widget-title">',
+                       'after_title'   => '</h4>',
+               )
+       );
+
+       // Register workshops sidebar.
+       register_sidebar(
+               array(
+                       'name'          => __( 'Workshops', 'wporg-learn' ),
+                       'id'            => 'wporg-learn-workshops',
+                       'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+                       'after_widget'  => '</aside>',
+                       'before_title'  => '<h4 class="widget-title">',
+                       'after_title'   => '</h4>',
+               )
+       );
+}
+add_filter( 'widgets_init', 'wporg_learn_register_sidebars', 10 );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px">  * Add fallback image to Jetpack when no featured image exists.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @param string $default_image The default image URL.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -933,3 +979,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">        return 'https://s.w.org/images/learn-thumbnail-fallback.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'jetpack_open_graph_image_default', 'wporg_learn_return_default_image', 15, 1 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Disable the News XML Sitemap generated by Jetpack
+ */
+add_filter( 'jetpack_news_sitemap_generate', '__return_false' );
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020singlelessonplanphp"></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/single-lesson-plan.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/single-lesson-plan.php       2021-11-11 03:43:12 UTC (rev 11322)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/single-lesson-plan.php 2021-11-11 03:53:36 UTC (rev 11323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        while ( have_posts() ) :
</span><span class="cx" style="display: block; padding: 0 10px">                                the_post();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                get_template_part( 'template-parts/content', 'single' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         get_template_part( 'template-parts/content', 'single', array( 'context' => 'lesson-plan' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                         endwhile; // End of the loop.
</span><span class="cx" style="display: block; padding: 0 10px">                        ?>
</span><span class="cx" style="display: block; padding: 0 10px">                </div>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscontentsinglephp"></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/content-single.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/content-single.php    2021-11-11 03:43:12 UTC (rev 11322)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/content-single.php      2021-11-11 03:53:36 UTC (rev 11323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,53 +28,20 @@
</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">                        </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <aside class="lp-sidebar">
-                               <div class="lp-details">
-                                       <ul>
-                                               <?php
-                                               foreach ( wporg_learn_get_lesson_plan_taxonomy_data( get_the_ID() ) as $detail ) {
-                                                       if ( ! empty( $detail['value'] ) ) {
-                                                               include locate_template( 'template-parts/component-taxonomy-item.php' );
-                                                       }
-                                               }
-                                               ?>
-                                       </ul>
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <ul class="lp-links">
-                                               <?php if ( $post->slides_view_url ) : ?>
-                                                       <li>
-                                                               <a href="<?php echo esc_attr( $post->slides_view_url ); ?>" target="_blank">
-                                                                       <span class="dashicons dashicons-admin-page"></span>
-                                                                       <?php esc_html_e( 'View Lesson Plan Slides', 'wporg-learn' ); ?>
-                                                               </a>
-                                                       </li>
-                                               <?php endif; ?>
-                                               <?php if ( $post->slides_download_url ) : ?>
-                                                       <li>
-                                                               <a href="<?php echo esc_attr( $post->slides_download_url ); ?>">
-                                                                       <span class="dashicons dashicons-download"></span>
-                                                                       <?php esc_html_e( 'Download Lesson Slides', 'wporg-learn' ); ?>
-                                                               </a>
-                                                       </li>
-                                               <?php endif; ?>
-                                               <!-- <li>
-                                                       <a href="#" target="_blank">
-                                                               <span class="dashicons dashicons-admin-post"></span>
-                                                               <?php esc_html_e( 'Print Lesson Plan', 'wporg-learn' ); ?>
-                                                       </a>
-                                               </li> -->
-                                       </ul>
-                                       <div class="lp-print">
-                                               <p><a href="#" onclick="window.print();"><?php esc_html_e( 'Print view', 'wporg-learn' ); ?></a></p>
-                                       </div>
-                                       <div class="lp-suggestion">
-                                               <h2 class="lp-suggestion_title h4"><?php esc_html_e( 'Suggestions', 'wporg-learn' ); ?></h2>
-                                               <p><?php esc_html_e( 'Found a typo, grammar error,or outdated screenshot?', 'wporg-learn' ); ?></p>
-                                               <p><?php esc_html_e( 'Used this lesson plan in your event and have some suggestions?', 'wporg-learn' ); ?></p>
-                                               <a href="https://learn.wordpress.org/report-content-errors/"><?php esc_html_e( 'Let us know!', 'wporg-learn' ); ?></a>
-                                       </div>
-                               </div>
-                       </aside>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php
+                       /**
+                        * Read in passed context and render sidebar.
+                        */
+                       switch ( get_post_type() ) {
+                               case 'lesson-plan':
+                                       get_sidebar( 'lesson-plan' );
+                                       break;
+                               case 'course':
+                                       get_sidebar( 'course' );
+                                       break;
+                       }
+                       ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                 </div>
</span><span class="cx" style="display: block; padding: 0 10px">        </section>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscontentworkshopsinglephp"></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/content-workshop-single.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/content-workshop-single.php   2021-11-11 03:43:12 UTC (rev 11322)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/content-workshop-single.php     2021-11-11 03:53:36 UTC (rev 11323)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,23 +49,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                        </div>
</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="wp-block-button is-style-secondary-full-width">
-                                               <a
-                                                       class="wp-block-button__link"
-                                                       href="https://learn.wordpress.org/social-learning/"
-                                                       style="border-radius:5px"
-                                               >
-                                                       <?php esc_html_e( 'Join a Social Learning Space', 'wporg-learn' ); ?>
-                                               </a>
-                                       </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php get_sidebar( 'workshop' ); ?>
</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 class="terms">
-                                               <?php printf(
-                                                       wp_kses_data( __( 'You must agree to our <a href="%s">Code of Conduct</a> in order to participate.', 'wporg-learn' ) ),
-                                                       esc_url( get_permalink( get_page_by_path( 'code-of-conduct' ) ) )
-                                               ); ?>
-                                       </p>
-
</del><span class="cx" style="display: block; padding: 0 10px">                                 </div> <!-- end sidebar column -->
</span><span class="cx" style="display: block; padding: 0 10px">                        </div> <!-- end columns -->
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>