Merge branch 'develop' of https://github.com/friendica/friendica into develop

This commit is contained in:
Ralf Thees 2018-10-20 10:50:36 +02:00
commit a29073f006
2 changed files with 9 additions and 8 deletions

View file

@ -450,10 +450,6 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
Addon::callHooks('item_photo_menu', $args);
Addon::callHooks('jot_tool', $jotplugins);
### include/security.php
Addon::callHooks('logged_in', $a->user);
### include/text.php
Addon::callHooks('contact_block_end', $arr);
@ -693,6 +689,11 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
Addon::callHooks($a->module.'_post_'.$selname, $o);
Addon::callHooks('jot_networks', $jotnets);
### src/Core/Authentication.php
Addon::callHooks('logged_in', $a->user);
### src/Core/Worker.php
Addon::callHooks("proc_run", $arr);

View file

@ -226,10 +226,6 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
Addon::callHooks('item_photo_menu', $args);
Addon::callHooks('jot_tool', $jotplugins);
### include/security.php
Addon::callHooks('logged_in', $a->user);
### include/text.php
Addon::callHooks('contact_block_end', $arr);
@ -426,6 +422,10 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
Addon::callHooks('page_header', $a->page['nav']);
Addon::callHooks('nav_info', $nav);
### src/Core/Authentication.php
Addon::callHooks('logged_in', $a->user);
### src/Worker/Directory.php
Addon::callHooks('globaldir_update', $arr);