diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-08-31 21:41:17 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-08-31 21:41:17 +0200 |
| commit | dff950162cd4d79d5e199e833e46a98d381397dc (patch) | |
| tree | 344a365547b8a99a7f57cd8dcba79cc1fc839643 /tests/dbal/fixtures | |
| parent | 05e6ed04ed48e321990125059e64e2d1592d69c4 (diff) | |
| parent | f008708d5cebfea7ef6efef4c876e99f819bff71 (diff) | |
| download | forums-dff950162cd4d79d5e199e833e46a98d381397dc.tar forums-dff950162cd4d79d5e199e833e46a98d381397dc.tar.gz forums-dff950162cd4d79d5e199e833e46a98d381397dc.tar.bz2 forums-dff950162cd4d79d5e199e833e46a98d381397dc.tar.xz forums-dff950162cd4d79d5e199e833e46a98d381397dc.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/phpbb/db/migration/tool/module.php
Diffstat (limited to 'tests/dbal/fixtures')
| -rw-r--r-- | tests/dbal/fixtures/migrator_module.xml | 54 |
1 files changed, 53 insertions, 1 deletions
diff --git a/tests/dbal/fixtures/migrator_module.xml b/tests/dbal/fixtures/migrator_module.xml index 32afe7e6f3..e172d7a145 100644 --- a/tests/dbal/fixtures/migrator_module.xml +++ b/tests/dbal/fixtures/migrator_module.xml @@ -20,7 +20,7 @@ <value>acp</value> <value>0</value> <value>1</value> - <value>4</value> + <value>6</value> <value>ACP_CAT</value> <value></value> <value></value> @@ -38,5 +38,57 @@ <value>test</value> <value></value> </row> + <row> + <value>3</value> + <value>1</value> + <value>1</value> + <value></value> + <value>acp</value> + <value>1</value> + <value>4</value> + <value>5</value> + <value>ACP_FORUM_BASED_PERMISSIONS</value> + <value></value> + <value></value> + </row> + <row> + <value>4</value> + <value>1</value> + <value>1</value> + <value></value> + <value>acp</value> + <value>0</value> + <value>7</value> + <value>12</value> + <value>ACP_CAT_FORUMS</value> + <value></value> + <value></value> + </row> + <row> + <value>5</value> + <value>1</value> + <value>1</value> + <value></value> + <value>acp</value> + <value>4</value> + <value>8</value> + <value>11</value> + <value>ACP_FORUM_BASED_PERMISSIONS</value> + <value></value> + <value></value> + </row> + <row> + <value>6</value> + <value>1</value> + <value>1</value> + <value></value> + <value>acp</value> + <value>5</value> + <value>9</value> + <value>10</value> + <value>ACP_FORUM_BASED_PERMISSIONS_CHILD_1</value> + <value></value> + <value></value> + </row> </table> </dataset> |