diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-31 23:40:35 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-31 23:40:35 +0200 |
| commit | ca07be9c57d35e297204814e8c93c710bb1890dd (patch) | |
| tree | 5aec14a2b697d9ee33912dd9998aaf149e73cfc6 /phpBB/includes/ucp/ucp_profile.php | |
| parent | d536a69e293cc71efa8a1dc719eb655a1e846f70 (diff) | |
| parent | 4e1e5865d03c8c56060a7e4fb975f88329997672 (diff) | |
| download | forums-ca07be9c57d35e297204814e8c93c710bb1890dd.tar forums-ca07be9c57d35e297204814e8c93c710bb1890dd.tar.gz forums-ca07be9c57d35e297204814e8c93c710bb1890dd.tar.bz2 forums-ca07be9c57d35e297204814e8c93c710bb1890dd.tar.xz forums-ca07be9c57d35e297204814e8c93c710bb1890dd.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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 55df5f610c..e55569fdd5 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -546,6 +546,9 @@ class ucp_profile // Build custom bbcodes array display_custom_bbcodes(); + // Generate smiley listing + generate_smilies('inline', 0); + break; case 'avatar': |