Merge branch 'api_zry' into 'master'

* Fix bug 22061.

See merge request easycorp/zentaopms!3234

api/v1/entries/bug.php

@@ -93,7 +93,7 @@ class bugEntry extends entry
         $oldBug = $this->loadModel('bug')->getByID($bugID);
 
         /* Set $_POST variables. */
-        $fields = 'title,project,execution,openedBuild,assignedTo,pri,severity,type,story,resolvedBy,closedBy,resolution,product,plan,task,module,steps,mailto,keywords';
+        $fields = 'uid,title,project,execution,openedBuild,assignedTo,pri,severity,type,story,resolvedBy,closedBy,resolution,product,plan,task,module,steps,mailto,keywords';
         $this->batchSetPost($fields, $oldBug);
         $this->setPost('notifyEmail', implode(',', $this->request('notifyEmail', array())));
 

module/bug/control.php

@@ -925,6 +925,7 @@ class bug extends control
                     }
                 }
                 $files = $this->loadModel('file')->saveUpload('bug', $bugID);
+                if(empty($files) and $this->post->uid != '' and isset($_SESSION['album']['used'][$this->post->uid])) $files = $this->file->getPairs($_SESSION['album']['used'][$this->post->uid]);
             }
             if($this->post->comment != '' or !empty($changes) or !empty($files))
             {