X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FRequestChangeFilter.java;h=fb3171923a67ac94b5d3281a946c74915ceda4c6;hb=7755990dfedede27bb6422de66e27b484255a1ad;hp=d9c453ee3787e003e3b66d50e3d9e84b89934d33;hpb=8c8acd50782b5d64b2a5a57fe8f9a4c2385203fd;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java b/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
index d9c453e..fb31719 100644
--- a/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
@@ -27,8 +27,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import net.pterodactylus.sone.web.page.Page.Request;
-import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Filter;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * This filter expects a {@link Request} as input and outputs a {@link URI} that
@@ -44,13 +44,17 @@ public class RequestChangeFilter implements Filter {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Object format(DataProvider dataProvider, Object data, Map<String, String> parameters) {
+	public Object format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
 		Request request = (Request) data;
 		String name = parameters.get("name");
+		String nameKey = parameters.get("nameKey");
+		if (nameKey != null) {
+			name = String.valueOf(templateContext.get(nameKey));
+		}
 		String key = parameters.get("key");
 		String value = null;
 		if (key != null) {
-			value = String.valueOf(dataProvider.getData(key));
+			value = String.valueOf(templateContext.get(key));
 		}
 		if (value == null) {
 			value = parameters.get("value");
@@ -80,7 +84,6 @@ public class RequestChangeFilter implements Filter {
 				questionMark = oldUri.length();
 			}
 			URI u = new URI(oldUri.substring(0, questionMark) + query.toString());
-			System.out.println("u: " + u);
 			return u;
 		} catch (UnsupportedEncodingException uee1) {
 			/* UTF-8 not supported? I don’t think so. */