No, before you only had the check for the php version which did not work on hhvm because it did not implement it yet. So I think `if ($raw && defined('PHP_QUERY_RFC3986') && version_compare(PHP_VERSION, '5.4.0', '>=')) {` should do the trick in all cases.