makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ticket/13348-olympus' into ticket/13348

Browse source 
Conflicts:
	phpBB/feed.php
This commit is contained in:
Marc Alexander 2015-02-03 18:30:45 +01:00
commit a09d022d5e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/phpbb/feed/base.php
View file

@ -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)