<!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>[48288] trunk/src: Media: Show an error message when a `.heic` file is uploaded that this type of files cannot be displayed in a web browser and suggesting to convert to JPEG.</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/48288">48288</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/48288","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-03 23:13:30 +0000 (Fri, 03 Jul 2020)</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: Show an error message when a `.heic` file is uploaded that this type of files cannot be displayed in a web browser and suggesting to convert to JPEG. The message is shown by using filters, plugins that want to handle uploading of `.heic` files can remove it.
Props mattheweppelsheimer, mikeschroder, jeffr0, andraganescu, desrosj, azaozz.
Fixes <a href="https://core.trac.wordpress.org/ticket/42775">#42775</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesvendorpluploadhandlersjs">trunk/src/js/_enqueues/vendor/plupload/handlers.js</a></li>
<li><a href="#trunksrcjs_enqueuesvendorpluploadwppluploadjs">trunk/src/js/_enqueues/vendor/plupload/wp-plupload.js</a></li>
<li><a href="#trunksrcwpadminincludesadminfiltersphp">trunk/src/wp-admin/includes/admin-filters.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesvendorpluploadhandlersjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/plupload/handlers.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/plupload/handlers.js 2020-07-03 21:57:51 UTC (rev 48287)
+++ trunk/src/js/_enqueues/vendor/plupload/handlers.js 2020-07-03 23:13:30 UTC (rev 48288)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,6 +568,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> uploadStart();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> plupload.each( files, function( file ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( file.type === 'image/heic' && up.settings.heic_upload_error ) {
+ // Show error but do not block uploading.
+ wpQueueError( pluploadL10n.unsupported_image )
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> fileQueued( 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="trunksrcjs_enqueuesvendorpluploadwppluploadjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/plupload/wp-plupload.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/plupload/wp-plupload.js 2020-07-03 21:57:51 UTC (rev 48287)
+++ trunk/src/js/_enqueues/vendor/plupload/wp-plupload.js 2020-07-03 23:13:30 UTC (rev 48288)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,6 +351,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">+ if ( file.type === 'image/heic' && up.settings.heic_upload_error ) {
+ // Show error but do not block uploading.
+ Uploader.errors.unshift({
+ message: pluploadL10n.unsupported_image,
+ data: {},
+ file: file
+ });
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Generate attributes for a new `Attachment` model.
</span><span class="cx" style="display: block; padding: 0 10px"> attributes = _.extend({
</span><span class="cx" style="display: block; padding: 0 10px"> file: file,
</span></span></pre></div>
<a id="trunksrcwpadminincludesadminfiltersphp"></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/admin-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/admin-filters.php 2020-07-03 21:57:51 UTC (rev 48287)
+++ trunk/src/wp-admin/includes/admin-filters.php 2020-07-03 23:13:30 UTC (rev 48288)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,6 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Media hooks.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'plupload_init', 'wp_show_heic_upload_error' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'media_upload_image', 'wp_media_upload_handler' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'media_upload_audio', 'wp_media_upload_handler' );
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></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/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2020-07-03 21:57:51 UTC (rev 48287)
+++ trunk/src/wp-includes/default-filters.php 2020-07-03 23:13:30 UTC (rev 48288)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,6 +534,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_playlist_scripts', 'wp_playlist_scripts' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'customize_controls_enqueue_scripts', 'wp_plupload_default_settings' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'plugins_loaded', '_wp_add_additional_image_sizes', 0 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'plupload_default_settings', 'wp_show_heic_upload_error' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Nav menu.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2 );
</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 2020-07-03 21:57:51 UTC (rev 48287)
+++ trunk/src/wp-includes/functions.php 2020-07-03 23:13:30 UTC (rev 48288)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3046,6 +3046,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'bmp' => 'image/bmp',
</span><span class="cx" style="display: block; padding: 0 10px"> 'tiff|tif' => 'image/tiff',
</span><span class="cx" style="display: block; padding: 0 10px"> 'ico' => 'image/x-icon',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'heic' => 'image/heic',
</ins><span class="cx" style="display: block; padding: 0 10px"> // Video formats.
</span><span class="cx" style="display: block; padding: 0 10px"> 'asf|asx' => 'video/x-ms-asf',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wmv' => 'video/x-ms-wmv',
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2020-07-03 21:57:51 UTC (rev 48287)
+++ trunk/src/wp-includes/media.php 2020-07-03 23:13:30 UTC (rev 48288)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3599,8 +3599,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $params Default Plupload parameters array.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $params = apply_filters( 'plupload_default_params', $params );
- $params['_wpnonce'] = wp_create_nonce( 'media-form' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $params = apply_filters( 'plupload_default_params', $params );
+
+ $params['_wpnonce'] = wp_create_nonce( 'media-form' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $defaults['multipart_params'] = $params;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $settings = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4686,3 +4688,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 2x large size.
</span><span class="cx" style="display: block; padding: 0 10px"> add_image_size( '2048x2048', 2048, 2048 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Callback to enable showig of the user error when uploading .heic images.
+ *
+ * @since 5.5.0
+ *
+ * @param array[] $plupload_settings The settings for Plupload.js.
+ * @return array[] Modified settings for Plupload.js.
+ */
+function wp_show_heic_upload_error( $plupload_settings ) {
+ $plupload_settings['heic_upload_error'] = true;
+ return $plupload_settings;
+}
</ins></span></pre></div>
<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 2020-07-03 21:57:51 UTC (rev 48287)
+++ trunk/src/wp-includes/script-loader.php 2020-07-03 23:13:30 UTC (rev 48288)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -846,6 +846,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'deleted' => __( 'moved to the Trash.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: File name. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'error_uploading' => __( '“%s” has failed to upload.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'unsupported_image' => __( 'This image cannot be displayed in a web browser. For best results convert it to JPEG before uploading.' ),
</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"> $scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.3.5' );
</span></span></pre>
</div>
</div>
</body>
</html>