Remove fallback contact query from Model\Contact::photoMenu

[friendica.git] / src / Module / NodeInfo210.php

diff --git a/src/Module/NodeInfo210.php b/src/Module/NodeInfo210.php
index 99b2fd05a857ed61174941ee5d329e2ff03e333a..f12ce52cb712e3a94993ca92829267f8fb5f4759 100644 (file)
--- a/src/Module/NodeInfo210.php
+++ b/src/Module/NodeInfo210.php
@@ -55,13 +55,13 @@ class NodeInfo210 extends BaseModule
                                'baseUrl'  => $this->baseUrl->get(),
                                'name'     => $this->config->get('config', 'sitename'),
                                'software' => 'friendica',
-                               'version'  => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION,
+                               'version'  => App::VERSION . '-' . DB_UPDATE_VERSION,
                        ],
-                       'organization'      => Nodeinfo::getOrganization(),
+                       'organization'      => Nodeinfo::getOrganization($this->config),
                        'protocols'         => ['dfrn', 'activitypub'],
-                       'services'          => [],
+                       'services'          => Nodeinfo::getServices(),
                        'openRegistrations' => intval($this->config->get('config', 'register_policy')) !== Register::CLOSED,
-                       'usage'             => [],
+                       'usage'             => Nodeinfo::getUsage(true),
                ];
 
                if (!empty($this->config->get('system', 'diaspora_enabled'))) {
@@ -72,10 +72,6 @@ class NodeInfo210 extends BaseModule
                        $nodeinfo['protocols'][] = 'ostatus';
                }
 
-               $nodeinfo['usage'] = Nodeinfo::getUsage(true);
-
-               $nodeinfo['services'] = Nodeinfo::getServices();
-
                if (Addon::isEnabled('twitter')) {
                        $nodeinfo['services']['inbound'][] = 'twitter';
                }