aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/constants.php2
-rw-r--r--phpBB/includes/ucp/ucp_profile.php3
2 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 09e1e50b8d..8d09fe4d9b 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-define('PHPBB_VERSION', '3.0.12-RC2');
+define('PHPBB_VERSION', '3.0.13-dev');
// QA-related
// define('PHPBB_QA', 1);
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':