diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-03-28 22:25:48 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-03-28 22:25:48 -0400 |
| commit | b7909ba71bf466d91d9072f1e6ba8d523e2ea5ef (patch) | |
| tree | 415ffe47e8605fe59f6bf14e57a72ba0047ffb4e | |
| parent | 6d0b7bba3fb883d21a1c3a5338862d4be5720992 (diff) | |
| parent | bd0ba372078d10a093bd09b1b58839fa7b39daf0 (diff) | |
| download | forums-b7909ba71bf466d91d9072f1e6ba8d523e2ea5ef.tar forums-b7909ba71bf466d91d9072f1e6ba8d523e2ea5ef.tar.gz forums-b7909ba71bf466d91d9072f1e6ba8d523e2ea5ef.tar.bz2 forums-b7909ba71bf466d91d9072f1e6ba8d523e2ea5ef.tar.xz forums-b7909ba71bf466d91d9072f1e6ba8d523e2ea5ef.zip | |
Merge pull request #2192 from bantu/ticket/12314
[ticket/12314] Workaround HHVM SPL autoloader sometimes using leading ba...
| -rw-r--r-- | phpBB/phpbb/class_loader.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/phpbb/class_loader.php b/phpBB/phpbb/class_loader.php index 37b62fff24..ee9767148b 100644 --- a/phpBB/phpbb/class_loader.php +++ b/phpBB/phpbb/class_loader.php @@ -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); |