Allow Diaspora to post to forums

diff --git a/boot.php b/boot.php
index 61deae18b73c06ac39f2b9d0b05411e4a9ef4b6c..b06c2d0bf411d6f2dd6f6763138d52b12c991052 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1215' );
+define ( 'FRIENDICA_VERSION',      '2.3.1216' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1115      );
 

diff --git a/include/items.php b/include/items.php
index a63468d925f9fef36f53cb52d466e6a9729130b5..0bd77582a52b428c516ae414cc7fdcdd9bdc4a56 100644 (file)
--- 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]);
                        }