diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-08-01 03:59:32 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-08-01 03:59:32 +0200 |
| commit | 2f8c5cf7d09f7d079671785574b588bc21c373cd (patch) | |
| tree | e1c12c4d39b8404d0d5870c57ebd91540fd2a37f /include/network.php | |
| parent | 1f2482f6abf5986ebf4b9ee292ba229a4a3b6797 (diff) | |
| parent | 9476c631b0f9ba52be869b0c430fea81f4202352 (diff) | |
| download | volse-hubzilla-2f8c5cf7d09f7d079671785574b588bc21c373cd.tar.gz volse-hubzilla-2f8c5cf7d09f7d079671785574b588bc21c373cd.tar.bz2 volse-hubzilla-2f8c5cf7d09f7d079671785574b588bc21c373cd.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/include/network.php b/include/network.php index fe9a9aa2b..fa49e5765 100644 --- a/include/network.php +++ b/include/network.php @@ -1142,7 +1142,7 @@ function discover_by_webbie($webbie) { $network = null; - $webbie = strtolower($webbie); +// $webbie = strtolower($webbie); $x = webfinger_rfc7033($webbie,true); if($x && array_key_exists('links',$x) && $x['links']) { @@ -1688,18 +1688,19 @@ function get_repository_version($branch = 'master') { function network_to_name($s) { $nets = array( - NETWORK_DFRN => t('Friendica'), - NETWORK_FRND => t('Friendica'), - NETWORK_OSTATUS => t('OStatus'), - NETWORK_GNUSOCIAL => t('GNU-Social'), - NETWORK_FEED => t('RSS/Atom'), - NETWORK_MAIL => t('Email'), - NETWORK_DIASPORA => t('Diaspora'), - NETWORK_FACEBOOK => t('Facebook'), - NETWORK_ZOT => t('Zot'), - NETWORK_LINKEDIN => t('LinkedIn'), - NETWORK_XMPP => t('XMPP/IM'), - NETWORK_MYSPACE => t('MySpace'), + NETWORK_DFRN => t('Friendica'), + NETWORK_FRND => t('Friendica'), + NETWORK_OSTATUS => t('OStatus'), + NETWORK_GNUSOCIAL => t('GNU-Social'), + NETWORK_FEED => t('RSS/Atom'), + NETWORK_ACTIVITYPUB => t('ActivityPub'), + NETWORK_MAIL => t('Email'), + NETWORK_DIASPORA => t('Diaspora'), + NETWORK_FACEBOOK => t('Facebook'), + NETWORK_ZOT => t('Zot'), + NETWORK_LINKEDIN => t('LinkedIn'), + NETWORK_XMPP => t('XMPP/IM'), + NETWORK_MYSPACE => t('MySpace'), ); call_hooks('network_to_name', $nets); |