Merge remote-tracking branch 'upstream/prep-release-3.1.11'

2 files changed, 138 insertions, 7 deletions

diff --git a/tests/functions_user/fixtures/delete_user.xml b/tests/functions_user/fixtures/delete_user.xml
index 07591389d2..56014b35d1 100644
--- a/tests/functions_user/fixtures/delete_user.xml
+++ b/tests/functions_user/fixtures/delete_user.xml
@@ -148,10 +148,11 @@
 		<column>post_id</column>
 		<column>poster_id</column>
 		<column>post_edit_user</column>
+		<column>post_delete_user</column>
 		<column>post_username</column>
 		<column>topic_id</column>
 		<column>forum_id</column>
-		<column>post_approved</column>
+		<column>post_visibility</column>
 		<column>post_time</column>
 		<column>post_text</column>
 		<column>post_reported</column>
@@ -159,6 +160,7 @@
 			<value>1</value>
 			<value>2</value>
 			<value>2</value>
+			<value>2</value>
 			<value></value>
 			<value>1</value>
 			<value>1</value>
@@ -171,6 +173,7 @@
 			<value>2</value>
 			<value>1</value>
 			<value>1</value>
+			<value>1</value>
 			<value>Other</value>
 			<value>2</value>
 			<value>2</value>
@@ -183,6 +186,7 @@
 			<value>3</value>
 			<value>2</value>
 			<value>2</value>
+			<value>2</value>
 			<value></value>
 			<value>3</value>
 			<value>3</value>
@@ -195,6 +199,7 @@
 			<value>4</value>
 			<value>1</value>
 			<value>1</value>
+			<value>1</value>
 			<value>Other</value>
 			<value>4</value>
 			<value>4</value>
@@ -258,29 +263,34 @@
 		<column>post_id</column>
 		<column>user_id</column>
 		<column>report_text</column>
+		<column>reported_post_text</column>
 		<row>
 			<value>1</value>
 			<value>1</value>
 			<value>1</value>
 			<value>Post Removed?</value>
+			<value></value>
 		</row>
 		<row>
 			<value>2</value>
 			<value>3</value>
 			<value>2</value>
 			<value>Post Removed?</value>
+			<value></value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>2</value>
 			<value>1</value>
 			<value>Keep</value>
+			<value></value>
 		</row>
 		<row>
 			<value>4</value>
 			<value>4</value>
 			<value>2</value>
 			<value>Remove Report</value>
+			<value></value>
 		</row>
 	</table>
 	<table name="phpbb_sessions">
@@ -303,6 +313,7 @@
 		<column>forum_id</column>
 		<column>topic_reported</column>
 		<column>topic_poster</column>
+		<column>topic_delete_user</column>
 		<column>topic_first_poster_name</column>
 		<column>topic_first_poster_colour</column>
 		<column>topic_last_poster_id</column>
@@ -313,6 +324,7 @@
 			<value>1</value>
 			<value>1</value>
 			<value>2</value>
+			<value>2</value>
 			<value></value>
 			<value>00AA00</value>
 			<value>2</value>
@@ -324,6 +336,7 @@
 			<value>2</value>
 			<value>1</value>
 			<value>1</value>
+			<value>1</value>
 			<value>Other</value>
 			<value></value>
 			<value>1</value>
@@ -335,6 +348,7 @@
 			<value>3</value>
 			<value>1</value>
 			<value>2</value>
+			<value>2</value>
 			<value></value>
 			<value>00AA00</value>
 			<value>2</value>
@@ -346,6 +360,7 @@
 			<value>4</value>
 			<value>1</value>
 			<value>1</value>
+			<value>1</value>
 			<value>Other</value>
 			<value></value>
 			<value>1</value>
@@ -355,17 +370,15 @@
 	</table>
 	<table name="phpbb_users">
 		<column>user_id</column>
+		<column>username</column>
 		<column>username_clean</column>
 		<column>user_permissions</column>
 		<column>user_sig</column>
-		<column>user_occ</column>
-		<column>user_interests</column>
 		<column>user_posts</column>
 		<row>
 			<value>1</value>
 			<value>Anonymous</value>
-			<value></value>
-			<value></value>
+			<value>anonymous</value>
 			<value></value>
 			<value></value>
 			<value>2</value>
@@ -373,8 +386,7 @@
 		<row>
 			<value>2</value>
 			<value>Foobar</value>
-			<value></value>
-			<value></value>
+			<value>foobar</value>
 			<value></value>
 			<value></value>
 			<value>2</value>
@@ -461,11 +473,17 @@
 	</table>
 	<table name="phpbb_profile_fields_data">
 		<column>user_id</column>
+		<column>pf_phpbb_interests</column>
+		<column>pf_phpbb_occupation</column>
 		<row>
 			<value>2</value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>3</value>
+			<value></value>
+			<value></value>
 		</row>
 	</table>
 	<table name="phpbb_moderator_cache">
diff --git a/tests/functions_user/fixtures/group_user_attributes.xml b/tests/functions_user/fixtures/group_user_attributes.xml
new file mode 100644
index 0000000000..9b1f1f504b
--- /dev/null
+++ b/tests/functions_user/fixtures/group_user_attributes.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_groups">
+		<column>group_id</column>
+		<column>group_avatar</column>
+		<column>group_rank</column>
+		<column>group_desc</column>
+		<row>
+			<value>1</value>
+			<value>default</value>
+			<value>1</value>
+			<value></value>
+		</row>
+		<row>
+			<value>2</value>
+			<value></value>
+			<value>0</value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>default2</value>
+			<value>3</value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>group_id</column>
+		<column>user_avatar</column>
+		<column>user_rank</column>
+		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+			<value>0</value>
+			<value>barfoo</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>1</value>
+			<value>default</value>
+			<value>1</value>
+			<value>foobar</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>1</value>
+			<value>custom</value>
+			<value>2</value>
+			<value>bertie</value>
+			<value></value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_user_group">
+		<column>user_id</column>
+		<column>group_id</column>
+		<column>user_pending</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>2</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>3</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>1</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>2</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>3</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>1</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>2</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>3</value>
+			<value>0</value>
+		</row>
+	</table>
+</dataset>