mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Don't allow requesting an archive page that doesn't exist

Browse Source 
Cherry picked from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
This commit is contained in:
Lothar Serra Mari 2019-11-20 23:59:04 +01:00 committed by Thomas Hochstein
parent 3bf067c6ea
commit 6accc81ad6
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/NEWS
View File

@ -1,6 +1,9 @@
Version 2.3.3-beta1 () Version 2.3.3-beta1 ()
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Don't allow requesting an archive page that doesn't exist.
Thanks to @lotharsm!
* Fix: Set action to empty in functions_routing.php when serving JS; * Fix: Set action to empty in functions_routing.php when serving JS;
otherisw the default page has been generated at every call. otherisw the default page has been generated at every call.

12
include/functions_entries.inc.php
View File

@ -404,10 +404,18 @@ function &serendipity_fetchEntries($range = null, $full = true, $limit = '', $fe
if (!empty($limit)) { if (!empty($limit)) {
if (isset($serendipity['GET']['page']) && ($serendipity['GET']['page'] > 1 || serendipity_db_bool($serendipity['archiveSortStable'])) && !strstr($limit, ',')) { if (isset($serendipity['GET']['page']) && ($serendipity['GET']['page'] > 1 || serendipity_db_bool($serendipity['archiveSortStable'])) && !strstr($limit, ',')) {
if (serendipity_db_bool($serendipity['archiveSortStable'])) {
$totalEntries = serendipity_getTotalEntries();
$totalEntries = serendipity_getTotalEntries();
$totalPages = ceil($totalEntries / $limit); $totalPages = ceil($totalEntries / $limit);
// Do not allow requesting a page that doesn't exist
// and do a fallback to the highest page number available
if ($serendipity['GET']['page'] > $totalPages) {
$serendipity['GET']['page'] = $totalPages;
}
if (serendipity_db_bool($serendipity['archiveSortStable'])) {
if ($totalPages <= 0 ) { if ($totalPages <= 0 ) {
$totalPages = 1; $totalPages = 1;
} }