Page MenuHomePhabricator
Files F13204535

D15828.diff
No OneTemporary
Actions

D15828.diff
View Options

diff --git a/src/applications/differential/render/DifferentialChangesetRenderer.php b/src/applications/differential/render/DifferentialChangesetRenderer.php
--- a/src/applications/differential/render/DifferentialChangesetRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetRenderer.php
@@ -626,6 +626,8 @@
unset($old['unix:filemode']);
}
+ $metadata = $changeset->getMetadata();
+
if ($this->hasOldFile()) {
$file = $this->getOldFile();
if ($file->getImageWidth()) {
@@ -634,6 +636,12 @@
}
$old['file:mimetype'] = $file->getMimeType();
$old['file:size'] = phutil_format_bytes($file->getByteSize());
+ } else {
+ $old['file:mimetype'] = idx($metadata, 'old:file:mime-type');
+ $size = idx($metadata, 'old:file:size');
+ if ($size !== null) {
+ $old['file:size'] = phutil_format_bytes($size);
+ }
}
if ($this->hasNewFile()) {
@@ -644,6 +652,12 @@
}
$new['file:mimetype'] = $file->getMimeType();
$new['file:size'] = phutil_format_bytes($file->getByteSize());
+ } else {
+ $new['file:mimetype'] = idx($metadata, 'new:file:mime-type');
+ $size = idx($metadata, 'new:file:size');
+ if ($size !== null) {
+ $new['file:size'] = phutil_format_bytes($size);
+ }
}
return array($old, $new);
diff --git a/src/applications/differential/render/DifferentialChangesetTestRenderer.php b/src/applications/differential/render/DifferentialChangesetTestRenderer.php
--- a/src/applications/differential/render/DifferentialChangesetTestRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetTestRenderer.php
@@ -32,6 +32,13 @@
$changeset = $this->getChangeset();
list($old, $new) = $this->getChangesetProperties($changeset);
+ foreach (array_keys($old) as $key) {
+ if ($old[$key] === idx($new, $key)) {
+ unset($old[$key]);
+ unset($new[$key]);
+ }
+ }
+
if (!$old && !$new) {
return null;
}

File Metadata

Mime Type
text/plain
Expires
Thu, May 16, 12:40 AM (4 w, 7 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6289060
Default Alt Text
D15828.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility