diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-08-29 18:44:43 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-29 15:42:48 +0200 |
| commit | bd1366d62d018c6b71ea24b1f9915d89d4a240a5 (patch) | |
| tree | 080b91094d49cacd0126187ba046594814ee303c /phpBB | |
| parent | 64827a6623c9a916d41c2ef5bf2c2092a3008722 (diff) | |
| download | forums-bd1366d62d018c6b71ea24b1f9915d89d4a240a5.tar forums-bd1366d62d018c6b71ea24b1f9915d89d4a240a5.tar.gz forums-bd1366d62d018c6b71ea24b1f9915d89d4a240a5.tar.bz2 forums-bd1366d62d018c6b71ea24b1f9915d89d4a240a5.tar.xz forums-bd1366d62d018c6b71ea24b1f9915d89d4a240a5.zip | |
[feature/extension-manager] Use _ext for cache - avoids conflict with file ext
PHPBB3-10323
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/extension/finder.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/extension/manager.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php index b3cdbd6ab9..7ba477582c 100644 --- a/phpBB/includes/extension/finder.php +++ b/phpBB/includes/extension/finder.php @@ -66,7 +66,7 @@ class phpbb_extension_finder 'directory' => false, ); - $this->cached_queries = ($this->cache) ? $this->cache->get('_extension_finder') : false; + $this->cached_queries = ($this->cache) ? $this->cache->get('_ext_finder') : false; } /** @@ -284,7 +284,7 @@ class phpbb_extension_finder if ($cache && $this->cache) { $this->cached_queries[$query] = $files; - $this->cache->put('_extension_finder', $this->cached_queries); + $this->cache->put('_ext_finder', $this->cached_queries); } return $files; diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php index e1e7571573..45250e623a 100644 --- a/phpBB/includes/extension/manager.php +++ b/phpBB/includes/extension/manager.php @@ -45,7 +45,7 @@ class phpbb_extension_manager $this->phpEx = $phpEx; $this->extension_table = $extension_table; - $this->extensions = $this->cache->get('_extensions'); + $this->extensions = $this->cache->get('_ext'); if ($this->extensions === false) { @@ -75,7 +75,7 @@ class phpbb_extension_manager } ksort($this->extensions); - $this->cache->put('_extensions', $this->extensions); + $this->cache->put('_ext', $this->extensions); } /** |