<!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>[52036] trunk: Fix relative URLs in inlined block styles that involve external assets</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="https://core.trac.wordpress.org/changeset/52036">52036</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/52036","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>gziolo</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-11-08 13:23:44 +0000 (Mon, 08 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'>Fix relative URLs in inlined block styles that involve external assets
When styles got inlined, relative URLs break. The problem was that URLs inside CSS files are relative to the stylesheet's path, and when styles get inlined that relation is lost. This patch fixes the issue by finding relative URLs which then get modified to be relative to the site's root.
Fixes <a href="https://core.trac.wordpress.org/ticket/54243">#54243</a>.
Props aristath, cdyerkes, hellofromtonya.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunktestsphpunittestsdependenciesstylesphp">trunk/tests/phpunit/tests/dependencies/styles.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2021-11-08 10:47:55 UTC (rev 52035)
+++ trunk/src/wp-includes/script-loader.php 2021-11-08 13:23:44 UTC (rev 52036)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2701,6 +2701,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_styles()->get_data( $handle, 'path' ) && file_exists( $wp_styles->registered[ $handle ]->extra['path'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $styles[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'handle' => $handle,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'src' => $wp_styles->registered[ $handle ]->src,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'path' => $wp_styles->registered[ $handle ]->extra['path'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'size' => filesize( $wp_styles->registered[ $handle ]->extra['path'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2735,6 +2736,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the styles if we don't already have them.
</span><span class="cx" style="display: block; padding: 0 10px"> $style['css'] = file_get_contents( $style['path'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check if the style contains relative URLs that need to be modified.
+ // URLs relative to the stylesheet's path should be converted to relative to the site's root.
+ $style['css'] = _wp_normalize_relative_css_links( $style['css'], $style['src'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Set `src` to `false` and add styles inline.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_styles->registered[ $style['handle'] ]->src = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $wp_styles->registered[ $style['handle'] ]->extra['after'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2749,6 +2754,45 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Make URLs relative to the WordPress installation.
+ *
+ * @since 5.9.0
+ * @access private
+ *
+ * @param string $css The CSS to make URLs relative to the WordPress installation.
+ * @param string $stylesheet_url The URL to the stylesheet.
+ *
+ * @return string The CSS with URLs made relative to the WordPress installation.
+ */
+function _wp_normalize_relative_css_links( $css, $stylesheet_url ) {
+ $has_src_results = preg_match_all( '#url\s*\(\s*[\'"]?\s*([^\'"\)]+)#', $css, $src_results );
+ if ( $has_src_results ) {
+ // Loop through the URLs to find relative ones.
+ foreach ( $src_results[1] as $src_index => $src_result ) {
+ // Skip if this is an absolute URL.
+ if ( 0 === strpos( $src_result, 'http' ) || 0 === strpos( $src_result, '//' ) ) {
+ continue;
+ }
+
+ // Build the absolute URL.
+ $absolute_url = dirname( $stylesheet_url ) . '/' . $src_result;
+ $absolute_url = str_replace( '/./', '/', $absolute_url );
+ // Convert to URL related to the site root.
+ $relative_url = wp_make_link_relative( $absolute_url );
+
+ // Replace the URL in the CSS.
+ $css = str_replace(
+ $src_results[0][ $src_index ],
+ str_replace( $src_result, $relative_url, $src_results[0][ $src_index ] ),
+ $css
+ );
+ }
+ }
+
+ return $css;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Inject the block editor assets that need to be loaded into the editor's iframe as an inline script.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span></span></pre></div>
<a id="trunktestsphpunittestsdependenciesstylesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/dependencies/styles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/styles.php 2021-11-08 10:47:55 UTC (rev 52035)
+++ trunk/tests/phpunit/tests/dependencies/styles.php 2021-11-08 13:23:44 UTC (rev 52036)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,6 +190,51 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test normalizing relative links in CSS.
+ *
+ * @dataProvider data_normalize_relative_css_links
+ *
+ * @ticket 54243
+ *
+ * @covers ::_wp_normalize_relative_css_links
+ *
+ * @param string $css Given CSS to test.
+ * @param string $expected Expected result.
+ */
+ public function test_normalize_relative_css_links( $css, $expected ) {
+ $this->assertSame(
+ $expected,
+ _wp_normalize_relative_css_links( $css, site_url( 'wp-content/themes/test/style.css' ) )
+ );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array
+ */
+ public function data_normalize_relative_css_links() {
+ return array(
+ 'Double quotes, same path' => array(
+ 'css' => 'p {background:url( "image0.svg" );}',
+ 'expected' => 'p {background:url( "/wp-content/themes/test/image0.svg" );}',
+ ),
+ 'Single quotes, same path, prefixed with "./"' => array(
+ 'css' => 'p {background-image: url(\'./image2.png\');}',
+ 'expected' => 'p {background-image: url(\'/wp-content/themes/test/image2.png\');}',
+ ),
+ 'Single quotes, one level up, prefixed with "../"' => array(
+ 'css' => 'p {background-image: url(\'../image1.jpg\');}',
+ 'expected' => 'p {background-image: url(\'/wp-content/themes/test/../image1.jpg\');}',
+ ),
+ 'External URLs, shouldn\'t change' => array(
+ 'css' => 'p {background-image: url(\'http://foo.com/image2.png\');}',
+ 'expected' => 'p {background-image: url(\'http://foo.com/image2.png\');}',
+ ),
+ );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Test if multiple inline styles work
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24813
</span></span></pre>
</div>
</div>
</body>
</html>