t_a/cavepaintingsFork
1
Fork 0
forked from Cavemanon/cavepaintings
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Have get_arg never return null

Browse Source 
90% of places assume it will never return null, and they will break in
weird ways if it does return null
This commit is contained in:
Shish
2019-11-04 00:40:10 +00:00
parent fc7da5114f
commit d17e207984
19 changed files with 141 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ext/pools/main.php
View File

@@ -173,7 +173,7 @@ class Pools extends Extension
// What action are we trying to perform?
switch ($event->get_arg(0)) {
case "list": //index
$this->list_pools($page, int_escape($event->get_arg(1)));
$this->list_pools($page, $event->try_page_num(1));
break;
case "new": // Show form for new pools
@@ -779,14 +779,7 @@ class Pools extends Extension
{
global $config, $user, $database;
$pageNumber = int_escape($event->get_arg(2));
if (is_null($pageNumber) || !is_numeric($pageNumber)) {
$pageNumber = 0;
} elseif ($pageNumber <= 0) {
$pageNumber = 0;
} else {
$pageNumber--;
}
$pageNumber = $event->try_page_num(2) - 1;
$poolID = int_escape($poolID);
$pool = $this->get_pool($poolID);