summaryrefslogtreecommitdiff
path: root/includes/pager.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2005-10-22 15:14:46 +0000
committerDries Buytaert <dries@buytaert.net>2005-10-22 15:14:46 +0000
commitf6764cfbd8dcdedd05263711a41fcedb72dda2ab (patch)
tree88f659fea364fc50d3173da0c5a8bdbc28be8557 /includes/pager.inc
parent07ecb2abb0206484a77acbf5ba767af856d99520 (diff)
downloadbrdo-f6764cfbd8dcdedd05263711a41fcedb72dda2ab.tar.gz
brdo-f6764cfbd8dcdedd05263711a41fcedb72dda2ab.tar.bz2
- Patch #30930 by m3avrck/deekayen: cured PHP5 warnings.
Diffstat (limited to 'includes/pager.inc')
-rw-r--r--includes/pager.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/pager.inc b/includes/pager.inc
index 959ce321b..58891986e 100644
--- a/includes/pager.inc
+++ b/includes/pager.inc
@@ -50,13 +50,13 @@
*/
function pager_query($query, $limit = 10, $element = 0, $count_query = NULL) {
global $pager_page_array, $pager_total, $pager_total_items;
- $page = $_GET['page'];
+ $page = isset($_GET['page']) ? $_GET['page'] : '';
// Substitute in query arguments.
$args = func_get_args();
$args = array_slice($args, 4);
// Alternative syntax for '...'
- if (is_array($args[0])) {
+ if (isset($args[0]) && is_array($args[0])) {
$args = $args[0];
}
@@ -72,13 +72,13 @@ function pager_query($query, $limit = 10, $element = 0, $count_query = NULL) {
if (count($args)) {
$pager_total_items[$element] = db_result(db_query($count_query, $args));
$pager_total[$element] = ceil($pager_total_items[$element] / $limit);
- $pager_page_array[$element] = max(0, min($pager_page_array[$element], ((int)$pager_total[$element]) - 1));
+ $pager_page_array[$element] = max(0, min((int)$pager_page_array[$element], ((int)$pager_total[$element]) - 1));
return db_query_range($query, $args, $pager_page_array[$element] * $limit, $limit);
}
else {
$pager_total_items[$element] = db_result(db_query($count_query));
$pager_total[$element] = ceil($pager_total_items[$element] / $limit);
- $pager_page_array[$element] = max(0, min($pager_page_array[$element], ((int)$pager_total[$element]) - 1));
+ $pager_page_array[$element] = max(0, min((int)$pager_page_array[$element], ((int)$pager_total[$element]) - 1));
return db_query_range($query, $pager_page_array[$element] * $limit, $limit);
}
}