1
0
Fork 0

Merge remote-tracking branch 'upstream/develop' into item-permissions

This commit is contained in:
Michael 2018-01-20 19:51:23 +00:00
commit 745bc7cf3f
117 changed files with 1336 additions and 1249 deletions

View file

@ -15,6 +15,7 @@
* information.
*/
use Friendica\App;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Core\Worker;
@ -50,7 +51,8 @@ function item_post(App $a) {
killme();
}
call_hooks('post_local_start', $_REQUEST);
Addon::callHooks('post_local_start', $_REQUEST);
logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
$api_source = defaults($_REQUEST, 'api_source', false);
@ -637,7 +639,7 @@ function item_post(App $a) {
$datarray['object'] = $object;
/*
* These fields are for the convenience of plugins...
* These fields are for the convenience of addons...
* 'self' if true indicates the owner is posting on their own wall
* If parent is 0 it is a top-level post.
*/
@ -679,10 +681,10 @@ function item_post(App $a) {
killme();
}
call_hooks('post_local',$datarray);
Addon::callHooks('post_local',$datarray);
if (x($datarray, 'cancel')) {
logger('mod_item: post cancelled by plugin.');
logger('mod_item: post cancelled by addon.');
if ($return_path) {
goaway($return_path);
}
@ -792,7 +794,7 @@ function item_post(App $a) {
}
}
call_hooks('post_local_end', $datarray);
Addon::callHooks('post_local_end', $datarray);
if (strlen($emailcc) && $profile_uid == local_user()) {
$erecips = explode(',', $emailcc);