From 86f2eb005f924769192876eabdece84e527f2cdb Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 26 Aug 2015 22:46:59 +0200 Subject: [PATCH] There seems to be a problem with the function to add all friends of a GNU Social account. So it is deactivated by now. --- include/ostatus.php | 1 + mod/settings.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/ostatus.php b/include/ostatus.php index a086177a7a..d39059eb6f 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -26,6 +26,7 @@ function ostatus_check_follow_friends() { } } +// This function doesn't work reliable by now. function ostatus_follow_friends($uid, $url) { $contact = probe_url($url); diff --git a/mod/settings.php b/mod/settings.php index cddabcb8b2..3a07e714d0 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -189,7 +189,7 @@ function settings_post(&$a) { if(x($_POST, 'general-submit')) { set_pconfig(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening'])); set_pconfig(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow'])); - set_pconfig(local_user(), 'system', 'ostatus_legacy_contact', $_POST['legacy_contact']); + //set_pconfig(local_user(), 'system', 'ostatus_legacy_contact', $_POST['legacy_contact']); } elseif(x($_POST, 'imap-submit')) { $mail_server = ((x($_POST,'mail_server')) ? $_POST['mail_server'] : ''); @@ -770,6 +770,8 @@ function settings_content(&$a) { $settings_connectors .= ''.t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.').''; $settings_connectors .= ''; + /* + // Deactivated by now - it doesn't seem to work reliable $legacy_contact = get_pconfig(local_user(), 'system', 'ostatus_legacy_contact'); $settings_connectors .= '
'; @@ -777,6 +779,7 @@ function settings_content(&$a) { $settings_connectors .= ''; $settings_connectors .= ''.t('If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.').''; $settings_connectors .= '
'; + */ $settings_connectors .= '
';