Merge "UploadStash us_props fix for Postgres"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 21 Feb 2014 14:40:14 +0000 (14:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 21 Feb 2014 14:40:14 +0000 (14:40 +0000)
includes/upload/UploadStash.php

index ea11737..f50eb49 100644 (file)
@@ -483,6 +483,7 @@ class UploadStash {
                }
 
                $this->fileMetadata[$key] = (array)$row;
+               $this->fileMetadata[$key]['us_props'] = $dbr->decodeBlob( $row->us_props );
 
                return true;
        }