fix PM replies after autocomplete changes
This commit is contained in:
parent
547007e199
commit
8a5dcf64d8
|
@ -172,7 +172,7 @@ function message_content(&$a) {
|
||||||
));
|
));
|
||||||
|
|
||||||
$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
|
$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
|
||||||
|
|
||||||
|
|
||||||
$prename = $preurl = $preid = '';
|
$prename = $preurl = $preid = '';
|
||||||
|
|
||||||
|
@ -188,7 +188,7 @@ function message_content(&$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$prefill = (($preselect) ? $prename . ' [' . $preurl . ']' : '');
|
$prefill = (($preselect) ? $prename : '');
|
||||||
|
|
||||||
// the ugly select box
|
// the ugly select box
|
||||||
|
|
||||||
|
@ -198,6 +198,7 @@ function message_content(&$a) {
|
||||||
$o .= replace_macros($tpl,array(
|
$o .= replace_macros($tpl,array(
|
||||||
'$header' => t('Send Private Message'),
|
'$header' => t('Send Private Message'),
|
||||||
'$to' => t('To:'),
|
'$to' => t('To:'),
|
||||||
|
'$showinputs' => 'true',
|
||||||
'$prefill' => $prefill,
|
'$prefill' => $prefill,
|
||||||
'$autocomp' => $autocomp,
|
'$autocomp' => $autocomp,
|
||||||
'$preid' => $preid,
|
'$preid' => $preid,
|
||||||
|
@ -376,9 +377,10 @@ function message_content(&$a) {
|
||||||
|
|
||||||
$seen = $message['seen'];
|
$seen = $message['seen'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
|
$select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
|
||||||
$parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
|
$parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
|
||||||
|
|
||||||
|
|
||||||
$tpl = get_markup_template('mail_display.tpl');
|
$tpl = get_markup_template('mail_display.tpl');
|
||||||
$o = replace_macros($tpl, array(
|
$o = replace_macros($tpl, array(
|
||||||
|
@ -393,6 +395,7 @@ function message_content(&$a) {
|
||||||
// reply
|
// reply
|
||||||
'$header' => t('Send Reply'),
|
'$header' => t('Send Reply'),
|
||||||
'$to' => t('To:'),
|
'$to' => t('To:'),
|
||||||
|
'$showinputs' => '',
|
||||||
'$subject' => t('Subject:'),
|
'$subject' => t('Subject:'),
|
||||||
'$subjtxt' => template_escape($message['title']),
|
'$subjtxt' => template_escape($message['title']),
|
||||||
'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
|
'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
|
||||||
|
|
|
@ -8,8 +8,12 @@ $parent
|
||||||
|
|
||||||
<div id="prvmail-to-label">$to</div>
|
<div id="prvmail-to-label">$to</div>
|
||||||
|
|
||||||
|
{{ if $showinputs }}
|
||||||
<input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
|
<input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
|
||||||
<input type="hidden" id="recip-complete" name="messageto" value="$preid">
|
<input type="hidden" id="recip-complete" name="messageto" value="$preid">
|
||||||
|
{{ else }}
|
||||||
|
$select
|
||||||
|
{{ endif }}
|
||||||
|
|
||||||
<div id="prvmail-subject-label">$subject</div>
|
<div id="prvmail-subject-label">$subject</div>
|
||||||
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
|
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
|
||||||
|
|
Loading…
Reference in a new issue