@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Pholio - fix a bug replacing multiple images
Summary: these transactions should //never// merge since they are always created for a 1:1 replacement. (ie any merging would be implicitly erroneous). Fixes T4081
Test Plan: made a mock with three images and replaced all three successfully. replaced image A with image B, did not save, replaced image B with image C, then saved and verified transaction correctly showed image A replaced with image C.
Reviewers: epriestley
Reviewed By: epriestley
CC: Korvin, epriestley, aran
Maniphest Tasks: T4081
Differential Revision: https://secure.phabricator.com/D7536
+4
-1
+4
-1
src/applications/pholio/editor/PholioMockEditor.php
+4
-1
src/applications/pholio/editor/PholioMockEditor.php
···
287
287
case PholioTransactionType::TYPE_DESCRIPTION:
288
288
return $v;
289
289
case PholioTransactionType::TYPE_IMAGE_REPLACE:
290
-
if ($u->getNewValue() == $v->getOldValue()) {
290
+
$u_img = $u->getNewValue();
291
+
$v_img = $v->getNewValue();
292
+
if ($u_img->getReplacesImagePHID() == $v_img->getReplacesImagePHID()) {
291
293
return $v;
292
294
}
295
+
break;
293
296
case PholioTransactionType::TYPE_IMAGE_FILE:
294
297
return $this->mergePHIDOrEdgeTransactions($u, $v);
295
298
case PholioTransactionType::TYPE_IMAGE_NAME: