From 25fa29e6e14e3e2d5551b868ee4c433ae9708e60 Mon Sep 17 00:00:00 2001
From: Jacob Evans <jacob@dekz.net>
Date: Wed, 20 Jun 2018 10:01:41 +1000
Subject: Update after rebase

---
 .../contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol
index d09aba599..9dc9e6525 100644
--- a/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol
@@ -53,13 +53,7 @@ contract MixinERC721Transfer is
             bytes memory receiverData
         ) = decodeERC721AssetData(assetData);
 
-        // Transfer token. Saves gas by calling safeTransferFrom only
-        // when there is receiverData present. Either succeeds or throws.
-        if (receiverData.length > 0) {
-            ERC721Token(token).safeTransferFrom(from, to, tokenId, receiverData);
-        } else {
-            ERC721Token(token).transferFrom(from, to, tokenId);
-        }
+        ERC721Token(token).safeTransferFrom(from, to, tokenId, receiverData);
     }
 
     /// @dev Decodes ERC721 Asset data.
-- 
cgit v1.2.3