Skip to content

Commit aa6efe8

Browse files
committed
ACF compatibility var scoped variable conflicts with argument name
1 parent 0c1ed08 commit aa6efe8

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

packages/lib/cloudinary.cfc

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -24,59 +24,59 @@ component {
2424

2525
public string function getTransform(numeric width=0, numeric height=0, string crop="FitInside", string format=""){
2626

27-
var format = "fl_keep_iptc";
27+
var transform = "fl_keep_iptc";
2828
var pixels = "";
2929

3030
switch (lcase(arguments.crop)){
3131
case "forcesize":
3232
// Simply force the resize of the image into the width/height provided
33-
format = listappend(format,"c_scale");
33+
transform = listappend(transform,"c_scale");
3434

3535
if (arguments.width gt 0){
36-
format = listappend(format,"w_#arguments.width#");
36+
transform = listappend(transform,"w_#arguments.width#");
3737
}
3838

3939
if (arguments.height gt 0){
40-
format = listappend(format,"h_#arguments.height#");
40+
transform = listappend(transform,"h_#arguments.height#");
4141
}
4242

4343
break;
4444

4545
case "fitinside":
46-
format = listappend(format,"c_fit");
46+
transform = listappend(transform,"c_fit");
4747

4848
if (arguments.width gt 0){
49-
format = listappend(format,"w_#arguments.width#");
49+
transform = listappend(transform,"w_#arguments.width#");
5050
}
5151

5252
if (arguments.height gt 0){
53-
format = listappend(format,"h_#arguments.height#");
53+
transform = listappend(transform,"h_#arguments.height#");
5454
}
5555

5656
break;
5757

5858
case "croptofit":
59-
format = listappend(format,"c_fill");
59+
transform = listappend(transform,"c_fill");
6060

6161
if (arguments.width gt 0){
62-
format = listappend(format,"w_#arguments.width#");
62+
transform = listappend(transform,"w_#arguments.width#");
6363
}
6464

6565
if (arguments.height gt 0){
66-
format = listappend(format,"h_#arguments.height#");
66+
transform = listappend(transform,"h_#arguments.height#");
6767
}
6868

6969
break;
7070

7171
case "pad":
72-
format = listappend(format,"c_pad");
72+
transform = listappend(transform,"c_pad");
7373

7474
if (arguments.width gt 0){
75-
format = listappend(format,"w_#arguments.width#");
75+
transform = listappend(transform,"w_#arguments.width#");
7676
}
7777

7878
if (arguments.height gt 0){
79-
format = listappend(format,"h_#arguments.height#");
79+
transform = listappend(transform,"h_#arguments.height#");
8080
}
8181

8282
break;
@@ -90,43 +90,43 @@ component {
9090
case "bottomleft":
9191
case "bottomcenter":
9292
case "bottomright":
93-
format = listappend(format,"c_fill");
93+
transform = listappend(transform,"c_fill");
9494

9595
if (arguments.width gt 0){
96-
format = listappend(format,"w_#arguments.width#");
96+
transform = listappend(transform,"w_#arguments.width#");
9797
}
9898

9999
if (arguments.height gt 0){
100-
format = listappend(format,"h_#arguments.height#");
100+
transform = listappend(transform,"h_#arguments.height#");
101101
}
102102

103103
switch (arguments.crop){
104104
case "center":
105-
format = listappend(format,"g_faces:center");
105+
transform = listappend(transform,"g_faces:center");
106106
break;
107107
case "topleft":
108-
format = listappend(format,"g_north_west");
108+
transform = listappend(transform,"g_north_west");
109109
break;
110110
case "topcenter":
111-
format = listappend(format,"g_north");
111+
transform = listappend(transform,"g_north");
112112
break;
113113
case "topright":
114-
format = listappend(format,"g_north_east");
114+
transform = listappend(transform,"g_north_east");
115115
break;
116116
case "left":
117-
format = listappend(format,"g_west");
117+
transform = listappend(transform,"g_west");
118118
break;
119119
case "right":
120-
format = listappend(format,"g_east");
120+
transform = listappend(transform,"g_east");
121121
break;
122122
case "bottomleft":
123-
format = listappend(format,"g_south_west");
123+
transform = listappend(transform,"g_south_west");
124124
break;
125125
case "bottomcenter":
126-
format = listappend(format,"g_south");
126+
transform = listappend(transform,"g_south");
127127
break;
128128
case "bottomright":
129-
format = listappend(format,"g_south_east");
129+
transform = listappend(transform,"g_south_east");
130130
break;
131131
}
132132

@@ -137,30 +137,30 @@ component {
137137
pixels = listtoarray(arguments.crop,",-");
138138

139139
// crop to selected section
140-
format = listappend(format,"x_#pixels[1]#,y_#pixels[2]#,w_#pixels[3]-pixels[1]#,h_#pixels[4]-pixels[2]#,c_crop");
140+
transform = listappend(transform,"x_#pixels[1]#,y_#pixels[2]#,w_#pixels[3]-pixels[1]#,h_#pixels[4]-pixels[2]#,c_crop");
141141

142142
// resize selected section to required size
143-
format = format & "/c_fit";
143+
transform = transform & "/c_fit";
144144

145145
if (arguments.Width gt 0){
146-
format = listappend(format,"w_#arguments.width#");
146+
transform = listappend(transform,"w_#arguments.width#");
147147
}
148148

149149
if (arguments.Height gt 0){
150-
format = listappend(format,"h_#arguments.height#");
150+
transform = listappend(transform,"h_#arguments.height#");
151151
}
152152
}
153153
}
154154

155155
switch (arguments.format){
156156
case "png":
157-
format = listappend(format,"f_png");
157+
transform = listappend(transform,"f_png");
158158
break;
159159
case "auto":
160-
format = listappend(format, "f_auto");
160+
transform = listappend(transform, "f_auto");
161161
}
162162

163-
return format;
163+
return transform;
164164
}
165165

166166
public struct function getURLInformation(required string file) {

0 commit comments

Comments
 (0)