diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-31 23:39:06 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-31 23:39:06 +0200 |
| commit | 4e1e5865d03c8c56060a7e4fb975f88329997672 (patch) | |
| tree | c40d676f703b6325875ba29a73350cd0f40b4a4a /phpBB/includes/ucp/ucp_profile.php | |
| parent | 63a017ec90602a01910438956647990886a2be49 (diff) | |
| parent | 6f883b6791e1bc9b168c98d4a95e9bbed6731a74 (diff) | |
| download | forums-4e1e5865d03c8c56060a7e4fb975f88329997672.tar forums-4e1e5865d03c8c56060a7e4fb975f88329997672.tar.gz forums-4e1e5865d03c8c56060a7e4fb975f88329997672.tar.bz2 forums-4e1e5865d03c8c56060a7e4fb975f88329997672.tar.xz forums-4e1e5865d03c8c56060a7e4fb975f88329997672.zip | |
Merge remote-tracking branch 'Elsensee/ticket/10037' into develop-olympus
* Elsensee/ticket/10037:
[ticket/10037] Fix table in subsilver2
[ticket/10037] Apply attached patch with a few changes
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 3 |
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': |