4 files changed, 37 insertions, 3 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 62e5fe7a0a..ab943c2f86 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.1.6-dev');
+define('PHPBB_VERSION', '3.1.7-dev');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index fff55d993e..ac25f24ddd 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4837,7 +4837,7 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false)
 	);
 
 	$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-	$driver = $phpbb_avatar_manager->get_driver($row['avatar_type'], $ignore_config);
+	$driver = $phpbb_avatar_manager->get_driver($row['avatar_type'], !$ignore_config);
 	$html = '';
 
 	if ($driver)
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 8b3d8d9fd5..e63f6b822b 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1301,6 +1301,29 @@ class parse_message extends bbcode_firstpass
 			$return_message = &$this->message;
 		}
 
+		$text = $this->message;
+		$uid = $this->bbcode_uid;
+
+		/**
+		* Event to modify the text before it is parsed
+		*
+		* @event core.modify_format_display_text_before
+		* @var string	text				The message text to parse
+		* @var string	uid					The bbcode uid
+		* @var bool		allow_bbcode		Do we allow bbcodes
+		* @var bool		allow_magic_url		Do we allow magic urls
+		* @var bool		allow_smilies		Do we allow smilies
+		* @var bool		update_this_message	Do we update the internal message
+		*									with the parsed result
+		* @since 3.1.6-RC1
+		*/
+		$vars = array('text', 'uid', 'allow_bbcode', 'allow_magic_url', 'allow_smilies', 'update_this_message');
+		extract($phpbb_dispatcher->trigger_event('core.modify_format_display_text_before', compact($vars)));
+
+		$this->message = $text;
+		$this->bbcode_uid = $uid;
+		unset($text, $uid);
+
 		if ($this->message_status == 'plain')
 		{
 			// Force updating message - of course.
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index 6e357b260a..1f5ce93277 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -30,7 +30,7 @@ class ucp_activate
 	function main($id, $mode)
 	{
 		global $config, $phpbb_root_path, $phpEx;
-		global $db, $user, $auth, $template, $phpbb_container;
+		global $db, $user, $auth, $template, $phpbb_container, $phpbb_dispatcher;
 
 		$user_id = request_var('u', 0);
 		$key = request_var('k', '');
@@ -143,6 +143,17 @@ class ucp_activate
 			}
 		}
 
+		/**
+		* This event can be used to modify data after user account's activation
+		*
+		* @event core.ucp_activate_after
+		* @var	array	user_row	Array with some user data
+		* @var	string	message		Language string of the message that will be displayed to the user
+		* @since 3.1.6-RC1
+		*/
+		$vars = array('user_row', 'message');
+		extract($phpbb_dispatcher->trigger_event('core.ucp_activate_after', compact($vars)));
+
 		meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
 		trigger_error($user->lang[$message]);
 	}