diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-12-25 15:14:04 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-12-25 15:14:04 +0100 |
| commit | dac5be16783548bb3659d1972fac8e0c47b57893 (patch) | |
| tree | f73d1ae4081d9d27e9b061d7e88e455dfecfc3fe /tests | |
| parent | 71698996caab075e333b2ca70fdeff8dedbe52b2 (diff) | |
| parent | ff3132a9c63be07ba0db0132faad89364da373e4 (diff) | |
| download | forums-dac5be16783548bb3659d1972fac8e0c47b57893.tar forums-dac5be16783548bb3659d1972fac8e0c47b57893.tar.gz forums-dac5be16783548bb3659d1972fac8e0c47b57893.tar.bz2 forums-dac5be16783548bb3659d1972fac8e0c47b57893.tar.xz forums-dac5be16783548bb3659d1972fac8e0c47b57893.zip | |
Merge remote-tracking branch 'p/ticket/10507' into develop
* p/ticket/10507:
[ticket/10507] develop does not have imagesets, fix lower test.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dbal/fixtures/styles.xml | 4 | ||||
| -rw-r--r-- | tests/dbal/order_lower_test.php | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/tests/dbal/fixtures/styles.xml b/tests/dbal/fixtures/styles.xml index 47b384c47f..36fc22a48f 100644 --- a/tests/dbal/fixtures/styles.xml +++ b/tests/dbal/fixtures/styles.xml @@ -7,7 +7,6 @@ <column>style_active</column> <column>template_id</column> <column>theme_id</column> - <column>imageset_id</column> <row> <value>1</value> <value>prosilver</value> @@ -15,7 +14,6 @@ <value>1</value> <value>1</value> <value>1</value> - <value>1</value> </row> <row> <value>2</value> @@ -24,7 +22,6 @@ <value>0</value> <value>2</value> <value>2</value> - <value>2</value> </row> <row> <value>3</value> @@ -33,7 +30,6 @@ <value>0</value> <value>3</value> <value>3</value> - <value>3</value> </row> </table> </dataset> diff --git a/tests/dbal/order_lower_test.php b/tests/dbal/order_lower_test.php index fd1c950252..712efd2d2b 100644 --- a/tests/dbal/order_lower_test.php +++ b/tests/dbal/order_lower_test.php @@ -35,7 +35,6 @@ class phpbb_dbal_order_lower_test extends phpbb_database_test_case 'style_active' => 1, 'template_id' => 1, 'theme_id' => 1, - 'imageset_id' => 1 ), array( 'style_id' => 3, @@ -44,7 +43,6 @@ class phpbb_dbal_order_lower_test extends phpbb_database_test_case 'style_active' => 0, 'template_id' => 3, 'theme_id' => 3, - 'imageset_id' => 3 ), array( 'style_id' => 2, @@ -53,7 +51,6 @@ class phpbb_dbal_order_lower_test extends phpbb_database_test_case 'style_active' => 0, 'template_id' => 2, 'theme_id' => 2, - 'imageset_id' => 2 ) ), $db->sql_fetchrowset($result) |