Merge branch '4.2' into 4

This commit is contained in:
Robbie Averill 2018-08-17 21:54:24 +12:00
commit 13625547d3
1 changed files with 7 additions and 1 deletions

View File

@ -7,10 +7,16 @@ SilverStripe\Control\Director:
'': 'SilverStripe\CMS\Controllers\RootURLController'
'RemoveOrphanedPagesTask//$Action/$ID/$OtherID': 'SilverStripe\CMS\Tasks\RemoveOrphanedPagesTask'
'SiteTreeMaintenanceTask//$Action/$ID/$OtherID': 'SilverStripe\CMS\Tasks\SiteTreeMaintenanceTask'
'$URLSegment//$Action/$ID/$OtherID': 'SilverStripe\CMS\Controllers\ModelAsController'
---
Name: legacycmsroutes
---
SilverStripe\Control\Director:
rules:
'admin/cms': '->admin/pages'
---
Name: modelascontrollercatchallroute
After: '*'
---
SilverStripe\Control\Director:
rules:
'$URLSegment//$Action/$ID/$OtherID': 'SilverStripe\CMS\Controllers\ModelAsController'