Merge remote-tracking branch 'upstream/develop' into item-notification

[friendica.git] / view / theme / vier / theme.php

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 7bba680fe8e576e196544013827a799e7251092a..ebe4011e654b2b0fc9e1beb3050a2233bf378dd1 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -16,7 +16,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
+use Friendica\Core\Search;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -107,7 +107,7 @@ function get_vier_config($key, $default = false, $admin = false)
 
 function vier_community_info()
 {
-       $a = \get_app();
+       $a = DI::app();
 
        $show_pages      = get_vier_config("show_pages", 1);
        $show_profiles   = get_vier_config("show_profiles", 1);
@@ -184,7 +184,7 @@ function vier_community_info()
                $nv['random'] = L10n::t('Random Profile');
                $nv['inv'] = L10n::t('Invite Friends');
                $nv['directory'] = L10n::t('Global Directory');
-               $nv['global_dir'] = get_server();
+               $nv['global_dir'] = Search::getGlobalDirectory();
                $nv['local_directory'] = L10n::t('Local Directory');
 
                $aside['$nv'] = $nv;
@@ -213,7 +213,7 @@ function vier_community_info()
                                        'name'         => $contact['name'],
                                        'cid'          => $contact['id'],
                                        'selected'     => $selected,
-                                       'micro'        => System::removedBaseUrl(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
+                                       'micro'        => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
                                        'id'           => ++$id,
                                ];
                                $entries[] = $entry;