diff --git a/core/misc/message-16-error.png b/core/misc/message-16-error.png deleted file mode 100644 index 486390c9b0ae6870eb81f39ca8206ad93dadd84d..0000000000000000000000000000000000000000 --- a/core/misc/message-16-error.png +++ /dev/null @@ -1,7 +0,0 @@ -�PNG - -��� IHDR�����������a���IDATxڥ�?HBQƣ��r�� ��#�p(2h���Ak -�!G�����P�������2ISiъ -�:�W_O"���s��w����^���g���H�^��3���כT(P��������pc�"31!��h�>_�af��� Epd����!����H�������߯�!��LNj M��p7<��ǃ�p�l��2��L�����Ilo#6;��a�!���vp�˅r4 -u -�Rp�NE��>�yHn���l�G.���RWR�B?�%a�<�a2#=4�}��D�rO�u_� TW�XT���P��jm�������A(`%�x�ZZj�KjFU�tNjX���''�;GWX��C�W83�p~z�o�$�B{;���r�t��Aj�X)� |��!uws��ֆ��h�x-=2��ة������Q-�riI�M��Q��(�r?6�{L�~�_�ͧ��G�����IEND�B`� \ No newline at end of file diff --git a/core/misc/message-16-help.png b/core/misc/message-16-help.png deleted file mode 100644 index fc44326e46b705778b66c9aa27994fb703d7c775..0000000000000000000000000000000000000000 --- a/core/misc/message-16-help.png +++ /dev/null @@ -1,5 +0,0 @@ -�PNG - -��� IHDR�����������a��cIDATxڥ��KSQNj( ��"�|�;��ܩ�Y��'��f��zkOnn�Z�a�SI�P��&ڋ�fsk�����E�0� �I귻�-�����8���|8p~g�m�6<(��%��BZ�c�]��;?�2��_r�]M]�%�c1zP`Ua�iE�� -r/��օ���3:P��P��D�yL��`�)${� -�],��B٭0�w���c}}��kx��P��P��u.�:�[R�}]1�\l �L�L��'�&����"~���(��An ��YY��)AAu>����ʉȯs�Y78����_��uU�C� vEUw���k�Z�և�&n��C(�:0�����=q��E$:�ء��a�6����s����㐭���|㰢=&d!P��!J�\3`K T���;�}9�B�@������%(��o�'PY�d)Aoo 3�f������C�0��G�is�4D6�a�G�@�[�Qi��2ZST�č<�(�O-�1� Y�Q�B��lM7H{���D�AncҖ7XH���]Bn�k�{�����Q�Wum���~��+� i�c�h�`.9���a[��_�i��w�tOW��ʫ���m5��$k��¶� qa��Tbn����IEND�B`� \ No newline at end of file diff --git a/core/misc/message-16-info.png b/core/misc/message-16-info.png deleted file mode 100644 index f47924fc8ab0c800363774a555ce2da7186cf787..0000000000000000000000000000000000000000 --- a/core/misc/message-16-info.png +++ /dev/null @@ -1,5 +0,0 @@ -�PNG - -��� IHDR�����������a���IDATx�m��KSa���PBP�� z�v.;�RѴ�AT:�Ew�&N��t�Hc-�\��y�,I����奝3�S��*_ 60�o������<����s�yd���JI�q��Ih�^���P+t��˦}Pw<�im蛼�5Ȋ �1���*F!���.y1�*�=V����"��{�=�/� ��Ϩh��!�,� =J߽���i�J��5,B� -x#����F�M���i]Ȑ�Ȟ���$`��L�,�z9���M������}h�i=!�������_��'�c�FF�$�>�|Q8���;ǯs4q(�s�Ad�v^���=�u��X ]`3����XCI�{�C"d��[BY�9<Lٿ#����DT.��$( &q��C�;q@C�}ٖ��|k��6��ig���C^GQ�$ky5߳�|�v$@�pȱt��nWE����x��$(�o�K��f������?�JZށp,����� Z�@:WY!�oaj�B���ʵ��Q�%P�k"�s�Ф$p��BY� -ڵ~�/�4w���9h����4��f]�m��Ē)�������P�m�*���v�0iG��p)��)�0�cz�q e����8z�N��L�f����i�}AR���;X��ȴD�ڢ�7���_�tNw��������}�B��h�9��Q�N(`Y����IEND�B`� \ No newline at end of file diff --git a/core/misc/message-16-warning.png b/core/misc/message-16-warning.png deleted file mode 100644 index ffc43177abdc983dd2d9d46c25cb0ad697e2b3f0..0000000000000000000000000000000000000000 --- a/core/misc/message-16-warning.png +++ /dev/null @@ -1,6 +0,0 @@ -�PNG - -��� IHDR�����������a���IDAT8Oc���?%���_��r��@�a��P� �op��|���W���58�%ɀ�K������<���7M���Pl,B�]UvG>��~��+8�>������Q4�k˭�����1��^.Z��]�������k(�P h@s����G��N� -�c����x h�4�Xѯ�{Q����T��0������ -��qP�k|��an���r����p��#�+2�oa5�2[�|i� -�v^ة�Y��d�=���sU,0(N�{��0��K���_]ˇ"�����d͇(Td��-hS@Q©��`�.��C�i��܀�X���r`(\?I����`����n��������1�¯����tT�7���aIQ��=l�0;n)�[���`�£4g������IEND�B`� \ No newline at end of file diff --git a/core/misc/message-24-error.png b/core/misc/message-24-error.png deleted file mode 100644 index b09418060cee9fe18a4717ed88dba3795b324a39..0000000000000000000000000000000000000000 --- a/core/misc/message-24-error.png +++ /dev/null @@ -1,4 +0,0 @@ -�PNG - -��� IHDR����������w=����IDATxڵ�MHA�CD��ŃxS<x=��(���(�""�/zWP�E��`ZJ�I�OUJ����,T0iI��F��s5M[z)����R����X�/a���y�d2��j1�p$�'���t���-�%>9�77�M���+Dq10���~�}} s{z@��� vv"R[�XKKPK� ���!1;��Ě�5%�pr3���M ������쬬���2.�k:��Q쑺ui ��q�:R_�H��pu5ȧ��f3\�y/�\�O������#��)������pM %1ܭ�`q1b��r�OL��t�n��~<_\D�o���<�vw��$ٶX����R�9�+�e��܂%%ҊP�cu�(ɳ�9��a�S��GG�64(�gee�65)�iA��˩|�X(��u9~x�PU�����iQ+8���ia!����-�Ư��'gzN��XA +�99����@~�����lV�9#Bf&���A��vF �&x��b~�|J -� �%��ڂ�p��x26�O��$+0��͎l��S��N'��LԜ��%>�__ବ�mm�����r����*�iSS��O��jU�+�Q�W>�"����>��l����*NCp��2p�'�p}�s�U�$|j*��iiZpe�ӗ�GN8���pE�8 �O��G":�9h�<)������H��iPH����IEND�B`� \ No newline at end of file diff --git a/core/misc/message-24-help.png b/core/misc/message-24-help.png deleted file mode 100644 index 66b89cee3d46dac9334b2d9e923b190bb48ce2a3..0000000000000000000000000000000000000000 --- a/core/misc/message-24-help.png +++ /dev/null @@ -1,7 +0,0 @@ -�PNG - -��� IHDR����������w=���IDATx�͖{L[U�&f��a�G��?��_]4��@�1 �X���A�Aa�7�x�2��(��[ N��AP�&ll<zo;p��H,���& -ԯ��ʭ�ꂋF�|roO~��9�wNι�W��/�w?N��Rhm�]�s�4��i����4G�s��},8����w����-ɑOfe�$g�dCb< ZMk�;�-���@�sPrm��a�nDY�p���z/L�>�ηEٮ����p����/N�$#��F�\끱~ov!A[��TT�RgC�iGZ�%>����ˡ����pSU蛖%$A����^��D�k�������_�B�]����p2 �����-�5tqS>T=u�3�����v���/����0W�rq|Nx�Fg۟ -��-��z������]��\C�c)��h/� ��5��EYZ��<� �ܝH�\�-�Eb�'�[�j��AR���~(zF�C���E\��ٍ�# �"A���3,{�z�JL<�,���J��7���ۛPۯ"��!�8XI����1;�D����T��˙�J=�,���L_�qkw���� M�b*����P�m� Zz�$��Pc@�<����AR$!���o�Vn���$E$��ɬ�$OYB�S�5�O���S=T��`R�8����nh^"mlk)�RR�Ĭ�>� �֙%=zn'P����� ��*�6�����30U� "A�ٙg�g��@�c!��0�ǣ,[ m�w(�aR][�l�i���G]��)�3��H�jB�&�GQ��bdycP�w�+�}��G[�rK�A^b� �V-�b��Eȭ3�0��'����������J>ؒ[gI���� ���e�uE��ޱ��7e7��#�s��Hc�_^0!t�f� -��U���ΉX�; -r@�?�� ���^8�/.��\��9E���'%�&{�˗�.��,�3�iZ)%g�Wן�r��|r�����c�:9�9����e�Ωm.w������[����'.�=�'�y��{�_���F/�(�����IEND�B`� \ No newline at end of file diff --git a/core/misc/message-24-info.png b/core/misc/message-24-info.png deleted file mode 100644 index be599cabe49f3ab2b4d2e5902936860572a00dc9..0000000000000000000000000000000000000000 --- a/core/misc/message-24-info.png +++ /dev/null @@ -1,8 +0,0 @@ -�PNG - -��� IHDR����������w=����IDATx�͖]L[e�&f�^o�f7��J��z�sʇ�c�b2�E�vm�Q`��cl��e�-������J��:����"SD11�0���@���='=Kwt�E�'�%O��<����y�3��U�{�[�C/���R���i��T�;gX��s�O�˕]O-��a������{7�D���u(�n��� �/��\I���O����[���pΟ2*�ȵ���4 -��8L�% -���\�"����4 �ݖ��ŷUd�t�%'�R��s���3�]��vF�v��X�Ak����' -�T���5)(�<�]q��P�I&�8;2����f�e�z~�K��]� ��G�h;ci���Ç@ǥU�{Z�Y�G����S=tӲ����дϡ��쾃ʮyh:n�=�#�l�'�Ν�'O&(03�a�EP|<*�!2>q�@@�5���ȉ1:�`�~��.� -M��i!��c�h>��ֽߐz�o�GQ;�1����š)䛽n� ����B^��ܖ(r��JH��(�k��A$.���!�<� �Y.��7�>ʃ�E�l&�mZ��H��$bEST�!y*+��eى�p��`���発���i~D�$ 1i��XE�q(�*Fd�2�@���x*Q�/�. |S�PږTi|e�(L��������8�w�h��Q �鯒�Ĥml -{�{P��[c�����ֱ�ٺ ML��m#��$���0����P5�b��k�v�����ݹ��g�������L\���Ɔ$�1mS��������E��7Z���ď�Ɂ�2�п�Y#�����jj��g��r�t;�������+�5��:�A���i�d�yi���۽p�]^Y{����$C6��g] g=.,�� T�d���J��k���Ak���|y-���o����{%��/VX{aQk�7�;���������K��b���W�>D�3�q����IEND�B`� \ No newline at end of file diff --git a/core/misc/message-24-ok.png b/core/misc/message-24-ok.png deleted file mode 100644 index bd3666934fb9e2d0f0beac231c5ee23d572069f1..0000000000000000000000000000000000000000 --- a/core/misc/message-24-ok.png +++ /dev/null @@ -1,5 +0,0 @@ -�PNG - -��� IHDR����������w=����IDATx�͖_L[U�&�>_�e/�ۮ�ni��r�o-fYۍ0�ʀ�&�ѕ���B{�0l�@�V k�1ec(c��T�&AHƇ��i6S͂���-�����ѓ|r�=��~�{���1��*��@�?E�k�6�O�(>��W���0�U!� -�Y�<��Dy��R��b��Sɐ�S"�ޒ��)M�:�?�/�[�[�S��nIz$�Gh�'̰\�����,�v��>C�������ޭ�u �]r�� ��f�]�[���u0��P.�N%d�L�P�~��Hզ�Q���*X&-kR3n����D�sc�1�N�O�J�5*�jX�+F��娜�|�6�@�����~�`8k��M�v�� -�3"3C����s&��L�wv/�cF��=��4�,�F�g��!9�e2;�X��۫�Rh���0j@��� x)Z�}.��ӂt:�x�{a8c�&��EB��d �e1A����Z4������o�8ʼ���� 렋�P��7s���gn�@��PG��(s� ��\�f��BЃ4B�����q�9������$`��w˿/c�{�@ Q�W�жio���ͲY��2BB!�m$�(�J��тg=~��N��3����I>D!�S$x~t��y���ax������}�-7�ηgoς���<�p�8�TwVyD��̗�H��%�<V��`!l����� t%���5i��e�?�#�N���|Ȏ�����U��}n�����[qI����X��H�X�/bK�\��)�����n���UW����Km�qf�0�����9,�N�fE|z~���nv�Q�A�J&2�D�k�Ł�I�81y�v=��������p�\p|�U)���[�A@�(�{�{���\����Ңl�c�~#?�mɈ<��Ź��‰�⥌���;K�ḷ��܌��;c�N���ʦ�N}L����}��o�/���"�g��CC��3lα�����U�UXój�c����IEND�B`� \ No newline at end of file diff --git a/core/misc/message-24-warning.png b/core/misc/message-24-warning.png deleted file mode 100644 index 183297d8695d5cc436592e540cfb702c3e9118b3..0000000000000000000000000000000000000000 --- a/core/misc/message-24-warning.png +++ /dev/null @@ -1,3 +0,0 @@ -�PNG - -��� IHDR����������w=����IDATH�c���?-1I���:gOnvΧ�� �2����'z��op�FU��l%�J���> ���A���e��fv��Q͂��S77K��y���m��Y�p�*L��Vo(����܂�����Z��i�Ԡ�r�k77I� �v��A���D�7�ZߠȂ�jk��\k��O.����Ī��/������g����Z�I��M���u�xQ�($.����+�x@����e��aa�a��o70�6Uչ�����I��*����M��=������ �^ʋHQۄ��g�<'ɂ�|�Т4���)��&�����`�hJ�����_��I��iFonnG2��������m�G���z� E��V����o���6O'� ��?j������Y �� _��i�����"hAv�ާ�İ��&��#0ib���U�f��'�Tgk����bu=Y$���b �r _&����P��iAZ�ηE��v���|y0�������b��7�����g�h�t��b���,������y�J�����Q, e`� R�ym� N���s��I�c�����G�)�� ��$My���&� c����é��k�������k�p�U�b���@?��c"1��㋸��[)�Iu܂=���4��*�� T���c�q�h8'^�)�L�T$�T�D�������e�W����IEND�B`� \ No newline at end of file diff --git a/core/modules/filter/filter.api.php b/core/modules/filter/filter.api.php index 7f2c132900e61b91bb6ac833d5f90b21e57dc85d..49351cbe1ce870a2d3cec980161950da992f2b40 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 bd3d072704561284af096aafe6be67a911071a17..269781c728dd7b9561676228845b588b0d1701e3 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 99d82d384eacd5a39b77b1b0fe7f844e7ea4f6f8..cb5168ea103734b075c70d9608d717366398cb98 100644 --- a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php +++ b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php @@ -79,7 +79,7 @@ function testImageSource() { $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.');