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

Merge pull request #940 from annando/master 

Bugfixes: 1. When posting shared feeds to Diaspora, the link vanished/2. The profile name detection had problems with feeds
This commit is contained in:
fabrixxm 2014-04-23 08:42:48 +02:00
parent 22c45b9bf1 acb5748221
commit b09f2f0a5d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/bbcode.php
View File

@ -55,8 +55,8 @@ function bb_cleanup_share($shared) {
if (strpos($shared[1],$title) !== false)
$title = "";
if (strpos($shared[1],$link) !== false)
$link = "";
// if (strpos($shared[1],$link) !== false)
// $link = "";
$text = trim($shared[1]);
@ -555,10 +555,13 @@ function GetProfileUsername($profile, $username) {
}
}
// To-Do: Better check for pumpio
$pumpio = preg_replace("=https?://([^/]*).*/(\w*)=ism", "$2@$1", $profile);
if ($pumpio != $profile)
return($username." (".$pumpio.")");
// pumpio (http://host.name/user)
$rest = preg_replace("=https?://([\.\w]+)/([\.\w]+)(.*)=ism", "$3", $profile);
if ($rest == "") {
$pumpio = preg_replace("=https?://([\.\w]+)/([\.\w]+)(.*)=ism", "*$2@$1*", $profile);
if ($pumpio != $profile)
return($username." (".$pumpio.")");
}
return($username);
}