Merge "registration: Only allow one extension to set a specific config setting"

[lhc/web/wiklou.git] / includes / upload / UploadStash.php

diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php
index 48477f8..da896f9 100644 (file)
--- a/includes/upload/UploadStash.php
+++ b/includes/upload/UploadStash.php
@@ -290,7 +290,6 @@ class UploadStash {
                }
 
                $this->fileMetadata[$key] = [
-                       'us_id' => $dbw->nextSequenceValue( 'uploadstash_us_id_seq' ),
                        'us_user' => $this->userId,
                        'us_key' => $key,
                        'us_orig_path' => $path,
@@ -516,7 +515,12 @@ class UploadStash {
 
                $row = $dbr->selectRow(
                        'uploadstash',
-                       '*',
+                       [
+                               'us_user', 'us_key', 'us_orig_path', 'us_path', 'us_props',
+                               'us_size', 'us_sha1', 'us_mime', 'us_media_type',
+                               'us_image_width', 'us_image_height', 'us_image_bits',
+                               'us_source_type', 'us_timestamp', 'us_status',
+                       ],
                        [ 'us_key' => $key ],
                        __METHOD__
                );