Merge branch 'hotfix-10.8.10' into stable

pixl8 · Jun 14, 2017 · 9bc843d · 9bc843d
2 parents e8249a4 + 6e32345
commit 9bc843d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/system/services/presideObjects/PresideObjectService.cfc b/system/services/presideObjects/PresideObjectService.cfc
@@ -2777,7 +2777,8 @@ component displayName="Preside Object Service" {
 		if ( Len( Trim( formula ) ) ) {
 			if ( formula.findNoCase( "${prefix}" ) ) {
 				if ( prefix.len() ) {
-					prefix &= formula.reFindNoCase( "\$\{prefix\}(\S+)?\." ) ? "$" : ".";
+					formula = formula.reReplaceNoCase( "\$\{prefix\}(\S+)?\.", "${prefix}$\1.", "all" );
+					formula = formula.reReplaceNoCase( "\$\{prefix\}([^\$])" , "${prefix}.\1", "all" );
 				}
 				formula = formula.replaceNoCase( "${prefix}", prefix, "all" );
 			}