diff options
author | Marc Alexander <admin@m-a-styles.de> | 2013-11-23 00:54:40 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2013-11-23 00:54:56 +0100 |
commit | 943ab555da799fd94b221d5cd0a82fce568de042 (patch) | |
tree | 613e88d68c78b7680a8e5b3654c52552c7a2598a /phpBB/phpbb/class_loader.php | |
parent | e108418824857e670a92f516285455f79bf6e12a (diff) | |
parent | 0d0b2627f723c3003af0ea301511a972008e7734 (diff) | |
download | forums-943ab555da799fd94b221d5cd0a82fce568de042.tar forums-943ab555da799fd94b221d5cd0a82fce568de042.tar.gz forums-943ab555da799fd94b221d5cd0a82fce568de042.tar.bz2 forums-943ab555da799fd94b221d5cd0a82fce568de042.tar.xz forums-943ab555da799fd94b221d5cd0a82fce568de042.zip |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912
Conflicts:
phpBB/config/services.yml
Diffstat (limited to 'phpBB/phpbb/class_loader.php')
-rw-r--r-- | phpBB/phpbb/class_loader.php | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/phpBB/phpbb/class_loader.php b/phpBB/phpbb/class_loader.php index 769f28b4f1..37b62fff24 100644 --- a/phpBB/phpbb/class_loader.php +++ b/phpBB/phpbb/class_loader.php @@ -10,14 +10,6 @@ namespace phpbb; /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -/** * The class loader resolves class names to file system paths and loads them if * necessary. * @@ -55,7 +47,7 @@ class class_loader * @param \phpbb\cache\driver\driver_interface $cache An implementation of the phpBB cache interface. */ public function __construct($namespace, $path, $php_ext = 'php', \phpbb\cache\driver\driver_interface $cache = null) - { + { if ($namespace[0] !== '\\') { $namespace = '\\' . $namespace; |