mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
'post encoding'-fix
git-svn-id: file:///svn/phpbb/trunk@4762 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
8d5dc5ed1b
commit
9d06365ec7
2 changed files with 9 additions and 5 deletions
|
@ -452,6 +452,7 @@ class mcp_main extends mcp
|
|||
'U_MCP_QUEUE' => $this->url . '&mode=approve&t=' . $row['topic_id'],
|
||||
'U_MCP_REPORT' => $this->url . '&mode=reports&t=' . $row['topic_id'],
|
||||
|
||||
'ATTACH_ICON_IMG' => ($auth->acl_gets('f_download', 'u_download', $row['forum_id']) && $row['topic_attachment']) ? $user->img('icon_attach', sprintf($user->lang['TOTAL_ATTACHMENTS'], $row['topic_attachment'])) : '',
|
||||
'TOPIC_FOLDER_IMG' => $folder_img,
|
||||
'TOPIC_TYPE' => $topic_type,
|
||||
'TOPIC_TITLE' => $topic_title,
|
||||
|
|
|
@ -619,8 +619,9 @@ if (!empty($poll_start))
|
|||
setcookie($config['cookie_name'] . '_poll_' . $topic_id, implode(',', $voted_id), time() + 31536000, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']);
|
||||
}
|
||||
|
||||
//, topic_last_post_time = ' . time() . "
|
||||
$sql = 'UPDATE ' . TOPICS_TABLE . '
|
||||
SET poll_last_vote = ' . time() . ', topic_last_post_time = ' . time() . "
|
||||
SET poll_last_vote = ' . time() . "
|
||||
WHERE topic_id = $topic_id";
|
||||
$db->sql_query($sql);
|
||||
|
||||
|
@ -744,7 +745,7 @@ while ($row = $db->sql_fetchrow($result))
|
|||
{
|
||||
if ($row['user_karma'] < $user->data['user_min_karma'])
|
||||
{
|
||||
$rowset[] = array(
|
||||
$rowset[$row['post_id']] = array(
|
||||
'below_karma' => TRUE,
|
||||
'post_id' => $row['post_id'],
|
||||
'poster' => $poster,
|
||||
|
@ -755,7 +756,7 @@ while ($row = $db->sql_fetchrow($result))
|
|||
}
|
||||
else if ($row['foe'])
|
||||
{
|
||||
$rowset[] = array(
|
||||
$rowset[$row['post_id']] = array(
|
||||
'foe' => TRUE,
|
||||
'post_id' => $row['post_id'],
|
||||
'poster' => $poster,
|
||||
|
@ -1004,13 +1005,15 @@ if (count($attach_list))
|
|||
$db->sql_query($sql);
|
||||
}
|
||||
}
|
||||
elseif ($has_attachments && !$topic_data['topic_attachment'])
|
||||
else if ($has_attachments && !$topic_data['topic_attachment'])
|
||||
{
|
||||
// Topic has approved attachments but its flag is wrong
|
||||
$sql = 'UPDATE ' . TOPICS_TABLE . "
|
||||
SET topic_attachment = 1
|
||||
WHERE topic_id = $topic_id";
|
||||
$db->sql_query($sql);
|
||||
|
||||
$topic_data['topic_attachment'] = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@ -1084,7 +1087,7 @@ for ($i = 0; $i < count($post_list); ++$i)
|
|||
// End signature parsing, only if needed
|
||||
if ($user_cache[$poster_id]['sig'] && empty($user_cache[$poster_id]['sig_parsed']))
|
||||
{
|
||||
$user_cache[$poster_id]['sig'] = ($config['enable_smilies']) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $user_cache[$poster_id]['sig']) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $user_cache[$poster_id]['sig']);
|
||||
$user_cache[$poster_id]['sig'] = (!$config['enable_smilies'] || !$user->optionget('viewsmilies')) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $user_cache[$poster_id]['sig']) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $user_cache[$poster_id]['sig']);
|
||||
|
||||
if ($user_cache[$poster_id]['sig_bbcode_bitfield'])
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue