diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-07 11:34:01 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-07 11:34:01 +0000 |
| commit | a539fca62b10f53a5f5dadf07f9ab07340fdabf9 (patch) | |
| tree | 28f4ab59d1564aefd30709748ce245f993be5f7c /phpBB/includes/acm | |
| parent | 711f482cb62070ab2340aa27c736a85cc6e8c518 (diff) | |
| download | forums-a539fca62b10f53a5f5dadf07f9ab07340fdabf9.tar forums-a539fca62b10f53a5f5dadf07f9ab07340fdabf9.tar.gz forums-a539fca62b10f53a5f5dadf07f9ab07340fdabf9.tar.bz2 forums-a539fca62b10f53a5f5dadf07f9ab07340fdabf9.tar.xz forums-a539fca62b10f53a5f5dadf07f9ab07340fdabf9.zip | |
some corrections, only very minor things.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9554 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acm')
| -rw-r--r-- | phpBB/includes/acm/acm_memcache.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/acm/acm_memory.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acm/acm_null.php | 7 |
3 files changed, 7 insertions, 14 deletions
diff --git a/phpBB/includes/acm/acm_memcache.php b/phpBB/includes/acm/acm_memcache.php index 5a34a2a51d..3077ee9615 100644 --- a/phpBB/includes/acm/acm_memcache.php +++ b/phpBB/includes/acm/acm_memcache.php @@ -32,6 +32,11 @@ if (!defined('PHPBB_ACM_MEMCACHE_COMPRESS')) define('PHPBB_ACM_MEMCACHE_COMPRESS', false); } +if (!defined('PHPBB_ACM_MEMCACHE_HOST')) +{ + define('PHPBB_ACM_MEMCACHE_HOST', 'localhost'); +} + /** * ACM for Memcached * @package acm @@ -48,11 +53,6 @@ class acm extends acm_memory // Call the parent constructor parent::acm_memory(); - if (!defined('PHPBB_ACM_MEMCACHE_HOST')) - { - trigger_error('Missing required constant [PHPBB_ACM_MEMCACHE_HOST] for memcache ACM module.', E_USER_ERROR); - } - $this->memcache = new Memcache; $this->memcache->connect(PHPBB_ACM_MEMCACHE_HOST, PHPBB_ACM_MEMCACHE_PORT); $this->flags = (PHPBB_ACM_MEMCACHE_COMPRESS) ? MEMCACHE_COMPRESSED : 0; diff --git a/phpBB/includes/acm/acm_memory.php b/phpBB/includes/acm/acm_memory.php index c7b5d34a47..fd9b9ff342 100644 --- a/phpBB/includes/acm/acm_memory.php +++ b/phpBB/includes/acm/acm_memory.php @@ -156,7 +156,7 @@ class acm_memory while (($entry = readdir($dir)) !== false) { - if (strpos($entry, 'ctpl_') !== 0 && strpos($entry, 'tpl_') !== 0) + if (strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && strpos($entry, 'tpl_') !== 0) { continue; } @@ -415,7 +415,7 @@ class acm_memory * @access protected * @param string $var Cache key * @return bool True if it exists, otherwise false - */ + */ function _isset($var) { // Most caches don't need to check diff --git a/phpBB/includes/acm/acm_null.php b/phpBB/includes/acm/acm_null.php index c2363b9ddf..fca67115a7 100644 --- a/phpBB/includes/acm/acm_null.php +++ b/phpBB/includes/acm/acm_null.php @@ -27,7 +27,6 @@ class acm */ function acm() { - } /** @@ -43,7 +42,6 @@ class acm */ function unload() { - } /** @@ -51,7 +49,6 @@ class acm */ function save() { - } /** @@ -76,7 +73,6 @@ class acm */ function put($var_name, $var, $ttl = 0) { - } /** @@ -84,7 +80,6 @@ class acm */ function purge() { - } /** @@ -92,7 +87,6 @@ class acm */ function destroy($var_name, $table = '') { - } /** @@ -116,7 +110,6 @@ class acm */ function sql_save($query, &$query_result, $ttl) { - } /** |