Merge pull request #696 from annando/issue-3535

Don't use the GNU Social address if the connector isn't activated
This commit is contained in:
Tobias Diekershoff 2018-08-10 06:33:35 +02:00 committed by GitHub
commit d9a740d485
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -91,7 +91,9 @@ function statusnet_uninstall()
function statusnet_check_item_notification(App $a, &$notification_data) function statusnet_check_item_notification(App $a, &$notification_data)
{ {
if (PConfig::get($notification_data["uid"], 'statusnet', 'post')) {
$notification_data["profiles"][] = PConfig::get($notification_data["uid"], 'statusnet', 'own_url'); $notification_data["profiles"][] = PConfig::get($notification_data["uid"], 'statusnet', 'own_url');
}
} }
function statusnet_jot_nets(App $a, &$b) function statusnet_jot_nets(App $a, &$b)
@ -134,7 +136,7 @@ function statusnet_settings_post(App $a, $post)
PConfig::delete(local_user(), 'statusnet', 'mirror_posts'); PConfig::delete(local_user(), 'statusnet', 'mirror_posts');
PConfig::delete(local_user(), 'statusnet', 'import'); PConfig::delete(local_user(), 'statusnet', 'import');
PConfig::delete(local_user(), 'statusnet', 'create_user'); PConfig::delete(local_user(), 'statusnet', 'create_user');
PConfig::delete(local_user(), 'statusnet', 'own_id'); PConfig::delete(local_user(), 'statusnet', 'own_url');
} else { } else {
if (isset($_POST['statusnet-preconf-apiurl'])) { if (isset($_POST['statusnet-preconf-apiurl'])) {
/* * * /* * *