aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/textformatter/s9e/factory.php
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2016-07-21 03:37:44 +0200
committerJoshyPHP <s9e.dev@gmail.com>2016-07-21 03:40:01 +0200
commit13a756bfb7f73bdbd89e178617345afa18210b69 (patch)
tree401fedffed7ec3541214d138f55b4749334eb1d1 /phpBB/phpbb/textformatter/s9e/factory.php
parent486ffa85a25ffb5415915c83c9cba81a4df2b528 (diff)
downloadforums-13a756bfb7f73bdbd89e178617345afa18210b69.tar
forums-13a756bfb7f73bdbd89e178617345afa18210b69.tar.gz
forums-13a756bfb7f73bdbd89e178617345afa18210b69.tar.bz2
forums-13a756bfb7f73bdbd89e178617345afa18210b69.tar.xz
forums-13a756bfb7f73bdbd89e178617345afa18210b69.zip
[ticket/14700] Prevent an exception on duplicate smilies in text_formatter
PHPBB3-14700
Diffstat (limited to 'phpBB/phpbb/textformatter/s9e/factory.php')
-rw-r--r--phpBB/phpbb/textformatter/s9e/factory.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index 8d1c0fabfe..916fdff909 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -309,7 +309,7 @@ class factory implements \phpbb\textformatter\cache_interface
// Load smilies
foreach ($this->data_access->get_smilies() as $row)
{
- $configurator->Emoticons->add(
+ $configurator->Emoticons->set(
$row['code'],
'<img class="smilies" src="{$T_SMILIES_PATH}/' . htmlspecialchars($row['smiley_url']) . '" alt="{.}" title="' . htmlspecialchars($row['emotion']) . '"/>'
);