1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-20 07:42:09 +02:00

Merge remote-tracking branch 'p/ticket/10507' into develop

* p/ticket/10507:
  [ticket/10507] develop does not have imagesets, fix lower test.
This commit is contained in:
Andreas Fischer 2011-12-25 15:14:04 +01:00
commit dac5be1678
2 changed files with 0 additions and 7 deletions

View File

@ -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>

View File

@ -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)