From acb57482215a7e5fcfb555459530ba54e66a6483 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 23 Apr 2014 00:34:34 +0200 Subject: [PATCH] Bugfixes: 1. When posting shared feeds to Diaspora, the link vanished/2. The profile name detection had problems with feeds --- include/bbcode.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 308cbf1be..d1cb1a911 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -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); }