Merge pull request #337 from phpbb/3.2.x

Merge 3.2.x into 3.3.x

Author: iMattPro

includes/overlords/contribs.php

@@ -654,7 +654,7 @@ public static function build_feed($template, $helper, $path_helper, $contrib = f
 		$contrib_specific = ($contrib_id) ? 'AND r.contrib_id = ' . (int) $contrib_id : '';
 
 		$sql_ary = [
-			'SELECT' => 'r.*, c.*, u.username_clean',
+			'SELECT' => 'r.*, c.*, u.username',
 
 			'FROM' => [
 				TITANIA_REVISIONS_TABLE => 'r',

migrations/base.php

@@ -32,6 +32,7 @@ protected function get_titania_config()
 
 		$this->titania_config = new \phpbb\titania\config\config(
 			$phpbb_container->get('config'),
+			$phpbb_container->get('config_text'),
 			$phpbb_container->getParameter('core.root_path') . 'ext/phpbb/titania/',
 			$phpbb_container->getParameter('core.php_ext')
 		);