aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2013-07-25 15:47:55 +0200
committerOliver Schramm <oliver.schramm97@gmail.com>2013-07-25 15:47:55 +0200
commit866e475f9644dd3575ed62bfb0e7dde0338fd5cc (patch)
treee7d046b18bbf4122eb18a286c886ba032c050c43 /phpBB/includes
parent76a7d544cf8ac09229ac4c1eb17d4ded51fc92e3 (diff)
downloadforums-866e475f9644dd3575ed62bfb0e7dde0338fd5cc.tar
forums-866e475f9644dd3575ed62bfb0e7dde0338fd5cc.tar.gz
forums-866e475f9644dd3575ed62bfb0e7dde0338fd5cc.tar.bz2
forums-866e475f9644dd3575ed62bfb0e7dde0338fd5cc.tar.xz
forums-866e475f9644dd3575ed62bfb0e7dde0338fd5cc.zip
[ticket/10037] Apply attached patch with a few changes
PHPBB3-10037
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/ucp/ucp_profile.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index d35d13b6c1..847311058b 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -548,6 +548,9 @@ class ucp_profile
// Build custom bbcodes array
display_custom_bbcodes();
+ // Generate smiley listing
+ generate_smilies('inline', 0);
+
break;
case 'avatar':