Merge branch 'develop' into improvement/move-app-to-src-2

[friendica.git] / include / plaintext.php

diff --git a/include/plaintext.php b/include/plaintext.php
index d98d736550469225f226b6fbc7341065b9b43fef..215d9f3db726a2e722a2da8f67400462c61fd08c 100644 (file)
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -4,7 +4,8 @@
  * @file include/plaintext.php
  */
 
-use \Friendica\ParseUrl;
+use Friendica\App;
+use Friendica\ParseUrl;
 
 require_once("include/Photo.php");
 require_once("include/bbcode.php");
@@ -63,6 +64,10 @@ function get_old_attachment_data($body) {
                                $post["url"] = $matches[1];
                                $post["title"] = $matches[2];
                        }
+                       if (($post["url"] == "") AND (in_array($post["type"], array("link", "video")))
+                               AND preg_match("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) {
+                               $post["url"] = $matches[1];
+                       }
 
                        // Search for description
                        if (preg_match("/\[quote\](.*?)\[\/quote\]/ism", $attacheddata, $matches))
@@ -268,12 +273,13 @@ function shortenmsg($msg, $limit, $twitter = false) {
        $lines = explode("\n", $msg);
        $msg = "";
        $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
+       $ellipsis = html_entity_decode("…", ENT_QUOTES, 'UTF-8');
        foreach ($lines AS $row=>$line) {
                if (iconv_strlen(trim($msg."\n".$line), "UTF-8") <= $limit)
                        $msg = trim($msg."\n".$line);
                // 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 = iconv_substr(iconv_substr(trim($msg."\n".$line), 0, $limit, "UTF-8"), 0, -3, "UTF-8")."...";
+                       $msg = iconv_substr(iconv_substr(trim($msg."\n".$line), 0, $limit, "UTF-8"), 0, -3, "UTF-8").$ellipsis;
                else
                        break;
        }
@@ -292,7 +298,7 @@ function shortenmsg($msg, $limit, $twitter = false) {
  *
  * @return string The converted message
  */
-function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") {
+function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") {
 
        // Remove the hash tags
        $URLSearchString = "^\[\]";
@@ -426,4 +432,3 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $t
 
        return($post);
 }
-?>