mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-05 23:25:30 +02:00
do not ask why i put the pm table there instead of the polls. :o
- remove forum description from title tag (now it's able to hold bbcode etc. resulting in broken layout) git-svn-id: file:///svn/phpbb/trunk@5721 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
80e28a2db7
commit
30a0cf29fb
@ -1111,12 +1111,20 @@ function submit_pm($mode, $subject, &$data, $update_message, $put_in_outbox = tr
|
||||
{
|
||||
foreach ($data['address_list'][$ug_type] as $id => $field)
|
||||
{
|
||||
$id = (int) $id;
|
||||
|
||||
// Do not rely on the address list being "valid"
|
||||
if (!$id)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
$field = ($field == 'to') ? 'to' : 'bcc';
|
||||
if ($ug_type == 'u')
|
||||
{
|
||||
$recipients[$id] = $field;
|
||||
}
|
||||
${$field}[] = $ug_type . '_' . (int) $id;
|
||||
${$field}[] = $ug_type . '_' . $id;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1229,9 +1237,9 @@ function submit_pm($mode, $subject, &$data, $update_message, $put_in_outbox = tr
|
||||
foreach ($recipients as $user_id => $type)
|
||||
{
|
||||
$sql_ary[] = array(
|
||||
'msg_id' => $data['msg_id'],
|
||||
'user_id' => $user_id,
|
||||
'author_id' => $data['from_user_id'],
|
||||
'msg_id' => (int) $data['msg_id'],
|
||||
'user_id' => (int) $user_id,
|
||||
'author_id' => (int) $data['from_user_id'],
|
||||
'folder_id' => PRIVMSGS_NO_BOX,
|
||||
'new' => 1,
|
||||
'unread' => 1,
|
||||
|
@ -1702,7 +1702,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
|
||||
default:
|
||||
foreach ($sql_insert_ary as $ary)
|
||||
{
|
||||
$db->sql_query('INSERT INTO ' . PRIVMSGS_TO_TABLE . ' ' . $db->sql_build_array('INSERT', $ary));
|
||||
$db->sql_query('INSERT INTO ' . POLL_OPTIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $ary));
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
@ -16,7 +16,7 @@ function marklist(form_name, status)
|
||||
|
||||
<!-- IF TOPIC_TITLE or FORUM_NAME -->
|
||||
<div id="pageheader">
|
||||
<h2><!-- IF TOPIC_TITLE --><a class="titles" href="{U_VIEWTOPIC}">{TOPIC_TITLE}</a><!-- ELSE --><a class="titles" href="{U_VIEW_FORUM}" title="{FORUM_DESC}">{FORUM_NAME}</a><!-- ENDIF --></h2>
|
||||
<h2><!-- IF TOPIC_TITLE --><a class="titles" href="{U_VIEWTOPIC}">{TOPIC_TITLE}</a><!-- ELSE --><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><!-- ENDIF --></h2>
|
||||
|
||||
<!-- IF MODERATORS -->
|
||||
<p class="moderators">{L_MODERATORS}: {MODERATORS}</p>
|
||||
|
@ -63,7 +63,7 @@ function checkForm()
|
||||
|
||||
<!-- IF not S_PRIVMSGS -->
|
||||
<div id="pageheader">
|
||||
<h2><!-- IF TOPIC_TITLE --><a class="titles" href="{U_VIEWTOPIC}">{TOPIC_TITLE}</a><!-- ELSE --><a class="titles" href="{U_VIEW_FORUM}" title="{FORUM_DESC}">{FORUM_NAME}</a><!-- ENDIF --></h2>
|
||||
<h2><!-- IF TOPIC_TITLE --><a class="titles" href="{U_VIEWTOPIC}">{TOPIC_TITLE}</a><!-- ELSE --><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><!-- ENDIF --></h2>
|
||||
|
||||
<!-- IF MODERATORS -->
|
||||
<p class="moderators">{L_MODERATORS}: {MODERATORS}</p>
|
||||
|
Loading…
x
Reference in New Issue
Block a user