Merge remote-tracking branch 'upstream/develop' into 1605-bugfix-notificatoon

[friendica.git] / include / plaintext.php

diff --git a/include/plaintext.php b/include/plaintext.php
index 39eed5111e12abca8523b7e6370b60c9a9a16d07..92ba8a27564bc9f0b182f6f96a92239528b3314f 100644 (file)
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -116,6 +116,8 @@ function get_attachment_data($body) {
        if ($matches[1] != "")
                $url = $matches[1];
 
+       $url = html_entity_decode($url, ENT_QUOTES, 'UTF-8');
+
        if ($url != "")
                $data["url"] = $url;
 
@@ -128,10 +130,9 @@ function get_attachment_data($body) {
        if ($matches[1] != "")
                $title = $matches[1];
 
-       //$title = htmlentities($title, ENT_QUOTES, 'UTF-8', false);
        $title = bbcode(html_entity_decode($title, ENT_QUOTES, 'UTF-8'), false, false, true);
+       $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
        $title = str_replace(array("[", "]"), array("[", "]"), $title);
-
        if ($title != "")
                $data["title"] = $title;
 
@@ -343,7 +344,7 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $t
                }
        }
 
-       $html = bbcode($post["text"], false, false, $htmlmode);
+       $html = bbcode($post["text"].$post["after"], false, false, $htmlmode);
        $msg = html2plain($html, 0, true);
        $msg = trim(html_entity_decode($msg,ENT_QUOTES,'UTF-8'));