aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-12-01 13:23:07 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-12-01 13:23:07 +0100
commit7671c971e4ad4ad333c79399cbd9197a1a542494 (patch)
tree3550b2bba6e81c821136b7959f4754932dde2e96 /phpBB/phpbb
parent1c567daf392118f3898b914d5b4535ee440c7681 (diff)
parent88c921be23a2cddbfb3ac7272eb14305664b6542 (diff)
downloadforums-7671c971e4ad4ad333c79399cbd9197a1a542494.tar
forums-7671c971e4ad4ad333c79399cbd9197a1a542494.tar.gz
forums-7671c971e4ad4ad333c79399cbd9197a1a542494.tar.bz2
forums-7671c971e4ad4ad333c79399cbd9197a1a542494.tar.xz
forums-7671c971e4ad4ad333c79399cbd9197a1a542494.zip
Merge pull request #4542 from JoshyPHP/ticket/14873
[ticket/14873] Added width/height attributes to smilies
Diffstat (limited to 'phpBB/phpbb')
-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 f62daefdd9..a310c67359 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -311,7 +311,7 @@ class factory implements \phpbb\textformatter\cache_interface
{
$configurator->Emoticons->set(
$row['code'],
- '<img class="smilies" src="{$T_SMILIES_PATH}/' . htmlspecialchars($row['smiley_url']) . '" alt="{.}" title="' . htmlspecialchars($row['emotion']) . '"/>'
+ '<img class="smilies" src="{$T_SMILIES_PATH}/' . htmlspecialchars($row['smiley_url']) . '" width="' . $row['smiley_width'] . '" height="' . $row['smiley_height'] . '" alt="{.}" title="' . htmlspecialchars($row['emotion']) . '"/>'
);
}