<!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>[38294] trunk/src: Media: when calling `pathinfo()`, also pass a `PATHINFO_*` constant to avoid array notices for unset keys.</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 { 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/38294">38294</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/38294","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-20 23:35:50 +0000 (Sat, 20 Aug 2016)</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: when calling `pathinfo()`, also pass a `PATHINFO_*` constant to avoid array notices for unset keys.
Props JaworskiMatt.
Fixes <a href="https://core.trac.wordpress.org/ticket/37608">#37608</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorphp">trunk/src/wp-includes/class-wp-image-editor.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesfilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2016-08-20 22:58:34 UTC (rev 38293)
+++ trunk/src/wp-admin/includes/file.php 2016-08-20 23:35:50 UTC (rev 38294)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,9 +77,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_file_description( $file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_file_descriptions, $allowed_files;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $relative_pathinfo = pathinfo( $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dirname = pathinfo( $file, PATHINFO_DIRNAME );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $file_path = $allowed_files[ $file ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $wp_file_descriptions[ basename( $file ) ] ) && '.' === $relative_pathinfo['dirname'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $wp_file_descriptions[ basename( $file ) ] ) && '.' === $dirname ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $wp_file_descriptions[ basename( $file ) ];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( file_exists( $file_path ) && is_file( $file_path ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $template_data = implode( '', file( $file_path ) );
</span></span></pre></div>
<a id="trunksrcwpadminincludesimageeditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image-edit.php 2016-08-20 22:58:34 UTC (rev 38293)
+++ trunk/src/wp-admin/includes/image-edit.php 2016-08-20 23:35:50 UTC (rev 38294)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -761,28 +761,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $backup_sizes = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Generate new filename.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = get_attached_file($post_id);
- $path_parts = pathinfo( $path );
- $filename = $path_parts['filename'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = get_attached_file( $post_id );
+
+ $basename = pathinfo( $path, PATHINFO_BASENAME );
+ $dirname = pathinfo( $path, PATHINFO_DIRNAME );
+ $ext = pathinfo( $path, PATHINFO_EXTENSION );
+ $filename = pathinfo( $path, PATHINFO_FILENAME );
</ins><span class="cx" style="display: block; padding: 0 10px"> $suffix = time() . rand(100, 999);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $basename ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'thumbnail' == $target )
- $new_path = "{$path_parts['dirname']}/{$filename}-temp.{$path_parts['extension']}";
- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'thumbnail' == $target ) {
+ $new_path = "{$dirname}/{$filename}-temp.{$ext}";
+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_path = $path;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while( true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filename = preg_replace( '/-e([0-9]+)$/', '', $filename );
</span><span class="cx" style="display: block; padding: 0 10px"> $filename .= "-e{$suffix}";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_filename = "{$filename}.{$path_parts['extension']}";
- $new_path = "{$path_parts['dirname']}/$new_filename";
- if ( file_exists($new_path) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_filename = "{$filename}.{$ext}";
+ $new_path = "{$dirname}/$new_filename";
+ if ( file_exists($new_path) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $suffix++;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</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">@@ -792,18 +797,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $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">- if ( 'nothumb' == $target || 'all' == $target || 'full' == $target || $scaled ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'nothumb' === $target || 'all' === $target || 'full' === $target || $scaled ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset($backup_sizes['full-orig']) ) {
- if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $backup_sizes['full-orig'] ) ) {
+ if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] !== $basename ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = "full-$suffix";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = 'full-orig';
</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 ( $tag )
- $backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $tag ) {
+ $backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $basename );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['file'] = _wp_relative_upload_path( $new_path );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,7 +840,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE && ! empty( $meta['sizes'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $meta['sizes'] as $size ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $size['file'] ) && preg_match( '/-e[0-9]{13}-/', $size['file'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $delete_file = path_join( $path_parts['dirname'], $size['file'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $delete_file = path_join( $dirname, $size['file'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_delete_file( $delete_file );
</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="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2016-08-20 22:58:34 UTC (rev 38293)
+++ trunk/src/wp-admin/includes/media.php 2016-08-20 23:35:50 UTC (rev 38294)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,13 +284,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($file['error']) )
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'upload_error', $file['error'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $name_parts = pathinfo($name);
- $name = trim( substr( $name, 0, -(1 + strlen($name_parts['extension'])) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $basename = pathinfo( $name, PATHINFO_BASENAME );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = $file['url'];
</span><span class="cx" style="display: block; padding: 0 10px"> $type = $file['type'];
</span><span class="cx" style="display: block; padding: 0 10px"> $file = $file['file'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = $name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = $basename;
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $excerpt = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpimageeditorphp"></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/class-wp-image-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor.php 2016-08-20 22:58:34 UTC (rev 38293)
+++ trunk/src/wp-includes/class-wp-image-editor.php 2016-08-20 23:35:50 UTC (rev 38294)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,13 +346,9 @@
</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 ( $filename ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ext = '';
- $info = pathinfo( $filename );
- $dir = $info['dirname'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dir = pathinfo( $filename, PATHINFO_DIRNAME );
+ $ext = pathinfo( $filename, PATHINFO_EXTENSION );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $info['extension'] ) )
- $ext = $info['extension'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> $filename = trailingslashit( $dir ) . wp_basename( $filename, ".$ext" ) . ".{$new_ext}";
</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">@@ -375,9 +371,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $suffix )
</span><span class="cx" style="display: block; padding: 0 10px"> $suffix = $this->get_suffix();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $info = pathinfo( $this->file );
- $dir = $info['dirname'];
- $ext = $info['extension'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dir = pathinfo( $this->file, PATHINFO_DIRNAME );
+ $ext = pathinfo( $this->file, PATHINFO_EXTENSION );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $name = wp_basename( $this->file, ".$ext" );
</span><span class="cx" style="display: block; padding: 0 10px"> $new_ext = strtolower( $extension ? $extension : $ext );
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2016-08-20 22:58:34 UTC (rev 38293)
+++ trunk/src/wp-includes/functions.php 2016-08-20 23:35:50 UTC (rev 38294)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2034,13 +2034,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = sanitize_file_name($filename);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Separate the filename into a name and extension.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $info = pathinfo($filename);
- $ext = !empty($info['extension']) ? '.' . $info['extension'] : '';
- $name = basename($filename, $ext);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ext = pathinfo( $filename, PATHINFO_EXTENSION );
+ $name = pathinfo( $filename, PATHINFO_BASENAME );
+ if ( $ext ) {
+ $ext = '.' . $ext;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Edge case: if file is named '.ext', treat as an empty name.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $name === $ext )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $name === $ext ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $name = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</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"> * Increment the file number until we have a unique file to save in $dir.
</span></span></pre>
</div>
</div>
</body>
</html>