Fix infinite redirect loop on cart page

Fix for issue #6319:
https://github.com/woothemes/woocommerce/issues/6319
Merge pull request #6320 from ryanstockau/master

Fix infinite redirect loop on cart page