diff --git a/src/applications/paste/xaction/PhabricatorPasteContentTransaction.php b/src/applications/paste/xaction/PhabricatorPasteContentTransaction.php --- a/src/applications/paste/xaction/PhabricatorPasteContentTransaction.php +++ b/src/applications/paste/xaction/PhabricatorPasteContentTransaction.php @@ -5,8 +5,6 @@ const TRANSACTIONTYPE = 'paste.create'; - private $fileName; - public function generateOldValue($object) { return $object->getFilePHID(); } @@ -32,26 +30,6 @@ return array($error); } - public function willApplyTransactions($object, array $xactions) { - // Find the most user-friendly filename we can by examining the title of - // the paste and the pending transactions. We'll use this if we create a - // new file to store raw content later. - - $name = $object->getTitle(); - if (!strlen($name)) { - $name = 'paste.raw'; - } - - $type_title = PhabricatorPasteTitleTransaction::TRANSACTIONTYPE; - foreach ($xactions as $xaction) { - if ($xaction->getTransactionType() == $type_title) { - $name = $xaction->getNewValue(); - } - } - - $this->fileName = $name; - } - public function generateNewValue($object, $value) { // If this transaction does not really change the paste content, return // the current file PHID so this transaction no-ops. @@ -66,16 +44,16 @@ $editor = $this->getEditor(); $actor = $editor->getActor(); - $file = $this->newFileForPaste($actor, $this->fileName, $value); + $file = $this->newFileForPaste($actor, $value); return $file->getPHID(); } - private function newFileForPaste(PhabricatorUser $actor, $name, $data) { + private function newFileForPaste(PhabricatorUser $actor, $data) { return PhabricatorFile::newFromFileData( $data, array( - 'name' => $name, + 'name' => 'raw.txt', 'mime-type' => 'text/plain; charset=utf-8', 'authorPHID' => $actor->getPHID(), 'viewPolicy' => PhabricatorPolicies::POLICY_NOONE, diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php --- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php +++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php @@ -1026,8 +1026,6 @@ $xactions = $this->filterTransactions($object, $xactions); if (!$is_preview) { - $this->willApplyTransactions($object, $xactions); - $this->hasRequiredMFA = true; if ($this->getShouldRequireMFA()) { $this->requireMFA($object, $xactions); @@ -4374,19 +4372,6 @@ return idx($types, $type); } - private function willApplyTransactions($object, array $xactions) { - foreach ($xactions as $xaction) { - $type = $xaction->getTransactionType(); - - $xtype = $this->getModularTransactionType($type); - if (!$xtype) { - continue; - } - - $xtype->willApplyTransactions($object, $xactions); - } - } - public function getCreateObjectTitle($author, $object) { return pht('%s created this object.', $author); } diff --git a/src/applications/transactions/storage/PhabricatorModularTransaction.php b/src/applications/transactions/storage/PhabricatorModularTransaction.php --- a/src/applications/transactions/storage/PhabricatorModularTransaction.php +++ b/src/applications/transactions/storage/PhabricatorModularTransaction.php @@ -69,11 +69,6 @@ ->generateNewValue($object, $this->getNewValue()); } - final public function willApplyTransactions($object, array $xactions) { - return $this->getTransactionImplementation() - ->willApplyTransactions($object, $xactions); - } - final public function applyInternalEffects($object) { return $this->getTransactionImplementation() ->applyInternalEffects($object); diff --git a/src/applications/transactions/storage/PhabricatorModularTransactionType.php b/src/applications/transactions/storage/PhabricatorModularTransactionType.php --- a/src/applications/transactions/storage/PhabricatorModularTransactionType.php +++ b/src/applications/transactions/storage/PhabricatorModularTransactionType.php @@ -23,10 +23,6 @@ return array(); } - public function willApplyTransactions($object, array $xactions) { - return; - } - public function applyInternalEffects($object, $value) { return; }