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

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index ccd30926c8dd0dcd8f63f0e8c51293ba76055dad..d3ce0fa40c9d2e1fee19d70c6dd09197b3c53374 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -40,7 +40,7 @@ function notes_init(App $a)
 function notes_content(App $a, $update = false)
 {
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -55,7 +55,7 @@ function notes_content(App $a, $update = false)
                        'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
                        'lockstate' => 'lock',
-                       'acl' => '',
+                       'acl' => \Friendica\Core\ACL::getSelfOnlyHTML(local_user(), DI::l10n()->t('Personal notes are visible only by yourself.')),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
@@ -69,7 +69,15 @@ function notes_content(App $a, $update = false)
        $condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
                'contact-id'=> $a->contact['id']];
 
-       $pager = new Pager(DI::args()->getQueryString(), 40);
+       if (DI::mode()->isMobile()) {
+               $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+                       DI::config()->get('system', 'itemspage_network_mobile'));
+       } else {
+               $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+                       DI::config()->get('system', 'itemspage_network'));
+       }
+
+       $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
 
        $params = ['order' => ['created' => true],
                'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
@@ -82,7 +90,7 @@ function notes_content(App $a, $update = false)
 
                $count = count($notes);
 
-               $o .= conversation($a, $notes, $pager, 'notes', $update);
+               $o .= conversation($a, $notes, 'notes', $update);
        }
 
        $o .= $pager->renderMinimal($count);