Facebook and App.net is removed from nearly all places (#5581)
* Facebook is removed from nearly all places * Remove app.net as well - it's dead for some time now
This commit is contained in:
parent
e62c1c3f81
commit
8c2efa6df4
12 changed files with 12 additions and 41 deletions
|
@ -637,7 +637,7 @@ function contacts_content(App $a)
|
|||
'$contact_id' => $contact['id'],
|
||||
'$block_text' => (($contact['blocked']) ? L10n::t('Unblock') : L10n::t('Block') ),
|
||||
'$ignore_text' => (($contact['readonly']) ? L10n::t('Unignore') : L10n::t('Ignore') ),
|
||||
'$insecure' => (($contact['network'] !== NETWORK_DFRN && $contact['network'] !== NETWORK_MAIL && $contact['network'] !== NETWORK_FACEBOOK && $contact['network'] !== NETWORK_DIASPORA) ? $insecure : ''),
|
||||
'$insecure' => (($contact['network'] !== NETWORK_DFRN && $contact['network'] !== NETWORK_MAIL && $contact['network'] !== NETWORK_DIASPORA) ? $insecure : ''),
|
||||
'$info' => $contact['info'],
|
||||
'$cinfo' => ['info', '', $contact['info'], ''],
|
||||
'$blocked' => (($contact['blocked']) ? L10n::t('Currently blocked') : ''),
|
||||
|
|
|
@ -1022,7 +1022,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
|
|||
$newname = $contact["nick"];
|
||||
|
||||
if (($newname == "") || (($contact["network"] != NETWORK_OSTATUS) && ($contact["network"] != NETWORK_TWITTER)
|
||||
&& ($contact["network"] != NETWORK_STATUSNET) && ($contact["network"] != NETWORK_APPNET))) {
|
||||
&& ($contact["network"] != NETWORK_STATUSNET))) {
|
||||
$newname = $contact["name"];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -32,7 +32,6 @@ function statistics_json_init(App $a) {
|
|||
$statistics["services"]["blogger"] = Addon::isEnabled("blogger");
|
||||
$statistics["services"]["buffer"] = Addon::isEnabled("buffer");
|
||||
$statistics["services"]["dreamwidth"] = Addon::isEnabled("dwpost");
|
||||
$statistics["services"]["facebook"] = Addon::isEnabled("fbpost");
|
||||
$statistics["services"]["gnusocial"] = Addon::isEnabled("statusnet");
|
||||
$statistics["services"]["googleplus"] = Addon::isEnabled("gpluspost");
|
||||
$statistics["services"]["libertree"] = Addon::isEnabled("libertree");
|
||||
|
@ -46,7 +45,6 @@ function statistics_json_init(App $a) {
|
|||
$statistics["blogger"] = $statistics["services"]["blogger"];
|
||||
$statistics["buffer"] = $statistics["services"]["buffer"];
|
||||
$statistics["dreamwidth"] = $statistics["services"]["dreamwidth"];
|
||||
$statistics["facebook"] = $statistics["services"]["facebook"];
|
||||
$statistics["gnusocial"] = $statistics["services"]["gnusocial"];
|
||||
$statistics["googleplus"] = $statistics["services"]["googleplus"];
|
||||
$statistics["libertree"] = $statistics["services"]["libertree"];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue