a79dd34 Use #uri helper in #current_url