fix bad merge on setAccessControlPolicy

coldbox-modules · Feb 16, 2021 · 3bff80f · 3bff80f
1 parent 0214d25
commit 3bff80f
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/models/AmazonS3.cfc b/models/AmazonS3.cfc
@@ -407,15 +407,6 @@ component accessors="true" singleton {
             amzHeaders = { "x-amz-acl" = arguments.acl }
         );
 
-		var grantsXML = xmlSearch( results.response, "//*[local-name()='Grant']" );
-		return arrayMap( grantsXML, function( node ) {
-			return {
-				"type"        : node.grantee.XMLAttributes[ "xsi:type" ],
-				"displayName" : "",
-				"permission"  : node.permission.XMLText,
-				"uri"         : node.grantee.XMLAttributes[ "xsi:type" ] == "Group" ? node.grantee.uri.xmlText : node.grantee.displayName.xmlText
-			};
-		} );
 	}
 
 	/**
@@ -441,6 +432,10 @@ component accessors="true" singleton {
 			"list-type" : 2
 		};
 
+        if ( len( arguments.prefix ) ) {
+            parameters[ "prefix" ] = arguments.prefix;
+        }
+
 		if ( len( arguments.marker ) ) {
 			parameters[ "marker" ] = arguments.marker;
 		}