Merge remote-tracking branch 'upstream/master'

This commit is contained in:
ctrlcctrlv 2013-08-19 13:21:25 +00:00
commit db5ce2cb8f
4 changed files with 9 additions and 20 deletions

View file

@ -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) {