Merge pull request #6342 from annando/notices

[friendica.git] / src / Content / Pager.php

diff --git a/src/Content/Pager.php b/src/Content/Pager.php
index a95fc7cf656351de1c5a812e8e8b58ec2c516f37..0a1766fe593ad225caa0d6555d202572d8650291 100644 (file)
--- a/src/Content/Pager.php
+++ b/src/Content/Pager.php
@@ -3,6 +3,7 @@
 namespace Friendica\Content;
 
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 
 /**
  * The Pager has two very different output, Minimal and Full, see renderMinimal() and renderFull() for more details.
@@ -168,12 +169,12 @@ class Pager
                        'next'  => [
                                'url'   => $this->ensureQueryParameter($this->baseQueryString . '&page=' . ($this->getPage() + 1)),
                                'text'  => L10n::t('older'),
-                               'class' =>  'next' . ($displayedItemCount <= 0 ? ' disabled' : '')
+                               'class' =>  'next' . ($displayedItemCount < $this->getItemsPerPage() ? ' disabled' : '')
                        ]
                ];
 
-               $tpl = get_markup_template('paginate.tpl');
-               return replace_macros($tpl, ['pager' => $data]);
+               $tpl = Renderer::getMarkupTemplate('paginate.tpl');
+               return Renderer::replaceMacros($tpl, ['pager' => $data]);
        }
 
        /**
@@ -276,7 +277,7 @@ class Pager
                        ];
                }
 
-               $tpl = get_markup_template('paginate.tpl');
-               return replace_macros($tpl, ['pager' => $data]);
+               $tpl = Renderer::getMarkupTemplate('paginate.tpl');
+               return Renderer::replaceMacros($tpl, ['pager' => $data]);
        }
 }