From dcb42a52cb89742f4c4e7805a6c615e598645a97 Mon Sep 17 00:00:00 2001 From: Michael Foster Date: Mon, 19 Aug 2013 04:24:07 +1000 Subject: [PATCH 1/4] typo --- install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.php b/install.php index eb4f031a..a510631e 100644 --- a/install.php +++ b/install.php @@ -536,7 +536,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.' ) From d2fdeead6408743b7d69bd098ea3c23358bfd395 Mon Sep 17 00:00:00 2001 From: Michael Foster Date: Mon, 19 Aug 2013 05:19:54 +1000 Subject: [PATCH 2/4] bidi_cleanup: Just replace with HTML5's (for now, at least). The old code was hardly working, and had issued with older PHP versions. --- inc/display.php | 22 ++++++---------------- templates/post_reply.html | 2 +- templates/post_thread.html | 2 +- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/inc/display.php b/inc/display.php index 23794052..09c75a42 100644 --- a/inc/display.php +++ b/inc/display.php @@ -218,23 +218,13 @@ 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'; +// int(1607)int(1584)int(1575)int(32)int(1575)int(1582)int(1578)int(1576)int(1575)int(1585)int(46) - $str = preg_replace("!(?$explicits)|(?$pdf)!", '', $str); - return $str; +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. + + return "$str"; } function secure_link_confirm($text, $title, $confirm_message, $href) { diff --git a/templates/post_reply.html b/templates/post_reply.html index bc3d36cd..28cbd7f8 100644 --- a/templates/post_reply.html +++ b/templates/post_reply.html @@ -71,7 +71,7 @@ {% if config.show_filename and post.filename %} , {% if post.filename|length > config.max_filename_display %} - {{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }} + {{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }} {% else %} {{ post.filename|e|bidi_cleanup }} {% endif %} diff --git a/templates/post_thread.html b/templates/post_thread.html index d5d6016e..0ee3f6fa 100644 --- a/templates/post_thread.html +++ b/templates/post_thread.html @@ -23,7 +23,7 @@ {% if config.show_filename and post.filename %} , {% if post.filename|length > config.max_filename_display %} - {{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }} + {{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }} {% else %} {{ post.filename|e|bidi_cleanup }} {% endif %} From c8fcba943958f736582838591f5632cb214e0f15 Mon Sep 17 00:00:00 2001 From: Michael Foster Date: Mon, 19 Aug 2013 05:22:08 +1000 Subject: [PATCH 3/4] disregard --- inc/display.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/inc/display.php b/inc/display.php index 09c75a42..6fa97f4f 100644 --- a/inc/display.php +++ b/inc/display.php @@ -218,8 +218,6 @@ function truncate($body, $url, $max_lines = false, $max_chars = false) { return $body; } -// int(1607)int(1584)int(1575)int(32)int(1575)int(1582)int(1578)int(1576)int(1575)int(1585)int(46) - 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. From ccfc1501afd678f1e7e5e1c853f1ad2584e90a36 Mon Sep 17 00:00:00 2001 From: czaks Date: Sun, 18 Aug 2013 22:11:41 -0400 Subject: [PATCH 4/4] tag for vichan-devel-4.0.11-gold --- install.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install.php b/install.php index 8bef9e11..47c277ff 100644 --- a/install.php +++ b/install.php @@ -1,7 +1,7 @@ vichan-devel-4.0.10'); +define('VERSION', 'v0.9.6-dev-12 + vichan-devel-4.0.11-gold'); 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 + vichan-devel-4.0.10': case false: // Update version number file_write($config['has_installed'], VERSION);