Merge pull request #741 from rhdunn/fix-ctrl-ext

dmcassel · web-flow · commit 6cbb59d8cf39 · 2017-02-13T16:00:32.000-05:00
issue #740: make -EXT work from modules and filesystem
diff --git a/src/app/config/config.xqy b/src/app/config/config.xqy
@@ -68,7 +68,7 @@ declare variable $c:ROXY-ROUTES :=
  :
  : ***********************************************
  :)
-declare variable $c:CTRL-EXT := ("@ml.controller-ext", $def:CTRL-EXT)[fn:not(. eq "@ml.controller-ext")][1];
+declare variable $c:CTRL-EXT := ("@ml.controller-ext", $def:CTRL-EXT)[fn:not(. eq "@" || "ml.controller-ext")][1];
 
 (:
  : ***********************************************

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ declare variable $c:ROXY-ROUTES :=`
`68`	`68`	`:`
`69`	`69`	`: ***********************************************`
`70`	`70`	`:)`
`71`		`-declare variable $c:CTRL-EXT := ("@ml.controller-ext", $def:CTRL-EXT)[fn:not(. eq "@ml.controller-ext")][1];`
	`71`	`+declare variable $c:CTRL-EXT := ("@ml.controller-ext", $def:CTRL-EXT)[fn:not(. eq "@" \|\| "ml.controller-ext")][1];`
`72`	`72`
`73`	`73`	`(:`
`74`	`74`	`: ***********************************************`