From 83cbb3412c75dbbb57864adc677d21dce85ba59e Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Wed, 2 Oct 2013 09:50:45 -0700
Subject: [PATCH] Issue #2096855 by zero2one: Fixed FilterHtmlImageSecure does
not support images with spaces in the filename.
---
core/modules/filter/filter.module | 1 +
.../lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php | 8 ++++++++
2 files changed, 9 insertions(+)
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 6feff66d8205..8809edf25b4e 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -1391,6 +1391,7 @@ function _filter_html_image_secure_process($text) {
// Ensure the path refers to an actual image by prefixing the image source
// with the Drupal root and running getimagesize() on it.
$local_image_path = $local_dir . drupal_substr($src, $base_path_length);
+ $local_image_path = rawurldecode($local_image_path);
if (@getimagesize($local_image_path)) {
// The image has the right path. Erroneous images are dealt with below.
continue;
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php
index 81a08519d623..bc6d8bb0ba09 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php
@@ -94,6 +94,12 @@ function testImageSource() {
$test_images = $this->drupalGetTestFiles('image');
$test_image = $test_images[0]->filename;
+ // Put a test image in the files directory with special filename.
+ $special_filename = 'tést fïle nà me.png';
+ $special_image = rawurlencode($special_filename);
+ $special_uri = str_replace($test_images[0]->filename, $special_filename, $test_images[0]->uri);
+ file_unmanaged_copy($test_images[0]->uri, $special_uri);
+
// Create a list of test image sources.
// The keys become the value of the IMG 'src' attribute, the values are the
// expected filter conversions.
@@ -111,6 +117,8 @@ function testImageSource() {
$files_path . '/' . $test_image => $files_path . '/' . $test_image,
$http_base_url . '/' . $public_files_path . '/' . $test_image => $files_path . '/' . $test_image,
$https_base_url . '/' . $public_files_path . '/' . $test_image => $files_path . '/' . $test_image,
+ $http_base_url . '/' . $public_files_path . '/' . $special_image => $files_path . '/' . $special_image,
+ $https_base_url . '/' . $public_files_path . '/' . $special_image => $files_path . '/' . $special_image,
$files_path . '/example.png' => $red_x_image,
'http://example.com/' . $druplicon => $red_x_image,
'https://example.com/' . $druplicon => $red_x_image,
--
GitLab