diff options
| author | Remco Bloemen <remco@wicked.ventures> | 2018-08-25 09:54:15 +0800 |
|---|---|---|
| committer | Remco Bloemen <remco@wicked.ventures> | 2018-08-25 09:54:15 +0800 |
| commit | d652deea232417bbef223bde46d8c12e9922b277 (patch) | |
| tree | f40e28c1231fa6646aae3354f3e58d98fa000e14 /packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol | |
| parent | 6b866d60533c7e46446bfb69639b07affd1aeb17 (diff) | |
| parent | f938c989e3e07161de20dd865baf59eecdde872d (diff) | |
| download | dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar.gz dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar.zst dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.zip | |
Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js into fix/contracts/robustMatching
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol')
| -rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol index 821d30279..4a59b6c0f 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol @@ -155,7 +155,8 @@ contract MixinTransactions is view returns (address) { - address contextAddress = currentContextAddress == address(0) ? msg.sender : currentContextAddress; + address currentContextAddress_ = currentContextAddress; + address contextAddress = currentContextAddress_ == address(0) ? msg.sender : currentContextAddress_; return contextAddress; } } |