X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FImageLinkFilter.java;h=06a11d7da26e9e3ddf69f82c60aca67699e0d9cf;hp=1684be776d2f892dd03c88756933170156a64423;hb=0f7a91f4fa689a4084d7db5987a534b4b4fc3866;hpb=c513e3329a397d0ebc17fe672f41c7d9d21122c7 diff --git a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java index 1684be7..06a11d7 100644 --- a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java +++ b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java @@ -1,5 +1,5 @@ /* - * Sone - ImageLinkFilter.java - Copyright © 2011 David Roden + * Sone - ImageLinkFilter.java - Copyright © 2011–2012 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 @@ -65,23 +65,21 @@ public class ImageLinkFilter implements Filter { * {@inheritDoc} */ @Override - public Object format(TemplateContext templateContext, Object data, Map parameters) { + public Object format(TemplateContext templateContext, Object data, Map parameters) { Image image = null; if (data instanceof String) { image = core.getImage((String) data, false); } else if (data instanceof Image) { image = (Image) data; - } else { + } + if (image == null) { return null; } - String imageClass = parameters.get("class"); + String imageClass = String.valueOf(parameters.get("class")); int maxWidth = Numbers.safeParseInteger(parameters.get("max-width"), Integer.MAX_VALUE); int maxHeight = Numbers.safeParseInteger(parameters.get("max-height"), Integer.MAX_VALUE); String mode = String.valueOf(parameters.get("mode")); - String title = parameters.get("title"); - if ((title != null) && title.startsWith("=")) { - title = String.valueOf(templateContext.get(title.substring(1))); - } + String title = String.valueOf(parameters.get("title")); TemplateContext linkTemplateContext = templateContextFactory.createTemplateContext(); linkTemplateContext.set("class", imageClass);