Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts:
	inc/display.php

2 files changed, 4 insertions, 4 deletions

diff --git a/templates/post_reply.html b/templates/post_reply.html
index 518a8edf..65fd576c 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -62,8 +62,8 @@
 				Spoiler Image, 
 			{% endif %}
 			{{ post.filesize|filesize }}
-			{% if post.filex and post.filey %}
-				, {{ post.filex}}x{{ post.filey }}
+			{% if post.filewidth and post.fileheight %}
+				, {{ post.filewidth}}x{{ post.fileheight }}
 				{% if config.show_ratio %}
 					, {{ post.ratio }}
 				{% endif %}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index dc788082..adc3b64e 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -14,8 +14,8 @@
 			{% trans %}Spoiler Image{% endtrans %}, 
 		{% endif %}
 		{{ post.filesize|filesize }}
-		{% if post.filex and post.filey %}
-			, {{ post.filex}}x{{ post.filey }}
+		{% if post.filewidth and post.fileheight %}
+			, {{ post.filewidth}}x{{ post.fileheight }}
 			{% if config.show_ratio %}
 				, {{ post.ratio }}
 			{% endif %}