<!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>[14190] sites/trunk/wp-themes.com/public_html/wp-content/plugins/style-variations: Theme Previews: Filter out duplicate style variations</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/14190">14190</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/14190","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ryelle</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-11-21 19:16:33 +0000 (Thu, 21 Nov 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'>Theme Previews: Filter out duplicate style variations
If there are duplicate style variations, it's likely that one is a subset (color palette or type set) and one is combined. Find the one with more settings and use that.
Merges WordPress/wordpress.org<a href="http://meta.trac.wordpress.org/ticket/425">#425</a>, fixes WordPress/wporg-theme-directory<a href="http://meta.trac.wordpress.org/ticket/158">#158</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwpthemescompublic_htmlwpcontentpluginsstylevariationsincpageinterceptphp">sites/trunk/wp-themes.com/public_html/wp-content/plugins/style-variations/inc/page-intercept.php</a></li>
<li><a href="#sitestrunkwpthemescompublic_htmlwpcontentpluginsstylevariationsincstylesendpointphp">sites/trunk/wp-themes.com/public_html/wp-content/plugins/style-variations/inc/styles-endpoint.php</a></li>
<li><a href="#sitestrunkwpthemescompublic_htmlwpcontentpluginsstylevariationsstylevariationsphp">sites/trunk/wp-themes.com/public_html/wp-content/plugins/style-variations/style-variations.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwpthemescompublic_htmlwpcontentpluginsstylevariationsincpageinterceptphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp-themes.com/public_html/wp-content/plugins/style-variations/inc/page-intercept.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp-themes.com/public_html/wp-content/plugins/style-variations/inc/page-intercept.php 2024-11-21 18:54:57 UTC (rev 14189)
+++ sites/trunk/wp-themes.com/public_html/wp-content/plugins/style-variations/inc/page-intercept.php 2024-11-21 19:16:33 UTC (rev 14190)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,6 +2,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\Theme_Preview\Style_Variations\Page_Intercept;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use function WordPressdotorg\Theme_Preview\Style_Variations\get_style_variations;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Return the name of the pattern from the $_GET request.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Retrieve all variations and match to make sure we have one with the same title.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $variations = \WP_Theme_JSON_Resolver::get_style_variations();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $variations = get_style_variations();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $variations ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,12 +100,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * We need to call gutenberg's filter `theme_json_user` to make sure the styles are applied to the page.
</span><span class="cx" style="display: block; padding: 0 10px"> * This use to work for both the page and card but a core change stopped that.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * See: https://core.trac.wordpress.org/ticket/56812
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * We now need to also call the core filter `wp_theme_json_data_user` to get the card preview to work.
</span><span class="cx" style="display: block; padding: 0 10px"> * Hopefully this code can be remove when we have a better component to use.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * Ref: https://github.com/WordPress/gutenberg/issues/44886
</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="sitestrunkwpthemescompublic_htmlwpcontentpluginsstylevariationsincstylesendpointphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp-themes.com/public_html/wp-content/plugins/style-variations/inc/styles-endpoint.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp-themes.com/public_html/wp-content/plugins/style-variations/inc/styles-endpoint.php 2024-11-21 18:54:57 UTC (rev 14189)
+++ sites/trunk/wp-themes.com/public_html/wp-content/plugins/style-variations/inc/styles-endpoint.php 2024-11-21 19:16:33 UTC (rev 14190)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,8 +2,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\Theme_Preview\Style_Variations\API_Endpoint;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use function WordPressdotorg\Theme_Preview\Style_Variations\get_style_variations;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function endpoint_handler() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $variations = \WP_Theme_JSON_Resolver::get_style_variations();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $variations = get_style_variations();
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_slug = get_option( 'stylesheet' );
</span><span class="cx" style="display: block; padding: 0 10px"> $styles = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $variations as $variation ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = strtolower( $variation['title'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = add_query_arg( 'style_variation', urlencode( $title ), $base );;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = add_query_arg( 'style_variation', urlencode( $title ), $base );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $styles[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $title,
</span></span></pre></div>
<a id="sitestrunkwpthemescompublic_htmlwpcontentpluginsstylevariationsstylevariationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp-themes.com/public_html/wp-content/plugins/style-variations/style-variations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp-themes.com/public_html/wp-content/plugins/style-variations/style-variations.php 2024-11-21 18:54:57 UTC (rev 14189)
+++ sites/trunk/wp-themes.com/public_html/wp-content/plugins/style-variations/style-variations.php 2024-11-21 19:16:33 UTC (rev 14190)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,6 +12,47 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) || die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Get unique style variations.
+ *
+ * If there are multiple variations matching a title, use the longest. This is
+ * a rough way to check for full (combined) style variations, as opposed to
+ * color palettes or type sets.
+ *
+ * @return array Variation list, or empty array.
+ */
+function get_style_variations() {
+ $variations = array();
+ $all_variations = \WP_Theme_JSON_Resolver::get_style_variations();
+
+ foreach ( $all_variations as $variation ) {
+ // Safety check: variations must have a title and settings.
+ if ( ! isset( $variation['title'], $variation['settings'] ) ) {
+ continue;
+ }
+ $found_variations = wp_list_filter(
+ $variations,
+ array( 'title' => $variation['title'] )
+ );
+ if ( ! $found_variations ) {
+ $variations[] = $variation;
+ } else {
+ // Loop over the found variations, even though there should only
+ // ever be one, to keep track of the index value.
+ foreach ( $found_variations as $i => $found ) {
+ $found_settings = wp_json_encode( $found );
+ $new_settings = wp_json_encode( $variation );
+ if ( strlen( $new_settings ) > strlen( $found_settings ) ) {
+ // Replace the item in the variations list.
+ $variations[ $i ] = $variation;
+ }
+ }
+ }
+ }
+
+ return $variations;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once __DIR__ . '/inc/global-style-page.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once __DIR__ . '/inc/page-intercept.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once __DIR__ . '/inc/styles-endpoint.php';
</span></span></pre>
</div>
</div>
</body>
</html>