Merge upstream master into patched/master

bce05004 · github-actions · 16793c38 · 62eb4568 · bce05004
Commit bce05004 authored Mar 08, 2022 by github-actions
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

ERC721.sol contracts/token/ERC721/ERC721.sol +1 -1

No files found.
--- a/contracts/token/ERC721/ERC721.sol
+++ b/contracts/token/ERC721/ERC721.sol
@@ -232,7 +232,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
    function _isApprovedOrOwner(address spender, uint256 tokenId) internal view virtual returns (bool) {
        require(_exists(tokenId), "ERC721: operator query for nonexistent token");
        address owner = ERC721.ownerOf(tokenId);
-        return (spender == owner || getApproved(tokenId) == spender || isApprovedForAll(owner, spender));
+        return (spender == owner || isApprovedForAll(owner, spender) || getApproved(tokenId) == spender);
    }

    /**