aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-01-20 23:16:12 -0800
committerredmatrix <git@macgirvin.com>2016-01-20 23:16:12 -0800
commit1d891984441fa2f4aa8e311191da23e9ddd6e928 (patch)
tree0a558e33ed4b77a56186721cf13844ba7b28af24 /mod
parent8c5d5b8e1c1bda6281af4cc291e3e391d590a9ce (diff)
downloadvolse-hubzilla-1d891984441fa2f4aa8e311191da23e9ddd6e928.tar.gz
volse-hubzilla-1d891984441fa2f4aa8e311191da23e9ddd6e928.tar.bz2
volse-hubzilla-1d891984441fa2f4aa8e311191da23e9ddd6e928.zip
issue #263 - account_default_channel not set to 0 when last channel of an account is removed
Diffstat (limited to 'mod')
-rw-r--r--mod/item.php21
1 files changed, 11 insertions, 10 deletions
diff --git a/mod/item.php b/mod/item.php
index f100c9dfe..fdc768c67 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -817,25 +817,26 @@ function item_post(&$a) {
dbesc($body)
);
- if($z && $z[0]['created'] > datetime_convert('UTC','UTC', 'now - 2 minutes')) {
- $datarray['cancel'] = 1;
- notice( t('Duplicate post suppressed.') . EOL);
- logger('Duplicate post. Faking plugin cancel.');
+ if($z) {
+ foreach($z as $zz) {
+ if($zz['created'] > datetime_convert('UTC','UTC', 'now - 2 minutes')) {
+ $datarray['cancel'] = 1;
+ notice( t('Duplicate post suppressed.') . EOL);
+ logger('Duplicate post. Faking plugin cancel.');
+ }
+ }
}
}
call_hooks('post_local',$datarray);
if(x($datarray,'cancel')) {
- logger('mod_item: post cancelled by plugin.');
- if($return_path) {
+ logger('mod_item: post cancelled by plugin or duplicate suppressed.');
+ if($return_path)
goaway($a->get_baseurl() . "/" . $return_path);
- }
$json = array('cancel' => 1);
- if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload']))
- $json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload'];
-
+ $json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload'];
echo json_encode($json);
killme();
}