Merge pull request #743 from silverstripe-rebelalliance/trac/7817

FIX issue with cyclic configs when framework called sapphire

_config/routes.yml

@@ -9,8 +9,8 @@ Director:
 Name: coreroutes
 Before: '*'
 After:
-  - framework/routes#rootroutes
+  - '#rootroutes'
-  - cms/routes#modelascontrollerroutes
+  - '#modelascontrollerroutes'
 ---
 Director:
   rules:
@@ -25,9 +25,9 @@ Director:
 Name: adminroutes
 Before: '*'
 After:
-  - framework/routes#rootroutes
+  - '#rootroutes'
-  - framework/routes#coreroutes
+  - '#coreroutes'
-  - cms/routes#modelascontrollerroutes
+  - '#modelascontrollerroutes'
 ---
 Director:
   rules:

core/manifest/ConfigManifest.php

@@ -223,11 +223,12 @@ class SS_ConfigManifest {
 						// For each, parse out into module/file#name, and set any missing to "*"
 						$header[$order] = array();
 						foreach($orderparts as $part) {
-							preg_match('! (\*|\w+) (?:\/(\*|\w+) (?:\*|\#(\w+))? )? !x', $part, $match);
+							preg_match('! (?P<module>\*|\w+)? (\/ (?P<file>\*|\w+))? (\# (?P<fragment>\*|\w+))? !x', $part, $match);
+
 							$header[$order][] = array(
-								'module' => $match[1],
+								'module' => isset($match['module']) && $match['module'] ? $match['module'] : '*',
-								'file' => isset($match[2]) ? $match[2] : '*',
+								'file' => isset($match['file']) && $match['file'] ? $match['file'] : '*',
-								'name' => isset($match[3]) ? $match[3] : '*'
+								'name' => isset($match['fragment'])  && $match['fragment'] ? $match['fragment'] : '*'
 							);
 						}
 					}