diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-04-25 04:01:38 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-04-25 04:01:38 -0700 |
| commit | 7b144bbff2968b8897359b7954f048ce5eb78455 (patch) | |
| tree | d22e4fb4b65d84f835ec8c5573145269b7187f7d /phpBB/includes/class_loader.php | |
| parent | 6d0b183553a63156cbeb4f515bbc22c728c63008 (diff) | |
| parent | 9c4553c41f0e0f2c28fb95b5e56886f77cb759ba (diff) | |
| download | forums-7b144bbff2968b8897359b7954f048ce5eb78455.tar forums-7b144bbff2968b8897359b7954f048ce5eb78455.tar.gz forums-7b144bbff2968b8897359b7954f048ce5eb78455.tar.bz2 forums-7b144bbff2968b8897359b7954f048ce5eb78455.tar.xz forums-7b144bbff2968b8897359b7954f048ce5eb78455.zip | |
Merge pull request #1369 from EXreaction/ticket/11335
Ticket/11335
Diffstat (limited to 'phpBB/includes/class_loader.php')
| -rw-r--r-- | phpBB/includes/class_loader.php | 8 |
1 files changed, 4 insertions, 4 deletions
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; } /** |