Merge remote-tracking branch 'remotes/friendica/master' into moveme

This commit is contained in:
Fabrixxm 2012-11-05 09:37:58 +01:00
commit 5b4944fe8e
126 changed files with 1348 additions and 1249 deletions

View file

@ -3958,10 +3958,10 @@ function drop_item($id,$interactive = true) {
// send the notification upstream/downstream as the case may be
proc_run('php',"include/notifier.php","drop","$drop_id");
if(! $interactive)
return $owner;
proc_run('php',"include/notifier.php","drop","$drop_id");
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
//NOTREACHED
}