3 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/phpbb/report/controller/report.php b/phpBB/phpbb/report/controller/report.php
index e1c14afde0..0aa6833dfa 100644
--- a/phpBB/phpbb/report/controller/report.php
+++ b/phpBB/phpbb/report/controller/report.php
@@ -141,7 +141,7 @@ class report
 		// Handle request
 		try
 		{
-			if (!empty($submit) && sizeof($error) === 0)
+			if (!empty($submit) && count($error) === 0)
 			{
 				$this->report_handler->add_report(
 					(int) $id,
@@ -273,7 +273,7 @@ class report
 		}
 
 		$this->template->assign_vars(array(
-			'ERROR'				=> (sizeof($error) > 0) ? implode('<br />', $error) : '',
+			'ERROR'				=> (count($error) > 0) ? implode('<br />', $error) : '',
 			'S_REPORT_POST'		=> ($mode === 'pm') ? false : true,
 			'REPORT_TEXT'		=> $report_text,
 			'S_HIDDEN_FIELDS'	=> (!empty($s_hidden_fields)) ? $s_hidden_fields : null,
@@ -302,7 +302,7 @@ class report
 			$error[] = $visual_confirmation_response;
 		}
 
-		if (sizeof($error) === 0)
+		if (count($error) === 0)
 		{
 			$captcha->reset();
 		}
diff --git a/phpBB/phpbb/report/report_handler_pm.php b/phpBB/phpbb/report/report_handler_pm.php
index 2f2a697efc..774ca329ad 100644
--- a/phpBB/phpbb/report/report_handler_pm.php
+++ b/phpBB/phpbb/report/report_handler_pm.php
@@ -53,8 +53,8 @@ class report_handler_pm extends report_handler
 			'user_notify'						=> $user_notify,
 			'report_text'						=> $report_text,
 			'reported_post_text'				=> $this->report_data['message_text'],
-			'reported_post_uid'					=> $this->report_data['bbcode_bitfield'],
-			'reported_post_bitfield'			=> $this->report_data['bbcode_uid'],
+			'reported_post_uid'					=> $this->report_data['bbcode_uid'],
+			'reported_post_bitfield'			=> $this->report_data['bbcode_bitfield'],
 			'reported_post_enable_bbcode'		=> $this->report_data['enable_bbcode'],
 			'reported_post_enable_smilies'		=> $this->report_data['enable_smilies'],
 			'reported_post_enable_magic_url'	=> $this->report_data['enable_magic_url'],
diff --git a/phpBB/phpbb/report/report_handler_post.php b/phpBB/phpbb/report/report_handler_post.php
index 5574a16dc0..52f09683ce 100644
--- a/phpBB/phpbb/report/report_handler_post.php
+++ b/phpBB/phpbb/report/report_handler_post.php
@@ -59,8 +59,8 @@ class report_handler_post extends report_handler
 			'user_notify'						=> $user_notify,
 			'report_text'						=> $report_text,
 			'reported_post_text'				=> $this->report_data['post_text'],
-			'reported_post_uid'					=> $this->report_data['bbcode_bitfield'],
-			'reported_post_bitfield'			=> $this->report_data['bbcode_uid'],
+			'reported_post_uid'					=> $this->report_data['bbcode_uid'],
+			'reported_post_bitfield'			=> $this->report_data['bbcode_bitfield'],
 			'reported_post_enable_bbcode'		=> $this->report_data['enable_bbcode'],
 			'reported_post_enable_smilies'		=> $this->report_data['enable_smilies'],
 			'reported_post_enable_magic_url'	=> $this->report_data['enable_magic_url'],