mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 09:30:34 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4926 from JoshyPHP/ticket/15348

Browse Source 
[ticket/15348] Ignore smilies that are immediately followed by a word
This commit is contained in:
Marc Alexander 2017-09-06 19:07:25 +02:00
commit 1084b91b66
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
4 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/phpbb/textformatter/s9e/factory.php
View File

@ -323,6 +323,9 @@ class factory implements \phpbb\textformatter\cache_interface
// Only parse emoticons at the beginning of the text or if they're preceded by any
// one of: a new line, a space, a dot, or a right square bracket
$configurator->Emoticons->notAfter = '[^\\n .\\]]';
// Ignore emoticons that are immediately followed by a "word" character
$configurator->Emoticons->notBefore = '\\w';
}
// Load the censored words

1
tests/text_processing/tickets_data/PHPBB3-15348.html Normal file
View File

@ -0,0 +1 @@
<img class="smilies" src="phpBB/images/smilies/icon_e_surprised.gif" width="15" height="17" alt=":o" title="First half of :ok:"> <img class="smilies" src="phpBB/images/smilies/icon_lol.gif" width="15" height="17" alt="k:" title="Second half of :ok:"> <img alt=":ok:" class="emoji smilies" draggable="false" src="//cdn.jsdelivr.net/emojione/assets/svg/1f197.svg">

1
tests/text_processing/tickets_data/PHPBB3-15348.txt Normal file
View File

@ -0,0 +1 @@
:o k: :ok:

33
tests/text_processing/tickets_data/PHPBB3-15348.xml Normal file
View File

@ -0,0 +1,33 @@
<?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>13</value>
<value>:o</value>
<value>First half of :ok:</value>
<value>icon_e_surprised.gif</value>
<value>15</value>
<value>17</value>
<value>14</value>
<value>1</value>
</row>
<row>
<value>99</value>
<value>k:</value>
<value>Second half of :ok:</value>
<value>icon_lol.gif</value>
<value>15</value>
<value>17</value>
<value>22</value>
<value>1</value>
</row>
</table>
</dataset>