Add one more check to skip getting into code that will do nothing
Merge branch 'phpng' of git.php.net:php-src into phpng