diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-02-17 13:51:31 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-02-17 13:51:31 +0100 |
| commit | fa5f094197e4361aec36441c747c6355cb4b2564 (patch) | |
| tree | 2f2ccfb647f1c4fa9372c60fa922eff90decd9ce /phpBB/includes | |
| parent | d70c3f1eb8c0ddc68d8eda1bd8708c4957c21182 (diff) | |
| parent | a24ba9dc2db66309851476a7436db483089f8988 (diff) | |
| download | forums-fa5f094197e4361aec36441c747c6355cb4b2564.tar forums-fa5f094197e4361aec36441c747c6355cb4b2564.tar.gz forums-fa5f094197e4361aec36441c747c6355cb4b2564.tar.bz2 forums-fa5f094197e4361aec36441c747c6355cb4b2564.tar.xz forums-fa5f094197e4361aec36441c747c6355cb4b2564.zip | |
Merge branch 'develop' into ticket/10380
* develop:
[ticket/10652] Fixing typo in template class
[ticket/10645] Missing CSS for checkboxes
[ticket/10614] Change not installed heading to available.
[ticket/10614] Unbreak all_available on extension manager.
[ticket/10614] Check if cache exists before destroying it
[ticket/10614] Remove ext manager exceptions for now
[ticket/10614] Refactor list command to use manager API
[ticket/10614] Add purge command
[ticket/10614] Tweak list output, show state, purge cache, handle missing exts
[ticket/10614] Make script accessible from anywhere
[ticket/10614] Better usage output
[ticket/10614] Add a script to enable, disable and view status of extensions.
[ticket/10500] Use correct class name in @uses.
[ticket/10500] Fix phpbb_template_compile instantiation.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/extension/manager.php | 30 | ||||
| -rw-r--r-- | phpBB/includes/template/template.php | 4 |
2 files changed, 30 insertions, 4 deletions
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php index 438578e7e7..c38f0df32e 100644 --- a/phpBB/includes/extension/manager.php +++ b/phpBB/includes/extension/manager.php @@ -61,7 +61,7 @@ class phpbb_extension_manager * * @return null */ - protected function load_extensions() + public function load_extensions() { $sql = 'SELECT * FROM ' . $this->extension_table; @@ -167,6 +167,11 @@ class phpbb_extension_manager $this->db->sql_query($sql); } + if ($this->cache) + { + $this->cache->destroy($this->cache_name); + } + return !$active; } @@ -219,6 +224,11 @@ class phpbb_extension_manager WHERE ext_name = '" . $this->db->sql_escape($name) . "'"; $this->db->sql_query($sql); + if ($this->cache) + { + $this->cache->destroy($this->cache_name); + } + return true; } @@ -234,6 +244,11 @@ class phpbb_extension_manager WHERE ext_name = '" . $this->db->sql_escape($name) . "'"; $this->db->sql_query($sql); + if ($this->cache) + { + $this->cache->destroy($this->cache_name); + } + return false; } @@ -292,6 +307,11 @@ class phpbb_extension_manager WHERE ext_name = '" . $this->db->sql_escape($name) . "'"; $this->db->sql_query($sql); + if ($this->cache) + { + $this->cache->destroy($this->cache_name); + } + return true; } @@ -301,6 +321,11 @@ class phpbb_extension_manager WHERE ext_name = '" . $this->db->sql_escape($name) . "'"; $this->db->sql_query($sql); + if ($this->cache) + { + $this->cache->destroy($this->cache_name); + } + return false; } @@ -329,7 +354,8 @@ class phpbb_extension_manager $available = array(); $iterator = new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/')); + new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/'), + RecursiveIteratorIterator::SELF_FIRST); foreach ($iterator as $file_info) { if ($file_info->isFile() && $file_info->getFilename() == 'ext' . $this->phpEx) diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php index 989322320b..9297b759ac 100644 --- a/phpBB/includes/template/template.php +++ b/phpBB/includes/template/template.php @@ -128,7 +128,7 @@ class phpbb_template { $templates = array($template_name => $template_path); - if ($fallback_template_path !== false) + if ($fallback_template_name !== false) { $templates[$fallback_template_name] = $fallback_template_path; } @@ -306,7 +306,7 @@ class phpbb_template * * @param string $handle Handle of the template to load * @return phpbb_template_renderer Template renderer object, or null on failure - * @uses template_compile is used to compile template source + * @uses phpbb_template_compile is used to compile template source */ private function _tpl_load($handle) { |