Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 08:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some more notices (#5526)

Browse source 
* Some more notices

* Fixed nasty to find notice in DFRN and OStatus

* And more notices ...

* Yeah, some removed notices ... again ...
This commit is contained in:
Michael Vogel 2018-07-30 06:41:20 +02:00 • committed by Tobias Diekershoff
parent 6d39cecc5d
commit a2cea16954
10 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Content/Text/BBCode.php
View file

@ -585,7 +585,7 @@ class BBCode extends BaseObject
$return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']);
}
if ($data["description"] != "" && $data["description"] != $data["title"]) {
if (!empty($data["description"]) && $data["description"] != $data["title"]) {
// Sanitize the HTML by converting it to BBCode
$bbcode = HTML::toBBCode($data["description"]);
$return .= sprintf('<blockquote>%s</blockquote>', trim(self::convert($bbcode)));
@ -627,15 +627,15 @@ class BBCode extends BaseObject
}
// If the link already is included in the post, don't add it again
if (($data["url"] != "") && strpos($data["text"], $data["url"])) {
if (!empty($data["url"]) && strpos($data["text"], $data["url"])) {
return $data["text"] . $data["after"];
}
$text = $data["text"];
if (($data["url"] != "") && ($data["title"] != "")) {
if (!empty($data["url"]) && ($data["title"] != "")) {
$text .= "\n[url=" . $data["url"] . "]" . $data["title"] . "[/url]";
} elseif (($data["url"] != "")) {
} elseif (!empty($data["url"])) {
$text .= "\n[url]" . $data["url"] . "[/url]";
}