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

diff --git a/backend.php b/backend.php
index 3578871e6a8d5bd793f632b6842a0892bf0d8c3a..4b3514254f286b190bad174dc98137469601733c 100644 (file)
--- 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 de5eb8a2ec50e51aebd2ec6d19bddc1a849a9ab3..f40ce7618461c2f1d4aa2eca018b2a134628a836 100644 (file)
--- 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 092bbc7f2d4b8b9f9d441f894329ac153cbf8827..39b52fd04dbbc64747767329a3ca451bd51e9631 100644 (file)
--- 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;