clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4596 from annando/attachment-encode 

Attachment encode
This commit is contained in:
Hypolite Petovan 2018-03-14 18:59:25 -04:00 committed by GitHub
parent 65b0159282 4ba3ba391a
commit d376ed6f61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Content/Text/BBCode.php
View File

@ -25,6 +25,7 @@ use Friendica\Util\ParseUrl;
require_once "include/event.php"; require_once "include/event.php";
require_once "include/html2plain.php"; require_once "include/html2plain.php";
require_once "include/html2bbcode.php";
require_once "mod/proxy.php"; require_once "mod/proxy.php";
class BBCode class BBCode
@ -705,9 +706,10 @@ class BBCode
} }
if ($data["description"] != "" && $data["description"] != $data["title"]) { if ($data["description"] != "" && $data["description"] != $data["title"]) {
$return .= sprintf('<blockquote>%s</blockquote>', trim(BBCode::convert($data["description"]))); // Sanitize the HTML by converting it to BBCode
$bbcode = html2bbcode($data["description"]);
$return .= sprintf('<blockquote>%s</blockquote>', trim(self::convert($bbcode)));
} }
if ($data["type"] == "link") { if ($data["type"] == "link") {
$return .= sprintf('<sup><a href="%s">%s</a></sup>', $data['url'], parse_url($data['url'], PHP_URL_HOST)); $return .= sprintf('<sup><a href="%s">%s</a></sup>', $data['url'], parse_url($data['url'], PHP_URL_HOST));
} }