Merge pull request #1862 from tobiasd/20150827-littlelessdebug

commented out a debugging call that produced a bit too much noise in t…

diff --git a/include/ostatus.php b/include/ostatus.php
index a086177a7a0258578b578613cf7f5a36bfc9f0a2..d39059eb6f88c0ebdb9f8c9082e1e5be974e455a 100644 (file)
--- 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/dfrn_request.php b/mod/dfrn_request.php
index 3316cb0b0f5103f9e43139d74dc839f1211db5e6..7e5b67b7c2b1ff2024c7a5ceb0cd760097bd25ce 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -836,7 +836,10 @@ function dfrn_request_content(&$a) {
                //$emailnet = (($mail_disabled) ? '' : t("<strike>Connect as an email follower</strike> \x28Coming soon\x29"));
                $emailnet = "";
 
-               $invite_desc = sprintf(t('If you are not yet a member of the free social web, <a href="%s/siteinfo">follow this link to find a public Friendica site and join us today</a>.', get_server()));
+               $invite_desc = sprintf(
+                       t('If you are not yet a member of the free social web, <a href="%s/siteinfo">follow this link to find a public Friendica site and join us today</a>.'),
+                       get_server()
+               );
 
                $o .= replace_macros($tpl,array(
                        '$header' => t('Friend/Connection Request'),

diff --git a/mod/settings.php b/mod/settings.php
index cddabcb8b2b1b230f120e9b2f335cb55973ce628..3a07e714d07acf9e2678fb6d1aba79fe52b42c0b 100644 (file)
--- 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 .= '<span class="field_help">'.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.').'</span>';
                $settings_connectors .= '</div>';
 
+               /*
+               // Deactivated by now - it doesn't seem to work reliable
                $legacy_contact = get_pconfig(local_user(), 'system', 'ostatus_legacy_contact');
 
                $settings_connectors .= '<div id="legacy-contact-wrapper" class="field input">';
@@ -777,6 +779,7 @@ function settings_content(&$a) {
                $settings_connectors .= '<input id="legacy-contact-checkbox" name="legacy_contact" value="'.$legacy_contact.'"/>';
                $settings_connectors .= '<span class="field_help">'.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.').'</span>';
                $settings_connectors .= '</div>';
+               */
 
                $settings_connectors .= '<div class="settings-submit-wrapper" ><input type="submit" name="general-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';