X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSubstringFilter.java;h=f14d0ffa8da791f0363c703c7b68bd9e1b29e3e5;hp=857017c5742f6fce9053bb13268c49548babef73;hb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae;hpb=13e00a0611cd80e43f813171d8b6d84870afbcbc

diff --git a/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java b/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java
index 857017c..f14d0ff 100644
--- a/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SubstringFilter.java - Copyright © 2010 David Roden
+ * Sone - SubstringFilter.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,9 +37,9 @@ public class SubstringFilter implements Filter {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Object format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
-		String startString = parameters.get("start");
-		String lengthString = parameters.get("length");
+	public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
+		String startString = String.valueOf(parameters.get("start"));
+		String lengthString = String.valueOf(parameters.get("length"));
 		int start = 0;
 		try {
 			start = Integer.parseInt(startString);
@@ -48,13 +48,7 @@ public class SubstringFilter implements Filter {
 		}
 		String dataString = String.valueOf(data);
 		int dataLength = dataString.length();
-		if (lengthString == null) {
-			if (start < 0) {
-				return dataString.substring(dataLength + start);
-			}
-			return dataString.substring(start);
-		}
-		int length = Integer.MAX_VALUE;
+		int length = dataLength;
 		try {
 			length = Integer.parseInt(lengthString);
 		} catch (NumberFormatException nfe1) {