Page MenuHomePhabricator
Files F15333572

D21223.diff
No OneTemporary
Actions

D21223.diff
View Options

diff --git a/src/applications/differential/storage/DifferentialViewState.php b/src/applications/differential/storage/DifferentialViewState.php
--- a/src/applications/differential/storage/DifferentialViewState.php
+++ b/src/applications/differential/storage/DifferentialViewState.php
@@ -49,6 +49,11 @@
$properties['diffID'] = (int)$diff_id;
}
+ $changeset_id = $changeset->getID();
+ if ($changeset_id !== null) {
+ $properties['changesetID'] = (int)$changeset_id;
+ }
+
$path_hash = $this->getChangesetPathHash($changeset);
$changeset_phid = $this->getChangesetKey($changeset);
diff --git a/src/infrastructure/diff/viewstate/PhabricatorChangesetViewStateEngine.php b/src/infrastructure/diff/viewstate/PhabricatorChangesetViewStateEngine.php
--- a/src/infrastructure/diff/viewstate/PhabricatorChangesetViewStateEngine.php
+++ b/src/infrastructure/diff/viewstate/PhabricatorChangesetViewStateEngine.php
@@ -197,12 +197,12 @@
$entries = isort($entries, 'epoch');
if ($entries) {
- $other_key = last_key($entries);
$other_spec = last($entries);
$this_version = (int)$changeset->getDiffID();
$other_version = (int)idx($other_spec, 'diffID');
$other_value = (bool)idx($other_spec, 'value', false);
+ $other_id = (int)idx($other_spec, 'changesetID');
if ($other_value === false) {
$is_hidden = false;
@@ -211,10 +211,14 @@
} else {
$viewer = $this->getViewer();
- $other_changeset = id(new DifferentialChangesetQuery())
- ->setViewer($viewer)
- ->withIDs(array($other_key))
- ->executeOne();
+ if ($other_id) {
+ $other_changeset = id(new DifferentialChangesetQuery())
+ ->setViewer($viewer)
+ ->withIDs(array($other_id))
+ ->executeOne();
+ } else {
+ $other_changeset = null;
+ }
$is_modified = false;
if ($other_changeset) {

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 9, 3:09 AM (2 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7381396
Default Alt Text
D21223.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility