<!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>[54713] branches/6.1: Media: Reverts `get_attached_file()` changes for normalized Windows paths.</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/54713">54713</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/54713","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>antpb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-10-28 15:28:59 +0000 (Fri, 28 Oct 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'>Media: Reverts `get_attached_file()` changes for normalized Windows paths.
Based on feedback from network storage configurations there was a noticed slowdown due to the usage of the `path_join()` function. This needs more time to find a workaround.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/53934">[53934]</a>.
Props mreishus, SergeyBiryukov, desrosj, mikeschroder.
Reverts <a href="https://core.trac.wordpress.org/changeset/53934">[53934]</a> in the 6.1 Branch.
See <a href="https://core.trac.wordpress.org/ticket/56924">#56924</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches61srcwpincludesfunctionsphp">branches/6.1/src/wp-includes/functions.php</a></li>
<li><a href="#branches61srcwpincludespostphp">branches/6.1/src/wp-includes/post.php</a></li>
<li><a href="#branches61testsphpunittestsfunctionsphp">branches/6.1/tests/phpunit/tests/functions.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branches61testsphpunittestspostgetAttachedFilephp">branches/6.1/tests/phpunit/tests/post/getAttachedFile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches61srcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/functions.php 2022-10-28 15:16:29 UTC (rev 54712)
+++ branches/6.1/src/wp-includes/functions.php 2022-10-28 15:28:59 UTC (rev 54713)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2079,7 +2079,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * For example, '/foo/bar', or 'c:\windows'.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 6.1.0 Allows normalized Windows paths (forward slashes).
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path File path.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if path is absolute, false is not absolute.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2110,11 +2109,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">- // Normalized Windows paths for local filesystem and network shares (forward slashes).
- if ( preg_match( '#(^[a-zA-Z]+:/|^//[\w!@\#\$%\^\(\)\-\'{}\.~]{1,15})#', $path ) ) {
- return true;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // A path starting with / or \ is absolute; anything else is relative.
</span><span class="cx" style="display: block; padding: 0 10px"> return ( '/' === $path[0] || '\\' === $path[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches61srcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/post.php 2022-10-28 15:16:29 UTC (rev 54712)
+++ branches/6.1/src/wp-includes/post.php 2022-10-28 15:28:59 UTC (rev 54713)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -724,11 +724,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $file = get_post_meta( $attachment_id, '_wp_attached_file', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the file is relative, prepend upload dir.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $file ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $file && 0 !== strpos( $file, '/' ) && ! preg_match( '|^.:\\\|', $file ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uploads = wp_get_upload_dir();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( false === $uploads['error'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file = path_join( $uploads['basedir'], $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file = $uploads['basedir'] . "/$file";
</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></pre></div>
<a id="branches61testsphpunittestsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/tests/phpunit/tests/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/tests/phpunit/tests/functions.php 2022-10-28 15:16:29 UTC (rev 54712)
+++ branches/6.1/tests/phpunit/tests/functions.php 2022-10-28 15:28:59 UTC (rev 54713)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,13 +105,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'C:\\',
</span><span class="cx" style="display: block; padding: 0 10px"> 'C:\\WINDOWS',
</span><span class="cx" style="display: block; padding: 0 10px"> '\\\\sambashare\\foo',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'c:/',
- 'c://',
- '//',
- 'c:/FOO',
- '//FOO',
- 'C:/WWW/Sites/demo/htdocs/wordpress/wp-content/uploads/2016/03/example.jpg',
- '//ComputerName/ShareName/SubfolderName/example.txt',
</del><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $absolute_paths as $path ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( path_is_absolute( $path ), "path_is_absolute('$path') should return true" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,14 +119,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '../foo',
</span><span class="cx" style="display: block; padding: 0 10px"> '../',
</span><span class="cx" style="display: block; padding: 0 10px"> '../foo.bar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'foo.bar',
</del><span class="cx" style="display: block; padding: 0 10px"> 'foo/bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'FOO',
</span><span class="cx" style="display: block; padding: 0 10px"> '..\\WINDOWS',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '..//WINDOWS',
- 'c:',
- 'C:',
</del><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $relative_paths as $path ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( path_is_absolute( $path ), "path_is_absolute('$path') should return false" );
</span></span></pre></div>
<a id="branches61testsphpunittestspostgetAttachedFilephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/6.1/tests/phpunit/tests/post/getAttachedFile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/tests/phpunit/tests/post/getAttachedFile.php 2022-10-28 15:16:29 UTC (rev 54712)
+++ branches/6.1/tests/phpunit/tests/post/getAttachedFile.php 2022-10-28 15:28:59 UTC (rev 54713)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,67 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * @group post
- * @covers ::get_attached_file
- */
-class Tests_Post_GetAttachedFile extends WP_UnitTestCase {
- /**
- * Post
- *
- * @var WP_Post
- */
- protected static $post;
-
- /**
- * Create shared fixtures.
- */
- public static function set_up_before_class() {
- self::$post = self::factory()->post->create_and_get(
- array(
- 'post_title' => 'example-page',
- 'post_type' => 'post',
- )
- );
- }
-
- /**
- * @ticket 36308
- *
- * @dataProvider data_get_attached_file_with_windows_paths
- *
- * @param string $file The file path to attach to the post.
- * @param string $expected The expected attached file path.
- * @param string $message The message when an assertion fails.
- */
- public function test_get_attached_file_with_windows_paths( $file, $expected, $message ) {
- $attachment = self::factory()->attachment->create_and_get(
- array(
- 'post_parent' => self::$post->ID,
- 'file' => $file,
- )
- );
-
- $this->assertSame( $expected, get_attached_file( $attachment->ID ), $message );
- }
-
- /**
- * Data provider with Windows paths.
- *
- * @return array
- */
- public function data_get_attached_file_with_windows_paths() {
- return array(
- 'a local path' => array(
- 'file' => 'C:/WWW/Sites/demo/htdocs/wordpress/wp-content/uploads/2016/03/example.jpg',
- 'expected' => 'C:/WWW/Sites/demo/htdocs/wordpress/wp-content/uploads/2016/03/example.jpg',
- 'message' => 'Windows local filesystem paths should be equal',
- ),
- 'a network share path' => array(
- 'file' => '//ComputerName/ShareName/SubfolderName/example.txt',
- 'expected' => '//ComputerName/ShareName/SubfolderName/example.txt',
- 'message' => 'Network share paths should be equal',
- ),
- );
- }
-
-}
</del></span></pre>
</div>
</div>
</body>
</html>