tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #4434 from annando/api-no-attachments

Browse source 
Use a more simple HTML for API output
This commit is contained in:
Hypolite Petovan 2018-02-10 09:22:11 -05:00 committed by GitHub
parent 8b557c3157 30cfca40d8
commit d3034b703a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/api.php
View file

@ -2647,7 +2647,7 @@ function api_convert_item($item)
$statustext = substr($statustext, 0, 1000)."... \n".$item["plink"]; $statustext = substr($statustext, 0, 1000)."... \n".$item["plink"];
} }
$statushtml = trim(bbcode($body, false, false)); $statushtml = bbcode(api_clean_attachments($body), false, false);
// Workaround for clients with limited HTML parser functionality // Workaround for clients with limited HTML parser functionality
$search = ["<br>", "<blockquote>", "</blockquote>", $search = ["<br>", "<blockquote>", "</blockquote>",

2
src/Protocol/DFRN.php
View file

@ -2412,7 +2412,7 @@ class DFRN
// Is there an existing item? // Is there an existing item?
if (DBM::is_result($current) && !self::isEditedTimestampNewer($current[0], $item)) { if (DBM::is_result($current) && !self::isEditedTimestampNewer($current[0], $item)) {
logger("Item ".$item["uri"]." already existed in this version.", LOGGER_DEBUG); logger("Item ".$item["uri"]." (".$item['edited'].") already existed.", LOGGER_DEBUG);
return; return;
} }