From 12c331cbd200d598fe5373043387bc3022197fe5 Mon Sep 17 00:00:00 2001
From: Matthew Barbour <matthew@darkholme.net>
Date: Tue, 2 Jun 2020 17:53:35 -0500
Subject: [PATCH] Removed extra tag set from cron uploader, no longer needed
 now that it runs as a user

---
 ext/cron_uploader/main.php | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/ext/cron_uploader/main.php b/ext/cron_uploader/main.php
index 3984c857..23be8653 100644
--- a/ext/cron_uploader/main.php
+++ b/ext/cron_uploader/main.php
@@ -131,9 +131,9 @@ class CronUploader extends Extension
             return;
         }
         foreach ($results as $result) {
-            $new_path = join_path($queue_dir, substr($result,strlen($stage_dir)));
+            $new_path = join_path($queue_dir, substr($result, strlen($stage_dir)));
 
-            if(file_exists($new_path)) {
+            if (file_exists($new_path)) {
                 $page->flash("File already exists in queue folder: " .$result);
                 return;
             }
@@ -141,22 +141,22 @@ class CronUploader extends Extension
 
         $success = true;
         foreach ($results as $result) {
-            $new_path = join_path($queue_dir, substr($result,strlen($stage_dir)));
+            $new_path = join_path($queue_dir, substr($result, strlen($stage_dir)));
 
             $dir = dirname($new_path);
-            if(!is_dir($dir)) {
+            if (!is_dir($dir)) {
                 mkdir($dir, 0775, true);
             }
 
-            if(rename($result, $new_path)===false){
+            if (rename($result, $new_path)===false) {
                 $page->flash("Could not move file: " .$result);
                 $success = false;
             }
         }
 
-        if($success===true) {
+        if ($success===true) {
             $page->flash("Re-staged $folder to queue");
-            if(remove_empty_dirs($stage_dir)===false) {
+            if (remove_empty_dirs($stage_dir)===false) {
                 $page->flash("Could not remove $folder");
             }
         }
@@ -317,7 +317,7 @@ class CronUploader extends Extension
             // Upload the file(s)
             foreach ($image_queue as $img) {
                 $execution_time = microtime(true) - $_shm_load_start;
-                if($execution_time>$max_time) {
+                if ($execution_time>$max_time) {
                     break;
                 }
                 try {
@@ -410,7 +410,7 @@ class CronUploader extends Extension
         if (array_key_exists('extension', $pathinfo)) {
             $metadata ['extension'] = $pathinfo ['extension'];
         }
-        $metadata ['tags'] = $tagArray; // doesn't work when not logged in here, handled below
+        $metadata ['tags'] = $tagArray;
         $metadata ['source'] = null;
         $event = new DataUploadEvent($tmpname, $metadata);
         send_event($event);
@@ -425,10 +425,6 @@ class CronUploader extends Extension
         }
         $this->log_message(SCORE_LOG_INFO, $infomsg);
 
-        // Set tags
-        $img = Image::by_id($event->image_id);
-        $img->set_tags(array_merge($tagArray, $img->get_tag_array()));
-
         return $event;
     }