diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-11-01 12:08:59 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-11-01 12:08:59 +0100 |
| commit | 11cdc36bcc7414002c2e72fd0c45d285d9515f0c (patch) | |
| tree | ffcb15dd536800b67c9918756e41bb4accde3320 /include | |
| parent | b28ff509b1f7c95ac723fb1b2a20929da2ba7d3d (diff) | |
| parent | 22d45a8d1ecfa0a0a2b8429ec3233e7099e84b66 (diff) | |
| download | volse-hubzilla-11cdc36bcc7414002c2e72fd0c45d285d9515f0c.tar.gz volse-hubzilla-11cdc36bcc7414002c2e72fd0c45d285d9515f0c.tar.bz2 volse-hubzilla-11cdc36bcc7414002c2e72fd0c45d285d9515f0c.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/nav.php | 2 | ||||
| -rw-r--r-- | include/queue_fn.php | 12 | ||||
| -rw-r--r-- | include/zot.php | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/include/nav.php b/include/nav.php index 89947e270..af0ebbae2 100644 --- a/include/nav.php +++ b/include/nav.php @@ -312,7 +312,7 @@ EOT; '$pleasewait' => t('Please wait...'), '$nav_apps' => $nav_apps, '$navbar_apps' => $navbar_apps, - '$channel_menu' => get_config('system','channel_menu'), + '$channel_menu' => get_pconfig(App::$profile_uid,'system','channel_menu',get_config('system','channel_menu')), '$channel_thumb' => ((App::$profile) ? App::$profile['thumb'] : ''), '$channel_apps' => $channel_apps, '$addapps' => t('Add Apps'), diff --git a/include/queue_fn.php b/include/queue_fn.php index c9179b953..c09033d0a 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -158,6 +158,16 @@ function queue_deliver($outq, $immediate = false) { } } + if($immediate) { + $x = q("select count(outq_hash) as total from outq where outq_delivered = 0"); + if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',300))) { + logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO); + update_queue_item($outq['outq_hash']); + return; + } + } + + $arr = array('outq' => $outq, 'base' => $base, 'handled' => false, 'immediate' => $immediate); call_hooks('queue_deliver',$arr); if($arr['handled']) @@ -205,7 +215,7 @@ function queue_deliver($outq, $immediate = false) { else { logger('deliver: queue post returned ' . $result['return_code'] . ' from ' . $outq['outq_posturl'],LOGGER_DEBUG); - update_queue_item($outq['outq_posturl']); + update_queue_item($outq['outq_hash']); } return; } diff --git a/include/zot.php b/include/zot.php index dad30dbb0..5270ed8b8 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3649,6 +3649,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { $disallowed = array('id','aid','uid','guid'); foreach($arr['profile'] as $profile) { + $x = q("select * from profile where profile_guid = '%s' and uid = %d limit 1", dbesc($profile['profile_guid']), intval($channel['channel_id']) @@ -3671,6 +3672,9 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { if(in_array($k,$disallowed)) continue; + if($profile['is_default'] && in_array($k,['photo','thumb'])) + continue; + if($k === 'name') $clean['fullname'] = $v; elseif($k === 'with') |