badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed transaction issue between cron uploader and bulk import

Browse source
This commit is contained in:
Matthew Barbour 2020-06-16 18:17:48 -05:00 committed by Shish
parent 9b9f1d0341
commit 30f62c2ff8
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/cron_uploader/main.php
View file

@ -354,7 +354,9 @@ class CronUploader extends Extension
$database->begin_transaction(); $database->begin_transaction();
$this->log_message(SCORE_LOG_INFO, "Adding file: {$img[0]} - tags: {$img[2]}"); $this->log_message(SCORE_LOG_INFO, "Adding file: {$img[0]} - tags: {$img[2]}");
$result = $this->add_image($img[0], $img[1], $img[2]); $result = $this->add_image($img[0], $img[1], $img[2]);
$database->commit(); if ($database->is_transaction_open()) {
$database->commit();
}
$this->move_uploaded($img[0], $img[1], $output_subdir, false); $this->move_uploaded($img[0], $img[1], $output_subdir, false);
if ($result->merged) { if ($result->merged) {
$merged++; $merged++;