.

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 7ca3fba70af9e939b744ca45b9cdec7797162a22..057797dddaebde38ec350e2e6c042d3ed6ee001f 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -282,25 +282,23 @@ function message_content(&$a) {
 
                $tpl = get_markup_template('prv_message.tpl');
                $o .= replace_macros($tpl,array(
-                       '$reply' => array(
-                               'header' => t('Send Private Message'),
-                               'to' => t('To:'),
-                               'showinputs' => 'true', 
-                               'prefill' => $prefill,
-                               'autocomp' => $autocomp,
-                               'preid' => $preid,
-                               'subject' => t('Subject:'),
-                               'subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
-                               'text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
-                               'readonly' => '',
-                               'yourmessage' => t('Your message:'),
-                               'select' => $select,
-                               'parent' => '',
-                               'upload' => t('Upload photo'),
-                               'insert' => t('Insert web link'),
-                               'wait' => t('Please wait'),
-                               'submit' => t('Submit')
-                       )
+                       '$header' => t('Send Private Message'),
+                       '$to' => t('To:'),
+                       '$showinputs' => 'true', 
+                       '$prefill' => $prefill,
+                       '$autocomp' => $autocomp,
+                       '$preid' => $preid,
+                       '$subject' => t('Subject:'),
+                       '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
+                       '$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
+                       '$readonly' => '',
+                       '$yourmessage' => t('Your message:'),
+                       '$select' => $select,
+                       '$parent' => '',
+                       '$upload' => t('Upload photo'),
+                       '$insert' => t('Insert web link'),
+                       '$wait' => t('Please wait'),
+                       '$submit' => t('Submit')
                ));
 
                return $o;
@@ -497,12 +495,6 @@ function message_content(&$a) {
 
                $tpl = get_markup_template('mail_display.tpl');
 
-               $includes = array(
-                       '$mail_conv' => 'mail_conv.tpl',
-                       '$prv_message' => 'prv_message.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
                if($a->theme['template_engine'] === 'internal') {
                        $subjtxt_e = template_escape($message['title']);
                }
@@ -510,7 +502,7 @@ function message_content(&$a) {
                        $subjtxt_e = $message['title'];
                }
 
-               $o = replace_macros($tpl, $includes + array(
+               $o = replace_macros($tpl, array(
                        '$thread_id' => $a->argv[1],
                        '$thread_subject' => $message['title'],
                        '$thread_seen' => $seen,
@@ -520,22 +512,20 @@ function message_content(&$a) {
                        '$mails' => $mails,
                        
                        // reply
-                       '$reply_info' => array(
-                               'header' => t('Send Reply'),
-                               'to' => t('To:'),
-                               'showinputs' => '',
-                               'subject' => t('Subject:'),
-                               'subjtxt' => $subjtxt_e,
-                               'readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
-                               'yourmessage' => t('Your message:'),
-                               'text' => '',
-                               'select' => $select,
-                               'parent' => $parent,
-                               'upload' => t('Upload photo'),
-                               'insert' => t('Insert web link'),
-                               'submit' => t('Submit'),
-                               'wait' => t('Please wait'),
-                       ),
+                       '$header' => t('Send Reply'),
+                       '$to' => t('To:'),
+                       '$showinputs' => '',
+                       '$subject' => t('Subject:'),
+                       '$subjtxt' => template_escape($message['title']),
+                       '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
+                       '$yourmessage' => t('Your message:'),
+                       '$text' => '',
+                       '$select' => $select,
+                       '$parent' => $parent,
+                       '$upload' => t('Upload photo'),
+                       '$insert' => t('Insert web link'),
+                       '$submit' => t('Submit'),
+                       '$wait' => t('Please wait')
 
                ));