diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-03 18:30:45 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-03 18:30:45 +0100 |
| commit | a09d022d5e50263d131711cdf936e6a4f690069b (patch) | |
| tree | 5e256069299afbc870c46abc28f930788cad7a83 | |
| parent | 5347eac69cfd0946dadfc6c2f3cb71709ca1895c (diff) | |
| parent | 4e06ab16f008a48944f1dfde1d06394126e54541 (diff) | |
| download | forums-a09d022d5e50263d131711cdf936e6a4f690069b.tar forums-a09d022d5e50263d131711cdf936e6a4f690069b.tar.gz forums-a09d022d5e50263d131711cdf936e6a4f690069b.tar.bz2 forums-a09d022d5e50263d131711cdf936e6a4f690069b.tar.xz forums-a09d022d5e50263d131711cdf936e6a4f690069b.zip | |
Merge branch 'ticket/13348-olympus' into ticket/13348
Conflicts:
phpBB/feed.php
| -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) |