aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-08-29 20:14:23 -0400
committerNils Adermann <naderman@naderman.de>2011-09-29 15:42:49 +0200
commitc785ef7aa7953c5e533e48b11ef13d6b1f344813 (patch)
tree49363b193236619c0eed69fbd68b965d0e64748c /phpBB
parent018a8359974273b65a3e6bd8aeca75396fd36a5b (diff)
downloadforums-c785ef7aa7953c5e533e48b11ef13d6b1f344813.tar
forums-c785ef7aa7953c5e533e48b11ef13d6b1f344813.tar.gz
forums-c785ef7aa7953c5e533e48b11ef13d6b1f344813.tar.bz2
forums-c785ef7aa7953c5e533e48b11ef13d6b1f344813.tar.xz
forums-c785ef7aa7953c5e533e48b11ef13d6b1f344813.zip
[feature/extension-manager] Make sure the extension manager works without cache
Includes a test for manager without a cache PHPBB3-10323
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/extension/manager.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 443eaf011b..a6c8ebb3d0 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -48,7 +48,7 @@ class phpbb_extension_manager
$this->extension_table = $extension_table;
$this->cache_name = $cache_name;
- $this->extensions = $this->cache->get($this->cache_name);
+ $this->extensions = ($this->cache) ? $this->cache->get($this->cache_name) : false;
if ($this->extensions === false)
{
@@ -78,7 +78,11 @@ class phpbb_extension_manager
}
ksort($this->extensions);
- $this->cache->put($this->cache_name, $this->extensions);
+
+ if ($this->cache)
+ {
+ $this->cache->put($this->cache_name, $this->extensions);
+ }
}
/**