Merge "UploadStash us_props fix for Postgres"

diff --combined includes/upload/UploadStash.php
index ea11737,ecebd07..f50eb49
--- 1/includes/upload/UploadStash.php
--- 2/includes/upload/UploadStash.php
+++ b/includes/upload/UploadStash.php
@@@ -260,7 -260,7 +260,7 @@@ class UploadStash 
                        'us_key' => $key,
                        'us_orig_path' => $path,
                        'us_path' => $stashPath, // virtual URL
 -                      'us_props' => serialize( $fileProps ),
 +                      'us_props' => $dbw->encodeBlob( serialize( $fileProps ) ),
                        'us_size' => $fileProps['size'],
                        'us_sha1' => $fileProps['sha1'],
                        'us_mime' => $fileProps['mime'],
@@@ -483,6 -483,7 +483,7 @@@
                }
  
                $this->fileMetadata[$key] = (array)$row;
+               $this->fileMetadata[$key]['us_props'] = $dbr->decodeBlob( $row->us_props );
  
                return true;
        }