mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 23:55:19 +00:00
when matching sender against author and owner, find the "best identity" with which to compare all of them - in this case the sender did not get the same treatment as the others.
This commit is contained in:
parent
b031aa35b1
commit
dd7e51b496
2 changed files with 1 additions and 5 deletions
|
@ -1643,6 +1643,7 @@ class Libzot
|
|||
// If an upstream hop used ActivityPub, set the identities to zot6 nomadic identities where applicable
|
||||
// else things could easily get confused
|
||||
|
||||
$sender = Activity::find_best_identity($sender);
|
||||
$msg_arr['author_xchan'] = Activity::find_best_identity($msg_arr['author_xchan']);
|
||||
$msg_arr['owner_xchan'] = Activity::find_best_identity($msg_arr['owner_xchan']);
|
||||
|
||||
|
|
|
@ -11,12 +11,9 @@ class WebServer
|
|||
|
||||
public function run()
|
||||
{
|
||||
|
||||
|
||||
/*
|
||||
* Bootstrap the application, load configuration, load modules, load theme, etc.
|
||||
*/
|
||||
|
||||
require_once('boot.php');
|
||||
|
||||
if (file_exists('maintenance_lock') || file_exists('cache/maintenance_lock')) {
|
||||
|
@ -38,7 +35,6 @@ class WebServer
|
|||
* During installation, only permit the view module and setup module.
|
||||
* The view module is required to expand/replace variables in style.css
|
||||
*/
|
||||
|
||||
if (App::$module !== 'view') {
|
||||
App::$module = 'setup';
|
||||
}
|
||||
|
@ -48,7 +44,6 @@ class WebServer
|
|||
* update the DB schema whenever we push a new one out. It also checks to see if
|
||||
* any plugins have been added or removed and reacts accordingly.
|
||||
*/
|
||||
|
||||
check_config();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue