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);