Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop-2.1.x' of https://github.com/board3/Board3-Portal into feature/module_services

Browse Source 
Conflicts:
	portal/includes/functions.php
This commit is contained in:
Marc Alexander
2013-11-14 18:33:31 +01:00
parent 0eacefc1da da964d047b
commit fefa2c8cd9
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
portal/includes/functions.php
View File

@@ -98,7 +98,7 @@ function obtain_portal_modules()
// fetch post for news & announce
function phpbb_fetch_posts($module_id, $forum_from, $permissions, $number_of_posts, $text_length, $time, $type, $start = 0, $invert = false)
{
global $db, $phpbb_root_path, $auth, $user, $bbcode_bitfield, $bbcode, $portal_config, $config;
global $db, $phpbb_root_path, $auth, $user, $bbcode_bitfield, $bbcode, $portal_config, $config, $cache;
$posts = $update_count = array();
$post_time = ($time == 0) ? '' : 'AND t.topic_time > ' . (time() - $time * 86400);
@@ -183,14 +183,23 @@ function phpbb_fetch_posts($module_id, $forum_from, $permissions, $number_of_pos
if ($type == 'announcements' && $global_f < 1)
{
$sql = 'SELECT forum_id
FROM ' . FORUMS_TABLE . '
WHERE forum_type = ' . FORUM_POST . '
' . str_replace('t.', '', $str_where) . '
ORDER BY forum_id';
$result = $db->sql_query_limit($sql, 1);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
if (!empty($str_where) || ($row = $cache->get('_forum_id_first_forum_post')) === false)
{
$sql = 'SELECT forum_id
FROM ' . FORUMS_TABLE . '
WHERE forum_type = ' . FORUM_POST . '
' . str_replace('t.', '', $str_where) . '
ORDER BY forum_id';
$result = $db->sql_query_limit($sql, 1);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
if (empty($str_where))
{
// Cache first forum ID for one day = 86400 s
$cache->put('_forum_id_first_forum_post', $row, 86400);
}
}
if (!sizeof($row))
{