mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-29 06:38:52 +00:00
small things... decode_text now checks for bbcode_uid existence. And yes, i know i have screwed up a lot of posts. :/
git-svn-id: file:///svn/phpbb/trunk@4486 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
9dc398f302
commit
924684b000
3 changed files with 12 additions and 10 deletions
|
@ -566,7 +566,8 @@ function decode_text(&$message, $bbcode_uid)
|
||||||
'',
|
'',
|
||||||
''
|
''
|
||||||
);
|
);
|
||||||
$message = str_replace($search, $replace, $message);
|
|
||||||
|
$message = ($bbcode_uid) ? str_replace($search, $replace, $message) : str_replace('<br />', "\n", $message);
|
||||||
|
|
||||||
$match = array(
|
$match = array(
|
||||||
'#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
|
'#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
|
||||||
|
|
|
@ -285,7 +285,7 @@ if ($mode == 'edit' && $post_edit_locked && !$auth->acl_get('m_', $forum_id))
|
||||||
|
|
||||||
if ($mode == 'edit')
|
if ($mode == 'edit')
|
||||||
{
|
{
|
||||||
$message_parser->bbcode_uid = $row['bbcode_uid'];
|
$message_parser->bbcode_uid = $bbcode_uid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -806,7 +806,6 @@ if (!sizeof($error) && $preview)
|
||||||
// Decode text for message display
|
// Decode text for message display
|
||||||
$bbcode_uid = ($mode == 'quote' && !$preview) ? $row['bbcode_uid'] : $message_parser->bbcode_uid;
|
$bbcode_uid = ($mode == 'quote' && !$preview) ? $row['bbcode_uid'] : $message_parser->bbcode_uid;
|
||||||
|
|
||||||
|
|
||||||
decode_text($post_text, $bbcode_uid);
|
decode_text($post_text, $bbcode_uid);
|
||||||
if ($subject)
|
if ($subject)
|
||||||
{
|
{
|
||||||
|
@ -1732,11 +1731,14 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_
|
||||||
|
|
||||||
case 'edit_first_post':
|
case 'edit_first_post':
|
||||||
case 'edit':
|
case 'edit':
|
||||||
$sql_data['post']['sql'] = array(
|
if (!$auth->acl_gets('m_', 'a_'))
|
||||||
'post_edit_time' => $current_time
|
{
|
||||||
);
|
$sql_data['post']['sql'] = array(
|
||||||
|
'post_edit_time' => $current_time
|
||||||
|
);
|
||||||
|
|
||||||
$sql_data['post']['stat'][] = 'post_edit_count = post_edit_count + 1';
|
$sql_data['post']['stat'][] = 'post_edit_count = post_edit_count + 1';
|
||||||
|
}
|
||||||
|
|
||||||
case 'edit_topic':
|
case 'edit_topic':
|
||||||
case 'edit_last_post':
|
case 'edit_last_post':
|
||||||
|
@ -1880,7 +1882,6 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_
|
||||||
unset($sql_data['post']['sql']);
|
unset($sql_data['post']['sql']);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Now only updates are performed to the topics and posts table
|
|
||||||
// Update the topics table
|
// Update the topics table
|
||||||
if (isset($sql_data['topic']['sql']))
|
if (isset($sql_data['topic']['sql']))
|
||||||
{
|
{
|
||||||
|
|
|
@ -97,7 +97,7 @@ function addquote(post_id, username) {
|
||||||
|
|
||||||
<td valign="top"><table width="100%" cellspacing="0" cellpadding="5" border="0">
|
<td valign="top"><table width="100%" cellspacing="0" cellpadding="5" border="0">
|
||||||
<tr>
|
<tr>
|
||||||
<td height="120" valign="top"><table width="100%" cellspacing="0" cellpadding="2">
|
<td valign="top"><table width="100%" cellspacing="0" cellpadding="2">
|
||||||
<tr>
|
<tr>
|
||||||
<td><div id="message_{postrow.POST_ID}" class="postbody">{postrow.MESSAGE}</div></td>
|
<td><div id="message_{postrow.POST_ID}" class="postbody">{postrow.MESSAGE}</div></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
Loading…
Add table
Reference in a new issue