Cavemanon/cavepaintings
7
Fork 2
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Added merged indicator to DataUploadEvent and ImageAddEvent

Browse Source 
Changed merge process so that the ID of the merged image can make it back through the event chanin
This commit is contained in:
Matthew Barbour
2019-06-19 19:40:25 -05:00
committed by matthew
parent 5a30ce1c83
commit 5eb4a66ab7
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/cron_uploader/main.php
View File

@ -388,8 +388,8 @@ class CronUploader extends Extension
$infomsg = ""; // Will contain info message
if ($event->image_id == -1) {
throw new Exception("File type not recognised. Filename: {$filename}");
} elseif ($event->image_id == null) {
$infomsg = "Image merged. Filename: {$filename}";
} elseif ($event->merged === true) {
$infomsg = "Image merged. ID: {$event->image_id} Filename: {$filename}";
} else {
$infomsg = "Image uploaded. ID: {$event->image_id} - Filename: {$filename}";
}