aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-01-11 00:39:34 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-01-11 00:39:34 +0100
commit30dacf8e4e313355c4694db2455e453a0ed62a11 (patch)
tree8abe56c742fb50ffb2c94428f5cfee31a91892b8
parenteff1d378ccb6e80b6011267c9ce73ab0a316522a (diff)
parentd97181f5a37bae8683f462b2e6341f1ab0189620 (diff)
downloadforums-30dacf8e4e313355c4694db2455e453a0ed62a11.tar
forums-30dacf8e4e313355c4694db2455e453a0ed62a11.tar.gz
forums-30dacf8e4e313355c4694db2455e453a0ed62a11.tar.bz2
forums-30dacf8e4e313355c4694db2455e453a0ed62a11.tar.xz
forums-30dacf8e4e313355c4694db2455e453a0ed62a11.zip
Merge branch 'task/igorw/acm-refactor' into develop
* task/igorw/acm-refactor: [task/acm-refactor] Refactor WinCache ACM module
-rw-r--r--phpBB/includes/cache/driver/wincache.php (renamed from phpBB/includes/acm/acm_wincache.php)8
1 files changed, 1 insertions, 7 deletions
diff --git a/phpBB/includes/acm/acm_wincache.php b/phpBB/includes/cache/driver/wincache.php
index 0501ab74c5..2e1a138ee9 100644
--- a/phpBB/includes/acm/acm_wincache.php
+++ b/phpBB/includes/cache/driver/wincache.php
@@ -15,17 +15,11 @@ if (!defined('IN_PHPBB'))
exit;
}
-// Include the abstract base
-if (!class_exists('acm_memory'))
-{
- require("{$phpbb_root_path}includes/acm/acm_memory.$phpEx");
-}
-
/**
* ACM for WinCache
* @package acm
*/
-class acm extends acm_memory
+class phpbb_cache_driver_wincache extends phpbb_cache_driver_memory
{
var $extension = 'wincache';