makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2192 from bantu/ticket/12314

Browse source 
[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
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/phpbb/class_loader.php
View file

@ -141,8 +141,14 @@ class class_loader
* @param string $class The class name which is being loaded. * @param string $class The class name which is being loaded.
*/ */
public function load_class($class) public function load_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; $class = '\\' . $class;
}
if (substr($class, 0, strlen($this->namespace)) === $this->namespace) if (substr($class, 0, strlen($this->namespace)) === $this->namespace)
{ {
$path = $this->resolve_path($class); $path = $this->resolve_path($class);