Merge branch 'hotfix_diaspora' into develop

This commit is contained in:
Fabrixxm 2016-01-20 08:50:18 +01:00
commit 7e83ba090f
4 changed files with 41 additions and 48 deletions

View file

@ -535,7 +535,7 @@ function notifier_run(&$argv, &$argc){
if($public_message) {
if (!$followup)
if (!$followup AND $top_level)
$r0 = diaspora_fetch_relay();
else
$r0 = array();