]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #5891 from JonnyTischbein/move_module_contacts
authorHypolite Petovan <hypolite@mrpetovan.com>
Sun, 14 Oct 2018 20:42:50 +0000 (16:42 -0400)
committerGitHub <noreply@github.com>
Sun, 14 Oct 2018 20:42:50 +0000 (16:42 -0400)
Move module contacts

1  2 
mod/crepair.php
src/Model/Contact.php

diff --cc mod/crepair.php
index d8c6b35f5ad03d69e80dc76327a5109d128c172e,af9575ed6d99c6f26d135ff8582ecab4ee356279..13885cb49106adc94b44a2f1d60dd4a50c5e9cdd
@@@ -133,9 -131,9 +131,9 @@@ function crepair_content(App $a
                $remote_self_options = ['0' => L10n::t('No mirroring'), '2' => L10n::t('Mirror as my own posting')];
        }
  
 -      $update_profile = in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]);
 +      $update_profile = in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]);
  
-       $tab_str = contacts_tab($a, $contact, 5);
+       $tab_str = Module\Contact::getTabsHTML($a, $contact, 5);
  
        $tpl = get_markup_template('crepair.tpl');
        $o = replace_macros($tpl, [
Simple merge