Skip to content

Commit

Permalink
Revert ? encoding fixes (fix ripper234#9, fix ripper234#2)
Browse files Browse the repository at this point in the history
Bring back fixes introduced in commit 8ed8c6b.
  • Loading branch information
AstroCB committed Apr 19, 2015
1 parent 3461ab0 commit 9406d99
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions app/controllers/Application.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.google.gson.GsonBuilder;
import org.apache.commons.lang.StringUtils;
import org.yaml.snakeyaml.util.UriEncoder;
import play.libs.F;
import play.libs.WS;
import play.mvc.*;
Expand Down Expand Up @@ -38,8 +37,7 @@ public static void index() {
}

public static void get(String url, final String callback) {
final String encodedUrl = UriEncoder.encode(url);
F.Promise<WS.HttpResponse> remoteCall = WS.url(encodedUrl).getAsync();
F.Promise<WS.HttpResponse> remoteCall = WS.url(url).getAsync();

await(remoteCall, new F.Action<WS.HttpResponse>() {
public void invoke(WS.HttpResponse result) {
Expand Down Expand Up @@ -77,4 +75,4 @@ public static String sanitizeJsonpParam(String s) {
if (!s.matches("^jsonp\\d+$")) return null;
return s;
}
}
}

0 comments on commit 9406d99

Please sign in to comment.