Fix a small bug with xcache (thanks bantu), and some code consistency changes

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9544 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith 2009-06-05 15:40:56 +00:00
parent a7c7f6a6a8
commit 9c00496ff5
4 changed files with 7 additions and 24 deletions

View file

@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
// Include the abstract base // Include the abstract base
if (!class_exists('acm_memory')) if (!class_exists('acm_memory'))
{ {
require("${phpbb_root_path}includes/acm/acm_memory.$phpEx"); require("{$phpbb_root_path}includes/acm/acm_memory.$phpEx");
} }
/** /**
@ -30,12 +30,6 @@ class acm extends acm_memory
{ {
var $extension = 'apc'; var $extension = 'apc';
function acm()
{
// Call the parent constructor
parent::acm_memory();
}
/** /**
* Purge cache data * Purge cache data
* *

View file

@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
// Include the abstract base // Include the abstract base
if (!class_exists('acm_memory')) if (!class_exists('acm_memory'))
{ {
require("${phpbb_root_path}includes/acm/acm_memory.$phpEx"); require("{$phpbb_root_path}includes/acm/acm_memory.$phpEx");
} }
/** /**
@ -33,12 +33,6 @@ class acm extends acm_memory
var $serialize_header = '#phpbb-serialized#'; var $serialize_header = '#phpbb-serialized#';
function acm()
{
// Call the parent constructor
parent::acm_memory();
}
/** /**
* Purge cache data * Purge cache data
* *

View file

@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
// Include the abstract base // Include the abstract base
if (!class_exists('acm_memory')) if (!class_exists('acm_memory'))
{ {
require("${phpbb_root_path}includes/acm/acm_memory.$phpEx"); require("{$phpbb_root_path}includes/acm/acm_memory.$phpEx");
} }
if (!defined('PHPBB_ACM_MEMCACHE_PORT')) if (!defined('PHPBB_ACM_MEMCACHE_PORT'))

View file

@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
// Include the abstract base // Include the abstract base
if (!class_exists('acm_memory')) if (!class_exists('acm_memory'))
{ {
require("${phpbb_root_path}includes/acm/acm_memory.$phpEx"); require("{$phpbb_root_path}includes/acm/acm_memory.$phpEx");
} }
/** /**
@ -30,12 +30,6 @@ class acm extends acm_memory
{ {
var $extension = 'xcache'; var $extension = 'xcache';
function acm()
{
// Call the parent constructor
parent::acm_memory();
}
/** /**
* Purge cache data * Purge cache data
* *
@ -62,7 +56,9 @@ class acm extends acm_memory
*/ */
function _read($var) function _read($var)
{ {
return xcache_get($this->key_prefix . $var); $result = xcache_get($this->key_prefix . $var);
return ($result !== null) ? $result : false;
} }
/** /**
@ -100,7 +96,6 @@ class acm extends acm_memory
*/ */
function _isset($var) function _isset($var)
{ {
// Most caches don't need to check
return xcache_isset($this->key_prefix . $var); return xcache_isset($this->key_prefix . $var);
} }
} }