aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-05-02 16:33:27 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-05-02 16:33:27 +0200
commita9ae1f83c7caa461ca2a13b9ef41f1b3140b7d22 (patch)
treefd25aab8b8a5a895413386010859ae35d4f84ffe
parent97e651a4917778bd4294073d254c8735b7b1f4df (diff)
parentebd56b69556c4e7a46aeebd9f4c1cfc47bba3286 (diff)
downloadforums-a9ae1f83c7caa461ca2a13b9ef41f1b3140b7d22.tar
forums-a9ae1f83c7caa461ca2a13b9ef41f1b3140b7d22.tar.gz
forums-a9ae1f83c7caa461ca2a13b9ef41f1b3140b7d22.tar.bz2
forums-a9ae1f83c7caa461ca2a13b9ef41f1b3140b7d22.tar.xz
forums-a9ae1f83c7caa461ca2a13b9ef41f1b3140b7d22.zip
Merge remote-tracking branch 'naderman/ticket/12469' into develop-ascraeus
* naderman/ticket/12469: [ticket/12469] Remove user table columns from fixtures that were deleted
-rw-r--r--tests/migrator/fixtures/convert_timezones.xml14
1 files changed, 0 insertions, 14 deletions
diff --git a/tests/migrator/fixtures/convert_timezones.xml b/tests/migrator/fixtures/convert_timezones.xml
index ce941d8b74..b02cf8393c 100644
--- a/tests/migrator/fixtures/convert_timezones.xml
+++ b/tests/migrator/fixtures/convert_timezones.xml
@@ -6,8 +6,6 @@
<column>username_clean</column>
<column>user_permissions</column>
<column>user_sig</column>
- <column>user_occ</column>
- <column>user_interests</column>
<column>user_timezone</column>
<column>user_dst</column>
<row>
@@ -16,8 +14,6 @@
<value>1</value>
<value></value>
<value></value>
- <value></value>
- <value></value>
<value>-12</value>
<value>0</value>
</row>
@@ -27,8 +23,6 @@
<value>2</value>
<value></value>
<value></value>
- <value></value>
- <value></value>
<value>-12</value>
<value>1</value>
</row>
@@ -38,8 +32,6 @@
<value>3</value>
<value></value>
<value></value>
- <value></value>
- <value></value>
<value>3</value>
<value>0</value>
</row>
@@ -49,8 +41,6 @@
<value>4</value>
<value></value>
<value></value>
- <value></value>
- <value></value>
<value>3</value>
<value>1</value>
</row>
@@ -60,8 +50,6 @@
<value>5</value>
<value></value>
<value></value>
- <value></value>
- <value></value>
<value>-3.5</value>
<value>0</value>
</row>
@@ -71,8 +59,6 @@
<value>6</value>
<value></value>
<value></value>
- <value></value>
- <value></value>
<value>8.75</value>
<value>0</value>
</row>