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

1 files changed, 4 insertions, 16 deletions

diff --git a/inc/display.php b/inc/display.php
index d16b12aa..02668e40 100644
--- a/inc/display.php
+++ b/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) {