summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2014-12-23 10:27:43 (GMT)
committerAlex Pott2014-12-23 10:27:43 (GMT)
commitaec0d2b0f05be3a3978bfab30a28d8a884105bac (patch)
tree628437289ed8b3f77ffcb7a5bbac58cb74fc3e04
parent2e6efcbd0341cfd61e10b854b1cccd9f0d6ac36a (diff)
Issue #2358675 by LewisNyman, BarisW, mgifford, MarkoT91: Remove messages icons in misc
-rw-r--r--core/misc/message-16-error.pngbin519 -> 0 bytes
-rw-r--r--core/misc/message-16-help.pngbin668 -> 0 bytes
-rw-r--r--core/misc/message-16-info.pngbin733 -> 0 bytes
-rw-r--r--core/misc/message-16-warning.pngbin442 -> 0 bytes
-rw-r--r--core/misc/message-24-error.pngbin733 -> 0 bytes
-rw-r--r--core/misc/message-24-help.pngbin1088 -> 0 bytes
-rw-r--r--core/misc/message-24-info.pngbin1011 -> 0 bytes
-rw-r--r--core/misc/message-24-ok.pngbin1058 -> 0 bytes
-rw-r--r--core/misc/message-24-warning.pngbin753 -> 0 bytes
-rw-r--r--core/modules/filter/filter.api.php2
-rw-r--r--core/modules/filter/filter.module8
-rw-r--r--core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php2
12 files changed, 5 insertions, 7 deletions
diff --git a/core/misc/message-16-error.png b/core/misc/message-16-error.png
deleted file mode 100644
index 486390c..0000000
--- a/core/misc/message-16-error.png
+++ /dev/null
Binary files differ
diff --git a/core/misc/message-16-help.png b/core/misc/message-16-help.png
deleted file mode 100644
index fc44326..0000000
--- a/core/misc/message-16-help.png
+++ /dev/null
Binary files differ
diff --git a/core/misc/message-16-info.png b/core/misc/message-16-info.png
deleted file mode 100644
index f47924f..0000000
--- a/core/misc/message-16-info.png
+++ /dev/null
Binary files differ
diff --git a/core/misc/message-16-warning.png b/core/misc/message-16-warning.png
deleted file mode 100644
index ffc4317..0000000
--- a/core/misc/message-16-warning.png
+++ /dev/null
Binary files differ
diff --git a/core/misc/message-24-error.png b/core/misc/message-24-error.png
deleted file mode 100644
index b094180..0000000
--- a/core/misc/message-24-error.png
+++ /dev/null
Binary files differ
diff --git a/core/misc/message-24-help.png b/core/misc/message-24-help.png
deleted file mode 100644
index 66b89ce..0000000
--- a/core/misc/message-24-help.png
+++ /dev/null
Binary files differ
diff --git a/core/misc/message-24-info.png b/core/misc/message-24-info.png
deleted file mode 100644
index be599ca..0000000
--- a/core/misc/message-24-info.png
+++ /dev/null
Binary files differ
diff --git a/core/misc/message-24-ok.png b/core/misc/message-24-ok.png
deleted file mode 100644
index bd36669..0000000
--- a/core/misc/message-24-ok.png
+++ /dev/null
Binary files differ
diff --git a/core/misc/message-24-warning.png b/core/misc/message-24-warning.png
deleted file mode 100644
index 183297d..0000000
--- a/core/misc/message-24-warning.png
+++ /dev/null
Binary files differ
diff --git a/core/modules/filter/filter.api.php b/core/modules/filter/filter.api.php
index 7f2c132..49351cb 100644
--- a/core/modules/filter/filter.api.php
+++ b/core/modules/filter/filter.api.php
@@ -35,7 +35,7 @@ function hook_filter_info_alter(&$info) {
*/
function hook_filter_secure_image_alter(&$image) {
// Turn an invalid image into an error indicator.
- $image->setAttribute('src', base_path() . 'core/misc/message-16-error.png');
+ $image->setAttribute('src', base_path() . 'core/misc/icons/ea2800/error.svg');
$image->setAttribute('alt', t('Image removed.'));
$image->setAttribute('title', t('This image has been removed. For security reasons, only images from the local domain are allowed.'));
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index bd3d072..269781c 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -864,13 +864,11 @@ function _filter_html_image_secure_process($text) {
*/
function filter_filter_secure_image_alter(&$image) {
// Turn an invalid image into an error indicator.
- $image->setAttribute('src', base_path() . 'core/misc/message-16-error.png');
+ $image->setAttribute('src', base_path() . 'core/misc/icons/ea2800/error.svg');
$image->setAttribute('alt', t('Image removed.'));
$image->setAttribute('title', t('This image has been removed. For security reasons, only images from the local domain are allowed.'));
- $image_factory = \Drupal::service('image.factory');
- $error_image = $image_factory->get('core/misc/message-16-error.png');
- $image->setAttribute('height', $error_image->getHeight());
- $image->setAttribute('width', $error_image->getWidth());
+ $image->setAttribute('height', '16');
+ $image->setAttribute('width', '16');
// Add a CSS class to aid in styling.
$class = ($image->getAttribute('class') ? trim($image->getAttribute('class')) . ' ' : '');
diff --git a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
index 99d82d3..cb5168e 100644
--- a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
+++ b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
@@ -79,7 +79,7 @@ class FilterHtmlImageSecureTest extends WebTestBase {
$csrf_path = $public_files_path . '/' . implode('/', array_fill(0, substr_count($public_files_path, '/') + 1, '..'));
$druplicon = 'core/misc/druplicon.png';
- $red_x_image = base_path() . 'core/misc/message-16-error.png';
+ $red_x_image = base_path() . 'core/misc/icons/ea2800/error.svg';
$alt_text = t('Image removed.');
$title_text = t('This image has been removed. For security reasons, only images from the local domain are allowed.');