aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-20 01:40:09 -0700
committerredmatrix <git@macgirvin.com>2016-04-20 01:40:09 -0700
commit2641980ac2876bfe66bb24795dbea4d25483616d (patch)
tree43e8e8cd23f1da37cfade118b42df69cae5bc884 /include
parent21b0128e9ea53365b5e77955fb0e177b2b513c64 (diff)
downloadvolse-hubzilla-2641980ac2876bfe66bb24795dbea4d25483616d.tar.gz
volse-hubzilla-2641980ac2876bfe66bb24795dbea4d25483616d.tar.bz2
volse-hubzilla-2641980ac2876bfe66bb24795dbea4d25483616d.zip
bb2d updates from testing signature changes
Diffstat (limited to 'include')
-rw-r--r--include/bb2diaspora.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 98e421670..add580636 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -268,7 +268,7 @@ function bb2dmention_callback($match) {
}
-function bb2diaspora_itemwallwall(&$item, $newpost = false) {
+function bb2diaspora_itemwallwall(&$item) {
// We will provide wallwall (embedded author on the Diaspora side) if
// 1. It is a wall-to-wall post
@@ -289,7 +289,7 @@ function bb2diaspora_itemwallwall(&$item, $newpost = false) {
}
$has_meta = false;
- if((! $newpost) && ($item['diaspora_meta'] || get_iconfig($item,'diaspora','fields')))
+ if($item['diaspora_meta'] || get_iconfig($item,'diaspora','fields'))
$has_meta = true;
if($item['author_xchan'] != $item['owner_xchan']) {
@@ -318,7 +318,7 @@ function bb2diaspora_itemwallwall(&$item, $newpost = false) {
}
-function bb2diaspora_itembody($item, $force_update = false, $newpost = false) {
+function bb2diaspora_itembody($item, $force_update = false, $have_channel = false) {
if(! get_iconfig($item,'diaspora','fields')) {
@@ -361,8 +361,8 @@ function bb2diaspora_itembody($item, $force_update = false, $newpost = false) {
}
}
-
- bb2diaspora_itemwallwall($newitem, $newpost);
+ if(! $have_channel)
+ bb2diaspora_itemwallwall($newitem, $newpost);
$title = $newitem['title'];
$body = preg_replace('/\#\^http/i', 'http', $newitem['body']);