ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1421 from connortechnology/fix_events_pagination 

remove the if(pages>1) so that the if  >  line always happens
This commit is contained in:
Steve Gilvarry 2016-04-28 21:43:54 +10:00
parent d9fd0faa32 50f2747bb4
commit ac5fdb8956
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/views/events.php
View File

@ -66,14 +66,12 @@ if ( !empty($limit) && $nEvents > $limit )
$nEvents = $limit; $nEvents = $limit;
} }
$pages = (int)ceil($nEvents/ZM_WEB_EVENTS_PER_PAGE); $pages = (int)ceil($nEvents/ZM_WEB_EVENTS_PER_PAGE);
if ( $pages > 1 ) {
if ( !empty($page) ) { if ( !empty($page) ) {
if ( $page < 0 ) if ( $page < 0 )
$page = 1; $page = 1;
if ( $page > $pages ) if ( $page > $pages )
$page = $pages; $page = $pages;
} }
}
if ( !empty($page) ) { if ( !empty($page) ) {
$limitStart = (($page-1)*ZM_WEB_EVENTS_PER_PAGE); $limitStart = (($page-1)*ZM_WEB_EVENTS_PER_PAGE);
if ( empty( $limit ) ) if ( empty( $limit ) )