return($username." (".$diaspora.")");
}
+ $red = preg_replace("=https?://(.*)/channel/(.*)=ism", "$2@$1", $profile);
+ if ($red != $profile) {
+ if ($getnetwork)
+ // red is identified as Diaspora - friendica can't connect directly to it
+ return(NETWORK_DIASPORA);
+ elseif ($compact)
+ return($red);
+ else
+ return($username." (".$red.")");
+ }
+
$StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile);
if ($StatusnetHost != $profile) {
$StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile);
}
function bb_expand_links($match) {
- if (stristr($match[2], $match[3]) OR ($match[2] == $match[3]))
+ if (($match[3] == "") OR ($match[2] == $match[3]) OR stristr($match[2], $match[3]))
return ($match[1]."[url]".$match[2]."[/url]");
else
return ($match[1].$match[3]." [url]".$match[2]."[/url]");