Merge pull request #862 from nupplaphil/bugs/6917-php_warning