2 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 85327cdfce..47ac177e05 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -174,6 +174,7 @@ abstract class base implements reparser_interface
 	*/
 	protected function reparse_record(array $record)
 	{
+		$record = $this->add_missing_fields($record);
 		$unparsed = array_merge(
 			$record,
 			generate_text_for_edit(
diff --git a/phpBB/phpbb/textreparser/row_based_plugin.php b/phpBB/phpbb/textreparser/row_based_plugin.php
index e39ec4d5d3..6b63ffeeaf 100644
--- a/phpBB/phpbb/textreparser/row_based_plugin.php
+++ b/phpBB/phpbb/textreparser/row_based_plugin.php
@@ -65,10 +65,7 @@ abstract class row_based_plugin extends base
 	protected function get_records($min_id, $max_id)
 	{
 		$result = $this->db->sql_query($this->get_records_query($min_id, $max_id));
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$records[] = $this->add_missing_fields($row);
-		}
+		$records = $this->db->sql_fetchrowset($result);
 		$this->db->sql_freeresult($result);
 
 		return $records;