diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-04-24 17:07:30 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-04-24 17:45:30 -0500 |
| commit | e870c04067772d227c4254533826f01252608f26 (patch) | |
| tree | 8d45dc6fab525062f3f7adc0cc667c41c1c4c826 | |
| parent | f8ffe849690b2c9aa7ee446e404c52a880ad74d6 (diff) | |
| download | forums-e870c04067772d227c4254533826f01252608f26.tar forums-e870c04067772d227c4254533826f01252608f26.tar.gz forums-e870c04067772d227c4254533826f01252608f26.tar.bz2 forums-e870c04067772d227c4254533826f01252608f26.tar.xz forums-e870c04067772d227c4254533826f01252608f26.zip | |
[ticket/11335] (class loader) Make php_ext 'php' not '.php'
PHPBB3-11335
| -rw-r--r-- | phpBB/config/services.yml | 4 | ||||
| -rw-r--r-- | phpBB/includes/class_loader.php | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 3b60f0e83e..502a3c418f 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -36,7 +36,7 @@ services: arguments: - phpbb_ - %core.root_path%includes/ - - .%core.php_ext% + - %core.php_ext% calls: - [register, []] - [set_cache, [@cache.driver]] @@ -46,7 +46,7 @@ services: arguments: - phpbb_ext_ - %core.root_path%ext/ - - .%core.php_ext% + - %core.php_ext% calls: - [register, []] - [set_cache, [@cache.driver]] diff --git a/phpBB/includes/class_loader.php b/phpBB/includes/class_loader.php index 6082800908..02a2d584dc 100644 --- a/phpBB/includes/class_loader.php +++ b/phpBB/includes/class_loader.php @@ -52,7 +52,7 @@ class phpbb_class_loader * @param string $php_ext The file extension for PHP files * @param phpbb_cache_driver_interface $cache An implementation of the phpBB cache interface. */ - public function __construct($prefix, $path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null) + public function __construct($prefix, $path, $php_ext = 'php', phpbb_cache_driver_interface $cache = null) { $this->prefix = $prefix; $this->path = $path; @@ -111,7 +111,7 @@ class phpbb_class_loader { if (isset($this->cached_paths[$class])) { - return $this->path . $this->cached_paths[$class] . $this->php_ext; + return $this->path . $this->cached_paths[$class] . '.' . $this->php_ext; } if (!preg_match('/^' . $this->prefix . '[a-zA-Z0-9_]+$/', $class)) @@ -136,7 +136,7 @@ class phpbb_class_loader $relative_path = $dirs . implode(array_slice($parts, $i, sizeof($parts) - $i), '_'); - if (!file_exists($this->path . $relative_path . $this->php_ext)) + if (!file_exists($this->path . $relative_path . '.' . $this->php_ext)) { return false; } @@ -147,7 +147,7 @@ class phpbb_class_loader $this->cache->put('class_loader_' . $this->prefix, $this->cached_paths); } - return $this->path . $relative_path . $this->php_ext; + return $this->path . $relative_path . '.' . $this->php_ext; } /** |