aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-01-04 13:50:12 -0800
committerfriendica <info@friendica.com>2012-01-04 13:50:12 -0800
commitc1cf6e48c225725c380472e1f730f6dc02917ecd (patch)
tree62d94c563ac1a8e719f64b64e576f7e4e26d9dc2 /include
parent48a5a2484e762a9804237ae28c24dafe5db7f953 (diff)
downloadvolse-hubzilla-c1cf6e48c225725c380472e1f730f6dc02917ecd.tar.gz
volse-hubzilla-c1cf6e48c225725c380472e1f730f6dc02917ecd.tar.bz2
volse-hubzilla-c1cf6e48c225725c380472e1f730f6dc02917ecd.zip
Allow Diaspora to post to forums
Diffstat (limited to 'include')
-rw-r--r--include/items.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index a63468d92..0bd77582a 100644
--- a/include/items.php
+++ b/include/items.php
@@ -945,10 +945,15 @@ function tgroup_deliver($uid,$item_id) {
$link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
+ // Diaspora uses their own hardwired link URL in @-tags
+ // instead of the one we supply with webfinger
+
+ $dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
+
$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
- if(link_compare($link,$mtch[1])) {
+ if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
$deliver_to_tgroup = true;
logger('tgroup_deliver: local group mention found: ' . $mtch[2]);
}