Just rewatched this last night (getting ready for DOFP, doing a marathon). Totally forgot that Logan gets his adamantium claws chopped off!! I wonder how they're going to deal with this in the new movie. Even in the teaser scene at the end in the airport, he has bone claws.
FWIW, the promo posters show Wolverine with adamantium claws in the present, and bone claws in the past.