aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2014-11-20 11:16:13 -0800
committerHabeas Codice <habeascodice@federated.social>2014-11-20 11:16:13 -0800
commit5ad79e3f044a3ac5647909bff77d0954fbf96c0f (patch)
tree756e352064e872f233e9cf167a1cc36189162bdc /include
parente3b0b5ed52a2ad4f3cdd0c8cd1911a5345e50586 (diff)
parent7a1b345bc2b4ef6d7f9e1c37a3e3ab689ebc6fb0 (diff)
downloadvolse-hubzilla-5ad79e3f044a3ac5647909bff77d0954fbf96c0f.tar.gz
volse-hubzilla-5ad79e3f044a3ac5647909bff77d0954fbf96c0f.tar.bz2
volse-hubzilla-5ad79e3f044a3ac5647909bff77d0954fbf96c0f.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include')
-rwxr-xr-xinclude/diaspora.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index b4f20528d..e494aac0f 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1395,7 +1395,12 @@ function diaspora_comment($importer,$xml,$msg) {
$datarray['body'] = $body;
- $datarray['app'] = 'Diaspora';
+ if(strstr($person['xchan_network'],'friendica'))
+ $app = 'Friendica';
+ else
+ $app = 'Diaspora';
+
+ $datarray['app'] = $app;
if(! $parent_author_signature) {
$key = get_config('system','pubkey');