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

10
ext/upload/main.php
View File

@ -187,11 +187,13 @@ class Upload extends Extension
throw new UploadException("Can not replace Image: disk nearly full");
}
// Try to get the image ID
$image_id = int_escape($event->get_arg(0));
if (empty($image_id)) {
$image_id = isset($_POST['image_id']) ? $_POST['image_id'] : null;
if($event->count_args() >= 1) {
$image_id = int_escape($event->get_arg(0));
}
if (empty($image_id)) {
elseif(isset($_POST['image_id'])) {
$image_id = $_POST['image_id'];
}
else {
throw new UploadException("Can not replace Image: No valid Image ID given.");
}