diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-02-03 20:36:41 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-02-03 20:36:41 +0100 |
| commit | 8832851b8e29c9a1969f61c8b8c82ef33639f34d (patch) | |
| tree | 5e256069299afbc870c46abc28f930788cad7a83 | |
| parent | 5347eac69cfd0946dadfc6c2f3cb71709ca1895c (diff) | |
| parent | a09d022d5e50263d131711cdf936e6a4f690069b (diff) | |
| download | forums-8832851b8e29c9a1969f61c8b8c82ef33639f34d.tar forums-8832851b8e29c9a1969f61c8b8c82ef33639f34d.tar.gz forums-8832851b8e29c9a1969f61c8b8c82ef33639f34d.tar.bz2 forums-8832851b8e29c9a1969f61c8b8c82ef33639f34d.tar.xz forums-8832851b8e29c9a1969f61c8b8c82ef33639f34d.zip | |
Merge pull request #3366 from marc1706/ticket/13348
[ticket/13348] Use close method to free feed query result handle
* marc1706/ticket/13348:
[ticket/13348] Remove unnecessary global $cache
[ticket/13348] Use close method to free query result handle
| -rw-r--r-- | phpBB/phpbb/feed/base.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/phpbb/feed/base.php b/phpBB/phpbb/feed/base.php index e31854160a..322e2ee9f1 100644 --- a/phpBB/phpbb/feed/base.php +++ b/phpBB/phpbb/feed/base.php @@ -67,6 +67,9 @@ abstract class base */ var $separator_stats = "\xE2\x80\x94"; // — + /** @var mixed Query result handle */ + protected $result; + /** * Constructor * @@ -229,9 +232,7 @@ abstract class base function get_item() { - static $result; - - if (!isset($result)) + if (!isset($this->result)) { if (!$this->get_sql()) { @@ -240,10 +241,10 @@ abstract class base // Query database $sql = $this->db->sql_build_query('SELECT', $this->sql); - $result = $this->db->sql_query_limit($sql, $this->num_items); + $this->result = $this->db->sql_query_limit($sql, $this->num_items); } - return $this->db->sql_fetchrow($result); + return $this->db->sql_fetchrow($this->result); } function user_viewprofile($row) |