friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #3724 from annando/plaintext 

Better content detection for posts to Twitter
This commit is contained in:
Tobias Diekershoff 2017-09-24 07:23:47 +02:00 committed by GitHub
parent c72d85333b aeb6e53d02
commit d6d1ee9112
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/plaintext.php
View File

@ -245,13 +245,19 @@ function get_attached_data($body) {
} }
} }
if (preg_match_all("(\[url\]([$URLSearchString]*)\[\/url\])ism", $body, $links, PREG_SET_ORDER)) { preg_match_all("(\[url\]([$URLSearchString]*)\[\/url\])ism", $body, $links1, PREG_SET_ORDER);
if (count($links) == 1) { preg_match_all("(\[url\=([$URLSearchString]*)\].*?\[\/url\])ism", $body, $links2, PREG_SET_ORDER);
$post["type"] = "text";
$post["url"] = $links[0][1]; $links = array_merge($links1, $links2);
$post["text"] = $body;
} if (count($links) == 1) {
$post["url"] = $links[0][1];
} }
if (count($links) > 0) {
unset($post["type"]);
}
if (!isset($post["type"])) { if (!isset($post["type"])) {
$post["type"] = "text"; $post["type"] = "text";
$post["text"] = trim($body); $post["text"] = trim($body);