From 3665540ffb565f0a9fe19bc316a594b7011c3c69 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Wed, 9 Dec 2009 22:16:53 +0000 Subject: Check for required eAccelerator functions #54465 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10309 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acm/acm_memory.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/includes/acm/acm_memory.php') 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); + } } /** -- cgit v1.2.1 From faf95e858f7bb7f1a0123569f2a27efde6062ea4 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 25 Dec 2009 15:55:35 +0000 Subject: Bug #55865 - Correctly move sql_row_pointer forward when calling sql_fetchfield() on cached queries. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10379 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acm/acm_memory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/acm/acm_memory.php') diff --git a/phpBB/includes/acm/acm_memory.php b/phpBB/includes/acm/acm_memory.php index e315e979e5..1a672ad7e1 100644 --- a/phpBB/includes/acm/acm_memory.php +++ b/phpBB/includes/acm/acm_memory.php @@ -364,7 +364,7 @@ class acm_memory { if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id])) { - return (isset($this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field])) ? $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field] : false; + return (isset($this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field])) ? $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++][$field] : false; } return false; -- cgit v1.2.1 From 4a80b883ab27267f801eec825fb9c8228ba696ab Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Thu, 7 Jan 2010 09:09:39 +0000 Subject: Oops thanks rxu, fixes r10309 refs #54465 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10396 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acm/acm_memory.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/includes/acm/acm_memory.php') diff --git a/phpBB/includes/acm/acm_memory.php b/phpBB/includes/acm/acm_memory.php index 1a672ad7e1..efbfd4dd62 100644 --- a/phpBB/includes/acm/acm_memory.php +++ b/phpBB/includes/acm/acm_memory.php @@ -50,6 +50,8 @@ class acm_memory if (isset($this->function) && !function_exists($this->function)) { + global $acm_type; + trigger_error("The required function [{$this->function}] is not available for the ACM module $acm_type.", E_USER_ERROR); } } -- cgit v1.2.1