- Patch #1057242 by drunken monkey: entity_uri() should not use ->uri (was ->uri doesn't match the contract for uri callbacks).