Merge branch 'hotfix-10.6.13' into stable

pixl8 · Sep 16, 2016 · edda30f · edda30f
2 parents 14594af + 3232fd5
commit edda30f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.6.12",
+    "version":"10.6.13",
     "author":"Pixl8 Interactive",
     "createPackageDirectory":true,
     "packageDirectory":"preside",

diff --git a/box.json.no.deps b/box.json.no.deps
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.6.12",
+    "version":"10.6.13",
     "author":"Pixl8 Interactive",
     "createPackageDirectory":true,
     "packageDirectory":"preside",

diff --git a/support/build/build.properties b/support/build/build.properties
@@ -2,5 +2,5 @@ build.number.remote.url=http://downloads.presidecms.com/presidecms/build.number
 
 ##############################
 # MANUALLY UPDATE EACH VERSION
-preside.version=10.6.12
+preside.version=10.6.13
 ##############################
diff --git a/system/services/presideObjects/PresideObjectService.cfc b/system/services/presideObjects/PresideObjectService.cfc
@@ -1413,12 +1413,17 @@ component singleton=true autodoc=true displayName="Preside Object Service" {
 		return objects;
 	}
 
-	private array function _getJoinsFromJoinTargets( required string objectName, required array joinTargets, required string forceJoins, required boolean fromVersionTable ) {
+	private array function _getJoinsFromJoinTargets(
+		  required string  objectName
+		, required array   joinTargets
+		, required string  forceJoins
+		, required boolean fromVersionTable
+	) {
 		var joins = [];
 
 		if ( ArrayLen( arguments.joinTargets ) ) {
 			var joinsCache    = _getCache();
-			var joinsCacheKey = "SQL Joins for #arguments.objectName# with join targets: #ArrayToList( arguments.joinTargets )#. From version table: #arguments.fromVersionTable#."
+			var joinsCacheKey = "SQL Joins for #arguments.objectName# with join targets: #ArrayToList( arguments.joinTargets )#. From version table: #arguments.fromVersionTable#. Forcing joins: [#arguments.forceJoins#]."
 
 			joins = joinsCache.get( joinsCacheKey );