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 - - IHDRaIDATxڥ?HBQƣr #p(2hAk -!GP2ISiъ -:W_O"sw^gH^3כT(Ppc"31!h>_af Epd!H ߯! LNj Mp7<ǃpl2LIlo#6; a!vp˅r4 -u -RpNE>yHnlG.RWR B?%a<a2#=4}DrOu_ TWXTPjmA(`%xZZjKjFUtNjX'';GWXCW83p~zo$B{;rtAjX) |!uwsֆhx-=2ةQ-riIMQ(r?6{L~_ͧGIENDB` \ 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 - - IHDRacIDATxڥKSQNj( "|;ܩY'fzkOnnZaS IP&ڋfskE0 I귻-8|8p~gm6<(%BZc];?2_r]M]%c1zP`􁩛UaiE -r/օ3:PPDyL`)${ -],B٭0w c}}kxPPu.:[R}]1\l L L'&"~(An YY)AAu>ʉȯsY78_uUC vEUwkZև&nC(:0=qE$:ءa6s㐭|㰢=&d!P! J\3`K T;}9B@%(o'PYd)Aoo 3fC0Gis4D6aG@[Qi2ZSTč<(O-1 YQBlM7H{DAncҖ7XH]Bnk{QWum~+ ich`.9a[_iwtOWʫm5$k¶ qaTbnIENDB` \ 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 - - IHDRaIDATxmKSaPBP zv.;RѴAT:Ew&NtHc-\y,I奝3S*_ 60o|Q8;ǯs4q(sAdv^=uX ]`3XCI{C"d[BY9~ +8>Q4k˭1^.Z]k(P h@sGN -cx h4Xѯ{QT0 -qPk|anrp#+2oa52[|i -v^ةYd=sU,0 (N{0K_]ˇ"d͇(Td-hS@Q©`.Ci܀Xr`(\?I`n1¯tT7aIQ=l0;n)[`£4gIENDB` \ 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 - - IHDRw=IDATxڵMHACDŃxS977M+Dq10~}} s{z@ vv"R[XKKPK !1;Ě5%pr3M 쬬2.k:Q쑺ui q:R_H pu5ȧf3޹\y/\O#)pM %1ܭ`q1brOLtn~<_\Do__ବmmr*i SSOjU+QW>">l*NCp2p'p}sU$|j*iiZpeӗGN8pE8 OG": 9h <)HiPHIENDB` \ 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 - - IHDRw=IDATx͖{L[U݌&faG?_]4޶@1 XAAa7x2([ NAP&llηEٮp/N$#F\끱~ov!A[T TRgCiGZ%>ˡpSU蛖%$A^Dk_B]p2 -5tqS>T= u3v/0Wrq|NxFg۟ --z]\Cc)h/ 5 EYZ׶< ܝH\-Eb'[jAR~(zFC E\ٍ# "A3,{zJL<,J7ۛPۯ"!8XI1;DT˙ J=,L_qkw Mb*Pm Zz$Pc@<AR$!oVn$E$ɬ $OYBS5OS=T`R8nh^"mlk)RRĬ> ֙%=zn'P *630U "Aٙgg@c!0ǣ,[ mw(aR][liG])3HjB&GQbdycPw+}G[rKA^b V-bEȭ30'J>ؒ[gI euEޱ7e7#sHc_^0!tf -UΉX; -r@? ^8/.\9E'%&{˗.,3iZ)%gWןr|rc:99eΩm.w['.='y{_F/(IENDB` \ 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 - - IHDRw=IDATx͖]L[e݌&f^of7Jzsʇcb2EvmQ` cle-J:"SD110@='=KwtE'%Oq@@5ȉ1:`~. -M΁i!ch>ֽߐzoGQ;1š)䛽n B^ܖ(rJH(kA$.!< Y.7>ʃEl&mZH$bEST!y*+eىp`発i~D$ 1iXEq(*׸Fd2@x*Q/. |SPږTi| e(L8whQ 鯒Ĥml -{{P[cֱٺ MLm#$0P5bkvݹgL\Ɔ$1mSE7ZďɁ2пY#jjgrt;+5:Aidyi۽p]^Y{$C6g] g=., TdJkAk|y-o{%/VX{aQk7;KbW>D3 qIENDB` \ 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 - - IHDRw=IDATx͖_L[U݌& >_e/ۮniro -fYۍ0ʀ&ѕB{0l@V k1ec(cT&AHƇi6S͂-ѓ|r=~{1*@?Ek6O(>W0U! -YC ޭu ]r f][ u0P.N%dLP~HզQ*X&-kR3nDsc1NOJ5*jX+F娜|6@~`8kMv -3"3Cs&Lwv/cF=4,Fg!9e2;X۫Rh0j@ x)Z}.ӂt:x{a8c&EBd e1AZ4׿o8ʼ 렋P7sgn@PG(s \fBЃ4Bq9$`w˿/c{@ QWжioͲY2BB!m$(Jтg=~N3I>D!S$x~tyax}-7ηgoς AefvQ͂S77KymYp*LVo(܂ZiԠ؂rk77I vAD7ZߠȂjk\kO.Ī/gZ޿IMuxQ($.+x@eaaao706UչI*M= ^ʋHQۄg<'ɂ|Т4)&`hJ_IiFonnG2mGz EVo6O' ?jY  _i"hAvާİ&#0ibUf'Tgkbu=Y$b r _&PiAZηEv|y0b7ghtb, yJQ, e` Rym NsIcG) $My& cékkpUb@?c"1㋸[)Iu܂=4* Tcqh8'^)LT$TD eWIENDB` \ 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.');