Merge branch 'hotfix-10.8.39' into stable

pixl8 · Aug 3, 2017 · 2ff2669 · 2ff2669
2 parents 3c6ee8c + 6ee74e0
commit 2ff2669
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/system/handlers/admin/DataManager.cfc b/system/handlers/admin/DataManager.cfc
@@ -1386,7 +1386,6 @@
 			getRecordsArgs.delete( "actionsView"     );
 			getRecordsArgs.delete( "useMultiActions" );
 			getRecordsArgs.delete( "isMultilingual"  );
-			getRecordsArgs.delete( "draftsEnabled"   );
 			getRecordsArgs.delete( "object"   );
 
 			if ( Len( Trim( rc.sFilterExpression ?: "" ) ) ) {

diff --git a/system/services/presideObjects/PresideObjectService.cfc b/system/services/presideObjects/PresideObjectService.cfc
@@ -2508,10 +2508,17 @@ component displayName="Preside Object Service" {
 	}
 
 	private string function _resolveObjectNameFromColumnJoinSyntax( required string startObject, required string joinSyntax ) {
-		return _getRelationshipGuidance().resolveRelationshipPathToTargetObject(
-			  sourceObject     = arguments.startObject
-			, relationshipPath = arguments.joinSyntax
-		);
+		variables._relationshipPathCalcCache = variables._relationshipPathCalcCache ?: {};
+		var cacheKey = arguments.startObject & arguments.joinSyntax;
+
+		if ( !_relationshipPathCalcCache.keyExists( cacheKey ) ) {
+			_relationshipPathCalcCache[ cacheKey ] = _getRelationshipGuidance().resolveRelationshipPathToTargetObject(
+				  sourceObject     = arguments.startObject
+				, relationshipPath = arguments.joinSyntax
+			);
+		}
+
+		return _relationshipPathCalcCache[ cacheKey ];
 	}
 
 	private struct function _prepareFilter(