Merge pull request #2192 from bantu/ticket/12314

[ticket/12314] Workaround HHVM SPL autoloader sometimes using leading ba...
This commit is contained in:
Nils Adermann 2014-03-28 22:25:48 -04:00
commit b7909ba71b

View file

@ -142,7 +142,13 @@ class class_loader
*/
public function load_class($class)
{
$class = '\\' . $class;
// In general $class is not supposed to contain a leading backslash,
// but sometimes it does. See tickets PHP-50731 and HHVM-1840.
if ($class[0] !== '\\')
{
$class = '\\' . $class;
}
if (substr($class, 0, strlen($this->namespace)) === $this->namespace)
{
$path = $this->resolve_path($class);