Cavemanon/cavepaintings
7
Fork 2
Code Issues 3 Pull Requests 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

29
ext/notes/main.php
View File

@ -384,12 +384,7 @@ class Notes extends Extension
{
global $database, $config;
$pageNumber = $event->get_arg(1);
if (is_null($pageNumber) || !is_numeric($pageNumber) || $pageNumber <= 0) {
$pageNumber = 0;
} else {
$pageNumber--;
}
$pageNumber = $event->try_page_num(1) - 1;
$notesPerPage = $config->get_int('notesNotesPerPage');
@ -419,12 +414,7 @@ class Notes extends Extension
{
global $config, $database;
$pageNumber = $event->get_arg(1);
if (is_null($pageNumber) || !is_numeric($pageNumber) || $pageNumber <= 0) {
$pageNumber = 0;
} else {
$pageNumber--;
}
$pageNumber = $event->try_page_num(1) - 1;
$requestsPerPage = $config->get_int('notesRequestsPerPage');
@ -478,12 +468,7 @@ class Notes extends Extension
{
global $config, $database;
$pageNumber = $event->get_arg(1);
if (is_null($pageNumber) || !is_numeric($pageNumber) || $pageNumber <= 0) {
$pageNumber = 0;
} else {
$pageNumber--;
}
$pageNumber = $event->try_page_num(1) - 1;
$historiesPerPage = $config->get_int('notesHistoriesPerPage');
@ -511,13 +496,7 @@ class Notes extends Extension
global $config, $database;
$noteID = $event->get_arg(1);
$pageNumber = $event->get_arg(2);
if (is_null($pageNumber) || !is_numeric($pageNumber) || $pageNumber <= 0) {
$pageNumber = 0;
} else {
$pageNumber--;
}
$pageNumber = $event->try_page_num(2);
$historiesPerPage = $config->get_int('notesHistoriesPerPage');