Have get_arg never return null

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

View File

@ -128,12 +128,13 @@ class TranscodeImage extends Extension
global $page, $user;
if ($event->page_matches("transcode") && $user->can(Permissions::EDIT_FILES)) {
$image_id = int_escape($event->get_arg(0));
if (empty($image_id)) {
$image_id = isset($_POST['image_id']) ? int_escape($_POST['image_id']) : null;
if($event->count_args() >= 1) {
$image_id = int_escape($event->get_arg(0));
}
// Try to get the image ID
if (empty($image_id)) {
elseif(isset($_POST['image_id'])) {
$image_id = int_escape($_POST['image_id']);
}
else {
throw new ImageTranscodeException("Can not resize Image: No valid Image ID given.");
}
$image_obj = Image::by_id($image_id);