diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-21 16:39:57 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-21 16:39:57 +0200 |
| commit | cc0aa90c49f99288cbda33519178a8042f1e4a71 (patch) | |
| tree | b6f4d8b001a8fabb78acf0cb48019547c2be3bff /phpBB/includes/extension/manager.php | |
| parent | 61f05e027d7fa86b3656e5186645de6422a4dc76 (diff) | |
| parent | 87b278bda7504f2f7d0a19dfa6a8552fde50e5a6 (diff) | |
| download | forums-cc0aa90c49f99288cbda33519178a8042f1e4a71.tar forums-cc0aa90c49f99288cbda33519178a8042f1e4a71.tar.gz forums-cc0aa90c49f99288cbda33519178a8042f1e4a71.tar.bz2 forums-cc0aa90c49f99288cbda33519178a8042f1e4a71.tar.xz forums-cc0aa90c49f99288cbda33519178a8042f1e4a71.zip | |
Merge remote-tracking branch 'github-igorw/ticket/11012' into develop
* github-igorw/ticket/11012:
[ticket/11012] Fix php_ext change in mock_extension_manager
[ticket/11012] Normalize $phpEx member vars to $php_ext
Diffstat (limited to 'phpBB/includes/extension/manager.php')
| -rw-r--r-- | phpBB/includes/extension/manager.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php index 537c19aff8..86d8fab64b 100644 --- a/phpBB/includes/extension/manager.php +++ b/phpBB/includes/extension/manager.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) class phpbb_extension_manager { protected $cache; - protected $phpEx; + protected $php_ext; protected $extensions; protected $extension_table; protected $phpbb_root_path; @@ -35,16 +35,16 @@ class phpbb_extension_manager * @param dbal $db A database connection * @param string $extension_table The name of the table holding extensions * @param string $phpbb_root_path Path to the phpbb includes directory. - * @param string $phpEx php file extension + * @param string $php_ext php file extension * @param phpbb_cache_driver_interface $cache A cache instance or null * @param string $cache_name The name of the cache variable, defaults to _ext */ - public function __construct(dbal $db, $extension_table, $phpbb_root_path, $phpEx = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext') + public function __construct(dbal $db, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext') { $this->phpbb_root_path = $phpbb_root_path; $this->db = $db; $this->cache = $cache; - $this->phpEx = $phpEx; + $this->php_ext = $php_ext; $this->extension_table = $extension_table; $this->cache_name = $cache_name; @@ -362,7 +362,7 @@ class phpbb_extension_manager RecursiveIteratorIterator::SELF_FIRST); foreach ($iterator as $file_info) { - if ($file_info->isFile() && $file_info->getFilename() == 'ext' . $this->phpEx) + if ($file_info->isFile() && $file_info->getFilename() == 'ext' . $this->php_ext) { $ext_name = $iterator->getInnerIterator()->getSubPath(); @@ -432,7 +432,7 @@ class phpbb_extension_manager } return $disabled; } - + /** * Check to see if a given extension is available on the filesystem * @@ -462,6 +462,6 @@ class phpbb_extension_manager */ public function get_finder() { - return new phpbb_extension_finder($this, $this->phpbb_root_path, $this->cache, $this->phpEx, $this->cache_name . '_finder'); + return new phpbb_extension_finder($this, $this->phpbb_root_path, $this->cache, $this->php_ext, $this->cache_name . '_finder'); } } |