Improvement for shortening of the new plaintext option.

diff --git a/include/html2plain.php b/include/html2plain.php
index 0398ea79b074159ff9fa2efa4e8b3ea7761eb492..f09087e0b0179fab68fb4e42328ba5037dbabf61 100644 (file)
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -114,11 +114,11 @@ function html2plain($html, $wraplength = 75, $compact = false)
        $message = str_replace("\r", "", $html);
 
        // replace all hashtag addresses
-       if (get_config("system", "remove_hashtags_on_export")) {
+/*     if (get_config("system", "remove_hashtags_on_export")) {
                $pattern = '/#<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
                $message = preg_replace($pattern, '#$2', $message);
        }
-
+*/
        $doc = new DOMDocument();
        $doc->preserveWhiteSpace = false;
 
@@ -185,8 +185,8 @@ function html2plain($html, $wraplength = 75, $compact = false)
        node2bbcode($doc, 'h6', array(), "\n\n*", "*\n");
 
        // Problem: there is no reliable way to detect if it is a link to a tag or profile
-       //node2bbcode($doc, 'a', array('href'=>'/(.+)/'), ' $1 ', '', true);
-       node2bbcode($doc, 'a', array('href'=>'/(.+)/', 'rel'=>'oembed'), ' $1 ', '', true);
+       //node2bbcode($doc, 'a', array('href'=>'/(.+)/'), ' $1 ', ' ', true);
+       //node2bbcode($doc, 'a', array('href'=>'/(.+)/', 'rel'=>'oembed'), ' $1 ', '', true);
        //node2bbcode($doc, 'img', array('alt'=>'/(.+)/'), '$1', '');
        //node2bbcode($doc, 'img', array('title'=>'/(.+)/'), '$1', '');
        //node2bbcode($doc, 'img', array(), '', '');

diff --git a/include/plaintext.php b/include/plaintext.php
index 0c985e05c05a6a489006260449081abcbc1be796..76bcaa1f9a769f9e6995c764c961d68f5f1037f8 100644 (file)
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -168,6 +168,8 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false) {
                                // Is the new message empty by now or is it a reshared message?
                                elseif (($msg == "") OR (($row == 1) AND (substr($msg, 0, 4) == $recycle)))
                                        $msg = substr(substr(trim($msg."\n".$line), 0, $limit), 0, -3)."...";
+                               else
+                                       break;
                        }
                }
        }