Fix for php 5.5
Merge branch 'master' of github.com:yushine/ECShop