Shanghia/Hong Kong

I'm planning to fly from London to New Zealand and would like to stop over in Shanghai to visit a friend. If I fly in and out of Shanghai and stay within the 72 hour limit, I understand that I don't need a Visa. Do the same conditions apply if I fly into Hong Kong and then out of Shanghai?