Merge branch 'master' of https://github.com/vichan-devel/vichan

3 files changed, 6 insertions, 6 deletions

diff --git a/templates/post/image.html b/templates/post/image.html
index 818ccb57..16fe20b6 100644
--- a/templates/post/image.html
+++ b/templates/post/image.html
@@ -1,16 +1,16 @@
 <a href="
-	{% if post.file|extension == 'webm' %}
+	{% if post.file|extension == 'webm' or post.file|extension == 'mp4' %}
 		{{ config.root }}player.php?v={{ config.uri_img }}{{ post.file }}&amp;t={{ post.filename|e('url') }}&amp;loop=1
 	{% else %}
 		{{ config.uri_img }}{{ post.file }}
 	{% endif %}
 	"
 	 target="_blank"
-	{% if post.thumb == 'file' or post.modifiers['is_file'] == '1' or post.filename|extension == 'webm' %}
+	{% if post.thumb == 'file' or post.modifiers['is_file'] == '1' or post.filename|extension == 'webm' or post.file|extension == 'mp4' %}
 		 class="file"
 	{% endif %}
 >
-	{% if post.thumb|extension == 'webm' %}
+	{% if post.thumb|extension == 'webm' or post.thumb|extension == 'mp4' %}
 		<video autoplay class="post-image" src="{{ config.uri_thumb }}{{ post.thumb }}"
 			 poster="
 				{{ config.root }}
diff --git a/templates/post/image_identification.html b/templates/post/image_identification.html
index fa2f30b3..e6e14abc 100644
--- a/templates/post/image_identification.html
+++ b/templates/post/image_identification.html
@@ -8,7 +8,7 @@
 			<a href="http://regex.info/exif.cgi?url={{ config.domain }}{{ config.uri_img }}{{ file.file }}" target="_blank">Exif</a> 
 		{% endif %}
 		{% if config.image_identification_google %}
-			<a href="https://www.google.com/searchbyimage?image_url={{ config.domain }}{{ config.uri_img }}{{ file.file }}" target="_blank">Google</a>
+			<a href="https://www.google.com/searchbyimage?image_url={{ config.domain|url_encode }}{{ config.uri_img|url_encode }}{{ file.file|url_encode }}" target="_blank">Google</a> 
 		{% endif %}
 		{% if config.image_identification_iqdb %}
 			<a href="http://iqdb.org/?url={{ config.domain }}{{ config.uri_img }}{{ file.file }}" target="_blank">iqdb</a>
diff --git a/templates/post/name.html b/templates/post/name.html
index 13c676c7..e7f85f8b 100644
--- a/templates/post/name.html
+++ b/templates/post/name.html
@@ -1,5 +1,5 @@
 {% set capcode = post.capcode|capcode %}
-{% if post.email|length > 0 and (config.hide_sage!=true or post.email!='sage') %}
+{% if post.email|length > 0 and (config.hide_sage!=true or post.email!='sage') and config.hide_email!=true %}
 	{# start email #}
 	<a class="email" href="mailto:{{ post.email }}">
 {% endif %}
@@ -7,7 +7,7 @@
 	{% if post.trip|length > 0 %}
 		<span {% if capcode.trip %}style="{{ capcode.trip }}" {% endif %}class="trip">{{ post.trip }}</span>
 	{% endif %}
-{% if post.email|length > 0 %}
+{% if post.email|length > 0 and (config.hide_sage!=true or post.email!='sage') and config.hide_email!=true %}
 	{# end email #}
 	</a>
 {% endif %}