Changeset 1591439

Timestamp:

02/07/2017 11:33:29 PM (9 years ago)

Author:

sterlo

Message:

Bringing down latest from GitHub which fixed WordPress 4.7.1 bug.

Location:

scalable-vector-graphics-svg/trunk

Files:

• readme.txt (modified) (2 diffs)
• scalable-vector-graphics.php (modified) (5 diffs)

scalable-vector-graphics-svg/trunk/readme.txt

@@ -2 +2 @@
 Contributors: sterlo
 Donate link: http://www.sterlinghamilton.com/projects/scalable-vector-graphics/
-Tags: svg, scalable, vector, mime, type, image, graphic, file, upload
+Tags: svg, scalable, vector, mime, type, image, graphic, file, upload, media
 Requires at least: 3.0
-Tested up to: 4.5.3
+Tested up to: 4.7.2
 Stable tag: trunk
 License: GPLv2 or later
@@ -41 +41 @@
 1. Be in the root of your WordPress installation.
 1. Run `wp plugin install scalable-vector-graphics-svg`.
-1. Run `wp activate scalable-vector-graphics-svg`.
+1. Run `wp plugin activate scalable-vector-graphics-svg`.
 
 == Changelog ==
 
+= 3.3 =
+* Add a patch for core bug introduced in 4.7.1
 = 3.2 =
 * Created End User styles to allow for the front of the site to display SVG files properly.

scalable-vector-graphics-svg/trunk/scalable-vector-graphics.php

@@ -4 +4 @@
  * Plugin URI: http://www.sterlinghamilton.com/projects/scalable-vector-graphics/
  * Description: Scalable Vector Graphics are two-dimensional vector graphics, that can be both static and dynamic. This plugin allows your to easily use them on your site.
- * Version: 3.2
+ * Version: 3.3
  * Author: Sterling Hamilton
  * Author URI: http://www.sterlinghamilton.com/
@@ -25 +25 @@
 
 namespace SterlingHamilton\Plugins\ScalableVectorGraphics;
+
+$wordpress_version = get_bloginfo('version');
 
 // Return the accepted value for SVG mime-types in compliance with the RFC 3023.
@@ -52 +54 @@
 // Consider this the "server side" fix for dimensions.
 // Which is needed for the Media Grid within the Administration area.
-function adjust_response_for_svg( $response, $attachment, $meta ) {
+function set_dimensions( $response, $attachment, $meta ) {
     if( $response['mime'] == 'image/svg+xml' && empty( $response['sizes'] ) ) {
         $svg_file_path = get_attached_file( $attachment->ID );
@@ -69 +71 @@
     return $response;
 }
+
 // Browsers may or may not show SVG files properly without a height/width.
 // WordPress specifically defines width/height as "0" if it cannot figure it out.
@@ -95 +98 @@
 }
 
-// Do work son.
+// Restores the ability to upload non-image files in WordPress 4.7.1 and 4.7.2.
+// Related Trac Ticket: https://core.trac.wordpress.org/ticket/39550
+// Credit: @sergeybiryukov
+// @TODO: Remove the plugin once WordPress 4.7.3 is available!
+function disable_real_mime_check( $data, $file, $filename, $mimes ) {
+    $wp_filetype = wp_check_filetype( $filename, $mimes );
+
+    $ext = $wp_filetype['ext'];
+    $type = $wp_filetype['type'];
+    $proper_filename = $data['proper_filename'];
+
+    return compact( 'ext', 'type', 'proper_filename' );
+}
+
+if($wordpress_version < "4.7.3") {
+    add_filter( 'wp_check_filetype_and_ext', __NAMESPACE__ . '\\disable_real_mime_check', 10, 4 );
+}
 add_filter( 'upload_mimes', __NAMESPACE__ . '\\allow_svg_uploads' );
-add_filter( 'wp_prepare_attachment_for_js', __NAMESPACE__ . '\\adjust_response_for_svg', 10, 3 );
+add_filter( 'wp_prepare_attachment_for_js', __NAMESPACE__ . '\\set_dimensions', 10, 3 );
 add_action( 'admin_enqueue_scripts', __NAMESPACE__ . '\\administration_styles' );
 add_action( 'wp_head', __NAMESPACE__ . '\\public_styles' );