remove headlines overflow hack, made truncate_string() utf-8 aware

3 files changed, 5 insertions, 5 deletions

diff --git a/backend.php b/backend.php
index 3578871e6..4b3514254 100644
--- a/backend.php
+++ b/backend.php
@@ -1373,7 +1373,7 @@
 
 				if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
 					$content_preview = truncate_string(strip_tags($line["content_preview"]), 
-						200);
+						100);
 				}
 
 				if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
diff --git a/functions.php b/functions.php
index de5eb8a2e..f40ce7618 100644
--- a/functions.php
+++ b/functions.php
@@ -821,8 +821,8 @@
 	}
 
 	function truncate_string($str, $max_len) {
-		if (strlen($str) > $max_len) {
-			return substr($str, 0, $max_len) . "...";
+		if (mb_strlen($str) > $max_len - 3) {
+			return mb_substr($str, 0, $max_len) . "...";
 		} else {
 			return $str;
 		}
diff --git a/tt-rss.css b/tt-rss.css
index 092bbc7f2..39b52fd04 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -839,11 +839,11 @@ div.postHeader td.postDate {
 	display : none;
 }
 
-td.hlContent {
+/*td.hlContent {
 	overflow : hidden;
 	height : 1em;
 	display : block;
-}
+} */
 
 td.hlMarkedPic, td.hlSelectRow, td.hlUpdated, td.hlFeed {
 	height : 1em;