diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2009-12-09 22:16:53 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2009-12-09 22:16:53 +0000 |
| commit | 3665540ffb565f0a9fe19bc316a594b7011c3c69 (patch) | |
| tree | 4d2f1fd39af593f64946493a07754fd8806a8a14 | |
| parent | 25545c06b25644a093f442b42bd97bab627aa3e5 (diff) | |
| download | forums-3665540ffb565f0a9fe19bc316a594b7011c3c69.tar forums-3665540ffb565f0a9fe19bc316a594b7011c3c69.tar.gz forums-3665540ffb565f0a9fe19bc316a594b7011c3c69.tar.bz2 forums-3665540ffb565f0a9fe19bc316a594b7011c3c69.tar.xz forums-3665540ffb565f0a9fe19bc316a594b7011c3c69.zip | |
Check for required eAccelerator functions #54465
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10309 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/acm/acm_eaccelerator.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/acm/acm_memory.php | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index ddff2266f9..c0ae5b917a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -107,6 +107,7 @@ <li>[Fix] Correctly take post time instead of topic time for the overall forum feed statistics row. (Bug #55005)</li> <li>[Fix] Posting errors with CAPTCHAs using user::add_lang(). (Bug #55245)</li> <li>[Fix] Use memcache::replace() instead of memcache::set() for existing keys to prevent problems.</li> + <li>[Fix] Check for required functions in eAccelerator. (Bug #54465).</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> <li>[Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)</li> </ul> diff --git a/phpBB/includes/acm/acm_eaccelerator.php b/phpBB/includes/acm/acm_eaccelerator.php index 1a3cf3c0f7..645067c199 100644 --- a/phpBB/includes/acm/acm_eaccelerator.php +++ b/phpBB/includes/acm/acm_eaccelerator.php @@ -30,6 +30,7 @@ if (!class_exists('acm_memory')) class acm extends acm_memory { var $extension = 'eaccelerator'; + var $function = 'eaccelerator_get'; var $serialize_header = '#phpbb-serialized#'; diff --git a/phpBB/includes/acm/acm_memory.php b/phpBB/includes/acm/acm_memory.php index 1ed4fb0d55..e315e979e5 100644 --- a/phpBB/includes/acm/acm_memory.php +++ b/phpBB/includes/acm/acm_memory.php @@ -47,6 +47,11 @@ class acm_memory trigger_error("Could not find required extension [{$this->extension}] for the ACM module $acm_type.", E_USER_ERROR); } + + if (isset($this->function) && !function_exists($this->function)) + { + trigger_error("The required function [{$this->function}] is not available for the ACM module $acm_type.", E_USER_ERROR); + } } /** |