Merge pull request #7988 from friendica/MrPetovan-notice

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 80706705dd5a38164e11363269560ee7a46a024b..44c7c8b44f9aa4859baf0d606cbee35e7ac1465c 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -377,7 +377,7 @@ function networkFlatView(App $a, $update = 0)
                        (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) ||
                        strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
                        'default_perms' => ACL::getDefaultUserPermissions($a->user),
-                       'acl' => ACL::getFullSelectorHTML($a->user, true),
+                       'acl' => ACL::getFullSelectorHTML($a->page, $a->user, true),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
@@ -554,7 +554,7 @@ function networkThreadedView(App $a, $update, $parent)
                        (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) ||
                        strlen($a->user['deny_cid']) || strlen($a->user['deny_gid']))) ? 'lock' : 'unlock'),
                        'default_perms' => ACL::getDefaultUserPermissions($a->user),
-                       'acl' => ACL::getFullSelectorHTML($a->user, true, $default_permissions),
+                       'acl' => ACL::getFullSelectorHTML($a->page, $a->user, true, $default_permissions),
                        'bang' => (($gid || $cid || $nets) ? '!' : ''),
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
@@ -925,10 +925,10 @@ function network_tabs(App $a)
        // tabs
        $tabs = [
                [
-                       'label' => L10n::t('Latest Activities'),
+                       'label' => L10n::t('Latest Activity'),
                        'url'   => str_replace('/new', '', $cmd) . '?order=activity' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
                        'sel'   => $all_active,
-                       'title' => L10n::t('Sort by activity Date'),
+                       'title' => L10n::t('Sort by latest activity'),
                        'id'    => 'activity-order-tab',
                        'accesskey' => 'e',
                ],
@@ -936,7 +936,7 @@ function network_tabs(App $a)
                        'label' => L10n::t('Latest Posts'),
                        'url'   => str_replace('/new', '', $cmd) . '?order=post' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
                        'sel'   => $post_active,
-                       'title' => L10n::t('Sort by post date'),
+                       'title' => L10n::t('Sort by post received date'),
                        'id'    => 'post-order-tab',
                        'accesskey' => 't',
                ],