Merge pull request #8175 from MrPetovan/task/revert-profile-default-tab

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index b0154a80fd8d038999811cc9ee3b9ea7f705cd59..1bbddf2196c19a04319150166b5a46b28c0fa616 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -12,7 +12,6 @@ use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\ACL;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
@@ -357,7 +356,7 @@ function networkFlatView(App $a, $update = 0)
 
                $o .= status_editor($a, $x);
 
-               if (!Config::get('theme', 'hide_eventlist')) {
+               if (!DI::config()->get('theme', 'hide_eventlist')) {
                        $o .= Profile::getBirthdays();
                        $o .= Profile::getEventsReminderHTML();
                }
@@ -620,7 +619,7 @@ function networkThreadedView(App $a, $update, $parent)
                }
        }
 
-       if (!$gid && !$cid && !$update && !Config::get('theme', 'hide_eventlist')) {
+       if (!$gid && !$cid && !$update && !DI::config()->get('theme', 'hide_eventlist')) {
                $o .= Profile::getBirthdays();
                $o .= Profile::getEventsReminderHTML();
        }
@@ -703,7 +702,7 @@ function networkThreadedView(App $a, $update, $parent)
                } else {
                        // Load all unseen items
                        $sql_extra4 = "`item`.`unseen`";
-                       if (Config::get("system", "like_no_comment")) {
+                       if (DI::config()->get("system", "like_no_comment")) {
                                $sql_extra4 .= " AND `item`.`gravity` IN (" . GRAVITY_PARENT . "," . GRAVITY_COMMENT . ")";
                        }
                        if ($order === 'post') {
@@ -880,7 +879,7 @@ function network_tabs(App $a)
 {
        // item filter tabs
        /// @TODO fix this logic, reduce duplication
-       /// $a->page['content'] .= '<div class="tabs-wrapper">';
+       /// DI::page()['content'] .= '<div class="tabs-wrapper">';
        list($no_active, $all_active, $post_active, $conv_active, $new_active, $starred_active, $bookmarked_active) = network_query_get_sel_tab($a);
 
        // if no tabs are selected, defaults to activitys