aboutsummaryrefslogtreecommitdiffstats
path: root/tests/pagination
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-11-26 13:30:24 +0100
committerMarc Alexander <admin@m-a-styles.de>2014-11-26 13:30:24 +0100
commit4c88c579b8cded6754476f08d6d268670e9f8dd9 (patch)
tree2bb43d71bc9aec21d02c6c7f15d6b758f2153fd5 /tests/pagination
parent630e7077e00b6c1c8023436351f777ef76165642 (diff)
parent51f46a8f91995e8a21cb0a38eacbe56d59578b14 (diff)
downloadforums-4c88c579b8cded6754476f08d6d268670e9f8dd9.tar
forums-4c88c579b8cded6754476f08d6d268670e9f8dd9.tar.gz
forums-4c88c579b8cded6754476f08d6d268670e9f8dd9.tar.bz2
forums-4c88c579b8cded6754476f08d6d268670e9f8dd9.tar.xz
forums-4c88c579b8cded6754476f08d6d268670e9f8dd9.zip
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'tests/pagination')
-rw-r--r--tests/pagination/config/test/routing/environment.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/pagination/config/test/routing/environment.yml b/tests/pagination/config/test/routing/environment.yml
index dd667274cd..2ce082c9d1 100644
--- a/tests/pagination/config/test/routing/environment.yml
+++ b/tests/pagination/config/test/routing/environment.yml
@@ -1,6 +1,6 @@
core_controller:
- pattern: /test
+ path: /test
defaults: { _controller: core_foo.controller:bar, page: 1}
core_page_controller:
- pattern: /test/page/{page}
+ path: /test/page/{page}
defaults: { _controller: core_foo.controller:bar}