Merge branch '2.1.x'

This commit is contained in:
Marc Alexander
2015-12-10 12:55:11 +01:00
2 changed files with 4 additions and 4 deletions

View File

@@ -136,7 +136,7 @@ class recent extends module_base
AND topic_moved_id = 0
' . $sql_where . $forum_sql . '
ORDER BY topic_time DESC';
$result = $this->db->sql_query_limit($sql, $this->config['board3_max_topics_' . $module_id], 0 , 600);
$result = $this->db->sql_query_limit($sql, $this->config['board3_max_topics_' . $module_id], 0 , 30);
while (($row = $this->db->sql_fetchrow($result)) && ($row['topic_title']))
{
@@ -162,7 +162,7 @@ class recent extends module_base
AND topic_moved_id = 0
' . $sql_where . $forum_sql . '
ORDER BY topic_time DESC';
$result = $this->db->sql_query_limit($sql, $this->config['board3_max_topics_' . $module_id], 0, 600);
$result = $this->db->sql_query_limit($sql, $this->config['board3_max_topics_' . $module_id], 0, 30);
while (($row = $this->db->sql_fetchrow($result)) && ($row['topic_title']))
{
@@ -189,7 +189,7 @@ class recent extends module_base
AND topic_moved_id = 0
' . $sql_where . $forum_sql . '
ORDER BY topic_time DESC';
$result = $this->db->sql_query_limit($sql, $this->config['board3_max_topics_' . $module_id], 0, 600);
$result = $this->db->sql_query_limit($sql, $this->config['board3_max_topics_' . $module_id], 0, 30);
while (($row = $this->db->sql_fetchrow($result)) && ($row['topic_title']))
{

View File

@@ -266,7 +266,7 @@ class fetch_posts
// Cache queries for 30 seconds
if ($number_of_posts != 0)
{
$result = $this->db->sql_query_limit($sql, $number_of_posts, $start, 600);
$result = $this->db->sql_query_limit($sql, $number_of_posts, $start, 30);
}
else
{