1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge branch '3.2.x'

* 3.2.x:
  [ticket/15163] Escape curly braces in smilies HTML attributes
This commit is contained in:
Tristan Darricau
2017-04-18 23:37:01 +02:00
4 changed files with 40 additions and 1 deletions

View File

@@ -0,0 +1 @@
<img class="smilies" src="phpBB/images/smilies/icon_lol.gif" width="15" height="17" alt="--{E" title="--{E">

View File

@@ -0,0 +1 @@
--{E

View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_smilies">
<column>smiley_id</column>
<column>code</column>
<column>emotion</column>
<column>smiley_url</column>
<column>smiley_width</column>
<column>smiley_height</column>
<column>smiley_order</column>
<column>display_on_posting</column>
<row>
<value>1</value>
<value>--{E</value>
<value>--{E</value>
<value>icon_lol.gif</value>
<value>15</value>
<value>17</value>
<value>22</value>
<value>1</value>
</row>
</table>
</dataset>