Merge remote-tracking branch 'upstream/master'

inc/display.php

@@ -232,23 +232,11 @@ function truncate($body, $url, $max_lines = false, $max_chars = false) {
 	return $body;
 }
 
-function bidi_cleanup($str){
-	# Removes all embedded RTL and LTR unicode formatting blocks in a string so that
-	# it can be used inside another without controlling its direction.
-	# More info: http://www.iamcal.com/understanding-bidirectional-text/
-	#
-	# LRE - U+202A - 0xE2 0x80 0xAA
-	# RLE - U+202B - 0xE2 0x80 0xAB
-	# LRO - U+202D - 0xE2 0x80 0xAD
-	# RLO - U+202E - 0xE2 0x80 0xAE
-	#
-	# PDF - U+202C - 0xE2 0x80 0xAC
-	#
-	$explicits	= '\xE2\x80\xAA|\xE2\x80\xAB|\xE2\x80\xAD|\xE2\x80\xAE';
-	$pdf		= '\xE2\x80\xAC';
+function bidi_cleanup($str) {
+	// Removes all embedded RTL and LTR unicode formatting blocks in a string so that
+	// it can be used inside another without controlling its direction.
 
-	$str = preg_replace("!(?<explicits>$explicits)|(?<pdf>$pdf)!", '', $str);
-	return $str;
+	return "<bdi>$str</bdi>";
 }
 
 function secure_link_confirm($text, $title, $confirm_message, $href) {

install.php

@@ -1,7 +1,7 @@
 <?php
 
 // Installation/upgrade file	
-define('VERSION', 'v0.9.6-dev-12 + <a href="https://int.vichan.net/devel/">vichan-devel-4.0.10</a>');
+define('VERSION', 'v0.9.6-dev-12 + <a href="https://int.vichan.net/devel/">vichan-devel-4.0.11-gold</a>');
 
 require 'inc/functions.php';
 
@@ -376,6 +376,7 @@ if (file_exists($config['has_installed'])) {
 					$board['uri'])) or error(db_error());
 			}
 		case 'v0.9.6-dev-12':
+		case 'v0.9.6-dev-12 + <a href="https://int.vichan.net/devel/">vichan-devel-4.0.10</a>':
 		case false:
 			// Update version number
 			file_write($config['has_installed'], VERSION);
@@ -548,7 +549,7 @@ if ($step == 0) {
 		array(
 			'category' => 'Misc',
 			'name' => 'Tinyboard installed using git',
-			'result' => is_dir('.git.'),
+			'result' => is_dir('.git'),
 			'required' => false,
 			'message' => 'Tinyboard is still beta software and it\'s not going to come out of beta any time soon. As there are often many months between releases yet changes and bug fixes are very frequent, it\'s recommended to use the git repository to maintain your Tinyboard installation. Using git makes upgrading much easier.'
 		)

templates/post_reply.html

@@ -71,7 +71,7 @@
 			{% if config.show_filename and post.filename %}
 				, 
 				{% if post.filename|length > config.max_filename_display %}
-					<span class="postfilename" title="{{ post.filename|e|bidi_cleanup }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>
+					<span class="postfilename" title="{{ post.filename|e }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>
 				{% else %}
 					<span class="postfilename">{{ post.filename|e|bidi_cleanup }}</span>
 				{% endif %}

templates/post_thread.html

@@ -23,7 +23,7 @@
 		{% if config.show_filename and post.filename %}
 			, 
 			{% if post.filename|length > config.max_filename_display %}
-				<span class="postfilename" title="{{ post.filename|e|bidi_cleanup }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>
+				<span class="postfilename" title="{{ post.filename|e }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>
 			{% else %}
 				<span class="postfilename">{{ post.filename|e|bidi_cleanup }}</span>
 			{% endif %}